From fb10351a946e943d932cbd4217e930a3a04c1405 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 27 Jul 2023 16:43:54 -0700 Subject: [PATCH 001/639] Add new constructor, .volume() --- .../primal/geometry/OrientedBoundingBox.hpp | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/src/axom/primal/geometry/OrientedBoundingBox.hpp b/src/axom/primal/geometry/OrientedBoundingBox.hpp index 7c0f82a446..9e30f840fd 100644 --- a/src/axom/primal/geometry/OrientedBoundingBox.hpp +++ b/src/axom/primal/geometry/OrientedBoundingBox.hpp @@ -119,6 +119,14 @@ class OrientedBoundingBox const VectorType (&u)[NDIMS], const VectorType& e); + /*! + * \brief Constructor. Creates an oriented bounding box from a collection of + * points with the given axes, which are assumed to be orthonormal. + * \param [in] pts C-style array of points + * \param [in] u axes of OBB + */ + OrientedBoundingBox(const PointType* pts, int n, const VectorType (&u)[NDIMS]); + /*! * \brief Copy Constructor. * \param [in] other The oriented bounding box to copy @@ -458,6 +466,57 @@ OrientedBoundingBox::OrientedBoundingBox(const PointType* pts, int n) this->m_c = Point(c); } +//------------------------------------------------------------------------------ +template +OrientedBoundingBox::OrientedBoundingBox(const PointType* pts, + int n, + const VectorType (&u)[NDIMS]) +{ + if(n <= 0) + { + this->clear(); + return; + } + + // Compute the centroid of the box from the centroid of the points + NumericArray c; // centroid + for(int i = 0; i < n; i++) + { + c += pts[i].array(); + } + c /= static_cast(n); + this->m_c = Point(c); + + // save space for pts minus the centroid + NumericArray diff; + + // Copy the axes from the vector + for(int i = 0; i < NDIMS; i++) + { + this->m_u[i] = Vector(u[i]); + } + + // Calculate the extents + Vector maxima; + T dot; + for(int i = 0; i < n; ++i) + { + for(int j = 0; j < NDIMS; ++j) + { + diff = pts[i].array() - c; + dot = utilities::abs( + numerics::dot_product(&(m_u[j][0]), &diff[0], NDIMS)); + if(maxima[j] < dot) + { + maxima[j] = dot; + } + } + } + + // save the extents + this->m_e = maxima; +} + //------------------------------------------------------------------------------ template OrientedBoundingBox::OrientedBoundingBox(const Point& c, @@ -559,6 +618,18 @@ OrientedBoundingBox& OrientedBoundingBox::expand(T expansion return *this; } +//------------------------------------------------------------------------------ +template +T OrientedBoundingBox::volume() const +{ + double vol = 1.0; + for (int i = 0; i < NDIMS; ++i) + { + vol*= this->m_e[i]; + } + return vol; +} + //------------------------------------------------------------------------------ template OrientedBoundingBox& OrientedBoundingBox::scale(double scaleFactor) From 374acfb666c1164d6c7184e2b942db9805e80aca Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 27 Jul 2023 16:44:25 -0700 Subject: [PATCH 002/639] Switch to switches, more careful adaptive check --- .../operators/detail/winding_number_impl.hpp | 67 ++++++++++++++++--- 1 file changed, 57 insertions(+), 10 deletions(-) diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 02c492ac4d..825a8b611a 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -311,30 +311,70 @@ double stokes_winding_number(const Point& query, // Compute one of three vector field line integrals depending on // the orientation of the original surface, indicated through ax. - if(ax == SingularityAxis::x) + switch(ax) + { + case(SingularityAxis::x): { quadrature += quad_rule.IntPoint(q).weight * (node[2] * node[0] * node_dt[1] - node[1] * node[0] * node_dt[2]) / (node[1] * node[1] + node[2] * node[2]) / node_norm; + break; } - else if(ax == SingularityAxis::y) + case(SingularityAxis::y): { quadrature += quad_rule.IntPoint(q).weight * (node[0] * node[1] * node_dt[2] - node[2] * node[1] * node_dt[0]) / (node[0] * node[0] + node[2] * node[2]) / node_norm; + break; } - else // ax == SingularityAxis::z || ax == SingularityAxis::rotated + case(SingularityAxis::z): + case(SingularityAxis::rotated): { quadrature += quad_rule.IntPoint(q).weight * (node[1] * node[2] * node_dt[0] - node[0] * node[2] * node_dt[1]) / (node[0] * node[0] + node[1] * node[1]) / node_norm; + break; + } } } - // Adaptively refine quadrature over curves if query is not far enough away. + // Adaptively refine quadrature over curves if query is not far enough away + // from the singularity axis. If rotated, assume you need to adapt. + bool needs_adapt = false; BoundingBox cBox(curve.boundingBox()); - if(squared_distance(query, cBox.getCentroid()) <= - 2 * cBox.range().squared_norm()) + Point centroid = cBox.getCentroid(); + + switch(ax) + { + case(SingularityAxis::x): + { + needs_adapt = (query[1] - centroid[1]) * (query[1] - centroid[1]) + + (query[2] - centroid[2]) * (query[2] - centroid[2]) <= + cBox.range().squared_norm(); + break; + } + case(SingularityAxis::y): + { + needs_adapt = (query[0] - centroid[0]) * (query[0] - centroid[0]) + + (query[2] - centroid[2]) * (query[2] - centroid[2]) <= + cBox.range().squared_norm(); + break; + } + case(SingularityAxis::z): + { + needs_adapt = (query[0] - centroid[0]) * (query[0] - centroid[0]) * + (query[1] - centroid[1]) * (query[1] - centroid[1]) <= + cBox.range().squared_norm(); + break; + } + case(SingularityAxis::rotated): + { + needs_adapt = true; + break; + } + } + + if(needs_adapt) { return stokes_winding_number_adaptive(query, curve, @@ -394,23 +434,30 @@ double stokes_winding_number_adaptive(const Point& query, // Compute one of three vector field line integrals depending on // the orientation of the original surface, indicated through ax. - if(ax == SingularityAxis::x) + switch(ax) + { + case(SingularityAxis::x): { quad_fine[i] += quad_rule.IntPoint(q).weight * (node[2] * node[0] * node_dt[1] - node[1] * node[0] * node_dt[2]) / (node[1] * node[1] + node[2] * node[2]) / node_norm; + break; } - else if(ax == SingularityAxis::y) + case(SingularityAxis::y): { quad_fine[i] += quad_rule.IntPoint(q).weight * (node[0] * node[1] * node_dt[2] - node[2] * node[1] * node_dt[0]) / (node[0] * node[0] + node[2] * node[2]) / node_norm; + break; } - else // ax == SingularityAxis::z || ax == SingularityAxis::rotated + case(SingularityAxis::z): + case(SingularityAxis::rotated): { quad_fine[i] += quad_rule.IntPoint(q).weight * (node[1] * node[2] * node_dt[0] - node[0] * node[2] * node_dt[1]) / (node[0] * node[0] + node[1] * node[1]) / node_norm; + break; + } } } } @@ -420,7 +467,7 @@ double stokes_winding_number_adaptive(const Point& query, axom::utilities::isNearlyEqualRelative(quad_fine[0] + quad_fine[1], quad_coarse, quad_tol, - 0.0)) + 1e-10)) { return 0.25 * M_1_PI * (quad_fine[0] + quad_fine[1]); } From cc6445b7db7e8aaab5d9613b0c39e17e6187bc0e Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 27 Jul 2023 16:44:52 -0700 Subject: [PATCH 003/639] bugfix for rotating patch edges --- src/axom/primal/operators/winding_number.hpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index 5ad0ac430d..421717d35f 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -474,8 +474,8 @@ int winding_number(const Point& query, template double winding_number(const Point& query, const BezierPatch& bPatch, - const double edge_tol = 1e-8, - const double quad_tol = 1e-8, + const double edge_tol = 1e-5, + const double quad_tol = 1e-6, const double EPS = 1e-8, const int depth = 0) { @@ -596,7 +596,7 @@ double winding_number(const Point& query, } else { - // Next, check an oriented bounding box. + // Next, create an oriented box with axes defined by the patch // If we are interior to the oriented bounding box, then we // cannot guarantee a separating plane, and need geometric refinement. OrientedBoundingBox oBox(bPatch.orientedBoundingBox().expand(edge_tol)); @@ -678,12 +678,12 @@ double winding_number(const Point& query, } for(int q = 0; q <= ord_v; ++q) { - boundingPoly[0][q] = rotate_point(rotator, bPatch(ord_v, q)); + boundingPoly[0][q] = rotate_point(rotator, bPatch(ord_u, q)); boundingPoly[2][q] = rotate_point(rotator, bPatch(0, ord_v - q)); if(patchIsRational) { - boundingPoly[0].setWeight(q, bPatch.getWeight(ord_v, q)); + boundingPoly[0].setWeight(q, bPatch.getWeight(ord_u, q)); boundingPoly[2].setWeight(q, bPatch.getWeight(0, ord_v - q)); } } @@ -698,12 +698,12 @@ double winding_number(const Point& query, } for(int p = 0; p <= ord_u; ++p) { - boundingPoly[1][p] = rotate_point(rotator, bPatch(ord_u - p, ord_u)); + boundingPoly[1][p] = rotate_point(rotator, bPatch(ord_u - p, ord_v)); boundingPoly[3][p] = rotate_point(rotator, bPatch(p, 0)); if(patchIsRational) { - boundingPoly[1].setWeight(p, bPatch.getWeight(ord_u - p, ord_u)); + boundingPoly[1].setWeight(p, bPatch.getWeight(ord_u - p, ord_v)); boundingPoly[3].setWeight(p, bPatch.getWeight(p, 0)); } } @@ -712,7 +712,6 @@ double winding_number(const Point& query, // Set up the polygon if we don't need to do any rotation or splitting. if(field_direction != detail::SingularityAxis::rotated) { - // Add the relevant bounding curves to the patch. boundingPoly[0] = bPatch.isocurve_u(0); boundingPoly[0].reverseOrientation(); From e2fd828e52057b99bf7620ecdad1176b6ae3a010 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 27 Jul 2023 16:45:24 -0700 Subject: [PATCH 004/639] bugfix + Ma algorithms for 3D --- src/axom/primal/operators/is_convex.hpp | 103 ++++++++++++++++++- src/axom/primal/tests/primal_polygon.cpp | 122 +++++++++++++++++++++-- 2 files changed, 212 insertions(+), 13 deletions(-) diff --git a/src/axom/primal/operators/is_convex.hpp b/src/axom/primal/operators/is_convex.hpp index 8d6c32d165..a0935c19c8 100644 --- a/src/axom/primal/operators/is_convex.hpp +++ b/src/axom/primal/operators/is_convex.hpp @@ -19,9 +19,10 @@ namespace primal * * \param [in] poly The polygon * - * Uses dot products to detect whether vertices extend in the "convex" direction. - * Uses the edge P[0]P[N] as a reference, meaning its adjacent edges are - * always considered to be oriented correctly. + * A 2D polygon is convex when every line that does not contain an edge + * intersects the shape at most twice. + * Checks whether for each pair of vertices P[i-1]P[i+1], the point + * P[i] and (P[0] or P[n]) lie on the same side of the line connecting them. * * Algorithm adapted from: * Y. L. Ma, W.T. Hewitt. "Point inversion and projection for NURBS curve @@ -54,7 +55,101 @@ bool is_convex(const Polygon& poly, double EPS = 1e-8) } // Ensure other point to check against isn't adjacent - if(res1 == orientation(poly[(i < n / 2) ? n : 0], seg, EPS)) + if(res1 == orientation(poly[(i <= n / 2) ? n : 0], seg, EPS)) + { + return false; + } + } + + return true; +} + +/*! + * \brief Determines if a 3D polygon defined by ordered vertices is convex + * + * \param [in] poly The polygon + * + * Uses dot products to detect whether vertices extend in the "convex" direction. + * Uses the edge P[0]P[N] as a reference, meaning its adjacent edges are + * always considered to be oriented correctly. + * + * Algorithm adapted from: + * Y. L. Ma, W.T. Hewitt. "Point inversion and projection for NURBS curve + * and surface: Control polygon approach" + * Computer Aided Geometric Design 20(2):79-99, May 2003. + * \note Only defined in 2D + * + * \return A boolean value indicating convexity + */ +template +bool is_convex(const Polygon& poly, double EPS = 1e-8) +{ + int n = poly.numVertices() - 1; + if(n + 1 < 3) + { + return true; // Triangles and lines are convex + } + + for(int i = 1; i < n; i++) + { + // For each non-endpoint, check if that point and one of the endpoints + // are on the same side as the segment connecting the adjacent nodes + Vector v0(poly[i - 1], poly[i]); + Vector v1(poly[i - 1], poly[i + 1]); + Vector v2(poly[i - 1], poly[(i <= n / 2) ? n : 0]); + + // Equivalent to (v0 x v1) dot (v0 x v2) > 0 + if(v0.squared_norm() * v1.dot(v2) > v0.dot(v2) * v0.dot(v1)) + { + return false; + } + } + + return true; +} + +/* + * Check if a polygon is "shallow," which we define as every line + * that is normal to an edge of the polygon intersects only that edge + * and the edge P[n]P[0]. + * + * This is true when ang(P[n]P[0]P[1]) + ang(P[n-1]P[n]P[0]) < 90, + * and every interior angle is greater than 90 degrees + */ +template +bool is_shallow(const Polygon& poly, double EPS = 1e-8) +{ + // Get max index of polygon vertices + const int n = poly.numVertices() - 1; + + if(n + 1 < 2) + { + return true; // Triangles and points are shallow + } + + // Check two edges connected to P[n]P[0]. + auto compute_angle = [](const Point& a, + const Point& b, + const Point& c) -> double { + Vector v1, v2; + v1 = Vector(b, a).unitVector(); + v2 = Vector(b, c).unitVector(); + + return acos(axom::utilities::clampVal(v1.dot(v2), -1.0, 1.0)); + }; + + // Check endpoints + if(compute_angle(poly[n], poly[0], poly[1]) + + compute_angle(poly[n - 1], poly[n], poly[0]) >= + 0.5 * M_PI) + { + return false; + } + + // Iterate over the middle vertices + for(int i = 1; i < n; ++i) + { + if(compute_angle(poly[i - 1], poly[i], poly[i + 1]) < 0.5 * M_PI) { return false; } diff --git a/src/axom/primal/tests/primal_polygon.cpp b/src/axom/primal/tests/primal_polygon.cpp index bf448225b7..832e1dd652 100644 --- a/src/axom/primal/tests/primal_polygon.cpp +++ b/src/axom/primal/tests/primal_polygon.cpp @@ -244,46 +244,150 @@ TEST(primal_polygon, convexity) poly.addVertex(PointType {0, 1}); EXPECT_TRUE(is_convex(poly)); - // Duplicate points should not affect convexity - vertices = axom::Array( + axom::Array convex_verts = axom::Array( {PointType {0, 0}, PointType {0, 1}, PointType {1, 1}, PointType {1, 0}}); + axom::Array concave_verts = axom::Array( + {PointType {0, 0}, PointType {0, 1}, PointType {0.1, 0.1}, PointType {1, 0}}); + axom::Array nonsimple_verts = axom::Array( + {PointType {0, 0}, PointType {1, 1}, PointType {0, 1}, PointType {1, 0}}); + poly.clear(); + + // Duplicate points and straight edges should not affect convexity for(int i = 0; i < 4; i++) { for(int j = 0; j < 3; j++) // Duplicate each element 3 times { - poly.addVertex(vertices[i]); + poly.addVertex(convex_verts[i]); } + + // Add midpoints between each duplicated vertex + poly.addVertex( + PointType::midpoint(convex_verts[i], convex_verts[(i + 1) % 4])); } EXPECT_TRUE(is_convex(poly)); // Verify checks up to rotation of vertices - vertices = axom::Array( - {PointType {0, 0}, PointType {1, 1}, PointType {1, 0}, PointType {0, 1}}); + for(int i = 0; i < 4; i++) + { + poly.clear(); + for(int j = 0; j < 4; j++) + { + poly.addVertex(concave_verts[(j + i) % 4]); + } + EXPECT_FALSE(is_convex(poly)); + } for(int i = 0; i < 4; i++) { poly.clear(); for(int j = 0; j < 4; j++) { - poly.addVertex(vertices[(j + i) % 4]); + poly.addVertex(nonsimple_verts[(j + i) % 4]); } EXPECT_FALSE(is_convex(poly)); } - vertices = axom::Array( - {PointType {0, 0}, PointType {0, 1}, PointType {1, 1}, PointType {1, 0}}); + for(int i = 0; i < 4; i++) + { + poly.clear(); + for(int j = 0; j < 4; j++) + { + poly.addVertex(convex_verts[(j + i) % 4]); + } + EXPECT_TRUE(is_convex(poly)); + } +} + +//------------------------------------------------------------------------------ +TEST(primal_polygon, convexity_3d) +{ + using PolygonType = axom::primal::Polygon; + using PointType = axom::primal::Point; + + axom::Array vertices({PointType {0, 0, 0}, PointType {1, 1, 0}}); + PolygonType poly(vertices); + + // Segments and Triangles are always convex + EXPECT_TRUE(is_convex(poly)); + poly.addVertex(PointType {0, 1, 0}); + EXPECT_TRUE(is_convex(poly)); + + axom::Array convex_verts = + axom::Array({PointType {0, 0, 0}, + PointType {0, 1, 0}, + PointType {1, 1, 0}, + PointType {1, 0, 0}}); + axom::Array concave_verts = + axom::Array({PointType {0, 0, 0}, + PointType {0, 1, 0}, + PointType {0.1, 0.1, 0}, + PointType {1, 0, 0}}); + axom::Array nonsimple_verts = + axom::Array({PointType {0, 0, 0}, + PointType {1, 1, 0}, + PointType {0, 1, 0}, + PointType {1, 0, 0}}); + + poly.clear(); + + // Duplicate points and straight edges should not affect convexity + for(int i = 0; i < 4; i++) + { + for(int j = 0; j < 3; j++) // Duplicate each element 3 times + { + poly.addVertex(convex_verts[i]); + } + + // Add midpoints between each duplicated vertex + poly.addVertex( + PointType::midpoint(convex_verts[i], convex_verts[(i + 1) % 4])); + } + + EXPECT_TRUE(is_convex(poly)); + + // Verify checks up to rotation of vertices for(int i = 0; i < 4; i++) { poly.clear(); for(int j = 0; j < 4; j++) { - poly.addVertex(vertices[(j + i) % 4]); + poly.addVertex(concave_verts[(j + i) % 4]); + } + EXPECT_FALSE(is_convex(poly)); + } + + for(int i = 0; i < 4; i++) + { + poly.clear(); + for(int j = 0; j < 4; j++) + { + poly.addVertex(nonsimple_verts[(j + i) % 4]); + } + EXPECT_FALSE(is_convex(poly)); + } + + for(int i = 0; i < 4; i++) + { + poly.clear(); + for(int j = 0; j < 4; j++) + { + poly.addVertex(convex_verts[(j + i) % 4]); } EXPECT_TRUE(is_convex(poly)); } + + axom::Array verts_3d = + axom::Array({PointType {0, 1, 0}, + PointType {0, 1, 1}, + PointType {0, 0, 1}, + PointType {-1, 0, 1}, + PointType {-1, 0, 0}}); + PolygonType poly_3d(verts_3d); + + EXPECT_FALSE(is_convex(poly_3d)); } //------------------------------------------------------------------------------ From 789726218a38114f895dc38967cd405f2ae2dba9 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 27 Jul 2023 16:45:42 -0700 Subject: [PATCH 005/639] First attempt at universal splitting --- src/axom/primal/operators/split.hpp | 64 +++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 85b6e351c9..914d737375 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -16,6 +16,7 @@ #include "axom/core/Array.hpp" #include "axom/primal/geometry/Octahedron.hpp" #include "axom/primal/geometry/Tetrahedron.hpp" +#include "axom/primal/geometry/BezierPatch.hpp" #include "axom/slic.hpp" @@ -78,6 +79,69 @@ void split(const Octahedron& oct, out.push_back(Tet(oct[Q], oct[S], oct[U], C)); }; +/*! + * \brief Splits a BezierPatch object into SuperConvex subpatches + * + * \param [in] bPatch BezierPatch to split + * \param [out] out The \a axom::Array of BezierPatch objects; a set of SuperConvex + * components of c are appended to out. + * + * + * Uses a bisection method, splitting the patch recursively until each section + * is SuperConvex (convex + shallow). + * + */ +template +void split_to_valid(const BezierPatch& bPatch, + axom::Array>& out) +{ + using Poly = Polygon; + using Patch = BezierPatch; + + const int ord_u = bPatch.getOrder_u(); + const int ord_v = bPatch.getOrder_v(); + Poly control_slice(); + + bool is_valid = true; + + // Check the slices that are fixed in u + for(int p = 0; is_valid && p <= ord_u; ++p) + { + control_slice.clear(); + for(int q = 0; q <= ord_v; ++q) + { + control_slice.addVertex(bPatch(p, q)); + } + + is_valid = is_convex(control_slice) && is_shallow(control_slice); + } + + // Check the slices that are fixed in v + for(int q = 0; is_valid && q <= ord_v; ++q) + { + control_slice.clear(); + for(int p = 0; p <= ord_u; ++p) + { + control_slice.addVertex(bPatch(p, q)); + } + is_valid = is_convex(control_slice) && is_shallow(control_slice); + } + + if(is_valid) + { + out.push_back(Patch(bPatch)); + } + else + { + Patch p1, p2, p3, p4; + bPatch.split(0.5, p1, p2, p3, p4); + split_to_valid(p1, out); + split_to_valid(p2, out); + split_to_valid(p3, out); + split_to_valid(p4, out); + } +} + } // namespace primal } // namespace axom From e051b51fcdc60f9c417ae0ec31da13d00affd6d9 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 28 Jul 2023 12:56:31 -0700 Subject: [PATCH 006/639] Improve split to only do it across one axis if needed --- src/axom/primal/operators/split.hpp | 82 +++++++++++++++++++---------- 1 file changed, 55 insertions(+), 27 deletions(-) diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 914d737375..4c591fb814 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -18,6 +18,8 @@ #include "axom/primal/geometry/Tetrahedron.hpp" #include "axom/primal/geometry/BezierPatch.hpp" +#include "axom/primal/operators/is_convex.hpp" + #include "axom/slic.hpp" // perhaps #include split_impl.hpp here @@ -95,51 +97,77 @@ template void split_to_valid(const BezierPatch& bPatch, axom::Array>& out) { - using Poly = Polygon; + using Poly = Polygon; using Patch = BezierPatch; const int ord_u = bPatch.getOrder_u(); const int ord_v = bPatch.getOrder_v(); - Poly control_slice(); + Poly control_slice; bool is_valid = true; - // Check the slices that are fixed in u - for(int p = 0; is_valid && p <= ord_u; ++p) + // If ord_u > ord_v, then check order u slices (block 1) first + // else, check order v slices (block 2) first + for(int i = 0; i < 2; ++i) { - control_slice.clear(); - for(int q = 0; q <= ord_v; ++q) + switch((ord_v > ord_u) != (i == 0)) + { + // Check slices that are fixed in v, + // which are of order u + case(true): { - control_slice.addVertex(bPatch(p, q)); + for(int q = 0; is_valid && q <= ord_v; ++q) + { + control_slice.clear(); + for(int p = 0; p <= ord_u; ++p) + { + control_slice.addVertex(bPatch(p, q)); + } + + if(!is_convex(control_slice) || !is_shallow(control_slice)) + { + is_valid = false; + Patch p1, p2; + bPatch.split_u(0.5, p1, p2); + split_to_valid(p1, out); + split_to_valid(p2, out); + } + } + + break; } - - is_valid = is_convex(control_slice) && is_shallow(control_slice); - } - - // Check the slices that are fixed in v - for(int q = 0; is_valid && q <= ord_v; ++q) - { - control_slice.clear(); - for(int p = 0; p <= ord_u; ++p) + // Check slices that are fixed in u, + // which are of order v + case(false): { - control_slice.addVertex(bPatch(p, q)); + for(int p = 0; is_valid && p <= ord_u; ++p) + { + control_slice.clear(); + for(int q = 0; q <= ord_v; ++q) + { + control_slice.addVertex(bPatch(p, q)); + } + + if(!is_convex(control_slice) || !is_shallow(control_slice)) + { + is_valid = false; + Patch p1, p2; + bPatch.split_v(0.5, p1, p2); + split_to_valid(p1, out); + split_to_valid(p2, out); + } + } + + break; + } } - is_valid = is_convex(control_slice) && is_shallow(control_slice); } + // If we fall out of the loop, then add it to the list if(is_valid) { out.push_back(Patch(bPatch)); } - else - { - Patch p1, p2, p3, p4; - bPatch.split(0.5, p1, p2, p3, p4); - split_to_valid(p1, out); - split_to_valid(p2, out); - split_to_valid(p3, out); - split_to_valid(p4, out); - } } } // namespace primal From ea6f129b6c1a3ca61c04ff9d71dc6e9d085c26cd Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 28 Jul 2023 12:57:10 -0700 Subject: [PATCH 007/639] Make is_valid work for degenerate shapes --- src/axom/primal/operators/is_convex.hpp | 50 +++++++++++++++++++------ 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/src/axom/primal/operators/is_convex.hpp b/src/axom/primal/operators/is_convex.hpp index a0935c19c8..140b842c96 100644 --- a/src/axom/primal/operators/is_convex.hpp +++ b/src/axom/primal/operators/is_convex.hpp @@ -9,6 +9,7 @@ #include "axom/primal/geometry/Segment.hpp" #include "axom/primal/geometry/Polygon.hpp" #include "axom/primal/operators/orientation.hpp" +#include "axom/primal/operators/squared_distance.hpp" namespace axom { @@ -94,12 +95,12 @@ bool is_convex(const Polygon& poly, double EPS = 1e-8) { // For each non-endpoint, check if that point and one of the endpoints // are on the same side as the segment connecting the adjacent nodes - Vector v0(poly[i - 1], poly[i]); - Vector v1(poly[i - 1], poly[i + 1]); - Vector v2(poly[i - 1], poly[(i <= n / 2) ? n : 0]); + const Vector v0(poly[i - 1], poly[i]); + const Vector v1(poly[i - 1], poly[i + 1]); + const Vector v2(poly[i - 1], poly[(i <= n / 2) ? n : 0]); - // Equivalent to (v0 x v1) dot (v0 x v2) > 0 - if(v0.squared_norm() * v1.dot(v2) > v0.dot(v2) * v0.dot(v1)) + // Equivalent to (v1 x v0) dot (v1 x v2) > 0 + if(v1.squared_norm() * v0.dot(v2) - v1.dot(v2) * v1.dot(v0) > EPS) { return false; } @@ -109,7 +110,7 @@ bool is_convex(const Polygon& poly, double EPS = 1e-8) } /* - * Check if a polygon is "shallow," which we define as every line + * Check if a convex polygon is "shallow," which we define as every line * that is normal to an edge of the polygon intersects only that edge * and the edge P[n]P[0]. * @@ -119,12 +120,36 @@ bool is_convex(const Polygon& poly, double EPS = 1e-8) template bool is_shallow(const Polygon& poly, double EPS = 1e-8) { - // Get max index of polygon vertices - const int n = poly.numVertices() - 1; + // max index for vertices in the full polygon + const int n_full = poly.numVertices() - 1; + if(n_full + 1 < 2) + { + return true; // lines and points are shallow + } + + int n = 0; // max index for vertices in the nondegenerate polygon + Polygon simple_poly; + simple_poly.addVertex(poly[0]); + + for(int i = 1; i < n_full; ++i) + { + if(squared_distance(simple_poly[n], poly[i]) > 1e-8) + { + simple_poly.addVertex(poly[i]); + n++; + } + } + + if((n > 0) && (squared_distance(simple_poly[0], poly[n_full]) > 1e-8) && + (squared_distance(simple_poly[n - 1], poly[n_full]) > 1e-8)) + { + simple_poly.addVertex(poly[poly.numVertices() - 1]); + n++; + } if(n + 1 < 2) { - return true; // Triangles and points are shallow + return true; // lines and points are shallow } // Check two edges connected to P[n]P[0]. @@ -139,8 +164,8 @@ bool is_shallow(const Polygon& poly, double EPS = 1e-8) }; // Check endpoints - if(compute_angle(poly[n], poly[0], poly[1]) + - compute_angle(poly[n - 1], poly[n], poly[0]) >= + if(compute_angle(simple_poly[n], simple_poly[0], simple_poly[1]) + + compute_angle(simple_poly[n - 1], simple_poly[n], simple_poly[0]) >= 0.5 * M_PI) { return false; @@ -149,7 +174,8 @@ bool is_shallow(const Polygon& poly, double EPS = 1e-8) // Iterate over the middle vertices for(int i = 1; i < n; ++i) { - if(compute_angle(poly[i - 1], poly[i], poly[i + 1]) < 0.5 * M_PI) + if(compute_angle(simple_poly[i - 1], simple_poly[i], simple_poly[i + 1]) < + 0.5 * M_PI) { return false; } From 73320a82aed69225a025c8da1a342c129ddb65b8 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 28 Jul 2023 13:00:52 -0700 Subject: [PATCH 008/639] Fix broken test --- src/axom/primal/tests/primal_polygon.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/axom/primal/tests/primal_polygon.cpp b/src/axom/primal/tests/primal_polygon.cpp index 832e1dd652..6917d34bdf 100644 --- a/src/axom/primal/tests/primal_polygon.cpp +++ b/src/axom/primal/tests/primal_polygon.cpp @@ -378,16 +378,6 @@ TEST(primal_polygon, convexity_3d) } EXPECT_TRUE(is_convex(poly)); } - - axom::Array verts_3d = - axom::Array({PointType {0, 1, 0}, - PointType {0, 1, 1}, - PointType {0, 0, 1}, - PointType {-1, 0, 1}, - PointType {-1, 0, 0}}); - PolygonType poly_3d(verts_3d); - - EXPECT_FALSE(is_convex(poly_3d)); } //------------------------------------------------------------------------------ From fa5d535a39a4b32afb699da78217dc3c74f60291 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 09:38:49 -0700 Subject: [PATCH 009/639] Add a second derivative for curves --- src/axom/primal/geometry/BezierCurve.hpp | 86 +++++++++++++++++++++++- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/src/axom/primal/geometry/BezierCurve.hpp b/src/axom/primal/geometry/BezierCurve.hpp index cabdaece1f..68cade0571 100644 --- a/src/axom/primal/geometry/BezierCurve.hpp +++ b/src/axom/primal/geometry/BezierCurve.hpp @@ -68,8 +68,6 @@ class BezierCurve using BoundingBoxType = BoundingBox; using OrientedBoundingBoxType = OrientedBoundingBox; - AXOM_STATIC_ASSERT_MSG((NDIMS == 2) || (NDIMS == 3), - "A Bezier Curve object may be defined in 2-D or 3-D"); AXOM_STATIC_ASSERT_MSG( std::is_arithmetic::value, "A Bezier Curve must be defined using an arithmetic type"); @@ -463,6 +461,90 @@ class BezierCurve } } + /*! + * \brief Computes the second derivative of a Bezier curve at a particular parameter value \a t + * + * \param [in] t parameter value at which to compute tangent + * \return p the 2nd derivative vector of the Bezier curve at t + * + * \note We typically find the second derivative of the curve at \a t between 0 and 1 + */ + VectorType dtdt(T t) const + { + using axom::utilities::lerp; + VectorType val; + + const int ord = getOrder(); + std::vector dCarray(ord + 1); + + if(isRational()) + { + axom::Array dWarray(ord + 1); + + // Run algorithm from Farin '83 on each dimension + for(int i = 0; i < NDIMS; ++i) + { + for(int p = 0; p <= ord; ++p) + { + dCarray[p] = m_controlPoints[p][i] * m_weights[p]; + dWarray[p] = m_weights[p]; + } + + // Stop two steps early and take finite differences of the last three values + for(int p = 1; p <= ord - 2; ++p) + { + const int end = ord - p; + for(int k = 0; k <= end; ++k) + { + dCarray[k] = lerp(dCarray[k], dCarray[k + 1], t); + dWarray[k] = lerp(dWarray[k], dWarray[k + 1], t); + } + } + + // Need the rest of the de casteljau weights for the formula + double w1[2] = {lerp(dWarray[0], dWarray[1], t), + lerp(dWarray[1], dWarray[2], t)}; + double w0[1] = {lerp(w1[0], w1[1], t)}; + + val[i] = ord * dWarray[2] * + (2 * ord * w1[0] * w1[0] - (ord - 1) * dWarray[0] * w0[0] - + 2 * w1[0] * w0[0]) * + (dCarray[2] / dWarray[2] - dCarray[1] / dWarray[1]); + val[i] -= ord * dWarray[0] * + (2 * ord * w1[1] * w1[1] - (ord - 1) * dWarray[2] * w0[0] - + 2 * w1[1] * w0[0]) * + (dCarray[1] / dWarray[1] - dCarray[0] / dWarray[0]); + val[i] /= w0[0] * w0[0] * w0[0]; + } + + return val; + } + else + { + // Run de Casteljau algorithm on each dimension + for(int i = 0; i < NDIMS; ++i) + { + for(int p = 0; p <= ord; ++p) + { + dCarray[p] = m_controlPoints[p][i]; + } + + // stop two steps early and take finite difference of last three values + for(int p = 1; p <= ord - 2; ++p) + { + const int end = ord - p; + for(int k = 0; k <= end; ++k) + { + dCarray[k] = lerp(dCarray[k], dCarray[k + 1], t); + } + } + val[i] = ord * (ord - 1) * (dCarray[2] - 2 * dCarray[1] + dCarray[0]); + } + + return val; + } + } + /*! * \brief Splits a Bezier curve into two Bezier curves at a given parameter value * From 147a3c49de2fd250715f8a7f672e13f57de906ae Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 09:49:45 -0700 Subject: [PATCH 010/639] Add template back to BezierPatch --- src/axom/primal/geometry/BezierPatch.hpp | 48 +++++++++---------- src/axom/primal/operators/split.hpp | 6 +-- src/axom/primal/operators/winding_number.hpp | 5 +- src/axom/primal/tests/primal_bezier_patch.cpp | 36 +++++++------- src/axom/primal/tests/primal_solid_angle.cpp | 6 +-- 5 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index 86e0f9560e..346e377b18 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -32,12 +32,12 @@ namespace axom namespace primal { // Forward declare the templated classes and operator functions -template +template class BezierPatch; /*! \brief Overloaded output operator for Bezier Patches*/ -template -std::ostream& operator<<(std::ostream& os, const BezierPatch& bPatch); +template +std::ostream& operator<<(std::ostream& os, const BezierPatch& bPatch); /*! * \class BezierPatch @@ -55,22 +55,22 @@ std::ostream& operator<<(std::ostream& os, const BezierPatch& bPatch); * Gerald Farin, "Algorithms for rational Bezier curves" * Computer-Aided Design, Volume 15, Number 2, 1983, */ -template +template class BezierPatch { public: - using PointType = Point; - using VectorType = Vector; - using PlaneType = Plane; + using PointType = Point; + using VectorType = Vector; + using PlaneType = Plane; using CoordsVec = axom::Array; using CoordsMat = axom::Array; using WeightsVec = axom::Array; using WeightsMat = axom::Array; - using BoundingBoxType = BoundingBox; - using OrientedBoundingBoxType = OrientedBoundingBox; - using BezierCurveType = primal::BezierCurve; + using BoundingBoxType = BoundingBox; + using OrientedBoundingBoxType = OrientedBoundingBox; + using BezierCurveType = primal::BezierCurve; AXOM_STATIC_ASSERT_MSG( std::is_arithmetic::value, @@ -383,15 +383,15 @@ class BezierPatch }; /// Checks equality of two Bezier Patches - friend inline bool operator==(const BezierPatch& lhs, - const BezierPatch& rhs) + friend inline bool operator==(const BezierPatch& lhs, + const BezierPatch& rhs) { return (lhs.m_controlPoints == rhs.m_controlPoints) && (lhs.m_weights == rhs.m_weights); } - friend inline bool operator!=(const BezierPatch& lhs, - const BezierPatch& rhs) + friend inline bool operator!=(const BezierPatch& lhs, + const BezierPatch& rhs) { return !(lhs == rhs); } @@ -580,7 +580,7 @@ class BezierPatch axom::Array dWarray(ord_u + 1); for(int q = 0; q <= ord_v; ++q) { - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { for(int p = 0; p <= ord_u; ++p) { @@ -626,7 +626,7 @@ class BezierPatch // Otherwise, do De Casteljau along the v-axis for(int q = 0; q <= ord_v; ++q) { - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { for(int p = 0; p <= ord_u; ++p) { @@ -688,7 +688,7 @@ class BezierPatch axom::Array dWarray(ord_v + 1); for(int p = 0; p <= ord_u; ++p) { - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { for(int q = 0; q <= ord_v; ++q) { @@ -733,7 +733,7 @@ class BezierPatch // Otherwise, do De Casteljau along the u-axis for(int p = 0; p <= ord_u; ++p) { - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { for(int q = 0; q <= ord_v; ++q) { @@ -870,7 +870,7 @@ class BezierPatch double temp_weight = lerp(p2.getWeight(k, q), p2.getWeight(k + 1, q), u); - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { p2(k, q)[i] = lerp(p2.getWeight(k, q) * p2(k, q)[i], p2.getWeight(k + 1, q) * p2(k + 1, q)[i], @@ -892,7 +892,7 @@ class BezierPatch { p1(0, q) = m_controlPoints(0, q); - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { for(int p = 1; p <= ord_u; ++p) { @@ -941,7 +941,7 @@ class BezierPatch double temp_weight = lerp(p2.getWeight(p, k), p2.getWeight(p, k + 1), v); - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { p2(p, k)[i] = lerp(p2.getWeight(p, k) * p2(p, k)[i], p2.getWeight(p, k + 1) * p2(p, k + 1)[i], @@ -963,7 +963,7 @@ class BezierPatch { p1(p, 0) = m_controlPoints(p, 0); - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { for(int q = 1; q <= ord_v; ++q) { @@ -1188,8 +1188,8 @@ class BezierPatch //------------------------------------------------------------------------------ /// Free functions related to BezierPatch //------------------------------------------------------------------------------ -template -std::ostream& operator<<(std::ostream& os, const BezierPatch& bPatch) +template +std::ostream& operator<<(std::ostream& os, const BezierPatch& bPatch) { bPatch.print(os); return os; diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 4c591fb814..07c3058836 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -94,11 +94,11 @@ void split(const Octahedron& oct, * */ template -void split_to_valid(const BezierPatch& bPatch, - axom::Array>& out) +void split_to_valid(const BezierPatch& bPatch, + axom::Array>& out) { using Poly = Polygon; - using Patch = BezierPatch; + using Patch = BezierPatch; const int ord_u = bPatch.getOrder_u(); const int ord_v = bPatch.getOrder_v(); diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index 421717d35f..2b8670dc96 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -473,7 +473,7 @@ int winding_number(const Point& query, */ template double winding_number(const Point& query, - const BezierPatch& bPatch, + const BezierPatch& bPatch, const double edge_tol = 1e-5, const double quad_tol = 1e-6, const double EPS = 1e-8, @@ -490,8 +490,7 @@ double winding_number(const Point& query, // Early return if the patch is approximately polygonal. // Very slight variations in curvature requires small EPS tolerance - constexpr int MAX_DEPTH = 10; - if(depth >= MAX_DEPTH || bPatch.isPolygonal(EPS)) + if(bPatch.isPolygonal(EPS)) { return winding_number( query, diff --git a/src/axom/primal/tests/primal_bezier_patch.cpp b/src/axom/primal/tests/primal_bezier_patch.cpp index c6da191bfe..e7bcebd46d 100644 --- a/src/axom/primal/tests/primal_bezier_patch.cpp +++ b/src/axom/primal/tests/primal_bezier_patch.cpp @@ -22,7 +22,7 @@ namespace primal = axom::primal; TEST(primal_bezierpatch, constructor) { using CoordType = double; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; using CoordsMat = BezierPatchType::CoordsMat; { @@ -60,7 +60,7 @@ TEST(primal_bezierpatch, set_order) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; SLIC_INFO("Test adding control points to an empty Bezier patch"); @@ -104,7 +104,7 @@ TEST(primal_bezierpatch, array_constructors) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; SLIC_INFO("Testing point array constructor"); @@ -178,7 +178,7 @@ TEST(primal_bezierpatch, axom_array_constructors) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; SLIC_INFO("Testing point array constructor"); @@ -283,7 +283,7 @@ TEST(primal_bezierpatch, make_rational) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 1; const int order_v = 1; @@ -340,7 +340,7 @@ TEST(primal_bezierpatch, evaluate) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 3; const int order_v = 2; @@ -405,7 +405,7 @@ TEST(primal_bezierpatch, isocurve) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 3; const int order_v = 2; @@ -437,7 +437,7 @@ TEST(primal_bezierpatch, evaluate_tall) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 2; const int order_v = 3; @@ -483,7 +483,7 @@ TEST(primal_bezierpatch, evaluation_degenerate) using CoordType = double; using PointType = primal::Point; using BezierCurveType = primal::BezierCurve; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order = 3; PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, @@ -514,7 +514,7 @@ TEST(primal_bezierpatch, tangent) using CoordType = double; using PointType = primal::Point; using VectorType = primal::Vector; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 3; const int order_v = 2; @@ -566,7 +566,7 @@ TEST(primal_bezierpatch, normal) using CoordType = double; using PointType = primal::Point; using VectorType = primal::Vector; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 3; const int order_v = 2; @@ -604,7 +604,7 @@ TEST(primal_bezierpatch, split_degenerate) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 0; const int order_v = 0; @@ -636,7 +636,7 @@ TEST(primal_bezierpatch, split_curve) using CoordType = double; using PointType = primal::Point; using BezierCurveType = primal::BezierCurve; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order = 3; PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, @@ -680,7 +680,7 @@ TEST(primal_bezierpatch, split_plane) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 1; const int order_v = 1; @@ -717,7 +717,7 @@ TEST(primal_bezierpatch, split_patch) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 3; const int order_v = 2; @@ -757,7 +757,7 @@ TEST(primal_bezierpatch, isPlanar) using CoordType = double; using PointType = primal::Point; using VectorType = primal::Vector; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; // order (0, 0) -- always true { @@ -837,7 +837,7 @@ TEST(primal_bezierpatch, reverse_orientation) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; SLIC_INFO("Testing reverseOrientation(axis) on Bezier patches"); @@ -929,7 +929,7 @@ TEST(primal_bezierpatch, rational_evaluation_split) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int ord_u = 3; const int ord_v = 3; diff --git a/src/axom/primal/tests/primal_solid_angle.cpp b/src/axom/primal/tests/primal_solid_angle.cpp index a81ca4e2f3..041bb1dc9a 100644 --- a/src/axom/primal/tests/primal_solid_angle.cpp +++ b/src/axom/primal/tests/primal_solid_angle.cpp @@ -484,7 +484,7 @@ TEST(primal_solid_angle, planar_bezierpatch) using Point3D = primal::Point; using Vector3D = primal::Vector; using Polygon = primal::Polygon; - using BezierPatch = primal::BezierPatch; + using BezierPatch = primal::BezierPatch; // Define normal vector for the quadrilateral Vector3D v1 = Vector3D({0.0, 1.0, 2.0}).unitVector(); @@ -538,11 +538,11 @@ TEST(primal_solid_angle, planar_bezierpatch) } //------------------------------------------------------------------------------ -TEST(primal_integral, bezierpatch_sphere) +TEST(primal_solid_angle, bezierpatch_sphere) { using Point3D = primal::Point; using Vector3D = primal::Vector; - using BPatch = primal::BezierPatch; + using BPatch = primal::BezierPatch; double rt2 = sqrt(2), rt3 = sqrt(3), rt6 = sqrt(6); From e1a0ae944671a950c0b1367897e4ad85038f173c Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 09:50:41 -0700 Subject: [PATCH 011/639] Add second derivatives for Bezier Patches --- src/axom/primal/geometry/BezierPatch.hpp | 56 ++++++++++++ src/axom/primal/tests/primal_bezier_curve.cpp | 37 ++++++++ src/axom/primal/tests/primal_bezier_patch.cpp | 87 +++++++++++++++++++ .../primal/tests/primal_rational_bezier.cpp | 38 ++++++++ 4 files changed, 218 insertions(+) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index 346e377b18..dee832f444 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -788,6 +788,8 @@ class BezierPatch */ VectorType du(T u, T v) const { return isocurve_v(v).dt(u); } + VectorType dudu(T u, T v) const { return isocurve_v(v).dtdt(u); } + /*! * \brief Computes a tangent of a Bezier patch at a particular parameter value (\a u, \a v) along the v axis * @@ -799,6 +801,60 @@ class BezierPatch */ VectorType dv(T u, T v) const { return isocurve_u(u).dt(v); } + VectorType dvdv(T u, T v) const { return isocurve_u(u).dtdt(v); } + + VectorType dudv(T u, T v) const + { + using axom::utilities::lerp; + + const int ord_u = getOrder_u(); + const int ord_v = getOrder_v(); + + // Construct the hodograph in the two directions, then evaluate it + + if(!isRational()) + { + BezierPatch hodograph(ord_u - 1, ord_v - 1); + // Iterate over each isocurve along v + for(int q = 0; q <= ord_v - 1; ++q) + { + for(int p = 0; p <= ord_u - 1; ++p) + { + for(int i = 0; i < NDIMS; ++i) + { + hodograph(p, q)[i] = ord_u * ord_v * + (m_controlPoints(p + 1, q + 1)[i] - m_controlPoints(p + 1, q)[i] - + m_controlPoints(p, q + 1)[i] + m_controlPoints(p, q)[i]); + } + } + } + + return Vector(hodograph.evaluate(u, v)); + } + else + { + BezierPatch nonrational(ord_u, ord_v); + BezierPatch weights(ord_u, ord_v); + for(int p = 0; p <= ord_u; ++p) + { + for(int q = 0; q <= ord_v; ++q) + { + nonrational(p, q) = m_controlPoints(p, q); + nonrational(p, q).array() *= m_weights(p, q); + weights(p, q)[0] = m_weights(p, q); + } + } + + // Return a wildly inefficient calculation of the rational derivative + return (nonrational.dudv(u, v) - weights.dv(u, v)[0] * du(u, v) - + weights.du(u, v)[0] * dv(u, v) - + weights.dudv(u, v)[0] * Vector(evaluate(u, v))) / + weights.evaluate(u, v)[0]; + } + } + + VectorType dvdu(T u, T v) const { return dudv(u, v); } + /*! * \brief Computes the normal vector of a Bezier patch at a particular parameter value (\a u, \a v) * diff --git a/src/axom/primal/tests/primal_bezier_curve.cpp b/src/axom/primal/tests/primal_bezier_curve.cpp index 755b22e946..c572d3b5aa 100644 --- a/src/axom/primal/tests/primal_bezier_curve.cpp +++ b/src/axom/primal/tests/primal_bezier_curve.cpp @@ -179,6 +179,43 @@ TEST(primal_beziercurve_, tangent) } } +//------------------------------------------------------------------------------ +TEST(primal_beziercurve_, second_derivative) +{ + SLIC_INFO("Testing Bezier second derivative calculation"); + + const int DIM = 3; + using CoordType = double; + using PointType = primal::Point; + using VectorType = primal::Vector; + using BezierCurveType = primal::BezierCurve; + + const int order = 3; + PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, + PointType {1.3, 1.6, 1.8}, + PointType {2.9, 2.4, 2.3}, + PointType {3.2, 3.5, 3.0}}; + + BezierCurveType b2Curve(data, order); + + VectorType midtval = VectorType {-1.2, 2.1, -0.3}; + VectorType starttval = VectorType {5.4, 2.4, -1.8}; + VectorType endtval = VectorType {-7.8, 1.8, 1.2}; + + // Evaluate the curve at several parameter values + // Curve should be tangent to control net at endpoints + VectorType eval0 = b2Curve.dtdt(0.0); + VectorType eval1 = b2Curve.dtdt(1.0); + VectorType evalMid = b2Curve.dtdt(0.5); + + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(starttval[i], eval0[i], 1e-14); + EXPECT_NEAR(endtval[i], eval1[i], 1e-14); + EXPECT_NEAR(midtval[i], evalMid[i], 1e-14); + } +} + //------------------------------------------------------------------------------ TEST(primal_beziercurve, split_cubic) { diff --git a/src/axom/primal/tests/primal_bezier_patch.cpp b/src/axom/primal/tests/primal_bezier_patch.cpp index e7bcebd46d..02140d04d8 100644 --- a/src/axom/primal/tests/primal_bezier_patch.cpp +++ b/src/axom/primal/tests/primal_bezier_patch.cpp @@ -596,6 +596,93 @@ TEST(primal_bezierpatch, normal) } } +//------------------------------------------------------------------------------ +TEST(primal_bezierpatch, second_derivative) +{ + SLIC_INFO("Testing bezier Patch normal calculation"); + + const int DIM = 3; + using CoordType = double; + using PointType = primal::Point; + using VectorType = primal::Vector; + using BezierPatchType = primal::BezierPatch; + + const int order_u = 3; + const int order_v = 4; + + // clang-format off + PointType controlPoints[(order_u + 1) * (order_v + 1)] = { + PointType {0, 0, 0}, PointType{0, 4, 0}, PointType{0, 8, -3}, PointType{0, 12, 1}, PointType{0, 16, 3}, + PointType {2, 0, 6}, PointType{2, 4, 5}, PointType{2, 8, 0}, PointType{4, 12, 2}, PointType{2, 16, 2}, + PointType {4, 0, 0}, PointType{4, 4, 5}, PointType{4, 8, 3}, PointType{2, 12, 3}, PointType{4, 16, 1}, + PointType {6, 0, 0}, PointType{6, 4, -3}, PointType{6, 8, 0}, PointType{6, 12, 2}, PointType{6, 16, 0}}; + + double weights[(order_u + 1) * (order_v + 1)] = { + 1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 2.0, 3.0, 2.0, 1.0, + 1.0, 2.0, 3.0, 2.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 1.0}; + // clang-format on + + BezierPatchType bPatch(controlPoints, weights, order_u, order_v); + + auto evaluate_test = bPatch.evaluate(0.5, 0.4); + PointType evaluate_exp = {3.0, 6.85038038884, 2.35777683855}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(evaluate_test[i], evaluate_exp[i], 1e-6); + } + + auto partial_u_test = bPatch.du(0.6, 0.4); + VectorType partial_u_exp = {3.78171724599, -0.19774668801, -0.370827644202}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(partial_u_test[i], partial_u_exp[i], 1e-6); + } + + auto partial_v_test = bPatch.dv(0.6, 0.4); + VectorType partial_v_exp = {-0.354910197356, 11.8772494643, -1.594127454970}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(partial_v_test[i], partial_v_exp[i], 1e-6); + } + + auto partial_uu_test = bPatch.dudu(0.6, 0.4); + VectorType partial_uu_exp = {3.20670028604, -2.12957447484, -16.1167567473}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(partial_uu_test[i], partial_uu_exp[i], 1e-6); + } + + auto partial_vv_test = bPatch.dvdv(0.6, 0.4); + VectorType partial_vv_exp = {0.479553359805, -8.63831027883, 1.13497887975}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(partial_vv_test[i], partial_vv_exp[i], 1e-6); + } + + BezierPatchType bPatch_nonrational(bPatch); + bPatch_nonrational.makeNonrational(); + bPatch_nonrational.makeRational(); + std::cout << bPatch_nonrational.getWeight(2, 3) << std::endl; + + auto partial_uv_test = bPatch.dudv(0.6, 0.4); + VectorType partial_uv_exp = {-3.43768298544, 1.94078069698, 8.48995274462}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(partial_uv_test[i], partial_uv_exp[i], 1e-6); + } + + auto partial_uv_test_nonrational = bPatch_nonrational.dudv(0.6, 0.4); + VectorType partial_uv_exp_nonrational = {-2.36544, 0, 11.80416}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(partial_uv_test_nonrational[i], + partial_uv_exp_nonrational[i], + 1e-6); + } +} + //------------------------------------------------------------------------------ TEST(primal_bezierpatch, split_degenerate) { diff --git a/src/axom/primal/tests/primal_rational_bezier.cpp b/src/axom/primal/tests/primal_rational_bezier.cpp index 2f9ea7a711..1f106dec2d 100644 --- a/src/axom/primal/tests/primal_rational_bezier.cpp +++ b/src/axom/primal/tests/primal_rational_bezier.cpp @@ -146,6 +146,44 @@ TEST(primal_rationalbezier, tangent) } } +//------------------------------------------------------------------------------ +TEST(primal_rationalbezier, second_derivative) +{ + SLIC_INFO("Testing Rational Bezier second derivative calculation"); + + const int DIM = 3; + using CoordType = double; + using PointType = primal::Point; + using VectorType = primal::Vector; + using BezierCurveType = primal::BezierCurve; + + const int order = 3; + PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, + PointType {1.3, 1.6, 1.8}, + PointType {2.9, 2.4, 2.3}, + PointType {3.2, 3.5, 3.0}}; + + double weights[order + 1] = {1, 2, 3, 4}; + + BezierCurveType b2Curve(data, weights, order); + + VectorType starttval = VectorType {-0.6, -2.4, -24.6}; + VectorType midtval = VectorType {-3.8448, 0.3456, -0.888}; + VectorType endtval = VectorType {-4.0125, 0.4875, 0.3375}; + + // Evaluate the curve at several parameter values + VectorType eval0 = b2Curve.dtdt(0.0); + VectorType evalMid = b2Curve.dtdt(0.5); + VectorType eval1 = b2Curve.dtdt(1.0); + + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(starttval[i], eval0[i], 1e-14); + EXPECT_NEAR(endtval[i], eval1[i], 1e-14); + EXPECT_NEAR(midtval[i], evalMid[i], 1e-14); + } +} + //------------------------------------------------------------------------------ TEST(primal_rationalbezier, split_cubic) { From cfcbaafa229ee535ce70993cc14ebbc2df814edf Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 09:57:41 -0700 Subject: [PATCH 012/639] Add method to compute tangents at corners --- src/axom/primal/geometry/BezierPatch.hpp | 88 ++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index dee832f444..e9cf9114df 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -1077,6 +1077,94 @@ class BezierPatch p0.split_v(v, p2, p4); } + /*! + * \brief Finds two unit tangent vectors at a corner geometrically + * + * \param [in] u parameter value of the corner (should be 0 or 1) + * \param [in] v parameter value of the corner (should be 0 or 1) + * \param [out] V1 First unit tangent vector + * \param [out] V2 Second unit tangent vector + * \param [in] edge_tol Physical distance at which nodes are indistinguishable + * \param [in] EPS Numerical tolerance to identify S(u, v) as a corner + */ + template + void corner_tangent_vectors(double u, + double v, + Vector& V1, + Vector& V2, + double edge_tol = 1e-8, + double EPS = 0) const + { + const int ord_u = getOrder_u(); + const int ord_v = getOrder_v(); + + double edge_tol_sq = edge_tol * edge_tol; + + V1 = Vector(); + V2 = Vector(); + + // Just kidding. We're doing the clever thing now. + // Add the bounding vertices to this list counterclockwise + axom::Array> point_list; + for(int p = 0; p < ord_u; ++p) + { + point_list.push_back(m_controlPoints(p, 0)); + } + for(int q = 0; q < ord_v; ++q) + { + point_list.push_back(m_controlPoints(ord_u, q)); + } + for(int p = ord_u; p > 0; --p) + { + point_list.push_back(m_controlPoints(p, ord_v)); + } + for(int q = ord_v; q > 0; --q) + { + point_list.push_back(m_controlPoints(0, q)); + } + + const int num_points = point_list.size(); + int start_idx; + if(u < EPS && v < EPS) + start_idx = 0; + else if(u > 1 - EPS && v < EPS) + start_idx = ord_u; + else if(u > 1 - EPS && v > 1 - EPS) + start_idx = ord_u + ord_v; + else if(u < EPS && v > 1 - EPS) + start_idx = 2 * ord_u + ord_v; + else + return; // Point is not a corner + + // Loop over points counterclockwise + for(int i = 0; i < num_points; ++i) + { + if(squared_distance(point_list[start_idx], + point_list[(start_idx + i) % num_points]) > edge_tol_sq) + { + V1 = Vector(point_list[start_idx], + point_list[(start_idx + i) % num_points]) + .unitVector(); + break; + } + } + + // Loop over points clockwise + for(int i = 0; i < num_points; ++i) + { + if(squared_distance( + point_list[start_idx], + point_list[(start_idx - i + num_points) % num_points]) > edge_tol_sq) + { + V2 = + Vector(point_list[start_idx], + point_list[(start_idx - i + num_points) % num_points]) + .unitVector(); + break; + } + } + } + /*! * \brief Predicate to check if the Bezier patch is approximately planar * From bead2f508983bd939fe8b0328fbc21362ed86fa1 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 10:08:56 -0700 Subject: [PATCH 013/639] Add crude Newton method projection --- .../operators/detail/winding_number_impl.hpp | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 825a8b611a..4201ce72c6 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -491,6 +491,64 @@ double stokes_winding_number_adaptive(const Point& query, } #endif +/*! + * \brief Find the point on a BezierPatch closest to a point close to the surface + * + * \param [in] p The query point to test + * \param [in] bPatch The BezierPatch object + * \param [out] min_u The u-coordinate of the closest point + * \param [out] min_v The v-coordinate of the closest point + * + * Apply the Newton-Raphson method to minimize the distance function. + * + * \note This is only meant to be used for `winding_number()`, + * as Newton's method is unstable for far away points. + * + * \return The closest point on the surface + */ +template +Point near_field_projection(const Point& p, + const BezierPatch& bPatch, + double& min_u, + double& min_v) +{ + double u = 5, v = 0.5; + Vector Sp, Su, Sv, Suu, Svv, Suv; + double A00, A01, A10, A11, det; + double b0, b1; + double delu, delv; + + for(int i = 0; i < 15; ++i) + { + auto surf_normal = Vector(p, bPatch.evaluate(u, v)); + + Sp = Vector(p, bPatch.evaluate(u, v)); + Su = bPatch.du(u, v); + Sv = bPatch.dv(u, v); + Suu = bPatch.dudu(u, v); + Svv = bPatch.dvdv(u, v); + Suv = bPatch.dudv(u, v); + + A00 = Sp.dot(Suu) + Su.dot(Su); + A10 = A01 = Sp.dot(Suv) + Su.dot(Sv); + A11 = Sp.dot(Svv) + Sv.dot(Sv); + det = (A00 * A11 - A01 * A10); + + b0 = -Sp.dot(Su); + b1 = -Sp.dot(Sv); + + delu = (A11 * b0 - A01 * b1) / det; + delv = (-A10 * b0 + A00 * b1) / det; + + u = axom::utilities::clampVal(u + delu, 0.0, 1.0); + v = axom::utilities::clampVal(v + delv, 0.0, 1.0); + } + + min_u = u; + min_v = v; + + return evaluate(u, v); +} } // end namespace detail } // end namespace primal } // end namespace axom From 15898733325237b53988cdc522e0959eee35863e Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 10:59:59 -0700 Subject: [PATCH 014/639] Major improvement to wn algorithm --- src/axom/primal/operators/winding_number.hpp | 220 ++++++++++--------- 1 file changed, 120 insertions(+), 100 deletions(-) diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index 2b8670dc96..b593200a78 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -455,7 +455,7 @@ int winding_number(const Point& query, #ifdef AXOM_USE_MFEM /*! - * \brief Computes the solid angle winding number for a Bezier patch + * \brief Computes the solid angle winding number for a 3D Bezier patch * * \param [in] query The query point to test * \param [in] bPatch The Bezier patch object @@ -468,6 +468,7 @@ int winding_number(const Point& query, * * \note Warning: This algorithm is only tested to high accuracy for queries within * 1e-5 of the surface. Otherwise, it will return less accurate results. + * \note CURRENTLY ASSUMES THE SURFACE IS VALID! PROJECTION MAY NOT WORK OTHERWISE! * * \return double The generalized winding number. */ @@ -500,79 +501,17 @@ double winding_number(const Point& query, PRIMAL_TINY); } - // Use a specific kind of recursion if we are within tol of an endpoint. - // Split the surface closer to the corner, assume smallest patch is polygonal, - // and set a new edge_tol so corners of the new patch aren't marked as coincident - constexpr double edge_offset = 0.01; - if(squared_distance(query, bPatch(0, 0)) <= edge_tol_sq) - { - BezierPatch p1, p2, p3, p4; - bPatch.split(0.0 + edge_offset, 0.0 + edge_offset, p1, p2, p3, p4); - double new_edge_tol = 0.5 * - sqrt(axom::utilities::min( - squared_distance(query, bPatch.evaluate(0.0, 0.0 + edge_offset)), - squared_distance(query, bPatch.evaluate(0.0 + edge_offset, 0.0)))); - new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - - return winding_number(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); - } - if(squared_distance(query, bPatch(ord_u, 0)) <= edge_tol_sq) - { - BezierPatch p1, p2, p3, p4; - bPatch.split(1.0 - edge_offset, 0.0 + edge_offset, p1, p2, p3, p4); - double new_edge_tol = 0.5 * - sqrt(axom::utilities::min( - squared_distance(query, bPatch.evaluate(1.0, 0.0 + edge_offset)), - squared_distance(query, bPatch.evaluate(1.0 - edge_offset, 0.0)))); - new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - - return winding_number(query, p1, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); - } - if(squared_distance(query, bPatch(0, ord_v)) <= edge_tol_sq) - { - BezierPatch p1, p2, p3, p4; - bPatch.split(0.0 + edge_offset, 1.0 - edge_offset, p1, p2, p3, p4); - double new_edge_tol = 0.5 * - sqrt(axom::utilities::min( - squared_distance(query, bPatch.evaluate(0.0 + edge_offset, 1.0)), - squared_distance(query, bPatch.evaluate(0.0, 1.0 - edge_offset)))); - new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - - return winding_number(query, p1, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); - } - if(squared_distance(query, bPatch(ord_u, ord_v)) <= edge_tol_sq) - { - BezierPatch p1, p2, p3, p4; - bPatch.split(1.0 - edge_offset, 1.0 - edge_offset, p1, p2, p3, p4); - double new_edge_tol = 0.5 * - sqrt(axom::utilities::min( - squared_distance(query, bPatch.evaluate(1.0, 1.0 - edge_offset)), - squared_distance(query, bPatch.evaluate(1.0 - edge_offset, 1.0)))); - new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - - return winding_number(query, p1, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p3, new_edge_tol, quad_tol, EPS, depth + 1); - } - /* - * To use Stokes theorem, we need to identify a separating plane between - * `query` and the surface, guaranteed through a bounding box. - * If it does, need to do geometric refinement: Splitting and rotating the curve - * until we can guarantee this. + * To use Stokes theorem, we need to either identify a separating plane between + * the query and the surface (dodge), or a ray that intersects the + * surface at only a single point (pierce). */ CurvedPolygon boundingPoly(4); - - // Define vector fields whose curl gives us the winding number + double wn = 0; detail::SingularityAxis field_direction; - // Check an axis-aligned bounding box (most surfaces satisfy this condition) + // Check if we dodge an axis-aligned bounding box, + // since most surfaces satisfy this condition. BoundingBox bBox(bPatch.boundingBox().expand(edge_tol)); const bool exterior_x = bBox.getMin()[0] > query[0] || query[0] > bBox.getMax()[0]; @@ -595,22 +534,9 @@ double winding_number(const Point& query, } else { - // Next, create an oriented box with axes defined by the patch - // If we are interior to the oriented bounding box, then we - // cannot guarantee a separating plane, and need geometric refinement. - OrientedBoundingBox oBox(bPatch.orientedBoundingBox().expand(edge_tol)); - if(oBox.contains(query)) - { - BezierPatch p1, p2, p3, p4; - bPatch.split(0.5, 0.5, p1, p2, p3, p4); - return winding_number(query, p1, edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p2, edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p3, edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p4, edge_tol, quad_tol, EPS, depth + 1); - } - - // Otherwise, we can apply a rotation to a z-aligned field. + // Otherwise, we can apply a rotation until we fit a z-aligned field. field_direction = detail::SingularityAxis::rotated; + numerics::Matrix rotator; // Lambda to generate a 3D rotation matrix from an angle and axis // Formulation from https://en.wikipedia.org/wiki/Rotation_matrix#Axis_and_angle @@ -647,24 +573,119 @@ double winding_number(const Point& query, {rotated[0] + query[0], rotated[1] + query[1], rotated[2] + query[2]}); }; - // Find vector from query to the bounding box - Point closest = closest_point(query, oBox); - Vector v0 = Vector(query, closest).unitVector(); + // Next, check the oriented bounding box defined by the patch's control points + // If we are exterior to it, then we can guarantee a separating plane. + // Note: The ideal check would be against the convex hull of the control points + OrientedBoundingBox oBox(bPatch.orientedBoundingBox().expand(edge_tol)); + if(oBox.contains(query)) + { + Vector cast_ray, closest_vector; + + // Need to do projection to find an axis that pierces the surface ONLY once + double min_u, min_v; + Point closest_point = + detail::near_field_projection(query, bPatch, min_u, min_v); + + int on_boundary = + (min_u < EPS) + (min_u > 1 - EPS) + (min_v < EPS) + (min_v > 1 - EPS); - // Find the direction of a ray perpendicular to that - Vector v1; - if(axom::utilities::isNearlyEqual(v0[0], v0[1], EPS)) - v1 = Vector({v0[2], v0[2], -v0[0] - v0[1]}).unitVector(); + // Cast a ray that is normal to the surface at the closest point + cast_ray = bPatch.normal(min_u, min_v).unitVector(); + + closest_vector = Vector(query, closest_point); + double min_dist = closest_vector.squared_norm(); + closest_vector = closest_vector.unitVector(); + + // If the query is on the surface, then we don't need to do any adjustment, + // as the induced discontinuity in the integrand is removable + if(min_dist < edge_tol * edge_tol) + { + wn = 0.0; + } + // Otherwise, we need to adjust for the contribution of a small removed + // disk around the ray we cast. + else + { + // If the closest point isn't on a boundary, the disk is totally interior + if(!on_boundary) + { + wn = 0.5; + } + // If the closest point is on a boundary, then the cast ray may + // or may not intersect the surface + else + { + // If the ray does not intersect, do nothing. + if(!axom::utilities::isNearlyEqual( + Vector::cross_product(closest_vector, cast_ray).squared_norm(), + 0.0, + EPS)) + { + wn = 0.0; + } + // If it does, then the contribution of the disk depends on + // the angle subtended by the tangent vectors + else + { + // Angle subtended by the line is exactly pi + if(on_boundary == 1) + { + wn = 0.25; + } + // Need to compute the angle subtended at corners + else + { + Vector V1, V2; + bPatch.corner_tangent_vectors(min_u, min_v, V1, V2, edge_tol, EPS); + + wn = 0.25 * + acos(axom::utilities::clampVal(V1.dot(V2), -1.0, 1.0)) / M_PI; + } + } + } + + // Need to change the sign of the disk's contribution + // depending on the orientation. + wn *= (closest_vector.dot(cast_ray) > 0) ? 1.0 : -1.0; + } + + // Rotate the surface so that the cast ray is oriented with k_hat + Vector axis = {cast_ray[1], -cast_ray[0], 0.0}; + double ang = acos(axom::utilities::clampVal(cast_ray[2], -1.0, 1.0)); + + rotator = angleAxisRotMatrix(ang, axis); + } else - v1 = Vector({-v0[1] - v0[2], v0[0], v0[0]}).unitVector(); + { + // Get a vector perpendicular to the normal of the separating plane + Vector axis, sn(query, closest_point(query, oBox)); + sn = sn.unitVector(); + + if(axom::utilities::isNearlyEqual(sn[0], sn[1], EPS)) + axis = Vector({sn[2], sn[2], -sn[0] - sn[1]}).unitVector(); + else + axis = Vector({-sn[1] - sn[2], sn[0], sn[0]}).unitVector(); - // Rotate v0 around v1 until it is perpendicular to the plane spanned by k and v1 - double ang = (v0[2] < 0 ? 1.0 : -1.0) * - acos(axom::utilities::clampVal( - -(v0[0] * v1[1] - v0[1] * v1[0]) / sqrt(v1[0] * v1[0] + v1[1] * v1[1]), - -1.0, - 1.0)); - auto rotator = angleAxisRotMatrix(ang, v1); + // We will rotate sn around axis until it is + // perpendicular to the plane spanned by k_hat and the axis + double ang, xy_norm = axis[0] * axis[0] + axis[1] * axis[1]; + + // Only need to avoid an exact divide by zero + if(axom::utilities::isNearlyEqual(xy_norm, 0.0, PRIMAL_TINY)) + { + ang = 0.0; + } + else + { + ang = (sn[2] < 0 ? 1.0 : -1.0) * + acos(axom::utilities::clampVal( + -(sn[0] * axis[1] - sn[1] * axis[0]) / sqrt(xy_norm), + -1.0, + 1.0)); + } + + rotator = angleAxisRotMatrix(ang, axis); + } // Collect rotated curves into the curved Polygon // Set up the (0, v) and (1, v) isocurves, rotated @@ -722,7 +743,6 @@ double winding_number(const Point& query, } // Iterate over the edges of the bounding curved polygon, add up the results - double wn = 0; for(int n = 0; n < 4; ++n) { wn += detail::stokes_winding_number(query, From 8b653d6130aec87308bb5572d3d5bcb3fb8c79a3 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 11:01:12 -0700 Subject: [PATCH 015/639] More rigorous test for new algorithm --- src/axom/primal/tests/primal_solid_angle.cpp | 87 ++++++++++++-------- 1 file changed, 54 insertions(+), 33 deletions(-) diff --git a/src/axom/primal/tests/primal_solid_angle.cpp b/src/axom/primal/tests/primal_solid_angle.cpp index 041bb1dc9a..a166e54d1d 100644 --- a/src/axom/primal/tests/primal_solid_angle.cpp +++ b/src/axom/primal/tests/primal_solid_angle.cpp @@ -617,85 +617,106 @@ TEST(primal_solid_angle, bezierpatch_sphere) } } - // Iterate over points of interest, i.e. axis/edge/vertex aligned - Vector3D query_directions[12] = {Vector3D({0.0, 0.0, 1.0}).unitVector(), - Vector3D({0.0, 1.0, 0.0}).unitVector(), - Vector3D({1.0, 0.0, 0.0}).unitVector(), - Vector3D({0.0, 1.0, 1.0}).unitVector(), - Vector3D({1.0, 0.0, 1.0}).unitVector(), - Vector3D({1.0, 1.0, 0.0}).unitVector(), - Vector3D({1.0, 1.0, 1.0}).unitVector(), - Vector3D({0.0, 0.1, 1.0}).unitVector(), - Vector3D({0.1, 1.0, 0.0}).unitVector(), - Vector3D({1.0, 0.0, 0.1}).unitVector(), - Vector3D(sphere_faces[0].evaluate(0, 0.6)), - Vector3D(sphere_faces[0].evaluate(0.6, 0))}; - - const double quad_tol = 1e-5; - const double EPS = 1e-10; + // Split each surface into valid subsurfaces + axom::Array valid_subsurfaces; + for(int n = 0; n < 6; ++n) + { + split_to_valid(sphere_faces[n], valid_subsurfaces); + } + const int num_subsurfaces = valid_subsurfaces.size(); + + // Iterate over points of interest, i.e. close to a boundary. + // Specifically need to exercise the projection steps + Vector3D query_directions[11] = { + Vector3D(valid_subsurfaces[3].evaluate(0.50, 0.50)), // 0 + Vector3D(valid_subsurfaces[3].evaluate(0.99, 0.95)), // 1 + Vector3D(valid_subsurfaces[3].evaluate(0.999, 0.995)), // 2 + Vector3D(valid_subsurfaces[3].evaluate(0.9999, 0.9995)), // 3 + Vector3D(valid_subsurfaces[3].evaluate(0.99999, 0.99995)), // 4 + Vector3D(valid_subsurfaces[3].evaluate(1.0, 0.9999)), // 5 + Vector3D(valid_subsurfaces[3].evaluate(0.9999, 1.0)), // 6 + Vector3D(valid_subsurfaces[3].evaluate(1.0, 1.0)), // 7 + Vector3D(valid_subsurfaces[3].evaluate(-.99, 0.95)), // 8 + Vector3D(valid_subsurfaces[3].evaluate(0.99, -.95)), // 9 + Vector3D(valid_subsurfaces[3].evaluate(-.99, -.95))}; // 10 const double edge_tol = 1e-6; const double edge_offset = 1e-5; + const double quad_tol = 1e-5; + const double EPS = 1e-10; + // Test some easy cases auto origin = Point3D({0.0, 0.0, 0.0}); auto near_origin = Point3D({0.1, -0.2, 0.15}); double origin_wn = 0.0, near_origin_wn = 0.0; - for(int k = 0; k < 6; ++k) + for(int k = 0; k < num_subsurfaces; ++k) { - origin_wn += winding_number(origin, sphere_faces[k], edge_tol, quad_tol, EPS); + origin_wn += + winding_number(origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); near_origin_wn += - winding_number(near_origin, sphere_faces[k], edge_tol, quad_tol, EPS); + winding_number(near_origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(origin_wn, 1.0, 6 * quad_tol); - EXPECT_NEAR(near_origin_wn, 1.0, 6 * quad_tol); + EXPECT_NEAR(origin_wn, 1.0, num_subsurfaces * quad_tol); + EXPECT_NEAR(near_origin_wn, 1.0, num_subsurfaces * quad_tol); - for(int i = 0; i < 12; ++i) + for(int i = 0; i < 11; ++i) { // Pick point close to the surface auto far_query = Point3D(10 * query_directions[i].array()); double far_wn = 0.0; - for(int k = 0; k < 6; ++k) + for(int k = 0; k < num_subsurfaces; ++k) { far_wn += - winding_number(far_query, sphere_faces[k], edge_tol, quad_tol, EPS); + winding_number(far_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(far_wn, 0.0, 6 * quad_tol); + EXPECT_NEAR(far_wn, 0.0, num_subsurfaces * quad_tol); } // Iterate over difficult query directions for very close points - for(int i = 0; i < 12; ++i) + for(int i = 0; i < 11; ++i) { + std::cout << i << std::endl; // Pick point close to the surface auto inner_query = Point3D((1.0 - edge_offset) * query_directions[i].array()); auto outer_query = Point3D((1.0 + edge_offset) * query_directions[i].array()); // Iterate over the patches that compose the sphere double inner_wn = 0; - for(int k = 0; k < 6; ++k) + for(int k = 0; k < num_subsurfaces; ++k) { inner_wn += - winding_number(inner_query, sphere_faces[k], edge_tol, quad_tol, EPS); + winding_number(inner_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(inner_wn, 1.0, 6 * quad_tol); + EXPECT_NEAR(inner_wn, 1.0, num_subsurfaces * quad_tol); // Iterate over the patches that compose the sphere double outer_wn = 0; - for(int k = 0; k < 6; ++k) + for(int k = 0; k < num_subsurfaces; ++k) { outer_wn += - winding_number(outer_query, sphere_faces[k], edge_tol, quad_tol, EPS); + winding_number(outer_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(outer_wn, 0.0, 6 * quad_tol); + EXPECT_NEAR(outer_wn, 0.0, num_subsurfaces * quad_tol); // Pick a point on the surface too. // Regardless of what tolerances are picked, the winding number // should lie between the values on either side when rounded auto coincident_query = Point3D(query_directions[i].array()); double coincident_wn = 0.0; - for(int k = 0; k < 6; ++k) + for(int k = 0; k < valid_subsurfaces.size(); ++k) + { + coincident_wn += winding_number(coincident_query, + valid_subsurfaces[k], + edge_tol, + quad_tol, + EPS); + } + EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); + } +} { coincident_wn += winding_number(coincident_query, sphere_faces[k], edge_tol, quad_tol, EPS); From 23dc7d5c30e00b0feb257a5be75511c47d96ea88 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 4 Aug 2023 14:30:10 -0700 Subject: [PATCH 016/639] Simpler interface for corner tangents --- src/axom/primal/geometry/BezierPatch.hpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index e9cf9114df..e01b9201da 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -1088,8 +1088,7 @@ class BezierPatch * \param [in] EPS Numerical tolerance to identify S(u, v) as a corner */ template - void corner_tangent_vectors(double u, - double v, + void corner_tangent_vectors(Point& p, Vector& V1, Vector& V2, double edge_tol = 1e-8, @@ -1125,13 +1124,13 @@ class BezierPatch const int num_points = point_list.size(); int start_idx; - if(u < EPS && v < EPS) + if(squared_distance(p, m_controlPoints(0, 0)) < edge_tol_sq) start_idx = 0; - else if(u > 1 - EPS && v < EPS) + else if(squared_distance(p, m_controlPoints(ord_u, 0)) < edge_tol_sq) start_idx = ord_u; - else if(u > 1 - EPS && v > 1 - EPS) + else if(squared_distance(p, m_controlPoints(ord_u, ord_v)) < edge_tol_sq) start_idx = ord_u + ord_v; - else if(u < EPS && v > 1 - EPS) + else if(squared_distance(p, m_controlPoints(0, ord_v)) < edge_tol_sq) start_idx = 2 * ord_u + ord_v; else return; // Point is not a corner From b2a10cab1f4d302a01e181801de78657514b7087 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 4 Aug 2023 14:34:07 -0700 Subject: [PATCH 017/639] Improve algorithm, ignore boundaries --- .../operators/detail/winding_number_impl.hpp | 2 +- src/axom/primal/operators/winding_number.hpp | 98 ++++++++++++------- 2 files changed, 62 insertions(+), 38 deletions(-) diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 4201ce72c6..9811841d02 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -462,7 +462,7 @@ double stokes_winding_number_adaptive(const Point& query, } } - constexpr int MAX_DEPTH = 12; + constexpr int MAX_DEPTH = 25; if(depth >= MAX_DEPTH || axom::utilities::isNearlyEqualRelative(quad_fine[0] + quad_fine[1], quad_coarse, diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index b593200a78..5204fe52a2 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -487,7 +487,7 @@ double winding_number(const Point& query, // Fix the number of quadrature nodes arbitrarily, but high enough // to `catch` near singularities for refinement - constexpr int quad_npts = 30; + constexpr int quad_npts = 50; // Early return if the patch is approximately polygonal. // Very slight variations in curvature requires small EPS tolerance @@ -579,12 +579,13 @@ double winding_number(const Point& query, OrientedBoundingBox oBox(bPatch.orientedBoundingBox().expand(edge_tol)); if(oBox.contains(query)) { - Vector cast_ray, closest_vector; + Vector cast_ray, closest_normal, closest_vector; // Need to do projection to find an axis that pierces the surface ONLY once + // and does so at an interior point double min_u, min_v; - Point closest_point = - detail::near_field_projection(query, bPatch, min_u, min_v); + detail::near_field_projection(query, bPatch, min_u, min_v, edge_tol, EPS); + Point closest_point = bPatch.evaluate(min_u, min_v); int on_boundary = (min_u < EPS) + (min_u > 1 - EPS) + (min_v < EPS) + (min_v > 1 - EPS); @@ -593,55 +594,71 @@ double winding_number(const Point& query, cast_ray = bPatch.normal(min_u, min_v).unitVector(); closest_vector = Vector(query, closest_point); - double min_dist = closest_vector.squared_norm(); - closest_vector = closest_vector.unitVector(); + int on_boundary = (min_u < EPS) || (min_u > 1 - EPS) || (min_v < EPS) || + (min_v > 1 - EPS); + + // Compute the normal to the surface at the closest point + closest_normal = bPatch.normal(min_u, min_v); + + // Need to do extra adjustments if we don't have a defined normal + if(axom::utilities::isNearlyEqual(closest_normal.squared_norm(), + 0.0, + PRIMAL_TINY)) + { + Vector T1, T2; + bPatch.corner_tangent_vectors(closest_point, T1, T2, edge_tol, EPS); + if(T1.squared_norm() == 0) + printf("Could not find a normal vector at this corner!\n"); + closest_normal = Vector::cross_product(T1, T2); + } + closest_normal = closest_normal.unitVector(); // If the query is on the surface, then we don't need to do any adjustment, // as the induced discontinuity in the integrand is removable - if(min_dist < edge_tol * edge_tol) + if(closest_vector.squared_norm() < edge_tol * edge_tol) { + cast_ray = closest_normal; wn = 0.0; } // Otherwise, we need to adjust for the contribution of a small removed // disk around the ray we cast. else { - // If the closest point isn't on a boundary, the disk is totally interior - if(!on_boundary) - { - wn = 0.5; - } - // If the closest point is on a boundary, then the cast ray may - // or may not intersect the surface - else + // Check orientation relative to the surface + bool exterior = closest_vector.dot(closest_normal) < 0; + + // If we're exterior, then we can definitely define a separating + // plane defined by closest_normal + if(exterior) { - // If the ray does not intersect, do nothing. - if(!axom::utilities::isNearlyEqual( - Vector::cross_product(closest_vector, cast_ray).squared_norm(), - 0.0, + // Get a perpendicular vector to closest_normal. + // Can possibly pick this one more cleverly. + if(axom::utilities::isNearlyEqual(closest_normal[0], + closest_normal[1], EPS)) - { - wn = 0.0; - } - // If it does, then the contribution of the disk depends on - // the angle subtended by the tangent vectors + cast_ray = Vector({closest_normal[2], + closest_normal[2], + -closest_normal[0] - closest_normal[1]}) + .unitVector(); else - { - // Angle subtended by the line is exactly pi - if(on_boundary == 1) - { - wn = 0.25; + cast_ray = Vector({-closest_normal[1] - closest_normal[2], + closest_normal[0], + closest_normal[0]}) + .unitVector(); } - // Need to compute the angle subtended at corners + // If we're interior, we can safely pierce the surface, making + // sure not to hit a boundary. else { - Vector V1, V2; - bPatch.corner_tangent_vectors(min_u, min_v, V1, V2, edge_tol, EPS); - - wn = 0.25 * - acos(axom::utilities::clampVal(V1.dot(V2), -1.0, 1.0)) / M_PI; - } - } + // This tolerance is arbitrary. A smaller value might be needed + double edge_offset = 0.01; + cast_ray = Vector( + query, + bPatch.evaluate( + axom::utilities::clampVal(min_u, edge_offset, 1 - edge_offset), + axom::utilities::clampVal(min_v, edge_offset, 1 - edge_offset))); + cast_ray = cast_ray.unitVector(); + wn = 0.5; } // Need to change the sign of the disk's contribution @@ -745,6 +762,13 @@ double winding_number(const Point& query, // Iterate over the edges of the bounding curved polygon, add up the results for(int n = 0; n < 4; ++n) { + // If the bounding polygon has zero length, skip it + if(squared_distance(boundingPoly[n].evaluate(0), + boundingPoly[n].evaluate(1)) < edge_tol_sq) + { + continue; + } + wn += detail::stokes_winding_number(query, boundingPoly[n], field_direction, From 1acafe6bee93739450e68e905d712f02c8c35d4c Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 4 Aug 2023 14:35:21 -0700 Subject: [PATCH 018/639] Improve Newton's method --- .../operators/detail/winding_number_impl.hpp | 63 +++++++++++++++---- 1 file changed, 51 insertions(+), 12 deletions(-) diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 9811841d02..4b4a3171ab 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -507,41 +507,80 @@ double stokes_winding_number_adaptive(const Point& query, * \return The closest point on the surface */ template -Point near_field_projection(const Point& p, +bool near_field_projection(const Point& p, const BezierPatch& bPatch, double& min_u, - double& min_v) + double& min_v, + double edge_tol = 1e-8, + double EPS = 1e-8) { - double u = 5, v = 0.5; + min_u = 0.5; + min_v = 0.5; Vector Sp, Su, Sv, Suu, Svv, Suv; double A00, A01, A10, A11, det; double b0, b1; double delu, delv; + // TODO: Compute Sp, Su, Sv, Suu, Svv, Suv MUCH more efficiently + // by using the same intermediates from de Casteljau for(int i = 0; i < 15; ++i) { - auto surf_normal = Vector(p, bPatch.evaluate(u, v)); + Sp = Vector(p, bPatch.evaluate(min_u, min_v)); + if(Sp.squared_norm() < edge_tol * edge_tol) + { + return true; + } - Sp = Vector(p, bPatch.evaluate(u, v)); - Su = bPatch.du(u, v); - Sv = bPatch.dv(u, v); - Suu = bPatch.dudu(u, v); - Svv = bPatch.dvdv(u, v); - Suv = bPatch.dudv(u, v); + Su = bPatch.du(min_u, min_v); + Sv = bPatch.dv(min_u, min_v); + + if(axom::utilities::isNearlyEqual(Su.squared_norm(), 0.0, EPS) && + axom::utilities::isNearlyEqual(Sv.squared_norm(), 0.0, EPS)) + { + return true; + } + + Suu = bPatch.dudu(min_u, min_v); + Svv = bPatch.dvdv(min_u, min_v); + Suv = bPatch.dudv(min_u, min_v); A00 = Sp.dot(Suu) + Su.dot(Su); A10 = A01 = Sp.dot(Suv) + Su.dot(Sv); A11 = Sp.dot(Svv) + Sv.dot(Sv); det = (A00 * A11 - A01 * A10); + // If the iteration fails, try to fix it with + // a different initial condition + if(axom::utilities::isNearlyEqual(det, 0.0, PRIMAL_TINY)) + { + min_u = 1.0 / i; + min_v = 1.0 / (i + 1); + continue; + } + b0 = -Sp.dot(Su); b1 = -Sp.dot(Sv); delu = (A11 * b0 - A01 * b1) / det; delv = (-A10 * b0 + A00 * b1) / det; - u = axom::utilities::clampVal(u + delu, 0.0, 1.0); - v = axom::utilities::clampVal(v + delv, 0.0, 1.0); + min_u = axom::utilities::clampVal(min_u + delu, 0.0, 1.0); + min_v = axom::utilities::clampVal(min_v + delv, 0.0, 1.0); + } + + if((axom::utilities::isNearlyEqual(bPatch.du(min_u, min_v).squared_norm(), + 0.0, + EPS) && + axom::utilities::isNearlyEqual(bPatch.dv(min_u, min_v).squared_norm(), + 0.0, + EPS)) || + Vector(p, bPatch.evaluate(min_u, min_v)).squared_norm() < + edge_tol * edge_tol) + { + return true; + } + + return false; } min_u = u; From 48baba9a99f926994aafa16fb5cc1e2d4301cbb2 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 4 Aug 2023 14:36:12 -0700 Subject: [PATCH 019/639] Add an alternate, degenerate sphere --- src/axom/primal/tests/primal_solid_angle.cpp | 186 +++++++++++++++++-- 1 file changed, 170 insertions(+), 16 deletions(-) diff --git a/src/axom/primal/tests/primal_solid_angle.cpp b/src/axom/primal/tests/primal_solid_angle.cpp index a166e54d1d..d78fcfd166 100644 --- a/src/axom/primal/tests/primal_solid_angle.cpp +++ b/src/axom/primal/tests/primal_solid_angle.cpp @@ -626,19 +626,20 @@ TEST(primal_solid_angle, bezierpatch_sphere) const int num_subsurfaces = valid_subsurfaces.size(); // Iterate over points of interest, i.e. close to a boundary. - // Specifically need to exercise the projection steps + // Specifically need to exercise the ray casting steps + const int idx = 3; // Select a difficult face Vector3D query_directions[11] = { - Vector3D(valid_subsurfaces[3].evaluate(0.50, 0.50)), // 0 - Vector3D(valid_subsurfaces[3].evaluate(0.99, 0.95)), // 1 - Vector3D(valid_subsurfaces[3].evaluate(0.999, 0.995)), // 2 - Vector3D(valid_subsurfaces[3].evaluate(0.9999, 0.9995)), // 3 - Vector3D(valid_subsurfaces[3].evaluate(0.99999, 0.99995)), // 4 - Vector3D(valid_subsurfaces[3].evaluate(1.0, 0.9999)), // 5 - Vector3D(valid_subsurfaces[3].evaluate(0.9999, 1.0)), // 6 - Vector3D(valid_subsurfaces[3].evaluate(1.0, 1.0)), // 7 - Vector3D(valid_subsurfaces[3].evaluate(-.99, 0.95)), // 8 - Vector3D(valid_subsurfaces[3].evaluate(0.99, -.95)), // 9 - Vector3D(valid_subsurfaces[3].evaluate(-.99, -.95))}; // 10 + Vector3D(valid_subsurfaces[idx].evaluate(0.50, 0.50)), // 0 + Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.95)), // 1 + Vector3D(valid_subsurfaces[idx].evaluate(0.999, 0.995)), // 2 + Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 0.9995)), // 3 + Vector3D(valid_subsurfaces[idx].evaluate(0.99999, 0.99995)), // 4 + Vector3D(valid_subsurfaces[idx].evaluate(1.0, 0.9999)), // 5 + Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 1.0)), // 6 + Vector3D(valid_subsurfaces[idx].evaluate(1.0, 1.0)), // 7 + Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.95)), // 8 + Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.05)), // 9 + Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.05))}; // 10 const double edge_tol = 1e-6; const double edge_offset = 1e-5; @@ -717,12 +718,165 @@ TEST(primal_solid_angle, bezierpatch_sphere) EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); } } + +TEST(primal_solid_angle, bezierpatch_degenerate_sphere) +{ + using Point2D = primal::Point; + using Point3D = primal::Point; + using Vector3D = primal::Vector; + using BCurve = primal::BezierCurve; + using BPatch = primal::BezierPatch; + + auto rotate_curve_to_patches = [](BCurve curve, BPatch patches[]) -> void { + const int ord = curve.getOrder(); + curve.makeRational(); + + for(int n = 0; n < 4; ++n) + { + patches[n].setOrder(ord, 2); + patches[n].makeRational(); + } + + for(int p = 0; p <= ord; ++p) + { + auto node = curve[p]; + patches[0](p, 0) = Point3D {node[0], 0.0, node[1]}; + patches[0](p, 1) = Point3D {node[0], node[0], node[1]}; + patches[0](p, 2) = Point3D {0.0, node[0], node[1]}; + + patches[1](p, 0) = Point3D {0.0, node[0], node[1]}; + patches[1](p, 1) = Point3D {-node[0], node[0], node[1]}; + patches[1](p, 2) = Point3D {-node[0], 0.0, node[1]}; + + patches[2](p, 0) = Point3D {-node[0], 0.0, node[1]}; + patches[2](p, 1) = Point3D {-node[0], -node[0], node[1]}; + patches[2](p, 2) = Point3D {0.0, -node[0], node[1]}; + + patches[3](p, 0) = Point3D {0.0, -node[0], node[1]}; + patches[3](p, 1) = Point3D {node[0], -node[0], node[1]}; + patches[3](p, 2) = Point3D {node[0], 0.0, node[1]}; + + for(int n = 0; n < 4; ++n) + { + patches[n].setWeight(p, 0, curve.getWeight(p)); + patches[n].setWeight(p, 1, curve.getWeight(p) / std::sqrt(2)); + patches[n].setWeight(p, 2, curve.getWeight(p)); + } + } + }; + + // Make a sphere out of 8 degenerate Bezier Patches + + // Define rational Beziers curve along the x-z axis and rotate them + Point2D curve1_nodes[] = {Point2D {0, 1}, Point2D {1, 1}, Point2D {1, 0}}; + double curve1_weights[] = {1, 1 / std::sqrt(2), 1}; + BCurve curve1(curve1_nodes, curve1_weights, 2); + BPatch patches1[4]; + rotate_curve_to_patches(curve1, patches1); + + Point2D curve2_nodes[] = {Point2D {1, 0}, Point2D {1, -1}, Point2D {0, -1}}; + double curve2_weights[] = {1, 1 / std::sqrt(2), 1}; + BCurve curve2(curve2_nodes, curve2_weights, 2); + BPatch patches2[4]; + rotate_curve_to_patches(curve2, patches2); + + // Split each surface into valid subsurfaces + axom::Array valid_subsurfaces; + for(int n = 0; n < 4; ++n) + { + split_to_valid(patches1[n], valid_subsurfaces); + split_to_valid(patches2[n], valid_subsurfaces); + } + + const int num_subsurfaces = valid_subsurfaces.size(); + + // Iterate over points of interest, i.e. close to a boundary. + // Specifically need to exercise the ray casting steps + int idx = 6; // Select a difficult face + Vector3D query_directions[11] = { + Vector3D(valid_subsurfaces[idx].evaluate(0.50, 0.50)), // 0 + Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.95)), // 1 + Vector3D(valid_subsurfaces[idx].evaluate(0.999, 0.995)), // 2 + Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 0.9995)), // 3 + Vector3D(valid_subsurfaces[idx].evaluate(0.99999, 0.99995)), // 4 + Vector3D(valid_subsurfaces[idx].evaluate(1.0, 0.9999)), // 5 + Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 1.0)), // 6 + Vector3D(valid_subsurfaces[idx].evaluate(1.0, 1.0)), // 7 + Vector3D(valid_subsurfaces[idx].evaluate(-.99, 0.95)), // 8 + Vector3D(valid_subsurfaces[idx].evaluate(0.99, -.95)), // 9 + Vector3D(valid_subsurfaces[idx].evaluate(-.99, -.95))}; // 10 + + const double edge_tol = 1e-6; + const double edge_offset = 1e-5; + + const double quad_tol = 1e-5; + const double EPS = 1e-10; + + // Test some easy cases + auto origin = Point3D({0.0, 0.0, 0.0}); + auto near_origin = Point3D({0.1, -0.2, 0.15}); + + double origin_wn = 0.0, near_origin_wn = 0.0; + for(int k = 0; k < num_subsurfaces; ++k) + { + origin_wn += + winding_number(origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + near_origin_wn += + winding_number(near_origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + } + EXPECT_NEAR(origin_wn, 1.0, num_subsurfaces * quad_tol); + EXPECT_NEAR(near_origin_wn, 1.0, num_subsurfaces * quad_tol); + + for(int i = 0; i < 11; ++i) + { + auto far_query = Point3D(10 * query_directions[i].array()); + + double far_wn = 0.0; + for(int k = 0; k < num_subsurfaces; ++k) + { + far_wn += + winding_number(far_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); +} + EXPECT_NEAR(far_wn, 0.0, num_subsurfaces * quad_tol); + } + + // Iterate over difficult query directions for very close points + for(int i = 0; i < 11; ++i) + { + // Pick point close to the surface + auto inner_query = Point3D((1.0 - edge_offset) * query_directions[i].array()); + auto outer_query = Point3D((1.0 + edge_offset) * query_directions[i].array()); + + // Iterate over the patches that compose the sphere + double inner_wn = 0; + for(int k = 0; k < num_subsurfaces; ++k) + { + inner_wn += + winding_number(inner_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + } + EXPECT_NEAR(inner_wn, 1.0, num_subsurfaces * quad_tol); + + // Iterate over the patches that compose the sphere + double outer_wn = 0; + for(int k = 0; k < num_subsurfaces; ++k) + { + outer_wn += + winding_number(outer_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + } + EXPECT_NEAR(outer_wn, 0.0, num_subsurfaces * quad_tol); + + // Pick a point on the surface too. + auto coincident_query = Point3D(query_directions[i].array()); + double coincident_wn = 0.0; + for(int k = 0; k < valid_subsurfaces.size(); ++k) { - coincident_wn += - winding_number(coincident_query, sphere_faces[k], edge_tol, quad_tol, EPS); + coincident_wn += winding_number(coincident_query, + valid_subsurfaces[k], + edge_tol, + quad_tol, + EPS); } - EXPECT_LT(coincident_wn, 1.5); - EXPECT_LT(-0.5, coincident_wn); + EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); } } From 33ff91f45e32a2a29ffd94b50d93bd029925fd62 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Tue, 8 Aug 2023 16:17:28 -0700 Subject: [PATCH 020/639] Add more efficient second derivatives --- src/axom/primal/geometry/BezierPatch.hpp | 263 +++++++++++++++++- src/axom/primal/tests/primal_bezier_patch.cpp | 51 ++-- 2 files changed, 277 insertions(+), 37 deletions(-) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index e01b9201da..73002cbf05 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -777,6 +777,162 @@ class BezierPatch } } + void evaluate_second_derivatives(T u, + T v, + Point& evaluation, + Vector& Du, + Vector& Dv, + Vector& DuDu, + Vector& DvDv, + Vector& DuDv) const + { + using axom::utilities::lerp; + const int ord_u = getOrder_u(); + const int ord_v = getOrder_v(); + + axom::Array dCmat(ord_u + 1, ord_v + 1); + axom::Array dCmat2(2, 2); + + if(!isRational()) + { + // Do de Casteljau until we get a 3x3 + for(int i = 0; i < NDIMS; ++i) + { + for(int p = 0; p <= ord_u; ++p) + { + for(int q = 0; q <= ord_v; ++q) + { + dCmat(p, q) = m_controlPoints(p, q)[i]; + } + } + + // Do de Casteljau over the longer direction first + if(ord_u >= ord_v) + { + // Stop 2 steps early in u + for(int p = 1; p <= ord_u - 2; ++p) + { + const int end = ord_u - p; + for(int k = 0; k <= end; ++k) + { + for(int q = 0; q <= ord_v; ++q) + { + dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); + } + } + } + + // Stop 2 steps early in v over the three columns + for(int q = 1; q <= ord_v - 2; ++q) + { + const int end = ord_v - q; + for(int k = 0; k <= end; ++k) + { + for(int p = 0; p <= 2; ++p) + { + dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); + } + } + } + } + else + { + // Stop 2 steps early in v + for(int q = 1; q <= ord_v - 2; ++q) + { + const int end = ord_v - q; + for(int k = 0; k <= end; ++k) + { + for(int p = 0; p <= ord_u; ++p) + { + dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); + } + } + } + + // Stop 2 steps early in v over the three columns + for(int p = 1; p <= ord_u - 2; ++p) + { + const int end = ord_u - p; + for(int k = 0; k <= end; ++k) + { + for(int q = 0; q <= 2; ++q) + { + dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); + } + } + } + } + + // By now, the first 3x3 submatrix of dCmat should have + // all the intermediate values needed + + // clang-format off + // Get second order derivatives + DuDu[i] = (ord_u - 1) * ord_u * ( (1 - v) * (1 - v) * (dCmat(2, 0) - 2 * dCmat(1, 0) + dCmat(0, 0)) + + 2 * v * (1 - v) * (dCmat(2, 1) - 2 * dCmat(1, 1) + dCmat(0, 1)) + + v * v * (dCmat(2, 2) - 2 * dCmat(1, 2) + dCmat(0, 2)) ); + + DvDv[i] = (ord_v - 1) * ord_v * ( (1 - u) * (1 - u) * (dCmat(0, 2) - 2 * dCmat(0, 1) + dCmat(0, 0)) + + 2 * u * (1 - u) * (dCmat(1, 2) - 2 * dCmat(1, 1) + dCmat(1, 0)) + + u * u * (dCmat(2, 2) - 2 * dCmat(2, 1) + dCmat(2, 0)) ); + + // Compute intermediate values for first order derivatives + dCmat2(0, 0) = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); + dCmat2(1, 0) = (1 - u) * (1 - v) * dCmat(1, 0) + u * (1 - v) * dCmat(2, 0) + (1 - u) * v * dCmat(1, 1) + u * v * dCmat(2, 1); + dCmat2(0, 1) = (1 - u) * (1 - v) * dCmat(0, 1) + u * (1 - v) * dCmat(1, 1) + (1 - u) * v * dCmat(0, 2) + u * v * dCmat(1, 2); + dCmat2(1, 1) = (1 - u) * (1 - v) * dCmat(1, 1) + u * (1 - v) * dCmat(2, 1) + (1 - u) * v * dCmat(1, 2) + u * v * dCmat(2, 2); + + // Compute first order derivatives + Du[i] = ord_u * ( (1 - v) * (dCmat2(1, 0) - dCmat2(0, 0)) + + v * (dCmat2(1, 1) - dCmat2(0, 1)) ); + + Dv[i] = ord_v * ( (1 - u) * (dCmat2(0, 1) - dCmat2(0, 0)) + + u * (dCmat2(1, 1) - dCmat2(1, 0)) ); + + DuDv[i] = ord_u * ord_v * (dCmat2(1, 1) - dCmat2(1, 0) - dCmat2(0, 1) + dCmat2(0, 0)); + + // Get the evaluation point + evaluation[i] = (1 - u) * (1 - v) * dCmat2(0, 0) + u * (1 - v) * dCmat2(1, 0) + (1 - u) * v * dCmat2(0, 1) + u * v * dCmat2(1, 1); + // clang-format on + } + } + else + { + BezierPatch projective(ord_u, ord_v); + BezierPatch weights(ord_u, ord_v); + + for(int p = 0; p <= ord_u; ++p) + { + for(int q = 0; q <= ord_v; ++q) + { + projective(p, q) = m_controlPoints(p, q); + projective(p, q).array() *= m_weights(p, q); + weights(p, q)[0] = m_weights(p, q); + } + } + + Point P; + Vector P_u, P_v, P_uu, P_vv, P_uv; + + Point W; + Vector W_u, W_v, W_uu, W_vv, W_uv; + + Vector eval_vec; + + projective.evaluate_second_derivatives(u, v, P, P_u, P_v, P_uu, P_vv, P_uv); + weights.evaluate_second_derivatives(u, v, W, W_u, W_v, W_uu, W_vv, W_uv); + + eval_vec = Vector(P) / W[0]; + Du = (P_u - eval_vec * W_u[0]) / W[0]; + Dv = (P_v - eval_vec * W_v[0]) / W[0]; + DuDu = (P_uu - 2 * W_u[0] * Du - eval_vec * W_uu[0]) / W[0]; + DvDv = (P_vv - 2 * W_v[0] * Dv - eval_vec * W_vv[0]) / W[0]; + DuDv = (P_uv - Du * W_v[0] - Dv * W_u[0] - eval_vec * W_uv[0]) / W[0]; + evaluation = Point(eval_vec.data()); + } + } + /*! * \brief Computes a tangent of a Bezier patch at a particular parameter value (\a u, \a v) along the u axis * @@ -833,23 +989,110 @@ class BezierPatch } else { - BezierPatch nonrational(ord_u, ord_v); - BezierPatch weights(ord_u, ord_v); + Vector val; + + axom::Array dCmat(ord_u + 1, ord_v + 1); + axom::Array dWmat(ord_u + 1, ord_v + 1); + + for(int i = 0; i < NDIMS; ++i) + { + // Do de Casteljau until we get a 3x3 for(int p = 0; p <= ord_u; ++p) { for(int q = 0; q <= ord_v; ++q) { - nonrational(p, q) = m_controlPoints(p, q); - nonrational(p, q).array() *= m_weights(p, q); - weights(p, q)[0] = m_weights(p, q); + dCmat(p, q) = m_controlPoints(p, q)[i] * m_weights(p, q); + dWmat(p, q) = m_weights(p, q); + } } + + // Do de Casteljau over the longer direction first + if(false) + { + // Stop 1 steps early in u + for(int p = 1; p <= ord_u - 1; ++p) + { + const int end = ord_u - p; + for(int k = 0; k <= end; ++k) + { + for(int q = 0; q <= ord_v; ++q) + { + dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); + dWmat(k, q) = lerp(dWmat(k, q), dWmat(k + 1, q), u); + } + } + } + + // Stop 1 step early in v over the two columns + for(int q = 1; q <= ord_v - 1; ++q) + { + const int end = ord_v - q; + for(int k = 0; k <= end; ++k) + { + for(int p = 0; p <= 1; ++p) + { + dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); + dWmat(p, k) = lerp(dWmat(p, k), dWmat(p, k + 1), v); + } + } + } + } + else + { + // Stop 1 step early in v + for(int q = 1; q <= ord_v - 1; ++q) + { + const int end = ord_v - q; + for(int k = 0; k <= end; ++k) + { + for(int p = 0; p <= ord_u; ++p) + { + dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); + dWmat(p, k) = lerp(dWmat(p, k), dWmat(p, k + 1), v); + } + } + } + + // Stop 1 step early in v over the two columns + for(int p = 1; p <= ord_u - 1; ++p) + { + const int end = ord_u - p; + for(int k = 0; k <= end; ++k) + { + for(int q = 0; q <= 1; ++q) + { + dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); + dWmat(k, q) = lerp(dWmat(k, q), dWmat(k + 1, q), u); + } + } + } + } + + // Store intermediate values + // clang-format off + double W = (1 - u) * (1 - v) * dWmat(0, 0) + u * (1 - v) * dWmat(1, 0) + + (1 - u) * v * dWmat(0, 1) + u * v * dWmat(1, 1); + double W_u = ord_u * ( (1 - v) * (dWmat(1, 0) - dWmat(0, 0)) + + v * (dWmat(1, 1) - dWmat(0, 1)) ); + double W_v = ord_v * ( (1 - u) * (dWmat(0, 1) - dWmat(0, 0)) + + u * (dWmat(1, 1) - dWmat(1, 0)) ); + double W_uv = ord_u * ord_v * (dWmat(1, 1) - dWmat(1, 0) - dWmat(0, 1) + dWmat(0, 0)); + + double C = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); + double C_u = ord_u * ( (1 - v) * (dCmat(1, 0) - dCmat(0, 0)) + + v * (dCmat(1, 1) - dCmat(0, 1)) ); + double C_v = ord_v * ( (1 - u) * (dCmat(0, 1) - dCmat(0, 0)) + + u * (dCmat(1, 1) - dCmat(1, 0)) ); + double C_uv = ord_u * ord_v * (dCmat(1, 1) - dCmat(1, 0) - dCmat(0, 1) + dCmat(0, 0)); + + val[i] = W * W * C_uv - W * (C_u * W_v + C_v * W_u) + + C * (2 * W_u * W_v - W * W_uv); + val[i] /= (W * W * W); + // clang-format on } - // Return a wildly inefficient calculation of the rational derivative - return (nonrational.dudv(u, v) - weights.dv(u, v)[0] * du(u, v) - - weights.du(u, v)[0] * dv(u, v) - - weights.dudv(u, v)[0] * Vector(evaluate(u, v))) / - weights.evaluate(u, v)[0]; + return val; } } diff --git a/src/axom/primal/tests/primal_bezier_patch.cpp b/src/axom/primal/tests/primal_bezier_patch.cpp index 02140d04d8..37b9b937a6 100644 --- a/src/axom/primal/tests/primal_bezier_patch.cpp +++ b/src/axom/primal/tests/primal_bezier_patch.cpp @@ -625,61 +625,58 @@ TEST(primal_bezierpatch, second_derivative) // clang-format on BezierPatchType bPatch(controlPoints, weights, order_u, order_v); + const double u = 0.6, v = 0.4; - auto evaluate_test = bPatch.evaluate(0.5, 0.4); - PointType evaluate_exp = {3.0, 6.85038038884, 2.35777683855}; + PointType evaluation; + VectorType Du, Dv, DuDu, DvDv, DuDv; + bPatch.evaluate_second_derivatives(u, v, evaluation, Du, Dv, DuDu, DvDv, DuDv); + + auto evaluate_test = bPatch.evaluate(u, v); + PointType evaluate_exp = {3.3677499397, 6.8406796016, 2.3949546817}; for(int i = 0; i < 3; ++i) { - EXPECT_NEAR(evaluate_test[i], evaluate_exp[i], 1e-6); + EXPECT_NEAR(evaluate_exp[i], evaluation[i], 1e-6); + EXPECT_NEAR(evaluate_exp[i], evaluate_test[i], 1e-6); } - auto partial_u_test = bPatch.du(0.6, 0.4); + auto partial_u_test = bPatch.du(u, v); VectorType partial_u_exp = {3.78171724599, -0.19774668801, -0.370827644202}; for(int i = 0; i < 3; ++i) { - EXPECT_NEAR(partial_u_test[i], partial_u_exp[i], 1e-6); + EXPECT_NEAR(partial_u_exp[i], Du[i], 1e-6); + EXPECT_NEAR(partial_u_exp[i], partial_u_test[i], 1e-6); } - auto partial_v_test = bPatch.dv(0.6, 0.4); + auto partial_v_test = bPatch.dv(u, v); VectorType partial_v_exp = {-0.354910197356, 11.8772494643, -1.594127454970}; for(int i = 0; i < 3; ++i) { - EXPECT_NEAR(partial_v_test[i], partial_v_exp[i], 1e-6); + EXPECT_NEAR(partial_v_exp[i], Dv[i], 1e-6); + EXPECT_NEAR(partial_v_exp[i], partial_v_test[i], 1e-6); } - auto partial_uu_test = bPatch.dudu(0.6, 0.4); + auto partial_uu_test = bPatch.dudu(u, v); VectorType partial_uu_exp = {3.20670028604, -2.12957447484, -16.1167567473}; for(int i = 0; i < 3; ++i) { - EXPECT_NEAR(partial_uu_test[i], partial_uu_exp[i], 1e-6); + EXPECT_NEAR(partial_uu_exp[i], DuDu[i], 1e-6); + EXPECT_NEAR(partial_uu_exp[i], partial_uu_test[i], 1e-6); } - auto partial_vv_test = bPatch.dvdv(0.6, 0.4); + auto partial_vv_test = bPatch.dvdv(u, v); VectorType partial_vv_exp = {0.479553359805, -8.63831027883, 1.13497887975}; for(int i = 0; i < 3; ++i) { - EXPECT_NEAR(partial_vv_test[i], partial_vv_exp[i], 1e-6); + EXPECT_NEAR(partial_vv_exp[i], DvDv[i], 1e-6); + EXPECT_NEAR(partial_vv_exp[i], partial_vv_test[i], 1e-6); } - BezierPatchType bPatch_nonrational(bPatch); - bPatch_nonrational.makeNonrational(); - bPatch_nonrational.makeRational(); - std::cout << bPatch_nonrational.getWeight(2, 3) << std::endl; - - auto partial_uv_test = bPatch.dudv(0.6, 0.4); + auto partial_uv_test = bPatch.dudv(u, v); VectorType partial_uv_exp = {-3.43768298544, 1.94078069698, 8.48995274462}; for(int i = 0; i < 3; ++i) { - EXPECT_NEAR(partial_uv_test[i], partial_uv_exp[i], 1e-6); - } - - auto partial_uv_test_nonrational = bPatch_nonrational.dudv(0.6, 0.4); - VectorType partial_uv_exp_nonrational = {-2.36544, 0, 11.80416}; - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(partial_uv_test_nonrational[i], - partial_uv_exp_nonrational[i], - 1e-6); + EXPECT_NEAR(partial_uv_exp[i], partial_uv_test[i], 1e-6); + EXPECT_NEAR(partial_uv_exp[i], DuDv[i], 1e-6); } } From 4fb7bdbb0f628321cc7530e2af69940828f63618 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Tue, 8 Aug 2023 16:18:54 -0700 Subject: [PATCH 021/639] Update function name and usage --- .../operators/detail/winding_number_impl.hpp | 44 ++++++------- src/axom/primal/operators/split.hpp | 14 ++--- src/axom/primal/operators/winding_number.hpp | 63 ++++++++++++------- 3 files changed, 71 insertions(+), 50 deletions(-) diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 4b4a3171ab..1074fa129f 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -469,6 +469,10 @@ double stokes_winding_number_adaptive(const Point& query, quad_tol, 1e-10)) { + if(depth >= MAX_DEPTH) + { + printf(""); + } return 0.25 * M_1_PI * (quad_fine[0] + quad_fine[1]); } else @@ -508,14 +512,15 @@ double stokes_winding_number_adaptive(const Point& query, */ template bool near_field_projection(const Point& p, - const BezierPatch& bPatch, - double& min_u, + const BezierPatch& bPatch, + double& min_u, double& min_v, double edge_tol = 1e-8, double EPS = 1e-8) { min_u = 0.5; min_v = 0.5; + Point S; Vector Sp, Su, Sv, Suu, Svv, Suv; double A00, A01, A10, A11, det; double b0, b1; @@ -523,27 +528,24 @@ bool near_field_projection(const Point& p, // TODO: Compute Sp, Su, Sv, Suu, Svv, Suv MUCH more efficiently // by using the same intermediates from de Casteljau - for(int i = 0; i < 15; ++i) + constexpr int max_iter = 15; + for(int i = 0; i < max_iter; ++i) { - Sp = Vector(p, bPatch.evaluate(min_u, min_v)); + // Get all derivatives necessary for Newton step + bPatch.evaluate_second_derivatives(min_u, min_v, S, Su, Sv, Suu, Svv, Suv); + Sp = Vector(p, S); + if(Sp.squared_norm() < edge_tol * edge_tol) { return true; } - Su = bPatch.du(min_u, min_v); - Sv = bPatch.dv(min_u, min_v); - - if(axom::utilities::isNearlyEqual(Su.squared_norm(), 0.0, EPS) && - axom::utilities::isNearlyEqual(Sv.squared_norm(), 0.0, EPS)) + if(axom::utilities::isNearlyEqual(Su.dot(Sp), 0.0, EPS) && + axom::utilities::isNearlyEqual(Sv.dot(Sp), 0.0, EPS)) { return true; } - Suu = bPatch.dudu(min_u, min_v); - Svv = bPatch.dvdv(min_u, min_v); - Suv = bPatch.dudv(min_u, min_v); - A00 = Sp.dot(Suu) + Su.dot(Su); A10 = A01 = Sp.dot(Suv) + Su.dot(Sv); A11 = Sp.dot(Svv) + Sv.dot(Sv); @@ -553,8 +555,13 @@ bool near_field_projection(const Point& p, // a different initial condition if(axom::utilities::isNearlyEqual(det, 0.0, PRIMAL_TINY)) { - min_u = 1.0 / i; - min_v = 1.0 / (i + 1); + if(i == max_iter) + { + min_u = min_v = 0.5; + return false; + } + min_u = 1.0 / (i + 1); + min_v = 1.0 / (i + 2); continue; } @@ -581,13 +588,8 @@ bool near_field_projection(const Point& p, } return false; - } - - min_u = u; - min_v = v; - - return evaluate(u, v); } + } // end namespace detail } // end namespace primal } // end namespace axom diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 07c3058836..6f67f288f4 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -82,7 +82,7 @@ void split(const Octahedron& oct, }; /*! - * \brief Splits a BezierPatch object into SuperConvex subpatches + * \brief Splits a BezierPatch object into valid subpatches for winding number computation * * \param [in] bPatch BezierPatch to split * \param [out] out The \a axom::Array of BezierPatch objects; a set of SuperConvex @@ -90,11 +90,11 @@ void split(const Octahedron& oct, * * * Uses a bisection method, splitting the patch recursively until each section - * is SuperConvex (convex + shallow). + * is convex + shallow. * */ template -void split_to_valid(const BezierPatch& bPatch, +void split_to_convex_shallow(const BezierPatch& bPatch, axom::Array>& out) { using Poly = Polygon; @@ -129,8 +129,8 @@ void split_to_valid(const BezierPatch& bPatch, is_valid = false; Patch p1, p2; bPatch.split_u(0.5, p1, p2); - split_to_valid(p1, out); - split_to_valid(p2, out); + split_to_convex_shallow(p1, out); + split_to_convex_shallow(p2, out); } } @@ -153,8 +153,8 @@ void split_to_valid(const BezierPatch& bPatch, is_valid = false; Patch p1, p2; bPatch.split_v(0.5, p1, p2); - split_to_valid(p1, out); - split_to_valid(p2, out); + split_to_convex_shallow(p1, out); + split_to_convex_shallow(p2, out); } } diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index 5204fe52a2..4b5c7cc5ba 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -468,26 +468,47 @@ int winding_number(const Point& query, * * \note Warning: This algorithm is only tested to high accuracy for queries within * 1e-5 of the surface. Otherwise, it will return less accurate results. - * \note CURRENTLY ASSUMES THE SURFACE IS VALID! PROJECTION MAY NOT WORK OTHERWISE! * * \return double The generalized winding number. */ template double winding_number(const Point& query, const BezierPatch& bPatch, + const bool isValidSurface = false, const double edge_tol = 1e-5, const double quad_tol = 1e-6, - const double EPS = 1e-8, - const int depth = 0) + const double EPS = 1e-8) { const int ord_u = bPatch.getOrder_u(); const int ord_v = bPatch.getOrder_v(); const bool patchIsRational = bPatch.isRational(); const double edge_tol_sq = edge_tol * edge_tol; + if(ord_u <= 0 || ord_v <= 0) + { + return 0.0; + } + + // If the patch isn't valid, then we need to split it and + // apply the algorithm to each component. + double wn = 0.0; + if(!isValidSurface) + { + axom::Array> valid_subsurfaces; + split_to_convex_shallow(bPatch, valid_subsurfaces); + + for(auto& surf : valid_subsurfaces) + { + wn += winding_number(query, surf, true, edge_tol, quad_tol, EPS); + } + + return wn; + } + // Fix the number of quadrature nodes arbitrarily, but high enough // to `catch` near singularities for refinement constexpr int quad_npts = 50; + constexpr double edge_offset = 0.01; // Early return if the patch is approximately polygonal. // Very slight variations in curvature requires small EPS tolerance @@ -507,7 +528,6 @@ double winding_number(const Point& query, * surface at only a single point (pierce). */ CurvedPolygon boundingPoly(4); - double wn = 0; detail::SingularityAxis field_direction; // Check if we dodge an axis-aligned bounding box, @@ -587,9 +607,6 @@ double winding_number(const Point& query, detail::near_field_projection(query, bPatch, min_u, min_v, edge_tol, EPS); Point closest_point = bPatch.evaluate(min_u, min_v); - int on_boundary = - (min_u < EPS) + (min_u > 1 - EPS) + (min_v < EPS) + (min_v > 1 - EPS); - // Cast a ray that is normal to the surface at the closest point cast_ray = bPatch.normal(min_u, min_v).unitVector(); @@ -605,17 +622,23 @@ double winding_number(const Point& query, 0.0, PRIMAL_TINY)) { - Vector T1, T2; - bPatch.corner_tangent_vectors(closest_point, T1, T2, edge_tol, EPS); - if(T1.squared_norm() == 0) - printf("Could not find a normal vector at this corner!\n"); - closest_normal = Vector::cross_product(T1, T2); + closest_normal = bPatch.normal( + axom::utilities::clampVal(min_u, edge_offset, 1 - edge_offset), + axom::utilities::clampVal(min_v, edge_offset, 1 - edge_offset)); + + // If that doesn't work, assume that the projection provides one. + if(axom::utilities::isNearlyEqual(closest_normal.squared_norm(), + 0.0, + PRIMAL_TINY)) + { + closest_normal = Vector(closest_point, query); + } } closest_normal = closest_normal.unitVector(); // If the query is on the surface, then we don't need to do any adjustment, // as the induced discontinuity in the integrand is removable - if(closest_vector.squared_norm() < edge_tol * edge_tol) + if(closest_vector.squared_norm() < edge_tol_sq) { cast_ray = closest_normal; wn = 0.0; @@ -635,7 +658,7 @@ double winding_number(const Point& query, // Can possibly pick this one more cleverly. if(axom::utilities::isNearlyEqual(closest_normal[0], closest_normal[1], - EPS)) + EPS)) cast_ray = Vector({closest_normal[2], closest_normal[2], -closest_normal[0] - closest_normal[1]}) @@ -645,13 +668,13 @@ double winding_number(const Point& query, closest_normal[0], closest_normal[0]}) .unitVector(); - } + } // If we're interior, we can safely pierce the surface, making // sure not to hit a boundary. - else - { + else + { // This tolerance is arbitrary. A smaller value might be needed - double edge_offset = 0.01; + cast_ray = Vector( query, bPatch.evaluate( @@ -660,10 +683,6 @@ double winding_number(const Point& query, cast_ray = cast_ray.unitVector(); wn = 0.5; } - - // Need to change the sign of the disk's contribution - // depending on the orientation. - wn *= (closest_vector.dot(cast_ray) > 0) ? 1.0 : -1.0; } // Rotate the surface so that the cast ray is oriented with k_hat From 46d3ef1efb2b423852b1fa137f97d5d9c9ea874f Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 10 Aug 2023 13:13:49 -0700 Subject: [PATCH 022/639] Add (possibly wrong) algorithms from Maa --- src/axom/primal/geometry/BezierPatch.hpp | 6 +- .../operators/detail/winding_number_impl.hpp | 90 ++++++++++++++++++- 2 files changed, 90 insertions(+), 6 deletions(-) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index 73002cbf05..a56649743e 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -997,10 +997,10 @@ class BezierPatch for(int i = 0; i < NDIMS; ++i) { // Do de Casteljau until we get a 3x3 - for(int p = 0; p <= ord_u; ++p) - { - for(int q = 0; q <= ord_v; ++q) + for(int p = 0; p <= ord_u; ++p) { + for(int q = 0; q <= ord_v; ++q) + { dCmat(p, q) = m_controlPoints(p, q)[i] * m_weights(p, q); dWmat(p, q) = m_weights(p, q); } diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 1074fa129f..0c980a8f7e 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -495,6 +495,88 @@ double stokes_winding_number_adaptive(const Point& query, } #endif +/// Return FALSE if the nearest point is an endpoint. +/// Given by Algorithm 3 in [Maa 2003] +template +bool point_nearest_bezier_curve(const Point& p, + const Polygon& poly) +{ + const int N = poly.numVertices() - 1; + if(N <= 1) return true; + + // Store the vectors used multiple times + Vector P0P(poly[0], p); + Vector PPN(p, poly[N]); + Vector PNP0(poly[N], poly[0]); + + // Check the more likely condition first + double R3 = -PNP0.dot(PPN); + double R4 = PNP0.dot(P0P); + if(R3 * R4 <= 0) return true; + + double R1 = P0P.dot(Vector(poly[0], poly[1])); + double R2 = PPN.dot(Vector(poly[N - 1], poly[N])); + if(R1 >= 0 && R2 >= 0) return true; + + return false; +} + +/// Return FALSE if nearest point is on the boundary +/// Given by Algorithm 4 in [Maa 2003] +template +bool point_nearest_bezier_patch(const Point& point, + const BezierPatch& bPatch, + double EPS = 1e-8) +{ + const int ord_u = bPatch.getOrder_u(); + const int ord_v = bPatch.getOrder_v(); + bool flag = false; + + Polygon controlPoly; + for(int q = 0; q <= ord_v; ++q) + { + controlPoly.clear(); + for(int p = 0; p <= ord_u; ++p) + { + controlPoly.addVertex(bPatch(p, q)); + } + + if(point_nearest_bezier_curve(point, controlPoly)) + { + flag = true; + break; + } + } + + if(flag == false) + { + return false; + } + + flag = false; + for(int p = 0; p <= ord_u; ++p) + { + controlPoly.clear(); + for(int q = 0; q <= ord_v; ++q) + { + controlPoly.addVertex(bPatch(p, q)); + } + + if(point_nearest_bezier_curve(point, controlPoly)) + { + flag = true; + break; + } + } + + if(flag == false) + { + return false; + } + + return true; +} + /*! * \brief Find the point on a BezierPatch closest to a point close to the surface * @@ -525,10 +607,11 @@ bool near_field_projection(const Point& p, double A00, A01, A10, A11, det; double b0, b1; double delu, delv; + double damp = 1.0; // TODO: Compute Sp, Su, Sv, Suu, Svv, Suv MUCH more efficiently // by using the same intermediates from de Casteljau - constexpr int max_iter = 15; + constexpr int max_iter = 10; for(int i = 0; i < max_iter; ++i) { // Get all derivatives necessary for Newton step @@ -568,8 +651,9 @@ bool near_field_projection(const Point& p, b0 = -Sp.dot(Su); b1 = -Sp.dot(Sv); - delu = (A11 * b0 - A01 * b1) / det; - delv = (-A10 * b0 + A00 * b1) / det; + delu = damp * (A11 * b0 - A01 * b1) / det; + delv = damp * (-A10 * b0 + A00 * b1) / det; + damp *= 1; min_u = axom::utilities::clampVal(min_u + delu, 0.0, 1.0); min_v = axom::utilities::clampVal(min_v + delv, 0.0, 1.0); From bbcb68b85da2bdfb2e1bf51bfd5c0df4dd06d1d8 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 10 Aug 2023 13:32:52 -0700 Subject: [PATCH 023/639] Put old method in new function --- src/axom/primal/operators/split.hpp | 2 +- src/axom/primal/operators/winding_number.hpp | 416 ++++++++++++++++--- src/axom/primal/tests/primal_solid_angle.cpp | 304 ++++++++++++-- 3 files changed, 614 insertions(+), 108 deletions(-) diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 6f67f288f4..00fa10dc29 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -95,7 +95,7 @@ void split(const Octahedron& oct, */ template void split_to_convex_shallow(const BezierPatch& bPatch, - axom::Array>& out) + axom::Array>& out) { using Poly = Polygon; using Patch = BezierPatch; diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index 4b5c7cc5ba..f82ff5e204 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -452,32 +452,15 @@ int winding_number(const Point& query, return std::lround(wn); } - #ifdef AXOM_USE_MFEM -/*! - * \brief Computes the solid angle winding number for a 3D Bezier patch - * - * \param [in] query The query point to test - * \param [in] bPatch The Bezier patch object - * \param [in] edge_tol The physical distance level at which objects are - * considered indistinguishable - * \param [in] quad_tol The maximum relative error allowed in the quadrature - * \param [in] EPS Miscellaneous numerical tolerance level for nonphysical distances - * - * Computes the generalized winding number for a Bezier patch using Stokes theorem. - * - * \note Warning: This algorithm is only tested to high accuracy for queries within - * 1e-5 of the surface. Otherwise, it will return less accurate results. - * - * \return double The generalized winding number. - */ + template -double winding_number(const Point& query, - const BezierPatch& bPatch, - const bool isValidSurface = false, - const double edge_tol = 1e-5, - const double quad_tol = 1e-6, - const double EPS = 1e-8) +double winding_number_casting(const Point& query, + const BezierPatch& bPatch, + const bool isValidSurface = false, + const double edge_tol = 1e-5, + const double quad_tol = 1e-6, + const double EPS = 1e-8) { const int ord_u = bPatch.getOrder_u(); const int ord_v = bPatch.getOrder_v(); @@ -499,7 +482,7 @@ double winding_number(const Point& query, for(auto& surf : valid_subsurfaces) { - wn += winding_number(query, surf, true, edge_tol, quad_tol, EPS); + wn += winding_number_casting(query, surf, true, edge_tol, quad_tol, EPS); } return wn; @@ -507,8 +490,7 @@ double winding_number(const Point& query, // Fix the number of quadrature nodes arbitrarily, but high enough // to `catch` near singularities for refinement - constexpr int quad_npts = 50; - constexpr double edge_offset = 0.01; + constexpr int quad_npts = 100; // Early return if the patch is approximately polygonal. // Very slight variations in curvature requires small EPS tolerance @@ -605,12 +587,12 @@ double winding_number(const Point& query, // and does so at an interior point double min_u, min_v; detail::near_field_projection(query, bPatch, min_u, min_v, edge_tol, EPS); - Point closest_point = bPatch.evaluate(min_u, min_v); + bool supposedToBeOnBoundary = + !detail::point_nearest_bezier_patch(query, bPatch); - // Cast a ray that is normal to the surface at the closest point - cast_ray = bPatch.normal(min_u, min_v).unitVector(); + Point closest_point = bPatch.evaluate(min_u, min_v); - closest_vector = Vector(query, closest_point); + closest_vector = Vector(closest_point, query); int on_boundary = (min_u < EPS) || (min_u > 1 - EPS) || (min_v < EPS) || (min_v > 1 - EPS); @@ -622,20 +604,23 @@ double winding_number(const Point& query, 0.0, PRIMAL_TINY)) { - closest_normal = bPatch.normal( - axom::utilities::clampVal(min_u, edge_offset, 1 - edge_offset), - axom::utilities::clampVal(min_v, edge_offset, 1 - edge_offset)); + closest_normal = + bPatch.normal(axom::utilities::clampVal(min_u, EPS, 1 - EPS), + axom::utilities::clampVal(min_v, EPS, 1 - EPS)); - // If that doesn't work, assume that the projection provides one. + // If that doesn't work, then it is likely (heuristic) that the interior + // is empty everywhere, and the winding number is zero. if(axom::utilities::isNearlyEqual(closest_normal.squared_norm(), 0.0, PRIMAL_TINY)) { - closest_normal = Vector(closest_point, query); + return 0.0; } } closest_normal = closest_normal.unitVector(); + //return closest_vector.dot(closest_normal); + // If the query is on the surface, then we don't need to do any adjustment, // as the induced discontinuity in the integrand is removable if(closest_vector.squared_norm() < edge_tol_sq) @@ -647,41 +632,61 @@ double winding_number(const Point& query, // disk around the ray we cast. else { + closest_vector = closest_vector.unitVector(); + // Check orientation relative to the surface - bool exterior = closest_vector.dot(closest_normal) < 0; + double dot_prod = closest_vector.dot(closest_normal); - // If we're exterior, then we can definitely define a separating - // plane defined by closest_normal - if(exterior) + if(on_boundary) { - // Get a perpendicular vector to closest_normal. - // Can possibly pick this one more cleverly. - if(axom::utilities::isNearlyEqual(closest_normal[0], - closest_normal[1], + Vector closest_orthog; + if(axom::utilities::isNearlyEqual(closest_vector[0], + closest_vector[1], EPS)) - cast_ray = Vector({closest_normal[2], - closest_normal[2], - -closest_normal[0] - closest_normal[1]}) - .unitVector(); + closest_orthog = + Vector({closest_vector[2], + closest_vector[2], + -closest_vector[0] - closest_vector[1]}) + .unitVector(); else - cast_ray = Vector({-closest_normal[1] - closest_normal[2], - closest_normal[0], - closest_normal[0]}) - .unitVector(); + closest_orthog = Vector({-closest_vector[1] - closest_vector[2], + closest_vector[0], + closest_vector[0]}) + .unitVector(); + //cast_ray = closest_orthog; + cast_ray = closest_normal; + + printf("==========Closest point is on a boundary!==========\n"); + printf("Are we supposed to be on the boundary? %s\n", + (supposedToBeOnBoundary ? "Yes!" : "No!")); + //python_print(closest_vector, query); + python_print(closest_orthog, query, "green"); + python_print(closest_normal, query, "red"); + python_print(closest_vector, closest_point, "blue"); + //python_print(closest_normal, closest_point); + python_print(bPatch); + python_print(query); + python_print(closest_point); + std::cout << closest_vector.dot(closest_normal) << std::endl; + printf("===================================================\n"); } - // If we're interior, we can safely pierce the surface, making - // sure not to hit a boundary. + // If the closest point isinterior, we can safely pierce the surface, + // since the ray cast won't hit a boundary else { - // This tolerance is arbitrary. A smaller value might be needed - - cast_ray = Vector( - query, - bPatch.evaluate( - axom::utilities::clampVal(min_u, edge_offset, 1 - edge_offset), - axom::utilities::clampVal(min_v, edge_offset, 1 - edge_offset))); - cast_ray = cast_ray.unitVector(); - wn = 0.5; + cast_ray = closest_vector; + wn = (dot_prod > 0 ? -1.0 : 1.0) * 0.5; + printf("-----------Closest point is on the interor!-----------\n"); + printf("Are we supposed to be on the boundary? %s\n", + (supposedToBeOnBoundary ? "Yes!" : "No!")); + //python_print(closest_vector, query); + python_print(cast_ray, query, "green"); + python_print(closest_vector, closest_point, "blue"); + python_print(bPatch); + python_print(query); + python_print(closest_point); + std::cout << closest_vector.dot(closest_normal) << std::endl; + printf("------------------------------------------------------\n"); } } @@ -799,6 +804,291 @@ double winding_number(const Point& query, } #endif +template +double winding_number_recursive(const Point& query, + const BezierPatch& bPatch, + const double edge_tol = 1e-8, + const double quad_tol = 1e-8, + const double EPS = 1e-8, + const int depth = 0) +{ + const int ord_u = bPatch.getOrder_u(); + const int ord_v = bPatch.getOrder_v(); + const bool patchIsRational = bPatch.isRational(); + const double edge_tol_sq = edge_tol * edge_tol; + + // Fix the number of quadrature nodes arbitrarily, but high enough + // to `catch` near singularities for refinement + constexpr int quad_npts = 30; + + // Early return if the patch is approximately polygonal. + // Very slight variations in curvature requires small EPS tolerance + constexpr int MAX_DEPTH = 10; + if(depth >= MAX_DEPTH || bPatch.isPolygonal(EPS)) + { + return winding_number( + query, + Polygon(axom::Array>( + {bPatch(0, 0), bPatch(ord_u, 0), bPatch(ord_u, ord_v), bPatch(0, ord_v)})), + edge_tol, + PRIMAL_TINY); + } + + // Use a specific kind of recursion if we are within tol of an endpoint. + // Split the surface closer to the corner, assume smallest patch is polygonal, + // and set a new edge_tol so corners of the new patch aren't marked as coincident + constexpr double edge_offset = 0.01; + if(squared_distance(query, bPatch(0, 0)) <= edge_tol_sq) + { + BezierPatch p1, p2, p3, p4; + bPatch.split(0.0 + edge_offset, 0.0 + edge_offset, p1, p2, p3, p4); + double new_edge_tol = 0.5 * + sqrt(axom::utilities::min( + squared_distance(query, bPatch.evaluate(0.0, 0.0 + edge_offset)), + squared_distance(query, bPatch.evaluate(0.0 + edge_offset, 0.0)))); + new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); + + return winding_number_recursive(query, + p2, + new_edge_tol, + quad_tol, + EPS, + depth + 1) + + winding_number_recursive(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); + } + if(squared_distance(query, bPatch(ord_u, 0)) <= edge_tol_sq) + { + BezierPatch p1, p2, p3, p4; + bPatch.split(1.0 - edge_offset, 0.0 + edge_offset, p1, p2, p3, p4); + double new_edge_tol = 0.5 * + sqrt(axom::utilities::min( + squared_distance(query, bPatch.evaluate(1.0, 0.0 + edge_offset)), + squared_distance(query, bPatch.evaluate(1.0 - edge_offset, 0.0)))); + new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); + + return winding_number_recursive(query, + p1, + new_edge_tol, + quad_tol, + EPS, + depth + 1) + + winding_number_recursive(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); + } + if(squared_distance(query, bPatch(0, ord_v)) <= edge_tol_sq) + { + BezierPatch p1, p2, p3, p4; + bPatch.split(0.0 + edge_offset, 1.0 - edge_offset, p1, p2, p3, p4); + double new_edge_tol = 0.5 * + sqrt(axom::utilities::min( + squared_distance(query, bPatch.evaluate(0.0 + edge_offset, 1.0)), + squared_distance(query, bPatch.evaluate(0.0, 1.0 - edge_offset)))); + new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); + + return winding_number_recursive(query, + p1, + new_edge_tol, + quad_tol, + EPS, + depth + 1) + + winding_number_recursive(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); + } + if(squared_distance(query, bPatch(ord_u, ord_v)) <= edge_tol_sq) + { + BezierPatch p1, p2, p3, p4; + bPatch.split(1.0 - edge_offset, 1.0 - edge_offset, p1, p2, p3, p4); + double new_edge_tol = 0.5 * + sqrt(axom::utilities::min( + squared_distance(query, bPatch.evaluate(1.0, 1.0 - edge_offset)), + squared_distance(query, bPatch.evaluate(1.0 - edge_offset, 1.0)))); + new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); + + return winding_number_recursive(query, + p1, + new_edge_tol, + quad_tol, + EPS, + depth + 1) + + winding_number_recursive(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p3, new_edge_tol, quad_tol, EPS, depth + 1); + } + + /* + * To use Stokes theorem, we need to identify a separating plane between + * `query` and the surface, guaranteed through a bounding box. + * If it does, need to do geometric refinement: Splitting and rotating the curve + * until we can guarantee this. + */ + CurvedPolygon boundingPoly(4); + + // Define vector fields whose curl gives us the winding number + detail::SingularityAxis field_direction; + + // Check an axis-aligned bounding box (most surfaces satisfy this condition) + BoundingBox bBox(bPatch.boundingBox().expand(edge_tol)); + const bool exterior_x = + bBox.getMin()[0] > query[0] || query[0] > bBox.getMax()[0]; + const bool exterior_y = + bBox.getMin()[1] > query[1] || query[1] > bBox.getMax()[1]; + const bool exterior_z = + bBox.getMin()[2] > query[2] || query[2] > bBox.getMax()[2]; + + if(exterior_y || exterior_z) + { + field_direction = detail::SingularityAxis::x; + } + else if(exterior_x || exterior_z) + { + field_direction = detail::SingularityAxis::y; + } + else if(exterior_x || exterior_y) + { + field_direction = detail::SingularityAxis::z; + } + else + { + // Next, check an oriented bounding box. + // If we are interior to the oriented bounding box, then we + // cannot guarantee a separating plane, and need geometric refinement. + OrientedBoundingBox oBox(bPatch.orientedBoundingBox().expand(edge_tol)); + if(oBox.contains(query)) + { + BezierPatch p1, p2, p3, p4; + bPatch.split(0.5, 0.5, p1, p2, p3, p4); + return winding_number_recursive(query, p1, edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p2, edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p3, edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p4, edge_tol, quad_tol, EPS, depth + 1); + } + + // Otherwise, we can apply a rotation to a z-aligned field. + field_direction = detail::SingularityAxis::rotated; + + // Lambda to generate a 3D rotation matrix from an angle and axis + // Formulation from https://en.wikipedia.org/wiki/Rotation_matrix#Axis_and_angle + auto angleAxisRotMatrix = + [](double theta, const Vector& axis) -> numerics::Matrix { + const auto unitized = axis.unitVector(); + const double x = unitized[0], y = unitized[1], z = unitized[2]; + const double c = cos(theta), s = sin(theta), C = 1 - c; + + auto matx = numerics::Matrix::zeros(3, 3); + + matx(0, 0) = x * x * C + c; + matx(0, 1) = x * y * C - z * s; + matx(0, 2) = x * z * C + y * s; + + matx(1, 0) = y * x * C + z * s; + matx(1, 1) = y * y * C + c; + matx(1, 2) = y * z * C - x * s; + + matx(2, 0) = z * x * C - y * s; + matx(2, 1) = z * y * C + x * s; + matx(2, 2) = z * z * C + c; + + return matx; + }; + + // Lambda to rotate the input point using the provided rotation matrix + auto rotate_point = [&query](const numerics::Matrix& matx, + const Point input) -> Point { + Vector shifted(query, input); + Vector rotated; + numerics::matrix_vector_multiply(matx, shifted.data(), rotated.data()); + return Point( + {rotated[0] + query[0], rotated[1] + query[1], rotated[2] + query[2]}); + }; + + // Find vector from query to the bounding box + Point closest = closest_point(query, oBox); + Vector v0 = Vector(query, closest).unitVector(); + + // Find the direction of a ray perpendicular to that + Vector v1; + if(axom::utilities::isNearlyEqual(v0[0], v0[1], EPS)) + v1 = Vector({v0[2], v0[2], -v0[0] - v0[1]}).unitVector(); + else + v1 = Vector({-v0[1] - v0[2], v0[0], v0[0]}).unitVector(); + + // Rotate v0 around v1 until it is perpendicular to the plane spanned by k and v1 + double ang = (v0[2] < 0 ? 1.0 : -1.0) * + acos(axom::utilities::clampVal( + -(v0[0] * v1[1] - v0[1] * v1[0]) / sqrt(v1[0] * v1[0] + v1[1] * v1[1]), + -1.0, + 1.0)); + auto rotator = angleAxisRotMatrix(ang, v1); + + // Collect rotated curves into the curved Polygon + // Set up the (0, v) and (1, v) isocurves, rotated + boundingPoly[0].setOrder(ord_v); + boundingPoly[2].setOrder(ord_v); + if(patchIsRational) + { + boundingPoly[0].makeRational(); + boundingPoly[2].makeRational(); + } + for(int q = 0; q <= ord_v; ++q) + { + boundingPoly[0][q] = rotate_point(rotator, bPatch(ord_v, q)); + boundingPoly[2][q] = rotate_point(rotator, bPatch(0, ord_v - q)); + + if(patchIsRational) + { + boundingPoly[0].setWeight(q, bPatch.getWeight(ord_v, q)); + boundingPoly[2].setWeight(q, bPatch.getWeight(0, ord_v - q)); + } + } + + // Set up the (u, 0) and (u, 1) isocurves + boundingPoly[1].setOrder(ord_u); + boundingPoly[3].setOrder(ord_u); + if(patchIsRational) + { + boundingPoly[1].makeRational(); + boundingPoly[3].makeRational(); + } + for(int p = 0; p <= ord_u; ++p) + { + boundingPoly[1][p] = rotate_point(rotator, bPatch(ord_u - p, ord_u)); + boundingPoly[3][p] = rotate_point(rotator, bPatch(p, 0)); + + if(patchIsRational) + { + boundingPoly[1].setWeight(p, bPatch.getWeight(ord_u - p, ord_u)); + boundingPoly[3].setWeight(p, bPatch.getWeight(p, 0)); + } + } + } + + // Set up the polygon if we don't need to do any rotation or splitting. + if(field_direction != detail::SingularityAxis::rotated) + { + // Add the relevant bounding curves to the patch. + boundingPoly[0] = bPatch.isocurve_u(0); + boundingPoly[0].reverseOrientation(); + + boundingPoly[1] = bPatch.isocurve_v(1); + boundingPoly[1].reverseOrientation(); + + boundingPoly[2] = bPatch.isocurve_u(1); + boundingPoly[3] = bPatch.isocurve_v(0); + } + + // Iterate over the edges of the bounding curved polygon, add up the results + double wn = 0; + for(int n = 0; n < 4; ++n) + { + wn += detail::stokes_winding_number(query, + boundingPoly[n], + field_direction, + quad_npts, + quad_tol); + } + + return wn; +} //@} } // namespace primal diff --git a/src/axom/primal/tests/primal_solid_angle.cpp b/src/axom/primal/tests/primal_solid_angle.cpp index d78fcfd166..e9597acb47 100644 --- a/src/axom/primal/tests/primal_solid_angle.cpp +++ b/src/axom/primal/tests/primal_solid_angle.cpp @@ -11,7 +11,6 @@ #include "axom/fmt.hpp" #include "gtest/gtest.h" - // C++ headers #include #include @@ -481,6 +480,8 @@ TEST(primal_solid_angle, selfintersecting_quadrilateral) //------------------------------------------------------------------------------ TEST(primal_solid_angle, planar_bezierpatch) { + return; + using Point3D = primal::Point; using Vector3D = primal::Vector; using Polygon = primal::Polygon; @@ -505,6 +506,7 @@ TEST(primal_solid_angle, planar_bezierpatch) // Construct a first order Bezier patch out of the same vertices Point3D controlPoints[4] = {quad[1], quad[0], quad[2], quad[3]}; BezierPatch quad_patch(controlPoints, 1, 1); + const bool isValidPatch = false; Point3D queries[8] = {Point3D {0.0, 4.0, 1.0}, Point3D {-1.0, 2.0, 2.0}, @@ -519,7 +521,7 @@ TEST(primal_solid_angle, planar_bezierpatch) for(int n = 0; n < 8; ++n) { EXPECT_NEAR(winding_number(queries[n], quad), - winding_number(queries[n], quad_patch), + winding_number_recursive(queries[n], quad_patch, isValidPatch), 1e-10); } @@ -531,8 +533,13 @@ TEST(primal_solid_angle, planar_bezierpatch) const double EPS = 0; for(int n = 0; n < 8; ++n) { - EXPECT_NEAR(winding_number(queries[n], quad_patch), - winding_number(queries[n], quad_patch, quad_tol, edge_tol, EPS), + EXPECT_NEAR(winding_number_recursive(queries[n], quad_patch, isValidPatch), + winding_number_recursive(queries[n], + quad_patch, + isValidPatch, + quad_tol, + edge_tol, + EPS), 1e-10); } } @@ -540,6 +547,8 @@ TEST(primal_solid_angle, planar_bezierpatch) //------------------------------------------------------------------------------ TEST(primal_solid_angle, bezierpatch_sphere) { + return; + using Point3D = primal::Point; using Vector3D = primal::Vector; using BPatch = primal::BezierPatch; @@ -621,9 +630,10 @@ TEST(primal_solid_angle, bezierpatch_sphere) axom::Array valid_subsurfaces; for(int n = 0; n < 6; ++n) { - split_to_valid(sphere_faces[n], valid_subsurfaces); + split_to_convex_shallow(sphere_faces[n], valid_subsurfaces); } const int num_subsurfaces = valid_subsurfaces.size(); + const bool isValidSubsurface = true; // Iterate over points of interest, i.e. close to a boundary. // Specifically need to exercise the ray casting steps @@ -645,7 +655,7 @@ TEST(primal_solid_angle, bezierpatch_sphere) const double edge_offset = 1e-5; const double quad_tol = 1e-5; - const double EPS = 1e-10; + const double EPS = 1e-8; // Test some easy cases auto origin = Point3D({0.0, 0.0, 0.0}); @@ -654,10 +664,18 @@ TEST(primal_solid_angle, bezierpatch_sphere) double origin_wn = 0.0, near_origin_wn = 0.0; for(int k = 0; k < num_subsurfaces; ++k) { - origin_wn += - winding_number(origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); - near_origin_wn += - winding_number(near_origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + origin_wn += winding_number_recursive(origin, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); + near_origin_wn += winding_number_recursive(near_origin, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(origin_wn, 1.0, num_subsurfaces * quad_tol); EXPECT_NEAR(near_origin_wn, 1.0, num_subsurfaces * quad_tol); @@ -670,8 +688,12 @@ TEST(primal_solid_angle, bezierpatch_sphere) double far_wn = 0.0; for(int k = 0; k < num_subsurfaces; ++k) { - far_wn += - winding_number(far_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + far_wn += winding_number_recursive(far_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(far_wn, 0.0, num_subsurfaces * quad_tol); } @@ -679,17 +701,34 @@ TEST(primal_solid_angle, bezierpatch_sphere) // Iterate over difficult query directions for very close points for(int i = 0; i < 11; ++i) { - std::cout << i << std::endl; + std::cout << std::endl << i << std::endl; // Pick point close to the surface auto inner_query = Point3D((1.0 - edge_offset) * query_directions[i].array()); auto outer_query = Point3D((1.0 + edge_offset) * query_directions[i].array()); // Iterate over the patches that compose the sphere double inner_wn = 0; + double inner_wn_old = 0.0; for(int k = 0; k < num_subsurfaces; ++k) { - inner_wn += - winding_number(inner_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + inner_wn += winding_number_recursive(inner_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); + + //inner_wn_old += winding_number_old(inner_query, + // valid_subsurfaces[k], + // edge_tol, + // quad_tol, + // EPS); + + //if(!axom::utilities::isNearlyEqual(inner_wn, inner_wn_old, 0.1)) + //{ + // printf("BPOAOFIJAEOFHFAAOEOF\n"); + // //printf("%f\n", inner_wn - inner_wn_old); + //} } EXPECT_NEAR(inner_wn, 1.0, num_subsurfaces * quad_tol); @@ -697,8 +736,12 @@ TEST(primal_solid_angle, bezierpatch_sphere) double outer_wn = 0; for(int k = 0; k < num_subsurfaces; ++k) { - outer_wn += - winding_number(outer_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + outer_wn += winding_number_recursive(outer_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(outer_wn, 0.0, num_subsurfaces * quad_tol); @@ -709,11 +752,12 @@ TEST(primal_solid_angle, bezierpatch_sphere) double coincident_wn = 0.0; for(int k = 0; k < valid_subsurfaces.size(); ++k) { - coincident_wn += winding_number(coincident_query, - valid_subsurfaces[k], - edge_tol, - quad_tol, - EPS); + coincident_wn += winding_number_recursive(coincident_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); } @@ -721,6 +765,8 @@ TEST(primal_solid_angle, bezierpatch_sphere) TEST(primal_solid_angle, bezierpatch_degenerate_sphere) { + return; + using Point2D = primal::Point; using Point3D = primal::Point; using Vector3D = primal::Vector; @@ -784,11 +830,12 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) axom::Array valid_subsurfaces; for(int n = 0; n < 4; ++n) { - split_to_valid(patches1[n], valid_subsurfaces); - split_to_valid(patches2[n], valid_subsurfaces); + split_to_convex_shallow(patches1[n], valid_subsurfaces); + split_to_convex_shallow(patches2[n], valid_subsurfaces); } const int num_subsurfaces = valid_subsurfaces.size(); + const bool isValidSubsurface = true; // Iterate over points of interest, i.e. close to a boundary. // Specifically need to exercise the ray casting steps @@ -802,15 +849,15 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) Vector3D(valid_subsurfaces[idx].evaluate(1.0, 0.9999)), // 5 Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 1.0)), // 6 Vector3D(valid_subsurfaces[idx].evaluate(1.0, 1.0)), // 7 - Vector3D(valid_subsurfaces[idx].evaluate(-.99, 0.95)), // 8 - Vector3D(valid_subsurfaces[idx].evaluate(0.99, -.95)), // 9 - Vector3D(valid_subsurfaces[idx].evaluate(-.99, -.95))}; // 10 + Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.95)), // 8 + Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.05)), // 9 + Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.05))}; // 10 const double edge_tol = 1e-6; const double edge_offset = 1e-5; const double quad_tol = 1e-5; - const double EPS = 1e-10; + const double EPS = 1e-8; // Test some easy cases auto origin = Point3D({0.0, 0.0, 0.0}); @@ -819,10 +866,18 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) double origin_wn = 0.0, near_origin_wn = 0.0; for(int k = 0; k < num_subsurfaces; ++k) { - origin_wn += - winding_number(origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); - near_origin_wn += - winding_number(near_origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + origin_wn += winding_number_recursive(origin, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); + near_origin_wn += winding_number_recursive(near_origin, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(origin_wn, 1.0, num_subsurfaces * quad_tol); EXPECT_NEAR(near_origin_wn, 1.0, num_subsurfaces * quad_tol); @@ -834,15 +889,21 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) double far_wn = 0.0; for(int k = 0; k < num_subsurfaces; ++k) { - far_wn += - winding_number(far_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); -} + far_wn += winding_number_recursive(far_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); + } EXPECT_NEAR(far_wn, 0.0, num_subsurfaces * quad_tol); } // Iterate over difficult query directions for very close points for(int i = 0; i < 11; ++i) { + std::cout << i << std::endl; + // Pick point close to the surface auto inner_query = Point3D((1.0 - edge_offset) * query_directions[i].array()); auto outer_query = Point3D((1.0 + edge_offset) * query_directions[i].array()); @@ -851,8 +912,12 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) double inner_wn = 0; for(int k = 0; k < num_subsurfaces; ++k) { - inner_wn += - winding_number(inner_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + inner_wn += winding_number_recursive(inner_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(inner_wn, 1.0, num_subsurfaces * quad_tol); @@ -860,8 +925,12 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) double outer_wn = 0; for(int k = 0; k < num_subsurfaces; ++k) { - outer_wn += - winding_number(outer_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + outer_wn += winding_number_recursive(outer_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(outer_wn, 0.0, num_subsurfaces * quad_tol); @@ -870,16 +939,163 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) double coincident_wn = 0.0; for(int k = 0; k < valid_subsurfaces.size(); ++k) { - coincident_wn += winding_number(coincident_query, - valid_subsurfaces[k], - edge_tol, - quad_tol, - EPS); + coincident_wn += winding_number_recursive(coincident_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); } } +TEST(primal_solid_angle, bezierpatch_empty_interior) +{ + return; + + using Point2D = primal::Point; + using Point3D = primal::Point; + using Vector3D = primal::Vector; + using BPatch = primal::BezierPatch; + + // clang-format off + axom::Array point_data = { + Point3D {2.5,0.2500,0.000}, Point3D {2.5,0.2500,0.000}, Point3D {2.5,0.2500,0.000}, Point3D{2.5,0.2500,0.000}, + Point3D {2.7,1.1250,0.750}, Point3D {2.7,1.1250,0.750}, Point3D {2.7,1.1250,0.750}, Point3D{2.7,1.1250,0.750}, + Point3D {2.6,1.8125,1.125}, Point3D {2.6,1.8125,1.125}, Point3D {2.6,1.8125,1.125}, Point3D{2.6,1.8125,1.125}, + Point3D {2.5,2.5000,1.125}, Point3D {2.5,2.5000,1.125}, Point3D {2.5,2.5000,1.125}, Point3D{2.5,2.5000,1.125} + }; + // clang-format on + + // Degnerate patch with zero surface area + BPatch bad_patch(point_data, 3, 3); + + Point3D surface_point = bad_patch.evaluate(0.2, 0.8); + Point3D other_point = Point3D {surface_point[0] + 0.01, + surface_point[1] - 0.01, + surface_point[2] + 0.01}; + + EXPECT_NEAR(winding_number_recursive(surface_point, bad_patch), 0.0, 1e-5); + EXPECT_NEAR(winding_number_recursive(other_point, bad_patch), 0.0, 1e-5); +} + +TEST(primal_solid_angle, bezierpatch_nonsense_geometry) +{ + using Point2D = primal::Point; + using Point3D = primal::Point; + using Vector3D = primal::Vector; + using BPatch = primal::BezierPatch; + + // Get a hand-coded control polygon + BPatch test_patch(1, 5); + test_patch(0, 0) = Point3D {-5.0, 3.0, 0.0}; + test_patch(0, 1) = Point3D {-4.0, 4.0, 0.0}; + test_patch(0, 2) = Point3D {-2.0, 5.0, 0.0}; + test_patch(0, 3) = Point3D {0.0, 5.5, 0.0}; + test_patch(0, 4) = Point3D {2.0, 5.5, 0.0}; + test_patch(0, 5) = Point3D {4.5, 4.5, 0.0}; + + test_patch(1, 0) = Point3D {-7.0, 3.0, 2.0}; + test_patch(1, 1) = Point3D {-4.0 - 2.0, 4.0, 2.0}; + test_patch(1, 2) = Point3D {-2.0 - 2.0, 5.0, 2.0}; + test_patch(1, 3) = Point3D {0.0 - 2.0, 5.5, 2.0}; + test_patch(1, 4) = Point3D {2.0 - 2.0, 5.5, 2.0}; + test_patch(1, 5) = Point3D {4.5 - 2.0, 4.5, 2.0}; + + // clang-format off + // Create literally random control points + axom::Array point_data = { + Point3D {0.4, 0.1, 0.8}, + Point3D {0.5, 0. , 0.3}, + Point3D {0.8, 0.8, 0.7}, + Point3D {0.2, 0.7, 0.6}, + Point3D {0.1, 0. , 0.6}, + Point3D {0.6, 0.1, 0.9}, + Point3D {0.3, 0.3, 0. }, + Point3D {0.1, 0.5, 0.3}, + Point3D {0.2, 0.4, 0.6}, + Point3D {0.5, 0.8, 0.1}, + Point3D {0.1, 0.9, 0.5}, + Point3D {0.1, 0.6, 0.7}, + Point3D {0.4, 1. , 0.4}, + Point3D {0.6, 0.4, 0.7}, + Point3D {0.6, 0.8, 0.2}, + Point3D {0.8, 0.3, 0.3} + }; + // clang-format on + + BPatch nonsense_patch(point_data, 3, 3); + + // Split each surface into valid subsurfaces + axom::Array valid_subsurfaces; + split_to_convex_shallow(nonsense_patch, valid_subsurfaces); + + //python_print(nonsense_patch); + //for(int n = 0; n < valid_subsurfaces.size(); ++n) + // python_print(valid_subsurfaces[n]); + + FILE* cmap_file = fopen( + "../../../../../axom_aux/cmap_data/nonsense_shape/" + "single_surface.csv", + "w"); + + int npts_u = 150; + int npts_v = 150; + double umin = -0.1, umax = 0.1; + double vmin = -0.1, vmax = 0.1; + + // Define a linear patch that represents this plane + Vector3D e1 = Vector3D({1, 0, 0}).unitVector(); + Vector3D e2 = Vector3D({0, 1, 0}).unitVector(); + Vector3D center = Vector3D {0.3733333333333331, 0.4466666666666663, 0.5}; + + Point3D controlPoints[4] = {Point3D((center + umin * e1 + vmin * e2).array()), + Point3D((center + umax * e1 + vmin * e2).array()), + Point3D((center + umin * e1 + vmax * e2).array()), + Point3D((center + umax * e1 + vmax * e2).array())}; + BPatch quad_patch(controlPoints, 1, 1); + + Point3D bad_query {0.37333333333333307, 0.44666666666666632, 0.50000000000000000}; + //winding_number(bad_query, valid_subsurfaces[13], true); + + for(double v = -0.10000000000000001; v <= vmax; v += (vmax - vmin) / npts_v) + { + printf("(u, v) = (u, %g)\n", v); + for(double u = 0.034666666666666783; u <= umax; u += (umax - umin) / npts_u) + { + Point3D query((center + u * e1 + v * e2).array()); + + double wn_casting = 0.0; + double wn_recursive = 0.0; + for(int k = 5; k < valid_subsurfaces.size(); ++k) + { + wn_casting += winding_number_casting(query, valid_subsurfaces[k], true); + wn_recursive += winding_number_recursive(query, valid_subsurfaces[k]); + + if(!axom::utilities::isNearlyEqual(wn_casting, wn_recursive, 0.1)) + { + printf("Casting: %f\n", wn_casting); + printf("Recursive: %f\n", wn_recursive); + break; + } + } + + fprintf(cmap_file, + "%.16f, %.16f, %.16f, %.16f, %.16f, %.16f, %.17f\n", + u, + v, + query[0], + query[1], + query[2], + wn_casting, + wn_recursive); + } + } + + fclose(cmap_file); +} + int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); From 5cf4494fe63271472008ccdc2d9a5f2a22fc310d Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 10 Aug 2023 14:39:55 -0700 Subject: [PATCH 024/639] Remove irrelevant updates from winding_number_casting --- src/axom/primal/geometry/BezierPatch.hpp | 87 ---- .../primal/geometry/OrientedBoundingBox.hpp | 34 +- .../operators/detail/winding_number_impl.hpp | 185 +------ src/axom/primal/operators/is_convex.hpp | 119 ----- src/axom/primal/operators/split.hpp | 89 ---- src/axom/primal/operators/winding_number.hpp | 423 +-------------- src/axom/primal/tests/primal_polygon.cpp | 112 +--- src/axom/primal/tests/primal_solid_angle.cpp | 487 ++---------------- 8 files changed, 88 insertions(+), 1448 deletions(-) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index a56649743e..9bc21ee52e 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -1320,93 +1320,6 @@ class BezierPatch p0.split_v(v, p2, p4); } - /*! - * \brief Finds two unit tangent vectors at a corner geometrically - * - * \param [in] u parameter value of the corner (should be 0 or 1) - * \param [in] v parameter value of the corner (should be 0 or 1) - * \param [out] V1 First unit tangent vector - * \param [out] V2 Second unit tangent vector - * \param [in] edge_tol Physical distance at which nodes are indistinguishable - * \param [in] EPS Numerical tolerance to identify S(u, v) as a corner - */ - template - void corner_tangent_vectors(Point& p, - Vector& V1, - Vector& V2, - double edge_tol = 1e-8, - double EPS = 0) const - { - const int ord_u = getOrder_u(); - const int ord_v = getOrder_v(); - - double edge_tol_sq = edge_tol * edge_tol; - - V1 = Vector(); - V2 = Vector(); - - // Just kidding. We're doing the clever thing now. - // Add the bounding vertices to this list counterclockwise - axom::Array> point_list; - for(int p = 0; p < ord_u; ++p) - { - point_list.push_back(m_controlPoints(p, 0)); - } - for(int q = 0; q < ord_v; ++q) - { - point_list.push_back(m_controlPoints(ord_u, q)); - } - for(int p = ord_u; p > 0; --p) - { - point_list.push_back(m_controlPoints(p, ord_v)); - } - for(int q = ord_v; q > 0; --q) - { - point_list.push_back(m_controlPoints(0, q)); - } - - const int num_points = point_list.size(); - int start_idx; - if(squared_distance(p, m_controlPoints(0, 0)) < edge_tol_sq) - start_idx = 0; - else if(squared_distance(p, m_controlPoints(ord_u, 0)) < edge_tol_sq) - start_idx = ord_u; - else if(squared_distance(p, m_controlPoints(ord_u, ord_v)) < edge_tol_sq) - start_idx = ord_u + ord_v; - else if(squared_distance(p, m_controlPoints(0, ord_v)) < edge_tol_sq) - start_idx = 2 * ord_u + ord_v; - else - return; // Point is not a corner - - // Loop over points counterclockwise - for(int i = 0; i < num_points; ++i) - { - if(squared_distance(point_list[start_idx], - point_list[(start_idx + i) % num_points]) > edge_tol_sq) - { - V1 = Vector(point_list[start_idx], - point_list[(start_idx + i) % num_points]) - .unitVector(); - break; - } - } - - // Loop over points clockwise - for(int i = 0; i < num_points; ++i) - { - if(squared_distance( - point_list[start_idx], - point_list[(start_idx - i + num_points) % num_points]) > edge_tol_sq) - { - V2 = - Vector(point_list[start_idx], - point_list[(start_idx - i + num_points) % num_points]) - .unitVector(); - break; - } - } - } - /*! * \brief Predicate to check if the Bezier patch is approximately planar * diff --git a/src/axom/primal/geometry/OrientedBoundingBox.hpp b/src/axom/primal/geometry/OrientedBoundingBox.hpp index 9e30f840fd..088ba9896e 100644 --- a/src/axom/primal/geometry/OrientedBoundingBox.hpp +++ b/src/axom/primal/geometry/OrientedBoundingBox.hpp @@ -106,19 +106,6 @@ class OrientedBoundingBox */ OrientedBoundingBox(const PointType* pts, int n); - /*! - * \brief Constructor. Creates an oriented bounding box with given center, - * axes, and extents. Normalizes axes and sets any negative extent to 0. - * \param [in] c center of OBB - * \param [in] u axes of OBB - * \param [in] e extents of OBB - * \note Axes are made orthonormal, but if they don't span, some will be - * set to 0. - */ - OrientedBoundingBox(const PointType& c, - const VectorType (&u)[NDIMS], - const VectorType& e); - /*! * \brief Constructor. Creates an oriented bounding box from a collection of * points with the given axes, which are assumed to be orthonormal. @@ -486,7 +473,7 @@ OrientedBoundingBox::OrientedBoundingBox(const PointType* pts, } c /= static_cast(n); this->m_c = Point(c); - + // save space for pts minus the centroid NumericArray diff; @@ -517,21 +504,6 @@ OrientedBoundingBox::OrientedBoundingBox(const PointType* pts, this->m_e = maxima; } -//------------------------------------------------------------------------------ -template -OrientedBoundingBox::OrientedBoundingBox(const Point& c, - const Vector (&u)[NDIMS], - const Vector& e) -{ - this->m_c = Point(c); - for(int i = 0; i < NDIMS; i++) - { - this->m_u[i] = Vector(u[i]); - } - this->m_e = Vector(e); - this->checkAndFix(); -} - //------------------------------------------------------------------------------ template OrientedBoundingBox::OrientedBoundingBox(const OrientedBoundingBox& other) @@ -623,9 +595,9 @@ template T OrientedBoundingBox::volume() const { double vol = 1.0; - for (int i = 0; i < NDIMS; ++i) + for(int i = 0; i < NDIMS; ++i) { - vol*= this->m_e[i]; + vol *= this->m_e[i]; } return vol; } diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 0c980a8f7e..fe96c6da2f 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -462,17 +462,13 @@ double stokes_winding_number_adaptive(const Point& query, } } - constexpr int MAX_DEPTH = 25; + constexpr int MAX_DEPTH = 15; if(depth >= MAX_DEPTH || axom::utilities::isNearlyEqualRelative(quad_fine[0] + quad_fine[1], quad_coarse, quad_tol, 1e-10)) { - if(depth >= MAX_DEPTH) - { - printf(""); - } return 0.25 * M_1_PI * (quad_fine[0] + quad_fine[1]); } else @@ -495,185 +491,6 @@ double stokes_winding_number_adaptive(const Point& query, } #endif -/// Return FALSE if the nearest point is an endpoint. -/// Given by Algorithm 3 in [Maa 2003] -template -bool point_nearest_bezier_curve(const Point& p, - const Polygon& poly) -{ - const int N = poly.numVertices() - 1; - if(N <= 1) return true; - - // Store the vectors used multiple times - Vector P0P(poly[0], p); - Vector PPN(p, poly[N]); - Vector PNP0(poly[N], poly[0]); - - // Check the more likely condition first - double R3 = -PNP0.dot(PPN); - double R4 = PNP0.dot(P0P); - if(R3 * R4 <= 0) return true; - - double R1 = P0P.dot(Vector(poly[0], poly[1])); - double R2 = PPN.dot(Vector(poly[N - 1], poly[N])); - if(R1 >= 0 && R2 >= 0) return true; - - return false; -} - -/// Return FALSE if nearest point is on the boundary -/// Given by Algorithm 4 in [Maa 2003] -template -bool point_nearest_bezier_patch(const Point& point, - const BezierPatch& bPatch, - double EPS = 1e-8) -{ - const int ord_u = bPatch.getOrder_u(); - const int ord_v = bPatch.getOrder_v(); - bool flag = false; - - Polygon controlPoly; - for(int q = 0; q <= ord_v; ++q) - { - controlPoly.clear(); - for(int p = 0; p <= ord_u; ++p) - { - controlPoly.addVertex(bPatch(p, q)); - } - - if(point_nearest_bezier_curve(point, controlPoly)) - { - flag = true; - break; - } - } - - if(flag == false) - { - return false; - } - - flag = false; - for(int p = 0; p <= ord_u; ++p) - { - controlPoly.clear(); - for(int q = 0; q <= ord_v; ++q) - { - controlPoly.addVertex(bPatch(p, q)); - } - - if(point_nearest_bezier_curve(point, controlPoly)) - { - flag = true; - break; - } - } - - if(flag == false) - { - return false; - } - - return true; -} - -/*! - * \brief Find the point on a BezierPatch closest to a point close to the surface - * - * \param [in] p The query point to test - * \param [in] bPatch The BezierPatch object - * \param [out] min_u The u-coordinate of the closest point - * \param [out] min_v The v-coordinate of the closest point - * - * Apply the Newton-Raphson method to minimize the distance function. - * - * \note This is only meant to be used for `winding_number()`, - * as Newton's method is unstable for far away points. - * - * \return The closest point on the surface - */ -template -bool near_field_projection(const Point& p, - const BezierPatch& bPatch, - double& min_u, - double& min_v, - double edge_tol = 1e-8, - double EPS = 1e-8) -{ - min_u = 0.5; - min_v = 0.5; - Point S; - Vector Sp, Su, Sv, Suu, Svv, Suv; - double A00, A01, A10, A11, det; - double b0, b1; - double delu, delv; - double damp = 1.0; - - // TODO: Compute Sp, Su, Sv, Suu, Svv, Suv MUCH more efficiently - // by using the same intermediates from de Casteljau - constexpr int max_iter = 10; - for(int i = 0; i < max_iter; ++i) - { - // Get all derivatives necessary for Newton step - bPatch.evaluate_second_derivatives(min_u, min_v, S, Su, Sv, Suu, Svv, Suv); - Sp = Vector(p, S); - - if(Sp.squared_norm() < edge_tol * edge_tol) - { - return true; - } - - if(axom::utilities::isNearlyEqual(Su.dot(Sp), 0.0, EPS) && - axom::utilities::isNearlyEqual(Sv.dot(Sp), 0.0, EPS)) - { - return true; - } - - A00 = Sp.dot(Suu) + Su.dot(Su); - A10 = A01 = Sp.dot(Suv) + Su.dot(Sv); - A11 = Sp.dot(Svv) + Sv.dot(Sv); - det = (A00 * A11 - A01 * A10); - - // If the iteration fails, try to fix it with - // a different initial condition - if(axom::utilities::isNearlyEqual(det, 0.0, PRIMAL_TINY)) - { - if(i == max_iter) - { - min_u = min_v = 0.5; - return false; - } - min_u = 1.0 / (i + 1); - min_v = 1.0 / (i + 2); - continue; - } - - b0 = -Sp.dot(Su); - b1 = -Sp.dot(Sv); - - delu = damp * (A11 * b0 - A01 * b1) / det; - delv = damp * (-A10 * b0 + A00 * b1) / det; - damp *= 1; - - min_u = axom::utilities::clampVal(min_u + delu, 0.0, 1.0); - min_v = axom::utilities::clampVal(min_v + delv, 0.0, 1.0); - } - - if((axom::utilities::isNearlyEqual(bPatch.du(min_u, min_v).squared_norm(), - 0.0, - EPS) && - axom::utilities::isNearlyEqual(bPatch.dv(min_u, min_v).squared_norm(), - 0.0, - EPS)) || - Vector(p, bPatch.evaluate(min_u, min_v)).squared_norm() < - edge_tol * edge_tol) - { - return true; - } - - return false; -} - } // end namespace detail } // end namespace primal } // end namespace axom diff --git a/src/axom/primal/operators/is_convex.hpp b/src/axom/primal/operators/is_convex.hpp index 140b842c96..c84313e18a 100644 --- a/src/axom/primal/operators/is_convex.hpp +++ b/src/axom/primal/operators/is_convex.hpp @@ -65,125 +65,6 @@ bool is_convex(const Polygon& poly, double EPS = 1e-8) return true; } -/*! - * \brief Determines if a 3D polygon defined by ordered vertices is convex - * - * \param [in] poly The polygon - * - * Uses dot products to detect whether vertices extend in the "convex" direction. - * Uses the edge P[0]P[N] as a reference, meaning its adjacent edges are - * always considered to be oriented correctly. - * - * Algorithm adapted from: - * Y. L. Ma, W.T. Hewitt. "Point inversion and projection for NURBS curve - * and surface: Control polygon approach" - * Computer Aided Geometric Design 20(2):79-99, May 2003. - * \note Only defined in 2D - * - * \return A boolean value indicating convexity - */ -template -bool is_convex(const Polygon& poly, double EPS = 1e-8) -{ - int n = poly.numVertices() - 1; - if(n + 1 < 3) - { - return true; // Triangles and lines are convex - } - - for(int i = 1; i < n; i++) - { - // For each non-endpoint, check if that point and one of the endpoints - // are on the same side as the segment connecting the adjacent nodes - const Vector v0(poly[i - 1], poly[i]); - const Vector v1(poly[i - 1], poly[i + 1]); - const Vector v2(poly[i - 1], poly[(i <= n / 2) ? n : 0]); - - // Equivalent to (v1 x v0) dot (v1 x v2) > 0 - if(v1.squared_norm() * v0.dot(v2) - v1.dot(v2) * v1.dot(v0) > EPS) - { - return false; - } - } - - return true; -} - -/* - * Check if a convex polygon is "shallow," which we define as every line - * that is normal to an edge of the polygon intersects only that edge - * and the edge P[n]P[0]. - * - * This is true when ang(P[n]P[0]P[1]) + ang(P[n-1]P[n]P[0]) < 90, - * and every interior angle is greater than 90 degrees - */ -template -bool is_shallow(const Polygon& poly, double EPS = 1e-8) -{ - // max index for vertices in the full polygon - const int n_full = poly.numVertices() - 1; - if(n_full + 1 < 2) - { - return true; // lines and points are shallow - } - - int n = 0; // max index for vertices in the nondegenerate polygon - Polygon simple_poly; - simple_poly.addVertex(poly[0]); - - for(int i = 1; i < n_full; ++i) - { - if(squared_distance(simple_poly[n], poly[i]) > 1e-8) - { - simple_poly.addVertex(poly[i]); - n++; - } - } - - if((n > 0) && (squared_distance(simple_poly[0], poly[n_full]) > 1e-8) && - (squared_distance(simple_poly[n - 1], poly[n_full]) > 1e-8)) - { - simple_poly.addVertex(poly[poly.numVertices() - 1]); - n++; - } - - if(n + 1 < 2) - { - return true; // lines and points are shallow - } - - // Check two edges connected to P[n]P[0]. - auto compute_angle = [](const Point& a, - const Point& b, - const Point& c) -> double { - Vector v1, v2; - v1 = Vector(b, a).unitVector(); - v2 = Vector(b, c).unitVector(); - - return acos(axom::utilities::clampVal(v1.dot(v2), -1.0, 1.0)); - }; - - // Check endpoints - if(compute_angle(simple_poly[n], simple_poly[0], simple_poly[1]) + - compute_angle(simple_poly[n - 1], simple_poly[n], simple_poly[0]) >= - 0.5 * M_PI) - { - return false; - } - - // Iterate over the middle vertices - for(int i = 1; i < n; ++i) - { - if(compute_angle(simple_poly[i - 1], simple_poly[i], simple_poly[i + 1]) < - 0.5 * M_PI) - { - return false; - } - } - - return true; -} - } // namespace primal } // namespace axom diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 00fa10dc29..6b852bfe63 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -81,95 +81,6 @@ void split(const Octahedron& oct, out.push_back(Tet(oct[Q], oct[S], oct[U], C)); }; -/*! - * \brief Splits a BezierPatch object into valid subpatches for winding number computation - * - * \param [in] bPatch BezierPatch to split - * \param [out] out The \a axom::Array of BezierPatch objects; a set of SuperConvex - * components of c are appended to out. - * - * - * Uses a bisection method, splitting the patch recursively until each section - * is convex + shallow. - * - */ -template -void split_to_convex_shallow(const BezierPatch& bPatch, - axom::Array>& out) -{ - using Poly = Polygon; - using Patch = BezierPatch; - - const int ord_u = bPatch.getOrder_u(); - const int ord_v = bPatch.getOrder_v(); - Poly control_slice; - - bool is_valid = true; - - // If ord_u > ord_v, then check order u slices (block 1) first - // else, check order v slices (block 2) first - for(int i = 0; i < 2; ++i) - { - switch((ord_v > ord_u) != (i == 0)) - { - // Check slices that are fixed in v, - // which are of order u - case(true): - { - for(int q = 0; is_valid && q <= ord_v; ++q) - { - control_slice.clear(); - for(int p = 0; p <= ord_u; ++p) - { - control_slice.addVertex(bPatch(p, q)); - } - - if(!is_convex(control_slice) || !is_shallow(control_slice)) - { - is_valid = false; - Patch p1, p2; - bPatch.split_u(0.5, p1, p2); - split_to_convex_shallow(p1, out); - split_to_convex_shallow(p2, out); - } - } - - break; - } - // Check slices that are fixed in u, - // which are of order v - case(false): - { - for(int p = 0; is_valid && p <= ord_u; ++p) - { - control_slice.clear(); - for(int q = 0; q <= ord_v; ++q) - { - control_slice.addVertex(bPatch(p, q)); - } - - if(!is_convex(control_slice) || !is_shallow(control_slice)) - { - is_valid = false; - Patch p1, p2; - bPatch.split_v(0.5, p1, p2); - split_to_convex_shallow(p1, out); - split_to_convex_shallow(p2, out); - } - } - - break; - } - } - } - - // If we fall out of the loop, then add it to the list - if(is_valid) - { - out.push_back(Patch(bPatch)); - } -} - } // namespace primal } // namespace axom diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index f82ff5e204..094dfe7231 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -216,7 +216,7 @@ double winding_number(const Point& q, double edge_tol = 1e-8, double EPS = 1e-8) { - return detail::curve_winding_number_recursive(q, c, false, edge_tol, EPS); + return detail::curve_winding_number(q, c, false, edge_tol, EPS); } /*! @@ -241,8 +241,7 @@ double winding_number(const Point& q, double ret_val = 0.0; for(int i = 0; i < cpoly.numEdges(); i++) { - ret_val += - detail::curve_winding_number_recursive(q, cpoly[i], false, edge_tol, EPS); + ret_val += detail::curve_winding_number(q, cpoly[i], false, edge_tol, EPS); } return ret_val; @@ -452,365 +451,15 @@ int winding_number(const Point& query, return std::lround(wn); } -#ifdef AXOM_USE_MFEM - -template -double winding_number_casting(const Point& query, - const BezierPatch& bPatch, - const bool isValidSurface = false, - const double edge_tol = 1e-5, - const double quad_tol = 1e-6, - const double EPS = 1e-8) -{ - const int ord_u = bPatch.getOrder_u(); - const int ord_v = bPatch.getOrder_v(); - const bool patchIsRational = bPatch.isRational(); - const double edge_tol_sq = edge_tol * edge_tol; - - if(ord_u <= 0 || ord_v <= 0) - { - return 0.0; - } - - // If the patch isn't valid, then we need to split it and - // apply the algorithm to each component. - double wn = 0.0; - if(!isValidSurface) - { - axom::Array> valid_subsurfaces; - split_to_convex_shallow(bPatch, valid_subsurfaces); - - for(auto& surf : valid_subsurfaces) - { - wn += winding_number_casting(query, surf, true, edge_tol, quad_tol, EPS); - } - - return wn; - } - - // Fix the number of quadrature nodes arbitrarily, but high enough - // to `catch` near singularities for refinement - constexpr int quad_npts = 100; - - // Early return if the patch is approximately polygonal. - // Very slight variations in curvature requires small EPS tolerance - if(bPatch.isPolygonal(EPS)) - { - return winding_number( - query, - Polygon(axom::Array>( - {bPatch(0, 0), bPatch(ord_u, 0), bPatch(ord_u, ord_v), bPatch(0, ord_v)})), - edge_tol, - PRIMAL_TINY); - } - - /* - * To use Stokes theorem, we need to either identify a separating plane between - * the query and the surface (dodge), or a ray that intersects the - * surface at only a single point (pierce). - */ - CurvedPolygon boundingPoly(4); - detail::SingularityAxis field_direction; - - // Check if we dodge an axis-aligned bounding box, - // since most surfaces satisfy this condition. - BoundingBox bBox(bPatch.boundingBox().expand(edge_tol)); - const bool exterior_x = - bBox.getMin()[0] > query[0] || query[0] > bBox.getMax()[0]; - const bool exterior_y = - bBox.getMin()[1] > query[1] || query[1] > bBox.getMax()[1]; - const bool exterior_z = - bBox.getMin()[2] > query[2] || query[2] > bBox.getMax()[2]; - - if(exterior_y || exterior_z) - { - field_direction = detail::SingularityAxis::x; - } - else if(exterior_x || exterior_z) - { - field_direction = detail::SingularityAxis::y; - } - else if(exterior_x || exterior_y) - { - field_direction = detail::SingularityAxis::z; - } - else - { - // Otherwise, we can apply a rotation until we fit a z-aligned field. - field_direction = detail::SingularityAxis::rotated; - numerics::Matrix rotator; - - // Lambda to generate a 3D rotation matrix from an angle and axis - // Formulation from https://en.wikipedia.org/wiki/Rotation_matrix#Axis_and_angle - auto angleAxisRotMatrix = - [](double theta, const Vector& axis) -> numerics::Matrix { - const auto unitized = axis.unitVector(); - const double x = unitized[0], y = unitized[1], z = unitized[2]; - const double c = cos(theta), s = sin(theta), C = 1 - c; - - auto matx = numerics::Matrix::zeros(3, 3); - - matx(0, 0) = x * x * C + c; - matx(0, 1) = x * y * C - z * s; - matx(0, 2) = x * z * C + y * s; - - matx(1, 0) = y * x * C + z * s; - matx(1, 1) = y * y * C + c; - matx(1, 2) = y * z * C - x * s; - - matx(2, 0) = z * x * C - y * s; - matx(2, 1) = z * y * C + x * s; - matx(2, 2) = z * z * C + c; - - return matx; - }; - - // Lambda to rotate the input point using the provided rotation matrix - auto rotate_point = [&query](const numerics::Matrix& matx, - const Point input) -> Point { - Vector shifted(query, input); - Vector rotated; - numerics::matrix_vector_multiply(matx, shifted.data(), rotated.data()); - return Point( - {rotated[0] + query[0], rotated[1] + query[1], rotated[2] + query[2]}); - }; - - // Next, check the oriented bounding box defined by the patch's control points - // If we are exterior to it, then we can guarantee a separating plane. - // Note: The ideal check would be against the convex hull of the control points - OrientedBoundingBox oBox(bPatch.orientedBoundingBox().expand(edge_tol)); - if(oBox.contains(query)) - { - Vector cast_ray, closest_normal, closest_vector; - - // Need to do projection to find an axis that pierces the surface ONLY once - // and does so at an interior point - double min_u, min_v; - detail::near_field_projection(query, bPatch, min_u, min_v, edge_tol, EPS); - bool supposedToBeOnBoundary = - !detail::point_nearest_bezier_patch(query, bPatch); - - Point closest_point = bPatch.evaluate(min_u, min_v); - - closest_vector = Vector(closest_point, query); - int on_boundary = (min_u < EPS) || (min_u > 1 - EPS) || (min_v < EPS) || - (min_v > 1 - EPS); - - // Compute the normal to the surface at the closest point - closest_normal = bPatch.normal(min_u, min_v); - - // Need to do extra adjustments if we don't have a defined normal - if(axom::utilities::isNearlyEqual(closest_normal.squared_norm(), - 0.0, - PRIMAL_TINY)) - { - closest_normal = - bPatch.normal(axom::utilities::clampVal(min_u, EPS, 1 - EPS), - axom::utilities::clampVal(min_v, EPS, 1 - EPS)); - - // If that doesn't work, then it is likely (heuristic) that the interior - // is empty everywhere, and the winding number is zero. - if(axom::utilities::isNearlyEqual(closest_normal.squared_norm(), - 0.0, - PRIMAL_TINY)) - { - return 0.0; - } - } - closest_normal = closest_normal.unitVector(); - - //return closest_vector.dot(closest_normal); - - // If the query is on the surface, then we don't need to do any adjustment, - // as the induced discontinuity in the integrand is removable - if(closest_vector.squared_norm() < edge_tol_sq) - { - cast_ray = closest_normal; - wn = 0.0; - } - // Otherwise, we need to adjust for the contribution of a small removed - // disk around the ray we cast. - else - { - closest_vector = closest_vector.unitVector(); - - // Check orientation relative to the surface - double dot_prod = closest_vector.dot(closest_normal); - - if(on_boundary) - { - Vector closest_orthog; - if(axom::utilities::isNearlyEqual(closest_vector[0], - closest_vector[1], - EPS)) - closest_orthog = - Vector({closest_vector[2], - closest_vector[2], - -closest_vector[0] - closest_vector[1]}) - .unitVector(); - else - closest_orthog = Vector({-closest_vector[1] - closest_vector[2], - closest_vector[0], - closest_vector[0]}) - .unitVector(); - //cast_ray = closest_orthog; - cast_ray = closest_normal; - - printf("==========Closest point is on a boundary!==========\n"); - printf("Are we supposed to be on the boundary? %s\n", - (supposedToBeOnBoundary ? "Yes!" : "No!")); - //python_print(closest_vector, query); - python_print(closest_orthog, query, "green"); - python_print(closest_normal, query, "red"); - python_print(closest_vector, closest_point, "blue"); - //python_print(closest_normal, closest_point); - python_print(bPatch); - python_print(query); - python_print(closest_point); - std::cout << closest_vector.dot(closest_normal) << std::endl; - printf("===================================================\n"); - } - // If the closest point isinterior, we can safely pierce the surface, - // since the ray cast won't hit a boundary - else - { - cast_ray = closest_vector; - wn = (dot_prod > 0 ? -1.0 : 1.0) * 0.5; - printf("-----------Closest point is on the interor!-----------\n"); - printf("Are we supposed to be on the boundary? %s\n", - (supposedToBeOnBoundary ? "Yes!" : "No!")); - //python_print(closest_vector, query); - python_print(cast_ray, query, "green"); - python_print(closest_vector, closest_point, "blue"); - python_print(bPatch); - python_print(query); - python_print(closest_point); - std::cout << closest_vector.dot(closest_normal) << std::endl; - printf("------------------------------------------------------\n"); - } - } - - // Rotate the surface so that the cast ray is oriented with k_hat - Vector axis = {cast_ray[1], -cast_ray[0], 0.0}; - double ang = acos(axom::utilities::clampVal(cast_ray[2], -1.0, 1.0)); - - rotator = angleAxisRotMatrix(ang, axis); - } - else - { - // Get a vector perpendicular to the normal of the separating plane - Vector axis, sn(query, closest_point(query, oBox)); - sn = sn.unitVector(); - - if(axom::utilities::isNearlyEqual(sn[0], sn[1], EPS)) - axis = Vector({sn[2], sn[2], -sn[0] - sn[1]}).unitVector(); - else - axis = Vector({-sn[1] - sn[2], sn[0], sn[0]}).unitVector(); - - // We will rotate sn around axis until it is - // perpendicular to the plane spanned by k_hat and the axis - double ang, xy_norm = axis[0] * axis[0] + axis[1] * axis[1]; - - // Only need to avoid an exact divide by zero - if(axom::utilities::isNearlyEqual(xy_norm, 0.0, PRIMAL_TINY)) - { - ang = 0.0; - } - else - { - ang = (sn[2] < 0 ? 1.0 : -1.0) * - acos(axom::utilities::clampVal( - -(sn[0] * axis[1] - sn[1] * axis[0]) / sqrt(xy_norm), - -1.0, - 1.0)); - } - - rotator = angleAxisRotMatrix(ang, axis); - } - - // Collect rotated curves into the curved Polygon - // Set up the (0, v) and (1, v) isocurves, rotated - boundingPoly[0].setOrder(ord_v); - boundingPoly[2].setOrder(ord_v); - if(patchIsRational) - { - boundingPoly[0].makeRational(); - boundingPoly[2].makeRational(); - } - for(int q = 0; q <= ord_v; ++q) - { - boundingPoly[0][q] = rotate_point(rotator, bPatch(ord_u, q)); - boundingPoly[2][q] = rotate_point(rotator, bPatch(0, ord_v - q)); - - if(patchIsRational) - { - boundingPoly[0].setWeight(q, bPatch.getWeight(ord_u, q)); - boundingPoly[2].setWeight(q, bPatch.getWeight(0, ord_v - q)); - } - } - - // Set up the (u, 0) and (u, 1) isocurves - boundingPoly[1].setOrder(ord_u); - boundingPoly[3].setOrder(ord_u); - if(patchIsRational) - { - boundingPoly[1].makeRational(); - boundingPoly[3].makeRational(); - } - for(int p = 0; p <= ord_u; ++p) - { - boundingPoly[1][p] = rotate_point(rotator, bPatch(ord_u - p, ord_v)); - boundingPoly[3][p] = rotate_point(rotator, bPatch(p, 0)); - - if(patchIsRational) - { - boundingPoly[1].setWeight(p, bPatch.getWeight(ord_u - p, ord_v)); - boundingPoly[3].setWeight(p, bPatch.getWeight(p, 0)); - } - } - } - - // Set up the polygon if we don't need to do any rotation or splitting. - if(field_direction != detail::SingularityAxis::rotated) - { - boundingPoly[0] = bPatch.isocurve_u(0); - boundingPoly[0].reverseOrientation(); - - boundingPoly[1] = bPatch.isocurve_v(1); - boundingPoly[1].reverseOrientation(); - - boundingPoly[2] = bPatch.isocurve_u(1); - boundingPoly[3] = bPatch.isocurve_v(0); - } - - // Iterate over the edges of the bounding curved polygon, add up the results - for(int n = 0; n < 4; ++n) - { - // If the bounding polygon has zero length, skip it - if(squared_distance(boundingPoly[n].evaluate(0), - boundingPoly[n].evaluate(1)) < edge_tol_sq) - { - continue; - } - - wn += detail::stokes_winding_number(query, - boundingPoly[n], - field_direction, - quad_npts, - quad_tol); - } - - return wn; -} -#endif +#ifdef AXOM_USE_MFEM template -double winding_number_recursive(const Point& query, - const BezierPatch& bPatch, - const double edge_tol = 1e-8, - const double quad_tol = 1e-8, - const double EPS = 1e-8, - const int depth = 0) +double winding_number(const Point& query, + const BezierPatch& bPatch, + const double edge_tol = 1e-8, + const double quad_tol = 1e-8, + const double EPS = 1e-8, + const int depth = 0) { const int ord_u = bPatch.getOrder_u(); const int ord_v = bPatch.getOrder_v(); @@ -848,14 +497,9 @@ double winding_number_recursive(const Point& query, squared_distance(query, bPatch.evaluate(0.0 + edge_offset, 0.0)))); new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - return winding_number_recursive(query, - p2, - new_edge_tol, - quad_tol, - EPS, - depth + 1) + - winding_number_recursive(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); + return winding_number(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); } if(squared_distance(query, bPatch(ord_u, 0)) <= edge_tol_sq) { @@ -867,14 +511,9 @@ double winding_number_recursive(const Point& query, squared_distance(query, bPatch.evaluate(1.0 - edge_offset, 0.0)))); new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - return winding_number_recursive(query, - p1, - new_edge_tol, - quad_tol, - EPS, - depth + 1) + - winding_number_recursive(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); + return winding_number(query, p1, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); } if(squared_distance(query, bPatch(0, ord_v)) <= edge_tol_sq) { @@ -886,14 +525,9 @@ double winding_number_recursive(const Point& query, squared_distance(query, bPatch.evaluate(0.0, 1.0 - edge_offset)))); new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - return winding_number_recursive(query, - p1, - new_edge_tol, - quad_tol, - EPS, - depth + 1) + - winding_number_recursive(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); + return winding_number(query, p1, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); } if(squared_distance(query, bPatch(ord_u, ord_v)) <= edge_tol_sq) { @@ -905,14 +539,9 @@ double winding_number_recursive(const Point& query, squared_distance(query, bPatch.evaluate(1.0 - edge_offset, 1.0)))); new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - return winding_number_recursive(query, - p1, - new_edge_tol, - quad_tol, - EPS, - depth + 1) + - winding_number_recursive(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p3, new_edge_tol, quad_tol, EPS, depth + 1); + return winding_number(query, p1, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p3, new_edge_tol, quad_tol, EPS, depth + 1); } /* @@ -957,10 +586,10 @@ double winding_number_recursive(const Point& query, { BezierPatch p1, p2, p3, p4; bPatch.split(0.5, 0.5, p1, p2, p3, p4); - return winding_number_recursive(query, p1, edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p2, edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p3, edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p4, edge_tol, quad_tol, EPS, depth + 1); + return winding_number(query, p1, edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p2, edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p3, edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p4, edge_tol, quad_tol, EPS, depth + 1); } // Otherwise, we can apply a rotation to a z-aligned field. @@ -1089,6 +718,8 @@ double winding_number_recursive(const Point& query, return wn; } +#endif + //@} } // namespace primal diff --git a/src/axom/primal/tests/primal_polygon.cpp b/src/axom/primal/tests/primal_polygon.cpp index 6917d34bdf..bf448225b7 100644 --- a/src/axom/primal/tests/primal_polygon.cpp +++ b/src/axom/primal/tests/primal_polygon.cpp @@ -244,137 +244,43 @@ TEST(primal_polygon, convexity) poly.addVertex(PointType {0, 1}); EXPECT_TRUE(is_convex(poly)); - axom::Array convex_verts = axom::Array( + // Duplicate points should not affect convexity + vertices = axom::Array( {PointType {0, 0}, PointType {0, 1}, PointType {1, 1}, PointType {1, 0}}); - axom::Array concave_verts = axom::Array( - {PointType {0, 0}, PointType {0, 1}, PointType {0.1, 0.1}, PointType {1, 0}}); - axom::Array nonsimple_verts = axom::Array( - {PointType {0, 0}, PointType {1, 1}, PointType {0, 1}, PointType {1, 0}}); - poly.clear(); - - // Duplicate points and straight edges should not affect convexity for(int i = 0; i < 4; i++) { for(int j = 0; j < 3; j++) // Duplicate each element 3 times { - poly.addVertex(convex_verts[i]); + poly.addVertex(vertices[i]); } - - // Add midpoints between each duplicated vertex - poly.addVertex( - PointType::midpoint(convex_verts[i], convex_verts[(i + 1) % 4])); } EXPECT_TRUE(is_convex(poly)); // Verify checks up to rotation of vertices - for(int i = 0; i < 4; i++) - { - poly.clear(); - for(int j = 0; j < 4; j++) - { - poly.addVertex(concave_verts[(j + i) % 4]); - } - EXPECT_FALSE(is_convex(poly)); - } - - for(int i = 0; i < 4; i++) - { - poly.clear(); - for(int j = 0; j < 4; j++) - { - poly.addVertex(nonsimple_verts[(j + i) % 4]); - } - EXPECT_FALSE(is_convex(poly)); - } - - for(int i = 0; i < 4; i++) - { - poly.clear(); - for(int j = 0; j < 4; j++) - { - poly.addVertex(convex_verts[(j + i) % 4]); - } - EXPECT_TRUE(is_convex(poly)); - } -} - -//------------------------------------------------------------------------------ -TEST(primal_polygon, convexity_3d) -{ - using PolygonType = axom::primal::Polygon; - using PointType = axom::primal::Point; - - axom::Array vertices({PointType {0, 0, 0}, PointType {1, 1, 0}}); - PolygonType poly(vertices); - - // Segments and Triangles are always convex - EXPECT_TRUE(is_convex(poly)); - - poly.addVertex(PointType {0, 1, 0}); - EXPECT_TRUE(is_convex(poly)); - - axom::Array convex_verts = - axom::Array({PointType {0, 0, 0}, - PointType {0, 1, 0}, - PointType {1, 1, 0}, - PointType {1, 0, 0}}); - axom::Array concave_verts = - axom::Array({PointType {0, 0, 0}, - PointType {0, 1, 0}, - PointType {0.1, 0.1, 0}, - PointType {1, 0, 0}}); - axom::Array nonsimple_verts = - axom::Array({PointType {0, 0, 0}, - PointType {1, 1, 0}, - PointType {0, 1, 0}, - PointType {1, 0, 0}}); - - poly.clear(); - - // Duplicate points and straight edges should not affect convexity - for(int i = 0; i < 4; i++) - { - for(int j = 0; j < 3; j++) // Duplicate each element 3 times - { - poly.addVertex(convex_verts[i]); - } - - // Add midpoints between each duplicated vertex - poly.addVertex( - PointType::midpoint(convex_verts[i], convex_verts[(i + 1) % 4])); - } - - EXPECT_TRUE(is_convex(poly)); + vertices = axom::Array( + {PointType {0, 0}, PointType {1, 1}, PointType {1, 0}, PointType {0, 1}}); - // Verify checks up to rotation of vertices for(int i = 0; i < 4; i++) { poly.clear(); for(int j = 0; j < 4; j++) { - poly.addVertex(concave_verts[(j + i) % 4]); + poly.addVertex(vertices[(j + i) % 4]); } EXPECT_FALSE(is_convex(poly)); } - for(int i = 0; i < 4; i++) - { - poly.clear(); - for(int j = 0; j < 4; j++) - { - poly.addVertex(nonsimple_verts[(j + i) % 4]); - } - EXPECT_FALSE(is_convex(poly)); - } + vertices = axom::Array( + {PointType {0, 0}, PointType {0, 1}, PointType {1, 1}, PointType {1, 0}}); for(int i = 0; i < 4; i++) { poly.clear(); for(int j = 0; j < 4; j++) { - poly.addVertex(convex_verts[(j + i) % 4]); + poly.addVertex(vertices[(j + i) % 4]); } EXPECT_TRUE(is_convex(poly)); } diff --git a/src/axom/primal/tests/primal_solid_angle.cpp b/src/axom/primal/tests/primal_solid_angle.cpp index e9597acb47..a81ca4e2f3 100644 --- a/src/axom/primal/tests/primal_solid_angle.cpp +++ b/src/axom/primal/tests/primal_solid_angle.cpp @@ -11,6 +11,7 @@ #include "axom/fmt.hpp" #include "gtest/gtest.h" + // C++ headers #include #include @@ -480,12 +481,10 @@ TEST(primal_solid_angle, selfintersecting_quadrilateral) //------------------------------------------------------------------------------ TEST(primal_solid_angle, planar_bezierpatch) { - return; - using Point3D = primal::Point; using Vector3D = primal::Vector; using Polygon = primal::Polygon; - using BezierPatch = primal::BezierPatch; + using BezierPatch = primal::BezierPatch; // Define normal vector for the quadrilateral Vector3D v1 = Vector3D({0.0, 1.0, 2.0}).unitVector(); @@ -506,7 +505,6 @@ TEST(primal_solid_angle, planar_bezierpatch) // Construct a first order Bezier patch out of the same vertices Point3D controlPoints[4] = {quad[1], quad[0], quad[2], quad[3]}; BezierPatch quad_patch(controlPoints, 1, 1); - const bool isValidPatch = false; Point3D queries[8] = {Point3D {0.0, 4.0, 1.0}, Point3D {-1.0, 2.0, 2.0}, @@ -521,7 +519,7 @@ TEST(primal_solid_angle, planar_bezierpatch) for(int n = 0; n < 8; ++n) { EXPECT_NEAR(winding_number(queries[n], quad), - winding_number_recursive(queries[n], quad_patch, isValidPatch), + winding_number(queries[n], quad_patch), 1e-10); } @@ -533,25 +531,18 @@ TEST(primal_solid_angle, planar_bezierpatch) const double EPS = 0; for(int n = 0; n < 8; ++n) { - EXPECT_NEAR(winding_number_recursive(queries[n], quad_patch, isValidPatch), - winding_number_recursive(queries[n], - quad_patch, - isValidPatch, - quad_tol, - edge_tol, - EPS), + EXPECT_NEAR(winding_number(queries[n], quad_patch), + winding_number(queries[n], quad_patch, quad_tol, edge_tol, EPS), 1e-10); } } //------------------------------------------------------------------------------ -TEST(primal_solid_angle, bezierpatch_sphere) +TEST(primal_integral, bezierpatch_sphere) { - return; - using Point3D = primal::Point; using Vector3D = primal::Vector; - using BPatch = primal::BezierPatch; + using BPatch = primal::BezierPatch; double rt2 = sqrt(2), rt3 = sqrt(3), rt6 = sqrt(6); @@ -626,474 +617,92 @@ TEST(primal_solid_angle, bezierpatch_sphere) } } - // Split each surface into valid subsurfaces - axom::Array valid_subsurfaces; - for(int n = 0; n < 6; ++n) - { - split_to_convex_shallow(sphere_faces[n], valid_subsurfaces); - } - const int num_subsurfaces = valid_subsurfaces.size(); - const bool isValidSubsurface = true; - - // Iterate over points of interest, i.e. close to a boundary. - // Specifically need to exercise the ray casting steps - const int idx = 3; // Select a difficult face - Vector3D query_directions[11] = { - Vector3D(valid_subsurfaces[idx].evaluate(0.50, 0.50)), // 0 - Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.95)), // 1 - Vector3D(valid_subsurfaces[idx].evaluate(0.999, 0.995)), // 2 - Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 0.9995)), // 3 - Vector3D(valid_subsurfaces[idx].evaluate(0.99999, 0.99995)), // 4 - Vector3D(valid_subsurfaces[idx].evaluate(1.0, 0.9999)), // 5 - Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 1.0)), // 6 - Vector3D(valid_subsurfaces[idx].evaluate(1.0, 1.0)), // 7 - Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.95)), // 8 - Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.05)), // 9 - Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.05))}; // 10 + // Iterate over points of interest, i.e. axis/edge/vertex aligned + Vector3D query_directions[12] = {Vector3D({0.0, 0.0, 1.0}).unitVector(), + Vector3D({0.0, 1.0, 0.0}).unitVector(), + Vector3D({1.0, 0.0, 0.0}).unitVector(), + Vector3D({0.0, 1.0, 1.0}).unitVector(), + Vector3D({1.0, 0.0, 1.0}).unitVector(), + Vector3D({1.0, 1.0, 0.0}).unitVector(), + Vector3D({1.0, 1.0, 1.0}).unitVector(), + Vector3D({0.0, 0.1, 1.0}).unitVector(), + Vector3D({0.1, 1.0, 0.0}).unitVector(), + Vector3D({1.0, 0.0, 0.1}).unitVector(), + Vector3D(sphere_faces[0].evaluate(0, 0.6)), + Vector3D(sphere_faces[0].evaluate(0.6, 0))}; + + const double quad_tol = 1e-5; + const double EPS = 1e-10; const double edge_tol = 1e-6; const double edge_offset = 1e-5; - const double quad_tol = 1e-5; - const double EPS = 1e-8; - // Test some easy cases auto origin = Point3D({0.0, 0.0, 0.0}); auto near_origin = Point3D({0.1, -0.2, 0.15}); double origin_wn = 0.0, near_origin_wn = 0.0; - for(int k = 0; k < num_subsurfaces; ++k) + for(int k = 0; k < 6; ++k) { - origin_wn += winding_number_recursive(origin, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - near_origin_wn += winding_number_recursive(near_origin, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); + origin_wn += winding_number(origin, sphere_faces[k], edge_tol, quad_tol, EPS); + near_origin_wn += + winding_number(near_origin, sphere_faces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(origin_wn, 1.0, num_subsurfaces * quad_tol); - EXPECT_NEAR(near_origin_wn, 1.0, num_subsurfaces * quad_tol); + EXPECT_NEAR(origin_wn, 1.0, 6 * quad_tol); + EXPECT_NEAR(near_origin_wn, 1.0, 6 * quad_tol); - for(int i = 0; i < 11; ++i) + for(int i = 0; i < 12; ++i) { // Pick point close to the surface auto far_query = Point3D(10 * query_directions[i].array()); double far_wn = 0.0; - for(int k = 0; k < num_subsurfaces; ++k) + for(int k = 0; k < 6; ++k) { - far_wn += winding_number_recursive(far_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); + far_wn += + winding_number(far_query, sphere_faces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(far_wn, 0.0, num_subsurfaces * quad_tol); + EXPECT_NEAR(far_wn, 0.0, 6 * quad_tol); } // Iterate over difficult query directions for very close points - for(int i = 0; i < 11; ++i) + for(int i = 0; i < 12; ++i) { - std::cout << std::endl << i << std::endl; // Pick point close to the surface auto inner_query = Point3D((1.0 - edge_offset) * query_directions[i].array()); auto outer_query = Point3D((1.0 + edge_offset) * query_directions[i].array()); // Iterate over the patches that compose the sphere double inner_wn = 0; - double inner_wn_old = 0.0; - for(int k = 0; k < num_subsurfaces; ++k) + for(int k = 0; k < 6; ++k) { - inner_wn += winding_number_recursive(inner_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - - //inner_wn_old += winding_number_old(inner_query, - // valid_subsurfaces[k], - // edge_tol, - // quad_tol, - // EPS); - - //if(!axom::utilities::isNearlyEqual(inner_wn, inner_wn_old, 0.1)) - //{ - // printf("BPOAOFIJAEOFHFAAOEOF\n"); - // //printf("%f\n", inner_wn - inner_wn_old); - //} + inner_wn += + winding_number(inner_query, sphere_faces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(inner_wn, 1.0, num_subsurfaces * quad_tol); + EXPECT_NEAR(inner_wn, 1.0, 6 * quad_tol); // Iterate over the patches that compose the sphere double outer_wn = 0; - for(int k = 0; k < num_subsurfaces; ++k) + for(int k = 0; k < 6; ++k) { - outer_wn += winding_number_recursive(outer_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); + outer_wn += + winding_number(outer_query, sphere_faces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(outer_wn, 0.0, num_subsurfaces * quad_tol); + EXPECT_NEAR(outer_wn, 0.0, 6 * quad_tol); // Pick a point on the surface too. // Regardless of what tolerances are picked, the winding number // should lie between the values on either side when rounded auto coincident_query = Point3D(query_directions[i].array()); double coincident_wn = 0.0; - for(int k = 0; k < valid_subsurfaces.size(); ++k) - { - coincident_wn += winding_number_recursive(coincident_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - } - EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); - } -} - -TEST(primal_solid_angle, bezierpatch_degenerate_sphere) -{ - return; - - using Point2D = primal::Point; - using Point3D = primal::Point; - using Vector3D = primal::Vector; - using BCurve = primal::BezierCurve; - using BPatch = primal::BezierPatch; - - auto rotate_curve_to_patches = [](BCurve curve, BPatch patches[]) -> void { - const int ord = curve.getOrder(); - curve.makeRational(); - - for(int n = 0; n < 4; ++n) - { - patches[n].setOrder(ord, 2); - patches[n].makeRational(); - } - - for(int p = 0; p <= ord; ++p) - { - auto node = curve[p]; - patches[0](p, 0) = Point3D {node[0], 0.0, node[1]}; - patches[0](p, 1) = Point3D {node[0], node[0], node[1]}; - patches[0](p, 2) = Point3D {0.0, node[0], node[1]}; - - patches[1](p, 0) = Point3D {0.0, node[0], node[1]}; - patches[1](p, 1) = Point3D {-node[0], node[0], node[1]}; - patches[1](p, 2) = Point3D {-node[0], 0.0, node[1]}; - - patches[2](p, 0) = Point3D {-node[0], 0.0, node[1]}; - patches[2](p, 1) = Point3D {-node[0], -node[0], node[1]}; - patches[2](p, 2) = Point3D {0.0, -node[0], node[1]}; - - patches[3](p, 0) = Point3D {0.0, -node[0], node[1]}; - patches[3](p, 1) = Point3D {node[0], -node[0], node[1]}; - patches[3](p, 2) = Point3D {node[0], 0.0, node[1]}; - - for(int n = 0; n < 4; ++n) - { - patches[n].setWeight(p, 0, curve.getWeight(p)); - patches[n].setWeight(p, 1, curve.getWeight(p) / std::sqrt(2)); - patches[n].setWeight(p, 2, curve.getWeight(p)); - } - } - }; - - // Make a sphere out of 8 degenerate Bezier Patches - - // Define rational Beziers curve along the x-z axis and rotate them - Point2D curve1_nodes[] = {Point2D {0, 1}, Point2D {1, 1}, Point2D {1, 0}}; - double curve1_weights[] = {1, 1 / std::sqrt(2), 1}; - BCurve curve1(curve1_nodes, curve1_weights, 2); - BPatch patches1[4]; - rotate_curve_to_patches(curve1, patches1); - - Point2D curve2_nodes[] = {Point2D {1, 0}, Point2D {1, -1}, Point2D {0, -1}}; - double curve2_weights[] = {1, 1 / std::sqrt(2), 1}; - BCurve curve2(curve2_nodes, curve2_weights, 2); - BPatch patches2[4]; - rotate_curve_to_patches(curve2, patches2); - - // Split each surface into valid subsurfaces - axom::Array valid_subsurfaces; - for(int n = 0; n < 4; ++n) - { - split_to_convex_shallow(patches1[n], valid_subsurfaces); - split_to_convex_shallow(patches2[n], valid_subsurfaces); - } - - const int num_subsurfaces = valid_subsurfaces.size(); - const bool isValidSubsurface = true; - - // Iterate over points of interest, i.e. close to a boundary. - // Specifically need to exercise the ray casting steps - int idx = 6; // Select a difficult face - Vector3D query_directions[11] = { - Vector3D(valid_subsurfaces[idx].evaluate(0.50, 0.50)), // 0 - Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.95)), // 1 - Vector3D(valid_subsurfaces[idx].evaluate(0.999, 0.995)), // 2 - Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 0.9995)), // 3 - Vector3D(valid_subsurfaces[idx].evaluate(0.99999, 0.99995)), // 4 - Vector3D(valid_subsurfaces[idx].evaluate(1.0, 0.9999)), // 5 - Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 1.0)), // 6 - Vector3D(valid_subsurfaces[idx].evaluate(1.0, 1.0)), // 7 - Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.95)), // 8 - Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.05)), // 9 - Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.05))}; // 10 - - const double edge_tol = 1e-6; - const double edge_offset = 1e-5; - - const double quad_tol = 1e-5; - const double EPS = 1e-8; - - // Test some easy cases - auto origin = Point3D({0.0, 0.0, 0.0}); - auto near_origin = Point3D({0.1, -0.2, 0.15}); - - double origin_wn = 0.0, near_origin_wn = 0.0; - for(int k = 0; k < num_subsurfaces; ++k) - { - origin_wn += winding_number_recursive(origin, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - near_origin_wn += winding_number_recursive(near_origin, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - } - EXPECT_NEAR(origin_wn, 1.0, num_subsurfaces * quad_tol); - EXPECT_NEAR(near_origin_wn, 1.0, num_subsurfaces * quad_tol); - - for(int i = 0; i < 11; ++i) - { - auto far_query = Point3D(10 * query_directions[i].array()); - - double far_wn = 0.0; - for(int k = 0; k < num_subsurfaces; ++k) - { - far_wn += winding_number_recursive(far_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - } - EXPECT_NEAR(far_wn, 0.0, num_subsurfaces * quad_tol); - } - - // Iterate over difficult query directions for very close points - for(int i = 0; i < 11; ++i) - { - std::cout << i << std::endl; - - // Pick point close to the surface - auto inner_query = Point3D((1.0 - edge_offset) * query_directions[i].array()); - auto outer_query = Point3D((1.0 + edge_offset) * query_directions[i].array()); - - // Iterate over the patches that compose the sphere - double inner_wn = 0; - for(int k = 0; k < num_subsurfaces; ++k) - { - inner_wn += winding_number_recursive(inner_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - } - EXPECT_NEAR(inner_wn, 1.0, num_subsurfaces * quad_tol); - - // Iterate over the patches that compose the sphere - double outer_wn = 0; - for(int k = 0; k < num_subsurfaces; ++k) - { - outer_wn += winding_number_recursive(outer_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - } - EXPECT_NEAR(outer_wn, 0.0, num_subsurfaces * quad_tol); - - // Pick a point on the surface too. - auto coincident_query = Point3D(query_directions[i].array()); - double coincident_wn = 0.0; - for(int k = 0; k < valid_subsurfaces.size(); ++k) - { - coincident_wn += winding_number_recursive(coincident_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - } - EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); - } -} - -TEST(primal_solid_angle, bezierpatch_empty_interior) -{ - return; - - using Point2D = primal::Point; - using Point3D = primal::Point; - using Vector3D = primal::Vector; - using BPatch = primal::BezierPatch; - - // clang-format off - axom::Array point_data = { - Point3D {2.5,0.2500,0.000}, Point3D {2.5,0.2500,0.000}, Point3D {2.5,0.2500,0.000}, Point3D{2.5,0.2500,0.000}, - Point3D {2.7,1.1250,0.750}, Point3D {2.7,1.1250,0.750}, Point3D {2.7,1.1250,0.750}, Point3D{2.7,1.1250,0.750}, - Point3D {2.6,1.8125,1.125}, Point3D {2.6,1.8125,1.125}, Point3D {2.6,1.8125,1.125}, Point3D{2.6,1.8125,1.125}, - Point3D {2.5,2.5000,1.125}, Point3D {2.5,2.5000,1.125}, Point3D {2.5,2.5000,1.125}, Point3D{2.5,2.5000,1.125} - }; - // clang-format on - - // Degnerate patch with zero surface area - BPatch bad_patch(point_data, 3, 3); - - Point3D surface_point = bad_patch.evaluate(0.2, 0.8); - Point3D other_point = Point3D {surface_point[0] + 0.01, - surface_point[1] - 0.01, - surface_point[2] + 0.01}; - - EXPECT_NEAR(winding_number_recursive(surface_point, bad_patch), 0.0, 1e-5); - EXPECT_NEAR(winding_number_recursive(other_point, bad_patch), 0.0, 1e-5); -} - -TEST(primal_solid_angle, bezierpatch_nonsense_geometry) -{ - using Point2D = primal::Point; - using Point3D = primal::Point; - using Vector3D = primal::Vector; - using BPatch = primal::BezierPatch; - - // Get a hand-coded control polygon - BPatch test_patch(1, 5); - test_patch(0, 0) = Point3D {-5.0, 3.0, 0.0}; - test_patch(0, 1) = Point3D {-4.0, 4.0, 0.0}; - test_patch(0, 2) = Point3D {-2.0, 5.0, 0.0}; - test_patch(0, 3) = Point3D {0.0, 5.5, 0.0}; - test_patch(0, 4) = Point3D {2.0, 5.5, 0.0}; - test_patch(0, 5) = Point3D {4.5, 4.5, 0.0}; - - test_patch(1, 0) = Point3D {-7.0, 3.0, 2.0}; - test_patch(1, 1) = Point3D {-4.0 - 2.0, 4.0, 2.0}; - test_patch(1, 2) = Point3D {-2.0 - 2.0, 5.0, 2.0}; - test_patch(1, 3) = Point3D {0.0 - 2.0, 5.5, 2.0}; - test_patch(1, 4) = Point3D {2.0 - 2.0, 5.5, 2.0}; - test_patch(1, 5) = Point3D {4.5 - 2.0, 4.5, 2.0}; - - // clang-format off - // Create literally random control points - axom::Array point_data = { - Point3D {0.4, 0.1, 0.8}, - Point3D {0.5, 0. , 0.3}, - Point3D {0.8, 0.8, 0.7}, - Point3D {0.2, 0.7, 0.6}, - Point3D {0.1, 0. , 0.6}, - Point3D {0.6, 0.1, 0.9}, - Point3D {0.3, 0.3, 0. }, - Point3D {0.1, 0.5, 0.3}, - Point3D {0.2, 0.4, 0.6}, - Point3D {0.5, 0.8, 0.1}, - Point3D {0.1, 0.9, 0.5}, - Point3D {0.1, 0.6, 0.7}, - Point3D {0.4, 1. , 0.4}, - Point3D {0.6, 0.4, 0.7}, - Point3D {0.6, 0.8, 0.2}, - Point3D {0.8, 0.3, 0.3} - }; - // clang-format on - - BPatch nonsense_patch(point_data, 3, 3); - - // Split each surface into valid subsurfaces - axom::Array valid_subsurfaces; - split_to_convex_shallow(nonsense_patch, valid_subsurfaces); - - //python_print(nonsense_patch); - //for(int n = 0; n < valid_subsurfaces.size(); ++n) - // python_print(valid_subsurfaces[n]); - - FILE* cmap_file = fopen( - "../../../../../axom_aux/cmap_data/nonsense_shape/" - "single_surface.csv", - "w"); - - int npts_u = 150; - int npts_v = 150; - double umin = -0.1, umax = 0.1; - double vmin = -0.1, vmax = 0.1; - - // Define a linear patch that represents this plane - Vector3D e1 = Vector3D({1, 0, 0}).unitVector(); - Vector3D e2 = Vector3D({0, 1, 0}).unitVector(); - Vector3D center = Vector3D {0.3733333333333331, 0.4466666666666663, 0.5}; - - Point3D controlPoints[4] = {Point3D((center + umin * e1 + vmin * e2).array()), - Point3D((center + umax * e1 + vmin * e2).array()), - Point3D((center + umin * e1 + vmax * e2).array()), - Point3D((center + umax * e1 + vmax * e2).array())}; - BPatch quad_patch(controlPoints, 1, 1); - - Point3D bad_query {0.37333333333333307, 0.44666666666666632, 0.50000000000000000}; - //winding_number(bad_query, valid_subsurfaces[13], true); - - for(double v = -0.10000000000000001; v <= vmax; v += (vmax - vmin) / npts_v) - { - printf("(u, v) = (u, %g)\n", v); - for(double u = 0.034666666666666783; u <= umax; u += (umax - umin) / npts_u) + for(int k = 0; k < 6; ++k) { - Point3D query((center + u * e1 + v * e2).array()); - - double wn_casting = 0.0; - double wn_recursive = 0.0; - for(int k = 5; k < valid_subsurfaces.size(); ++k) - { - wn_casting += winding_number_casting(query, valid_subsurfaces[k], true); - wn_recursive += winding_number_recursive(query, valid_subsurfaces[k]); - - if(!axom::utilities::isNearlyEqual(wn_casting, wn_recursive, 0.1)) - { - printf("Casting: %f\n", wn_casting); - printf("Recursive: %f\n", wn_recursive); - break; - } - } - - fprintf(cmap_file, - "%.16f, %.16f, %.16f, %.16f, %.16f, %.16f, %.17f\n", - u, - v, - query[0], - query[1], - query[2], - wn_casting, - wn_recursive); + coincident_wn += + winding_number(coincident_query, sphere_faces[k], edge_tol, quad_tol, EPS); } + EXPECT_LT(coincident_wn, 1.5); + EXPECT_LT(-0.5, coincident_wn); } - - fclose(cmap_file); } int main(int argc, char** argv) From 798c63e05303b0daabe11af01cbcbf503ea0ea24 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 27 Jul 2023 16:43:54 -0700 Subject: [PATCH 025/639] Add new constructor, .volume() --- .../primal/geometry/OrientedBoundingBox.hpp | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/src/axom/primal/geometry/OrientedBoundingBox.hpp b/src/axom/primal/geometry/OrientedBoundingBox.hpp index 7c0f82a446..9e30f840fd 100644 --- a/src/axom/primal/geometry/OrientedBoundingBox.hpp +++ b/src/axom/primal/geometry/OrientedBoundingBox.hpp @@ -119,6 +119,14 @@ class OrientedBoundingBox const VectorType (&u)[NDIMS], const VectorType& e); + /*! + * \brief Constructor. Creates an oriented bounding box from a collection of + * points with the given axes, which are assumed to be orthonormal. + * \param [in] pts C-style array of points + * \param [in] u axes of OBB + */ + OrientedBoundingBox(const PointType* pts, int n, const VectorType (&u)[NDIMS]); + /*! * \brief Copy Constructor. * \param [in] other The oriented bounding box to copy @@ -458,6 +466,57 @@ OrientedBoundingBox::OrientedBoundingBox(const PointType* pts, int n) this->m_c = Point(c); } +//------------------------------------------------------------------------------ +template +OrientedBoundingBox::OrientedBoundingBox(const PointType* pts, + int n, + const VectorType (&u)[NDIMS]) +{ + if(n <= 0) + { + this->clear(); + return; + } + + // Compute the centroid of the box from the centroid of the points + NumericArray c; // centroid + for(int i = 0; i < n; i++) + { + c += pts[i].array(); + } + c /= static_cast(n); + this->m_c = Point(c); + + // save space for pts minus the centroid + NumericArray diff; + + // Copy the axes from the vector + for(int i = 0; i < NDIMS; i++) + { + this->m_u[i] = Vector(u[i]); + } + + // Calculate the extents + Vector maxima; + T dot; + for(int i = 0; i < n; ++i) + { + for(int j = 0; j < NDIMS; ++j) + { + diff = pts[i].array() - c; + dot = utilities::abs( + numerics::dot_product(&(m_u[j][0]), &diff[0], NDIMS)); + if(maxima[j] < dot) + { + maxima[j] = dot; + } + } + } + + // save the extents + this->m_e = maxima; +} + //------------------------------------------------------------------------------ template OrientedBoundingBox::OrientedBoundingBox(const Point& c, @@ -559,6 +618,18 @@ OrientedBoundingBox& OrientedBoundingBox::expand(T expansion return *this; } +//------------------------------------------------------------------------------ +template +T OrientedBoundingBox::volume() const +{ + double vol = 1.0; + for (int i = 0; i < NDIMS; ++i) + { + vol*= this->m_e[i]; + } + return vol; +} + //------------------------------------------------------------------------------ template OrientedBoundingBox& OrientedBoundingBox::scale(double scaleFactor) From 8e692cd99c5a727d634e331cd58e60f50d1d7a3b Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 27 Jul 2023 16:44:25 -0700 Subject: [PATCH 026/639] Switch to switches, more careful adaptive check --- .../operators/detail/winding_number_impl.hpp | 67 ++++++++++++++++--- 1 file changed, 57 insertions(+), 10 deletions(-) diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 02c492ac4d..825a8b611a 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -311,30 +311,70 @@ double stokes_winding_number(const Point& query, // Compute one of three vector field line integrals depending on // the orientation of the original surface, indicated through ax. - if(ax == SingularityAxis::x) + switch(ax) + { + case(SingularityAxis::x): { quadrature += quad_rule.IntPoint(q).weight * (node[2] * node[0] * node_dt[1] - node[1] * node[0] * node_dt[2]) / (node[1] * node[1] + node[2] * node[2]) / node_norm; + break; } - else if(ax == SingularityAxis::y) + case(SingularityAxis::y): { quadrature += quad_rule.IntPoint(q).weight * (node[0] * node[1] * node_dt[2] - node[2] * node[1] * node_dt[0]) / (node[0] * node[0] + node[2] * node[2]) / node_norm; + break; } - else // ax == SingularityAxis::z || ax == SingularityAxis::rotated + case(SingularityAxis::z): + case(SingularityAxis::rotated): { quadrature += quad_rule.IntPoint(q).weight * (node[1] * node[2] * node_dt[0] - node[0] * node[2] * node_dt[1]) / (node[0] * node[0] + node[1] * node[1]) / node_norm; + break; + } } } - // Adaptively refine quadrature over curves if query is not far enough away. + // Adaptively refine quadrature over curves if query is not far enough away + // from the singularity axis. If rotated, assume you need to adapt. + bool needs_adapt = false; BoundingBox cBox(curve.boundingBox()); - if(squared_distance(query, cBox.getCentroid()) <= - 2 * cBox.range().squared_norm()) + Point centroid = cBox.getCentroid(); + + switch(ax) + { + case(SingularityAxis::x): + { + needs_adapt = (query[1] - centroid[1]) * (query[1] - centroid[1]) + + (query[2] - centroid[2]) * (query[2] - centroid[2]) <= + cBox.range().squared_norm(); + break; + } + case(SingularityAxis::y): + { + needs_adapt = (query[0] - centroid[0]) * (query[0] - centroid[0]) + + (query[2] - centroid[2]) * (query[2] - centroid[2]) <= + cBox.range().squared_norm(); + break; + } + case(SingularityAxis::z): + { + needs_adapt = (query[0] - centroid[0]) * (query[0] - centroid[0]) * + (query[1] - centroid[1]) * (query[1] - centroid[1]) <= + cBox.range().squared_norm(); + break; + } + case(SingularityAxis::rotated): + { + needs_adapt = true; + break; + } + } + + if(needs_adapt) { return stokes_winding_number_adaptive(query, curve, @@ -394,23 +434,30 @@ double stokes_winding_number_adaptive(const Point& query, // Compute one of three vector field line integrals depending on // the orientation of the original surface, indicated through ax. - if(ax == SingularityAxis::x) + switch(ax) + { + case(SingularityAxis::x): { quad_fine[i] += quad_rule.IntPoint(q).weight * (node[2] * node[0] * node_dt[1] - node[1] * node[0] * node_dt[2]) / (node[1] * node[1] + node[2] * node[2]) / node_norm; + break; } - else if(ax == SingularityAxis::y) + case(SingularityAxis::y): { quad_fine[i] += quad_rule.IntPoint(q).weight * (node[0] * node[1] * node_dt[2] - node[2] * node[1] * node_dt[0]) / (node[0] * node[0] + node[2] * node[2]) / node_norm; + break; } - else // ax == SingularityAxis::z || ax == SingularityAxis::rotated + case(SingularityAxis::z): + case(SingularityAxis::rotated): { quad_fine[i] += quad_rule.IntPoint(q).weight * (node[1] * node[2] * node_dt[0] - node[0] * node[2] * node_dt[1]) / (node[0] * node[0] + node[1] * node[1]) / node_norm; + break; + } } } } @@ -420,7 +467,7 @@ double stokes_winding_number_adaptive(const Point& query, axom::utilities::isNearlyEqualRelative(quad_fine[0] + quad_fine[1], quad_coarse, quad_tol, - 0.0)) + 1e-10)) { return 0.25 * M_1_PI * (quad_fine[0] + quad_fine[1]); } From 09c64ebacf0b6c40483185c0994a94cebdb5b5bd Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 27 Jul 2023 16:44:52 -0700 Subject: [PATCH 027/639] bugfix for rotating patch edges --- src/axom/primal/operators/winding_number.hpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index 5ad0ac430d..421717d35f 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -474,8 +474,8 @@ int winding_number(const Point& query, template double winding_number(const Point& query, const BezierPatch& bPatch, - const double edge_tol = 1e-8, - const double quad_tol = 1e-8, + const double edge_tol = 1e-5, + const double quad_tol = 1e-6, const double EPS = 1e-8, const int depth = 0) { @@ -596,7 +596,7 @@ double winding_number(const Point& query, } else { - // Next, check an oriented bounding box. + // Next, create an oriented box with axes defined by the patch // If we are interior to the oriented bounding box, then we // cannot guarantee a separating plane, and need geometric refinement. OrientedBoundingBox oBox(bPatch.orientedBoundingBox().expand(edge_tol)); @@ -678,12 +678,12 @@ double winding_number(const Point& query, } for(int q = 0; q <= ord_v; ++q) { - boundingPoly[0][q] = rotate_point(rotator, bPatch(ord_v, q)); + boundingPoly[0][q] = rotate_point(rotator, bPatch(ord_u, q)); boundingPoly[2][q] = rotate_point(rotator, bPatch(0, ord_v - q)); if(patchIsRational) { - boundingPoly[0].setWeight(q, bPatch.getWeight(ord_v, q)); + boundingPoly[0].setWeight(q, bPatch.getWeight(ord_u, q)); boundingPoly[2].setWeight(q, bPatch.getWeight(0, ord_v - q)); } } @@ -698,12 +698,12 @@ double winding_number(const Point& query, } for(int p = 0; p <= ord_u; ++p) { - boundingPoly[1][p] = rotate_point(rotator, bPatch(ord_u - p, ord_u)); + boundingPoly[1][p] = rotate_point(rotator, bPatch(ord_u - p, ord_v)); boundingPoly[3][p] = rotate_point(rotator, bPatch(p, 0)); if(patchIsRational) { - boundingPoly[1].setWeight(p, bPatch.getWeight(ord_u - p, ord_u)); + boundingPoly[1].setWeight(p, bPatch.getWeight(ord_u - p, ord_v)); boundingPoly[3].setWeight(p, bPatch.getWeight(p, 0)); } } @@ -712,7 +712,6 @@ double winding_number(const Point& query, // Set up the polygon if we don't need to do any rotation or splitting. if(field_direction != detail::SingularityAxis::rotated) { - // Add the relevant bounding curves to the patch. boundingPoly[0] = bPatch.isocurve_u(0); boundingPoly[0].reverseOrientation(); From 933e4852d70800eff5be0014d0508f9d8e576aab Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 27 Jul 2023 16:45:24 -0700 Subject: [PATCH 028/639] bugfix + Ma algorithms for 3D --- src/axom/primal/operators/is_convex.hpp | 103 ++++++++++++++++++- src/axom/primal/tests/primal_polygon.cpp | 122 +++++++++++++++++++++-- 2 files changed, 212 insertions(+), 13 deletions(-) diff --git a/src/axom/primal/operators/is_convex.hpp b/src/axom/primal/operators/is_convex.hpp index 8d6c32d165..a0935c19c8 100644 --- a/src/axom/primal/operators/is_convex.hpp +++ b/src/axom/primal/operators/is_convex.hpp @@ -19,9 +19,10 @@ namespace primal * * \param [in] poly The polygon * - * Uses dot products to detect whether vertices extend in the "convex" direction. - * Uses the edge P[0]P[N] as a reference, meaning its adjacent edges are - * always considered to be oriented correctly. + * A 2D polygon is convex when every line that does not contain an edge + * intersects the shape at most twice. + * Checks whether for each pair of vertices P[i-1]P[i+1], the point + * P[i] and (P[0] or P[n]) lie on the same side of the line connecting them. * * Algorithm adapted from: * Y. L. Ma, W.T. Hewitt. "Point inversion and projection for NURBS curve @@ -54,7 +55,101 @@ bool is_convex(const Polygon& poly, double EPS = 1e-8) } // Ensure other point to check against isn't adjacent - if(res1 == orientation(poly[(i < n / 2) ? n : 0], seg, EPS)) + if(res1 == orientation(poly[(i <= n / 2) ? n : 0], seg, EPS)) + { + return false; + } + } + + return true; +} + +/*! + * \brief Determines if a 3D polygon defined by ordered vertices is convex + * + * \param [in] poly The polygon + * + * Uses dot products to detect whether vertices extend in the "convex" direction. + * Uses the edge P[0]P[N] as a reference, meaning its adjacent edges are + * always considered to be oriented correctly. + * + * Algorithm adapted from: + * Y. L. Ma, W.T. Hewitt. "Point inversion and projection for NURBS curve + * and surface: Control polygon approach" + * Computer Aided Geometric Design 20(2):79-99, May 2003. + * \note Only defined in 2D + * + * \return A boolean value indicating convexity + */ +template +bool is_convex(const Polygon& poly, double EPS = 1e-8) +{ + int n = poly.numVertices() - 1; + if(n + 1 < 3) + { + return true; // Triangles and lines are convex + } + + for(int i = 1; i < n; i++) + { + // For each non-endpoint, check if that point and one of the endpoints + // are on the same side as the segment connecting the adjacent nodes + Vector v0(poly[i - 1], poly[i]); + Vector v1(poly[i - 1], poly[i + 1]); + Vector v2(poly[i - 1], poly[(i <= n / 2) ? n : 0]); + + // Equivalent to (v0 x v1) dot (v0 x v2) > 0 + if(v0.squared_norm() * v1.dot(v2) > v0.dot(v2) * v0.dot(v1)) + { + return false; + } + } + + return true; +} + +/* + * Check if a polygon is "shallow," which we define as every line + * that is normal to an edge of the polygon intersects only that edge + * and the edge P[n]P[0]. + * + * This is true when ang(P[n]P[0]P[1]) + ang(P[n-1]P[n]P[0]) < 90, + * and every interior angle is greater than 90 degrees + */ +template +bool is_shallow(const Polygon& poly, double EPS = 1e-8) +{ + // Get max index of polygon vertices + const int n = poly.numVertices() - 1; + + if(n + 1 < 2) + { + return true; // Triangles and points are shallow + } + + // Check two edges connected to P[n]P[0]. + auto compute_angle = [](const Point& a, + const Point& b, + const Point& c) -> double { + Vector v1, v2; + v1 = Vector(b, a).unitVector(); + v2 = Vector(b, c).unitVector(); + + return acos(axom::utilities::clampVal(v1.dot(v2), -1.0, 1.0)); + }; + + // Check endpoints + if(compute_angle(poly[n], poly[0], poly[1]) + + compute_angle(poly[n - 1], poly[n], poly[0]) >= + 0.5 * M_PI) + { + return false; + } + + // Iterate over the middle vertices + for(int i = 1; i < n; ++i) + { + if(compute_angle(poly[i - 1], poly[i], poly[i + 1]) < 0.5 * M_PI) { return false; } diff --git a/src/axom/primal/tests/primal_polygon.cpp b/src/axom/primal/tests/primal_polygon.cpp index bf448225b7..832e1dd652 100644 --- a/src/axom/primal/tests/primal_polygon.cpp +++ b/src/axom/primal/tests/primal_polygon.cpp @@ -244,46 +244,150 @@ TEST(primal_polygon, convexity) poly.addVertex(PointType {0, 1}); EXPECT_TRUE(is_convex(poly)); - // Duplicate points should not affect convexity - vertices = axom::Array( + axom::Array convex_verts = axom::Array( {PointType {0, 0}, PointType {0, 1}, PointType {1, 1}, PointType {1, 0}}); + axom::Array concave_verts = axom::Array( + {PointType {0, 0}, PointType {0, 1}, PointType {0.1, 0.1}, PointType {1, 0}}); + axom::Array nonsimple_verts = axom::Array( + {PointType {0, 0}, PointType {1, 1}, PointType {0, 1}, PointType {1, 0}}); + poly.clear(); + + // Duplicate points and straight edges should not affect convexity for(int i = 0; i < 4; i++) { for(int j = 0; j < 3; j++) // Duplicate each element 3 times { - poly.addVertex(vertices[i]); + poly.addVertex(convex_verts[i]); } + + // Add midpoints between each duplicated vertex + poly.addVertex( + PointType::midpoint(convex_verts[i], convex_verts[(i + 1) % 4])); } EXPECT_TRUE(is_convex(poly)); // Verify checks up to rotation of vertices - vertices = axom::Array( - {PointType {0, 0}, PointType {1, 1}, PointType {1, 0}, PointType {0, 1}}); + for(int i = 0; i < 4; i++) + { + poly.clear(); + for(int j = 0; j < 4; j++) + { + poly.addVertex(concave_verts[(j + i) % 4]); + } + EXPECT_FALSE(is_convex(poly)); + } for(int i = 0; i < 4; i++) { poly.clear(); for(int j = 0; j < 4; j++) { - poly.addVertex(vertices[(j + i) % 4]); + poly.addVertex(nonsimple_verts[(j + i) % 4]); } EXPECT_FALSE(is_convex(poly)); } - vertices = axom::Array( - {PointType {0, 0}, PointType {0, 1}, PointType {1, 1}, PointType {1, 0}}); + for(int i = 0; i < 4; i++) + { + poly.clear(); + for(int j = 0; j < 4; j++) + { + poly.addVertex(convex_verts[(j + i) % 4]); + } + EXPECT_TRUE(is_convex(poly)); + } +} + +//------------------------------------------------------------------------------ +TEST(primal_polygon, convexity_3d) +{ + using PolygonType = axom::primal::Polygon; + using PointType = axom::primal::Point; + + axom::Array vertices({PointType {0, 0, 0}, PointType {1, 1, 0}}); + PolygonType poly(vertices); + + // Segments and Triangles are always convex + EXPECT_TRUE(is_convex(poly)); + poly.addVertex(PointType {0, 1, 0}); + EXPECT_TRUE(is_convex(poly)); + + axom::Array convex_verts = + axom::Array({PointType {0, 0, 0}, + PointType {0, 1, 0}, + PointType {1, 1, 0}, + PointType {1, 0, 0}}); + axom::Array concave_verts = + axom::Array({PointType {0, 0, 0}, + PointType {0, 1, 0}, + PointType {0.1, 0.1, 0}, + PointType {1, 0, 0}}); + axom::Array nonsimple_verts = + axom::Array({PointType {0, 0, 0}, + PointType {1, 1, 0}, + PointType {0, 1, 0}, + PointType {1, 0, 0}}); + + poly.clear(); + + // Duplicate points and straight edges should not affect convexity + for(int i = 0; i < 4; i++) + { + for(int j = 0; j < 3; j++) // Duplicate each element 3 times + { + poly.addVertex(convex_verts[i]); + } + + // Add midpoints between each duplicated vertex + poly.addVertex( + PointType::midpoint(convex_verts[i], convex_verts[(i + 1) % 4])); + } + + EXPECT_TRUE(is_convex(poly)); + + // Verify checks up to rotation of vertices for(int i = 0; i < 4; i++) { poly.clear(); for(int j = 0; j < 4; j++) { - poly.addVertex(vertices[(j + i) % 4]); + poly.addVertex(concave_verts[(j + i) % 4]); + } + EXPECT_FALSE(is_convex(poly)); + } + + for(int i = 0; i < 4; i++) + { + poly.clear(); + for(int j = 0; j < 4; j++) + { + poly.addVertex(nonsimple_verts[(j + i) % 4]); + } + EXPECT_FALSE(is_convex(poly)); + } + + for(int i = 0; i < 4; i++) + { + poly.clear(); + for(int j = 0; j < 4; j++) + { + poly.addVertex(convex_verts[(j + i) % 4]); } EXPECT_TRUE(is_convex(poly)); } + + axom::Array verts_3d = + axom::Array({PointType {0, 1, 0}, + PointType {0, 1, 1}, + PointType {0, 0, 1}, + PointType {-1, 0, 1}, + PointType {-1, 0, 0}}); + PolygonType poly_3d(verts_3d); + + EXPECT_FALSE(is_convex(poly_3d)); } //------------------------------------------------------------------------------ From e04898665daef94f2c23938ed7b4f0367941045c Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 27 Jul 2023 16:45:42 -0700 Subject: [PATCH 029/639] First attempt at universal splitting --- src/axom/primal/operators/split.hpp | 64 +++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 85b6e351c9..914d737375 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -16,6 +16,7 @@ #include "axom/core/Array.hpp" #include "axom/primal/geometry/Octahedron.hpp" #include "axom/primal/geometry/Tetrahedron.hpp" +#include "axom/primal/geometry/BezierPatch.hpp" #include "axom/slic.hpp" @@ -78,6 +79,69 @@ void split(const Octahedron& oct, out.push_back(Tet(oct[Q], oct[S], oct[U], C)); }; +/*! + * \brief Splits a BezierPatch object into SuperConvex subpatches + * + * \param [in] bPatch BezierPatch to split + * \param [out] out The \a axom::Array of BezierPatch objects; a set of SuperConvex + * components of c are appended to out. + * + * + * Uses a bisection method, splitting the patch recursively until each section + * is SuperConvex (convex + shallow). + * + */ +template +void split_to_valid(const BezierPatch& bPatch, + axom::Array>& out) +{ + using Poly = Polygon; + using Patch = BezierPatch; + + const int ord_u = bPatch.getOrder_u(); + const int ord_v = bPatch.getOrder_v(); + Poly control_slice(); + + bool is_valid = true; + + // Check the slices that are fixed in u + for(int p = 0; is_valid && p <= ord_u; ++p) + { + control_slice.clear(); + for(int q = 0; q <= ord_v; ++q) + { + control_slice.addVertex(bPatch(p, q)); + } + + is_valid = is_convex(control_slice) && is_shallow(control_slice); + } + + // Check the slices that are fixed in v + for(int q = 0; is_valid && q <= ord_v; ++q) + { + control_slice.clear(); + for(int p = 0; p <= ord_u; ++p) + { + control_slice.addVertex(bPatch(p, q)); + } + is_valid = is_convex(control_slice) && is_shallow(control_slice); + } + + if(is_valid) + { + out.push_back(Patch(bPatch)); + } + else + { + Patch p1, p2, p3, p4; + bPatch.split(0.5, p1, p2, p3, p4); + split_to_valid(p1, out); + split_to_valid(p2, out); + split_to_valid(p3, out); + split_to_valid(p4, out); + } +} + } // namespace primal } // namespace axom From cc34c301043abb8e80ec194d59b2cbb1b9aaa02c Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 28 Jul 2023 12:56:31 -0700 Subject: [PATCH 030/639] Improve split to only do it across one axis if needed --- src/axom/primal/operators/split.hpp | 82 +++++++++++++++++++---------- 1 file changed, 55 insertions(+), 27 deletions(-) diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 914d737375..4c591fb814 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -18,6 +18,8 @@ #include "axom/primal/geometry/Tetrahedron.hpp" #include "axom/primal/geometry/BezierPatch.hpp" +#include "axom/primal/operators/is_convex.hpp" + #include "axom/slic.hpp" // perhaps #include split_impl.hpp here @@ -95,51 +97,77 @@ template void split_to_valid(const BezierPatch& bPatch, axom::Array>& out) { - using Poly = Polygon; + using Poly = Polygon; using Patch = BezierPatch; const int ord_u = bPatch.getOrder_u(); const int ord_v = bPatch.getOrder_v(); - Poly control_slice(); + Poly control_slice; bool is_valid = true; - // Check the slices that are fixed in u - for(int p = 0; is_valid && p <= ord_u; ++p) + // If ord_u > ord_v, then check order u slices (block 1) first + // else, check order v slices (block 2) first + for(int i = 0; i < 2; ++i) { - control_slice.clear(); - for(int q = 0; q <= ord_v; ++q) + switch((ord_v > ord_u) != (i == 0)) + { + // Check slices that are fixed in v, + // which are of order u + case(true): { - control_slice.addVertex(bPatch(p, q)); + for(int q = 0; is_valid && q <= ord_v; ++q) + { + control_slice.clear(); + for(int p = 0; p <= ord_u; ++p) + { + control_slice.addVertex(bPatch(p, q)); + } + + if(!is_convex(control_slice) || !is_shallow(control_slice)) + { + is_valid = false; + Patch p1, p2; + bPatch.split_u(0.5, p1, p2); + split_to_valid(p1, out); + split_to_valid(p2, out); + } + } + + break; } - - is_valid = is_convex(control_slice) && is_shallow(control_slice); - } - - // Check the slices that are fixed in v - for(int q = 0; is_valid && q <= ord_v; ++q) - { - control_slice.clear(); - for(int p = 0; p <= ord_u; ++p) + // Check slices that are fixed in u, + // which are of order v + case(false): { - control_slice.addVertex(bPatch(p, q)); + for(int p = 0; is_valid && p <= ord_u; ++p) + { + control_slice.clear(); + for(int q = 0; q <= ord_v; ++q) + { + control_slice.addVertex(bPatch(p, q)); + } + + if(!is_convex(control_slice) || !is_shallow(control_slice)) + { + is_valid = false; + Patch p1, p2; + bPatch.split_v(0.5, p1, p2); + split_to_valid(p1, out); + split_to_valid(p2, out); + } + } + + break; + } } - is_valid = is_convex(control_slice) && is_shallow(control_slice); } + // If we fall out of the loop, then add it to the list if(is_valid) { out.push_back(Patch(bPatch)); } - else - { - Patch p1, p2, p3, p4; - bPatch.split(0.5, p1, p2, p3, p4); - split_to_valid(p1, out); - split_to_valid(p2, out); - split_to_valid(p3, out); - split_to_valid(p4, out); - } } } // namespace primal From e639ed41e8e3dd7face480b66d956560eece1c5a Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 28 Jul 2023 12:57:10 -0700 Subject: [PATCH 031/639] Make is_valid work for degenerate shapes --- src/axom/primal/operators/is_convex.hpp | 50 +++++++++++++++++++------ 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/src/axom/primal/operators/is_convex.hpp b/src/axom/primal/operators/is_convex.hpp index a0935c19c8..140b842c96 100644 --- a/src/axom/primal/operators/is_convex.hpp +++ b/src/axom/primal/operators/is_convex.hpp @@ -9,6 +9,7 @@ #include "axom/primal/geometry/Segment.hpp" #include "axom/primal/geometry/Polygon.hpp" #include "axom/primal/operators/orientation.hpp" +#include "axom/primal/operators/squared_distance.hpp" namespace axom { @@ -94,12 +95,12 @@ bool is_convex(const Polygon& poly, double EPS = 1e-8) { // For each non-endpoint, check if that point and one of the endpoints // are on the same side as the segment connecting the adjacent nodes - Vector v0(poly[i - 1], poly[i]); - Vector v1(poly[i - 1], poly[i + 1]); - Vector v2(poly[i - 1], poly[(i <= n / 2) ? n : 0]); + const Vector v0(poly[i - 1], poly[i]); + const Vector v1(poly[i - 1], poly[i + 1]); + const Vector v2(poly[i - 1], poly[(i <= n / 2) ? n : 0]); - // Equivalent to (v0 x v1) dot (v0 x v2) > 0 - if(v0.squared_norm() * v1.dot(v2) > v0.dot(v2) * v0.dot(v1)) + // Equivalent to (v1 x v0) dot (v1 x v2) > 0 + if(v1.squared_norm() * v0.dot(v2) - v1.dot(v2) * v1.dot(v0) > EPS) { return false; } @@ -109,7 +110,7 @@ bool is_convex(const Polygon& poly, double EPS = 1e-8) } /* - * Check if a polygon is "shallow," which we define as every line + * Check if a convex polygon is "shallow," which we define as every line * that is normal to an edge of the polygon intersects only that edge * and the edge P[n]P[0]. * @@ -119,12 +120,36 @@ bool is_convex(const Polygon& poly, double EPS = 1e-8) template bool is_shallow(const Polygon& poly, double EPS = 1e-8) { - // Get max index of polygon vertices - const int n = poly.numVertices() - 1; + // max index for vertices in the full polygon + const int n_full = poly.numVertices() - 1; + if(n_full + 1 < 2) + { + return true; // lines and points are shallow + } + + int n = 0; // max index for vertices in the nondegenerate polygon + Polygon simple_poly; + simple_poly.addVertex(poly[0]); + + for(int i = 1; i < n_full; ++i) + { + if(squared_distance(simple_poly[n], poly[i]) > 1e-8) + { + simple_poly.addVertex(poly[i]); + n++; + } + } + + if((n > 0) && (squared_distance(simple_poly[0], poly[n_full]) > 1e-8) && + (squared_distance(simple_poly[n - 1], poly[n_full]) > 1e-8)) + { + simple_poly.addVertex(poly[poly.numVertices() - 1]); + n++; + } if(n + 1 < 2) { - return true; // Triangles and points are shallow + return true; // lines and points are shallow } // Check two edges connected to P[n]P[0]. @@ -139,8 +164,8 @@ bool is_shallow(const Polygon& poly, double EPS = 1e-8) }; // Check endpoints - if(compute_angle(poly[n], poly[0], poly[1]) + - compute_angle(poly[n - 1], poly[n], poly[0]) >= + if(compute_angle(simple_poly[n], simple_poly[0], simple_poly[1]) + + compute_angle(simple_poly[n - 1], simple_poly[n], simple_poly[0]) >= 0.5 * M_PI) { return false; @@ -149,7 +174,8 @@ bool is_shallow(const Polygon& poly, double EPS = 1e-8) // Iterate over the middle vertices for(int i = 1; i < n; ++i) { - if(compute_angle(poly[i - 1], poly[i], poly[i + 1]) < 0.5 * M_PI) + if(compute_angle(simple_poly[i - 1], simple_poly[i], simple_poly[i + 1]) < + 0.5 * M_PI) { return false; } From 68c720b54e437d36cf2f0e2e836ce407df6e74b8 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 28 Jul 2023 13:00:52 -0700 Subject: [PATCH 032/639] Fix broken test --- src/axom/primal/tests/primal_polygon.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/axom/primal/tests/primal_polygon.cpp b/src/axom/primal/tests/primal_polygon.cpp index 832e1dd652..6917d34bdf 100644 --- a/src/axom/primal/tests/primal_polygon.cpp +++ b/src/axom/primal/tests/primal_polygon.cpp @@ -378,16 +378,6 @@ TEST(primal_polygon, convexity_3d) } EXPECT_TRUE(is_convex(poly)); } - - axom::Array verts_3d = - axom::Array({PointType {0, 1, 0}, - PointType {0, 1, 1}, - PointType {0, 0, 1}, - PointType {-1, 0, 1}, - PointType {-1, 0, 0}}); - PolygonType poly_3d(verts_3d); - - EXPECT_FALSE(is_convex(poly_3d)); } //------------------------------------------------------------------------------ From 526d5196fda78845f1bef5153c75a5144e3950df Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 09:38:49 -0700 Subject: [PATCH 033/639] Add a second derivative for curves --- src/axom/primal/geometry/BezierCurve.hpp | 86 +++++++++++++++++++++++- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/src/axom/primal/geometry/BezierCurve.hpp b/src/axom/primal/geometry/BezierCurve.hpp index cabdaece1f..68cade0571 100644 --- a/src/axom/primal/geometry/BezierCurve.hpp +++ b/src/axom/primal/geometry/BezierCurve.hpp @@ -68,8 +68,6 @@ class BezierCurve using BoundingBoxType = BoundingBox; using OrientedBoundingBoxType = OrientedBoundingBox; - AXOM_STATIC_ASSERT_MSG((NDIMS == 2) || (NDIMS == 3), - "A Bezier Curve object may be defined in 2-D or 3-D"); AXOM_STATIC_ASSERT_MSG( std::is_arithmetic::value, "A Bezier Curve must be defined using an arithmetic type"); @@ -463,6 +461,90 @@ class BezierCurve } } + /*! + * \brief Computes the second derivative of a Bezier curve at a particular parameter value \a t + * + * \param [in] t parameter value at which to compute tangent + * \return p the 2nd derivative vector of the Bezier curve at t + * + * \note We typically find the second derivative of the curve at \a t between 0 and 1 + */ + VectorType dtdt(T t) const + { + using axom::utilities::lerp; + VectorType val; + + const int ord = getOrder(); + std::vector dCarray(ord + 1); + + if(isRational()) + { + axom::Array dWarray(ord + 1); + + // Run algorithm from Farin '83 on each dimension + for(int i = 0; i < NDIMS; ++i) + { + for(int p = 0; p <= ord; ++p) + { + dCarray[p] = m_controlPoints[p][i] * m_weights[p]; + dWarray[p] = m_weights[p]; + } + + // Stop two steps early and take finite differences of the last three values + for(int p = 1; p <= ord - 2; ++p) + { + const int end = ord - p; + for(int k = 0; k <= end; ++k) + { + dCarray[k] = lerp(dCarray[k], dCarray[k + 1], t); + dWarray[k] = lerp(dWarray[k], dWarray[k + 1], t); + } + } + + // Need the rest of the de casteljau weights for the formula + double w1[2] = {lerp(dWarray[0], dWarray[1], t), + lerp(dWarray[1], dWarray[2], t)}; + double w0[1] = {lerp(w1[0], w1[1], t)}; + + val[i] = ord * dWarray[2] * + (2 * ord * w1[0] * w1[0] - (ord - 1) * dWarray[0] * w0[0] - + 2 * w1[0] * w0[0]) * + (dCarray[2] / dWarray[2] - dCarray[1] / dWarray[1]); + val[i] -= ord * dWarray[0] * + (2 * ord * w1[1] * w1[1] - (ord - 1) * dWarray[2] * w0[0] - + 2 * w1[1] * w0[0]) * + (dCarray[1] / dWarray[1] - dCarray[0] / dWarray[0]); + val[i] /= w0[0] * w0[0] * w0[0]; + } + + return val; + } + else + { + // Run de Casteljau algorithm on each dimension + for(int i = 0; i < NDIMS; ++i) + { + for(int p = 0; p <= ord; ++p) + { + dCarray[p] = m_controlPoints[p][i]; + } + + // stop two steps early and take finite difference of last three values + for(int p = 1; p <= ord - 2; ++p) + { + const int end = ord - p; + for(int k = 0; k <= end; ++k) + { + dCarray[k] = lerp(dCarray[k], dCarray[k + 1], t); + } + } + val[i] = ord * (ord - 1) * (dCarray[2] - 2 * dCarray[1] + dCarray[0]); + } + + return val; + } + } + /*! * \brief Splits a Bezier curve into two Bezier curves at a given parameter value * From 9905c3a2949c733a0fc0783449c380098cdde541 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 09:49:45 -0700 Subject: [PATCH 034/639] Add template back to BezierPatch --- src/axom/primal/geometry/BezierPatch.hpp | 48 +++++++++---------- src/axom/primal/operators/split.hpp | 6 +-- src/axom/primal/operators/winding_number.hpp | 5 +- src/axom/primal/tests/primal_bezier_patch.cpp | 36 +++++++------- src/axom/primal/tests/primal_solid_angle.cpp | 6 +-- 5 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index 86e0f9560e..346e377b18 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -32,12 +32,12 @@ namespace axom namespace primal { // Forward declare the templated classes and operator functions -template +template class BezierPatch; /*! \brief Overloaded output operator for Bezier Patches*/ -template -std::ostream& operator<<(std::ostream& os, const BezierPatch& bPatch); +template +std::ostream& operator<<(std::ostream& os, const BezierPatch& bPatch); /*! * \class BezierPatch @@ -55,22 +55,22 @@ std::ostream& operator<<(std::ostream& os, const BezierPatch& bPatch); * Gerald Farin, "Algorithms for rational Bezier curves" * Computer-Aided Design, Volume 15, Number 2, 1983, */ -template +template class BezierPatch { public: - using PointType = Point; - using VectorType = Vector; - using PlaneType = Plane; + using PointType = Point; + using VectorType = Vector; + using PlaneType = Plane; using CoordsVec = axom::Array; using CoordsMat = axom::Array; using WeightsVec = axom::Array; using WeightsMat = axom::Array; - using BoundingBoxType = BoundingBox; - using OrientedBoundingBoxType = OrientedBoundingBox; - using BezierCurveType = primal::BezierCurve; + using BoundingBoxType = BoundingBox; + using OrientedBoundingBoxType = OrientedBoundingBox; + using BezierCurveType = primal::BezierCurve; AXOM_STATIC_ASSERT_MSG( std::is_arithmetic::value, @@ -383,15 +383,15 @@ class BezierPatch }; /// Checks equality of two Bezier Patches - friend inline bool operator==(const BezierPatch& lhs, - const BezierPatch& rhs) + friend inline bool operator==(const BezierPatch& lhs, + const BezierPatch& rhs) { return (lhs.m_controlPoints == rhs.m_controlPoints) && (lhs.m_weights == rhs.m_weights); } - friend inline bool operator!=(const BezierPatch& lhs, - const BezierPatch& rhs) + friend inline bool operator!=(const BezierPatch& lhs, + const BezierPatch& rhs) { return !(lhs == rhs); } @@ -580,7 +580,7 @@ class BezierPatch axom::Array dWarray(ord_u + 1); for(int q = 0; q <= ord_v; ++q) { - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { for(int p = 0; p <= ord_u; ++p) { @@ -626,7 +626,7 @@ class BezierPatch // Otherwise, do De Casteljau along the v-axis for(int q = 0; q <= ord_v; ++q) { - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { for(int p = 0; p <= ord_u; ++p) { @@ -688,7 +688,7 @@ class BezierPatch axom::Array dWarray(ord_v + 1); for(int p = 0; p <= ord_u; ++p) { - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { for(int q = 0; q <= ord_v; ++q) { @@ -733,7 +733,7 @@ class BezierPatch // Otherwise, do De Casteljau along the u-axis for(int p = 0; p <= ord_u; ++p) { - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { for(int q = 0; q <= ord_v; ++q) { @@ -870,7 +870,7 @@ class BezierPatch double temp_weight = lerp(p2.getWeight(k, q), p2.getWeight(k + 1, q), u); - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { p2(k, q)[i] = lerp(p2.getWeight(k, q) * p2(k, q)[i], p2.getWeight(k + 1, q) * p2(k + 1, q)[i], @@ -892,7 +892,7 @@ class BezierPatch { p1(0, q) = m_controlPoints(0, q); - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { for(int p = 1; p <= ord_u; ++p) { @@ -941,7 +941,7 @@ class BezierPatch double temp_weight = lerp(p2.getWeight(p, k), p2.getWeight(p, k + 1), v); - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { p2(p, k)[i] = lerp(p2.getWeight(p, k) * p2(p, k)[i], p2.getWeight(p, k + 1) * p2(p, k + 1)[i], @@ -963,7 +963,7 @@ class BezierPatch { p1(p, 0) = m_controlPoints(p, 0); - for(int i = 0; i < 3; ++i) + for(int i = 0; i < NDIMS; ++i) { for(int q = 1; q <= ord_v; ++q) { @@ -1188,8 +1188,8 @@ class BezierPatch //------------------------------------------------------------------------------ /// Free functions related to BezierPatch //------------------------------------------------------------------------------ -template -std::ostream& operator<<(std::ostream& os, const BezierPatch& bPatch) +template +std::ostream& operator<<(std::ostream& os, const BezierPatch& bPatch) { bPatch.print(os); return os; diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 4c591fb814..07c3058836 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -94,11 +94,11 @@ void split(const Octahedron& oct, * */ template -void split_to_valid(const BezierPatch& bPatch, - axom::Array>& out) +void split_to_valid(const BezierPatch& bPatch, + axom::Array>& out) { using Poly = Polygon; - using Patch = BezierPatch; + using Patch = BezierPatch; const int ord_u = bPatch.getOrder_u(); const int ord_v = bPatch.getOrder_v(); diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index 421717d35f..2b8670dc96 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -473,7 +473,7 @@ int winding_number(const Point& query, */ template double winding_number(const Point& query, - const BezierPatch& bPatch, + const BezierPatch& bPatch, const double edge_tol = 1e-5, const double quad_tol = 1e-6, const double EPS = 1e-8, @@ -490,8 +490,7 @@ double winding_number(const Point& query, // Early return if the patch is approximately polygonal. // Very slight variations in curvature requires small EPS tolerance - constexpr int MAX_DEPTH = 10; - if(depth >= MAX_DEPTH || bPatch.isPolygonal(EPS)) + if(bPatch.isPolygonal(EPS)) { return winding_number( query, diff --git a/src/axom/primal/tests/primal_bezier_patch.cpp b/src/axom/primal/tests/primal_bezier_patch.cpp index c6da191bfe..e7bcebd46d 100644 --- a/src/axom/primal/tests/primal_bezier_patch.cpp +++ b/src/axom/primal/tests/primal_bezier_patch.cpp @@ -22,7 +22,7 @@ namespace primal = axom::primal; TEST(primal_bezierpatch, constructor) { using CoordType = double; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; using CoordsMat = BezierPatchType::CoordsMat; { @@ -60,7 +60,7 @@ TEST(primal_bezierpatch, set_order) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; SLIC_INFO("Test adding control points to an empty Bezier patch"); @@ -104,7 +104,7 @@ TEST(primal_bezierpatch, array_constructors) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; SLIC_INFO("Testing point array constructor"); @@ -178,7 +178,7 @@ TEST(primal_bezierpatch, axom_array_constructors) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; SLIC_INFO("Testing point array constructor"); @@ -283,7 +283,7 @@ TEST(primal_bezierpatch, make_rational) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 1; const int order_v = 1; @@ -340,7 +340,7 @@ TEST(primal_bezierpatch, evaluate) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 3; const int order_v = 2; @@ -405,7 +405,7 @@ TEST(primal_bezierpatch, isocurve) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 3; const int order_v = 2; @@ -437,7 +437,7 @@ TEST(primal_bezierpatch, evaluate_tall) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 2; const int order_v = 3; @@ -483,7 +483,7 @@ TEST(primal_bezierpatch, evaluation_degenerate) using CoordType = double; using PointType = primal::Point; using BezierCurveType = primal::BezierCurve; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order = 3; PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, @@ -514,7 +514,7 @@ TEST(primal_bezierpatch, tangent) using CoordType = double; using PointType = primal::Point; using VectorType = primal::Vector; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 3; const int order_v = 2; @@ -566,7 +566,7 @@ TEST(primal_bezierpatch, normal) using CoordType = double; using PointType = primal::Point; using VectorType = primal::Vector; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 3; const int order_v = 2; @@ -604,7 +604,7 @@ TEST(primal_bezierpatch, split_degenerate) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 0; const int order_v = 0; @@ -636,7 +636,7 @@ TEST(primal_bezierpatch, split_curve) using CoordType = double; using PointType = primal::Point; using BezierCurveType = primal::BezierCurve; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order = 3; PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, @@ -680,7 +680,7 @@ TEST(primal_bezierpatch, split_plane) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 1; const int order_v = 1; @@ -717,7 +717,7 @@ TEST(primal_bezierpatch, split_patch) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int order_u = 3; const int order_v = 2; @@ -757,7 +757,7 @@ TEST(primal_bezierpatch, isPlanar) using CoordType = double; using PointType = primal::Point; using VectorType = primal::Vector; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; // order (0, 0) -- always true { @@ -837,7 +837,7 @@ TEST(primal_bezierpatch, reverse_orientation) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; SLIC_INFO("Testing reverseOrientation(axis) on Bezier patches"); @@ -929,7 +929,7 @@ TEST(primal_bezierpatch, rational_evaluation_split) const int DIM = 3; using CoordType = double; using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; + using BezierPatchType = primal::BezierPatch; const int ord_u = 3; const int ord_v = 3; diff --git a/src/axom/primal/tests/primal_solid_angle.cpp b/src/axom/primal/tests/primal_solid_angle.cpp index a81ca4e2f3..041bb1dc9a 100644 --- a/src/axom/primal/tests/primal_solid_angle.cpp +++ b/src/axom/primal/tests/primal_solid_angle.cpp @@ -484,7 +484,7 @@ TEST(primal_solid_angle, planar_bezierpatch) using Point3D = primal::Point; using Vector3D = primal::Vector; using Polygon = primal::Polygon; - using BezierPatch = primal::BezierPatch; + using BezierPatch = primal::BezierPatch; // Define normal vector for the quadrilateral Vector3D v1 = Vector3D({0.0, 1.0, 2.0}).unitVector(); @@ -538,11 +538,11 @@ TEST(primal_solid_angle, planar_bezierpatch) } //------------------------------------------------------------------------------ -TEST(primal_integral, bezierpatch_sphere) +TEST(primal_solid_angle, bezierpatch_sphere) { using Point3D = primal::Point; using Vector3D = primal::Vector; - using BPatch = primal::BezierPatch; + using BPatch = primal::BezierPatch; double rt2 = sqrt(2), rt3 = sqrt(3), rt6 = sqrt(6); From a2ad67f4e98a483c2bb97bfa2ee3fc6b0d400551 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 09:50:41 -0700 Subject: [PATCH 035/639] Add second derivatives for Bezier Patches --- src/axom/primal/geometry/BezierPatch.hpp | 56 ++++++++++++ src/axom/primal/tests/primal_bezier_curve.cpp | 37 ++++++++ src/axom/primal/tests/primal_bezier_patch.cpp | 87 +++++++++++++++++++ .../primal/tests/primal_rational_bezier.cpp | 38 ++++++++ 4 files changed, 218 insertions(+) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index 346e377b18..dee832f444 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -788,6 +788,8 @@ class BezierPatch */ VectorType du(T u, T v) const { return isocurve_v(v).dt(u); } + VectorType dudu(T u, T v) const { return isocurve_v(v).dtdt(u); } + /*! * \brief Computes a tangent of a Bezier patch at a particular parameter value (\a u, \a v) along the v axis * @@ -799,6 +801,60 @@ class BezierPatch */ VectorType dv(T u, T v) const { return isocurve_u(u).dt(v); } + VectorType dvdv(T u, T v) const { return isocurve_u(u).dtdt(v); } + + VectorType dudv(T u, T v) const + { + using axom::utilities::lerp; + + const int ord_u = getOrder_u(); + const int ord_v = getOrder_v(); + + // Construct the hodograph in the two directions, then evaluate it + + if(!isRational()) + { + BezierPatch hodograph(ord_u - 1, ord_v - 1); + // Iterate over each isocurve along v + for(int q = 0; q <= ord_v - 1; ++q) + { + for(int p = 0; p <= ord_u - 1; ++p) + { + for(int i = 0; i < NDIMS; ++i) + { + hodograph(p, q)[i] = ord_u * ord_v * + (m_controlPoints(p + 1, q + 1)[i] - m_controlPoints(p + 1, q)[i] - + m_controlPoints(p, q + 1)[i] + m_controlPoints(p, q)[i]); + } + } + } + + return Vector(hodograph.evaluate(u, v)); + } + else + { + BezierPatch nonrational(ord_u, ord_v); + BezierPatch weights(ord_u, ord_v); + for(int p = 0; p <= ord_u; ++p) + { + for(int q = 0; q <= ord_v; ++q) + { + nonrational(p, q) = m_controlPoints(p, q); + nonrational(p, q).array() *= m_weights(p, q); + weights(p, q)[0] = m_weights(p, q); + } + } + + // Return a wildly inefficient calculation of the rational derivative + return (nonrational.dudv(u, v) - weights.dv(u, v)[0] * du(u, v) - + weights.du(u, v)[0] * dv(u, v) - + weights.dudv(u, v)[0] * Vector(evaluate(u, v))) / + weights.evaluate(u, v)[0]; + } + } + + VectorType dvdu(T u, T v) const { return dudv(u, v); } + /*! * \brief Computes the normal vector of a Bezier patch at a particular parameter value (\a u, \a v) * diff --git a/src/axom/primal/tests/primal_bezier_curve.cpp b/src/axom/primal/tests/primal_bezier_curve.cpp index 755b22e946..c572d3b5aa 100644 --- a/src/axom/primal/tests/primal_bezier_curve.cpp +++ b/src/axom/primal/tests/primal_bezier_curve.cpp @@ -179,6 +179,43 @@ TEST(primal_beziercurve_, tangent) } } +//------------------------------------------------------------------------------ +TEST(primal_beziercurve_, second_derivative) +{ + SLIC_INFO("Testing Bezier second derivative calculation"); + + const int DIM = 3; + using CoordType = double; + using PointType = primal::Point; + using VectorType = primal::Vector; + using BezierCurveType = primal::BezierCurve; + + const int order = 3; + PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, + PointType {1.3, 1.6, 1.8}, + PointType {2.9, 2.4, 2.3}, + PointType {3.2, 3.5, 3.0}}; + + BezierCurveType b2Curve(data, order); + + VectorType midtval = VectorType {-1.2, 2.1, -0.3}; + VectorType starttval = VectorType {5.4, 2.4, -1.8}; + VectorType endtval = VectorType {-7.8, 1.8, 1.2}; + + // Evaluate the curve at several parameter values + // Curve should be tangent to control net at endpoints + VectorType eval0 = b2Curve.dtdt(0.0); + VectorType eval1 = b2Curve.dtdt(1.0); + VectorType evalMid = b2Curve.dtdt(0.5); + + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(starttval[i], eval0[i], 1e-14); + EXPECT_NEAR(endtval[i], eval1[i], 1e-14); + EXPECT_NEAR(midtval[i], evalMid[i], 1e-14); + } +} + //------------------------------------------------------------------------------ TEST(primal_beziercurve, split_cubic) { diff --git a/src/axom/primal/tests/primal_bezier_patch.cpp b/src/axom/primal/tests/primal_bezier_patch.cpp index e7bcebd46d..02140d04d8 100644 --- a/src/axom/primal/tests/primal_bezier_patch.cpp +++ b/src/axom/primal/tests/primal_bezier_patch.cpp @@ -596,6 +596,93 @@ TEST(primal_bezierpatch, normal) } } +//------------------------------------------------------------------------------ +TEST(primal_bezierpatch, second_derivative) +{ + SLIC_INFO("Testing bezier Patch normal calculation"); + + const int DIM = 3; + using CoordType = double; + using PointType = primal::Point; + using VectorType = primal::Vector; + using BezierPatchType = primal::BezierPatch; + + const int order_u = 3; + const int order_v = 4; + + // clang-format off + PointType controlPoints[(order_u + 1) * (order_v + 1)] = { + PointType {0, 0, 0}, PointType{0, 4, 0}, PointType{0, 8, -3}, PointType{0, 12, 1}, PointType{0, 16, 3}, + PointType {2, 0, 6}, PointType{2, 4, 5}, PointType{2, 8, 0}, PointType{4, 12, 2}, PointType{2, 16, 2}, + PointType {4, 0, 0}, PointType{4, 4, 5}, PointType{4, 8, 3}, PointType{2, 12, 3}, PointType{4, 16, 1}, + PointType {6, 0, 0}, PointType{6, 4, -3}, PointType{6, 8, 0}, PointType{6, 12, 2}, PointType{6, 16, 0}}; + + double weights[(order_u + 1) * (order_v + 1)] = { + 1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 2.0, 3.0, 2.0, 1.0, + 1.0, 2.0, 3.0, 2.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 1.0}; + // clang-format on + + BezierPatchType bPatch(controlPoints, weights, order_u, order_v); + + auto evaluate_test = bPatch.evaluate(0.5, 0.4); + PointType evaluate_exp = {3.0, 6.85038038884, 2.35777683855}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(evaluate_test[i], evaluate_exp[i], 1e-6); + } + + auto partial_u_test = bPatch.du(0.6, 0.4); + VectorType partial_u_exp = {3.78171724599, -0.19774668801, -0.370827644202}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(partial_u_test[i], partial_u_exp[i], 1e-6); + } + + auto partial_v_test = bPatch.dv(0.6, 0.4); + VectorType partial_v_exp = {-0.354910197356, 11.8772494643, -1.594127454970}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(partial_v_test[i], partial_v_exp[i], 1e-6); + } + + auto partial_uu_test = bPatch.dudu(0.6, 0.4); + VectorType partial_uu_exp = {3.20670028604, -2.12957447484, -16.1167567473}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(partial_uu_test[i], partial_uu_exp[i], 1e-6); + } + + auto partial_vv_test = bPatch.dvdv(0.6, 0.4); + VectorType partial_vv_exp = {0.479553359805, -8.63831027883, 1.13497887975}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(partial_vv_test[i], partial_vv_exp[i], 1e-6); + } + + BezierPatchType bPatch_nonrational(bPatch); + bPatch_nonrational.makeNonrational(); + bPatch_nonrational.makeRational(); + std::cout << bPatch_nonrational.getWeight(2, 3) << std::endl; + + auto partial_uv_test = bPatch.dudv(0.6, 0.4); + VectorType partial_uv_exp = {-3.43768298544, 1.94078069698, 8.48995274462}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(partial_uv_test[i], partial_uv_exp[i], 1e-6); + } + + auto partial_uv_test_nonrational = bPatch_nonrational.dudv(0.6, 0.4); + VectorType partial_uv_exp_nonrational = {-2.36544, 0, 11.80416}; + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(partial_uv_test_nonrational[i], + partial_uv_exp_nonrational[i], + 1e-6); + } +} + //------------------------------------------------------------------------------ TEST(primal_bezierpatch, split_degenerate) { diff --git a/src/axom/primal/tests/primal_rational_bezier.cpp b/src/axom/primal/tests/primal_rational_bezier.cpp index 2f9ea7a711..1f106dec2d 100644 --- a/src/axom/primal/tests/primal_rational_bezier.cpp +++ b/src/axom/primal/tests/primal_rational_bezier.cpp @@ -146,6 +146,44 @@ TEST(primal_rationalbezier, tangent) } } +//------------------------------------------------------------------------------ +TEST(primal_rationalbezier, second_derivative) +{ + SLIC_INFO("Testing Rational Bezier second derivative calculation"); + + const int DIM = 3; + using CoordType = double; + using PointType = primal::Point; + using VectorType = primal::Vector; + using BezierCurveType = primal::BezierCurve; + + const int order = 3; + PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, + PointType {1.3, 1.6, 1.8}, + PointType {2.9, 2.4, 2.3}, + PointType {3.2, 3.5, 3.0}}; + + double weights[order + 1] = {1, 2, 3, 4}; + + BezierCurveType b2Curve(data, weights, order); + + VectorType starttval = VectorType {-0.6, -2.4, -24.6}; + VectorType midtval = VectorType {-3.8448, 0.3456, -0.888}; + VectorType endtval = VectorType {-4.0125, 0.4875, 0.3375}; + + // Evaluate the curve at several parameter values + VectorType eval0 = b2Curve.dtdt(0.0); + VectorType evalMid = b2Curve.dtdt(0.5); + VectorType eval1 = b2Curve.dtdt(1.0); + + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(starttval[i], eval0[i], 1e-14); + EXPECT_NEAR(endtval[i], eval1[i], 1e-14); + EXPECT_NEAR(midtval[i], evalMid[i], 1e-14); + } +} + //------------------------------------------------------------------------------ TEST(primal_rationalbezier, split_cubic) { From 0325073652b092a892238ad39c8f5aa315d041f5 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 09:57:41 -0700 Subject: [PATCH 036/639] Add method to compute tangents at corners --- src/axom/primal/geometry/BezierPatch.hpp | 88 ++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index dee832f444..e9cf9114df 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -1077,6 +1077,94 @@ class BezierPatch p0.split_v(v, p2, p4); } + /*! + * \brief Finds two unit tangent vectors at a corner geometrically + * + * \param [in] u parameter value of the corner (should be 0 or 1) + * \param [in] v parameter value of the corner (should be 0 or 1) + * \param [out] V1 First unit tangent vector + * \param [out] V2 Second unit tangent vector + * \param [in] edge_tol Physical distance at which nodes are indistinguishable + * \param [in] EPS Numerical tolerance to identify S(u, v) as a corner + */ + template + void corner_tangent_vectors(double u, + double v, + Vector& V1, + Vector& V2, + double edge_tol = 1e-8, + double EPS = 0) const + { + const int ord_u = getOrder_u(); + const int ord_v = getOrder_v(); + + double edge_tol_sq = edge_tol * edge_tol; + + V1 = Vector(); + V2 = Vector(); + + // Just kidding. We're doing the clever thing now. + // Add the bounding vertices to this list counterclockwise + axom::Array> point_list; + for(int p = 0; p < ord_u; ++p) + { + point_list.push_back(m_controlPoints(p, 0)); + } + for(int q = 0; q < ord_v; ++q) + { + point_list.push_back(m_controlPoints(ord_u, q)); + } + for(int p = ord_u; p > 0; --p) + { + point_list.push_back(m_controlPoints(p, ord_v)); + } + for(int q = ord_v; q > 0; --q) + { + point_list.push_back(m_controlPoints(0, q)); + } + + const int num_points = point_list.size(); + int start_idx; + if(u < EPS && v < EPS) + start_idx = 0; + else if(u > 1 - EPS && v < EPS) + start_idx = ord_u; + else if(u > 1 - EPS && v > 1 - EPS) + start_idx = ord_u + ord_v; + else if(u < EPS && v > 1 - EPS) + start_idx = 2 * ord_u + ord_v; + else + return; // Point is not a corner + + // Loop over points counterclockwise + for(int i = 0; i < num_points; ++i) + { + if(squared_distance(point_list[start_idx], + point_list[(start_idx + i) % num_points]) > edge_tol_sq) + { + V1 = Vector(point_list[start_idx], + point_list[(start_idx + i) % num_points]) + .unitVector(); + break; + } + } + + // Loop over points clockwise + for(int i = 0; i < num_points; ++i) + { + if(squared_distance( + point_list[start_idx], + point_list[(start_idx - i + num_points) % num_points]) > edge_tol_sq) + { + V2 = + Vector(point_list[start_idx], + point_list[(start_idx - i + num_points) % num_points]) + .unitVector(); + break; + } + } + } + /*! * \brief Predicate to check if the Bezier patch is approximately planar * From 06d2d7822b05f2571432bfeb1234c4928445336d Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 10:08:56 -0700 Subject: [PATCH 037/639] Add crude Newton method projection --- .../operators/detail/winding_number_impl.hpp | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 825a8b611a..4201ce72c6 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -491,6 +491,64 @@ double stokes_winding_number_adaptive(const Point& query, } #endif +/*! + * \brief Find the point on a BezierPatch closest to a point close to the surface + * + * \param [in] p The query point to test + * \param [in] bPatch The BezierPatch object + * \param [out] min_u The u-coordinate of the closest point + * \param [out] min_v The v-coordinate of the closest point + * + * Apply the Newton-Raphson method to minimize the distance function. + * + * \note This is only meant to be used for `winding_number()`, + * as Newton's method is unstable for far away points. + * + * \return The closest point on the surface + */ +template +Point near_field_projection(const Point& p, + const BezierPatch& bPatch, + double& min_u, + double& min_v) +{ + double u = 5, v = 0.5; + Vector Sp, Su, Sv, Suu, Svv, Suv; + double A00, A01, A10, A11, det; + double b0, b1; + double delu, delv; + + for(int i = 0; i < 15; ++i) + { + auto surf_normal = Vector(p, bPatch.evaluate(u, v)); + + Sp = Vector(p, bPatch.evaluate(u, v)); + Su = bPatch.du(u, v); + Sv = bPatch.dv(u, v); + Suu = bPatch.dudu(u, v); + Svv = bPatch.dvdv(u, v); + Suv = bPatch.dudv(u, v); + + A00 = Sp.dot(Suu) + Su.dot(Su); + A10 = A01 = Sp.dot(Suv) + Su.dot(Sv); + A11 = Sp.dot(Svv) + Sv.dot(Sv); + det = (A00 * A11 - A01 * A10); + + b0 = -Sp.dot(Su); + b1 = -Sp.dot(Sv); + + delu = (A11 * b0 - A01 * b1) / det; + delv = (-A10 * b0 + A00 * b1) / det; + + u = axom::utilities::clampVal(u + delu, 0.0, 1.0); + v = axom::utilities::clampVal(v + delv, 0.0, 1.0); + } + + min_u = u; + min_v = v; + + return evaluate(u, v); +} } // end namespace detail } // end namespace primal } // end namespace axom From 4307e012295648f408bb5f6ea018f414bdb18a82 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 10:59:59 -0700 Subject: [PATCH 038/639] Major improvement to wn algorithm --- src/axom/primal/operators/winding_number.hpp | 220 ++++++++++--------- 1 file changed, 120 insertions(+), 100 deletions(-) diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index 2b8670dc96..b593200a78 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -455,7 +455,7 @@ int winding_number(const Point& query, #ifdef AXOM_USE_MFEM /*! - * \brief Computes the solid angle winding number for a Bezier patch + * \brief Computes the solid angle winding number for a 3D Bezier patch * * \param [in] query The query point to test * \param [in] bPatch The Bezier patch object @@ -468,6 +468,7 @@ int winding_number(const Point& query, * * \note Warning: This algorithm is only tested to high accuracy for queries within * 1e-5 of the surface. Otherwise, it will return less accurate results. + * \note CURRENTLY ASSUMES THE SURFACE IS VALID! PROJECTION MAY NOT WORK OTHERWISE! * * \return double The generalized winding number. */ @@ -500,79 +501,17 @@ double winding_number(const Point& query, PRIMAL_TINY); } - // Use a specific kind of recursion if we are within tol of an endpoint. - // Split the surface closer to the corner, assume smallest patch is polygonal, - // and set a new edge_tol so corners of the new patch aren't marked as coincident - constexpr double edge_offset = 0.01; - if(squared_distance(query, bPatch(0, 0)) <= edge_tol_sq) - { - BezierPatch p1, p2, p3, p4; - bPatch.split(0.0 + edge_offset, 0.0 + edge_offset, p1, p2, p3, p4); - double new_edge_tol = 0.5 * - sqrt(axom::utilities::min( - squared_distance(query, bPatch.evaluate(0.0, 0.0 + edge_offset)), - squared_distance(query, bPatch.evaluate(0.0 + edge_offset, 0.0)))); - new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - - return winding_number(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); - } - if(squared_distance(query, bPatch(ord_u, 0)) <= edge_tol_sq) - { - BezierPatch p1, p2, p3, p4; - bPatch.split(1.0 - edge_offset, 0.0 + edge_offset, p1, p2, p3, p4); - double new_edge_tol = 0.5 * - sqrt(axom::utilities::min( - squared_distance(query, bPatch.evaluate(1.0, 0.0 + edge_offset)), - squared_distance(query, bPatch.evaluate(1.0 - edge_offset, 0.0)))); - new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - - return winding_number(query, p1, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); - } - if(squared_distance(query, bPatch(0, ord_v)) <= edge_tol_sq) - { - BezierPatch p1, p2, p3, p4; - bPatch.split(0.0 + edge_offset, 1.0 - edge_offset, p1, p2, p3, p4); - double new_edge_tol = 0.5 * - sqrt(axom::utilities::min( - squared_distance(query, bPatch.evaluate(0.0 + edge_offset, 1.0)), - squared_distance(query, bPatch.evaluate(0.0, 1.0 - edge_offset)))); - new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - - return winding_number(query, p1, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); - } - if(squared_distance(query, bPatch(ord_u, ord_v)) <= edge_tol_sq) - { - BezierPatch p1, p2, p3, p4; - bPatch.split(1.0 - edge_offset, 1.0 - edge_offset, p1, p2, p3, p4); - double new_edge_tol = 0.5 * - sqrt(axom::utilities::min( - squared_distance(query, bPatch.evaluate(1.0, 1.0 - edge_offset)), - squared_distance(query, bPatch.evaluate(1.0 - edge_offset, 1.0)))); - new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - - return winding_number(query, p1, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p3, new_edge_tol, quad_tol, EPS, depth + 1); - } - /* - * To use Stokes theorem, we need to identify a separating plane between - * `query` and the surface, guaranteed through a bounding box. - * If it does, need to do geometric refinement: Splitting and rotating the curve - * until we can guarantee this. + * To use Stokes theorem, we need to either identify a separating plane between + * the query and the surface (dodge), or a ray that intersects the + * surface at only a single point (pierce). */ CurvedPolygon boundingPoly(4); - - // Define vector fields whose curl gives us the winding number + double wn = 0; detail::SingularityAxis field_direction; - // Check an axis-aligned bounding box (most surfaces satisfy this condition) + // Check if we dodge an axis-aligned bounding box, + // since most surfaces satisfy this condition. BoundingBox bBox(bPatch.boundingBox().expand(edge_tol)); const bool exterior_x = bBox.getMin()[0] > query[0] || query[0] > bBox.getMax()[0]; @@ -595,22 +534,9 @@ double winding_number(const Point& query, } else { - // Next, create an oriented box with axes defined by the patch - // If we are interior to the oriented bounding box, then we - // cannot guarantee a separating plane, and need geometric refinement. - OrientedBoundingBox oBox(bPatch.orientedBoundingBox().expand(edge_tol)); - if(oBox.contains(query)) - { - BezierPatch p1, p2, p3, p4; - bPatch.split(0.5, 0.5, p1, p2, p3, p4); - return winding_number(query, p1, edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p2, edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p3, edge_tol, quad_tol, EPS, depth + 1) + - winding_number(query, p4, edge_tol, quad_tol, EPS, depth + 1); - } - - // Otherwise, we can apply a rotation to a z-aligned field. + // Otherwise, we can apply a rotation until we fit a z-aligned field. field_direction = detail::SingularityAxis::rotated; + numerics::Matrix rotator; // Lambda to generate a 3D rotation matrix from an angle and axis // Formulation from https://en.wikipedia.org/wiki/Rotation_matrix#Axis_and_angle @@ -647,24 +573,119 @@ double winding_number(const Point& query, {rotated[0] + query[0], rotated[1] + query[1], rotated[2] + query[2]}); }; - // Find vector from query to the bounding box - Point closest = closest_point(query, oBox); - Vector v0 = Vector(query, closest).unitVector(); + // Next, check the oriented bounding box defined by the patch's control points + // If we are exterior to it, then we can guarantee a separating plane. + // Note: The ideal check would be against the convex hull of the control points + OrientedBoundingBox oBox(bPatch.orientedBoundingBox().expand(edge_tol)); + if(oBox.contains(query)) + { + Vector cast_ray, closest_vector; + + // Need to do projection to find an axis that pierces the surface ONLY once + double min_u, min_v; + Point closest_point = + detail::near_field_projection(query, bPatch, min_u, min_v); + + int on_boundary = + (min_u < EPS) + (min_u > 1 - EPS) + (min_v < EPS) + (min_v > 1 - EPS); - // Find the direction of a ray perpendicular to that - Vector v1; - if(axom::utilities::isNearlyEqual(v0[0], v0[1], EPS)) - v1 = Vector({v0[2], v0[2], -v0[0] - v0[1]}).unitVector(); + // Cast a ray that is normal to the surface at the closest point + cast_ray = bPatch.normal(min_u, min_v).unitVector(); + + closest_vector = Vector(query, closest_point); + double min_dist = closest_vector.squared_norm(); + closest_vector = closest_vector.unitVector(); + + // If the query is on the surface, then we don't need to do any adjustment, + // as the induced discontinuity in the integrand is removable + if(min_dist < edge_tol * edge_tol) + { + wn = 0.0; + } + // Otherwise, we need to adjust for the contribution of a small removed + // disk around the ray we cast. + else + { + // If the closest point isn't on a boundary, the disk is totally interior + if(!on_boundary) + { + wn = 0.5; + } + // If the closest point is on a boundary, then the cast ray may + // or may not intersect the surface + else + { + // If the ray does not intersect, do nothing. + if(!axom::utilities::isNearlyEqual( + Vector::cross_product(closest_vector, cast_ray).squared_norm(), + 0.0, + EPS)) + { + wn = 0.0; + } + // If it does, then the contribution of the disk depends on + // the angle subtended by the tangent vectors + else + { + // Angle subtended by the line is exactly pi + if(on_boundary == 1) + { + wn = 0.25; + } + // Need to compute the angle subtended at corners + else + { + Vector V1, V2; + bPatch.corner_tangent_vectors(min_u, min_v, V1, V2, edge_tol, EPS); + + wn = 0.25 * + acos(axom::utilities::clampVal(V1.dot(V2), -1.0, 1.0)) / M_PI; + } + } + } + + // Need to change the sign of the disk's contribution + // depending on the orientation. + wn *= (closest_vector.dot(cast_ray) > 0) ? 1.0 : -1.0; + } + + // Rotate the surface so that the cast ray is oriented with k_hat + Vector axis = {cast_ray[1], -cast_ray[0], 0.0}; + double ang = acos(axom::utilities::clampVal(cast_ray[2], -1.0, 1.0)); + + rotator = angleAxisRotMatrix(ang, axis); + } else - v1 = Vector({-v0[1] - v0[2], v0[0], v0[0]}).unitVector(); + { + // Get a vector perpendicular to the normal of the separating plane + Vector axis, sn(query, closest_point(query, oBox)); + sn = sn.unitVector(); + + if(axom::utilities::isNearlyEqual(sn[0], sn[1], EPS)) + axis = Vector({sn[2], sn[2], -sn[0] - sn[1]}).unitVector(); + else + axis = Vector({-sn[1] - sn[2], sn[0], sn[0]}).unitVector(); - // Rotate v0 around v1 until it is perpendicular to the plane spanned by k and v1 - double ang = (v0[2] < 0 ? 1.0 : -1.0) * - acos(axom::utilities::clampVal( - -(v0[0] * v1[1] - v0[1] * v1[0]) / sqrt(v1[0] * v1[0] + v1[1] * v1[1]), - -1.0, - 1.0)); - auto rotator = angleAxisRotMatrix(ang, v1); + // We will rotate sn around axis until it is + // perpendicular to the plane spanned by k_hat and the axis + double ang, xy_norm = axis[0] * axis[0] + axis[1] * axis[1]; + + // Only need to avoid an exact divide by zero + if(axom::utilities::isNearlyEqual(xy_norm, 0.0, PRIMAL_TINY)) + { + ang = 0.0; + } + else + { + ang = (sn[2] < 0 ? 1.0 : -1.0) * + acos(axom::utilities::clampVal( + -(sn[0] * axis[1] - sn[1] * axis[0]) / sqrt(xy_norm), + -1.0, + 1.0)); + } + + rotator = angleAxisRotMatrix(ang, axis); + } // Collect rotated curves into the curved Polygon // Set up the (0, v) and (1, v) isocurves, rotated @@ -722,7 +743,6 @@ double winding_number(const Point& query, } // Iterate over the edges of the bounding curved polygon, add up the results - double wn = 0; for(int n = 0; n < 4; ++n) { wn += detail::stokes_winding_number(query, From d17e09af0f8750c85d79d64933c79959e66a815b Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 3 Aug 2023 11:01:12 -0700 Subject: [PATCH 039/639] More rigorous test for new algorithm --- src/axom/primal/tests/primal_solid_angle.cpp | 87 ++++++++++++-------- 1 file changed, 54 insertions(+), 33 deletions(-) diff --git a/src/axom/primal/tests/primal_solid_angle.cpp b/src/axom/primal/tests/primal_solid_angle.cpp index 041bb1dc9a..a166e54d1d 100644 --- a/src/axom/primal/tests/primal_solid_angle.cpp +++ b/src/axom/primal/tests/primal_solid_angle.cpp @@ -617,85 +617,106 @@ TEST(primal_solid_angle, bezierpatch_sphere) } } - // Iterate over points of interest, i.e. axis/edge/vertex aligned - Vector3D query_directions[12] = {Vector3D({0.0, 0.0, 1.0}).unitVector(), - Vector3D({0.0, 1.0, 0.0}).unitVector(), - Vector3D({1.0, 0.0, 0.0}).unitVector(), - Vector3D({0.0, 1.0, 1.0}).unitVector(), - Vector3D({1.0, 0.0, 1.0}).unitVector(), - Vector3D({1.0, 1.0, 0.0}).unitVector(), - Vector3D({1.0, 1.0, 1.0}).unitVector(), - Vector3D({0.0, 0.1, 1.0}).unitVector(), - Vector3D({0.1, 1.0, 0.0}).unitVector(), - Vector3D({1.0, 0.0, 0.1}).unitVector(), - Vector3D(sphere_faces[0].evaluate(0, 0.6)), - Vector3D(sphere_faces[0].evaluate(0.6, 0))}; - - const double quad_tol = 1e-5; - const double EPS = 1e-10; + // Split each surface into valid subsurfaces + axom::Array valid_subsurfaces; + for(int n = 0; n < 6; ++n) + { + split_to_valid(sphere_faces[n], valid_subsurfaces); + } + const int num_subsurfaces = valid_subsurfaces.size(); + + // Iterate over points of interest, i.e. close to a boundary. + // Specifically need to exercise the projection steps + Vector3D query_directions[11] = { + Vector3D(valid_subsurfaces[3].evaluate(0.50, 0.50)), // 0 + Vector3D(valid_subsurfaces[3].evaluate(0.99, 0.95)), // 1 + Vector3D(valid_subsurfaces[3].evaluate(0.999, 0.995)), // 2 + Vector3D(valid_subsurfaces[3].evaluate(0.9999, 0.9995)), // 3 + Vector3D(valid_subsurfaces[3].evaluate(0.99999, 0.99995)), // 4 + Vector3D(valid_subsurfaces[3].evaluate(1.0, 0.9999)), // 5 + Vector3D(valid_subsurfaces[3].evaluate(0.9999, 1.0)), // 6 + Vector3D(valid_subsurfaces[3].evaluate(1.0, 1.0)), // 7 + Vector3D(valid_subsurfaces[3].evaluate(-.99, 0.95)), // 8 + Vector3D(valid_subsurfaces[3].evaluate(0.99, -.95)), // 9 + Vector3D(valid_subsurfaces[3].evaluate(-.99, -.95))}; // 10 const double edge_tol = 1e-6; const double edge_offset = 1e-5; + const double quad_tol = 1e-5; + const double EPS = 1e-10; + // Test some easy cases auto origin = Point3D({0.0, 0.0, 0.0}); auto near_origin = Point3D({0.1, -0.2, 0.15}); double origin_wn = 0.0, near_origin_wn = 0.0; - for(int k = 0; k < 6; ++k) + for(int k = 0; k < num_subsurfaces; ++k) { - origin_wn += winding_number(origin, sphere_faces[k], edge_tol, quad_tol, EPS); + origin_wn += + winding_number(origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); near_origin_wn += - winding_number(near_origin, sphere_faces[k], edge_tol, quad_tol, EPS); + winding_number(near_origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(origin_wn, 1.0, 6 * quad_tol); - EXPECT_NEAR(near_origin_wn, 1.0, 6 * quad_tol); + EXPECT_NEAR(origin_wn, 1.0, num_subsurfaces * quad_tol); + EXPECT_NEAR(near_origin_wn, 1.0, num_subsurfaces * quad_tol); - for(int i = 0; i < 12; ++i) + for(int i = 0; i < 11; ++i) { // Pick point close to the surface auto far_query = Point3D(10 * query_directions[i].array()); double far_wn = 0.0; - for(int k = 0; k < 6; ++k) + for(int k = 0; k < num_subsurfaces; ++k) { far_wn += - winding_number(far_query, sphere_faces[k], edge_tol, quad_tol, EPS); + winding_number(far_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(far_wn, 0.0, 6 * quad_tol); + EXPECT_NEAR(far_wn, 0.0, num_subsurfaces * quad_tol); } // Iterate over difficult query directions for very close points - for(int i = 0; i < 12; ++i) + for(int i = 0; i < 11; ++i) { + std::cout << i << std::endl; // Pick point close to the surface auto inner_query = Point3D((1.0 - edge_offset) * query_directions[i].array()); auto outer_query = Point3D((1.0 + edge_offset) * query_directions[i].array()); // Iterate over the patches that compose the sphere double inner_wn = 0; - for(int k = 0; k < 6; ++k) + for(int k = 0; k < num_subsurfaces; ++k) { inner_wn += - winding_number(inner_query, sphere_faces[k], edge_tol, quad_tol, EPS); + winding_number(inner_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(inner_wn, 1.0, 6 * quad_tol); + EXPECT_NEAR(inner_wn, 1.0, num_subsurfaces * quad_tol); // Iterate over the patches that compose the sphere double outer_wn = 0; - for(int k = 0; k < 6; ++k) + for(int k = 0; k < num_subsurfaces; ++k) { outer_wn += - winding_number(outer_query, sphere_faces[k], edge_tol, quad_tol, EPS); + winding_number(outer_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(outer_wn, 0.0, 6 * quad_tol); + EXPECT_NEAR(outer_wn, 0.0, num_subsurfaces * quad_tol); // Pick a point on the surface too. // Regardless of what tolerances are picked, the winding number // should lie between the values on either side when rounded auto coincident_query = Point3D(query_directions[i].array()); double coincident_wn = 0.0; - for(int k = 0; k < 6; ++k) + for(int k = 0; k < valid_subsurfaces.size(); ++k) + { + coincident_wn += winding_number(coincident_query, + valid_subsurfaces[k], + edge_tol, + quad_tol, + EPS); + } + EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); + } +} { coincident_wn += winding_number(coincident_query, sphere_faces[k], edge_tol, quad_tol, EPS); From 9e1ac3b25d46fc33e5c65e5fa87e3c3dcc76997d Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 4 Aug 2023 14:30:10 -0700 Subject: [PATCH 040/639] Simpler interface for corner tangents --- src/axom/primal/geometry/BezierPatch.hpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index e9cf9114df..e01b9201da 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -1088,8 +1088,7 @@ class BezierPatch * \param [in] EPS Numerical tolerance to identify S(u, v) as a corner */ template - void corner_tangent_vectors(double u, - double v, + void corner_tangent_vectors(Point& p, Vector& V1, Vector& V2, double edge_tol = 1e-8, @@ -1125,13 +1124,13 @@ class BezierPatch const int num_points = point_list.size(); int start_idx; - if(u < EPS && v < EPS) + if(squared_distance(p, m_controlPoints(0, 0)) < edge_tol_sq) start_idx = 0; - else if(u > 1 - EPS && v < EPS) + else if(squared_distance(p, m_controlPoints(ord_u, 0)) < edge_tol_sq) start_idx = ord_u; - else if(u > 1 - EPS && v > 1 - EPS) + else if(squared_distance(p, m_controlPoints(ord_u, ord_v)) < edge_tol_sq) start_idx = ord_u + ord_v; - else if(u < EPS && v > 1 - EPS) + else if(squared_distance(p, m_controlPoints(0, ord_v)) < edge_tol_sq) start_idx = 2 * ord_u + ord_v; else return; // Point is not a corner From 4940f1bf7cc67e3b0a8989e6dcf32fc6a942f177 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 4 Aug 2023 14:34:07 -0700 Subject: [PATCH 041/639] Improve algorithm, ignore boundaries --- .../operators/detail/winding_number_impl.hpp | 2 +- src/axom/primal/operators/winding_number.hpp | 98 ++++++++++++------- 2 files changed, 62 insertions(+), 38 deletions(-) diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 4201ce72c6..9811841d02 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -462,7 +462,7 @@ double stokes_winding_number_adaptive(const Point& query, } } - constexpr int MAX_DEPTH = 12; + constexpr int MAX_DEPTH = 25; if(depth >= MAX_DEPTH || axom::utilities::isNearlyEqualRelative(quad_fine[0] + quad_fine[1], quad_coarse, diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index b593200a78..5204fe52a2 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -487,7 +487,7 @@ double winding_number(const Point& query, // Fix the number of quadrature nodes arbitrarily, but high enough // to `catch` near singularities for refinement - constexpr int quad_npts = 30; + constexpr int quad_npts = 50; // Early return if the patch is approximately polygonal. // Very slight variations in curvature requires small EPS tolerance @@ -579,12 +579,13 @@ double winding_number(const Point& query, OrientedBoundingBox oBox(bPatch.orientedBoundingBox().expand(edge_tol)); if(oBox.contains(query)) { - Vector cast_ray, closest_vector; + Vector cast_ray, closest_normal, closest_vector; // Need to do projection to find an axis that pierces the surface ONLY once + // and does so at an interior point double min_u, min_v; - Point closest_point = - detail::near_field_projection(query, bPatch, min_u, min_v); + detail::near_field_projection(query, bPatch, min_u, min_v, edge_tol, EPS); + Point closest_point = bPatch.evaluate(min_u, min_v); int on_boundary = (min_u < EPS) + (min_u > 1 - EPS) + (min_v < EPS) + (min_v > 1 - EPS); @@ -593,55 +594,71 @@ double winding_number(const Point& query, cast_ray = bPatch.normal(min_u, min_v).unitVector(); closest_vector = Vector(query, closest_point); - double min_dist = closest_vector.squared_norm(); - closest_vector = closest_vector.unitVector(); + int on_boundary = (min_u < EPS) || (min_u > 1 - EPS) || (min_v < EPS) || + (min_v > 1 - EPS); + + // Compute the normal to the surface at the closest point + closest_normal = bPatch.normal(min_u, min_v); + + // Need to do extra adjustments if we don't have a defined normal + if(axom::utilities::isNearlyEqual(closest_normal.squared_norm(), + 0.0, + PRIMAL_TINY)) + { + Vector T1, T2; + bPatch.corner_tangent_vectors(closest_point, T1, T2, edge_tol, EPS); + if(T1.squared_norm() == 0) + printf("Could not find a normal vector at this corner!\n"); + closest_normal = Vector::cross_product(T1, T2); + } + closest_normal = closest_normal.unitVector(); // If the query is on the surface, then we don't need to do any adjustment, // as the induced discontinuity in the integrand is removable - if(min_dist < edge_tol * edge_tol) + if(closest_vector.squared_norm() < edge_tol * edge_tol) { + cast_ray = closest_normal; wn = 0.0; } // Otherwise, we need to adjust for the contribution of a small removed // disk around the ray we cast. else { - // If the closest point isn't on a boundary, the disk is totally interior - if(!on_boundary) - { - wn = 0.5; - } - // If the closest point is on a boundary, then the cast ray may - // or may not intersect the surface - else + // Check orientation relative to the surface + bool exterior = closest_vector.dot(closest_normal) < 0; + + // If we're exterior, then we can definitely define a separating + // plane defined by closest_normal + if(exterior) { - // If the ray does not intersect, do nothing. - if(!axom::utilities::isNearlyEqual( - Vector::cross_product(closest_vector, cast_ray).squared_norm(), - 0.0, + // Get a perpendicular vector to closest_normal. + // Can possibly pick this one more cleverly. + if(axom::utilities::isNearlyEqual(closest_normal[0], + closest_normal[1], EPS)) - { - wn = 0.0; - } - // If it does, then the contribution of the disk depends on - // the angle subtended by the tangent vectors + cast_ray = Vector({closest_normal[2], + closest_normal[2], + -closest_normal[0] - closest_normal[1]}) + .unitVector(); else - { - // Angle subtended by the line is exactly pi - if(on_boundary == 1) - { - wn = 0.25; + cast_ray = Vector({-closest_normal[1] - closest_normal[2], + closest_normal[0], + closest_normal[0]}) + .unitVector(); } - // Need to compute the angle subtended at corners + // If we're interior, we can safely pierce the surface, making + // sure not to hit a boundary. else { - Vector V1, V2; - bPatch.corner_tangent_vectors(min_u, min_v, V1, V2, edge_tol, EPS); - - wn = 0.25 * - acos(axom::utilities::clampVal(V1.dot(V2), -1.0, 1.0)) / M_PI; - } - } + // This tolerance is arbitrary. A smaller value might be needed + double edge_offset = 0.01; + cast_ray = Vector( + query, + bPatch.evaluate( + axom::utilities::clampVal(min_u, edge_offset, 1 - edge_offset), + axom::utilities::clampVal(min_v, edge_offset, 1 - edge_offset))); + cast_ray = cast_ray.unitVector(); + wn = 0.5; } // Need to change the sign of the disk's contribution @@ -745,6 +762,13 @@ double winding_number(const Point& query, // Iterate over the edges of the bounding curved polygon, add up the results for(int n = 0; n < 4; ++n) { + // If the bounding polygon has zero length, skip it + if(squared_distance(boundingPoly[n].evaluate(0), + boundingPoly[n].evaluate(1)) < edge_tol_sq) + { + continue; + } + wn += detail::stokes_winding_number(query, boundingPoly[n], field_direction, From 903d1e5b6d4a358e4bd750c0a68cbd3707530a5f Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 4 Aug 2023 14:35:21 -0700 Subject: [PATCH 042/639] Improve Newton's method --- .../operators/detail/winding_number_impl.hpp | 63 +++++++++++++++---- 1 file changed, 51 insertions(+), 12 deletions(-) diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 9811841d02..4b4a3171ab 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -507,41 +507,80 @@ double stokes_winding_number_adaptive(const Point& query, * \return The closest point on the surface */ template -Point near_field_projection(const Point& p, +bool near_field_projection(const Point& p, const BezierPatch& bPatch, double& min_u, - double& min_v) + double& min_v, + double edge_tol = 1e-8, + double EPS = 1e-8) { - double u = 5, v = 0.5; + min_u = 0.5; + min_v = 0.5; Vector Sp, Su, Sv, Suu, Svv, Suv; double A00, A01, A10, A11, det; double b0, b1; double delu, delv; + // TODO: Compute Sp, Su, Sv, Suu, Svv, Suv MUCH more efficiently + // by using the same intermediates from de Casteljau for(int i = 0; i < 15; ++i) { - auto surf_normal = Vector(p, bPatch.evaluate(u, v)); + Sp = Vector(p, bPatch.evaluate(min_u, min_v)); + if(Sp.squared_norm() < edge_tol * edge_tol) + { + return true; + } - Sp = Vector(p, bPatch.evaluate(u, v)); - Su = bPatch.du(u, v); - Sv = bPatch.dv(u, v); - Suu = bPatch.dudu(u, v); - Svv = bPatch.dvdv(u, v); - Suv = bPatch.dudv(u, v); + Su = bPatch.du(min_u, min_v); + Sv = bPatch.dv(min_u, min_v); + + if(axom::utilities::isNearlyEqual(Su.squared_norm(), 0.0, EPS) && + axom::utilities::isNearlyEqual(Sv.squared_norm(), 0.0, EPS)) + { + return true; + } + + Suu = bPatch.dudu(min_u, min_v); + Svv = bPatch.dvdv(min_u, min_v); + Suv = bPatch.dudv(min_u, min_v); A00 = Sp.dot(Suu) + Su.dot(Su); A10 = A01 = Sp.dot(Suv) + Su.dot(Sv); A11 = Sp.dot(Svv) + Sv.dot(Sv); det = (A00 * A11 - A01 * A10); + // If the iteration fails, try to fix it with + // a different initial condition + if(axom::utilities::isNearlyEqual(det, 0.0, PRIMAL_TINY)) + { + min_u = 1.0 / i; + min_v = 1.0 / (i + 1); + continue; + } + b0 = -Sp.dot(Su); b1 = -Sp.dot(Sv); delu = (A11 * b0 - A01 * b1) / det; delv = (-A10 * b0 + A00 * b1) / det; - u = axom::utilities::clampVal(u + delu, 0.0, 1.0); - v = axom::utilities::clampVal(v + delv, 0.0, 1.0); + min_u = axom::utilities::clampVal(min_u + delu, 0.0, 1.0); + min_v = axom::utilities::clampVal(min_v + delv, 0.0, 1.0); + } + + if((axom::utilities::isNearlyEqual(bPatch.du(min_u, min_v).squared_norm(), + 0.0, + EPS) && + axom::utilities::isNearlyEqual(bPatch.dv(min_u, min_v).squared_norm(), + 0.0, + EPS)) || + Vector(p, bPatch.evaluate(min_u, min_v)).squared_norm() < + edge_tol * edge_tol) + { + return true; + } + + return false; } min_u = u; From be20db0570cbe727891383f22dc6c3e7cc2436cb Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 4 Aug 2023 14:36:12 -0700 Subject: [PATCH 043/639] Add an alternate, degenerate sphere --- src/axom/primal/tests/primal_solid_angle.cpp | 186 +++++++++++++++++-- 1 file changed, 170 insertions(+), 16 deletions(-) diff --git a/src/axom/primal/tests/primal_solid_angle.cpp b/src/axom/primal/tests/primal_solid_angle.cpp index a166e54d1d..d78fcfd166 100644 --- a/src/axom/primal/tests/primal_solid_angle.cpp +++ b/src/axom/primal/tests/primal_solid_angle.cpp @@ -626,19 +626,20 @@ TEST(primal_solid_angle, bezierpatch_sphere) const int num_subsurfaces = valid_subsurfaces.size(); // Iterate over points of interest, i.e. close to a boundary. - // Specifically need to exercise the projection steps + // Specifically need to exercise the ray casting steps + const int idx = 3; // Select a difficult face Vector3D query_directions[11] = { - Vector3D(valid_subsurfaces[3].evaluate(0.50, 0.50)), // 0 - Vector3D(valid_subsurfaces[3].evaluate(0.99, 0.95)), // 1 - Vector3D(valid_subsurfaces[3].evaluate(0.999, 0.995)), // 2 - Vector3D(valid_subsurfaces[3].evaluate(0.9999, 0.9995)), // 3 - Vector3D(valid_subsurfaces[3].evaluate(0.99999, 0.99995)), // 4 - Vector3D(valid_subsurfaces[3].evaluate(1.0, 0.9999)), // 5 - Vector3D(valid_subsurfaces[3].evaluate(0.9999, 1.0)), // 6 - Vector3D(valid_subsurfaces[3].evaluate(1.0, 1.0)), // 7 - Vector3D(valid_subsurfaces[3].evaluate(-.99, 0.95)), // 8 - Vector3D(valid_subsurfaces[3].evaluate(0.99, -.95)), // 9 - Vector3D(valid_subsurfaces[3].evaluate(-.99, -.95))}; // 10 + Vector3D(valid_subsurfaces[idx].evaluate(0.50, 0.50)), // 0 + Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.95)), // 1 + Vector3D(valid_subsurfaces[idx].evaluate(0.999, 0.995)), // 2 + Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 0.9995)), // 3 + Vector3D(valid_subsurfaces[idx].evaluate(0.99999, 0.99995)), // 4 + Vector3D(valid_subsurfaces[idx].evaluate(1.0, 0.9999)), // 5 + Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 1.0)), // 6 + Vector3D(valid_subsurfaces[idx].evaluate(1.0, 1.0)), // 7 + Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.95)), // 8 + Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.05)), // 9 + Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.05))}; // 10 const double edge_tol = 1e-6; const double edge_offset = 1e-5; @@ -717,12 +718,165 @@ TEST(primal_solid_angle, bezierpatch_sphere) EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); } } + +TEST(primal_solid_angle, bezierpatch_degenerate_sphere) +{ + using Point2D = primal::Point; + using Point3D = primal::Point; + using Vector3D = primal::Vector; + using BCurve = primal::BezierCurve; + using BPatch = primal::BezierPatch; + + auto rotate_curve_to_patches = [](BCurve curve, BPatch patches[]) -> void { + const int ord = curve.getOrder(); + curve.makeRational(); + + for(int n = 0; n < 4; ++n) + { + patches[n].setOrder(ord, 2); + patches[n].makeRational(); + } + + for(int p = 0; p <= ord; ++p) + { + auto node = curve[p]; + patches[0](p, 0) = Point3D {node[0], 0.0, node[1]}; + patches[0](p, 1) = Point3D {node[0], node[0], node[1]}; + patches[0](p, 2) = Point3D {0.0, node[0], node[1]}; + + patches[1](p, 0) = Point3D {0.0, node[0], node[1]}; + patches[1](p, 1) = Point3D {-node[0], node[0], node[1]}; + patches[1](p, 2) = Point3D {-node[0], 0.0, node[1]}; + + patches[2](p, 0) = Point3D {-node[0], 0.0, node[1]}; + patches[2](p, 1) = Point3D {-node[0], -node[0], node[1]}; + patches[2](p, 2) = Point3D {0.0, -node[0], node[1]}; + + patches[3](p, 0) = Point3D {0.0, -node[0], node[1]}; + patches[3](p, 1) = Point3D {node[0], -node[0], node[1]}; + patches[3](p, 2) = Point3D {node[0], 0.0, node[1]}; + + for(int n = 0; n < 4; ++n) + { + patches[n].setWeight(p, 0, curve.getWeight(p)); + patches[n].setWeight(p, 1, curve.getWeight(p) / std::sqrt(2)); + patches[n].setWeight(p, 2, curve.getWeight(p)); + } + } + }; + + // Make a sphere out of 8 degenerate Bezier Patches + + // Define rational Beziers curve along the x-z axis and rotate them + Point2D curve1_nodes[] = {Point2D {0, 1}, Point2D {1, 1}, Point2D {1, 0}}; + double curve1_weights[] = {1, 1 / std::sqrt(2), 1}; + BCurve curve1(curve1_nodes, curve1_weights, 2); + BPatch patches1[4]; + rotate_curve_to_patches(curve1, patches1); + + Point2D curve2_nodes[] = {Point2D {1, 0}, Point2D {1, -1}, Point2D {0, -1}}; + double curve2_weights[] = {1, 1 / std::sqrt(2), 1}; + BCurve curve2(curve2_nodes, curve2_weights, 2); + BPatch patches2[4]; + rotate_curve_to_patches(curve2, patches2); + + // Split each surface into valid subsurfaces + axom::Array valid_subsurfaces; + for(int n = 0; n < 4; ++n) + { + split_to_valid(patches1[n], valid_subsurfaces); + split_to_valid(patches2[n], valid_subsurfaces); + } + + const int num_subsurfaces = valid_subsurfaces.size(); + + // Iterate over points of interest, i.e. close to a boundary. + // Specifically need to exercise the ray casting steps + int idx = 6; // Select a difficult face + Vector3D query_directions[11] = { + Vector3D(valid_subsurfaces[idx].evaluate(0.50, 0.50)), // 0 + Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.95)), // 1 + Vector3D(valid_subsurfaces[idx].evaluate(0.999, 0.995)), // 2 + Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 0.9995)), // 3 + Vector3D(valid_subsurfaces[idx].evaluate(0.99999, 0.99995)), // 4 + Vector3D(valid_subsurfaces[idx].evaluate(1.0, 0.9999)), // 5 + Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 1.0)), // 6 + Vector3D(valid_subsurfaces[idx].evaluate(1.0, 1.0)), // 7 + Vector3D(valid_subsurfaces[idx].evaluate(-.99, 0.95)), // 8 + Vector3D(valid_subsurfaces[idx].evaluate(0.99, -.95)), // 9 + Vector3D(valid_subsurfaces[idx].evaluate(-.99, -.95))}; // 10 + + const double edge_tol = 1e-6; + const double edge_offset = 1e-5; + + const double quad_tol = 1e-5; + const double EPS = 1e-10; + + // Test some easy cases + auto origin = Point3D({0.0, 0.0, 0.0}); + auto near_origin = Point3D({0.1, -0.2, 0.15}); + + double origin_wn = 0.0, near_origin_wn = 0.0; + for(int k = 0; k < num_subsurfaces; ++k) + { + origin_wn += + winding_number(origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + near_origin_wn += + winding_number(near_origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + } + EXPECT_NEAR(origin_wn, 1.0, num_subsurfaces * quad_tol); + EXPECT_NEAR(near_origin_wn, 1.0, num_subsurfaces * quad_tol); + + for(int i = 0; i < 11; ++i) + { + auto far_query = Point3D(10 * query_directions[i].array()); + + double far_wn = 0.0; + for(int k = 0; k < num_subsurfaces; ++k) + { + far_wn += + winding_number(far_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); +} + EXPECT_NEAR(far_wn, 0.0, num_subsurfaces * quad_tol); + } + + // Iterate over difficult query directions for very close points + for(int i = 0; i < 11; ++i) + { + // Pick point close to the surface + auto inner_query = Point3D((1.0 - edge_offset) * query_directions[i].array()); + auto outer_query = Point3D((1.0 + edge_offset) * query_directions[i].array()); + + // Iterate over the patches that compose the sphere + double inner_wn = 0; + for(int k = 0; k < num_subsurfaces; ++k) + { + inner_wn += + winding_number(inner_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + } + EXPECT_NEAR(inner_wn, 1.0, num_subsurfaces * quad_tol); + + // Iterate over the patches that compose the sphere + double outer_wn = 0; + for(int k = 0; k < num_subsurfaces; ++k) + { + outer_wn += + winding_number(outer_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + } + EXPECT_NEAR(outer_wn, 0.0, num_subsurfaces * quad_tol); + + // Pick a point on the surface too. + auto coincident_query = Point3D(query_directions[i].array()); + double coincident_wn = 0.0; + for(int k = 0; k < valid_subsurfaces.size(); ++k) { - coincident_wn += - winding_number(coincident_query, sphere_faces[k], edge_tol, quad_tol, EPS); + coincident_wn += winding_number(coincident_query, + valid_subsurfaces[k], + edge_tol, + quad_tol, + EPS); } - EXPECT_LT(coincident_wn, 1.5); - EXPECT_LT(-0.5, coincident_wn); + EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); } } From 0d4a6c4f315b56d45b58882676c45f6e280090db Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Tue, 8 Aug 2023 16:17:28 -0700 Subject: [PATCH 044/639] Add more efficient second derivatives --- src/axom/primal/geometry/BezierPatch.hpp | 263 +++++++++++++++++- src/axom/primal/tests/primal_bezier_patch.cpp | 51 ++-- 2 files changed, 277 insertions(+), 37 deletions(-) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index e01b9201da..73002cbf05 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -777,6 +777,162 @@ class BezierPatch } } + void evaluate_second_derivatives(T u, + T v, + Point& evaluation, + Vector& Du, + Vector& Dv, + Vector& DuDu, + Vector& DvDv, + Vector& DuDv) const + { + using axom::utilities::lerp; + const int ord_u = getOrder_u(); + const int ord_v = getOrder_v(); + + axom::Array dCmat(ord_u + 1, ord_v + 1); + axom::Array dCmat2(2, 2); + + if(!isRational()) + { + // Do de Casteljau until we get a 3x3 + for(int i = 0; i < NDIMS; ++i) + { + for(int p = 0; p <= ord_u; ++p) + { + for(int q = 0; q <= ord_v; ++q) + { + dCmat(p, q) = m_controlPoints(p, q)[i]; + } + } + + // Do de Casteljau over the longer direction first + if(ord_u >= ord_v) + { + // Stop 2 steps early in u + for(int p = 1; p <= ord_u - 2; ++p) + { + const int end = ord_u - p; + for(int k = 0; k <= end; ++k) + { + for(int q = 0; q <= ord_v; ++q) + { + dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); + } + } + } + + // Stop 2 steps early in v over the three columns + for(int q = 1; q <= ord_v - 2; ++q) + { + const int end = ord_v - q; + for(int k = 0; k <= end; ++k) + { + for(int p = 0; p <= 2; ++p) + { + dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); + } + } + } + } + else + { + // Stop 2 steps early in v + for(int q = 1; q <= ord_v - 2; ++q) + { + const int end = ord_v - q; + for(int k = 0; k <= end; ++k) + { + for(int p = 0; p <= ord_u; ++p) + { + dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); + } + } + } + + // Stop 2 steps early in v over the three columns + for(int p = 1; p <= ord_u - 2; ++p) + { + const int end = ord_u - p; + for(int k = 0; k <= end; ++k) + { + for(int q = 0; q <= 2; ++q) + { + dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); + } + } + } + } + + // By now, the first 3x3 submatrix of dCmat should have + // all the intermediate values needed + + // clang-format off + // Get second order derivatives + DuDu[i] = (ord_u - 1) * ord_u * ( (1 - v) * (1 - v) * (dCmat(2, 0) - 2 * dCmat(1, 0) + dCmat(0, 0)) + + 2 * v * (1 - v) * (dCmat(2, 1) - 2 * dCmat(1, 1) + dCmat(0, 1)) + + v * v * (dCmat(2, 2) - 2 * dCmat(1, 2) + dCmat(0, 2)) ); + + DvDv[i] = (ord_v - 1) * ord_v * ( (1 - u) * (1 - u) * (dCmat(0, 2) - 2 * dCmat(0, 1) + dCmat(0, 0)) + + 2 * u * (1 - u) * (dCmat(1, 2) - 2 * dCmat(1, 1) + dCmat(1, 0)) + + u * u * (dCmat(2, 2) - 2 * dCmat(2, 1) + dCmat(2, 0)) ); + + // Compute intermediate values for first order derivatives + dCmat2(0, 0) = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); + dCmat2(1, 0) = (1 - u) * (1 - v) * dCmat(1, 0) + u * (1 - v) * dCmat(2, 0) + (1 - u) * v * dCmat(1, 1) + u * v * dCmat(2, 1); + dCmat2(0, 1) = (1 - u) * (1 - v) * dCmat(0, 1) + u * (1 - v) * dCmat(1, 1) + (1 - u) * v * dCmat(0, 2) + u * v * dCmat(1, 2); + dCmat2(1, 1) = (1 - u) * (1 - v) * dCmat(1, 1) + u * (1 - v) * dCmat(2, 1) + (1 - u) * v * dCmat(1, 2) + u * v * dCmat(2, 2); + + // Compute first order derivatives + Du[i] = ord_u * ( (1 - v) * (dCmat2(1, 0) - dCmat2(0, 0)) + + v * (dCmat2(1, 1) - dCmat2(0, 1)) ); + + Dv[i] = ord_v * ( (1 - u) * (dCmat2(0, 1) - dCmat2(0, 0)) + + u * (dCmat2(1, 1) - dCmat2(1, 0)) ); + + DuDv[i] = ord_u * ord_v * (dCmat2(1, 1) - dCmat2(1, 0) - dCmat2(0, 1) + dCmat2(0, 0)); + + // Get the evaluation point + evaluation[i] = (1 - u) * (1 - v) * dCmat2(0, 0) + u * (1 - v) * dCmat2(1, 0) + (1 - u) * v * dCmat2(0, 1) + u * v * dCmat2(1, 1); + // clang-format on + } + } + else + { + BezierPatch projective(ord_u, ord_v); + BezierPatch weights(ord_u, ord_v); + + for(int p = 0; p <= ord_u; ++p) + { + for(int q = 0; q <= ord_v; ++q) + { + projective(p, q) = m_controlPoints(p, q); + projective(p, q).array() *= m_weights(p, q); + weights(p, q)[0] = m_weights(p, q); + } + } + + Point P; + Vector P_u, P_v, P_uu, P_vv, P_uv; + + Point W; + Vector W_u, W_v, W_uu, W_vv, W_uv; + + Vector eval_vec; + + projective.evaluate_second_derivatives(u, v, P, P_u, P_v, P_uu, P_vv, P_uv); + weights.evaluate_second_derivatives(u, v, W, W_u, W_v, W_uu, W_vv, W_uv); + + eval_vec = Vector(P) / W[0]; + Du = (P_u - eval_vec * W_u[0]) / W[0]; + Dv = (P_v - eval_vec * W_v[0]) / W[0]; + DuDu = (P_uu - 2 * W_u[0] * Du - eval_vec * W_uu[0]) / W[0]; + DvDv = (P_vv - 2 * W_v[0] * Dv - eval_vec * W_vv[0]) / W[0]; + DuDv = (P_uv - Du * W_v[0] - Dv * W_u[0] - eval_vec * W_uv[0]) / W[0]; + evaluation = Point(eval_vec.data()); + } + } + /*! * \brief Computes a tangent of a Bezier patch at a particular parameter value (\a u, \a v) along the u axis * @@ -833,23 +989,110 @@ class BezierPatch } else { - BezierPatch nonrational(ord_u, ord_v); - BezierPatch weights(ord_u, ord_v); + Vector val; + + axom::Array dCmat(ord_u + 1, ord_v + 1); + axom::Array dWmat(ord_u + 1, ord_v + 1); + + for(int i = 0; i < NDIMS; ++i) + { + // Do de Casteljau until we get a 3x3 for(int p = 0; p <= ord_u; ++p) { for(int q = 0; q <= ord_v; ++q) { - nonrational(p, q) = m_controlPoints(p, q); - nonrational(p, q).array() *= m_weights(p, q); - weights(p, q)[0] = m_weights(p, q); + dCmat(p, q) = m_controlPoints(p, q)[i] * m_weights(p, q); + dWmat(p, q) = m_weights(p, q); + } } + + // Do de Casteljau over the longer direction first + if(false) + { + // Stop 1 steps early in u + for(int p = 1; p <= ord_u - 1; ++p) + { + const int end = ord_u - p; + for(int k = 0; k <= end; ++k) + { + for(int q = 0; q <= ord_v; ++q) + { + dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); + dWmat(k, q) = lerp(dWmat(k, q), dWmat(k + 1, q), u); + } + } + } + + // Stop 1 step early in v over the two columns + for(int q = 1; q <= ord_v - 1; ++q) + { + const int end = ord_v - q; + for(int k = 0; k <= end; ++k) + { + for(int p = 0; p <= 1; ++p) + { + dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); + dWmat(p, k) = lerp(dWmat(p, k), dWmat(p, k + 1), v); + } + } + } + } + else + { + // Stop 1 step early in v + for(int q = 1; q <= ord_v - 1; ++q) + { + const int end = ord_v - q; + for(int k = 0; k <= end; ++k) + { + for(int p = 0; p <= ord_u; ++p) + { + dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); + dWmat(p, k) = lerp(dWmat(p, k), dWmat(p, k + 1), v); + } + } + } + + // Stop 1 step early in v over the two columns + for(int p = 1; p <= ord_u - 1; ++p) + { + const int end = ord_u - p; + for(int k = 0; k <= end; ++k) + { + for(int q = 0; q <= 1; ++q) + { + dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); + dWmat(k, q) = lerp(dWmat(k, q), dWmat(k + 1, q), u); + } + } + } + } + + // Store intermediate values + // clang-format off + double W = (1 - u) * (1 - v) * dWmat(0, 0) + u * (1 - v) * dWmat(1, 0) + + (1 - u) * v * dWmat(0, 1) + u * v * dWmat(1, 1); + double W_u = ord_u * ( (1 - v) * (dWmat(1, 0) - dWmat(0, 0)) + + v * (dWmat(1, 1) - dWmat(0, 1)) ); + double W_v = ord_v * ( (1 - u) * (dWmat(0, 1) - dWmat(0, 0)) + + u * (dWmat(1, 1) - dWmat(1, 0)) ); + double W_uv = ord_u * ord_v * (dWmat(1, 1) - dWmat(1, 0) - dWmat(0, 1) + dWmat(0, 0)); + + double C = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); + double C_u = ord_u * ( (1 - v) * (dCmat(1, 0) - dCmat(0, 0)) + + v * (dCmat(1, 1) - dCmat(0, 1)) ); + double C_v = ord_v * ( (1 - u) * (dCmat(0, 1) - dCmat(0, 0)) + + u * (dCmat(1, 1) - dCmat(1, 0)) ); + double C_uv = ord_u * ord_v * (dCmat(1, 1) - dCmat(1, 0) - dCmat(0, 1) + dCmat(0, 0)); + + val[i] = W * W * C_uv - W * (C_u * W_v + C_v * W_u) + + C * (2 * W_u * W_v - W * W_uv); + val[i] /= (W * W * W); + // clang-format on } - // Return a wildly inefficient calculation of the rational derivative - return (nonrational.dudv(u, v) - weights.dv(u, v)[0] * du(u, v) - - weights.du(u, v)[0] * dv(u, v) - - weights.dudv(u, v)[0] * Vector(evaluate(u, v))) / - weights.evaluate(u, v)[0]; + return val; } } diff --git a/src/axom/primal/tests/primal_bezier_patch.cpp b/src/axom/primal/tests/primal_bezier_patch.cpp index 02140d04d8..37b9b937a6 100644 --- a/src/axom/primal/tests/primal_bezier_patch.cpp +++ b/src/axom/primal/tests/primal_bezier_patch.cpp @@ -625,61 +625,58 @@ TEST(primal_bezierpatch, second_derivative) // clang-format on BezierPatchType bPatch(controlPoints, weights, order_u, order_v); + const double u = 0.6, v = 0.4; - auto evaluate_test = bPatch.evaluate(0.5, 0.4); - PointType evaluate_exp = {3.0, 6.85038038884, 2.35777683855}; + PointType evaluation; + VectorType Du, Dv, DuDu, DvDv, DuDv; + bPatch.evaluate_second_derivatives(u, v, evaluation, Du, Dv, DuDu, DvDv, DuDv); + + auto evaluate_test = bPatch.evaluate(u, v); + PointType evaluate_exp = {3.3677499397, 6.8406796016, 2.3949546817}; for(int i = 0; i < 3; ++i) { - EXPECT_NEAR(evaluate_test[i], evaluate_exp[i], 1e-6); + EXPECT_NEAR(evaluate_exp[i], evaluation[i], 1e-6); + EXPECT_NEAR(evaluate_exp[i], evaluate_test[i], 1e-6); } - auto partial_u_test = bPatch.du(0.6, 0.4); + auto partial_u_test = bPatch.du(u, v); VectorType partial_u_exp = {3.78171724599, -0.19774668801, -0.370827644202}; for(int i = 0; i < 3; ++i) { - EXPECT_NEAR(partial_u_test[i], partial_u_exp[i], 1e-6); + EXPECT_NEAR(partial_u_exp[i], Du[i], 1e-6); + EXPECT_NEAR(partial_u_exp[i], partial_u_test[i], 1e-6); } - auto partial_v_test = bPatch.dv(0.6, 0.4); + auto partial_v_test = bPatch.dv(u, v); VectorType partial_v_exp = {-0.354910197356, 11.8772494643, -1.594127454970}; for(int i = 0; i < 3; ++i) { - EXPECT_NEAR(partial_v_test[i], partial_v_exp[i], 1e-6); + EXPECT_NEAR(partial_v_exp[i], Dv[i], 1e-6); + EXPECT_NEAR(partial_v_exp[i], partial_v_test[i], 1e-6); } - auto partial_uu_test = bPatch.dudu(0.6, 0.4); + auto partial_uu_test = bPatch.dudu(u, v); VectorType partial_uu_exp = {3.20670028604, -2.12957447484, -16.1167567473}; for(int i = 0; i < 3; ++i) { - EXPECT_NEAR(partial_uu_test[i], partial_uu_exp[i], 1e-6); + EXPECT_NEAR(partial_uu_exp[i], DuDu[i], 1e-6); + EXPECT_NEAR(partial_uu_exp[i], partial_uu_test[i], 1e-6); } - auto partial_vv_test = bPatch.dvdv(0.6, 0.4); + auto partial_vv_test = bPatch.dvdv(u, v); VectorType partial_vv_exp = {0.479553359805, -8.63831027883, 1.13497887975}; for(int i = 0; i < 3; ++i) { - EXPECT_NEAR(partial_vv_test[i], partial_vv_exp[i], 1e-6); + EXPECT_NEAR(partial_vv_exp[i], DvDv[i], 1e-6); + EXPECT_NEAR(partial_vv_exp[i], partial_vv_test[i], 1e-6); } - BezierPatchType bPatch_nonrational(bPatch); - bPatch_nonrational.makeNonrational(); - bPatch_nonrational.makeRational(); - std::cout << bPatch_nonrational.getWeight(2, 3) << std::endl; - - auto partial_uv_test = bPatch.dudv(0.6, 0.4); + auto partial_uv_test = bPatch.dudv(u, v); VectorType partial_uv_exp = {-3.43768298544, 1.94078069698, 8.48995274462}; for(int i = 0; i < 3; ++i) { - EXPECT_NEAR(partial_uv_test[i], partial_uv_exp[i], 1e-6); - } - - auto partial_uv_test_nonrational = bPatch_nonrational.dudv(0.6, 0.4); - VectorType partial_uv_exp_nonrational = {-2.36544, 0, 11.80416}; - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(partial_uv_test_nonrational[i], - partial_uv_exp_nonrational[i], - 1e-6); + EXPECT_NEAR(partial_uv_exp[i], partial_uv_test[i], 1e-6); + EXPECT_NEAR(partial_uv_exp[i], DuDv[i], 1e-6); } } From 1b349c17c30cd25811374c379c7ea7e8e27319f8 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Tue, 8 Aug 2023 16:18:54 -0700 Subject: [PATCH 045/639] Update function name and usage --- .../operators/detail/winding_number_impl.hpp | 44 ++++++------- src/axom/primal/operators/split.hpp | 14 ++--- src/axom/primal/operators/winding_number.hpp | 63 ++++++++++++------- 3 files changed, 71 insertions(+), 50 deletions(-) diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 4b4a3171ab..1074fa129f 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -469,6 +469,10 @@ double stokes_winding_number_adaptive(const Point& query, quad_tol, 1e-10)) { + if(depth >= MAX_DEPTH) + { + printf(""); + } return 0.25 * M_1_PI * (quad_fine[0] + quad_fine[1]); } else @@ -508,14 +512,15 @@ double stokes_winding_number_adaptive(const Point& query, */ template bool near_field_projection(const Point& p, - const BezierPatch& bPatch, - double& min_u, + const BezierPatch& bPatch, + double& min_u, double& min_v, double edge_tol = 1e-8, double EPS = 1e-8) { min_u = 0.5; min_v = 0.5; + Point S; Vector Sp, Su, Sv, Suu, Svv, Suv; double A00, A01, A10, A11, det; double b0, b1; @@ -523,27 +528,24 @@ bool near_field_projection(const Point& p, // TODO: Compute Sp, Su, Sv, Suu, Svv, Suv MUCH more efficiently // by using the same intermediates from de Casteljau - for(int i = 0; i < 15; ++i) + constexpr int max_iter = 15; + for(int i = 0; i < max_iter; ++i) { - Sp = Vector(p, bPatch.evaluate(min_u, min_v)); + // Get all derivatives necessary for Newton step + bPatch.evaluate_second_derivatives(min_u, min_v, S, Su, Sv, Suu, Svv, Suv); + Sp = Vector(p, S); + if(Sp.squared_norm() < edge_tol * edge_tol) { return true; } - Su = bPatch.du(min_u, min_v); - Sv = bPatch.dv(min_u, min_v); - - if(axom::utilities::isNearlyEqual(Su.squared_norm(), 0.0, EPS) && - axom::utilities::isNearlyEqual(Sv.squared_norm(), 0.0, EPS)) + if(axom::utilities::isNearlyEqual(Su.dot(Sp), 0.0, EPS) && + axom::utilities::isNearlyEqual(Sv.dot(Sp), 0.0, EPS)) { return true; } - Suu = bPatch.dudu(min_u, min_v); - Svv = bPatch.dvdv(min_u, min_v); - Suv = bPatch.dudv(min_u, min_v); - A00 = Sp.dot(Suu) + Su.dot(Su); A10 = A01 = Sp.dot(Suv) + Su.dot(Sv); A11 = Sp.dot(Svv) + Sv.dot(Sv); @@ -553,8 +555,13 @@ bool near_field_projection(const Point& p, // a different initial condition if(axom::utilities::isNearlyEqual(det, 0.0, PRIMAL_TINY)) { - min_u = 1.0 / i; - min_v = 1.0 / (i + 1); + if(i == max_iter) + { + min_u = min_v = 0.5; + return false; + } + min_u = 1.0 / (i + 1); + min_v = 1.0 / (i + 2); continue; } @@ -581,13 +588,8 @@ bool near_field_projection(const Point& p, } return false; - } - - min_u = u; - min_v = v; - - return evaluate(u, v); } + } // end namespace detail } // end namespace primal } // end namespace axom diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 07c3058836..6f67f288f4 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -82,7 +82,7 @@ void split(const Octahedron& oct, }; /*! - * \brief Splits a BezierPatch object into SuperConvex subpatches + * \brief Splits a BezierPatch object into valid subpatches for winding number computation * * \param [in] bPatch BezierPatch to split * \param [out] out The \a axom::Array of BezierPatch objects; a set of SuperConvex @@ -90,11 +90,11 @@ void split(const Octahedron& oct, * * * Uses a bisection method, splitting the patch recursively until each section - * is SuperConvex (convex + shallow). + * is convex + shallow. * */ template -void split_to_valid(const BezierPatch& bPatch, +void split_to_convex_shallow(const BezierPatch& bPatch, axom::Array>& out) { using Poly = Polygon; @@ -129,8 +129,8 @@ void split_to_valid(const BezierPatch& bPatch, is_valid = false; Patch p1, p2; bPatch.split_u(0.5, p1, p2); - split_to_valid(p1, out); - split_to_valid(p2, out); + split_to_convex_shallow(p1, out); + split_to_convex_shallow(p2, out); } } @@ -153,8 +153,8 @@ void split_to_valid(const BezierPatch& bPatch, is_valid = false; Patch p1, p2; bPatch.split_v(0.5, p1, p2); - split_to_valid(p1, out); - split_to_valid(p2, out); + split_to_convex_shallow(p1, out); + split_to_convex_shallow(p2, out); } } diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index 5204fe52a2..4b5c7cc5ba 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -468,26 +468,47 @@ int winding_number(const Point& query, * * \note Warning: This algorithm is only tested to high accuracy for queries within * 1e-5 of the surface. Otherwise, it will return less accurate results. - * \note CURRENTLY ASSUMES THE SURFACE IS VALID! PROJECTION MAY NOT WORK OTHERWISE! * * \return double The generalized winding number. */ template double winding_number(const Point& query, const BezierPatch& bPatch, + const bool isValidSurface = false, const double edge_tol = 1e-5, const double quad_tol = 1e-6, - const double EPS = 1e-8, - const int depth = 0) + const double EPS = 1e-8) { const int ord_u = bPatch.getOrder_u(); const int ord_v = bPatch.getOrder_v(); const bool patchIsRational = bPatch.isRational(); const double edge_tol_sq = edge_tol * edge_tol; + if(ord_u <= 0 || ord_v <= 0) + { + return 0.0; + } + + // If the patch isn't valid, then we need to split it and + // apply the algorithm to each component. + double wn = 0.0; + if(!isValidSurface) + { + axom::Array> valid_subsurfaces; + split_to_convex_shallow(bPatch, valid_subsurfaces); + + for(auto& surf : valid_subsurfaces) + { + wn += winding_number(query, surf, true, edge_tol, quad_tol, EPS); + } + + return wn; + } + // Fix the number of quadrature nodes arbitrarily, but high enough // to `catch` near singularities for refinement constexpr int quad_npts = 50; + constexpr double edge_offset = 0.01; // Early return if the patch is approximately polygonal. // Very slight variations in curvature requires small EPS tolerance @@ -507,7 +528,6 @@ double winding_number(const Point& query, * surface at only a single point (pierce). */ CurvedPolygon boundingPoly(4); - double wn = 0; detail::SingularityAxis field_direction; // Check if we dodge an axis-aligned bounding box, @@ -587,9 +607,6 @@ double winding_number(const Point& query, detail::near_field_projection(query, bPatch, min_u, min_v, edge_tol, EPS); Point closest_point = bPatch.evaluate(min_u, min_v); - int on_boundary = - (min_u < EPS) + (min_u > 1 - EPS) + (min_v < EPS) + (min_v > 1 - EPS); - // Cast a ray that is normal to the surface at the closest point cast_ray = bPatch.normal(min_u, min_v).unitVector(); @@ -605,17 +622,23 @@ double winding_number(const Point& query, 0.0, PRIMAL_TINY)) { - Vector T1, T2; - bPatch.corner_tangent_vectors(closest_point, T1, T2, edge_tol, EPS); - if(T1.squared_norm() == 0) - printf("Could not find a normal vector at this corner!\n"); - closest_normal = Vector::cross_product(T1, T2); + closest_normal = bPatch.normal( + axom::utilities::clampVal(min_u, edge_offset, 1 - edge_offset), + axom::utilities::clampVal(min_v, edge_offset, 1 - edge_offset)); + + // If that doesn't work, assume that the projection provides one. + if(axom::utilities::isNearlyEqual(closest_normal.squared_norm(), + 0.0, + PRIMAL_TINY)) + { + closest_normal = Vector(closest_point, query); + } } closest_normal = closest_normal.unitVector(); // If the query is on the surface, then we don't need to do any adjustment, // as the induced discontinuity in the integrand is removable - if(closest_vector.squared_norm() < edge_tol * edge_tol) + if(closest_vector.squared_norm() < edge_tol_sq) { cast_ray = closest_normal; wn = 0.0; @@ -635,7 +658,7 @@ double winding_number(const Point& query, // Can possibly pick this one more cleverly. if(axom::utilities::isNearlyEqual(closest_normal[0], closest_normal[1], - EPS)) + EPS)) cast_ray = Vector({closest_normal[2], closest_normal[2], -closest_normal[0] - closest_normal[1]}) @@ -645,13 +668,13 @@ double winding_number(const Point& query, closest_normal[0], closest_normal[0]}) .unitVector(); - } + } // If we're interior, we can safely pierce the surface, making // sure not to hit a boundary. - else - { + else + { // This tolerance is arbitrary. A smaller value might be needed - double edge_offset = 0.01; + cast_ray = Vector( query, bPatch.evaluate( @@ -660,10 +683,6 @@ double winding_number(const Point& query, cast_ray = cast_ray.unitVector(); wn = 0.5; } - - // Need to change the sign of the disk's contribution - // depending on the orientation. - wn *= (closest_vector.dot(cast_ray) > 0) ? 1.0 : -1.0; } // Rotate the surface so that the cast ray is oriented with k_hat From 97114bf853c09c708b076f83ad30a68bf6b6a27b Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 10 Aug 2023 13:13:49 -0700 Subject: [PATCH 046/639] Add (possibly wrong) algorithms from Maa --- src/axom/primal/geometry/BezierPatch.hpp | 6 +- .../operators/detail/winding_number_impl.hpp | 90 ++++++++++++++++++- 2 files changed, 90 insertions(+), 6 deletions(-) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index 73002cbf05..a56649743e 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -997,10 +997,10 @@ class BezierPatch for(int i = 0; i < NDIMS; ++i) { // Do de Casteljau until we get a 3x3 - for(int p = 0; p <= ord_u; ++p) - { - for(int q = 0; q <= ord_v; ++q) + for(int p = 0; p <= ord_u; ++p) { + for(int q = 0; q <= ord_v; ++q) + { dCmat(p, q) = m_controlPoints(p, q)[i] * m_weights(p, q); dWmat(p, q) = m_weights(p, q); } diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 1074fa129f..0c980a8f7e 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -495,6 +495,88 @@ double stokes_winding_number_adaptive(const Point& query, } #endif +/// Return FALSE if the nearest point is an endpoint. +/// Given by Algorithm 3 in [Maa 2003] +template +bool point_nearest_bezier_curve(const Point& p, + const Polygon& poly) +{ + const int N = poly.numVertices() - 1; + if(N <= 1) return true; + + // Store the vectors used multiple times + Vector P0P(poly[0], p); + Vector PPN(p, poly[N]); + Vector PNP0(poly[N], poly[0]); + + // Check the more likely condition first + double R3 = -PNP0.dot(PPN); + double R4 = PNP0.dot(P0P); + if(R3 * R4 <= 0) return true; + + double R1 = P0P.dot(Vector(poly[0], poly[1])); + double R2 = PPN.dot(Vector(poly[N - 1], poly[N])); + if(R1 >= 0 && R2 >= 0) return true; + + return false; +} + +/// Return FALSE if nearest point is on the boundary +/// Given by Algorithm 4 in [Maa 2003] +template +bool point_nearest_bezier_patch(const Point& point, + const BezierPatch& bPatch, + double EPS = 1e-8) +{ + const int ord_u = bPatch.getOrder_u(); + const int ord_v = bPatch.getOrder_v(); + bool flag = false; + + Polygon controlPoly; + for(int q = 0; q <= ord_v; ++q) + { + controlPoly.clear(); + for(int p = 0; p <= ord_u; ++p) + { + controlPoly.addVertex(bPatch(p, q)); + } + + if(point_nearest_bezier_curve(point, controlPoly)) + { + flag = true; + break; + } + } + + if(flag == false) + { + return false; + } + + flag = false; + for(int p = 0; p <= ord_u; ++p) + { + controlPoly.clear(); + for(int q = 0; q <= ord_v; ++q) + { + controlPoly.addVertex(bPatch(p, q)); + } + + if(point_nearest_bezier_curve(point, controlPoly)) + { + flag = true; + break; + } + } + + if(flag == false) + { + return false; + } + + return true; +} + /*! * \brief Find the point on a BezierPatch closest to a point close to the surface * @@ -525,10 +607,11 @@ bool near_field_projection(const Point& p, double A00, A01, A10, A11, det; double b0, b1; double delu, delv; + double damp = 1.0; // TODO: Compute Sp, Su, Sv, Suu, Svv, Suv MUCH more efficiently // by using the same intermediates from de Casteljau - constexpr int max_iter = 15; + constexpr int max_iter = 10; for(int i = 0; i < max_iter; ++i) { // Get all derivatives necessary for Newton step @@ -568,8 +651,9 @@ bool near_field_projection(const Point& p, b0 = -Sp.dot(Su); b1 = -Sp.dot(Sv); - delu = (A11 * b0 - A01 * b1) / det; - delv = (-A10 * b0 + A00 * b1) / det; + delu = damp * (A11 * b0 - A01 * b1) / det; + delv = damp * (-A10 * b0 + A00 * b1) / det; + damp *= 1; min_u = axom::utilities::clampVal(min_u + delu, 0.0, 1.0); min_v = axom::utilities::clampVal(min_v + delv, 0.0, 1.0); From 77df4764bf91585c576078ac4e3443b4114623a8 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 10 Aug 2023 13:32:52 -0700 Subject: [PATCH 047/639] Put old method in new function --- src/axom/primal/operators/split.hpp | 2 +- src/axom/primal/operators/winding_number.hpp | 416 ++++++++++++++++--- src/axom/primal/tests/primal_solid_angle.cpp | 304 ++++++++++++-- 3 files changed, 614 insertions(+), 108 deletions(-) diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 6f67f288f4..00fa10dc29 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -95,7 +95,7 @@ void split(const Octahedron& oct, */ template void split_to_convex_shallow(const BezierPatch& bPatch, - axom::Array>& out) + axom::Array>& out) { using Poly = Polygon; using Patch = BezierPatch; diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index 4b5c7cc5ba..f82ff5e204 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -452,32 +452,15 @@ int winding_number(const Point& query, return std::lround(wn); } - #ifdef AXOM_USE_MFEM -/*! - * \brief Computes the solid angle winding number for a 3D Bezier patch - * - * \param [in] query The query point to test - * \param [in] bPatch The Bezier patch object - * \param [in] edge_tol The physical distance level at which objects are - * considered indistinguishable - * \param [in] quad_tol The maximum relative error allowed in the quadrature - * \param [in] EPS Miscellaneous numerical tolerance level for nonphysical distances - * - * Computes the generalized winding number for a Bezier patch using Stokes theorem. - * - * \note Warning: This algorithm is only tested to high accuracy for queries within - * 1e-5 of the surface. Otherwise, it will return less accurate results. - * - * \return double The generalized winding number. - */ + template -double winding_number(const Point& query, - const BezierPatch& bPatch, - const bool isValidSurface = false, - const double edge_tol = 1e-5, - const double quad_tol = 1e-6, - const double EPS = 1e-8) +double winding_number_casting(const Point& query, + const BezierPatch& bPatch, + const bool isValidSurface = false, + const double edge_tol = 1e-5, + const double quad_tol = 1e-6, + const double EPS = 1e-8) { const int ord_u = bPatch.getOrder_u(); const int ord_v = bPatch.getOrder_v(); @@ -499,7 +482,7 @@ double winding_number(const Point& query, for(auto& surf : valid_subsurfaces) { - wn += winding_number(query, surf, true, edge_tol, quad_tol, EPS); + wn += winding_number_casting(query, surf, true, edge_tol, quad_tol, EPS); } return wn; @@ -507,8 +490,7 @@ double winding_number(const Point& query, // Fix the number of quadrature nodes arbitrarily, but high enough // to `catch` near singularities for refinement - constexpr int quad_npts = 50; - constexpr double edge_offset = 0.01; + constexpr int quad_npts = 100; // Early return if the patch is approximately polygonal. // Very slight variations in curvature requires small EPS tolerance @@ -605,12 +587,12 @@ double winding_number(const Point& query, // and does so at an interior point double min_u, min_v; detail::near_field_projection(query, bPatch, min_u, min_v, edge_tol, EPS); - Point closest_point = bPatch.evaluate(min_u, min_v); + bool supposedToBeOnBoundary = + !detail::point_nearest_bezier_patch(query, bPatch); - // Cast a ray that is normal to the surface at the closest point - cast_ray = bPatch.normal(min_u, min_v).unitVector(); + Point closest_point = bPatch.evaluate(min_u, min_v); - closest_vector = Vector(query, closest_point); + closest_vector = Vector(closest_point, query); int on_boundary = (min_u < EPS) || (min_u > 1 - EPS) || (min_v < EPS) || (min_v > 1 - EPS); @@ -622,20 +604,23 @@ double winding_number(const Point& query, 0.0, PRIMAL_TINY)) { - closest_normal = bPatch.normal( - axom::utilities::clampVal(min_u, edge_offset, 1 - edge_offset), - axom::utilities::clampVal(min_v, edge_offset, 1 - edge_offset)); + closest_normal = + bPatch.normal(axom::utilities::clampVal(min_u, EPS, 1 - EPS), + axom::utilities::clampVal(min_v, EPS, 1 - EPS)); - // If that doesn't work, assume that the projection provides one. + // If that doesn't work, then it is likely (heuristic) that the interior + // is empty everywhere, and the winding number is zero. if(axom::utilities::isNearlyEqual(closest_normal.squared_norm(), 0.0, PRIMAL_TINY)) { - closest_normal = Vector(closest_point, query); + return 0.0; } } closest_normal = closest_normal.unitVector(); + //return closest_vector.dot(closest_normal); + // If the query is on the surface, then we don't need to do any adjustment, // as the induced discontinuity in the integrand is removable if(closest_vector.squared_norm() < edge_tol_sq) @@ -647,41 +632,61 @@ double winding_number(const Point& query, // disk around the ray we cast. else { + closest_vector = closest_vector.unitVector(); + // Check orientation relative to the surface - bool exterior = closest_vector.dot(closest_normal) < 0; + double dot_prod = closest_vector.dot(closest_normal); - // If we're exterior, then we can definitely define a separating - // plane defined by closest_normal - if(exterior) + if(on_boundary) { - // Get a perpendicular vector to closest_normal. - // Can possibly pick this one more cleverly. - if(axom::utilities::isNearlyEqual(closest_normal[0], - closest_normal[1], + Vector closest_orthog; + if(axom::utilities::isNearlyEqual(closest_vector[0], + closest_vector[1], EPS)) - cast_ray = Vector({closest_normal[2], - closest_normal[2], - -closest_normal[0] - closest_normal[1]}) - .unitVector(); + closest_orthog = + Vector({closest_vector[2], + closest_vector[2], + -closest_vector[0] - closest_vector[1]}) + .unitVector(); else - cast_ray = Vector({-closest_normal[1] - closest_normal[2], - closest_normal[0], - closest_normal[0]}) - .unitVector(); + closest_orthog = Vector({-closest_vector[1] - closest_vector[2], + closest_vector[0], + closest_vector[0]}) + .unitVector(); + //cast_ray = closest_orthog; + cast_ray = closest_normal; + + printf("==========Closest point is on a boundary!==========\n"); + printf("Are we supposed to be on the boundary? %s\n", + (supposedToBeOnBoundary ? "Yes!" : "No!")); + //python_print(closest_vector, query); + python_print(closest_orthog, query, "green"); + python_print(closest_normal, query, "red"); + python_print(closest_vector, closest_point, "blue"); + //python_print(closest_normal, closest_point); + python_print(bPatch); + python_print(query); + python_print(closest_point); + std::cout << closest_vector.dot(closest_normal) << std::endl; + printf("===================================================\n"); } - // If we're interior, we can safely pierce the surface, making - // sure not to hit a boundary. + // If the closest point isinterior, we can safely pierce the surface, + // since the ray cast won't hit a boundary else { - // This tolerance is arbitrary. A smaller value might be needed - - cast_ray = Vector( - query, - bPatch.evaluate( - axom::utilities::clampVal(min_u, edge_offset, 1 - edge_offset), - axom::utilities::clampVal(min_v, edge_offset, 1 - edge_offset))); - cast_ray = cast_ray.unitVector(); - wn = 0.5; + cast_ray = closest_vector; + wn = (dot_prod > 0 ? -1.0 : 1.0) * 0.5; + printf("-----------Closest point is on the interor!-----------\n"); + printf("Are we supposed to be on the boundary? %s\n", + (supposedToBeOnBoundary ? "Yes!" : "No!")); + //python_print(closest_vector, query); + python_print(cast_ray, query, "green"); + python_print(closest_vector, closest_point, "blue"); + python_print(bPatch); + python_print(query); + python_print(closest_point); + std::cout << closest_vector.dot(closest_normal) << std::endl; + printf("------------------------------------------------------\n"); } } @@ -799,6 +804,291 @@ double winding_number(const Point& query, } #endif +template +double winding_number_recursive(const Point& query, + const BezierPatch& bPatch, + const double edge_tol = 1e-8, + const double quad_tol = 1e-8, + const double EPS = 1e-8, + const int depth = 0) +{ + const int ord_u = bPatch.getOrder_u(); + const int ord_v = bPatch.getOrder_v(); + const bool patchIsRational = bPatch.isRational(); + const double edge_tol_sq = edge_tol * edge_tol; + + // Fix the number of quadrature nodes arbitrarily, but high enough + // to `catch` near singularities for refinement + constexpr int quad_npts = 30; + + // Early return if the patch is approximately polygonal. + // Very slight variations in curvature requires small EPS tolerance + constexpr int MAX_DEPTH = 10; + if(depth >= MAX_DEPTH || bPatch.isPolygonal(EPS)) + { + return winding_number( + query, + Polygon(axom::Array>( + {bPatch(0, 0), bPatch(ord_u, 0), bPatch(ord_u, ord_v), bPatch(0, ord_v)})), + edge_tol, + PRIMAL_TINY); + } + + // Use a specific kind of recursion if we are within tol of an endpoint. + // Split the surface closer to the corner, assume smallest patch is polygonal, + // and set a new edge_tol so corners of the new patch aren't marked as coincident + constexpr double edge_offset = 0.01; + if(squared_distance(query, bPatch(0, 0)) <= edge_tol_sq) + { + BezierPatch p1, p2, p3, p4; + bPatch.split(0.0 + edge_offset, 0.0 + edge_offset, p1, p2, p3, p4); + double new_edge_tol = 0.5 * + sqrt(axom::utilities::min( + squared_distance(query, bPatch.evaluate(0.0, 0.0 + edge_offset)), + squared_distance(query, bPatch.evaluate(0.0 + edge_offset, 0.0)))); + new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); + + return winding_number_recursive(query, + p2, + new_edge_tol, + quad_tol, + EPS, + depth + 1) + + winding_number_recursive(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); + } + if(squared_distance(query, bPatch(ord_u, 0)) <= edge_tol_sq) + { + BezierPatch p1, p2, p3, p4; + bPatch.split(1.0 - edge_offset, 0.0 + edge_offset, p1, p2, p3, p4); + double new_edge_tol = 0.5 * + sqrt(axom::utilities::min( + squared_distance(query, bPatch.evaluate(1.0, 0.0 + edge_offset)), + squared_distance(query, bPatch.evaluate(1.0 - edge_offset, 0.0)))); + new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); + + return winding_number_recursive(query, + p1, + new_edge_tol, + quad_tol, + EPS, + depth + 1) + + winding_number_recursive(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); + } + if(squared_distance(query, bPatch(0, ord_v)) <= edge_tol_sq) + { + BezierPatch p1, p2, p3, p4; + bPatch.split(0.0 + edge_offset, 1.0 - edge_offset, p1, p2, p3, p4); + double new_edge_tol = 0.5 * + sqrt(axom::utilities::min( + squared_distance(query, bPatch.evaluate(0.0 + edge_offset, 1.0)), + squared_distance(query, bPatch.evaluate(0.0, 1.0 - edge_offset)))); + new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); + + return winding_number_recursive(query, + p1, + new_edge_tol, + quad_tol, + EPS, + depth + 1) + + winding_number_recursive(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); + } + if(squared_distance(query, bPatch(ord_u, ord_v)) <= edge_tol_sq) + { + BezierPatch p1, p2, p3, p4; + bPatch.split(1.0 - edge_offset, 1.0 - edge_offset, p1, p2, p3, p4); + double new_edge_tol = 0.5 * + sqrt(axom::utilities::min( + squared_distance(query, bPatch.evaluate(1.0, 1.0 - edge_offset)), + squared_distance(query, bPatch.evaluate(1.0 - edge_offset, 1.0)))); + new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); + + return winding_number_recursive(query, + p1, + new_edge_tol, + quad_tol, + EPS, + depth + 1) + + winding_number_recursive(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p3, new_edge_tol, quad_tol, EPS, depth + 1); + } + + /* + * To use Stokes theorem, we need to identify a separating plane between + * `query` and the surface, guaranteed through a bounding box. + * If it does, need to do geometric refinement: Splitting and rotating the curve + * until we can guarantee this. + */ + CurvedPolygon boundingPoly(4); + + // Define vector fields whose curl gives us the winding number + detail::SingularityAxis field_direction; + + // Check an axis-aligned bounding box (most surfaces satisfy this condition) + BoundingBox bBox(bPatch.boundingBox().expand(edge_tol)); + const bool exterior_x = + bBox.getMin()[0] > query[0] || query[0] > bBox.getMax()[0]; + const bool exterior_y = + bBox.getMin()[1] > query[1] || query[1] > bBox.getMax()[1]; + const bool exterior_z = + bBox.getMin()[2] > query[2] || query[2] > bBox.getMax()[2]; + + if(exterior_y || exterior_z) + { + field_direction = detail::SingularityAxis::x; + } + else if(exterior_x || exterior_z) + { + field_direction = detail::SingularityAxis::y; + } + else if(exterior_x || exterior_y) + { + field_direction = detail::SingularityAxis::z; + } + else + { + // Next, check an oriented bounding box. + // If we are interior to the oriented bounding box, then we + // cannot guarantee a separating plane, and need geometric refinement. + OrientedBoundingBox oBox(bPatch.orientedBoundingBox().expand(edge_tol)); + if(oBox.contains(query)) + { + BezierPatch p1, p2, p3, p4; + bPatch.split(0.5, 0.5, p1, p2, p3, p4); + return winding_number_recursive(query, p1, edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p2, edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p3, edge_tol, quad_tol, EPS, depth + 1) + + winding_number_recursive(query, p4, edge_tol, quad_tol, EPS, depth + 1); + } + + // Otherwise, we can apply a rotation to a z-aligned field. + field_direction = detail::SingularityAxis::rotated; + + // Lambda to generate a 3D rotation matrix from an angle and axis + // Formulation from https://en.wikipedia.org/wiki/Rotation_matrix#Axis_and_angle + auto angleAxisRotMatrix = + [](double theta, const Vector& axis) -> numerics::Matrix { + const auto unitized = axis.unitVector(); + const double x = unitized[0], y = unitized[1], z = unitized[2]; + const double c = cos(theta), s = sin(theta), C = 1 - c; + + auto matx = numerics::Matrix::zeros(3, 3); + + matx(0, 0) = x * x * C + c; + matx(0, 1) = x * y * C - z * s; + matx(0, 2) = x * z * C + y * s; + + matx(1, 0) = y * x * C + z * s; + matx(1, 1) = y * y * C + c; + matx(1, 2) = y * z * C - x * s; + + matx(2, 0) = z * x * C - y * s; + matx(2, 1) = z * y * C + x * s; + matx(2, 2) = z * z * C + c; + + return matx; + }; + + // Lambda to rotate the input point using the provided rotation matrix + auto rotate_point = [&query](const numerics::Matrix& matx, + const Point input) -> Point { + Vector shifted(query, input); + Vector rotated; + numerics::matrix_vector_multiply(matx, shifted.data(), rotated.data()); + return Point( + {rotated[0] + query[0], rotated[1] + query[1], rotated[2] + query[2]}); + }; + + // Find vector from query to the bounding box + Point closest = closest_point(query, oBox); + Vector v0 = Vector(query, closest).unitVector(); + + // Find the direction of a ray perpendicular to that + Vector v1; + if(axom::utilities::isNearlyEqual(v0[0], v0[1], EPS)) + v1 = Vector({v0[2], v0[2], -v0[0] - v0[1]}).unitVector(); + else + v1 = Vector({-v0[1] - v0[2], v0[0], v0[0]}).unitVector(); + + // Rotate v0 around v1 until it is perpendicular to the plane spanned by k and v1 + double ang = (v0[2] < 0 ? 1.0 : -1.0) * + acos(axom::utilities::clampVal( + -(v0[0] * v1[1] - v0[1] * v1[0]) / sqrt(v1[0] * v1[0] + v1[1] * v1[1]), + -1.0, + 1.0)); + auto rotator = angleAxisRotMatrix(ang, v1); + + // Collect rotated curves into the curved Polygon + // Set up the (0, v) and (1, v) isocurves, rotated + boundingPoly[0].setOrder(ord_v); + boundingPoly[2].setOrder(ord_v); + if(patchIsRational) + { + boundingPoly[0].makeRational(); + boundingPoly[2].makeRational(); + } + for(int q = 0; q <= ord_v; ++q) + { + boundingPoly[0][q] = rotate_point(rotator, bPatch(ord_v, q)); + boundingPoly[2][q] = rotate_point(rotator, bPatch(0, ord_v - q)); + + if(patchIsRational) + { + boundingPoly[0].setWeight(q, bPatch.getWeight(ord_v, q)); + boundingPoly[2].setWeight(q, bPatch.getWeight(0, ord_v - q)); + } + } + + // Set up the (u, 0) and (u, 1) isocurves + boundingPoly[1].setOrder(ord_u); + boundingPoly[3].setOrder(ord_u); + if(patchIsRational) + { + boundingPoly[1].makeRational(); + boundingPoly[3].makeRational(); + } + for(int p = 0; p <= ord_u; ++p) + { + boundingPoly[1][p] = rotate_point(rotator, bPatch(ord_u - p, ord_u)); + boundingPoly[3][p] = rotate_point(rotator, bPatch(p, 0)); + + if(patchIsRational) + { + boundingPoly[1].setWeight(p, bPatch.getWeight(ord_u - p, ord_u)); + boundingPoly[3].setWeight(p, bPatch.getWeight(p, 0)); + } + } + } + + // Set up the polygon if we don't need to do any rotation or splitting. + if(field_direction != detail::SingularityAxis::rotated) + { + // Add the relevant bounding curves to the patch. + boundingPoly[0] = bPatch.isocurve_u(0); + boundingPoly[0].reverseOrientation(); + + boundingPoly[1] = bPatch.isocurve_v(1); + boundingPoly[1].reverseOrientation(); + + boundingPoly[2] = bPatch.isocurve_u(1); + boundingPoly[3] = bPatch.isocurve_v(0); + } + + // Iterate over the edges of the bounding curved polygon, add up the results + double wn = 0; + for(int n = 0; n < 4; ++n) + { + wn += detail::stokes_winding_number(query, + boundingPoly[n], + field_direction, + quad_npts, + quad_tol); + } + + return wn; +} //@} } // namespace primal diff --git a/src/axom/primal/tests/primal_solid_angle.cpp b/src/axom/primal/tests/primal_solid_angle.cpp index d78fcfd166..e9597acb47 100644 --- a/src/axom/primal/tests/primal_solid_angle.cpp +++ b/src/axom/primal/tests/primal_solid_angle.cpp @@ -11,7 +11,6 @@ #include "axom/fmt.hpp" #include "gtest/gtest.h" - // C++ headers #include #include @@ -481,6 +480,8 @@ TEST(primal_solid_angle, selfintersecting_quadrilateral) //------------------------------------------------------------------------------ TEST(primal_solid_angle, planar_bezierpatch) { + return; + using Point3D = primal::Point; using Vector3D = primal::Vector; using Polygon = primal::Polygon; @@ -505,6 +506,7 @@ TEST(primal_solid_angle, planar_bezierpatch) // Construct a first order Bezier patch out of the same vertices Point3D controlPoints[4] = {quad[1], quad[0], quad[2], quad[3]}; BezierPatch quad_patch(controlPoints, 1, 1); + const bool isValidPatch = false; Point3D queries[8] = {Point3D {0.0, 4.0, 1.0}, Point3D {-1.0, 2.0, 2.0}, @@ -519,7 +521,7 @@ TEST(primal_solid_angle, planar_bezierpatch) for(int n = 0; n < 8; ++n) { EXPECT_NEAR(winding_number(queries[n], quad), - winding_number(queries[n], quad_patch), + winding_number_recursive(queries[n], quad_patch, isValidPatch), 1e-10); } @@ -531,8 +533,13 @@ TEST(primal_solid_angle, planar_bezierpatch) const double EPS = 0; for(int n = 0; n < 8; ++n) { - EXPECT_NEAR(winding_number(queries[n], quad_patch), - winding_number(queries[n], quad_patch, quad_tol, edge_tol, EPS), + EXPECT_NEAR(winding_number_recursive(queries[n], quad_patch, isValidPatch), + winding_number_recursive(queries[n], + quad_patch, + isValidPatch, + quad_tol, + edge_tol, + EPS), 1e-10); } } @@ -540,6 +547,8 @@ TEST(primal_solid_angle, planar_bezierpatch) //------------------------------------------------------------------------------ TEST(primal_solid_angle, bezierpatch_sphere) { + return; + using Point3D = primal::Point; using Vector3D = primal::Vector; using BPatch = primal::BezierPatch; @@ -621,9 +630,10 @@ TEST(primal_solid_angle, bezierpatch_sphere) axom::Array valid_subsurfaces; for(int n = 0; n < 6; ++n) { - split_to_valid(sphere_faces[n], valid_subsurfaces); + split_to_convex_shallow(sphere_faces[n], valid_subsurfaces); } const int num_subsurfaces = valid_subsurfaces.size(); + const bool isValidSubsurface = true; // Iterate over points of interest, i.e. close to a boundary. // Specifically need to exercise the ray casting steps @@ -645,7 +655,7 @@ TEST(primal_solid_angle, bezierpatch_sphere) const double edge_offset = 1e-5; const double quad_tol = 1e-5; - const double EPS = 1e-10; + const double EPS = 1e-8; // Test some easy cases auto origin = Point3D({0.0, 0.0, 0.0}); @@ -654,10 +664,18 @@ TEST(primal_solid_angle, bezierpatch_sphere) double origin_wn = 0.0, near_origin_wn = 0.0; for(int k = 0; k < num_subsurfaces; ++k) { - origin_wn += - winding_number(origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); - near_origin_wn += - winding_number(near_origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + origin_wn += winding_number_recursive(origin, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); + near_origin_wn += winding_number_recursive(near_origin, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(origin_wn, 1.0, num_subsurfaces * quad_tol); EXPECT_NEAR(near_origin_wn, 1.0, num_subsurfaces * quad_tol); @@ -670,8 +688,12 @@ TEST(primal_solid_angle, bezierpatch_sphere) double far_wn = 0.0; for(int k = 0; k < num_subsurfaces; ++k) { - far_wn += - winding_number(far_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + far_wn += winding_number_recursive(far_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(far_wn, 0.0, num_subsurfaces * quad_tol); } @@ -679,17 +701,34 @@ TEST(primal_solid_angle, bezierpatch_sphere) // Iterate over difficult query directions for very close points for(int i = 0; i < 11; ++i) { - std::cout << i << std::endl; + std::cout << std::endl << i << std::endl; // Pick point close to the surface auto inner_query = Point3D((1.0 - edge_offset) * query_directions[i].array()); auto outer_query = Point3D((1.0 + edge_offset) * query_directions[i].array()); // Iterate over the patches that compose the sphere double inner_wn = 0; + double inner_wn_old = 0.0; for(int k = 0; k < num_subsurfaces; ++k) { - inner_wn += - winding_number(inner_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + inner_wn += winding_number_recursive(inner_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); + + //inner_wn_old += winding_number_old(inner_query, + // valid_subsurfaces[k], + // edge_tol, + // quad_tol, + // EPS); + + //if(!axom::utilities::isNearlyEqual(inner_wn, inner_wn_old, 0.1)) + //{ + // printf("BPOAOFIJAEOFHFAAOEOF\n"); + // //printf("%f\n", inner_wn - inner_wn_old); + //} } EXPECT_NEAR(inner_wn, 1.0, num_subsurfaces * quad_tol); @@ -697,8 +736,12 @@ TEST(primal_solid_angle, bezierpatch_sphere) double outer_wn = 0; for(int k = 0; k < num_subsurfaces; ++k) { - outer_wn += - winding_number(outer_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + outer_wn += winding_number_recursive(outer_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(outer_wn, 0.0, num_subsurfaces * quad_tol); @@ -709,11 +752,12 @@ TEST(primal_solid_angle, bezierpatch_sphere) double coincident_wn = 0.0; for(int k = 0; k < valid_subsurfaces.size(); ++k) { - coincident_wn += winding_number(coincident_query, - valid_subsurfaces[k], - edge_tol, - quad_tol, - EPS); + coincident_wn += winding_number_recursive(coincident_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); } @@ -721,6 +765,8 @@ TEST(primal_solid_angle, bezierpatch_sphere) TEST(primal_solid_angle, bezierpatch_degenerate_sphere) { + return; + using Point2D = primal::Point; using Point3D = primal::Point; using Vector3D = primal::Vector; @@ -784,11 +830,12 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) axom::Array valid_subsurfaces; for(int n = 0; n < 4; ++n) { - split_to_valid(patches1[n], valid_subsurfaces); - split_to_valid(patches2[n], valid_subsurfaces); + split_to_convex_shallow(patches1[n], valid_subsurfaces); + split_to_convex_shallow(patches2[n], valid_subsurfaces); } const int num_subsurfaces = valid_subsurfaces.size(); + const bool isValidSubsurface = true; // Iterate over points of interest, i.e. close to a boundary. // Specifically need to exercise the ray casting steps @@ -802,15 +849,15 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) Vector3D(valid_subsurfaces[idx].evaluate(1.0, 0.9999)), // 5 Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 1.0)), // 6 Vector3D(valid_subsurfaces[idx].evaluate(1.0, 1.0)), // 7 - Vector3D(valid_subsurfaces[idx].evaluate(-.99, 0.95)), // 8 - Vector3D(valid_subsurfaces[idx].evaluate(0.99, -.95)), // 9 - Vector3D(valid_subsurfaces[idx].evaluate(-.99, -.95))}; // 10 + Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.95)), // 8 + Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.05)), // 9 + Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.05))}; // 10 const double edge_tol = 1e-6; const double edge_offset = 1e-5; const double quad_tol = 1e-5; - const double EPS = 1e-10; + const double EPS = 1e-8; // Test some easy cases auto origin = Point3D({0.0, 0.0, 0.0}); @@ -819,10 +866,18 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) double origin_wn = 0.0, near_origin_wn = 0.0; for(int k = 0; k < num_subsurfaces; ++k) { - origin_wn += - winding_number(origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); - near_origin_wn += - winding_number(near_origin, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + origin_wn += winding_number_recursive(origin, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); + near_origin_wn += winding_number_recursive(near_origin, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(origin_wn, 1.0, num_subsurfaces * quad_tol); EXPECT_NEAR(near_origin_wn, 1.0, num_subsurfaces * quad_tol); @@ -834,15 +889,21 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) double far_wn = 0.0; for(int k = 0; k < num_subsurfaces; ++k) { - far_wn += - winding_number(far_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); -} + far_wn += winding_number_recursive(far_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); + } EXPECT_NEAR(far_wn, 0.0, num_subsurfaces * quad_tol); } // Iterate over difficult query directions for very close points for(int i = 0; i < 11; ++i) { + std::cout << i << std::endl; + // Pick point close to the surface auto inner_query = Point3D((1.0 - edge_offset) * query_directions[i].array()); auto outer_query = Point3D((1.0 + edge_offset) * query_directions[i].array()); @@ -851,8 +912,12 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) double inner_wn = 0; for(int k = 0; k < num_subsurfaces; ++k) { - inner_wn += - winding_number(inner_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + inner_wn += winding_number_recursive(inner_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(inner_wn, 1.0, num_subsurfaces * quad_tol); @@ -860,8 +925,12 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) double outer_wn = 0; for(int k = 0; k < num_subsurfaces; ++k) { - outer_wn += - winding_number(outer_query, valid_subsurfaces[k], edge_tol, quad_tol, EPS); + outer_wn += winding_number_recursive(outer_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(outer_wn, 0.0, num_subsurfaces * quad_tol); @@ -870,16 +939,163 @@ TEST(primal_solid_angle, bezierpatch_degenerate_sphere) double coincident_wn = 0.0; for(int k = 0; k < valid_subsurfaces.size(); ++k) { - coincident_wn += winding_number(coincident_query, - valid_subsurfaces[k], - edge_tol, - quad_tol, - EPS); + coincident_wn += winding_number_recursive(coincident_query, + valid_subsurfaces[k], + isValidSubsurface, + edge_tol, + quad_tol, + EPS); } EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); } } +TEST(primal_solid_angle, bezierpatch_empty_interior) +{ + return; + + using Point2D = primal::Point; + using Point3D = primal::Point; + using Vector3D = primal::Vector; + using BPatch = primal::BezierPatch; + + // clang-format off + axom::Array point_data = { + Point3D {2.5,0.2500,0.000}, Point3D {2.5,0.2500,0.000}, Point3D {2.5,0.2500,0.000}, Point3D{2.5,0.2500,0.000}, + Point3D {2.7,1.1250,0.750}, Point3D {2.7,1.1250,0.750}, Point3D {2.7,1.1250,0.750}, Point3D{2.7,1.1250,0.750}, + Point3D {2.6,1.8125,1.125}, Point3D {2.6,1.8125,1.125}, Point3D {2.6,1.8125,1.125}, Point3D{2.6,1.8125,1.125}, + Point3D {2.5,2.5000,1.125}, Point3D {2.5,2.5000,1.125}, Point3D {2.5,2.5000,1.125}, Point3D{2.5,2.5000,1.125} + }; + // clang-format on + + // Degnerate patch with zero surface area + BPatch bad_patch(point_data, 3, 3); + + Point3D surface_point = bad_patch.evaluate(0.2, 0.8); + Point3D other_point = Point3D {surface_point[0] + 0.01, + surface_point[1] - 0.01, + surface_point[2] + 0.01}; + + EXPECT_NEAR(winding_number_recursive(surface_point, bad_patch), 0.0, 1e-5); + EXPECT_NEAR(winding_number_recursive(other_point, bad_patch), 0.0, 1e-5); +} + +TEST(primal_solid_angle, bezierpatch_nonsense_geometry) +{ + using Point2D = primal::Point; + using Point3D = primal::Point; + using Vector3D = primal::Vector; + using BPatch = primal::BezierPatch; + + // Get a hand-coded control polygon + BPatch test_patch(1, 5); + test_patch(0, 0) = Point3D {-5.0, 3.0, 0.0}; + test_patch(0, 1) = Point3D {-4.0, 4.0, 0.0}; + test_patch(0, 2) = Point3D {-2.0, 5.0, 0.0}; + test_patch(0, 3) = Point3D {0.0, 5.5, 0.0}; + test_patch(0, 4) = Point3D {2.0, 5.5, 0.0}; + test_patch(0, 5) = Point3D {4.5, 4.5, 0.0}; + + test_patch(1, 0) = Point3D {-7.0, 3.0, 2.0}; + test_patch(1, 1) = Point3D {-4.0 - 2.0, 4.0, 2.0}; + test_patch(1, 2) = Point3D {-2.0 - 2.0, 5.0, 2.0}; + test_patch(1, 3) = Point3D {0.0 - 2.0, 5.5, 2.0}; + test_patch(1, 4) = Point3D {2.0 - 2.0, 5.5, 2.0}; + test_patch(1, 5) = Point3D {4.5 - 2.0, 4.5, 2.0}; + + // clang-format off + // Create literally random control points + axom::Array point_data = { + Point3D {0.4, 0.1, 0.8}, + Point3D {0.5, 0. , 0.3}, + Point3D {0.8, 0.8, 0.7}, + Point3D {0.2, 0.7, 0.6}, + Point3D {0.1, 0. , 0.6}, + Point3D {0.6, 0.1, 0.9}, + Point3D {0.3, 0.3, 0. }, + Point3D {0.1, 0.5, 0.3}, + Point3D {0.2, 0.4, 0.6}, + Point3D {0.5, 0.8, 0.1}, + Point3D {0.1, 0.9, 0.5}, + Point3D {0.1, 0.6, 0.7}, + Point3D {0.4, 1. , 0.4}, + Point3D {0.6, 0.4, 0.7}, + Point3D {0.6, 0.8, 0.2}, + Point3D {0.8, 0.3, 0.3} + }; + // clang-format on + + BPatch nonsense_patch(point_data, 3, 3); + + // Split each surface into valid subsurfaces + axom::Array valid_subsurfaces; + split_to_convex_shallow(nonsense_patch, valid_subsurfaces); + + //python_print(nonsense_patch); + //for(int n = 0; n < valid_subsurfaces.size(); ++n) + // python_print(valid_subsurfaces[n]); + + FILE* cmap_file = fopen( + "../../../../../axom_aux/cmap_data/nonsense_shape/" + "single_surface.csv", + "w"); + + int npts_u = 150; + int npts_v = 150; + double umin = -0.1, umax = 0.1; + double vmin = -0.1, vmax = 0.1; + + // Define a linear patch that represents this plane + Vector3D e1 = Vector3D({1, 0, 0}).unitVector(); + Vector3D e2 = Vector3D({0, 1, 0}).unitVector(); + Vector3D center = Vector3D {0.3733333333333331, 0.4466666666666663, 0.5}; + + Point3D controlPoints[4] = {Point3D((center + umin * e1 + vmin * e2).array()), + Point3D((center + umax * e1 + vmin * e2).array()), + Point3D((center + umin * e1 + vmax * e2).array()), + Point3D((center + umax * e1 + vmax * e2).array())}; + BPatch quad_patch(controlPoints, 1, 1); + + Point3D bad_query {0.37333333333333307, 0.44666666666666632, 0.50000000000000000}; + //winding_number(bad_query, valid_subsurfaces[13], true); + + for(double v = -0.10000000000000001; v <= vmax; v += (vmax - vmin) / npts_v) + { + printf("(u, v) = (u, %g)\n", v); + for(double u = 0.034666666666666783; u <= umax; u += (umax - umin) / npts_u) + { + Point3D query((center + u * e1 + v * e2).array()); + + double wn_casting = 0.0; + double wn_recursive = 0.0; + for(int k = 5; k < valid_subsurfaces.size(); ++k) + { + wn_casting += winding_number_casting(query, valid_subsurfaces[k], true); + wn_recursive += winding_number_recursive(query, valid_subsurfaces[k]); + + if(!axom::utilities::isNearlyEqual(wn_casting, wn_recursive, 0.1)) + { + printf("Casting: %f\n", wn_casting); + printf("Recursive: %f\n", wn_recursive); + break; + } + } + + fprintf(cmap_file, + "%.16f, %.16f, %.16f, %.16f, %.16f, %.16f, %.17f\n", + u, + v, + query[0], + query[1], + query[2], + wn_casting, + wn_recursive); + } + } + + fclose(cmap_file); +} + int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); From 3eb4d947e34ca73e4a16f71b676d69c7e9893fb2 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 10 Aug 2023 14:39:55 -0700 Subject: [PATCH 048/639] Remove irrelevant updates from winding_number_casting --- src/axom/primal/geometry/BezierPatch.hpp | 87 ---- .../primal/geometry/OrientedBoundingBox.hpp | 34 +- .../operators/detail/winding_number_impl.hpp | 185 +------ src/axom/primal/operators/is_convex.hpp | 119 ----- src/axom/primal/operators/split.hpp | 89 ---- src/axom/primal/operators/winding_number.hpp | 423 +-------------- src/axom/primal/tests/primal_polygon.cpp | 112 +--- src/axom/primal/tests/primal_solid_angle.cpp | 487 ++---------------- 8 files changed, 88 insertions(+), 1448 deletions(-) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index a56649743e..9bc21ee52e 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -1320,93 +1320,6 @@ class BezierPatch p0.split_v(v, p2, p4); } - /*! - * \brief Finds two unit tangent vectors at a corner geometrically - * - * \param [in] u parameter value of the corner (should be 0 or 1) - * \param [in] v parameter value of the corner (should be 0 or 1) - * \param [out] V1 First unit tangent vector - * \param [out] V2 Second unit tangent vector - * \param [in] edge_tol Physical distance at which nodes are indistinguishable - * \param [in] EPS Numerical tolerance to identify S(u, v) as a corner - */ - template - void corner_tangent_vectors(Point& p, - Vector& V1, - Vector& V2, - double edge_tol = 1e-8, - double EPS = 0) const - { - const int ord_u = getOrder_u(); - const int ord_v = getOrder_v(); - - double edge_tol_sq = edge_tol * edge_tol; - - V1 = Vector(); - V2 = Vector(); - - // Just kidding. We're doing the clever thing now. - // Add the bounding vertices to this list counterclockwise - axom::Array> point_list; - for(int p = 0; p < ord_u; ++p) - { - point_list.push_back(m_controlPoints(p, 0)); - } - for(int q = 0; q < ord_v; ++q) - { - point_list.push_back(m_controlPoints(ord_u, q)); - } - for(int p = ord_u; p > 0; --p) - { - point_list.push_back(m_controlPoints(p, ord_v)); - } - for(int q = ord_v; q > 0; --q) - { - point_list.push_back(m_controlPoints(0, q)); - } - - const int num_points = point_list.size(); - int start_idx; - if(squared_distance(p, m_controlPoints(0, 0)) < edge_tol_sq) - start_idx = 0; - else if(squared_distance(p, m_controlPoints(ord_u, 0)) < edge_tol_sq) - start_idx = ord_u; - else if(squared_distance(p, m_controlPoints(ord_u, ord_v)) < edge_tol_sq) - start_idx = ord_u + ord_v; - else if(squared_distance(p, m_controlPoints(0, ord_v)) < edge_tol_sq) - start_idx = 2 * ord_u + ord_v; - else - return; // Point is not a corner - - // Loop over points counterclockwise - for(int i = 0; i < num_points; ++i) - { - if(squared_distance(point_list[start_idx], - point_list[(start_idx + i) % num_points]) > edge_tol_sq) - { - V1 = Vector(point_list[start_idx], - point_list[(start_idx + i) % num_points]) - .unitVector(); - break; - } - } - - // Loop over points clockwise - for(int i = 0; i < num_points; ++i) - { - if(squared_distance( - point_list[start_idx], - point_list[(start_idx - i + num_points) % num_points]) > edge_tol_sq) - { - V2 = - Vector(point_list[start_idx], - point_list[(start_idx - i + num_points) % num_points]) - .unitVector(); - break; - } - } - } - /*! * \brief Predicate to check if the Bezier patch is approximately planar * diff --git a/src/axom/primal/geometry/OrientedBoundingBox.hpp b/src/axom/primal/geometry/OrientedBoundingBox.hpp index 9e30f840fd..088ba9896e 100644 --- a/src/axom/primal/geometry/OrientedBoundingBox.hpp +++ b/src/axom/primal/geometry/OrientedBoundingBox.hpp @@ -106,19 +106,6 @@ class OrientedBoundingBox */ OrientedBoundingBox(const PointType* pts, int n); - /*! - * \brief Constructor. Creates an oriented bounding box with given center, - * axes, and extents. Normalizes axes and sets any negative extent to 0. - * \param [in] c center of OBB - * \param [in] u axes of OBB - * \param [in] e extents of OBB - * \note Axes are made orthonormal, but if they don't span, some will be - * set to 0. - */ - OrientedBoundingBox(const PointType& c, - const VectorType (&u)[NDIMS], - const VectorType& e); - /*! * \brief Constructor. Creates an oriented bounding box from a collection of * points with the given axes, which are assumed to be orthonormal. @@ -486,7 +473,7 @@ OrientedBoundingBox::OrientedBoundingBox(const PointType* pts, } c /= static_cast(n); this->m_c = Point(c); - + // save space for pts minus the centroid NumericArray diff; @@ -517,21 +504,6 @@ OrientedBoundingBox::OrientedBoundingBox(const PointType* pts, this->m_e = maxima; } -//------------------------------------------------------------------------------ -template -OrientedBoundingBox::OrientedBoundingBox(const Point& c, - const Vector (&u)[NDIMS], - const Vector& e) -{ - this->m_c = Point(c); - for(int i = 0; i < NDIMS; i++) - { - this->m_u[i] = Vector(u[i]); - } - this->m_e = Vector(e); - this->checkAndFix(); -} - //------------------------------------------------------------------------------ template OrientedBoundingBox::OrientedBoundingBox(const OrientedBoundingBox& other) @@ -623,9 +595,9 @@ template T OrientedBoundingBox::volume() const { double vol = 1.0; - for (int i = 0; i < NDIMS; ++i) + for(int i = 0; i < NDIMS; ++i) { - vol*= this->m_e[i]; + vol *= this->m_e[i]; } return vol; } diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 0c980a8f7e..fe96c6da2f 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -462,17 +462,13 @@ double stokes_winding_number_adaptive(const Point& query, } } - constexpr int MAX_DEPTH = 25; + constexpr int MAX_DEPTH = 15; if(depth >= MAX_DEPTH || axom::utilities::isNearlyEqualRelative(quad_fine[0] + quad_fine[1], quad_coarse, quad_tol, 1e-10)) { - if(depth >= MAX_DEPTH) - { - printf(""); - } return 0.25 * M_1_PI * (quad_fine[0] + quad_fine[1]); } else @@ -495,185 +491,6 @@ double stokes_winding_number_adaptive(const Point& query, } #endif -/// Return FALSE if the nearest point is an endpoint. -/// Given by Algorithm 3 in [Maa 2003] -template -bool point_nearest_bezier_curve(const Point& p, - const Polygon& poly) -{ - const int N = poly.numVertices() - 1; - if(N <= 1) return true; - - // Store the vectors used multiple times - Vector P0P(poly[0], p); - Vector PPN(p, poly[N]); - Vector PNP0(poly[N], poly[0]); - - // Check the more likely condition first - double R3 = -PNP0.dot(PPN); - double R4 = PNP0.dot(P0P); - if(R3 * R4 <= 0) return true; - - double R1 = P0P.dot(Vector(poly[0], poly[1])); - double R2 = PPN.dot(Vector(poly[N - 1], poly[N])); - if(R1 >= 0 && R2 >= 0) return true; - - return false; -} - -/// Return FALSE if nearest point is on the boundary -/// Given by Algorithm 4 in [Maa 2003] -template -bool point_nearest_bezier_patch(const Point& point, - const BezierPatch& bPatch, - double EPS = 1e-8) -{ - const int ord_u = bPatch.getOrder_u(); - const int ord_v = bPatch.getOrder_v(); - bool flag = false; - - Polygon controlPoly; - for(int q = 0; q <= ord_v; ++q) - { - controlPoly.clear(); - for(int p = 0; p <= ord_u; ++p) - { - controlPoly.addVertex(bPatch(p, q)); - } - - if(point_nearest_bezier_curve(point, controlPoly)) - { - flag = true; - break; - } - } - - if(flag == false) - { - return false; - } - - flag = false; - for(int p = 0; p <= ord_u; ++p) - { - controlPoly.clear(); - for(int q = 0; q <= ord_v; ++q) - { - controlPoly.addVertex(bPatch(p, q)); - } - - if(point_nearest_bezier_curve(point, controlPoly)) - { - flag = true; - break; - } - } - - if(flag == false) - { - return false; - } - - return true; -} - -/*! - * \brief Find the point on a BezierPatch closest to a point close to the surface - * - * \param [in] p The query point to test - * \param [in] bPatch The BezierPatch object - * \param [out] min_u The u-coordinate of the closest point - * \param [out] min_v The v-coordinate of the closest point - * - * Apply the Newton-Raphson method to minimize the distance function. - * - * \note This is only meant to be used for `winding_number()`, - * as Newton's method is unstable for far away points. - * - * \return The closest point on the surface - */ -template -bool near_field_projection(const Point& p, - const BezierPatch& bPatch, - double& min_u, - double& min_v, - double edge_tol = 1e-8, - double EPS = 1e-8) -{ - min_u = 0.5; - min_v = 0.5; - Point S; - Vector Sp, Su, Sv, Suu, Svv, Suv; - double A00, A01, A10, A11, det; - double b0, b1; - double delu, delv; - double damp = 1.0; - - // TODO: Compute Sp, Su, Sv, Suu, Svv, Suv MUCH more efficiently - // by using the same intermediates from de Casteljau - constexpr int max_iter = 10; - for(int i = 0; i < max_iter; ++i) - { - // Get all derivatives necessary for Newton step - bPatch.evaluate_second_derivatives(min_u, min_v, S, Su, Sv, Suu, Svv, Suv); - Sp = Vector(p, S); - - if(Sp.squared_norm() < edge_tol * edge_tol) - { - return true; - } - - if(axom::utilities::isNearlyEqual(Su.dot(Sp), 0.0, EPS) && - axom::utilities::isNearlyEqual(Sv.dot(Sp), 0.0, EPS)) - { - return true; - } - - A00 = Sp.dot(Suu) + Su.dot(Su); - A10 = A01 = Sp.dot(Suv) + Su.dot(Sv); - A11 = Sp.dot(Svv) + Sv.dot(Sv); - det = (A00 * A11 - A01 * A10); - - // If the iteration fails, try to fix it with - // a different initial condition - if(axom::utilities::isNearlyEqual(det, 0.0, PRIMAL_TINY)) - { - if(i == max_iter) - { - min_u = min_v = 0.5; - return false; - } - min_u = 1.0 / (i + 1); - min_v = 1.0 / (i + 2); - continue; - } - - b0 = -Sp.dot(Su); - b1 = -Sp.dot(Sv); - - delu = damp * (A11 * b0 - A01 * b1) / det; - delv = damp * (-A10 * b0 + A00 * b1) / det; - damp *= 1; - - min_u = axom::utilities::clampVal(min_u + delu, 0.0, 1.0); - min_v = axom::utilities::clampVal(min_v + delv, 0.0, 1.0); - } - - if((axom::utilities::isNearlyEqual(bPatch.du(min_u, min_v).squared_norm(), - 0.0, - EPS) && - axom::utilities::isNearlyEqual(bPatch.dv(min_u, min_v).squared_norm(), - 0.0, - EPS)) || - Vector(p, bPatch.evaluate(min_u, min_v)).squared_norm() < - edge_tol * edge_tol) - { - return true; - } - - return false; -} - } // end namespace detail } // end namespace primal } // end namespace axom diff --git a/src/axom/primal/operators/is_convex.hpp b/src/axom/primal/operators/is_convex.hpp index 140b842c96..c84313e18a 100644 --- a/src/axom/primal/operators/is_convex.hpp +++ b/src/axom/primal/operators/is_convex.hpp @@ -65,125 +65,6 @@ bool is_convex(const Polygon& poly, double EPS = 1e-8) return true; } -/*! - * \brief Determines if a 3D polygon defined by ordered vertices is convex - * - * \param [in] poly The polygon - * - * Uses dot products to detect whether vertices extend in the "convex" direction. - * Uses the edge P[0]P[N] as a reference, meaning its adjacent edges are - * always considered to be oriented correctly. - * - * Algorithm adapted from: - * Y. L. Ma, W.T. Hewitt. "Point inversion and projection for NURBS curve - * and surface: Control polygon approach" - * Computer Aided Geometric Design 20(2):79-99, May 2003. - * \note Only defined in 2D - * - * \return A boolean value indicating convexity - */ -template -bool is_convex(const Polygon& poly, double EPS = 1e-8) -{ - int n = poly.numVertices() - 1; - if(n + 1 < 3) - { - return true; // Triangles and lines are convex - } - - for(int i = 1; i < n; i++) - { - // For each non-endpoint, check if that point and one of the endpoints - // are on the same side as the segment connecting the adjacent nodes - const Vector v0(poly[i - 1], poly[i]); - const Vector v1(poly[i - 1], poly[i + 1]); - const Vector v2(poly[i - 1], poly[(i <= n / 2) ? n : 0]); - - // Equivalent to (v1 x v0) dot (v1 x v2) > 0 - if(v1.squared_norm() * v0.dot(v2) - v1.dot(v2) * v1.dot(v0) > EPS) - { - return false; - } - } - - return true; -} - -/* - * Check if a convex polygon is "shallow," which we define as every line - * that is normal to an edge of the polygon intersects only that edge - * and the edge P[n]P[0]. - * - * This is true when ang(P[n]P[0]P[1]) + ang(P[n-1]P[n]P[0]) < 90, - * and every interior angle is greater than 90 degrees - */ -template -bool is_shallow(const Polygon& poly, double EPS = 1e-8) -{ - // max index for vertices in the full polygon - const int n_full = poly.numVertices() - 1; - if(n_full + 1 < 2) - { - return true; // lines and points are shallow - } - - int n = 0; // max index for vertices in the nondegenerate polygon - Polygon simple_poly; - simple_poly.addVertex(poly[0]); - - for(int i = 1; i < n_full; ++i) - { - if(squared_distance(simple_poly[n], poly[i]) > 1e-8) - { - simple_poly.addVertex(poly[i]); - n++; - } - } - - if((n > 0) && (squared_distance(simple_poly[0], poly[n_full]) > 1e-8) && - (squared_distance(simple_poly[n - 1], poly[n_full]) > 1e-8)) - { - simple_poly.addVertex(poly[poly.numVertices() - 1]); - n++; - } - - if(n + 1 < 2) - { - return true; // lines and points are shallow - } - - // Check two edges connected to P[n]P[0]. - auto compute_angle = [](const Point& a, - const Point& b, - const Point& c) -> double { - Vector v1, v2; - v1 = Vector(b, a).unitVector(); - v2 = Vector(b, c).unitVector(); - - return acos(axom::utilities::clampVal(v1.dot(v2), -1.0, 1.0)); - }; - - // Check endpoints - if(compute_angle(simple_poly[n], simple_poly[0], simple_poly[1]) + - compute_angle(simple_poly[n - 1], simple_poly[n], simple_poly[0]) >= - 0.5 * M_PI) - { - return false; - } - - // Iterate over the middle vertices - for(int i = 1; i < n; ++i) - { - if(compute_angle(simple_poly[i - 1], simple_poly[i], simple_poly[i + 1]) < - 0.5 * M_PI) - { - return false; - } - } - - return true; -} - } // namespace primal } // namespace axom diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 00fa10dc29..6b852bfe63 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -81,95 +81,6 @@ void split(const Octahedron& oct, out.push_back(Tet(oct[Q], oct[S], oct[U], C)); }; -/*! - * \brief Splits a BezierPatch object into valid subpatches for winding number computation - * - * \param [in] bPatch BezierPatch to split - * \param [out] out The \a axom::Array of BezierPatch objects; a set of SuperConvex - * components of c are appended to out. - * - * - * Uses a bisection method, splitting the patch recursively until each section - * is convex + shallow. - * - */ -template -void split_to_convex_shallow(const BezierPatch& bPatch, - axom::Array>& out) -{ - using Poly = Polygon; - using Patch = BezierPatch; - - const int ord_u = bPatch.getOrder_u(); - const int ord_v = bPatch.getOrder_v(); - Poly control_slice; - - bool is_valid = true; - - // If ord_u > ord_v, then check order u slices (block 1) first - // else, check order v slices (block 2) first - for(int i = 0; i < 2; ++i) - { - switch((ord_v > ord_u) != (i == 0)) - { - // Check slices that are fixed in v, - // which are of order u - case(true): - { - for(int q = 0; is_valid && q <= ord_v; ++q) - { - control_slice.clear(); - for(int p = 0; p <= ord_u; ++p) - { - control_slice.addVertex(bPatch(p, q)); - } - - if(!is_convex(control_slice) || !is_shallow(control_slice)) - { - is_valid = false; - Patch p1, p2; - bPatch.split_u(0.5, p1, p2); - split_to_convex_shallow(p1, out); - split_to_convex_shallow(p2, out); - } - } - - break; - } - // Check slices that are fixed in u, - // which are of order v - case(false): - { - for(int p = 0; is_valid && p <= ord_u; ++p) - { - control_slice.clear(); - for(int q = 0; q <= ord_v; ++q) - { - control_slice.addVertex(bPatch(p, q)); - } - - if(!is_convex(control_slice) || !is_shallow(control_slice)) - { - is_valid = false; - Patch p1, p2; - bPatch.split_v(0.5, p1, p2); - split_to_convex_shallow(p1, out); - split_to_convex_shallow(p2, out); - } - } - - break; - } - } - } - - // If we fall out of the loop, then add it to the list - if(is_valid) - { - out.push_back(Patch(bPatch)); - } -} - } // namespace primal } // namespace axom diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index f82ff5e204..094dfe7231 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -216,7 +216,7 @@ double winding_number(const Point& q, double edge_tol = 1e-8, double EPS = 1e-8) { - return detail::curve_winding_number_recursive(q, c, false, edge_tol, EPS); + return detail::curve_winding_number(q, c, false, edge_tol, EPS); } /*! @@ -241,8 +241,7 @@ double winding_number(const Point& q, double ret_val = 0.0; for(int i = 0; i < cpoly.numEdges(); i++) { - ret_val += - detail::curve_winding_number_recursive(q, cpoly[i], false, edge_tol, EPS); + ret_val += detail::curve_winding_number(q, cpoly[i], false, edge_tol, EPS); } return ret_val; @@ -452,365 +451,15 @@ int winding_number(const Point& query, return std::lround(wn); } -#ifdef AXOM_USE_MFEM - -template -double winding_number_casting(const Point& query, - const BezierPatch& bPatch, - const bool isValidSurface = false, - const double edge_tol = 1e-5, - const double quad_tol = 1e-6, - const double EPS = 1e-8) -{ - const int ord_u = bPatch.getOrder_u(); - const int ord_v = bPatch.getOrder_v(); - const bool patchIsRational = bPatch.isRational(); - const double edge_tol_sq = edge_tol * edge_tol; - - if(ord_u <= 0 || ord_v <= 0) - { - return 0.0; - } - - // If the patch isn't valid, then we need to split it and - // apply the algorithm to each component. - double wn = 0.0; - if(!isValidSurface) - { - axom::Array> valid_subsurfaces; - split_to_convex_shallow(bPatch, valid_subsurfaces); - - for(auto& surf : valid_subsurfaces) - { - wn += winding_number_casting(query, surf, true, edge_tol, quad_tol, EPS); - } - - return wn; - } - - // Fix the number of quadrature nodes arbitrarily, but high enough - // to `catch` near singularities for refinement - constexpr int quad_npts = 100; - - // Early return if the patch is approximately polygonal. - // Very slight variations in curvature requires small EPS tolerance - if(bPatch.isPolygonal(EPS)) - { - return winding_number( - query, - Polygon(axom::Array>( - {bPatch(0, 0), bPatch(ord_u, 0), bPatch(ord_u, ord_v), bPatch(0, ord_v)})), - edge_tol, - PRIMAL_TINY); - } - - /* - * To use Stokes theorem, we need to either identify a separating plane between - * the query and the surface (dodge), or a ray that intersects the - * surface at only a single point (pierce). - */ - CurvedPolygon boundingPoly(4); - detail::SingularityAxis field_direction; - - // Check if we dodge an axis-aligned bounding box, - // since most surfaces satisfy this condition. - BoundingBox bBox(bPatch.boundingBox().expand(edge_tol)); - const bool exterior_x = - bBox.getMin()[0] > query[0] || query[0] > bBox.getMax()[0]; - const bool exterior_y = - bBox.getMin()[1] > query[1] || query[1] > bBox.getMax()[1]; - const bool exterior_z = - bBox.getMin()[2] > query[2] || query[2] > bBox.getMax()[2]; - - if(exterior_y || exterior_z) - { - field_direction = detail::SingularityAxis::x; - } - else if(exterior_x || exterior_z) - { - field_direction = detail::SingularityAxis::y; - } - else if(exterior_x || exterior_y) - { - field_direction = detail::SingularityAxis::z; - } - else - { - // Otherwise, we can apply a rotation until we fit a z-aligned field. - field_direction = detail::SingularityAxis::rotated; - numerics::Matrix rotator; - - // Lambda to generate a 3D rotation matrix from an angle and axis - // Formulation from https://en.wikipedia.org/wiki/Rotation_matrix#Axis_and_angle - auto angleAxisRotMatrix = - [](double theta, const Vector& axis) -> numerics::Matrix { - const auto unitized = axis.unitVector(); - const double x = unitized[0], y = unitized[1], z = unitized[2]; - const double c = cos(theta), s = sin(theta), C = 1 - c; - - auto matx = numerics::Matrix::zeros(3, 3); - - matx(0, 0) = x * x * C + c; - matx(0, 1) = x * y * C - z * s; - matx(0, 2) = x * z * C + y * s; - - matx(1, 0) = y * x * C + z * s; - matx(1, 1) = y * y * C + c; - matx(1, 2) = y * z * C - x * s; - - matx(2, 0) = z * x * C - y * s; - matx(2, 1) = z * y * C + x * s; - matx(2, 2) = z * z * C + c; - - return matx; - }; - - // Lambda to rotate the input point using the provided rotation matrix - auto rotate_point = [&query](const numerics::Matrix& matx, - const Point input) -> Point { - Vector shifted(query, input); - Vector rotated; - numerics::matrix_vector_multiply(matx, shifted.data(), rotated.data()); - return Point( - {rotated[0] + query[0], rotated[1] + query[1], rotated[2] + query[2]}); - }; - - // Next, check the oriented bounding box defined by the patch's control points - // If we are exterior to it, then we can guarantee a separating plane. - // Note: The ideal check would be against the convex hull of the control points - OrientedBoundingBox oBox(bPatch.orientedBoundingBox().expand(edge_tol)); - if(oBox.contains(query)) - { - Vector cast_ray, closest_normal, closest_vector; - - // Need to do projection to find an axis that pierces the surface ONLY once - // and does so at an interior point - double min_u, min_v; - detail::near_field_projection(query, bPatch, min_u, min_v, edge_tol, EPS); - bool supposedToBeOnBoundary = - !detail::point_nearest_bezier_patch(query, bPatch); - - Point closest_point = bPatch.evaluate(min_u, min_v); - - closest_vector = Vector(closest_point, query); - int on_boundary = (min_u < EPS) || (min_u > 1 - EPS) || (min_v < EPS) || - (min_v > 1 - EPS); - - // Compute the normal to the surface at the closest point - closest_normal = bPatch.normal(min_u, min_v); - - // Need to do extra adjustments if we don't have a defined normal - if(axom::utilities::isNearlyEqual(closest_normal.squared_norm(), - 0.0, - PRIMAL_TINY)) - { - closest_normal = - bPatch.normal(axom::utilities::clampVal(min_u, EPS, 1 - EPS), - axom::utilities::clampVal(min_v, EPS, 1 - EPS)); - - // If that doesn't work, then it is likely (heuristic) that the interior - // is empty everywhere, and the winding number is zero. - if(axom::utilities::isNearlyEqual(closest_normal.squared_norm(), - 0.0, - PRIMAL_TINY)) - { - return 0.0; - } - } - closest_normal = closest_normal.unitVector(); - - //return closest_vector.dot(closest_normal); - - // If the query is on the surface, then we don't need to do any adjustment, - // as the induced discontinuity in the integrand is removable - if(closest_vector.squared_norm() < edge_tol_sq) - { - cast_ray = closest_normal; - wn = 0.0; - } - // Otherwise, we need to adjust for the contribution of a small removed - // disk around the ray we cast. - else - { - closest_vector = closest_vector.unitVector(); - - // Check orientation relative to the surface - double dot_prod = closest_vector.dot(closest_normal); - - if(on_boundary) - { - Vector closest_orthog; - if(axom::utilities::isNearlyEqual(closest_vector[0], - closest_vector[1], - EPS)) - closest_orthog = - Vector({closest_vector[2], - closest_vector[2], - -closest_vector[0] - closest_vector[1]}) - .unitVector(); - else - closest_orthog = Vector({-closest_vector[1] - closest_vector[2], - closest_vector[0], - closest_vector[0]}) - .unitVector(); - //cast_ray = closest_orthog; - cast_ray = closest_normal; - - printf("==========Closest point is on a boundary!==========\n"); - printf("Are we supposed to be on the boundary? %s\n", - (supposedToBeOnBoundary ? "Yes!" : "No!")); - //python_print(closest_vector, query); - python_print(closest_orthog, query, "green"); - python_print(closest_normal, query, "red"); - python_print(closest_vector, closest_point, "blue"); - //python_print(closest_normal, closest_point); - python_print(bPatch); - python_print(query); - python_print(closest_point); - std::cout << closest_vector.dot(closest_normal) << std::endl; - printf("===================================================\n"); - } - // If the closest point isinterior, we can safely pierce the surface, - // since the ray cast won't hit a boundary - else - { - cast_ray = closest_vector; - wn = (dot_prod > 0 ? -1.0 : 1.0) * 0.5; - printf("-----------Closest point is on the interor!-----------\n"); - printf("Are we supposed to be on the boundary? %s\n", - (supposedToBeOnBoundary ? "Yes!" : "No!")); - //python_print(closest_vector, query); - python_print(cast_ray, query, "green"); - python_print(closest_vector, closest_point, "blue"); - python_print(bPatch); - python_print(query); - python_print(closest_point); - std::cout << closest_vector.dot(closest_normal) << std::endl; - printf("------------------------------------------------------\n"); - } - } - - // Rotate the surface so that the cast ray is oriented with k_hat - Vector axis = {cast_ray[1], -cast_ray[0], 0.0}; - double ang = acos(axom::utilities::clampVal(cast_ray[2], -1.0, 1.0)); - - rotator = angleAxisRotMatrix(ang, axis); - } - else - { - // Get a vector perpendicular to the normal of the separating plane - Vector axis, sn(query, closest_point(query, oBox)); - sn = sn.unitVector(); - - if(axom::utilities::isNearlyEqual(sn[0], sn[1], EPS)) - axis = Vector({sn[2], sn[2], -sn[0] - sn[1]}).unitVector(); - else - axis = Vector({-sn[1] - sn[2], sn[0], sn[0]}).unitVector(); - - // We will rotate sn around axis until it is - // perpendicular to the plane spanned by k_hat and the axis - double ang, xy_norm = axis[0] * axis[0] + axis[1] * axis[1]; - - // Only need to avoid an exact divide by zero - if(axom::utilities::isNearlyEqual(xy_norm, 0.0, PRIMAL_TINY)) - { - ang = 0.0; - } - else - { - ang = (sn[2] < 0 ? 1.0 : -1.0) * - acos(axom::utilities::clampVal( - -(sn[0] * axis[1] - sn[1] * axis[0]) / sqrt(xy_norm), - -1.0, - 1.0)); - } - - rotator = angleAxisRotMatrix(ang, axis); - } - - // Collect rotated curves into the curved Polygon - // Set up the (0, v) and (1, v) isocurves, rotated - boundingPoly[0].setOrder(ord_v); - boundingPoly[2].setOrder(ord_v); - if(patchIsRational) - { - boundingPoly[0].makeRational(); - boundingPoly[2].makeRational(); - } - for(int q = 0; q <= ord_v; ++q) - { - boundingPoly[0][q] = rotate_point(rotator, bPatch(ord_u, q)); - boundingPoly[2][q] = rotate_point(rotator, bPatch(0, ord_v - q)); - - if(patchIsRational) - { - boundingPoly[0].setWeight(q, bPatch.getWeight(ord_u, q)); - boundingPoly[2].setWeight(q, bPatch.getWeight(0, ord_v - q)); - } - } - - // Set up the (u, 0) and (u, 1) isocurves - boundingPoly[1].setOrder(ord_u); - boundingPoly[3].setOrder(ord_u); - if(patchIsRational) - { - boundingPoly[1].makeRational(); - boundingPoly[3].makeRational(); - } - for(int p = 0; p <= ord_u; ++p) - { - boundingPoly[1][p] = rotate_point(rotator, bPatch(ord_u - p, ord_v)); - boundingPoly[3][p] = rotate_point(rotator, bPatch(p, 0)); - - if(patchIsRational) - { - boundingPoly[1].setWeight(p, bPatch.getWeight(ord_u - p, ord_v)); - boundingPoly[3].setWeight(p, bPatch.getWeight(p, 0)); - } - } - } - - // Set up the polygon if we don't need to do any rotation or splitting. - if(field_direction != detail::SingularityAxis::rotated) - { - boundingPoly[0] = bPatch.isocurve_u(0); - boundingPoly[0].reverseOrientation(); - - boundingPoly[1] = bPatch.isocurve_v(1); - boundingPoly[1].reverseOrientation(); - - boundingPoly[2] = bPatch.isocurve_u(1); - boundingPoly[3] = bPatch.isocurve_v(0); - } - - // Iterate over the edges of the bounding curved polygon, add up the results - for(int n = 0; n < 4; ++n) - { - // If the bounding polygon has zero length, skip it - if(squared_distance(boundingPoly[n].evaluate(0), - boundingPoly[n].evaluate(1)) < edge_tol_sq) - { - continue; - } - - wn += detail::stokes_winding_number(query, - boundingPoly[n], - field_direction, - quad_npts, - quad_tol); - } - - return wn; -} -#endif +#ifdef AXOM_USE_MFEM template -double winding_number_recursive(const Point& query, - const BezierPatch& bPatch, - const double edge_tol = 1e-8, - const double quad_tol = 1e-8, - const double EPS = 1e-8, - const int depth = 0) +double winding_number(const Point& query, + const BezierPatch& bPatch, + const double edge_tol = 1e-8, + const double quad_tol = 1e-8, + const double EPS = 1e-8, + const int depth = 0) { const int ord_u = bPatch.getOrder_u(); const int ord_v = bPatch.getOrder_v(); @@ -848,14 +497,9 @@ double winding_number_recursive(const Point& query, squared_distance(query, bPatch.evaluate(0.0 + edge_offset, 0.0)))); new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - return winding_number_recursive(query, - p2, - new_edge_tol, - quad_tol, - EPS, - depth + 1) + - winding_number_recursive(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); + return winding_number(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); } if(squared_distance(query, bPatch(ord_u, 0)) <= edge_tol_sq) { @@ -867,14 +511,9 @@ double winding_number_recursive(const Point& query, squared_distance(query, bPatch.evaluate(1.0 - edge_offset, 0.0)))); new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - return winding_number_recursive(query, - p1, - new_edge_tol, - quad_tol, - EPS, - depth + 1) + - winding_number_recursive(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); + return winding_number(query, p1, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p3, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); } if(squared_distance(query, bPatch(0, ord_v)) <= edge_tol_sq) { @@ -886,14 +525,9 @@ double winding_number_recursive(const Point& query, squared_distance(query, bPatch.evaluate(0.0, 1.0 - edge_offset)))); new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - return winding_number_recursive(query, - p1, - new_edge_tol, - quad_tol, - EPS, - depth + 1) + - winding_number_recursive(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); + return winding_number(query, p1, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p4, new_edge_tol, quad_tol, EPS, depth + 1); } if(squared_distance(query, bPatch(ord_u, ord_v)) <= edge_tol_sq) { @@ -905,14 +539,9 @@ double winding_number_recursive(const Point& query, squared_distance(query, bPatch.evaluate(1.0 - edge_offset, 1.0)))); new_edge_tol = axom::utilities::min(new_edge_tol, edge_tol); - return winding_number_recursive(query, - p1, - new_edge_tol, - quad_tol, - EPS, - depth + 1) + - winding_number_recursive(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p3, new_edge_tol, quad_tol, EPS, depth + 1); + return winding_number(query, p1, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p2, new_edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p3, new_edge_tol, quad_tol, EPS, depth + 1); } /* @@ -957,10 +586,10 @@ double winding_number_recursive(const Point& query, { BezierPatch p1, p2, p3, p4; bPatch.split(0.5, 0.5, p1, p2, p3, p4); - return winding_number_recursive(query, p1, edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p2, edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p3, edge_tol, quad_tol, EPS, depth + 1) + - winding_number_recursive(query, p4, edge_tol, quad_tol, EPS, depth + 1); + return winding_number(query, p1, edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p2, edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p3, edge_tol, quad_tol, EPS, depth + 1) + + winding_number(query, p4, edge_tol, quad_tol, EPS, depth + 1); } // Otherwise, we can apply a rotation to a z-aligned field. @@ -1089,6 +718,8 @@ double winding_number_recursive(const Point& query, return wn; } +#endif + //@} } // namespace primal diff --git a/src/axom/primal/tests/primal_polygon.cpp b/src/axom/primal/tests/primal_polygon.cpp index 6917d34bdf..bf448225b7 100644 --- a/src/axom/primal/tests/primal_polygon.cpp +++ b/src/axom/primal/tests/primal_polygon.cpp @@ -244,137 +244,43 @@ TEST(primal_polygon, convexity) poly.addVertex(PointType {0, 1}); EXPECT_TRUE(is_convex(poly)); - axom::Array convex_verts = axom::Array( + // Duplicate points should not affect convexity + vertices = axom::Array( {PointType {0, 0}, PointType {0, 1}, PointType {1, 1}, PointType {1, 0}}); - axom::Array concave_verts = axom::Array( - {PointType {0, 0}, PointType {0, 1}, PointType {0.1, 0.1}, PointType {1, 0}}); - axom::Array nonsimple_verts = axom::Array( - {PointType {0, 0}, PointType {1, 1}, PointType {0, 1}, PointType {1, 0}}); - poly.clear(); - - // Duplicate points and straight edges should not affect convexity for(int i = 0; i < 4; i++) { for(int j = 0; j < 3; j++) // Duplicate each element 3 times { - poly.addVertex(convex_verts[i]); + poly.addVertex(vertices[i]); } - - // Add midpoints between each duplicated vertex - poly.addVertex( - PointType::midpoint(convex_verts[i], convex_verts[(i + 1) % 4])); } EXPECT_TRUE(is_convex(poly)); // Verify checks up to rotation of vertices - for(int i = 0; i < 4; i++) - { - poly.clear(); - for(int j = 0; j < 4; j++) - { - poly.addVertex(concave_verts[(j + i) % 4]); - } - EXPECT_FALSE(is_convex(poly)); - } - - for(int i = 0; i < 4; i++) - { - poly.clear(); - for(int j = 0; j < 4; j++) - { - poly.addVertex(nonsimple_verts[(j + i) % 4]); - } - EXPECT_FALSE(is_convex(poly)); - } - - for(int i = 0; i < 4; i++) - { - poly.clear(); - for(int j = 0; j < 4; j++) - { - poly.addVertex(convex_verts[(j + i) % 4]); - } - EXPECT_TRUE(is_convex(poly)); - } -} - -//------------------------------------------------------------------------------ -TEST(primal_polygon, convexity_3d) -{ - using PolygonType = axom::primal::Polygon; - using PointType = axom::primal::Point; - - axom::Array vertices({PointType {0, 0, 0}, PointType {1, 1, 0}}); - PolygonType poly(vertices); - - // Segments and Triangles are always convex - EXPECT_TRUE(is_convex(poly)); - - poly.addVertex(PointType {0, 1, 0}); - EXPECT_TRUE(is_convex(poly)); - - axom::Array convex_verts = - axom::Array({PointType {0, 0, 0}, - PointType {0, 1, 0}, - PointType {1, 1, 0}, - PointType {1, 0, 0}}); - axom::Array concave_verts = - axom::Array({PointType {0, 0, 0}, - PointType {0, 1, 0}, - PointType {0.1, 0.1, 0}, - PointType {1, 0, 0}}); - axom::Array nonsimple_verts = - axom::Array({PointType {0, 0, 0}, - PointType {1, 1, 0}, - PointType {0, 1, 0}, - PointType {1, 0, 0}}); - - poly.clear(); - - // Duplicate points and straight edges should not affect convexity - for(int i = 0; i < 4; i++) - { - for(int j = 0; j < 3; j++) // Duplicate each element 3 times - { - poly.addVertex(convex_verts[i]); - } - - // Add midpoints between each duplicated vertex - poly.addVertex( - PointType::midpoint(convex_verts[i], convex_verts[(i + 1) % 4])); - } - - EXPECT_TRUE(is_convex(poly)); + vertices = axom::Array( + {PointType {0, 0}, PointType {1, 1}, PointType {1, 0}, PointType {0, 1}}); - // Verify checks up to rotation of vertices for(int i = 0; i < 4; i++) { poly.clear(); for(int j = 0; j < 4; j++) { - poly.addVertex(concave_verts[(j + i) % 4]); + poly.addVertex(vertices[(j + i) % 4]); } EXPECT_FALSE(is_convex(poly)); } - for(int i = 0; i < 4; i++) - { - poly.clear(); - for(int j = 0; j < 4; j++) - { - poly.addVertex(nonsimple_verts[(j + i) % 4]); - } - EXPECT_FALSE(is_convex(poly)); - } + vertices = axom::Array( + {PointType {0, 0}, PointType {0, 1}, PointType {1, 1}, PointType {1, 0}}); for(int i = 0; i < 4; i++) { poly.clear(); for(int j = 0; j < 4; j++) { - poly.addVertex(convex_verts[(j + i) % 4]); + poly.addVertex(vertices[(j + i) % 4]); } EXPECT_TRUE(is_convex(poly)); } diff --git a/src/axom/primal/tests/primal_solid_angle.cpp b/src/axom/primal/tests/primal_solid_angle.cpp index e9597acb47..a81ca4e2f3 100644 --- a/src/axom/primal/tests/primal_solid_angle.cpp +++ b/src/axom/primal/tests/primal_solid_angle.cpp @@ -11,6 +11,7 @@ #include "axom/fmt.hpp" #include "gtest/gtest.h" + // C++ headers #include #include @@ -480,12 +481,10 @@ TEST(primal_solid_angle, selfintersecting_quadrilateral) //------------------------------------------------------------------------------ TEST(primal_solid_angle, planar_bezierpatch) { - return; - using Point3D = primal::Point; using Vector3D = primal::Vector; using Polygon = primal::Polygon; - using BezierPatch = primal::BezierPatch; + using BezierPatch = primal::BezierPatch; // Define normal vector for the quadrilateral Vector3D v1 = Vector3D({0.0, 1.0, 2.0}).unitVector(); @@ -506,7 +505,6 @@ TEST(primal_solid_angle, planar_bezierpatch) // Construct a first order Bezier patch out of the same vertices Point3D controlPoints[4] = {quad[1], quad[0], quad[2], quad[3]}; BezierPatch quad_patch(controlPoints, 1, 1); - const bool isValidPatch = false; Point3D queries[8] = {Point3D {0.0, 4.0, 1.0}, Point3D {-1.0, 2.0, 2.0}, @@ -521,7 +519,7 @@ TEST(primal_solid_angle, planar_bezierpatch) for(int n = 0; n < 8; ++n) { EXPECT_NEAR(winding_number(queries[n], quad), - winding_number_recursive(queries[n], quad_patch, isValidPatch), + winding_number(queries[n], quad_patch), 1e-10); } @@ -533,25 +531,18 @@ TEST(primal_solid_angle, planar_bezierpatch) const double EPS = 0; for(int n = 0; n < 8; ++n) { - EXPECT_NEAR(winding_number_recursive(queries[n], quad_patch, isValidPatch), - winding_number_recursive(queries[n], - quad_patch, - isValidPatch, - quad_tol, - edge_tol, - EPS), + EXPECT_NEAR(winding_number(queries[n], quad_patch), + winding_number(queries[n], quad_patch, quad_tol, edge_tol, EPS), 1e-10); } } //------------------------------------------------------------------------------ -TEST(primal_solid_angle, bezierpatch_sphere) +TEST(primal_integral, bezierpatch_sphere) { - return; - using Point3D = primal::Point; using Vector3D = primal::Vector; - using BPatch = primal::BezierPatch; + using BPatch = primal::BezierPatch; double rt2 = sqrt(2), rt3 = sqrt(3), rt6 = sqrt(6); @@ -626,474 +617,92 @@ TEST(primal_solid_angle, bezierpatch_sphere) } } - // Split each surface into valid subsurfaces - axom::Array valid_subsurfaces; - for(int n = 0; n < 6; ++n) - { - split_to_convex_shallow(sphere_faces[n], valid_subsurfaces); - } - const int num_subsurfaces = valid_subsurfaces.size(); - const bool isValidSubsurface = true; - - // Iterate over points of interest, i.e. close to a boundary. - // Specifically need to exercise the ray casting steps - const int idx = 3; // Select a difficult face - Vector3D query_directions[11] = { - Vector3D(valid_subsurfaces[idx].evaluate(0.50, 0.50)), // 0 - Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.95)), // 1 - Vector3D(valid_subsurfaces[idx].evaluate(0.999, 0.995)), // 2 - Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 0.9995)), // 3 - Vector3D(valid_subsurfaces[idx].evaluate(0.99999, 0.99995)), // 4 - Vector3D(valid_subsurfaces[idx].evaluate(1.0, 0.9999)), // 5 - Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 1.0)), // 6 - Vector3D(valid_subsurfaces[idx].evaluate(1.0, 1.0)), // 7 - Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.95)), // 8 - Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.05)), // 9 - Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.05))}; // 10 + // Iterate over points of interest, i.e. axis/edge/vertex aligned + Vector3D query_directions[12] = {Vector3D({0.0, 0.0, 1.0}).unitVector(), + Vector3D({0.0, 1.0, 0.0}).unitVector(), + Vector3D({1.0, 0.0, 0.0}).unitVector(), + Vector3D({0.0, 1.0, 1.0}).unitVector(), + Vector3D({1.0, 0.0, 1.0}).unitVector(), + Vector3D({1.0, 1.0, 0.0}).unitVector(), + Vector3D({1.0, 1.0, 1.0}).unitVector(), + Vector3D({0.0, 0.1, 1.0}).unitVector(), + Vector3D({0.1, 1.0, 0.0}).unitVector(), + Vector3D({1.0, 0.0, 0.1}).unitVector(), + Vector3D(sphere_faces[0].evaluate(0, 0.6)), + Vector3D(sphere_faces[0].evaluate(0.6, 0))}; + + const double quad_tol = 1e-5; + const double EPS = 1e-10; const double edge_tol = 1e-6; const double edge_offset = 1e-5; - const double quad_tol = 1e-5; - const double EPS = 1e-8; - // Test some easy cases auto origin = Point3D({0.0, 0.0, 0.0}); auto near_origin = Point3D({0.1, -0.2, 0.15}); double origin_wn = 0.0, near_origin_wn = 0.0; - for(int k = 0; k < num_subsurfaces; ++k) + for(int k = 0; k < 6; ++k) { - origin_wn += winding_number_recursive(origin, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - near_origin_wn += winding_number_recursive(near_origin, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); + origin_wn += winding_number(origin, sphere_faces[k], edge_tol, quad_tol, EPS); + near_origin_wn += + winding_number(near_origin, sphere_faces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(origin_wn, 1.0, num_subsurfaces * quad_tol); - EXPECT_NEAR(near_origin_wn, 1.0, num_subsurfaces * quad_tol); + EXPECT_NEAR(origin_wn, 1.0, 6 * quad_tol); + EXPECT_NEAR(near_origin_wn, 1.0, 6 * quad_tol); - for(int i = 0; i < 11; ++i) + for(int i = 0; i < 12; ++i) { // Pick point close to the surface auto far_query = Point3D(10 * query_directions[i].array()); double far_wn = 0.0; - for(int k = 0; k < num_subsurfaces; ++k) + for(int k = 0; k < 6; ++k) { - far_wn += winding_number_recursive(far_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); + far_wn += + winding_number(far_query, sphere_faces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(far_wn, 0.0, num_subsurfaces * quad_tol); + EXPECT_NEAR(far_wn, 0.0, 6 * quad_tol); } // Iterate over difficult query directions for very close points - for(int i = 0; i < 11; ++i) + for(int i = 0; i < 12; ++i) { - std::cout << std::endl << i << std::endl; // Pick point close to the surface auto inner_query = Point3D((1.0 - edge_offset) * query_directions[i].array()); auto outer_query = Point3D((1.0 + edge_offset) * query_directions[i].array()); // Iterate over the patches that compose the sphere double inner_wn = 0; - double inner_wn_old = 0.0; - for(int k = 0; k < num_subsurfaces; ++k) + for(int k = 0; k < 6; ++k) { - inner_wn += winding_number_recursive(inner_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - - //inner_wn_old += winding_number_old(inner_query, - // valid_subsurfaces[k], - // edge_tol, - // quad_tol, - // EPS); - - //if(!axom::utilities::isNearlyEqual(inner_wn, inner_wn_old, 0.1)) - //{ - // printf("BPOAOFIJAEOFHFAAOEOF\n"); - // //printf("%f\n", inner_wn - inner_wn_old); - //} + inner_wn += + winding_number(inner_query, sphere_faces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(inner_wn, 1.0, num_subsurfaces * quad_tol); + EXPECT_NEAR(inner_wn, 1.0, 6 * quad_tol); // Iterate over the patches that compose the sphere double outer_wn = 0; - for(int k = 0; k < num_subsurfaces; ++k) + for(int k = 0; k < 6; ++k) { - outer_wn += winding_number_recursive(outer_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); + outer_wn += + winding_number(outer_query, sphere_faces[k], edge_tol, quad_tol, EPS); } - EXPECT_NEAR(outer_wn, 0.0, num_subsurfaces * quad_tol); + EXPECT_NEAR(outer_wn, 0.0, 6 * quad_tol); // Pick a point on the surface too. // Regardless of what tolerances are picked, the winding number // should lie between the values on either side when rounded auto coincident_query = Point3D(query_directions[i].array()); double coincident_wn = 0.0; - for(int k = 0; k < valid_subsurfaces.size(); ++k) - { - coincident_wn += winding_number_recursive(coincident_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - } - EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); - } -} - -TEST(primal_solid_angle, bezierpatch_degenerate_sphere) -{ - return; - - using Point2D = primal::Point; - using Point3D = primal::Point; - using Vector3D = primal::Vector; - using BCurve = primal::BezierCurve; - using BPatch = primal::BezierPatch; - - auto rotate_curve_to_patches = [](BCurve curve, BPatch patches[]) -> void { - const int ord = curve.getOrder(); - curve.makeRational(); - - for(int n = 0; n < 4; ++n) - { - patches[n].setOrder(ord, 2); - patches[n].makeRational(); - } - - for(int p = 0; p <= ord; ++p) - { - auto node = curve[p]; - patches[0](p, 0) = Point3D {node[0], 0.0, node[1]}; - patches[0](p, 1) = Point3D {node[0], node[0], node[1]}; - patches[0](p, 2) = Point3D {0.0, node[0], node[1]}; - - patches[1](p, 0) = Point3D {0.0, node[0], node[1]}; - patches[1](p, 1) = Point3D {-node[0], node[0], node[1]}; - patches[1](p, 2) = Point3D {-node[0], 0.0, node[1]}; - - patches[2](p, 0) = Point3D {-node[0], 0.0, node[1]}; - patches[2](p, 1) = Point3D {-node[0], -node[0], node[1]}; - patches[2](p, 2) = Point3D {0.0, -node[0], node[1]}; - - patches[3](p, 0) = Point3D {0.0, -node[0], node[1]}; - patches[3](p, 1) = Point3D {node[0], -node[0], node[1]}; - patches[3](p, 2) = Point3D {node[0], 0.0, node[1]}; - - for(int n = 0; n < 4; ++n) - { - patches[n].setWeight(p, 0, curve.getWeight(p)); - patches[n].setWeight(p, 1, curve.getWeight(p) / std::sqrt(2)); - patches[n].setWeight(p, 2, curve.getWeight(p)); - } - } - }; - - // Make a sphere out of 8 degenerate Bezier Patches - - // Define rational Beziers curve along the x-z axis and rotate them - Point2D curve1_nodes[] = {Point2D {0, 1}, Point2D {1, 1}, Point2D {1, 0}}; - double curve1_weights[] = {1, 1 / std::sqrt(2), 1}; - BCurve curve1(curve1_nodes, curve1_weights, 2); - BPatch patches1[4]; - rotate_curve_to_patches(curve1, patches1); - - Point2D curve2_nodes[] = {Point2D {1, 0}, Point2D {1, -1}, Point2D {0, -1}}; - double curve2_weights[] = {1, 1 / std::sqrt(2), 1}; - BCurve curve2(curve2_nodes, curve2_weights, 2); - BPatch patches2[4]; - rotate_curve_to_patches(curve2, patches2); - - // Split each surface into valid subsurfaces - axom::Array valid_subsurfaces; - for(int n = 0; n < 4; ++n) - { - split_to_convex_shallow(patches1[n], valid_subsurfaces); - split_to_convex_shallow(patches2[n], valid_subsurfaces); - } - - const int num_subsurfaces = valid_subsurfaces.size(); - const bool isValidSubsurface = true; - - // Iterate over points of interest, i.e. close to a boundary. - // Specifically need to exercise the ray casting steps - int idx = 6; // Select a difficult face - Vector3D query_directions[11] = { - Vector3D(valid_subsurfaces[idx].evaluate(0.50, 0.50)), // 0 - Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.95)), // 1 - Vector3D(valid_subsurfaces[idx].evaluate(0.999, 0.995)), // 2 - Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 0.9995)), // 3 - Vector3D(valid_subsurfaces[idx].evaluate(0.99999, 0.99995)), // 4 - Vector3D(valid_subsurfaces[idx].evaluate(1.0, 0.9999)), // 5 - Vector3D(valid_subsurfaces[idx].evaluate(0.9999, 1.0)), // 6 - Vector3D(valid_subsurfaces[idx].evaluate(1.0, 1.0)), // 7 - Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.95)), // 8 - Vector3D(valid_subsurfaces[idx].evaluate(0.99, 0.05)), // 9 - Vector3D(valid_subsurfaces[idx].evaluate(0.01, 0.05))}; // 10 - - const double edge_tol = 1e-6; - const double edge_offset = 1e-5; - - const double quad_tol = 1e-5; - const double EPS = 1e-8; - - // Test some easy cases - auto origin = Point3D({0.0, 0.0, 0.0}); - auto near_origin = Point3D({0.1, -0.2, 0.15}); - - double origin_wn = 0.0, near_origin_wn = 0.0; - for(int k = 0; k < num_subsurfaces; ++k) - { - origin_wn += winding_number_recursive(origin, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - near_origin_wn += winding_number_recursive(near_origin, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - } - EXPECT_NEAR(origin_wn, 1.0, num_subsurfaces * quad_tol); - EXPECT_NEAR(near_origin_wn, 1.0, num_subsurfaces * quad_tol); - - for(int i = 0; i < 11; ++i) - { - auto far_query = Point3D(10 * query_directions[i].array()); - - double far_wn = 0.0; - for(int k = 0; k < num_subsurfaces; ++k) - { - far_wn += winding_number_recursive(far_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - } - EXPECT_NEAR(far_wn, 0.0, num_subsurfaces * quad_tol); - } - - // Iterate over difficult query directions for very close points - for(int i = 0; i < 11; ++i) - { - std::cout << i << std::endl; - - // Pick point close to the surface - auto inner_query = Point3D((1.0 - edge_offset) * query_directions[i].array()); - auto outer_query = Point3D((1.0 + edge_offset) * query_directions[i].array()); - - // Iterate over the patches that compose the sphere - double inner_wn = 0; - for(int k = 0; k < num_subsurfaces; ++k) - { - inner_wn += winding_number_recursive(inner_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - } - EXPECT_NEAR(inner_wn, 1.0, num_subsurfaces * quad_tol); - - // Iterate over the patches that compose the sphere - double outer_wn = 0; - for(int k = 0; k < num_subsurfaces; ++k) - { - outer_wn += winding_number_recursive(outer_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - } - EXPECT_NEAR(outer_wn, 0.0, num_subsurfaces * quad_tol); - - // Pick a point on the surface too. - auto coincident_query = Point3D(query_directions[i].array()); - double coincident_wn = 0.0; - for(int k = 0; k < valid_subsurfaces.size(); ++k) - { - coincident_wn += winding_number_recursive(coincident_query, - valid_subsurfaces[k], - isValidSubsurface, - edge_tol, - quad_tol, - EPS); - } - EXPECT_NEAR(coincident_wn, 0.5, num_subsurfaces * quad_tol); - } -} - -TEST(primal_solid_angle, bezierpatch_empty_interior) -{ - return; - - using Point2D = primal::Point; - using Point3D = primal::Point; - using Vector3D = primal::Vector; - using BPatch = primal::BezierPatch; - - // clang-format off - axom::Array point_data = { - Point3D {2.5,0.2500,0.000}, Point3D {2.5,0.2500,0.000}, Point3D {2.5,0.2500,0.000}, Point3D{2.5,0.2500,0.000}, - Point3D {2.7,1.1250,0.750}, Point3D {2.7,1.1250,0.750}, Point3D {2.7,1.1250,0.750}, Point3D{2.7,1.1250,0.750}, - Point3D {2.6,1.8125,1.125}, Point3D {2.6,1.8125,1.125}, Point3D {2.6,1.8125,1.125}, Point3D{2.6,1.8125,1.125}, - Point3D {2.5,2.5000,1.125}, Point3D {2.5,2.5000,1.125}, Point3D {2.5,2.5000,1.125}, Point3D{2.5,2.5000,1.125} - }; - // clang-format on - - // Degnerate patch with zero surface area - BPatch bad_patch(point_data, 3, 3); - - Point3D surface_point = bad_patch.evaluate(0.2, 0.8); - Point3D other_point = Point3D {surface_point[0] + 0.01, - surface_point[1] - 0.01, - surface_point[2] + 0.01}; - - EXPECT_NEAR(winding_number_recursive(surface_point, bad_patch), 0.0, 1e-5); - EXPECT_NEAR(winding_number_recursive(other_point, bad_patch), 0.0, 1e-5); -} - -TEST(primal_solid_angle, bezierpatch_nonsense_geometry) -{ - using Point2D = primal::Point; - using Point3D = primal::Point; - using Vector3D = primal::Vector; - using BPatch = primal::BezierPatch; - - // Get a hand-coded control polygon - BPatch test_patch(1, 5); - test_patch(0, 0) = Point3D {-5.0, 3.0, 0.0}; - test_patch(0, 1) = Point3D {-4.0, 4.0, 0.0}; - test_patch(0, 2) = Point3D {-2.0, 5.0, 0.0}; - test_patch(0, 3) = Point3D {0.0, 5.5, 0.0}; - test_patch(0, 4) = Point3D {2.0, 5.5, 0.0}; - test_patch(0, 5) = Point3D {4.5, 4.5, 0.0}; - - test_patch(1, 0) = Point3D {-7.0, 3.0, 2.0}; - test_patch(1, 1) = Point3D {-4.0 - 2.0, 4.0, 2.0}; - test_patch(1, 2) = Point3D {-2.0 - 2.0, 5.0, 2.0}; - test_patch(1, 3) = Point3D {0.0 - 2.0, 5.5, 2.0}; - test_patch(1, 4) = Point3D {2.0 - 2.0, 5.5, 2.0}; - test_patch(1, 5) = Point3D {4.5 - 2.0, 4.5, 2.0}; - - // clang-format off - // Create literally random control points - axom::Array point_data = { - Point3D {0.4, 0.1, 0.8}, - Point3D {0.5, 0. , 0.3}, - Point3D {0.8, 0.8, 0.7}, - Point3D {0.2, 0.7, 0.6}, - Point3D {0.1, 0. , 0.6}, - Point3D {0.6, 0.1, 0.9}, - Point3D {0.3, 0.3, 0. }, - Point3D {0.1, 0.5, 0.3}, - Point3D {0.2, 0.4, 0.6}, - Point3D {0.5, 0.8, 0.1}, - Point3D {0.1, 0.9, 0.5}, - Point3D {0.1, 0.6, 0.7}, - Point3D {0.4, 1. , 0.4}, - Point3D {0.6, 0.4, 0.7}, - Point3D {0.6, 0.8, 0.2}, - Point3D {0.8, 0.3, 0.3} - }; - // clang-format on - - BPatch nonsense_patch(point_data, 3, 3); - - // Split each surface into valid subsurfaces - axom::Array valid_subsurfaces; - split_to_convex_shallow(nonsense_patch, valid_subsurfaces); - - //python_print(nonsense_patch); - //for(int n = 0; n < valid_subsurfaces.size(); ++n) - // python_print(valid_subsurfaces[n]); - - FILE* cmap_file = fopen( - "../../../../../axom_aux/cmap_data/nonsense_shape/" - "single_surface.csv", - "w"); - - int npts_u = 150; - int npts_v = 150; - double umin = -0.1, umax = 0.1; - double vmin = -0.1, vmax = 0.1; - - // Define a linear patch that represents this plane - Vector3D e1 = Vector3D({1, 0, 0}).unitVector(); - Vector3D e2 = Vector3D({0, 1, 0}).unitVector(); - Vector3D center = Vector3D {0.3733333333333331, 0.4466666666666663, 0.5}; - - Point3D controlPoints[4] = {Point3D((center + umin * e1 + vmin * e2).array()), - Point3D((center + umax * e1 + vmin * e2).array()), - Point3D((center + umin * e1 + vmax * e2).array()), - Point3D((center + umax * e1 + vmax * e2).array())}; - BPatch quad_patch(controlPoints, 1, 1); - - Point3D bad_query {0.37333333333333307, 0.44666666666666632, 0.50000000000000000}; - //winding_number(bad_query, valid_subsurfaces[13], true); - - for(double v = -0.10000000000000001; v <= vmax; v += (vmax - vmin) / npts_v) - { - printf("(u, v) = (u, %g)\n", v); - for(double u = 0.034666666666666783; u <= umax; u += (umax - umin) / npts_u) + for(int k = 0; k < 6; ++k) { - Point3D query((center + u * e1 + v * e2).array()); - - double wn_casting = 0.0; - double wn_recursive = 0.0; - for(int k = 5; k < valid_subsurfaces.size(); ++k) - { - wn_casting += winding_number_casting(query, valid_subsurfaces[k], true); - wn_recursive += winding_number_recursive(query, valid_subsurfaces[k]); - - if(!axom::utilities::isNearlyEqual(wn_casting, wn_recursive, 0.1)) - { - printf("Casting: %f\n", wn_casting); - printf("Recursive: %f\n", wn_recursive); - break; - } - } - - fprintf(cmap_file, - "%.16f, %.16f, %.16f, %.16f, %.16f, %.16f, %.17f\n", - u, - v, - query[0], - query[1], - query[2], - wn_casting, - wn_recursive); + coincident_wn += + winding_number(coincident_query, sphere_faces[k], edge_tol, quad_tol, EPS); } + EXPECT_LT(coincident_wn, 1.5); + EXPECT_LT(-0.5, coincident_wn); } - - fclose(cmap_file); } int main(int argc, char** argv) From 10e70264b375800597f811b099c58a6f86e6c52d Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 10 Aug 2023 14:54:18 -0700 Subject: [PATCH 049/639] Revert oriented bounding box to develop --- .../primal/geometry/OrientedBoundingBox.hpp | 71 ++++--------------- 1 file changed, 14 insertions(+), 57 deletions(-) diff --git a/src/axom/primal/geometry/OrientedBoundingBox.hpp b/src/axom/primal/geometry/OrientedBoundingBox.hpp index 088ba9896e..7c0f82a446 100644 --- a/src/axom/primal/geometry/OrientedBoundingBox.hpp +++ b/src/axom/primal/geometry/OrientedBoundingBox.hpp @@ -107,12 +107,17 @@ class OrientedBoundingBox OrientedBoundingBox(const PointType* pts, int n); /*! - * \brief Constructor. Creates an oriented bounding box from a collection of - * points with the given axes, which are assumed to be orthonormal. - * \param [in] pts C-style array of points + * \brief Constructor. Creates an oriented bounding box with given center, + * axes, and extents. Normalizes axes and sets any negative extent to 0. + * \param [in] c center of OBB * \param [in] u axes of OBB + * \param [in] e extents of OBB + * \note Axes are made orthonormal, but if they don't span, some will be + * set to 0. */ - OrientedBoundingBox(const PointType* pts, int n, const VectorType (&u)[NDIMS]); + OrientedBoundingBox(const PointType& c, + const VectorType (&u)[NDIMS], + const VectorType& e); /*! * \brief Copy Constructor. @@ -455,53 +460,17 @@ OrientedBoundingBox::OrientedBoundingBox(const PointType* pts, int n) //------------------------------------------------------------------------------ template -OrientedBoundingBox::OrientedBoundingBox(const PointType* pts, - int n, - const VectorType (&u)[NDIMS]) +OrientedBoundingBox::OrientedBoundingBox(const Point& c, + const Vector (&u)[NDIMS], + const Vector& e) { - if(n <= 0) - { - this->clear(); - return; - } - - // Compute the centroid of the box from the centroid of the points - NumericArray c; // centroid - for(int i = 0; i < n; i++) - { - c += pts[i].array(); - } - c /= static_cast(n); this->m_c = Point(c); - - // save space for pts minus the centroid - NumericArray diff; - - // Copy the axes from the vector for(int i = 0; i < NDIMS; i++) { this->m_u[i] = Vector(u[i]); } - - // Calculate the extents - Vector maxima; - T dot; - for(int i = 0; i < n; ++i) - { - for(int j = 0; j < NDIMS; ++j) - { - diff = pts[i].array() - c; - dot = utilities::abs( - numerics::dot_product(&(m_u[j][0]), &diff[0], NDIMS)); - if(maxima[j] < dot) - { - maxima[j] = dot; - } - } - } - - // save the extents - this->m_e = maxima; + this->m_e = Vector(e); + this->checkAndFix(); } //------------------------------------------------------------------------------ @@ -590,18 +559,6 @@ OrientedBoundingBox& OrientedBoundingBox::expand(T expansion return *this; } -//------------------------------------------------------------------------------ -template -T OrientedBoundingBox::volume() const -{ - double vol = 1.0; - for(int i = 0; i < NDIMS; ++i) - { - vol *= this->m_e[i]; - } - return vol; -} - //------------------------------------------------------------------------------ template OrientedBoundingBox& OrientedBoundingBox::scale(double scaleFactor) From 4b15c1e582917c555e2bae8a74a0b3948077abb7 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Thu, 10 Aug 2023 14:54:18 -0700 Subject: [PATCH 050/639] Revert files to develop versions --- .../primal/geometry/OrientedBoundingBox.hpp | 71 ++++--------------- src/axom/primal/operators/split.hpp | 3 - 2 files changed, 14 insertions(+), 60 deletions(-) diff --git a/src/axom/primal/geometry/OrientedBoundingBox.hpp b/src/axom/primal/geometry/OrientedBoundingBox.hpp index 088ba9896e..7c0f82a446 100644 --- a/src/axom/primal/geometry/OrientedBoundingBox.hpp +++ b/src/axom/primal/geometry/OrientedBoundingBox.hpp @@ -107,12 +107,17 @@ class OrientedBoundingBox OrientedBoundingBox(const PointType* pts, int n); /*! - * \brief Constructor. Creates an oriented bounding box from a collection of - * points with the given axes, which are assumed to be orthonormal. - * \param [in] pts C-style array of points + * \brief Constructor. Creates an oriented bounding box with given center, + * axes, and extents. Normalizes axes and sets any negative extent to 0. + * \param [in] c center of OBB * \param [in] u axes of OBB + * \param [in] e extents of OBB + * \note Axes are made orthonormal, but if they don't span, some will be + * set to 0. */ - OrientedBoundingBox(const PointType* pts, int n, const VectorType (&u)[NDIMS]); + OrientedBoundingBox(const PointType& c, + const VectorType (&u)[NDIMS], + const VectorType& e); /*! * \brief Copy Constructor. @@ -455,53 +460,17 @@ OrientedBoundingBox::OrientedBoundingBox(const PointType* pts, int n) //------------------------------------------------------------------------------ template -OrientedBoundingBox::OrientedBoundingBox(const PointType* pts, - int n, - const VectorType (&u)[NDIMS]) +OrientedBoundingBox::OrientedBoundingBox(const Point& c, + const Vector (&u)[NDIMS], + const Vector& e) { - if(n <= 0) - { - this->clear(); - return; - } - - // Compute the centroid of the box from the centroid of the points - NumericArray c; // centroid - for(int i = 0; i < n; i++) - { - c += pts[i].array(); - } - c /= static_cast(n); this->m_c = Point(c); - - // save space for pts minus the centroid - NumericArray diff; - - // Copy the axes from the vector for(int i = 0; i < NDIMS; i++) { this->m_u[i] = Vector(u[i]); } - - // Calculate the extents - Vector maxima; - T dot; - for(int i = 0; i < n; ++i) - { - for(int j = 0; j < NDIMS; ++j) - { - diff = pts[i].array() - c; - dot = utilities::abs( - numerics::dot_product(&(m_u[j][0]), &diff[0], NDIMS)); - if(maxima[j] < dot) - { - maxima[j] = dot; - } - } - } - - // save the extents - this->m_e = maxima; + this->m_e = Vector(e); + this->checkAndFix(); } //------------------------------------------------------------------------------ @@ -590,18 +559,6 @@ OrientedBoundingBox& OrientedBoundingBox::expand(T expansion return *this; } -//------------------------------------------------------------------------------ -template -T OrientedBoundingBox::volume() const -{ - double vol = 1.0; - for(int i = 0; i < NDIMS; ++i) - { - vol *= this->m_e[i]; - } - return vol; -} - //------------------------------------------------------------------------------ template OrientedBoundingBox& OrientedBoundingBox::scale(double scaleFactor) diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 6b852bfe63..85b6e351c9 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -16,9 +16,6 @@ #include "axom/core/Array.hpp" #include "axom/primal/geometry/Octahedron.hpp" #include "axom/primal/geometry/Tetrahedron.hpp" -#include "axom/primal/geometry/BezierPatch.hpp" - -#include "axom/primal/operators/is_convex.hpp" #include "axom/slic.hpp" From 096afb1c0c4d92271f426aea6eea5617a7eba21f Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 11 Aug 2023 15:04:21 -0700 Subject: [PATCH 051/639] Add many catches for zero returns --- src/axom/primal/geometry/BezierCurve.hpp | 15 ++ src/axom/primal/geometry/BezierPatch.hpp | 174 +++++++++++++++++------ 2 files changed, 147 insertions(+), 42 deletions(-) diff --git a/src/axom/primal/geometry/BezierCurve.hpp b/src/axom/primal/geometry/BezierCurve.hpp index 68cade0571..ccfc295bfa 100644 --- a/src/axom/primal/geometry/BezierCurve.hpp +++ b/src/axom/primal/geometry/BezierCurve.hpp @@ -404,6 +404,11 @@ class BezierCurve const int ord = getOrder(); axom::Array dCarray(ord + 1); + if(ord <= 0) + { + return val; + } + if(isRational()) { axom::Array dWarray(ord + 1); @@ -477,6 +482,16 @@ class BezierCurve const int ord = getOrder(); std::vector dCarray(ord + 1); + if(ord <= 1) + { + return val; + } + + if(ord <= 1) + { + val; + } + if(isRational()) { axom::Array dWarray(ord + 1); diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index 9bc21ee52e..f050860d74 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -72,6 +72,10 @@ class BezierPatch using OrientedBoundingBoxType = OrientedBoundingBox; using BezierCurveType = primal::BezierCurve; + AXOM_STATIC_ASSERT_MSG( + (NDIMS == 1) || (NDIMS == 2) || (NDIMS == 3), + "A Bezier Patch object may be defined in 1-, 2-, or 3-D"); + AXOM_STATIC_ASSERT_MSG( std::is_arithmetic::value, "A Bezier Patch must be defined using an arithmetic type"); @@ -779,7 +783,7 @@ class BezierPatch void evaluate_second_derivatives(T u, T v, - Point& evaluation, + Point& eval, Vector& Du, Vector& Dv, Vector& DuDu, @@ -791,7 +795,6 @@ class BezierPatch const int ord_v = getOrder_v(); axom::Array dCmat(ord_u + 1, ord_v + 1); - axom::Array dCmat2(2, 2); if(!isRational()) { @@ -869,37 +872,91 @@ class BezierPatch // clang-format off // Get second order derivatives - DuDu[i] = (ord_u - 1) * ord_u * ( (1 - v) * (1 - v) * (dCmat(2, 0) - 2 * dCmat(1, 0) + dCmat(0, 0)) + - 2 * v * (1 - v) * (dCmat(2, 1) - 2 * dCmat(1, 1) + dCmat(0, 1)) + - v * v * (dCmat(2, 2) - 2 * dCmat(1, 2) + dCmat(0, 2)) ); - - DvDv[i] = (ord_v - 1) * ord_v * ( (1 - u) * (1 - u) * (dCmat(0, 2) - 2 * dCmat(0, 1) + dCmat(0, 0)) + - 2 * u * (1 - u) * (dCmat(1, 2) - 2 * dCmat(1, 1) + dCmat(1, 0)) + - u * u * (dCmat(2, 2) - 2 * dCmat(2, 1) + dCmat(2, 0)) ); + if( ord_u > 1 ) + { + if (ord_v == 0) + { + DuDu[i] = (ord_u - 1) * ord_u * + (dCmat(2, 0) - 2 * dCmat(1, 0) + dCmat(0, 0)); + } + else if (ord_v == 1) + { + DuDu[i] = (ord_u - 1) * ord_u * + ( (1 - v) * (dCmat(2, 0) - 2 * dCmat(1, 0) + dCmat(0, 0)) + + v * (dCmat(2, 1) - 2 * dCmat(1, 1) + dCmat(0, 1)) ); + } + else + { + DuDu[i] = (ord_u - 1) * ord_u * + ( (1 - v) * (1 - v) * (dCmat(2, 0) - 2 * dCmat(1, 0) + dCmat(0, 0)) + + 2 * v * (1 - v) * (dCmat(2, 1) - 2 * dCmat(1, 1) + dCmat(0, 1)) + + v * v * (dCmat(2, 2) - 2 * dCmat(1, 2) + dCmat(0, 2)) ); + } + } + + if( ord_v > 1 ) + { + if( ord_u == 0 ) + { + DvDv[i] = (ord_v - 1) * ord_v * + (dCmat(0, 2) - 2 * dCmat(0, 1) + dCmat(0, 0)); + } + else if (ord_u == 1) + { + DvDv[i] = (ord_v - 1) * ord_v * + ( (1 - u) * (dCmat(0, 2) - 2 * dCmat(0, 1) + dCmat(0, 0)) + + u * (dCmat(1, 2) - 2 * dCmat(1, 1) + dCmat(1, 0)) ); + } + else + { + DvDv[i] = (ord_v - 1) * ord_v * + ( (1 - u) * (1 - u) * (dCmat(0, 2) - 2 * dCmat(0, 1) + dCmat(0, 0)) + + 2 * u * (1 - u) * (dCmat(1, 2) - 2 * dCmat(1, 1) + dCmat(1, 0)) + + u * u * (dCmat(2, 2) - 2 * dCmat(2, 1) + dCmat(2, 0)) ); + } + } // Compute intermediate values for first order derivatives - dCmat2(0, 0) = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); - dCmat2(1, 0) = (1 - u) * (1 - v) * dCmat(1, 0) + u * (1 - v) * dCmat(2, 0) + (1 - u) * v * dCmat(1, 1) + u * v * dCmat(2, 1); - dCmat2(0, 1) = (1 - u) * (1 - v) * dCmat(0, 1) + u * (1 - v) * dCmat(1, 1) + (1 - u) * v * dCmat(0, 2) + u * v * dCmat(1, 2); - dCmat2(1, 1) = (1 - u) * (1 - v) * dCmat(1, 1) + u * (1 - v) * dCmat(2, 1) + (1 - u) * v * dCmat(1, 2) + u * v * dCmat(2, 2); + dCmat(0, 0) = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); + if( ord_u > 1 ) + { + dCmat(1, 0) = (1 - u) * (1 - v) * dCmat(1, 0) + u * (1 - v) * dCmat(2, 0) + (1 - u) * v * dCmat(1, 1) + u * v * dCmat(2, 1); + } + if( ord_v > 1 ) + { + dCmat(0, 1) = (1 - u) * (1 - v) * dCmat(0, 1) + u * (1 - v) * dCmat(1, 1) + (1 - u) * v * dCmat(0, 2) + u * v * dCmat(1, 2); + } + if( ord_u > 1 && ord_v > 1 ) + { + dCmat(1, 1) = (1 - u) * (1 - v) * dCmat(1, 1) + u * (1 - v) * dCmat(2, 1) + (1 - u) * v * dCmat(1, 2) + u * v * dCmat(2, 2); + } // Compute first order derivatives - Du[i] = ord_u * ( (1 - v) * (dCmat2(1, 0) - dCmat2(0, 0)) + - v * (dCmat2(1, 1) - dCmat2(0, 1)) ); + if( ord_u > 1 ) + { + Du[i] = ord_u * ( (1 - v) * (dCmat(1, 0) - dCmat(0, 0)) + + v * (dCmat(1, 1) - dCmat(0, 1)) ); + } - Dv[i] = ord_v * ( (1 - u) * (dCmat2(0, 1) - dCmat2(0, 0)) + - u * (dCmat2(1, 1) - dCmat2(1, 0)) ); + if( ord_v > 1 ) + { + Dv[i] = ord_v * ( (1 - u) * (dCmat(0, 1) - dCmat(0, 0)) + + u * (dCmat(1, 1) - dCmat(1, 0)) ); + } - DuDv[i] = ord_u * ord_v * (dCmat2(1, 1) - dCmat2(1, 0) - dCmat2(0, 1) + dCmat2(0, 0)); + DuDv[i] = ord_u * ord_v * (dCmat(1, 1) - dCmat(1, 0) - dCmat(0, 1) + dCmat(0, 0)); // Get the evaluation point - evaluation[i] = (1 - u) * (1 - v) * dCmat2(0, 0) + u * (1 - v) * dCmat2(1, 0) + (1 - u) * v * dCmat2(0, 1) + u * v * dCmat2(1, 1); + eval[i] = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); // clang-format on } } else { + // Store BezierPatch of projective weights, (wx, wy, wz) BezierPatch projective(ord_u, ord_v); + + // Store BezierPatch of weights (w) BezierPatch weights(ord_u, ord_v); for(int p = 0; p <= ord_u; ++p) @@ -923,13 +980,16 @@ class BezierPatch projective.evaluate_second_derivatives(u, v, P, P_u, P_v, P_uu, P_vv, P_uv); weights.evaluate_second_derivatives(u, v, W, W_u, W_v, W_uu, W_vv, W_uv); - eval_vec = Vector(P) / W[0]; - Du = (P_u - eval_vec * W_u[0]) / W[0]; - Dv = (P_v - eval_vec * W_v[0]) / W[0]; - DuDu = (P_uu - 2 * W_u[0] * Du - eval_vec * W_uu[0]) / W[0]; - DvDv = (P_vv - 2 * W_v[0] * Dv - eval_vec * W_vv[0]) / W[0]; - DuDv = (P_uv - Du * W_v[0] - Dv * W_u[0] - eval_vec * W_uv[0]) / W[0]; - evaluation = Point(eval_vec.data()); + for(int i = 0; i < NDIMS; ++i) + { + eval[i] = P[i] / W[0]; + Du[i] = (P_u[i] - eval[i] * W_u[0]) / W[0]; + Dv[i] = (P_v[i] - eval[i] * W_v[0]) / W[0]; + DuDu[i] = (P_uu[i] - 2 * W_u[0] * Du[i] - eval[i] * W_uu[0]) / W[0]; + DvDv[i] = (P_vv[i] - 2 * W_v[0] * Dv[i] - eval[i] * W_vv[0]) / W[0]; + DuDv[i] = + (P_uv[i] - Du[i] * W_v[0] - Dv[i] * W_u[0] - eval[i] * W_uv[0]) / W[0]; + } } } @@ -967,7 +1027,6 @@ class BezierPatch const int ord_v = getOrder_v(); // Construct the hodograph in the two directions, then evaluate it - if(!isRational()) { BezierPatch hodograph(ord_u - 1, ord_v - 1); @@ -1070,21 +1129,52 @@ class BezierPatch // Store intermediate values // clang-format off - double W = (1 - u) * (1 - v) * dWmat(0, 0) + u * (1 - v) * dWmat(1, 0) + - (1 - u) * v * dWmat(0, 1) + u * v * dWmat(1, 1); - double W_u = ord_u * ( (1 - v) * (dWmat(1, 0) - dWmat(0, 0)) + - v * (dWmat(1, 1) - dWmat(0, 1)) ); - double W_v = ord_v * ( (1 - u) * (dWmat(0, 1) - dWmat(0, 0)) + - u * (dWmat(1, 1) - dWmat(1, 0)) ); - double W_uv = ord_u * ord_v * (dWmat(1, 1) - dWmat(1, 0) - dWmat(0, 1) + dWmat(0, 0)); - - double C = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + - (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); - double C_u = ord_u * ( (1 - v) * (dCmat(1, 0) - dCmat(0, 0)) + - v * (dCmat(1, 1) - dCmat(0, 1)) ); - double C_v = ord_v * ( (1 - u) * (dCmat(0, 1) - dCmat(0, 0)) + - u * (dCmat(1, 1) - dCmat(1, 0)) ); - double C_uv = ord_u * ord_v * (dCmat(1, 1) - dCmat(1, 0) - dCmat(0, 1) + dCmat(0, 0)); + double W, W_u, W_v, W_uv; + double C, C_u, C_v, C_uv; + if (ord_u == 0 && ord_v == 0) + { + W = dWmat(0, 0); + C = dWmat(0, 0); + + W_u = W_v = W_uv = 0.0; + C_u = C_v = C_uv = 0.0; + } + else if (ord_u == 0 && ord_v == 1) + { + W = (1 - v) * dWmat(0, 0) + v * dWmat(0, 1); + C = (1 - v) * dCmat(0, 0) + v * dCmat(0, 1); + W_u = C_u = W_uv = C_uv = 0.0; + + W_v = dWmat(0, 1) - dWmat(0, 0); + C_v = dCmat(0, 1) - dCmat(0, 0); + } + else if (ord_u == 1 && ord_v == 0) + { + W = (1 - u) * dWmat(0, 0) + u * dWmat(1, 0); + C = (1 - u) * dCmat(0, 0) + u * dCmat(1, 0); + W_u = C_u = W_uv = C_uv = 0.0; + + W_v = dWmat(1, 0) - dWmat(0, 0); + C_v = dCmat(1, 0) - dCmat(0, 0); + } + else + { + W = (1 - u) * (1 - v) * dWmat(0, 0) + u * (1 - v) * dWmat(1, 0) + + (1 - u) * v * dWmat(0, 1) + u * v * dWmat(1, 1); + W_u = ord_u * ( (1 - v) * (dWmat(1, 0) - dWmat(0, 0)) + + v * (dWmat(1, 1) - dWmat(0, 1)) ); + W_v = ord_v * ( (1 - u) * (dWmat(0, 1) - dWmat(0, 0)) + + u * (dWmat(1, 1) - dWmat(1, 0)) ); + W_uv = ord_u * ord_v * (dWmat(1, 1) - dWmat(1, 0) - dWmat(0, 1) + dWmat(0, 0)); + + C = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); + C_u = ord_u * ( (1 - v) * (dCmat(1, 0) - dCmat(0, 0)) + + v * (dCmat(1, 1) - dCmat(0, 1)) ); + C_v = ord_v * ( (1 - u) * (dCmat(0, 1) - dCmat(0, 0)) + + u * (dCmat(1, 1) - dCmat(1, 0)) ); + C_uv = ord_u * ord_v * (dCmat(1, 1) - dCmat(1, 0) - dCmat(0, 1) + dCmat(0, 0)); + } val[i] = W * W * C_uv - W * (C_u * W_v + C_v * W_u) + C * (2 * W_u * W_v - W * W_uv); From 14d45d5de85d6c1709dae3e9d1fe9f20300bf33f Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 11 Aug 2023 15:05:03 -0700 Subject: [PATCH 052/639] Add tests for zero return cases --- src/axom/primal/tests/primal_bezier_curve.cpp | 31 ++++++++ src/axom/primal/tests/primal_bezier_patch.cpp | 71 ++++++++++++++++++- src/axom/primal/tests/primal_solid_angle.cpp | 4 +- 3 files changed, 102 insertions(+), 4 deletions(-) diff --git a/src/axom/primal/tests/primal_bezier_curve.cpp b/src/axom/primal/tests/primal_bezier_curve.cpp index c572d3b5aa..555c299f49 100644 --- a/src/axom/primal/tests/primal_bezier_curve.cpp +++ b/src/axom/primal/tests/primal_bezier_curve.cpp @@ -142,6 +142,37 @@ TEST(primal_beziercurve, evaluate) } } +//------------------------------------------------------------------------------ +TEST(primal_beziercurve_, point_derivatives) +{ + SLIC_INFO("Testing Bezier derivative calculations on a low-order curve"); + + const int DIM = 3; + using CoordType = double; + using PointType = primal::Point; + using VectorType = primal::Vector; + using BezierCurveType = primal::BezierCurve; + + PointType data1[1] = {PointType {0.6, 1.2, 1.0}}; + PointType data2[2] = {PointType {0.6, 1.2, 1.0}, PointType {1.3, 1.6, 1.8}}; + + BezierCurveType pointCurve(data1, 0); + BezierCurveType lineCurve(data2, 1); + + // Evaluate the curve at several parameter values + // Curve should be tangent to control net at endpoints + VectorType eval_point_first = pointCurve.dt(0.5); + VectorType eval_point_second = pointCurve.dtdt(0.5); + VectorType eval_line_second = lineCurve.dtdt(0.5); + + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(0.0, eval_point_first[i], 1e-15); + EXPECT_NEAR(0.0, eval_point_second[i], 1e-15); + EXPECT_NEAR(0.0, eval_line_second[i], 1e-15); + } +} + //------------------------------------------------------------------------------ TEST(primal_beziercurve_, tangent) { diff --git a/src/axom/primal/tests/primal_bezier_patch.cpp b/src/axom/primal/tests/primal_bezier_patch.cpp index 37b9b937a6..632eccf04f 100644 --- a/src/axom/primal/tests/primal_bezier_patch.cpp +++ b/src/axom/primal/tests/primal_bezier_patch.cpp @@ -599,8 +599,6 @@ TEST(primal_bezierpatch, normal) //------------------------------------------------------------------------------ TEST(primal_bezierpatch, second_derivative) { - SLIC_INFO("Testing bezier Patch normal calculation"); - const int DIM = 3; using CoordType = double; using PointType = primal::Point; @@ -680,6 +678,75 @@ TEST(primal_bezierpatch, second_derivative) } } +//------------------------------------------------------------------------------ +TEST(primal_bezierpatch, second_derivative_linear) +{ + SLIC_INFO("Testing bezier Patch derivative calculation for linear"); + + const int DIM = 3; + using CoordType = double; + using PointType = primal::Point; + using VectorType = primal::Vector; + using BezierPatchType = primal::BezierPatch; + + const int order_u = 1; + const int order_v = 4; + + // Test on a linear Bezier patch to make sure the correct values are zero + // clang-format off + PointType controlPoints[(order_u + 1) * (order_v + 1)] = { + PointType {0, 0, 0}, PointType{0, 4, 0}, PointType{0, 8, -3}, PointType{0, 12, 1}, PointType{0, 16, 3}, + PointType {2, 0, 6}, PointType{2, 4, 5}, PointType{2, 8, 0}, PointType{4, 12, 2}, PointType{2, 16, 2}}; + + double weights[(order_u + 1) * (order_v + 1)] = { + 1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 2.0, 3.0, 2.0, 1.0}; + // clang-format on + + BezierPatchType bPatch(controlPoints, weights, order_u, order_v); + const double u = 0.6, v = 0.4; + + PointType eval; + VectorType Du, Dv, DuDu, DvDv, DuDv; + bPatch.evaluate_second_derivatives(u, v, eval, Du, Dv, DuDu, DvDv, DuDv); + + auto evaluate_test = bPatch.evaluate(u, v); + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(eval[i], evaluate_test[i], 1e-6); + } + + auto partial_u_test = bPatch.du(u, v); + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(Du[i], partial_u_test[i], 1e-6); + } + + auto partial_v_test = bPatch.dv(u, v); + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(Dv[i], partial_v_test[i], 1e-6); + } + + auto partial_uu_test = bPatch.dudu(u, v); + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(DuDu[i], partial_uu_test[i], 1e-6); + } + + auto partial_vv_test = bPatch.dvdv(u, v); + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(DvDv[i], partial_vv_test[i], 1e-6); + } + + auto partial_uv_test = bPatch.dudv(u, v); + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(DuDv[i], DuDv[i], 1e-6); + } +} + //------------------------------------------------------------------------------ TEST(primal_bezierpatch, split_degenerate) { diff --git a/src/axom/primal/tests/primal_solid_angle.cpp b/src/axom/primal/tests/primal_solid_angle.cpp index a81ca4e2f3..95574be9cf 100644 --- a/src/axom/primal/tests/primal_solid_angle.cpp +++ b/src/axom/primal/tests/primal_solid_angle.cpp @@ -484,7 +484,7 @@ TEST(primal_solid_angle, planar_bezierpatch) using Point3D = primal::Point; using Vector3D = primal::Vector; using Polygon = primal::Polygon; - using BezierPatch = primal::BezierPatch; + using BezierPatch = primal::BezierPatch; // Define normal vector for the quadrilateral Vector3D v1 = Vector3D({0.0, 1.0, 2.0}).unitVector(); @@ -542,7 +542,7 @@ TEST(primal_integral, bezierpatch_sphere) { using Point3D = primal::Point; using Vector3D = primal::Vector; - using BPatch = primal::BezierPatch; + using BPatch = primal::BezierPatch; double rt2 = sqrt(2), rt3 = sqrt(3), rt6 = sqrt(6); From d5ef094f1a3ce943274e3426efb8fa78f94715d0 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Sat, 12 Aug 2023 23:17:06 -0700 Subject: [PATCH 053/639] Make rational evaluation more efficient --- src/axom/primal/geometry/BezierCurve.hpp | 350 +++++++-- src/axom/primal/geometry/BezierPatch.hpp | 742 +++++++++++++----- src/axom/primal/operators/winding_number.hpp | 5 +- src/axom/primal/tests/primal_bezier_patch.cpp | 71 +- 4 files changed, 899 insertions(+), 269 deletions(-) diff --git a/src/axom/primal/geometry/BezierCurve.hpp b/src/axom/primal/geometry/BezierCurve.hpp index ccfc295bfa..813a609e59 100644 --- a/src/axom/primal/geometry/BezierCurve.hpp +++ b/src/axom/primal/geometry/BezierCurve.hpp @@ -68,6 +68,10 @@ class BezierCurve using BoundingBoxType = BoundingBox; using OrientedBoundingBoxType = OrientedBoundingBox; + AXOM_STATIC_ASSERT_MSG( + (NDIMS == 1) || (NDIMS == 2) || (NDIMS == 3), + "A Bezier Curve object may be defined in 1-, 2-, or 3-D"); + AXOM_STATIC_ASSERT_MSG( std::is_arithmetic::value, "A Bezier Curve must be defined using an arithmetic type"); @@ -336,17 +340,15 @@ class BezierCurve const int ord = getOrder(); axom::Array dCarray(ord + 1); - if(isRational()) + // If not rational, we can do standard de Casteljau + if(!isRational()) { - axom::Array dWarray(ord + 1); - - // Run algorithm from Farin '83 on each dimension + // Run de Casteljau algorithm on each dimension for(int i = 0; i < NDIMS; ++i) { for(int p = 0; p <= ord; ++p) { - dCarray[p] = m_controlPoints[p][i] * m_weights[p]; - dWarray[p] = m_weights[p]; + dCarray[p] = m_controlPoints[p][i]; } for(int p = 1; p <= ord; ++p) @@ -355,15 +357,60 @@ class BezierCurve for(int k = 0; k <= end; ++k) { dCarray[k] = lerp(dCarray[k], dCarray[k + 1], t); - dWarray[k] = lerp(dWarray[k], dWarray[k + 1], t); } } - ptval[i] = dCarray[0] / dWarray[0]; + ptval[i] = dCarray[0]; } return ptval; } - else // If ordinary Bezier curve + // If rational, construct 4D homogeneous curve to evaluate + else + { + // Store BezierCurve of projective weights, (wx, wy, wz) + // and BezierCurve of weights (w) + BezierCurve projective(ord); + BezierCurve weights(ord); + + for(int p = 0; p <= ord; ++p) + { + weights[p][0] = m_weights[p]; + + for(int i = 0; i < NDIMS; ++i) + { + projective[p][i] = m_controlPoints[p][i] * m_weights[p]; + } + } + + Point P = projective.evaluate(t); + Point W = weights.evaluate(t); + + for(int i = 0; i < NDIMS; ++i) + { + ptval[i] = P[i] / W[0]; + } + + return ptval; + } + } + + /*! + * \brief Computes the 0th and 1st derivative of a Bezier curve + * + * \param [in] t Parameter value at which to compute tangent + * \param [out] eval The value of the curve at \a t + * \param [out] Dt The tangent vector of the curve at \a t + */ + void evaluate_first_derivative(T t, PointType& eval, VectorType& Dt) const + { + using axom::utilities::lerp; + VectorType val; + + const int ord = getOrder(); + std::vector dCarray(ord + 1); + + // If the curve is nonrational, we can use standard de Casteljau + if(!isRational()) { // Run de Casteljau algorithm on each dimension for(int i = 0; i < NDIMS; ++i) @@ -373,7 +420,8 @@ class BezierCurve dCarray[p] = m_controlPoints[p][i]; } - for(int p = 1; p <= ord; ++p) + // stop one step early and take difference of last two values + for(int p = 1; p <= ord - 1; ++p) { const int end = ord - p; for(int k = 0; k <= end; ++k) @@ -381,15 +429,57 @@ class BezierCurve dCarray[k] = lerp(dCarray[k], dCarray[k + 1], t); } } - ptval[i] = dCarray[0]; + + if(ord == 0) + { + eval[i] = dCarray[0]; + Dt[i] = 0.0; + } + else + { + eval[i] = (1 - t) * dCarray[0] + t * dCarray[1]; + Dt[i] = ord * (dCarray[1] - dCarray[0]); + } } + } + // If rational, construct the 4D homogeneous surface, + // which requires all first derivatives + else + { + // Store BezierPatch of projective weights, (wx, wy, wz) + // and BezierPatch of weights (w) + BezierCurve projective(ord); + BezierCurve weights(ord); - return ptval; + for(int p = 0; p <= ord; ++p) + { + weights[p][0] = m_weights[p]; + + for(int i = 0; i < NDIMS; ++i) + { + projective[p][i] = m_controlPoints[p][i] * m_weights[p]; + } + } + + Point P; + Vector P_t; + + Point W; + Vector W_t; + + projective.evaluate_first_derivative(t, P, P_t); + weights.evaluate_first_derivative(t, W, W_t); + + for(int i = 0; i < NDIMS; ++i) + { + eval[i] = P[i] / W[0]; + Dt[i] = (P_t[i] - eval[i] * W_t[0]) / W[0]; + } } } /*! - * \brief Computes the tangent of a Bezier curve at a particular parameter value \a t + * \brief Computes the tangent of a Bezier curve at a particular parameter value \a t * * \param [in] t parameter value at which to compute tangent * \return p the tangent vector of the Bezier curve at t @@ -404,43 +494,98 @@ class BezierCurve const int ord = getOrder(); axom::Array dCarray(ord + 1); - if(ord <= 0) - { - return val; - } - - if(isRational()) + // If the curve is nonrational, we can use standard de Casteljau + if(!isRational()) { - axom::Array dWarray(ord + 1); - - // Run algorithm from Farin '83 on each dimension + // Run de Casteljau algorithm on each dimension for(int i = 0; i < NDIMS; ++i) { for(int p = 0; p <= ord; ++p) { - dCarray[p] = m_controlPoints[p][i] * m_weights[p]; - dWarray[p] = m_weights[p]; + dCarray[p] = m_controlPoints[p][i]; } - // stop one step early and do calculation on last two values + // stop one step early and take difference of last two values for(int p = 1; p <= ord - 1; ++p) { const int end = ord - p; for(int k = 0; k <= end; ++k) { dCarray[k] = lerp(dCarray[k], dCarray[k + 1], t); - dWarray[k] = lerp(dWarray[k], dWarray[k + 1], t); } } - val[i] = ord * (dWarray[0] * dCarray[1] - dWarray[1] * dCarray[0]); - dWarray[0] = lerp(dWarray[0], dWarray[1], t); - val[i] /= dWarray[0] * dWarray[0]; + if(ord == 0) + { + val[i] = 0.0; + } + else + { + val[i] = ord * (dCarray[1] - dCarray[0]); + } } return val; } + // If rational, construct the 4D homogeneous surface, + // which requires all first derivatives else + { + VectorType val; + + // Store BezierPatch of projective weights, (wx, wy, wz) + // and BezierPatch of weights (w) + BezierCurve projective(ord); + BezierCurve weights(ord); + + for(int p = 0; p <= ord; ++p) + { + weights[p][0] = m_weights[p]; + + for(int i = 0; i < NDIMS; ++i) + { + projective[p][i] = m_controlPoints[p][i] * m_weights[p]; + } + } + + Point P; + Vector P_t; + + Point W; + Vector W_t; + + projective.evaluate_first_derivative(t, P, P_t); + weights.evaluate_first_derivative(t, W, W_t); + + for(int i = 0; i < NDIMS; ++i) + { + val[i] = (W[0] * P_t[i] - P[i] * W_t[0]) / (W[0] * W[0]); + } + + return val; + } + } + + /*! + * \brief Computes the 0th, 1st, and 2nd derivatives of a Bezier curve + * + * \param [in] t Parameter value at which to compute tangent + * \param [out] eval The value of the curve at \a t + * \param [out] Dt The tangent vector of the curve at \a t + */ + void evaluate_second_derivative(T t, + PointType& eval, + VectorType& Dt, + VectorType& DtDt) const + { + using axom::utilities::lerp; + VectorType val; + + const int ord = getOrder(); + std::vector dCarray(ord + 1); + + // If the curve is nonrational, we can use standard de Casteljau + if(!isRational()) { // Run de Casteljau algorithm on each dimension for(int i = 0; i < NDIMS; ++i) @@ -451,7 +596,7 @@ class BezierCurve } // stop one step early and take difference of last two values - for(int p = 1; p <= ord - 1; ++p) + for(int p = 1; p <= ord - 2; ++p) { const int end = ord - p; for(int k = 0; k <= end; ++k) @@ -459,10 +604,63 @@ class BezierCurve dCarray[k] = lerp(dCarray[k], dCarray[k + 1], t); } } - val[i] = ord * (dCarray[1] - dCarray[0]); + + if(ord == 0) + { + eval[i] = dCarray[0]; + Dt[i] = 0.0; + DtDt[i] = 0.0; + } + else if(ord == 1) + { + eval[i] = (1 - t) * dCarray[0] + t * dCarray[1]; + Dt[i] = ord * (dCarray[1] - dCarray[0]); + DtDt[i] = 0.0; + } + else + { + eval[i] = (1 - t) * (1 - t) * dCarray[0] + + 2 * (1 - t) * t * dCarray[1] + t * t * dCarray[2]; + Dt[i] = ord * + ((1 - t) * (dCarray[1] - dCarray[0]) + t * (dCarray[2] - dCarray[1])); + DtDt[i] = ord * (ord - 1) * (dCarray[2] - 2 * dCarray[1] + dCarray[0]); + } + } + } + // If rational, construct the 4D homogeneous surface, + // which requires all first derivatives + else + { + // Store BezierPatch of projective weights, (wx, wy, wz) + // and BezierPatch of weights (w) + BezierCurve projective(ord); + BezierCurve weights(ord); + + for(int p = 0; p <= ord; ++p) + { + weights[p][0] = m_weights[p]; + + for(int i = 0; i < NDIMS; ++i) + { + projective[p][i] = m_controlPoints[p][i] * m_weights[p]; + } } - return val; + Point P; + Vector P_t, P_tt; + + Point W; + Vector W_t, W_tt; + + projective.evaluate_second_derivative(t, P, P_t, P_tt); + weights.evaluate_second_derivative(t, W, W_t, W_tt); + + for(int i = 0; i < NDIMS; ++i) + { + eval[i] = P[i] / W[0]; + Dt[i] = (P_t[i] - eval[i] * W_t[0]) / W[0]; + DtDt[i] = (P_tt[i] - 2 * Dt[i] * W_t[0] - eval[i] * W_tt[0]) / W[0]; + } } } @@ -482,78 +680,74 @@ class BezierCurve const int ord = getOrder(); std::vector dCarray(ord + 1); - if(ord <= 1) - { - return val; - } - - if(ord <= 1) - { - val; - } - - if(isRational()) + // If the curve is nonrational, we can use standard de Casteljau + if(!isRational()) { - axom::Array dWarray(ord + 1); - - // Run algorithm from Farin '83 on each dimension + // Run de Casteljau algorithm on each dimension for(int i = 0; i < NDIMS; ++i) { for(int p = 0; p <= ord; ++p) { - dCarray[p] = m_controlPoints[p][i] * m_weights[p]; - dWarray[p] = m_weights[p]; + dCarray[p] = m_controlPoints[p][i]; } - // Stop two steps early and take finite differences of the last three values + // stop one step early and take difference of last two values for(int p = 1; p <= ord - 2; ++p) { const int end = ord - p; for(int k = 0; k <= end; ++k) { dCarray[k] = lerp(dCarray[k], dCarray[k + 1], t); - dWarray[k] = lerp(dWarray[k], dWarray[k + 1], t); } } - // Need the rest of the de casteljau weights for the formula - double w1[2] = {lerp(dWarray[0], dWarray[1], t), - lerp(dWarray[1], dWarray[2], t)}; - double w0[1] = {lerp(w1[0], w1[1], t)}; - - val[i] = ord * dWarray[2] * - (2 * ord * w1[0] * w1[0] - (ord - 1) * dWarray[0] * w0[0] - - 2 * w1[0] * w0[0]) * - (dCarray[2] / dWarray[2] - dCarray[1] / dWarray[1]); - val[i] -= ord * dWarray[0] * - (2 * ord * w1[1] * w1[1] - (ord - 1) * dWarray[2] * w0[0] - - 2 * w1[1] * w0[0]) * - (dCarray[1] / dWarray[1] - dCarray[0] / dWarray[0]); - val[i] /= w0[0] * w0[0] * w0[0]; + if(ord <= 1) + { + val[i] = 0.0; + } + else + { + val[i] = ord * (ord - 1) * (dCarray[2] - 2 * dCarray[1] + dCarray[0]); + } } return val; } + // If rational, construct the 4D homogeneous surface, + // which requires all first derivatives else { - // Run de Casteljau algorithm on each dimension - for(int i = 0; i < NDIMS; ++i) + VectorType val; + + // Store BezierPatch of projective weights, (wx, wy, wz) + // and BezierPatch of weights (w) + BezierCurve projective(ord); + BezierCurve weights(ord); + + for(int p = 0; p <= ord; ++p) { - for(int p = 0; p <= ord; ++p) - { - dCarray[p] = m_controlPoints[p][i]; - } + weights[p][0] = m_weights[p]; - // stop two steps early and take finite difference of last three values - for(int p = 1; p <= ord - 2; ++p) + for(int i = 0; i < NDIMS; ++i) { - const int end = ord - p; - for(int k = 0; k <= end; ++k) - { - dCarray[k] = lerp(dCarray[k], dCarray[k + 1], t); - } + projective[p][i] = m_controlPoints[p][i] * m_weights[p]; } - val[i] = ord * (ord - 1) * (dCarray[2] - 2 * dCarray[1] + dCarray[0]); + } + + Point P; + Vector P_t, P_tt; + + Point W; + Vector W_t, W_tt; + + projective.evaluate_second_derivative(t, P, P_t, P_tt); + weights.evaluate_second_derivative(t, W, W_t, W_tt); + + for(int i = 0; i < NDIMS; ++i) + { + val[i] = W[0] * W[0] * P_tt[i] - + 2 * (W[0] * P_t[i] - P[i] * W_t[0]) * W_t[0] - P[i] * W[0] * W_tt[0]; + val[i] /= (W[0] * W[0] * W[0]); } return val; diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index f050860d74..2dd654c6ab 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -557,16 +557,14 @@ class BezierPatch BezierCurveType c(ord_v); axom::Array dCarray(ord_u + 1); - if(isRational()) + if(!isRational()) { - c.makeRational(); // If looking for an edge, don't need to use De Casteljau if(u == 0.0) { for(int q = 0; q <= ord_v; ++q) { c[q] = m_controlPoints(0, q); - c.setWeight(q, m_weights(0, q)); } return c; } @@ -575,21 +573,18 @@ class BezierPatch for(int q = 0; q <= ord_v; ++q) { c[q] = m_controlPoints(ord_u, q); - c.setWeight(q, m_weights(ord_u, q)); } return c; } - // Otherwise, do De Casteljau along the v-axis - axom::Array dWarray(ord_u + 1); + // Otherwise, do De Casteljau along the u-axis for(int q = 0; q <= ord_v; ++q) { for(int i = 0; i < NDIMS; ++i) { for(int p = 0; p <= ord_u; ++p) { - dCarray[p] = m_controlPoints(p, q)[i] * m_weights(p, q); - dWarray[p] = m_weights(p, q); + dCarray[p] = m_controlPoints(p, q)[i]; } for(int p = 1; p <= ord_u; ++p) @@ -598,23 +593,26 @@ class BezierPatch for(int k = 0; k <= end; ++k) { dCarray[k] = lerp(dCarray[k], dCarray[k + 1], u); - dWarray[k] = lerp(dWarray[k], dWarray[k + 1], u); } } - c[q][i] = dCarray[0] / dWarray[0]; - c.setWeight(q, dWarray[0]); + c[q][i] = dCarray[0]; } } + + return c; } else { + c.makeRational(); + // If looking for an edge, don't need to use De Casteljau if(u == 0.0) { for(int q = 0; q <= ord_v; ++q) { c[q] = m_controlPoints(0, q); + c.setWeight(q, m_weights(0, q)); } return c; } @@ -623,34 +621,45 @@ class BezierPatch for(int q = 0; q <= ord_v; ++q) { c[q] = m_controlPoints(ord_u, q); + c.setWeight(q, m_weights(ord_u, q)); } return c; } - // Otherwise, do De Casteljau along the v-axis - for(int q = 0; q <= ord_v; ++q) + // Otherwise, do de Casteljau on the homogeneous control points + + // Store BezierPatch of projective weights, (wx, wy, wz) + // and BezierPatch of weights (w) + BezierPatch projective(ord_u, ord_v); + BezierPatch weights(ord_u, ord_v); + + for(int p = 0; p <= ord_u; ++p) { - for(int i = 0; i < NDIMS; ++i) + for(int q = 0; q <= ord_v; ++q) { - for(int p = 0; p <= ord_u; ++p) - { - dCarray[p] = m_controlPoints(p, q)[i]; - } + weights(p, q)[0] = m_weights(p, q); - for(int p = 1; p <= ord_u; ++p) + for(int i = 0; i < NDIMS; ++i) { - const int end = ord_u - p; - for(int k = 0; k <= end; ++k) - { - dCarray[k] = lerp(dCarray[k], dCarray[k + 1], u); - } + projective(p, q)[i] = m_controlPoints(p, q)[i] * m_weights(p, q); } - c[q][i] = dCarray[0]; } } - } - return c; + BezierCurve P = projective.isocurve_u(u); + BezierCurve W = weights.isocurve_u(u); + + for(int q = 0; q <= ord_v; ++q) + { + for(int i = 0; i < NDIMS; ++i) + { + c[q][i] = P[q][i] / W[q][0]; + c.setWeight(q, W[q][0]); + } + } + + return c; + } } /// Return an isocurve for a fixed value of v @@ -664,17 +673,14 @@ class BezierPatch BezierCurveType c(ord_u); axom::Array dCarray(ord_v + 1); - if(isRational()) + if(!isRational()) { - c.makeRational(); - // If looking for an edge, don't need to use De Casteljau if(v == 0.0) { for(int p = 0; p <= ord_u; ++p) { c[p] = m_controlPoints(p, 0); - c.setWeight(p, m_weights(p, 0)); } return c; } @@ -683,21 +689,18 @@ class BezierPatch for(int p = 0; p <= ord_u; ++p) { c[p] = m_controlPoints(p, ord_v); - c.setWeight(p, m_weights(p, ord_v)); } return c; } // Otherwise, do De Casteljau along the u-axis - axom::Array dWarray(ord_v + 1); for(int p = 0; p <= ord_u; ++p) { for(int i = 0; i < NDIMS; ++i) { for(int q = 0; q <= ord_v; ++q) { - dCarray[q] = m_controlPoints(p, q)[i] * m_weights(p, q); - dWarray[q] = m_weights(p, q); + dCarray[q] = m_controlPoints(p, q)[i]; } for(int q = 1; q <= ord_v; ++q) @@ -706,22 +709,26 @@ class BezierPatch for(int k = 0; k <= end; ++k) { dCarray[k] = lerp(dCarray[k], dCarray[k + 1], v); - dWarray[k] = lerp(dWarray[k], dWarray[k + 1], v); } } - c[p][i] = dCarray[0] / dWarray[0]; - c.setWeight(p, dWarray[0]); + + c[p][i] = dCarray[0]; } } + + return c; } else { + c.makeRational(); + // If looking for an edge, don't need to use De Casteljau if(v == 0.0) { for(int p = 0; p <= ord_u; ++p) { c[p] = m_controlPoints(p, 0); + c.setWeight(p, m_weights(p, 0)); } return c; } @@ -730,34 +737,45 @@ class BezierPatch for(int p = 0; p <= ord_u; ++p) { c[p] = m_controlPoints(p, ord_v); + c.setWeight(p, m_weights(p, ord_v)); } return c; } - // Otherwise, do De Casteljau along the u-axis + // Otherwise, do de Casteljau on the homogeneous control points + + // Store BezierPatch of projective weights, (wx, wy, wz) + // and BezierPatch of weights (w) + BezierPatch projective(ord_u, ord_v); + BezierPatch weights(ord_u, ord_v); + for(int p = 0; p <= ord_u; ++p) { - for(int i = 0; i < NDIMS; ++i) + for(int q = 0; q <= ord_v; ++q) { - for(int q = 0; q <= ord_v; ++q) - { - dCarray[q] = m_controlPoints(p, q)[i]; - } + weights(p, q)[0] = m_weights(p, q); - for(int q = 1; q <= ord_v; ++q) + for(int i = 0; i < NDIMS; ++i) { - const int end = ord_v - q; - for(int k = 0; k <= end; ++k) - { - dCarray[k] = lerp(dCarray[k], dCarray[k + 1], v); - } + projective(p, q)[i] = m_controlPoints(p, q)[i] * m_weights(p, q); } - c[p][i] = dCarray[0]; } } - } - return c; + BezierCurve P = projective.isocurve_v(v); + BezierCurve W = weights.isocurve_v(v); + + for(int p = 0; p <= ord_u; ++p) + { + for(int i = 0; i < NDIMS; ++i) + { + c[p][i] = P[p][i] / W[p][0]; + c.setWeight(p, W[p][0]); + } + } + + return c; + } } /*! @@ -781,6 +799,331 @@ class BezierPatch } } + void evaluate_first_derivatives(T u, + T v, + Point& eval, + Vector& Du, + Vector& Dv) const + { + using axom::utilities::lerp; + const int ord_u = getOrder_u(); + const int ord_v = getOrder_v(); + + axom::Array dCmat(ord_u + 1, ord_v + 1); + + if(!isRational()) + { + // Do de Casteljau until we get a 2x2 + for(int i = 0; i < NDIMS; ++i) + { + for(int p = 0; p <= ord_u; ++p) + { + for(int q = 0; q <= ord_v; ++q) + { + dCmat(p, q) = m_controlPoints(p, q)[i]; + } + } + + // Store the size after each de Casteljau reduction is made + int end_u = ord_u; + int end_v = ord_v; + + // Do de Casteljau over the longer direction first + if(ord_u >= ord_v) + { + // Stop 1 steps early in u + while(end_u > 1) + { + end_u -= 1; + for(int k = 0; k <= end_u; ++k) + { + for(int q = 0; q <= end_v; ++q) + { + dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); + } + } + } + + // Stop 1 steps early in v + while(end_v > 1) + { + end_v -= 1; + for(int k = 0; k <= end_v; ++k) + { + for(int p = 0; p <= end_u; ++p) + { + dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); + } + } + } + } + else + { + // Stop 1 steps early in v + while(end_v > 1) + { + end_v -= 1; + for(int k = 0; k <= end_v; ++k) + { + for(int p = 0; p <= end_u; ++p) + { + dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); + } + } + } + + // Stop 2 steps early in v over the three columns + while(end_u > 1) + { + end_u -= 1; + for(int k = 0; k <= end_u; ++k) + { + for(int q = 0; q <= end_v; ++q) + { + dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); + } + } + } + } + + // By now, the first 2x2 submatrix of dCmat should have + // all the intermediate values needed + + // Compute first order derivatives + // clang-format off + if( end_u == 1 && end_v == 1 ) + { + Du[i] = ord_u * ( (1 - v) * (dCmat(1, 0) - dCmat(0, 0)) + + v * (dCmat(1, 1) - dCmat(0, 1)) ); + Dv[i] = ord_v * ( (1 - u) * (dCmat(0, 1) - dCmat(0, 0)) + + u * (dCmat(1, 1) - dCmat(1, 0)) ); + eval[i] = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); + } + else if (end_u == 1 && end_v == 0) + { + Du[i] = ord_u * (dCmat(1, 0) - dCmat(0, 0)); + Dv[i] = 0.0; + eval[i] = (1 - u) * dCmat(0, 0) + u * dCmat(1, 0); + } + else if (end_u == 0 && end_v == 1) + { + Du[i] = 0.0; + Dv[i] = ord_v * (dCmat(0, 1) - dCmat(0, 0)); + eval[i] = (1 - v) * dCmat(0, 0) + v * dCmat(0, 1); + } + else + { + Du[i] = 0.0; + Dv[i] = 0.0; + eval[i] = dCmat(0, 0); + } + // clang-format on + } + } + else + { + // Store BezierPatch of projective weights, (wx, wy, wz) + // and BezierPatch of weights (w) + BezierPatch projective(ord_u, ord_v); + BezierPatch weights(ord_u, ord_v); + + for(int p = 0; p <= ord_u; ++p) + { + for(int q = 0; q <= ord_v; ++q) + { + weights(p, q)[0] = m_weights(p, q); + + for(int i = 0; i < NDIMS; ++i) + { + projective(p, q)[i] = m_controlPoints(p, q)[i] * m_weights(p, q); + } + } + } + + Point P; + Vector P_u, P_v, P_uu, P_vv, P_uv; + + Point W; + Vector W_u, W_v, W_uu, W_vv, W_uv; + + projective.evaluate_second_derivatives(u, v, P, P_u, P_v, P_uu, P_vv, P_uv); + weights.evaluate_second_derivatives(u, v, W, W_u, W_v, W_uu, W_vv, W_uv); + + for(int i = 0; i < NDIMS; ++i) + { + eval[i] = P[i] / W[0]; + Du[i] = (P_u[i] - eval[i] * W_u[0]) / W[0]; + Dv[i] = (P_v[i] - eval[i] * W_v[0]) / W[0]; + } + } + } + + void evaluate_linear_derivatives(T u, + T v, + Point& eval, + Vector& Du, + Vector& Dv, + Vector& DuDv) const + { + using axom::utilities::lerp; + const int ord_u = getOrder_u(); + const int ord_v = getOrder_v(); + + axom::Array dCmat(ord_u + 1, ord_v + 1); + + if(!isRational()) + { + // Do de Casteljau until we get a 2x2 + for(int i = 0; i < NDIMS; ++i) + { + for(int p = 0; p <= ord_u; ++p) + { + for(int q = 0; q <= ord_v; ++q) + { + dCmat(p, q) = m_controlPoints(p, q)[i]; + } + } + + // Store the size after each de Casteljau reduction is made + int end_u = ord_u; + int end_v = ord_v; + + // Do de Casteljau over the longer direction first + if(ord_u >= ord_v) + { + // Stop 1 steps early in u + while(end_u > 1) + { + end_u -= 1; + for(int k = 0; k <= end_u; ++k) + { + for(int q = 0; q <= end_v; ++q) + { + dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); + } + } + } + + // Stop 1 steps early in v + while(end_v > 1) + { + end_v -= 1; + for(int k = 0; k <= end_v; ++k) + { + for(int p = 0; p <= end_u; ++p) + { + dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); + } + } + } + } + else + { + // Stop 1 steps early in v + while(end_v > 1) + { + end_v -= 1; + for(int k = 0; k <= end_v; ++k) + { + for(int p = 0; p <= end_u; ++p) + { + dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); + } + } + } + + // Stop 2 steps early in v over the three columns + while(end_u > 1) + { + end_u -= 1; + for(int k = 0; k <= end_u; ++k) + { + for(int q = 0; q <= end_v; ++q) + { + dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); + } + } + } + } + + // By now, the first 2x2 submatrix of dCmat should have + // all the intermediate values needed + + // Compute first order derivatives + // clang-format off + if( end_u == 1 && end_v == 1 ) + { + Du[i] = ord_u * ( (1 - v) * (dCmat(1, 0) - dCmat(0, 0)) + + v * (dCmat(1, 1) - dCmat(0, 1)) ); + Dv[i] = ord_v * ( (1 - u) * (dCmat(0, 1) - dCmat(0, 0)) + + u * (dCmat(1, 1) - dCmat(1, 0)) ); + DuDv[i] = ord_u * ord_v * (dCmat(1, 1) - dCmat(1, 0) - dCmat(0, 1) + dCmat(0, 0)); + eval[i] = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); + } + else if (end_u == 1 && end_v == 0) + { + Du[i] = ord_u * (dCmat(1, 0) - dCmat(0, 0)); + Dv[i] = 0.0; + DuDv[i] = 0.0; + eval[i] = (1 - u) * dCmat(0, 0) + u * dCmat(1, 0); + } + else if (end_u == 0 && end_v == 1) + { + Du[i] = 0.0; + Dv[i] = ord_v * (dCmat(0, 1) - dCmat(0, 0)); + DuDv[i] = 0.0; + eval[i] = (1 - v) * dCmat(0, 0) + v * dCmat(0, 1); + } + else + { + Du[i] = 0.0; + Dv[i] = 0.0; + DuDv[i] = 0.0; + eval[i] = dCmat(0, 0); + } + // clang-format on + } + } + else + { + // Store BezierPatch of projective weights, (wx, wy, wz) + // and BezierPatch of weights (w) + BezierPatch projective(ord_u, ord_v); + BezierPatch weights(ord_u, ord_v); + + for(int p = 0; p <= ord_u; ++p) + { + for(int q = 0; q <= ord_v; ++q) + { + weights(p, q)[0] = m_weights(p, q); + + for(int i = 0; i < NDIMS; ++i) + { + projective(p, q)[i] = m_controlPoints(p, q)[i] * m_weights(p, q); + } + } + } + + Point P; + Vector P_u, P_v, P_uu, P_vv, P_uv; + + Point W; + Vector W_u, W_v, W_uu, W_vv, W_uv; + + projective.evaluate_second_derivatives(u, v, P, P_u, P_v, P_uu, P_vv, P_uv); + weights.evaluate_second_derivatives(u, v, W, W_u, W_v, W_uu, W_vv, W_uv); + + for(int i = 0; i < NDIMS; ++i) + { + eval[i] = P[i] / W[0]; + Du[i] = (P_u[i] - eval[i] * W_u[0]) / W[0]; + Dv[i] = (P_v[i] - eval[i] * W_v[0]) / W[0]; + DuDv[i] = + (P_uv[i] - Du[i] * W_v[0] - Dv[i] * W_u[0] - eval[i] * W_uv[0]) / W[0]; + } + } + } + void evaluate_second_derivatives(T u, T v, Point& eval, @@ -809,29 +1152,33 @@ class BezierPatch } } + // Store the size after each de Casteljau reduction is made + int end_u = ord_u; + int end_v = ord_v; + // Do de Casteljau over the longer direction first if(ord_u >= ord_v) { // Stop 2 steps early in u - for(int p = 1; p <= ord_u - 2; ++p) + while(end_u > 2) { - const int end = ord_u - p; - for(int k = 0; k <= end; ++k) + end_u -= 1; + for(int k = 0; k <= end_u; ++k) { - for(int q = 0; q <= ord_v; ++q) + for(int q = 0; q <= end_v; ++q) { dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); } } } - // Stop 2 steps early in v over the three columns - for(int q = 1; q <= ord_v - 2; ++q) + // Stop 2 steps early in v + while(end_v > 2) { - const int end = ord_v - q; - for(int k = 0; k <= end; ++k) + end_v -= 1; + for(int k = 0; k <= end_v; ++k) { - for(int p = 0; p <= 2; ++p) + for(int p = 0; p <= end_u; ++p) { dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); } @@ -841,12 +1188,12 @@ class BezierPatch else { // Stop 2 steps early in v - for(int q = 1; q <= ord_v - 2; ++q) + while(end_v > 2) { - const int end = ord_v - q; - for(int k = 0; k <= end; ++k) + end_v -= 1; + for(int k = 0; k <= end_v; ++k) { - for(int p = 0; p <= ord_u; ++p) + for(int p = 0; p <= end_u; ++p) { dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); } @@ -854,12 +1201,12 @@ class BezierPatch } // Stop 2 steps early in v over the three columns - for(int p = 1; p <= ord_u - 2; ++p) + while(end_u > 2) { - const int end = ord_u - p; - for(int k = 0; k <= end; ++k) + end_u -= 1; + for(int k = 0; k <= end_u; ++k) { - for(int q = 0; q <= 2; ++q) + for(int q = 0; q <= end_v; ++q) { dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); } @@ -872,7 +1219,7 @@ class BezierPatch // clang-format off // Get second order derivatives - if( ord_u > 1 ) + if( ord_u >= 2 ) { if (ord_v == 0) { @@ -893,8 +1240,12 @@ class BezierPatch v * v * (dCmat(2, 2) - 2 * dCmat(1, 2) + dCmat(0, 2)) ); } } + else + { + DuDu[i] = 0.0; + } - if( ord_v > 1 ) + if( ord_v >= 2 ) { if( ord_u == 0 ) { @@ -915,57 +1266,89 @@ class BezierPatch u * u * (dCmat(2, 2) - 2 * dCmat(2, 1) + dCmat(2, 0)) ); } } - - // Compute intermediate values for first order derivatives - dCmat(0, 0) = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); - if( ord_u > 1 ) + else { - dCmat(1, 0) = (1 - u) * (1 - v) * dCmat(1, 0) + u * (1 - v) * dCmat(2, 0) + (1 - u) * v * dCmat(1, 1) + u * v * dCmat(2, 1); + DvDv[i] = 0.0; } - if( ord_v > 1 ) + + // Do one de Casteljau iteration in u + while( end_u > 1 ) { - dCmat(0, 1) = (1 - u) * (1 - v) * dCmat(0, 1) + u * (1 - v) * dCmat(1, 1) + (1 - u) * v * dCmat(0, 2) + u * v * dCmat(1, 2); + end_u -= 1; + for(int k = 0; k <= end_u; ++k) + { + for(int q = 0; q <= end_v; ++q) + { + dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); + } + } } - if( ord_u > 1 && ord_v > 1 ) + + // Do (at most) one de Casteljau iteration in v + while(end_v > 1) { - dCmat(1, 1) = (1 - u) * (1 - v) * dCmat(1, 1) + u * (1 - v) * dCmat(2, 1) + (1 - u) * v * dCmat(1, 2) + u * v * dCmat(2, 2); + end_v -= 1; + for(int k = 0; k <= end_v; ++k) + { + for(int p = 0; p <= end_u; ++p) + { + dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); + } + } } // Compute first order derivatives - if( ord_u > 1 ) + // clang-format off + if( end_u == 1 && end_v == 1 ) { Du[i] = ord_u * ( (1 - v) * (dCmat(1, 0) - dCmat(0, 0)) + v * (dCmat(1, 1) - dCmat(0, 1)) ); - } - - if( ord_v > 1 ) - { Dv[i] = ord_v * ( (1 - u) * (dCmat(0, 1) - dCmat(0, 0)) + u * (dCmat(1, 1) - dCmat(1, 0)) ); + DuDv[i] = ord_u * ord_v * (dCmat(1, 1) - dCmat(1, 0) - dCmat(0, 1) + dCmat(0, 0)); + eval[i] = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); + } + else if (end_u == 1 && end_v == 0) + { + Du[i] = ord_u * (dCmat(1, 0) - dCmat(0, 0)); + Dv[i] = 0.0; + DuDv[i] = 0.0; + eval[i] = (1 - u) * dCmat(0, 0) + u * dCmat(1, 0); + } + else if (end_u == 0 && end_v == 1) + { + Du[i] = 0.0; + Dv[i] = ord_v * (dCmat(0, 1) - dCmat(0, 0)); + DuDv[i] = 0.0; + eval[i] = (1 - v) * dCmat(0, 0) + v * dCmat(0, 1); + } + else + { + Du[i] = 0.0; + Dv[i] = 0.0; + DuDv[i] = 0.0; + eval[i] = dCmat(0, 0); } - - DuDv[i] = ord_u * ord_v * (dCmat(1, 1) - dCmat(1, 0) - dCmat(0, 1) + dCmat(0, 0)); - - // Get the evaluation point - eval[i] = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); // clang-format on } } else { // Store BezierPatch of projective weights, (wx, wy, wz) + // and BezierPatch of weights (w) BezierPatch projective(ord_u, ord_v); - - // Store BezierPatch of weights (w) BezierPatch weights(ord_u, ord_v); for(int p = 0; p <= ord_u; ++p) { for(int q = 0; q <= ord_v; ++q) { - projective(p, q) = m_controlPoints(p, q); - projective(p, q).array() *= m_weights(p, q); weights(p, q)[0] = m_weights(p, q); + + for(int i = 0; i < NDIMS; ++i) + { + projective(p, q)[i] = m_controlPoints(p, q)[i] * m_weights(p, q); + } } } @@ -975,8 +1358,6 @@ class BezierPatch Point W; Vector W_u, W_v, W_uu, W_vv, W_uv; - Vector eval_vec; - projective.evaluate_second_derivatives(u, v, P, P_u, P_v, P_uu, P_vv, P_uv); weights.evaluate_second_derivatives(u, v, W, W_u, W_v, W_uu, W_vv, W_uv); @@ -1026,72 +1407,54 @@ class BezierPatch const int ord_u = getOrder_u(); const int ord_v = getOrder_v(); - // Construct the hodograph in the two directions, then evaluate it + // If the curve is nonrational, we can use standard de Casteljau if(!isRational()) - { - BezierPatch hodograph(ord_u - 1, ord_v - 1); - // Iterate over each isocurve along v - for(int q = 0; q <= ord_v - 1; ++q) - { - for(int p = 0; p <= ord_u - 1; ++p) - { - for(int i = 0; i < NDIMS; ++i) - { - hodograph(p, q)[i] = ord_u * ord_v * - (m_controlPoints(p + 1, q + 1)[i] - m_controlPoints(p + 1, q)[i] - - m_controlPoints(p, q + 1)[i] + m_controlPoints(p, q)[i]); - } - } - } - - return Vector(hodograph.evaluate(u, v)); - } - else { Vector val; axom::Array dCmat(ord_u + 1, ord_v + 1); axom::Array dWmat(ord_u + 1, ord_v + 1); + // Do de Casteljau until we get a 2x2 for(int i = 0; i < NDIMS; ++i) { - // Do de Casteljau until we get a 3x3 for(int p = 0; p <= ord_u; ++p) { for(int q = 0; q <= ord_v; ++q) { - dCmat(p, q) = m_controlPoints(p, q)[i] * m_weights(p, q); - dWmat(p, q) = m_weights(p, q); + dCmat(p, q) = m_controlPoints(p, q)[i]; } } + // Store the size after each de Casteljau reduction is made + int end_u = ord_u; + int end_v = ord_v; + // Do de Casteljau over the longer direction first - if(false) + if(ord_u >= ord_v) { // Stop 1 steps early in u - for(int p = 1; p <= ord_u - 1; ++p) + while(end_u > 1) { - const int end = ord_u - p; - for(int k = 0; k <= end; ++k) + end_u -= 1; + for(int k = 0; k <= end_u; ++k) { for(int q = 0; q <= ord_v; ++q) { dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); - dWmat(k, q) = lerp(dWmat(k, q), dWmat(k + 1, q), u); } } } - // Stop 1 step early in v over the two columns - for(int q = 1; q <= ord_v - 1; ++q) + // Stop 1 steps early in u + while(end_v > 1) { - const int end = ord_v - q; - for(int k = 0; k <= end; ++k) + end_v -= 1; + for(int k = 0; k <= end_v; ++k) { - for(int p = 0; p <= 1; ++p) + for(int p = 0; p <= end_u; ++p) { dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); - dWmat(p, k) = lerp(dWmat(p, k), dWmat(p, k + 1), v); } } } @@ -1099,87 +1462,89 @@ class BezierPatch else { // Stop 1 step early in v - for(int q = 1; q <= ord_v - 1; ++q) + while(end_v > 1) { - const int end = ord_v - q; - for(int k = 0; k <= end; ++k) + end_v -= 1; + for(int k = 0; k <= end_v; ++k) { - for(int p = 0; p <= ord_u; ++p) + for(int p = 0; p <= end_u; ++p) { dCmat(p, k) = lerp(dCmat(p, k), dCmat(p, k + 1), v); - dWmat(p, k) = lerp(dWmat(p, k), dWmat(p, k + 1), v); } } } // Stop 1 step early in v over the two columns - for(int p = 1; p <= ord_u - 1; ++p) + while(end_u > 1) { - const int end = ord_u - p; - for(int k = 0; k <= end; ++k) + end_u -= 1; + for(int k = 0; k <= end_u; ++k) { - for(int q = 0; q <= 1; ++q) + for(int q = 0; q <= ord_v; ++q) { dCmat(k, q) = lerp(dCmat(k, q), dCmat(k + 1, q), u); - dWmat(k, q) = lerp(dWmat(k, q), dWmat(k + 1, q), u); } } } } - // Store intermediate values - // clang-format off - double W, W_u, W_v, W_uv; - double C, C_u, C_v, C_uv; - if (ord_u == 0 && ord_v == 0) + // Do the evaluation, accounting for insufficient control points + if(end_u == 0 || end_v == 0) { - W = dWmat(0, 0); - C = dWmat(0, 0); - - W_u = W_v = W_uv = 0.0; - C_u = C_v = C_uv = 0.0; + val[i] = 0.0; } - else if (ord_u == 0 && ord_v == 1) + else { - W = (1 - v) * dWmat(0, 0) + v * dWmat(0, 1); - C = (1 - v) * dCmat(0, 0) + v * dCmat(0, 1); - W_u = C_u = W_uv = C_uv = 0.0; - - W_v = dWmat(0, 1) - dWmat(0, 0); - C_v = dCmat(0, 1) - dCmat(0, 0); + // clang-format off + val[i] = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + + (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); + // clang-format on } - else if (ord_u == 1 && ord_v == 0) - { - W = (1 - u) * dWmat(0, 0) + u * dWmat(1, 0); - C = (1 - u) * dCmat(0, 0) + u * dCmat(1, 0); - W_u = C_u = W_uv = C_uv = 0.0; + } - W_v = dWmat(1, 0) - dWmat(0, 0); - C_v = dCmat(1, 0) - dCmat(0, 0); - } - else + return val; + } + // If rational, construct the 4D homogeneous surface, + // which requires all first derivatives + else + { + Vector val; + + // Store BezierPatch of projective weights, (wx, wy, wz) + // and BezierPatch of weights (w) + BezierPatch projective(ord_u, ord_v); + BezierPatch weights(ord_u, ord_v); + + for(int p = 0; p <= ord_u; ++p) + { + for(int q = 0; q <= ord_v; ++q) { - W = (1 - u) * (1 - v) * dWmat(0, 0) + u * (1 - v) * dWmat(1, 0) + - (1 - u) * v * dWmat(0, 1) + u * v * dWmat(1, 1); - W_u = ord_u * ( (1 - v) * (dWmat(1, 0) - dWmat(0, 0)) + - v * (dWmat(1, 1) - dWmat(0, 1)) ); - W_v = ord_v * ( (1 - u) * (dWmat(0, 1) - dWmat(0, 0)) + - u * (dWmat(1, 1) - dWmat(1, 0)) ); - W_uv = ord_u * ord_v * (dWmat(1, 1) - dWmat(1, 0) - dWmat(0, 1) + dWmat(0, 0)); - - C = (1 - u) * (1 - v) * dCmat(0, 0) + u * (1 - v) * dCmat(1, 0) + - (1 - u) * v * dCmat(0, 1) + u * v * dCmat(1, 1); - C_u = ord_u * ( (1 - v) * (dCmat(1, 0) - dCmat(0, 0)) + - v * (dCmat(1, 1) - dCmat(0, 1)) ); - C_v = ord_v * ( (1 - u) * (dCmat(0, 1) - dCmat(0, 0)) + - u * (dCmat(1, 1) - dCmat(1, 0)) ); - C_uv = ord_u * ord_v * (dCmat(1, 1) - dCmat(1, 0) - dCmat(0, 1) + dCmat(0, 0)); + weights(p, q)[0] = m_weights(p, q); + + for(int i = 0; i < NDIMS; ++i) + { + projective(p, q)[i] = m_controlPoints(p, q)[i] * m_weights(p, q); + } } + } - val[i] = W * W * C_uv - W * (C_u * W_v + C_v * W_u) + - C * (2 * W_u * W_v - W * W_uv); - val[i] /= (W * W * W); - // clang-format on + Point P; + Vector P_u, P_v, P_uv; + + Point W; + Vector W_u, W_v, W_uv; + + projective.evaluate_linear_derivatives(u, v, P, P_u, P_v, P_uv); + weights.evaluate_linear_derivatives(u, v, W, W_u, W_v, W_uv); + + // Store values used in each coordinate computation + double weight_prod = 2 * W_u[0] * W_v[0] - W[0] * W_uv[0]; + double weight_cubed = W[0] * W[0] * W[0]; + for(int i = 0; i < NDIMS; ++i) + { + val[i] = W[0] * W[0] * P_uv[i] - + W[0] * (P_u[i] * W_v[0] + P_v[i] * W_u[0]) + P[i] * weight_prod; + val[i] /= weight_cubed; } return val; @@ -1199,7 +1564,10 @@ class BezierPatch */ VectorType normal(T u, T v) const { - return VectorType::cross_product(du(u, v), dv(u, v)); + Point eval; + Vector Du, Dv; + evaluate_first_derivatives(u, v, eval, Du, Dv); + return VectorType::cross_product(Du, Dv); } /*! diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index 094dfe7231..041b90279e 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -216,7 +216,7 @@ double winding_number(const Point& q, double edge_tol = 1e-8, double EPS = 1e-8) { - return detail::curve_winding_number(q, c, false, edge_tol, EPS); + return detail::curve_winding_number_recursive(q, c, false, edge_tol, EPS); } /*! @@ -241,7 +241,8 @@ double winding_number(const Point& q, double ret_val = 0.0; for(int i = 0; i < cpoly.numEdges(); i++) { - ret_val += detail::curve_winding_number(q, cpoly[i], false, edge_tol, EPS); + ret_val += + detail::curve_winding_number_recursive(q, cpoly[i], false, edge_tol, EPS); } return ret_val; diff --git a/src/axom/primal/tests/primal_bezier_patch.cpp b/src/axom/primal/tests/primal_bezier_patch.cpp index 632eccf04f..d96ca5af2a 100644 --- a/src/axom/primal/tests/primal_bezier_patch.cpp +++ b/src/axom/primal/tests/primal_bezier_patch.cpp @@ -700,11 +700,78 @@ TEST(primal_bezierpatch, second_derivative_linear) double weights[(order_u + 1) * (order_v + 1)] = { 1.0, 1.0, 1.0, 1.0, 1.0, - 1.0, 2.0, 3.0, 2.0, 1.0}; + 1.0, 1.0, 1.0, 1.0, 1.0}; // clang-format on BezierPatchType bPatch(controlPoints, weights, order_u, order_v); - const double u = 0.6, v = 0.4; + const double u = 0.5, v = 0.5; + + PointType eval; + VectorType Du, Dv, DuDu, DvDv, DuDv; + bPatch.evaluate_second_derivatives(u, v, eval, Du, Dv, DuDu, DvDv, DuDv); + + auto evaluate_test = bPatch.evaluate(u, v); + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(eval[i], evaluate_test[i], 1e-6); + } + + auto partial_u_test = bPatch.du(u, v); + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(Du[i], partial_u_test[i], 1e-6); + } + + auto partial_v_test = bPatch.dv(u, v); + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(Dv[i], partial_v_test[i], 1e-6); + } + + auto partial_uu_test = bPatch.dudu(u, v); + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(DuDu[i], partial_uu_test[i], 1e-6); + } + + auto partial_vv_test = bPatch.dvdv(u, v); + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(DvDv[i], partial_vv_test[i], 1e-6); + } + + auto partial_uv_test = bPatch.dudv(u, v); + for(int i = 0; i < 3; ++i) + { + EXPECT_NEAR(DuDv[i], DuDv[i], 1e-6); + } +} + +//------------------------------------------------------------------------------ +TEST(primal_bezierpatch, second_derivative_point) +{ + SLIC_INFO("Testing bezier Patch derivative calculation for point"); + + const int DIM = 3; + using CoordType = double; + using PointType = primal::Point; + using VectorType = primal::Vector; + using BezierPatchType = primal::BezierPatch; + + const int order_u = 0; + const int order_v = 4; + + // Test on a linear Bezier patch to make sure the correct values are zero + // clang-format off + PointType controlPoints[(order_u + 1) * (order_v + 1)] = { + PointType {0, 0, 0}, PointType{0, 4, 0}, PointType{0, 8, -3}, PointType{0, 12, 1}, PointType{0, 16, 3}}; + + double weights[(order_u + 1) * (order_v + 1)] = { + 1.0, 1.0, 1.0, 1.0, 1.0}; + // clang-format on + + BezierPatchType bPatch(controlPoints, weights, order_u, order_v); + const double u = 0.5, v = 0.5; PointType eval; VectorType Du, Dv, DuDu, DvDv, DuDv; From ea60c92fd0010cc9759ceb442723159731478b96 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 12 Jul 2023 14:03:53 -0700 Subject: [PATCH 054/639] Add script to generate multidomain strided-structured mesh for testing. Script gen-strided-structured-mesh.py is similar to gen-multidom-structured-mesh.py, but it also supports blueprint's strided-structured mesh specifications. --- .../examples/quest_marching_cubes_example.cpp | 2 +- src/tools/gen-strided-structured-mesh.py | 181 ++++++++++++++++++ 2 files changed, 182 insertions(+), 1 deletion(-) create mode 100755 src/tools/gen-strided-structured-mesh.py diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index a3f1faf07f..d1c5e5b83f 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -552,7 +552,7 @@ struct BlueprintStructuredMesh #else conduit::relay::io::blueprint::load_mesh(meshFilename, _mdMesh); #endif - assert(conduit::blueprint::mesh::is_multi_domain(_mdMesh)); + SLIC_ASSERT(conduit::blueprint::mesh::is_multi_domain(_mdMesh)); _domCount = conduit::blueprint::mesh::number_of_domains(_mdMesh); if(_domCount > 0) diff --git a/src/tools/gen-strided-structured-mesh.py b/src/tools/gen-strided-structured-mesh.py new file mode 100755 index 0000000000..8c7f44f790 --- /dev/null +++ b/src/tools/gen-strided-structured-mesh.py @@ -0,0 +1,181 @@ +#!/usr/bin/env python3 + +# gen-strided-structured-mesh.py +# Write a simple strided-structured blueprint mesh for testing. + +# This script requires a conduit installation configured with python3 and hdf5. +# Make sure PYTHONPATH includes /path/to/conduit/install/python-modules + +try: + import conduit + import conduit.blueprint + import conduit.relay +except ModuleNotFoundError as e: + print(f'{e}\nMake sure your PYTHONPATH includes /path/to/conduit/install/python-modules\nConduit must be configured with python and hdf5.') + exit(-1) + +import numpy as np + +def i_c(s): + '''Convert comma-separated string to list of integers.''' + return list(map(int, s.split(','))) + +def f_c(s): + '''Convert comma-separated string to list of floating point numbers.''' + return list(map(float, s.split(','))) + +from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter +ps = ArgumentParser(description='Write a blueprint strided-unstructured mesh.', + formatter_class=ArgumentDefaultsHelpFormatter) +ps.add_argument('--useList', action='store_true', help='Put domains in a list instead of a map') +ps.add_argument('-ml', type=f_c, default=(0.,0.), help='Mesh lower coordinates') +ps.add_argument('-mu', type=f_c, default=(1.,1.), help='Mesh upper coordinates') +ps.add_argument('-ms', type=i_c, default=(3,3), help='Logical size of mesh (cells)') +ps.add_argument('-dc', type=i_c, default=(1,1), help='Domain counts in each index direction') +ps.add_argument('--strided', action='store_true', help='Use strided_structured (has ghosts)') +ps.add_argument('-o', '--output', type=str, default='mdmesh', help='Output file base name') +opts,unkn = ps.parse_known_args() +print(opts, unkn) +if(unkn): + print("Unrecognized arguments:", *unkn) + quit(1) + +dim = len(opts.dc) + +if dim not in (2,3) \ + or len(opts.ms) != dim \ + or len(opts.ml) != dim \ + or len(opts.mu) != dim: + raise RuntimeError('dc, ms, ml and mu options must have the same dimensions (2 or 3)') + +# Must have enough cells for requested partitioning. +goodDc = [opts.ms[i] >= opts.dc[i] for i in range(dim)] +if sum(goodDc) < dim: + raise RuntimeError(f'ms ({opts.ms}) must be >= dc ({opts.dc}) in all directions.') + +def scale_structured_domain(n, startCoord, endCoord): + '''This function scales and shifts a blueprint structured domain after + it has been created. There's no way to specify the physical extent + of a domain using conduit.blueprint.mesh.examples.basic, as far as I + can tell. + + ''' + print(f'Rescaling to {startCoord} -> {endCoord}') + + ndim = n['coordsets/coords/values'].number_of_children() + + domLens = n['topologies/mesh/elements/dims'] + dirs = 'ij' if ndim == 2 else 'ijk' + domLens = [ domLens[d] for d in dirs ] + domLens = np.array(domLens) + domPhysicalSize = np.array(endCoord) - np.array(startCoord) + #print(f'domLens={domLens} domPhysicalSize={domPhysicalSize}') + assert(n['topologies/mesh/type'] == 'structured') + assert(len(startCoord) >= ndim) + assert(len(domPhysicalSize) >= ndim) + + coordArrayLens = domLens + 1 + npnl + npnr + print(f'coordArrayLens={coordArrayLens}') + + xyz = 'xyz' + for d in range(ndim): + coords = n['coordsets/coords/values'][d] + coords = np.reshape(coords, np.flip(coordArrayLens)) + + # realCoords excludes the ghost layers. + if ndim == 2: + realCoords = coords[npnl:, npnl:] if npnr == 0 else coords[npnl:-npnr, npnl:-npnr] + else: + realCoords = coords[npnl:, npnl:, npnl:] if npnr == 0 else coords[npnl:-npnr, npnl:-npnr, npnl:-npnr] + minC, maxC = np.amin(realCoords), np.amax(realCoords) + curRange = maxC - minC + shift = startCoord[d] - minC + scale = domPhysicalSize[d]/curRange + coords = (coords - minC) * domPhysicalSize[d]/curRange + startCoord[d] + n['coordsets/coords/values'][xyz[d]] = coords + +domType = 'structured' + +domCounts = opts.dc if dim == 3 else (*opts.dc, 1) # domCounts must be length 3, even for 2D. +meshSize = opts.ms +meshLower = opts.ml +meshUpper = opts.mu + +# Convert to np.array to use element-wise arithmetic. +domCounts = np.array(domCounts, dtype=np.int) +meshSize = np.array(meshSize, dtype=np.int) +meshLower = np.array(meshLower) +meshUpper = np.array(meshUpper) + +domPhysicalSize = (meshUpper - meshLower)/domCounts[:dim] +cellPhysicalSize = (meshUpper - meshLower)/meshSize + +domSize = meshSize//domCounts[:dim] +domSizeRem = meshSize % domCounts[:dim] +#print(f'meshSize={meshSize} cells, domCounts={domCounts} domSize={domSize} domSizeRem={domSizeRem}') +#print(f'meshLower={meshLower} meshUpper={meshUpper}') + +def domain_index_begin(di, dj, dk=None): + '''Compute first cell index of the domain with multi-dimensional index (di, dj, dk).''' + ds = (di, dj) if dim == 2 else (di, dj, dk) + idx = np.array(ds) + std = domSize * ds + extra = np.where( idx < domSizeRem[:dim], idx, domSizeRem[:dim] ) + begin = std + extra + return begin + +# Number of phony nodes on left and right sides, for strided option +if opts.strided: + npnl, npnr = 2, 1 +else: + npnl, npnr = 0, 0 + +mdMesh = conduit.Node() +for dk in range(domCounts[2]): + for dj in range(domCounts[1]): + for di in range(domCounts[0]): + if opts.useList: + dom = mdMesh.append() + else: + domName = f'domain_{di:1d}_{dj:1d}' + if len(opts.dc) == 3: domName += f'_{dk:1d}' + dom = mdMesh[domName] + + cellStart = domain_index_begin(di, dj, dk) + cellEnd = domain_index_begin(di+1, dj+1, dk+1 if dim == 3 else 0) + pointCounts = cellEnd - cellStart + 1 + print(f'cellStart={cellStart} cellEnd={cellEnd} pointCounts={pointCounts}') + + elemExtents = (cellEnd - cellStart) + (npnl + npnr + 1) + vertExtents = np.array(pointCounts) + (npnl + npnr) + elemOffset = np.full(dim, npnl) + vertOffset = np.full(dim, npnl) + #print(f'\n{domName}: {cellStart} -> {cellEnd}') + + pointCounts3 = pointCounts if len(pointCounts) == 3 else (*pointCounts, 0) + if opts.strided: + desc = conduit.Node() + desc['vertex_data/shape'].set(vertExtents) + desc['vertex_data/origin'].set(vertOffset) + desc['element_data/shape'].set(elemExtents) + desc['element_data/origin'].set(elemOffset) + print(f'\ndesc({di},{dj},{dk}):', end=''); print(desc) + conduit.blueprint.mesh.examples.strided_structured(desc, *pointCounts3, dom) + if dom.has_child("state"): dom.remove_child("state") + else: + conduit.blueprint.mesh.examples.basic(domType, *pointCounts3, dom) + + domLower = meshLower[:dim] + cellStart * cellPhysicalSize[:dim] + domUpper = meshLower[:dim] + cellEnd * cellPhysicalSize[:dim] + scale_structured_domain(dom, domLower, domUpper) + #print(dom) + +print('mdMesh:'); print(mdMesh) + +info = conduit.Node() +if not conduit.blueprint.mesh.verify(mdMesh, info): + print("Mesh failed blueprint verification. Info:") + print(info) + +conduit.relay.io.blueprint.save_mesh(mdMesh, opts.output, "hdf5") +print(f'Wrote mesh {opts.output}') From 0149a0ddd3387b6f65234e054487c8fc0f990610 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 17 Aug 2023 09:37:17 -0700 Subject: [PATCH 055/639] fix release notes version links --- RELEASE-NOTES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 852f9f59fd..43b62cd8b5 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -19,7 +19,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ ## [Unreleased] - Release date yyyy-mm-dd -## [v0.8.1] - Release date 2023-08-16 +## [Version 0.8.1] - Release date 2023-08-16 ### Changed - Updates to [RAJA version 2023.06.0][https://github.com/LLNL/RAJA/releases/tag/v2023.06.0] @@ -30,7 +30,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - Fixed MFEMSidreDataCollection finite element space bug - Various fixes to CMake machinery -## [v0.8.0] - Release date 2023-07-26 +## [Version 0.8.0] - Release date 2023-07-26 ### Added - Adds MarchingCubes class implementing the marching cubes algorithm for surface detection. From 8c4c03c653146001d4690cf0f63c19254bce747a Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 17 Aug 2023 09:58:25 -0700 Subject: [PATCH 056/639] move to main branch for radiuss shared configs --- scripts/spack/radiuss-spack-configs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spack/radiuss-spack-configs b/scripts/spack/radiuss-spack-configs index 5dad973b73..f204a025ce 160000 --- a/scripts/spack/radiuss-spack-configs +++ b/scripts/spack/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 5dad973b737aa39bd984285c4376ad417e40c9cf +Subproject commit f204a025ce8de449bb4fbd246e496415a6e55075 From 1de9e0cee7fa2535ee38704905ed274dcb917aa5 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 17 Aug 2023 11:47:59 -0700 Subject: [PATCH 057/639] Partial progress toward supporting ghosts and strides. Affects MarchingCubes and DistributedClosestPoint. --- src/axom/quest/MarchingCubes.cpp | 6 +- src/axom/quest/MeshViewUtil.hpp | 558 ++++++++++++++++++ src/axom/quest/detail/MarchingCubesImpl.hpp | 55 +- ...est_distributed_distance_query_example.cpp | 50 +- .../examples/quest_marching_cubes_example.cpp | 87 +-- 5 files changed, 689 insertions(+), 67 deletions(-) create mode 100644 src/axom/quest/MeshViewUtil.hpp diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 528778d0c3..13f8676a72 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -164,11 +164,7 @@ void MarchingCubesSingleDomain::setDomain(const conduit::Node& dom) m_dom = &dom; - const conduit::Node& dimsNode = - m_dom->fetch_existing("topologies/mesh/elements/dims"); - - m_ndim = dimsNode.number_of_children(); - + m_ndim = conduit::blueprint::mesh::coordset::dims(dom.fetch_existing("coordsets/coords")); SLIC_ASSERT(m_ndim >= 2 && m_ndim <= 3); const conduit::Node& coordsValues = dom[m_coordsetPath + "/values"]; diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp new file mode 100644 index 0000000000..6a17e443c5 --- /dev/null +++ b/src/axom/quest/MeshViewUtil.hpp @@ -0,0 +1,558 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +#ifndef QUEST_MESH_VIEW_UTIL_H_ +#define QUEST_MESH_VIEW_UTIL_H_ + +#include "axom/config.hpp" +#include "axom/core.hpp" + +#include "axom/fmt.hpp" + +#include "conduit_blueprint_mesh.hpp" + +#include +#include +#include +#include +#include + +namespace axom +{ +namespace quest +{ + +/** + \brief Utility for accessing views into a blueprint mesh, + for structured mesh with explicit coordinates. + + Views are single-domain-specific. They don't apply to multi-domain meshes. + They are also topology specific, with the topology name given + to the constructor. + + TODO: Figure out a more appropriate place for this file. + It's only in axom/quest because the initial need was there. +*/ +template +class MeshViewUtil +{ +public: + + //@{ + //@name Setting up + /*! + @brief Constructor + @param [in] bpDomain Blueprint single domain. + @param [in] topologyName Name of topology in the domain. + + If \a topologyName is omitted, use the first topology, + + The topology dimension must match DIM. + */ + MeshViewUtil(conduit::Node& bpDomain, const std::string& topologyName = "") + : m_dom(&bpDomain) + , m_topologyName(topologyName) + { + if(m_topologyName.empty()) + { + m_topologyName = bpDomain.fetch_existing("topologies")[0].name(); + } + + const std::string topoPath = "topologies/" + m_topologyName; + SLIC_ASSERT(m_dom->has_path(topoPath)); + m_topology = &m_dom->fetch_existing(topoPath); + + SLIC_ASSERT(m_topology->fetch_existing("type").as_string() == "structured"); + + const std::string coordsetPath = + "coordsets/" + m_dom->fetch_existing(topoPath + "/coordset").as_string(); + m_coordset = &m_dom->fetch_existing(coordsetPath); + + SLIC_ASSERT( m_coordset->fetch_existing("type").as_string() == "explicit"); + + int dim = conduit::blueprint::mesh::coordset::dims(*m_coordset); + if(dim != DIM) + { + SLIC_ERROR(axom::fmt::format("MeshViewUtil template parameter DIM={} doesn't match mesh topology dimension ({})", + DIM, dim)); + } + + m_cdom = m_dom; + m_ctopology = m_topology; + m_ccoordset = m_coordset; + } + + /*! + @brief Constructor + @param [in] bpDomain const Blueprint single domain. + @param [in] topologyName Name op topology in the domain. + */ + MeshViewUtil(const conduit::Node& bpDomain, const std::string& topologyName) + : m_cdom(&bpDomain) + , m_topologyName(topologyName) + { + const std::string topoPath = "topologies/" + m_topologyName; + SLIC_ASSERT(m_dom->has_path(topoPath)); + m_ctopology = &m_cdom->fetch_existing(topoPath); + + SLIC_ASSERT(m_ctopology->fetch_existing("type").as_string() == "structured"); + + const std::string coordsetPath = + "coordsets/" + m_dom->fetch_existing(topoPath + "/coordset").as_string(); + m_ccoordset = &m_cdom->fetch_existing(coordsetPath); + + SLIC_ASSERT( m_ccoordset->fetch_existing("type").as_string() == "explicit"); + + int dim = conduit::blueprint::mesh::coordset::dims(*m_ccoordset); + if(dim != DIM) + { + SLIC_ERROR(axom::fmt::format("MeshViewUtil template parameter DIM={} doesn't match mesh topology dimension ({})", + DIM, dim)); + } + } + //@} + + + //@{ + //!@name Blueprint data organization + /*! + @brief Get the named topology. + + @return the Conduit node at "topologies/". + */ + const conduit::Node& getTopology() + { + return *m_topology; + } + const conduit::Node& getTopology() const + { + return *m_ctopology; + } + + /*! + @brief Get the coordinates conduit::Node for the named topology. + */ + conduit::Node& getCoordSet() + { + return *m_coordset; + } + const conduit::Node& getCoordSet() const + { + return *m_ccoordset; + } + + /*! + @brief Get the spatial dimension of the named topology. + */ + conduit::index_t getTopologyDim() const + { + return DIM; + } + //@} + + + //@{ + //!@name Sizes and shapes + /*! + @brief Get the number of cells in each direction of a blueprint single domain. + + @param domId Index of domain + @lengths Space for dimension() numbers. + */ + axom::StackArray getDomainShape() const + { + const conduit::Node& dimsNode = m_ctopology->fetch_existing("elements/dims"); + axom::StackArray rval; + for(int i = 0; i < DIM; ++i) + { + rval[i] = dimsNode[i].as_int(); + } + return rval; + } + + axom::StackArray getRealExtents(const std::string& association) + { + axom::StackArray rval = getDomainShape(); + if(association == "vertex") + { + for(int d=0; dfetch_existing("values"); + axom::IndexType rval = valuesNode[0].dtype().number_of_elements(); + return rval; + } + + /*! + @brief Return coordinates data allocated shape of coords data, + (includes ghosts). + */ + axom::StackArray getCoordsShapeWithGhosts() const + { + const conduit::Node& valuesNode = getCoordSet().fetch_existing("values"); + const axom::IndexType coordValuesCount = + valuesNode[0].dtype().number_of_elements(); + + // Shape of allocated memory, including ghosts. + axom::StackArray memShape; + + auto stridesPtr = getCoordsStridesPtr(); + if(stridesPtr) + { + axom::StackArray strides; + for(int d=0; dfetch_existing("elements/dims"); + const conduit::int32* rval = nullptr; + if(topologyDims.has_child("strides")) + { + rval = topologyDims.fetch_existing("strides").as_int32_ptr(); + } + return rval; + } + + /*! + @brief Get the strides of the coordinates data array. + If strides are not specified, assume direction 0 is + fastest (Conduit's default striding). + */ + axom::StackArray getCoordsStrides() const + { + axom::StackArray rval; + auto stridesPtr = getCoordsStridesPtr(); + if(stridesPtr) + { + for(int d=0; dfetch_existing("elements/dims"); + const conduit::int32* rval = nullptr; + if(topologyDims.has_child("offsets")) + { + rval = topologyDims.fetch_existing("offsets").as_int32_ptr(); + } + return rval; + } + + axom::StackArray getCoordsOffsets() const + { + auto offsetsPtr = getCoordsOffsetsPtr(); + axom::StackArray rval; + for(int d=0; dfetch_existing("field/" + fieldName + "values"); + axom::IndexType rval = valuesNode.dtype().number_of_elements(); + return rval; + } + + /*! + @brief Get the strides of a named field data. + If the field has no strides, return null. + */ + const conduit::int32* getFieldStridesPtr(const std::string& fieldName) const + { + const conduit::Node& fieldNode = m_dom->fetch_existing("fields/" + fieldName); + const conduit::int32* rval = fieldNode.has_child("strides") ? + fieldNode.fetch_existing("strides").as_int32_ptr() : nullptr; + return rval; + } + + /*! + @brief Get the strides of a named field data. + If strides are not specified, assume direction 0 is + fastest (Conduit's default striding). + */ + axom::StackArray getFieldStrides(const std::string& fieldName) const + { + const conduit::Node& fieldNode = m_dom->fetch_existing("fields/" + fieldName); + const bool atVertex = fieldNode.fetch_existing("association").as_string() == "vertex"; + const conduit::int32* stridesPtr = fieldNode.has_child("strides") ? + fieldNode.fetch_existing("strides").as_int32_ptr() : nullptr; + + axom::StackArray rval; + if(stridesPtr) + { + for(int d=0; d> getCoordsViews() + { + conduit::Node& valuesNode = getCoordSet().fetch_existing("values"); + const axom::IndexType coordValuesCount = + valuesNode[0].dtype().number_of_elements(); + + axom::Array> rval(DIM); + + // Shape of allocated memory, including ghosts. + axom::StackArray memShape; + + auto stridesPtr = getCoordsStridesPtr(); + if(stridesPtr) + { + axom::StackArray strides; + for(int d=0; d(dataValues, memShape, strides); + } + assert(strides == getCoordsStrides()); + } + else + { + // No strides implies no ghosts, so memory shape is domain shape. + memShape = getDomainShape(); + axom::StackArray strides = getCoordsStrides(); + for(int d=0; d(dataValues, memShape, strides); + } + } + + return rval; + } + + /*! + @brief Return view to a scalar field variable. + */ + axom::ArrayView getFieldView(const std::string& fieldName) + { + conduit::Node& fieldNode = m_dom->fetch_existing("fields/" + fieldName); + conduit::Node& valuesNode = fieldNode.fetch_existing("values"); + const axom::IndexType valuesCount = valuesNode.dtype().number_of_elements(); + + axom::ArrayView rval; + + // Shape of allocated memory, including ghosts. + axom::StackArray memShape; + + auto stridesPtr = fieldNode.has_child("strides") ? + fieldNode.fetch_existing("strides").as_int32_ptr() : nullptr; + axom::StackArray strides = getFieldStrides(fieldName); + + double* dataValues = valuesNode.as_double_ptr();// TODO: Use template parameter T. + + if(stridesPtr) + { + for(int d=0; d(dataValues, memShape, strides); + + return rval; + } + //@} + + //@{ + //!@name Creating data + + /*! + @brief Create a new scalar nodal data field. + @param [in] fieldName + @param [in] dtype Conduit data type to put in the field. Must be at least + big enough for the strides specified. + @param [in] association "vertex" or "element" + @param [in] strides Data strides. Set to zero for no ghosts and default strides. + @param [in] offsets Data index offsets. + */ + void createNodalField( const std::string& fieldName, const std::string& association, + const conduit::DataType& dtype, + const axom::StackArray& strides, + const axom::StackArray& offsets) + { + if(m_dom->has_path("fields/" + fieldName)) + { + SLIC_ERROR(axom::fmt::format("Cannot create field {}. It already exists.", fieldName)); + } + if(association != "vertex" && association != "element") + { + SLIC_ERROR(axom::fmt::format("Not yet supporting association '{}'.", association)); + } + + auto realExtents = getRealExtents(association); + + conduit::Node& fieldNode = m_dom->fetch_existing("fields")[fieldName]; + fieldNode["association"] = association; + fieldNode["topology"] = m_topologyName; + + { + fieldNode["strides"].set(conduit::DataType::int32(DIM)); + std::int32_t* tmpPtr = fieldNode["strides"].as_int32_ptr(); + for(int d=0; d mvu(dom); + m_coordsViews = mvu.getCoordsViews(); +#else { const conduit::Node& coordValues = dom.fetch_existing(coordsetPath + "/values"); - const bool isInterleaved = - conduit::blueprint::mcarray::is_interleaved(coordValues); - const int coordSp = isInterleaved ? DIM : 1; - for(int d = 0; d < DIM; ++d) + if(dimsNode.has_child("strides")) + { + const auto* stridesPtr = dimsNode.fetch_existing("strides").as_int32_ptr(); + StackArray strides; + for(IndexType d=0; d(coordsPtr, m_pShape, strides); + } + } + else { - const double* coordsPtr = coordValues[d].as_double_ptr(); - m_coordsViews[d] = - axom::ArrayView(coordsPtr, m_pShape, coordSp); + assert(false); // Temporarily not supported, since supporting ghosts. + const bool isInterleaved = + conduit::blueprint::mcarray::is_interleaved(coordValues); + const int coordSp = isInterleaved ? DIM : 1; + for(int d = 0; d < DIM; ++d) + { + const double* coordsPtr = coordValues[d].as_double_ptr(); + m_coordsViews[d] = + axom::ArrayView(coordsPtr, m_pShape, coordSp); + } } } +#endif // Nodal function { auto& fcnValues = dom.fetch_existing(fcnPath + "/values"); const double* fcnPtr = fcnValues.as_double_ptr(); - m_fcnView = axom::ArrayView(fcnPtr, m_pShape); + if(dom.fetch_existing(fcnPath).has_child("strides")) + { + const auto* stridesPtr = dom.fetch_existing(fcnPath + "/strides").as_int32_ptr(); + StackArray strides; + for(IndexType d=0; d(fcnPtr, m_pShape, strides); + } + else + { + m_fcnView = axom::ArrayView(fcnPtr, m_pShape); + } } // Mask @@ -506,6 +544,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase } //!@brief Output contour mesh to a mint::UnstructuredMesh object. + // TODO: If cellIdField was allocated by user, we should look at its strides/offsets. void populateContourMesh( axom::mint::UnstructuredMesh& mesh, const std::string& cellIdField) const override diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index ef168e4c21..2101854c74 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -17,6 +17,7 @@ #include "axom/quest.hpp" #include "axom/slam.hpp" #include "axom/core/Types.hpp" +#include "axom/core/WhereMacro.hpp" #include "conduit_blueprint.hpp" #include "conduit_blueprint_mpi.hpp" @@ -275,16 +276,16 @@ struct BlueprintParticleMesh return false; } - /// Returns the number of points in a particle mesh domain + /*! + @brief Returns the number of points in a particle mesh domain + including ghost points. + */ int numPoints(axom::IndexType dIdx) const { int rval = 0; auto* cg = m_coordsGroups[dIdx]; - //BTNG: The following if-check is probably not a use-case - if(cg != nullptr && cg->hasView("values/x")) - { - rval = cg->getView("values/x")->getNumElements(); - } + SLIC_ASSERT(cg != nullptr && cg->hasView("values/x")); + rval = cg->getView("values/x")->getNumElements(); return rval; } /// Returns the number of points in the particle mesh @@ -302,7 +303,7 @@ struct BlueprintParticleMesh int dimension() const { return m_dimension; } /*! - @brief Read a blueprint mesh. + @brief Read a blueprint mesh and store it internally in m_group. */ void read_blueprint_mesh(const std::string& meshFilename) { @@ -320,6 +321,14 @@ struct BlueprintParticleMesh assert(conduit::blueprint::mesh::is_multi_domain(mdMesh)); conduit::index_t domCount = conduit::blueprint::mesh::number_of_domains(mdMesh); + if(domCount > 0) + { + m_coordsAreStrided = mdMesh[0].fetch_existing("topologies/mesh/elements/dims").has_child("strides"); + if(m_coordsAreStrided) + { + SLIC_WARNING(axom::fmt::format("Mesh '{}' is strided. Stride support is under development.", meshFilename)); + } + } if(domCount > 0) { @@ -426,7 +435,7 @@ struct BlueprintParticleMesh } // set the default connectivity - // Maybe be required by an old version of visit. May not be needed by newer versions of visit. + // May be required by an old version of visit. May not be needed by newer versions of visit. sidre::Array arr( m_topoGroups[domainIdx]->createView("elements/connectivity"), SZ, @@ -481,6 +490,13 @@ struct BlueprintParticleMesh auto* fld = m_fieldsGroups[dIdx]->createGroup(fieldName); fld->createViewString("association", "vertex"); fld->createViewString("topology", m_topoGroups[dIdx]->getName()); + if(m_coordsAreStrided) + { + auto* offsets = m_topoGroups[dIdx]->getView("elements/dims/offsets"); + auto* strides = m_topoGroups[dIdx]->getView("elements/dims/strides"); + fld->copyView(offsets); + fld->copyView(strides); + } fld->createViewAndAllocate("values", sidre::detail::SidreTT::id, numPoints(dIdx)); @@ -498,6 +514,13 @@ struct BlueprintParticleMesh auto* fld = m_fieldsGroups[dIdx]->createGroup(fieldName); fld->createViewString("association", "vertex"); fld->createViewString("topology", m_topoGroups[dIdx]->getName()); + if(m_coordsAreStrided) + { + auto* offsets = m_topoGroups[dIdx]->getView("elements/dims/offsets"); + auto* strides = m_topoGroups[dIdx]->getView("elements/dims/strides"); + fld->copyView(offsets); + fld->copyView(strides); + } // create views into a shared buffer for the coordinates, with stride DIM auto* buf = m_domainGroups[dIdx] @@ -584,7 +607,6 @@ struct BlueprintParticleMesh slic::flushStreams(); return false; } - // info.print(); } return true; } @@ -642,6 +664,8 @@ struct BlueprintParticleMesh } private: + //!@brief Whether stride/offsets are given for blueprint mesh coordinates data. + bool m_coordsAreStrided = false; const std::string m_coordsetName; const std::string m_topologyName; /// Parent group for the entire mesh @@ -1268,9 +1292,10 @@ int main(int argc, char** argv) PointType(params.circleCenter.data(), params.circleCenter.size()), params.circleRadius); - sidre::DataStore objectDS; + sidre::DataStore dataStore; + ObjectMeshWrapper objectMeshWrapper( - objectDS.getRoot()->createGroup("object_mesh", true)); + dataStore.getRoot()->createGroup("object_mesh", true)); objectMeshWrapper.setVerbosity(params.isVerbose()); { @@ -1298,9 +1323,8 @@ int main(int argc, char** argv) // Load computational mesh and generate a particle mesh over its nodes // These will be used to query the closest points on the object mesh(es) //--------------------------------------------------------------------------- - sidre::DataStore queryDS; // TODO: Need separate stores for object and query? QueryMeshWrapper queryMeshWrapper( - queryDS.getRoot()->createGroup("queryMesh", true), + dataStore.getRoot()->createGroup("queryMesh", true), params.meshFile); // queryMeshWrapper.print_mesh_info(); diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index d1c5e5b83f..0898492774 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -21,8 +21,10 @@ #include "axom/primal.hpp" #include "axom/mint.hpp" #include "axom/quest.hpp" +#include "axom/quest/MeshViewUtil.hpp" #include "axom/sidre.hpp" #include "axom/core/Types.hpp" +#include "axom/core/WhereMacro.hpp" #include "conduit_blueprint.hpp" #include "conduit_relay_io_blueprint.hpp" @@ -435,6 +437,7 @@ struct BlueprintStructuredMesh void printMeshInfo() const { _mdMesh.print(); } + //!@brief Get the shape of cell-based arrays for a domain. template axom::StackArray getCellsShape(int domainNum) { @@ -447,6 +450,7 @@ struct BlueprintStructuredMesh return shape; } + //!@brief Get the shape of node-based arrays for a domain. template axom::StackArray getNodesShape(int domainNum) { @@ -459,6 +463,7 @@ struct BlueprintStructuredMesh return shape; } + //!@brief Get an ArrayView of coordinates data for a domain. template axom::Array> get_coords_view(int domainNum) { @@ -534,11 +539,12 @@ struct BlueprintStructuredMesh int _ndims {-1}; conduit::Node _mdMesh; axom::IndexType _domCount; + bool _coordsAreStrided = false; const std::string _coordsetPath; const std::string _topologyPath; /*! - @brief Read a blueprint mesh. + @brief Read a blueprint mesh into conduit::Node _mdMesh. */ void readBlueprintMesh(const std::string& meshFilename) { @@ -555,8 +561,15 @@ struct BlueprintStructuredMesh SLIC_ASSERT(conduit::blueprint::mesh::is_multi_domain(_mdMesh)); _domCount = conduit::blueprint::mesh::number_of_domains(_mdMesh); +std::cout<<__WHERE<<"mdMesh:"< 0) { + _coordsAreStrided = _mdMesh[0].fetch_existing("topologies/mesh/elements/dims").has_child("strides"); + if(_coordsAreStrided) + { + SLIC_WARNING(axom::fmt::format("Mesh '{}' is strided. Stride support is under development.", meshFilename)); + } const conduit::Node coordsetNode = _mdMesh[0].fetch_existing(_coordsetPath); _ndims = conduit::blueprint::mesh::coordset::dims(coordsetNode); } @@ -630,14 +643,7 @@ void saveMesh(const sidre::Group& mesh, const std::string& filename) } // info.print(); } -#ifdef AXOM_USE_MPI - conduit::relay::mpi::io::blueprint::save_mesh(tmpMesh, - filename, - "hdf5", - MPI_COMM_WORLD); -#else - conduit::relay::io::blueprint::save_mesh(tmpMesh, filename, "hdf5"); -#endif + saveMesh(tmpMesh, filename); } //!@brief Reverse the order of a StackArray. @@ -778,48 +784,47 @@ struct ContourTestBase for(int domId = 0; domId < bpMesh.domainCount(); ++domId) { conduit::Node& dom = bpMesh.domain(domId); - // Access the coordinates - auto cellCounts = bpMesh.domainLengths(domId); - axom::StackArray shape; - for(int i = 0; i < DIM; ++i) - { - shape[i] = 1 + cellCounts[i]; - } - conduit::index_t pointCount = bpMesh.nodeCount(domId); - conduit::Node& coordsValues = - dom.fetch_existing("coordsets/coords/values"); - double* coordsPtrs[DIM]; - axom::ArrayView coordsViews[DIM]; - for(int d = 0; d < DIM; ++d) - { - coordsPtrs[d] = coordsValues[d].as_double_ptr(); - coordsViews[d] = axom::ArrayView(coordsPtrs[d], shape); - } - axom::ArrayView, DIM> coordsView( - (axom::primal::Point*)coordsValues.data_ptr(), - shape); - - // Create the nodal function data. + axom::quest::MeshViewUtil mvu(dom, "mesh"); + +#if 1 + // Create nodal function data with ghosts like node coords. + mvu.createNodalField( functionName(), "vertex", + conduit::DataType::float64(mvu.getCoordsCountWithGhosts()), + mvu.getCoordsStrides(), + mvu.getCoordsOffsets()); +#else + // Create nodal function data. conduit::Node& fieldNode = dom["fields"][functionName()]; fieldNode["association"] = "vertex"; fieldNode["topology"] = "mesh"; fieldNode["volume_dependent"] = "false"; - fieldNode["values"].set(conduit::DataType::float64(pointCount)); - double* d = fieldNode["values"].value(); - axom::ArrayView fieldView(d, shape); + fieldNode["values"].set(conduit::DataType::float64(mvu.getCoordsCountWithGhosts())); +#endif + // TODO: Not correctly setting up fieldNode with stride. See Conduit example. // Set the function value at the nodes. // value(pt) is the virtual function defining the // distance in a derived class. - for(int n = 0; n < pointCount; ++n) + const axom::Array> coordsViews = mvu.getCoordsViews(); + axom::ArrayView fieldView = mvu.getFieldView(functionName()); + populateNodalDistance(coordsViews, fieldView); + } + } + void populateNodalDistance( + const axom::Array>& coordsViews, + axom::ArrayView& fieldView) + { + SLIC_ASSERT(coordsViews[0].size() == fieldView.size()); + SLIC_ASSERT(coordsViews[0].shape() == fieldView.shape()); + auto pointCount = fieldView.size(); + for(axom::IndexType n=0; n pt; + for(int d = 0; d < DIM; ++d) { - axom::primal::Point pt; - for(int d = 0; d < DIM; ++d) - { - pt[d] = coordsViews[d].flatIndex(n); - } - fieldView.flatIndex(n) = value(pt); + pt[d] = coordsViews[d].flatIndex(n); } + fieldView.flatIndex(n) = value(pt); } } From a9d7b7796d0d15b2dc02d54166b2e7f62ea21604 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 17 Aug 2023 18:34:19 -0700 Subject: [PATCH 058/639] Ensure several ENV variables are not empty before appending them to a list These were causing build failures due to a check in the blt_list_append macro. --- src/cmake/CMakeBasics.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cmake/CMakeBasics.cmake b/src/cmake/CMakeBasics.cmake index 362b316258..eeb79c4242 100644 --- a/src/cmake/CMakeBasics.cmake +++ b/src/cmake/CMakeBasics.cmake @@ -216,17 +216,17 @@ endif() #------------------------------------------------------------------------------ # Build up an AXOM_CONFIG_NAME if not already provided +# Note: some variables might be defined but empty (e.g. CMAKE_BUILD_TYPE in our +# MacOS CI AppleClang configuration) so check before appending them to the list if(NOT DEFINED AXOM_CONFIG_NAME) set(_config "") - if(DEFINED ENV{SYS_TYPE}) + if(DEFINED ENV{SYS_TYPE} AND NOT "$ENV{SYS_TYPE}" STREQUAL "") blt_list_append(TO _config ELEMENTS $ENV{SYS_TYPE}) endif() - if(DEFINED ENV{LCSCHEDCLUSTER}) + if(DEFINED ENV{LCSCHEDCLUSTER} AND NOT "$ENV{LCSCHEDCLUSTER}" STREQUAL "") blt_list_append(TO _config ELEMENTS $ENV{LCSCHEDCLUSTER}) endif() blt_list_append(TO _config ELEMENTS ${CMAKE_CXX_COMPILER_ID}) - # Note: the second condition is required since CMAKE_BUILD_TYPE might be empty - # e.g. in our MacOS CI AppleClang configuration if(NOT CMAKE_CONFIGURATION_TYPES AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "") blt_list_append(TO _config ELEMENTS ${CMAKE_BUILD_TYPE}) endif() From bd798c2a8203ca6b199a1044fcb75d9c5db86e73 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Sat, 19 Aug 2023 11:16:16 -0700 Subject: [PATCH 059/639] Tidy up switch statements --- build/DESKTOP-02PFUDB.x64-windows.cmake | 132 ++++++++++++++++++ .../operators/detail/winding_number_impl.hpp | 20 --- 2 files changed, 132 insertions(+), 20 deletions(-) create mode 100644 build/DESKTOP-02PFUDB.x64-windows.cmake diff --git a/build/DESKTOP-02PFUDB.x64-windows.cmake b/build/DESKTOP-02PFUDB.x64-windows.cmake new file mode 100644 index 0000000000..09ab546090 --- /dev/null +++ b/build/DESKTOP-02PFUDB.x64-windows.cmake @@ -0,0 +1,132 @@ +#------------------------------------------------------------------------------ +# !!!! This is a generated file, edit at own risk !!!! +#------------------------------------------------------------------------------ +# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# other Axom Project Developers. See the top-level LICENSE file for details. +# +# SPDX-License-Identifier: (BSD-3-Clause) +#------------------------------------------------------------------------------ +# Host-config generated by vcpkg +# +# Port: axom +# Architecture: x64 +# Platform toolset: v143 +# +# vcpkg root path: E:/Code/repos/axom/build/vcpkg +# vcpkg target triplet: x64-windows +# vcpkg target triplet file: E:/Code/repos/axom/build/vcpkg/triplets/x64-windows.cmake +# +# CMake executable path: C:/Program Files/CMake/bin/cmake.exe +#------------------------------------------------------------------------------ +# To configure the code using the vcpkg toolchain: +# cmake -C E:/Code/repos/axom/build/vcpkg/packages/axom_x64-windows/include/axom/hc.cmake \ +# -G \ +# ../src +# +# Supported MSVC generators: +# For x86 MSVC builds, use "Visual Studio 2022", "Visual Studio 2019" or "Visual Studio 2017" +# For x64 MSVC builds, use "Visual Studio 2022 -A x64", "Visual Studio 2019 -A x64" or "Visual Studio 2017 Win64" +# (note: msvc 2019 and later use the -A flag to set the architecture) +# +# +# One can also use Axom's `config-build` script: +# cd +# config-build.py -hc E:/Code/repos/axom/build/vcpkg/packages/axom_x64-windows/include/axom/hc.cmake \ +# --msvc {2017,201764,2019,201964,2022,202264} \ +# [other options] +# +#------------------------------------------------------------------------------ +# To build the code through the command line: +# cmake --build . --target ALL_BUILD --config Debug [ -- -m:8 [-v:m] ] +# +# To run tests, run either: +# cmake --build . --target RUN_TESTS --config Debug +# ctest -C Debug [-j8] +# +# For release builds, use 'Release' in the configuration instead of 'Debug' +#------------------------------------------------------------------------------ + +# Toolchain file +set(CMAKE_TOOLCHAIN_FILE "E:/Code/repos/axom/build/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE FILEPATH "") +set(VCPKG_TARGET_TRIPLET "x64-windows" CACHE STRING "") + +# CMake options +set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "") + +# Axom options +set(AXOM_ENABLE_TESTS ON CACHE BOOL "") +set(AXOM_ENABLE_DOCS OFF CACHE BOOL "") +set(AXOM_ENABLE_EXAMPLES ON CACHE BOOL "") + +if(VCPKG_TARGET_TRIPLET MATCHES "^x64") + set(AXOM_USE_64BIT_INDEXTYPE ON CACHE BOOL "") +endif() + +# BLT options +set(ENABLE_FORTRAN OFF CACHE BOOL "") +set(ENABLE_FOLDERS ON CACHE BOOL "") + +#------------------------------------------------------------------------------ +# Static vs. Dynamic builds +#------------------------------------------------------------------------------ +# Note: Static builds require some care and effort to get right with MSVC. +# With a static build, choose one of +# - disable Google Test and MSVC static MD to MT (see BLT options +# section) or +# - disable one of HDF5, conduit (which uses HDF5), or sidre (which +# uses conduit). +#------------------------------------------------------------------------------ + +# On Windows, build shared libraries by default. +set(BUILD_SHARED_LIBS ON CACHE BOOL "") +# Shared libraries on Windows don't export symbols by default. We'll export +# all symbols to make behavior more like Linux or Mac OS. +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON CACHE BOOL "") + +# Toggle the following to disable gtest if you are compiling with static +# libraries and need HDF5 +set(ENABLE_GTEST ON CACHE BOOL "") +set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") + +# Toggle the following to disable changing MSVC's /MD to /MT if you are +# compiling with static libraries and need HDF5 +set(BLT_ENABLE_MSVC_STATIC_MD_TO_MT ON CACHE BOOL "") + +#------------------------------------------------------------------------------ +# MPI options +#------------------------------------------------------------------------------ +set(ENABLE_MPI OFF CACHE BOOL "") + +# If MSMPI and no other MPI is installed, turn ENABLE_MPI ON and CMake +# should automatically detect it. If CMake doesn't auto-detect MSMPI, +# or if you need to use another MPI, you will need to specify the MPI +# compiler wrappers and helper settings. +# +# Here are settings that might be appropriate for Intel compiler: +# +# set(MPI_C_COMPILER "C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_2019.5.281/windows/mpi/intel64/bin/mpicc.bat" CACHE PATH "") +# set(MPI_CXX_COMPILER "C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_2019.5.281/windows/mpi/intel64/bin/mpicc.bat" CACHE PATH "") +# set(MPI_Fortran_COMPILER "C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_2019.5.281/windows/mpi/intel64/bin/mpifc.bat" CACHE PATH "") +# set(MPIEXEC "C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_2019.5.281/windows/mpi/intel64/bin/mpiexec.exe" CACHE PATH "") +# set(MPIEXEC_NUMPROC_FLAG "-n" CACHE PATH "") + +#------------------------------------------------------------------------------ +# Set TPLs +#------------------------------------------------------------------------------ + +set(CONDUIT_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows/share/conduit" CACHE PATH "") +set(HDF5_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows" CACHE PATH "") + +set(LUA_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows" CACHE PATH "") + +set(MFEM_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows" CACHE PATH "") + +# Setup OpenMP; fix MSVC linker error about unknown flag +set(ENABLE_OPENMP ON CACHE BOOL "") +set(BLT_OPENMP_LINK_FLAGS " " CACHE STRING "") + +set(RAJA_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows" CACHE PATH "") + +set(UMPIRE_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows" CACHE PATH "") + +set(CAMP_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows" CACHE PATH "") diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index fe96c6da2f..0abf12955b 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -314,28 +314,22 @@ double stokes_winding_number(const Point& query, switch(ax) { case(SingularityAxis::x): - { quadrature += quad_rule.IntPoint(q).weight * (node[2] * node[0] * node_dt[1] - node[1] * node[0] * node_dt[2]) / (node[1] * node[1] + node[2] * node[2]) / node_norm; break; - } case(SingularityAxis::y): - { quadrature += quad_rule.IntPoint(q).weight * (node[0] * node[1] * node_dt[2] - node[2] * node[1] * node_dt[0]) / (node[0] * node[0] + node[2] * node[2]) / node_norm; break; - } case(SingularityAxis::z): case(SingularityAxis::rotated): - { quadrature += quad_rule.IntPoint(q).weight * (node[1] * node[2] * node_dt[0] - node[0] * node[2] * node_dt[1]) / (node[0] * node[0] + node[1] * node[1]) / node_norm; break; } - } } // Adaptively refine quadrature over curves if query is not far enough away @@ -347,32 +341,24 @@ double stokes_winding_number(const Point& query, switch(ax) { case(SingularityAxis::x): - { needs_adapt = (query[1] - centroid[1]) * (query[1] - centroid[1]) + (query[2] - centroid[2]) * (query[2] - centroid[2]) <= cBox.range().squared_norm(); break; - } case(SingularityAxis::y): - { needs_adapt = (query[0] - centroid[0]) * (query[0] - centroid[0]) + (query[2] - centroid[2]) * (query[2] - centroid[2]) <= cBox.range().squared_norm(); break; - } case(SingularityAxis::z): - { needs_adapt = (query[0] - centroid[0]) * (query[0] - centroid[0]) * (query[1] - centroid[1]) * (query[1] - centroid[1]) <= cBox.range().squared_norm(); break; - } case(SingularityAxis::rotated): - { needs_adapt = true; break; } - } if(needs_adapt) { @@ -437,28 +423,22 @@ double stokes_winding_number_adaptive(const Point& query, switch(ax) { case(SingularityAxis::x): - { quad_fine[i] += quad_rule.IntPoint(q).weight * (node[2] * node[0] * node_dt[1] - node[1] * node[0] * node_dt[2]) / (node[1] * node[1] + node[2] * node[2]) / node_norm; break; - } case(SingularityAxis::y): - { quad_fine[i] += quad_rule.IntPoint(q).weight * (node[0] * node[1] * node_dt[2] - node[2] * node[1] * node_dt[0]) / (node[0] * node[0] + node[2] * node[2]) / node_norm; break; - } case(SingularityAxis::z): case(SingularityAxis::rotated): - { quad_fine[i] += quad_rule.IntPoint(q).weight * (node[1] * node[2] * node_dt[0] - node[0] * node[2] * node_dt[1]) / (node[0] * node[0] + node[1] * node[1]) / node_norm; break; } - } } } From aee3cb6c6294c464d6a9987db340b22e87c93864 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Sat, 19 Aug 2023 11:17:14 -0700 Subject: [PATCH 060/639] Revert max recursive depth --- src/axom/primal/operators/detail/winding_number_impl.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 0abf12955b..4a03d84a38 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -442,7 +442,7 @@ double stokes_winding_number_adaptive(const Point& query, } } - constexpr int MAX_DEPTH = 15; + constexpr int MAX_DEPTH = 12; if(depth >= MAX_DEPTH || axom::utilities::isNearlyEqualRelative(quad_fine[0] + quad_fine[1], quad_coarse, From 2b120d6f96bc73cadb81c2990b87f3ae814e5689 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Sat, 19 Aug 2023 12:52:25 -0700 Subject: [PATCH 061/639] Considerably more thorough bezier curve test --- build/DESKTOP-02PFUDB.x64-windows.cmake | 132 ------------- src/axom/primal/tests/primal_bezier_curve.cpp | 183 ++++++++++-------- 2 files changed, 106 insertions(+), 209 deletions(-) delete mode 100644 build/DESKTOP-02PFUDB.x64-windows.cmake diff --git a/build/DESKTOP-02PFUDB.x64-windows.cmake b/build/DESKTOP-02PFUDB.x64-windows.cmake deleted file mode 100644 index 09ab546090..0000000000 --- a/build/DESKTOP-02PFUDB.x64-windows.cmake +++ /dev/null @@ -1,132 +0,0 @@ -#------------------------------------------------------------------------------ -# !!!! This is a generated file, edit at own risk !!!! -#------------------------------------------------------------------------------ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) -#------------------------------------------------------------------------------ -# Host-config generated by vcpkg -# -# Port: axom -# Architecture: x64 -# Platform toolset: v143 -# -# vcpkg root path: E:/Code/repos/axom/build/vcpkg -# vcpkg target triplet: x64-windows -# vcpkg target triplet file: E:/Code/repos/axom/build/vcpkg/triplets/x64-windows.cmake -# -# CMake executable path: C:/Program Files/CMake/bin/cmake.exe -#------------------------------------------------------------------------------ -# To configure the code using the vcpkg toolchain: -# cmake -C E:/Code/repos/axom/build/vcpkg/packages/axom_x64-windows/include/axom/hc.cmake \ -# -G \ -# ../src -# -# Supported MSVC generators: -# For x86 MSVC builds, use "Visual Studio 2022", "Visual Studio 2019" or "Visual Studio 2017" -# For x64 MSVC builds, use "Visual Studio 2022 -A x64", "Visual Studio 2019 -A x64" or "Visual Studio 2017 Win64" -# (note: msvc 2019 and later use the -A flag to set the architecture) -# -# -# One can also use Axom's `config-build` script: -# cd -# config-build.py -hc E:/Code/repos/axom/build/vcpkg/packages/axom_x64-windows/include/axom/hc.cmake \ -# --msvc {2017,201764,2019,201964,2022,202264} \ -# [other options] -# -#------------------------------------------------------------------------------ -# To build the code through the command line: -# cmake --build . --target ALL_BUILD --config Debug [ -- -m:8 [-v:m] ] -# -# To run tests, run either: -# cmake --build . --target RUN_TESTS --config Debug -# ctest -C Debug [-j8] -# -# For release builds, use 'Release' in the configuration instead of 'Debug' -#------------------------------------------------------------------------------ - -# Toolchain file -set(CMAKE_TOOLCHAIN_FILE "E:/Code/repos/axom/build/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE FILEPATH "") -set(VCPKG_TARGET_TRIPLET "x64-windows" CACHE STRING "") - -# CMake options -set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "") - -# Axom options -set(AXOM_ENABLE_TESTS ON CACHE BOOL "") -set(AXOM_ENABLE_DOCS OFF CACHE BOOL "") -set(AXOM_ENABLE_EXAMPLES ON CACHE BOOL "") - -if(VCPKG_TARGET_TRIPLET MATCHES "^x64") - set(AXOM_USE_64BIT_INDEXTYPE ON CACHE BOOL "") -endif() - -# BLT options -set(ENABLE_FORTRAN OFF CACHE BOOL "") -set(ENABLE_FOLDERS ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# Static vs. Dynamic builds -#------------------------------------------------------------------------------ -# Note: Static builds require some care and effort to get right with MSVC. -# With a static build, choose one of -# - disable Google Test and MSVC static MD to MT (see BLT options -# section) or -# - disable one of HDF5, conduit (which uses HDF5), or sidre (which -# uses conduit). -#------------------------------------------------------------------------------ - -# On Windows, build shared libraries by default. -set(BUILD_SHARED_LIBS ON CACHE BOOL "") -# Shared libraries on Windows don't export symbols by default. We'll export -# all symbols to make behavior more like Linux or Mac OS. -set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON CACHE BOOL "") - -# Toggle the following to disable gtest if you are compiling with static -# libraries and need HDF5 -set(ENABLE_GTEST ON CACHE BOOL "") -set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") - -# Toggle the following to disable changing MSVC's /MD to /MT if you are -# compiling with static libraries and need HDF5 -set(BLT_ENABLE_MSVC_STATIC_MD_TO_MT ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# MPI options -#------------------------------------------------------------------------------ -set(ENABLE_MPI OFF CACHE BOOL "") - -# If MSMPI and no other MPI is installed, turn ENABLE_MPI ON and CMake -# should automatically detect it. If CMake doesn't auto-detect MSMPI, -# or if you need to use another MPI, you will need to specify the MPI -# compiler wrappers and helper settings. -# -# Here are settings that might be appropriate for Intel compiler: -# -# set(MPI_C_COMPILER "C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_2019.5.281/windows/mpi/intel64/bin/mpicc.bat" CACHE PATH "") -# set(MPI_CXX_COMPILER "C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_2019.5.281/windows/mpi/intel64/bin/mpicc.bat" CACHE PATH "") -# set(MPI_Fortran_COMPILER "C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_2019.5.281/windows/mpi/intel64/bin/mpifc.bat" CACHE PATH "") -# set(MPIEXEC "C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_2019.5.281/windows/mpi/intel64/bin/mpiexec.exe" CACHE PATH "") -# set(MPIEXEC_NUMPROC_FLAG "-n" CACHE PATH "") - -#------------------------------------------------------------------------------ -# Set TPLs -#------------------------------------------------------------------------------ - -set(CONDUIT_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows/share/conduit" CACHE PATH "") -set(HDF5_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows" CACHE PATH "") - -set(LUA_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows" CACHE PATH "") - -set(MFEM_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows" CACHE PATH "") - -# Setup OpenMP; fix MSVC linker error about unknown flag -set(ENABLE_OPENMP ON CACHE BOOL "") -set(BLT_OPENMP_LINK_FLAGS " " CACHE STRING "") - -set(RAJA_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows" CACHE PATH "") - -set(UMPIRE_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows" CACHE PATH "") - -set(CAMP_DIR "E:/Code/repos/axom/build/vcpkg/installed/x64-windows" CACHE PATH "") diff --git a/src/axom/primal/tests/primal_bezier_curve.cpp b/src/axom/primal/tests/primal_bezier_curve.cpp index 555c299f49..8a3b0e8240 100644 --- a/src/axom/primal/tests/primal_bezier_curve.cpp +++ b/src/axom/primal/tests/primal_bezier_curve.cpp @@ -118,34 +118,42 @@ TEST(primal_beziercurve, evaluate) using PointType = primal::Point; using BezierCurveType = primal::BezierCurve; - const int order = 3; - PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, - PointType {1.3, 1.6, 1.8}, - PointType {2.9, 2.4, 2.3}, - PointType {3.2, 3.5, 3.0}}; - - BezierCurveType b2Curve(data, order); + const int max_order = 3; + PointType data[max_order + 1] = {PointType {0.6, 1.2, 1.0}, + PointType {1.3, 1.6, 1.8}, + PointType {2.9, 2.4, 2.3}, + PointType {3.2, 3.5, 3.0}}; - PointType midtval {2.05, 2.0875, 2.0375}; + // clang-format off + PointType exp_vals[4][3] = {{PointType {0.6, 1.2, 1.0}, PointType { 0.6, 1.2, 1.0}, PointType {0.6, 1.2, 1.0}}, + {PointType {0.6, 1.2, 1.0}, PointType { 0.95, 1.4, 1.4}, PointType {1.3, 1.6, 1.8}}, + {PointType {0.6, 1.2, 1.0}, PointType {1.525, 1.7, 1.725}, PointType {2.9, 2.4, 2.3}}, + {PointType {0.6, 1.2, 1.0}, PointType { 2.05, 2.0875, 2.0375}, PointType {3.2, 3.5, 3.0}}}; + // clang-format on + + // Test evaluation at various orders, using the first `ord` + // points in `data` as control points. + for(int ord = 0; ord <= max_order; ++ord) + { + BezierCurveType curve(data, ord); - // Evaluate the curve at several parameter values - // Curve should interpolate endpoints - PointType eval0 = b2Curve.evaluate(0.0); - PointType eval1 = b2Curve.evaluate(1.0); - PointType evalMid = b2Curve.evaluate(0.5); + PointType calc_start = curve.evaluate(0.0); + PointType calc_mid = curve.evaluate(0.5); + PointType calc_end = curve.evaluate(1.0); - for(int i = 0; i < DIM; ++i) - { - EXPECT_DOUBLE_EQ(b2Curve[0][i], eval0[i]); - EXPECT_DOUBLE_EQ(b2Curve[order][i], eval1[i]); - EXPECT_DOUBLE_EQ(midtval[i], evalMid[i]); + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(calc_start[i], exp_vals[ord][0][i], 1e-15); + EXPECT_NEAR(calc_mid[i], exp_vals[ord][1][i], 1e-15); + EXPECT_NEAR(calc_end[i], exp_vals[ord][2][i], 1e-15); + } } } //------------------------------------------------------------------------------ -TEST(primal_beziercurve_, point_derivatives) +TEST(primal_beziercurve_, first_derivatives) { - SLIC_INFO("Testing Bezier derivative calculations on a low-order curve"); + SLIC_INFO("Testing Bezier derivative calculation"); const int DIM = 3; using CoordType = double; @@ -153,30 +161,42 @@ TEST(primal_beziercurve_, point_derivatives) using VectorType = primal::Vector; using BezierCurveType = primal::BezierCurve; - PointType data1[1] = {PointType {0.6, 1.2, 1.0}}; - PointType data2[2] = {PointType {0.6, 1.2, 1.0}, PointType {1.3, 1.6, 1.8}}; + const int max_order = 3; + PointType data[max_order + 1] = {PointType {0.6, 1.2, 1.0}, + PointType {1.3, 1.6, 1.8}, + PointType {2.9, 2.4, 2.3}, + PointType {3.2, 3.5, 3.0}}; - BezierCurveType pointCurve(data1, 0); - BezierCurveType lineCurve(data2, 1); + // clang-format off + VectorType exp_vals[4][3] = {{VectorType {0.0, 0.0, 0.0}, VectorType { 0.0, 0.0, 0.0}, VectorType {0.0, 0.0, 0.0}}, + {VectorType {0.7, 0.4, 0.8}, VectorType { 0.7, 0.4, 0.8}, VectorType {0.7, 0.4, 0.8}}, + {VectorType {1.4, 0.8, 1.6}, VectorType { 2.3, 1.2, 1.3}, VectorType {3.2, 1.6, 1.0}}, + {VectorType {2.1, 1.2, 2.4}, VectorType {3.15, 2.325, 1.875}, VectorType {0.9, 3.3, 2.1}}}; + // clang-format on + + // Test derivative calculation at various orders, using the first `ord` + // points in `data` as control points. + for(int ord = 0; ord <= max_order; ++ord) + { + BezierCurveType curve(data, ord); - // Evaluate the curve at several parameter values - // Curve should be tangent to control net at endpoints - VectorType eval_point_first = pointCurve.dt(0.5); - VectorType eval_point_second = pointCurve.dtdt(0.5); - VectorType eval_line_second = lineCurve.dtdt(0.5); + VectorType calc_start = curve.dt(0.0); + VectorType calc_mid = curve.dt(0.5); + VectorType calc_end = curve.dt(1.0); - for(int i = 0; i < DIM; ++i) - { - EXPECT_NEAR(0.0, eval_point_first[i], 1e-15); - EXPECT_NEAR(0.0, eval_point_second[i], 1e-15); - EXPECT_NEAR(0.0, eval_line_second[i], 1e-15); + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(calc_start[i], exp_vals[ord][0][i], 1e-15); + EXPECT_NEAR(calc_mid[i], exp_vals[ord][1][i], 1e-15); + EXPECT_NEAR(calc_end[i], exp_vals[ord][2][i], 1e-15); + } } } //------------------------------------------------------------------------------ -TEST(primal_beziercurve_, tangent) +TEST(primal_beziercurve_, second_derivative) { - SLIC_INFO("Testing Bezier tangent calculation"); + SLIC_INFO("Testing Bezier second derivative calculation"); const int DIM = 3; using CoordType = double; @@ -184,36 +204,42 @@ TEST(primal_beziercurve_, tangent) using VectorType = primal::Vector; using BezierCurveType = primal::BezierCurve; - const int order = 3; - PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, - PointType {1.3, 1.6, 1.8}, - PointType {2.9, 2.4, 2.3}, - PointType {3.2, 3.5, 3.0}}; - - BezierCurveType b2Curve(data, order); + const int max_order = 3; + PointType data[max_order + 1] = {PointType {0.6, 1.2, 1.0}, + PointType {1.3, 1.6, 1.8}, + PointType {2.9, 2.4, 2.3}, + PointType {3.2, 3.5, 3.0}}; - VectorType midtval = VectorType {3.15, 2.325, 1.875}; - VectorType starttval = VectorType {2.1, 1.2, 2.4}; - VectorType endtval = VectorType {.9, 3.3, 2.1}; + // clang-format off + VectorType exp_vals[4][3] = {{VectorType {0.0, 0.0, 0.0}, VectorType { 0.0, 0.0, 0.0}, VectorType { 0.0, 0.0, 0.0}}, + {VectorType {0.0, 0.0, 0.0}, VectorType { 0.0, 0.0, 0.0}, VectorType { 0.0, 0.0, 0.0}}, + {VectorType {1.8, 0.8, -0.6}, VectorType { 1.8, 0.8, -0.6}, VectorType { 1.8, 0.8, -0.6}}, + {VectorType {5.4, 2.4, -1.8}, VectorType {-1.2, 2.1, -0.3}, VectorType {-7.8, 1.8, 1.2}}}; + // clang-format on + + // Test evaluation at various orders, using the first `ord` + // points in `data` as control points. + for(int ord = 0; ord <= max_order; ++ord) + { + BezierCurveType curve(data, ord); - // Evaluate the curve at several parameter values - // Curve should be tangent to control net at endpoints - VectorType eval0 = b2Curve.dt(0.0); - VectorType eval1 = b2Curve.dt(1.0); - VectorType evalMid = b2Curve.dt(0.5); + VectorType calc_start = curve.dtdt(0.0); + VectorType calc_mid = curve.dtdt(0.5); + VectorType calc_end = curve.dtdt(1.0); - for(int i = 0; i < DIM; ++i) - { - EXPECT_NEAR(starttval[i], eval0[i], 1e-15); - EXPECT_NEAR(endtval[i], eval1[i], 1e-15); - EXPECT_NEAR(midtval[i], evalMid[i], 1e-15); + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(calc_start[i], exp_vals[ord][0][i], 1e-14); + EXPECT_NEAR(calc_mid[i], exp_vals[ord][1][i], 1e-14); + EXPECT_NEAR(calc_end[i], exp_vals[ord][2][i], 1e-14); + } } } //------------------------------------------------------------------------------ -TEST(primal_beziercurve_, second_derivative) +TEST(primal_beziercurve_, batch_derivatives) { - SLIC_INFO("Testing Bezier second derivative calculation"); + SLIC_INFO("Testing Bezier batched derivative calculations"); const int DIM = 3; using CoordType = double; @@ -221,29 +247,32 @@ TEST(primal_beziercurve_, second_derivative) using VectorType = primal::Vector; using BezierCurveType = primal::BezierCurve; - const int order = 3; - PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, - PointType {1.3, 1.6, 1.8}, - PointType {2.9, 2.4, 2.3}, - PointType {3.2, 3.5, 3.0}}; + const int max_order = 3; + PointType data[max_order + 1] = {PointType {0.6, 1.2, 1.0}, + PointType {1.3, 1.6, 1.8}, + PointType {2.9, 2.4, 2.3}, + PointType {3.2, 3.5, 3.0}}; - BezierCurveType b2Curve(data, order); + const double t = 0.6; + PointType batch1_val, batch2_val; + VectorType batch1_dt, batch2_dt, batch2_dtdt; - VectorType midtval = VectorType {-1.2, 2.1, -0.3}; - VectorType starttval = VectorType {5.4, 2.4, -1.8}; - VectorType endtval = VectorType {-7.8, 1.8, 1.2}; + // Test the derivative calculations on various orders + for(int ord = 0; ord <= max_order; ++ord) + { + BezierCurveType curve(data, ord); - // Evaluate the curve at several parameter values - // Curve should be tangent to control net at endpoints - VectorType eval0 = b2Curve.dtdt(0.0); - VectorType eval1 = b2Curve.dtdt(1.0); - VectorType evalMid = b2Curve.dtdt(0.5); + curve.evaluate_first_derivative(t, batch1_val, batch1_dt); + curve.evaluate_second_derivative(t, batch2_val, batch2_dt, batch2_dtdt); + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(curve.evaluate(t)[i], batch1_val[i], 1e-15); + EXPECT_NEAR(curve.dt(t)[i], batch1_dt[i], 1e-15); - for(int i = 0; i < DIM; ++i) - { - EXPECT_NEAR(starttval[i], eval0[i], 1e-14); - EXPECT_NEAR(endtval[i], eval1[i], 1e-14); - EXPECT_NEAR(midtval[i], evalMid[i], 1e-14); + EXPECT_NEAR(curve.evaluate(t)[i], batch2_val[i], 1e-15); + EXPECT_NEAR(curve.dt(t)[i], batch2_dt[i], 1e-15); + EXPECT_NEAR(curve.dtdt(t)[i], batch2_dtdt[i], 1e-15); + } } } From 9343385838ceb8d9b98c22e2ab2caac87a4fc431 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Sat, 19 Aug 2023 17:24:31 -0600 Subject: [PATCH 062/639] Considerably more thorough rational curve test --- .../primal/tests/primal_rational_bezier.cpp | 156 ++++++++++-------- 1 file changed, 86 insertions(+), 70 deletions(-) diff --git a/src/axom/primal/tests/primal_rational_bezier.cpp b/src/axom/primal/tests/primal_rational_bezier.cpp index 1f106dec2d..83abfc018c 100644 --- a/src/axom/primal/tests/primal_rational_bezier.cpp +++ b/src/axom/primal/tests/primal_rational_bezier.cpp @@ -17,8 +17,6 @@ #include "axom/slic.hpp" #include "axom/fmt.hpp" -#include - namespace primal = axom::primal; //------------------------------------------------------------------------------ @@ -81,36 +79,43 @@ TEST(primal_rationalbezier, evaluate) using PointType = primal::Point; using BezierCurveType = primal::BezierCurve; - const int order = 3; - PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, - PointType {1.3, 1.6, 1.8}, - PointType {2.9, 2.4, 2.3}, - PointType {3.2, 3.5, 3.0}}; - - double weights[order + 1] = {1, 2, 3, 4}; - - BezierCurveType b2Curve(data, weights, order); - - PointType midtval {2.365, 2.32, 2.225}; + const int max_order = 3; + PointType data[max_order + 1] = {PointType {0.6, 1.2, 1.0}, + PointType {1.3, 1.6, 1.8}, + PointType {2.9, 2.4, 2.3}, + PointType {3.2, 3.5, 3.0}}; + double weights[max_order + 1] = {1, 2, 3, 4}; + + // clang-format off + PointType exp_vals[4][3] = {{PointType {0.6, 1.2, 1.0}, PointType { 0.6, 1.2, 1.0}, PointType {0.6, 1.2, 1.0}}, + {PointType {0.6, 1.2, 1.0}, PointType {16./15., 22./15., 23./15.}, PointType {1.3, 1.6, 1.8}}, + {PointType {0.6, 1.2, 1.0}, PointType { 1.8125, 1.85, 1.8875}, PointType {2.9, 2.4, 2.3}}, + {PointType {0.6, 1.2, 1.0}, PointType { 2.365, 2.32, 2.225}, PointType {3.2, 3.5, 3.0}}}; + // clang-format on + + // Test evaluation at various orders, using the first `ord` + // points in `data` as control points. + for(int ord = 0; ord <= max_order; ++ord) + { + BezierCurveType curve(data, weights, ord); - // Evaluate the curve at several parameter values - // Curve should interpolate endpoints - PointType eval0 = b2Curve.evaluate(0.0); - PointType eval1 = b2Curve.evaluate(1.0); - PointType evalMid = b2Curve.evaluate(0.5); + PointType calc_start = curve.evaluate(0.0); + PointType calc_mid = curve.evaluate(0.5); + PointType calc_end = curve.evaluate(1.0); - for(int i = 0; i < DIM; ++i) - { - EXPECT_DOUBLE_EQ(b2Curve[0][i], eval0[i]); - EXPECT_DOUBLE_EQ(b2Curve[order][i], eval1[i]); - EXPECT_DOUBLE_EQ(midtval[i], evalMid[i]); + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(calc_start[i], exp_vals[ord][0][i], 1e-15); + EXPECT_NEAR(calc_mid[i], exp_vals[ord][1][i], 1e-15); + EXPECT_NEAR(calc_end[i], exp_vals[ord][2][i], 1e-15); + } } } //------------------------------------------------------------------------------ -TEST(primal_rationalbezier, tangent) +TEST(primal_rationalbezier, first_derivative) { - SLIC_INFO("Testing Rational Bezier tangent calculation"); + SLIC_INFO("Testing Rational Bezier derivative calculation"); const int DIM = 3; using CoordType = double; @@ -118,31 +123,36 @@ TEST(primal_rationalbezier, tangent) using VectorType = primal::Vector; using BezierCurveType = primal::BezierCurve; - const int order = 3; - PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, - PointType {1.3, 1.6, 1.8}, - PointType {2.9, 2.4, 2.3}, - PointType {3.2, 3.5, 3.0}}; - - double weights[order + 1] = {1, 2, 3, 4}; - - BezierCurveType b2Curve(data, weights, order); - - VectorType midtval = VectorType {2.652, 2.256, 1.62}; - VectorType starttval = VectorType {4.2, 2.4, 4.8}; - VectorType endtval = VectorType {0.675, 2.475, 1.575}; + const int max_order = 3; + PointType data[max_order + 1] = {PointType {0.6, 1.2, 1.0}, + PointType {1.3, 1.6, 1.8}, + PointType {2.9, 2.4, 2.3}, + PointType {3.2, 3.5, 3.0}}; + double weights[max_order + 1] = {1, 2, 3, 4}; + + // clang-format off + VectorType exp_vals[4][3] = {{VectorType {0.0, 0.0, 0.0}, VectorType { 0.0, 0.0, 0.0}, VectorType { 0.0, 0.0, 0.0}}, + {VectorType {1.4, 0.8, 1.6}, VectorType {28./45., 16./45., 32./45.}, VectorType { 0.35, 0.2, 0.4}}, + {VectorType {2.8, 1.6, 3.2}, VectorType { 2.2375, 1.15, 1.0625}, VectorType {32./15., 16./15., 2./3.}}, + {VectorType {4.2, 2.4, 4.8}, VectorType { 2.652, 2.256, 1.62}, VectorType { 0.675, 2.475, 1.575}}}; + // clang-format on + + // Test derivative calculation at various orders, using the first `ord` + // points in `data` as control points. + for(int ord = 0; ord <= max_order; ++ord) + { + BezierCurveType curve(data, weights, ord); - // Evaluate the curve at several parameter values - // Curve should be tangent to control net at endpoints - VectorType eval0 = b2Curve.dt(0.0); - VectorType eval1 = b2Curve.dt(1.0); - VectorType evalMid = b2Curve.dt(0.5); + VectorType calc_start = curve.dt(0.0); + VectorType calc_mid = curve.dt(0.5); + VectorType calc_end = curve.dt(1.0); - for(int i = 0; i < DIM; ++i) - { - EXPECT_NEAR(starttval[i], eval0[i], 1e-14); - EXPECT_NEAR(endtval[i], eval1[i], 1e-14); - EXPECT_NEAR(midtval[i], evalMid[i], 1e-14); + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(calc_start[i], exp_vals[ord][0][i], 1e-15); + EXPECT_NEAR(calc_mid[i], exp_vals[ord][1][i], 1e-15); + EXPECT_NEAR(calc_end[i], exp_vals[ord][2][i], 1e-15); + } } } @@ -157,30 +167,36 @@ TEST(primal_rationalbezier, second_derivative) using VectorType = primal::Vector; using BezierCurveType = primal::BezierCurve; - const int order = 3; - PointType data[order + 1] = {PointType {0.6, 1.2, 1.0}, - PointType {1.3, 1.6, 1.8}, - PointType {2.9, 2.4, 2.3}, - PointType {3.2, 3.5, 3.0}}; - - double weights[order + 1] = {1, 2, 3, 4}; - - BezierCurveType b2Curve(data, weights, order); - - VectorType starttval = VectorType {-0.6, -2.4, -24.6}; - VectorType midtval = VectorType {-3.8448, 0.3456, -0.888}; - VectorType endtval = VectorType {-4.0125, 0.4875, 0.3375}; + const int max_order = 3; + PointType data[max_order + 1] = {PointType {0.6, 1.2, 1.0}, + PointType {1.3, 1.6, 1.8}, + PointType {2.9, 2.4, 2.3}, + PointType {3.2, 3.5, 3.0}}; + double weights[max_order + 1] = {1, 2, 3, 4}; + + // clang-format off + VectorType exp_vals[4][3] = {{VectorType { 0.0, 0.0, 0.0}, VectorType { 0.0, 0.0, 0.0}, VectorType { 0.0, 0.0, 0.0}}, + {VectorType {-2.8, -1.6, -3.2}, VectorType {-112./135., -64./135., -128./135.}, VectorType { -0.35, -0.2, -0.4}}, + {VectorType {-3.0, -2.4, -11.4}, VectorType { -0.375, -0.3, -1.425}, VectorType { -1./9., -8./90., -19./45.}}, + {VectorType {-0.6, -2.4, -24.6}, VectorType { -3.8448, 0.3456, -0.888}, VectorType {-4.0125, 0.4875, 0.3375}}}; + // clang-format on + + // Test derivative calculation at various orders, using the first `ord` + // points in `data` as control points. + for(int ord = 0; ord <= max_order; ++ord) + { + BezierCurveType curve(data, weights, ord); - // Evaluate the curve at several parameter values - VectorType eval0 = b2Curve.dtdt(0.0); - VectorType evalMid = b2Curve.dtdt(0.5); - VectorType eval1 = b2Curve.dtdt(1.0); + VectorType calc_start = curve.dtdt(0.0); + VectorType calc_mid = curve.dtdt(0.5); + VectorType calc_end = curve.dtdt(1.0); - for(int i = 0; i < DIM; ++i) - { - EXPECT_NEAR(starttval[i], eval0[i], 1e-14); - EXPECT_NEAR(endtval[i], eval1[i], 1e-14); - EXPECT_NEAR(midtval[i], evalMid[i], 1e-14); + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(calc_start[i], exp_vals[ord][0][i], 1e-14); + EXPECT_NEAR(calc_mid[i], exp_vals[ord][1][i], 1e-14); + EXPECT_NEAR(calc_end[i], exp_vals[ord][2][i], 1e-14); + } } } From 582130bacb3467d32a106551b6691594183d91dd Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Sun, 20 Aug 2023 19:44:52 -0600 Subject: [PATCH 063/639] Considerably more thorough rational patch test --- src/axom/primal/tests/primal_bezier_patch.cpp | 486 +++++++++++------- 1 file changed, 301 insertions(+), 185 deletions(-) diff --git a/src/axom/primal/tests/primal_bezier_patch.cpp b/src/axom/primal/tests/primal_bezier_patch.cpp index d96ca5af2a..885cc1f73f 100644 --- a/src/axom/primal/tests/primal_bezier_patch.cpp +++ b/src/axom/primal/tests/primal_bezier_patch.cpp @@ -429,50 +429,6 @@ TEST(primal_bezierpatch, isocurve) EXPECT_EQ(bPatch.isocurve(0.5, 1).getOrder(), order_u); } -//------------------------------------------------------------------------------ -TEST(primal_bezierpatch, evaluate_tall) -{ - SLIC_INFO("Testing bezier Patch evaluation with axes swapped"); - - const int DIM = 3; - using CoordType = double; - using PointType = primal::Point; - using BezierPatchType = primal::BezierPatch; - - const int order_u = 2; - const int order_v = 3; - - // clang-format off - PointType controlPoints[(order_u + 1) * (order_v + 1)] = { - PointType {0, 0, 0}, PointType {2, 0, 6}, PointType {4, 0, 0}, PointType {6, 0, 0}, - PointType {0, 4, 0}, PointType {2, 4, 0}, PointType {4, 4, 0}, PointType {6, 4, -3}, - PointType {0, 8, -3}, PointType {2, 8, 0}, PointType {4, 8, 3}, PointType {6, 8, 0}}; - // clang-format on - - BezierPatchType bPatch(controlPoints, order_u, order_v); - - // Evaluate the patch at each of the four corners, where the patch interpolates - for(int i = 0; i < DIM; ++i) - { - EXPECT_DOUBLE_EQ(bPatch.evaluate(0, 0)[i], controlPoints[0][i]); - EXPECT_DOUBLE_EQ(bPatch.evaluate(0, 1)[i], controlPoints[3][i]); - EXPECT_DOUBLE_EQ(bPatch.evaluate(1, 0)[i], controlPoints[8][i]); - EXPECT_DOUBLE_EQ(bPatch.evaluate(1, 1)[i], controlPoints[11][i]); - } - - // Evaluate the patch at some interior points - PointType interior_1 {3.0, 4.0, 0.5625}; // (0.5, 0.5) - PointType interior_2 {1.5, 6.0, -171.0 / 512.0}; // (0.75, 0.25) - PointType interior_3 {4.5, 2.0, 39.0 / 512.0}; // (0.25, 0.75) - - for(int i = 0; i < DIM; ++i) - { - EXPECT_DOUBLE_EQ(bPatch.evaluate(0.5, 0.5)[i], interior_1[i]); - EXPECT_DOUBLE_EQ(bPatch.evaluate(0.75, 0.25)[i], interior_2[i]); - EXPECT_DOUBLE_EQ(bPatch.evaluate(0.25, 0.75)[i], interior_3[i]); - } -} - //------------------------------------------------------------------------------ TEST(primal_bezierpatch, evaluation_degenerate) { @@ -494,7 +450,7 @@ TEST(primal_bezierpatch, evaluation_degenerate) BezierCurveType bCurve(data, order); BezierPatchType bPatch(data, order, 0); - for(double t = 0; t <= 1; t += 0.01) + for(double t = 0; t <= 1; t += 0.1) { for(int i = 0; i < DIM; ++i) { @@ -597,7 +553,7 @@ TEST(primal_bezierpatch, normal) } //------------------------------------------------------------------------------ -TEST(primal_bezierpatch, second_derivative) +TEST(primal_bezierpatch, rational_evaluation) { const int DIM = 3; using CoordType = double; @@ -605,212 +561,372 @@ TEST(primal_bezierpatch, second_derivative) using VectorType = primal::Vector; using BezierPatchType = primal::BezierPatch; - const int order_u = 3; + const int max_order_u = 3; const int order_v = 4; // clang-format off - PointType controlPoints[(order_u + 1) * (order_v + 1)] = { + PointType controlPoints[(max_order_u + 1) * (order_v + 1)] = { PointType {0, 0, 0}, PointType{0, 4, 0}, PointType{0, 8, -3}, PointType{0, 12, 1}, PointType{0, 16, 3}, PointType {2, 0, 6}, PointType{2, 4, 5}, PointType{2, 8, 0}, PointType{4, 12, 2}, PointType{2, 16, 2}, PointType {4, 0, 0}, PointType{4, 4, 5}, PointType{4, 8, 3}, PointType{2, 12, 3}, PointType{4, 16, 1}, PointType {6, 0, 0}, PointType{6, 4, -3}, PointType{6, 8, 0}, PointType{6, 12, 2}, PointType{6, 16, 0}}; - double weights[(order_u + 1) * (order_v + 1)] = { - 1.0, 1.0, 1.0, 1.0, 1.0, - 1.0, 2.0, 3.0, 2.0, 1.0, - 1.0, 2.0, 3.0, 2.0, 1.0, - 1.0, 1.0, 1.0, 1.0, 1.0}; + double weights[(max_order_u + 1) * (order_v + 1)] = { + 1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 2.0, 3.0, 2.0, 1.0, + 1.0, 2.0, 3.0, 2.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 1.0}; + + PointType exp_vals[4][3] = {{PointType {0.0, 0.0, 0.0}, PointType { 0.0, 6.4, -0.8064}, PointType {0.0, 16.0, 3.0}}, + {PointType {0.4, 0.0, 1.2}, PointType {1561./997., 6736./997., 1279./997.}, PointType {1.6, 16.0, 2.2}}, + {PointType {0.8, 0.0, 1.92}, PointType { 218./91., 8104./1183., 2579./1183.}, PointType {3.2, 16.0, 1.4}}, + {PointType {1.2, 0.0, 2.304}, PointType { 3.0, 8104./1183., 11157./4732.}, PointType {4.8, 16.0, 0.6}}}; // clang-format on - BezierPatchType bPatch(controlPoints, weights, order_u, order_v); - const double u = 0.6, v = 0.4; + double u0 = 0.2, u1 = 0.5, u2 = 0.8; + double v0 = 0.0, v1 = 0.4, v2 = 1.0; - PointType evaluation; - VectorType Du, Dv, DuDu, DvDv, DuDv; - bPatch.evaluate_second_derivatives(u, v, evaluation, Du, Dv, DuDu, DvDv, DuDv); - - auto evaluate_test = bPatch.evaluate(u, v); - PointType evaluate_exp = {3.3677499397, 6.8406796016, 2.3949546817}; - for(int i = 0; i < 3; ++i) + // For each test order, construct a Bezier patch using the first order_u + 1 + // rows of control points and weights + for(int order_u = 0; order_u <= max_order_u; ++order_u) { - EXPECT_NEAR(evaluate_exp[i], evaluation[i], 1e-6); - EXPECT_NEAR(evaluate_exp[i], evaluate_test[i], 1e-6); - } + BezierPatchType patch(controlPoints, weights, order_u, order_v); - auto partial_u_test = bPatch.du(u, v); - VectorType partial_u_exp = {3.78171724599, -0.19774668801, -0.370827644202}; - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(partial_u_exp[i], Du[i], 1e-6); - EXPECT_NEAR(partial_u_exp[i], partial_u_test[i], 1e-6); - } + PointType calc_0 = patch.evaluate(u0, v0); + PointType calc_1 = patch.evaluate(u1, v1); + PointType calc_2 = patch.evaluate(u2, v2); - auto partial_v_test = bPatch.dv(u, v); - VectorType partial_v_exp = {-0.354910197356, 11.8772494643, -1.594127454970}; - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(partial_v_exp[i], Dv[i], 1e-6); - EXPECT_NEAR(partial_v_exp[i], partial_v_test[i], 1e-6); - } + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(calc_0[i], exp_vals[order_u][0][i], 1e-15); + EXPECT_NEAR(calc_1[i], exp_vals[order_u][1][i], 1e-15); + EXPECT_NEAR(calc_2[i], exp_vals[order_u][2][i], 1e-15); + } - auto partial_uu_test = bPatch.dudu(u, v); - VectorType partial_uu_exp = {3.20670028604, -2.12957447484, -16.1167567473}; - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(partial_uu_exp[i], DuDu[i], 1e-6); - EXPECT_NEAR(partial_uu_exp[i], partial_uu_test[i], 1e-6); - } + patch.swapAxes(); - auto partial_vv_test = bPatch.dvdv(u, v); - VectorType partial_vv_exp = {0.479553359805, -8.63831027883, 1.13497887975}; - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(partial_vv_exp[i], DvDv[i], 1e-6); - EXPECT_NEAR(partial_vv_exp[i], partial_vv_test[i], 1e-6); - } + calc_0 = patch.evaluate(v0, u0); + calc_1 = patch.evaluate(v1, u1); + calc_2 = patch.evaluate(v2, u2); - auto partial_uv_test = bPatch.dudv(u, v); - VectorType partial_uv_exp = {-3.43768298544, 1.94078069698, 8.48995274462}; - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(partial_uv_exp[i], partial_uv_test[i], 1e-6); - EXPECT_NEAR(partial_uv_exp[i], DuDv[i], 1e-6); + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(calc_0[i], exp_vals[order_u][0][i], 1e-15); + EXPECT_NEAR(calc_1[i], exp_vals[order_u][1][i], 1e-15); + EXPECT_NEAR(calc_2[i], exp_vals[order_u][2][i], 1e-15); + } } } //------------------------------------------------------------------------------ -TEST(primal_bezierpatch, second_derivative_linear) +TEST(primal_bezierpatch, rational_first_derivatives) { - SLIC_INFO("Testing bezier Patch derivative calculation for linear"); - const int DIM = 3; using CoordType = double; using PointType = primal::Point; using VectorType = primal::Vector; using BezierPatchType = primal::BezierPatch; - const int order_u = 1; + const int max_order_u = 3; const int order_v = 4; - // Test on a linear Bezier patch to make sure the correct values are zero // clang-format off - PointType controlPoints[(order_u + 1) * (order_v + 1)] = { + PointType controlPoints[(max_order_u + 1) * (order_v + 1)] = { PointType {0, 0, 0}, PointType{0, 4, 0}, PointType{0, 8, -3}, PointType{0, 12, 1}, PointType{0, 16, 3}, - PointType {2, 0, 6}, PointType{2, 4, 5}, PointType{2, 8, 0}, PointType{4, 12, 2}, PointType{2, 16, 2}}; + PointType {2, 0, 6}, PointType{2, 4, 5}, PointType{2, 8, 0}, PointType{4, 12, 2}, PointType{2, 16, 2}, + PointType {4, 0, 0}, PointType{4, 4, 5}, PointType{4, 8, 3}, PointType{2, 12, 3}, PointType{4, 16, 1}, + PointType {6, 0, 0}, PointType{6, 4, -3}, PointType{6, 8, 0}, PointType{6, 12, 2}, PointType{6, 16, 0}}; - double weights[(order_u + 1) * (order_v + 1)] = { - 1.0, 1.0, 1.0, 1.0, 1.0, - 1.0, 1.0, 1.0, 1.0, 1.0}; - // clang-format on + double weights[(max_order_u + 1) * (order_v + 1)] = { + 1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 2.0, 3.0, 2.0, 1.0, + 1.0, 2.0, 3.0, 2.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 1.0}; + + VectorType exp_du[4][3] = {{VectorType {0.0, 0.0, 0.0}, VectorType { 0.0, 0.0, 0.0}, VectorType {0.0, 0.0, 0.0}}, + {VectorType {2.0, 0.0, 6.0}, VectorType {1951250./994009., 444000./994009., 2603726./994009.}, VectorType {2.0, 0.0, -1.0}}, + {VectorType {4.0, 0.0, 7.2}, VectorType { 301180./107653., 444000./1399489., 4232824./1399489.}, VectorType {4.0, 0.0, -2.0}}, + {VectorType {6.0, 0.0, 5.76}, VectorType { 330./91., 0.0, 2523./2366.}, VectorType {6.0, 0.0, -3.0}}}; + + VectorType exp_dv[4][3] = {{VectorType { 0.0, 16.0, 0.0}, VectorType { 0.0, 16.0, -0.064}, VectorType { 0.0, 16.0, 8.0}}, + {VectorType { 1.28, 19.2, 2.24}, VectorType {1276850./994009., 12622200./994009., -3524050./994009.}, VectorType {-14.08, 28.8, 2.24}}, + {VectorType {2.048, 21.76, 3.9552}, VectorType { 64650./107653., 16488700./1399489., -4637275./1399489.}, VectorType { 4.608, 31.36, -9.664}}, + {VectorType {2.304, 23.68, 5.46432}, VectorType { 0.0, 16488700./1399489., -12970725./5597956.}, VectorType { 6.912, 23.68, -11.328}}}; + // clang-format on + + double u0 = 0.2, u1 = 0.5, u2 = 0.8; + double v0 = 0.0, v1 = 0.4, v2 = 1.0; + + // For each test order, construct a Bezier patch using the first order_u + 1 + // rows of control points and weights + for(int order_u = 0; order_u <= max_order_u; ++order_u) + { + BezierPatchType patch(controlPoints, weights, order_u, order_v); - BezierPatchType bPatch(controlPoints, weights, order_u, order_v); - const double u = 0.5, v = 0.5; + VectorType calc_du_0 = patch.du(u0, v0); + VectorType calc_du_1 = patch.du(u1, v1); + VectorType calc_du_2 = patch.du(u2, v2); - PointType eval; - VectorType Du, Dv, DuDu, DvDv, DuDv; - bPatch.evaluate_second_derivatives(u, v, eval, Du, Dv, DuDu, DvDv, DuDv); + VectorType calc_dv_0 = patch.dv(u0, v0); + VectorType calc_dv_1 = patch.dv(u1, v1); + VectorType calc_dv_2 = patch.dv(u2, v2); - auto evaluate_test = bPatch.evaluate(u, v); - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(eval[i], evaluate_test[i], 1e-6); - } + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(calc_du_0[i], exp_du[order_u][0][i], 1e-13); + EXPECT_NEAR(calc_du_1[i], exp_du[order_u][1][i], 1e-13); + EXPECT_NEAR(calc_du_2[i], exp_du[order_u][2][i], 1e-13); - auto partial_u_test = bPatch.du(u, v); - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(Du[i], partial_u_test[i], 1e-6); - } + EXPECT_NEAR(calc_dv_0[i], exp_dv[order_u][0][i], 1e-13); + EXPECT_NEAR(calc_dv_1[i], exp_dv[order_u][1][i], 1e-13); + EXPECT_NEAR(calc_dv_2[i], exp_dv[order_u][2][i], 1e-13); + } - auto partial_v_test = bPatch.dv(u, v); - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(Dv[i], partial_v_test[i], 1e-6); - } + // Swap the axes and check that the derivatives are correct + patch.swapAxes(); - auto partial_uu_test = bPatch.dudu(u, v); - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(DuDu[i], partial_uu_test[i], 1e-6); - } + calc_du_0 = patch.dv(v0, u0); + calc_du_1 = patch.dv(v1, u1); + calc_du_2 = patch.dv(v2, u2); - auto partial_vv_test = bPatch.dvdv(u, v); - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(DvDv[i], partial_vv_test[i], 1e-6); - } + calc_dv_0 = patch.du(v0, u0); + calc_dv_1 = patch.du(v1, u1); + calc_dv_2 = patch.du(v2, u2); - auto partial_uv_test = bPatch.dudv(u, v); - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(DuDv[i], DuDv[i], 1e-6); + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(calc_du_0[i], exp_du[order_u][0][i], 1e-13); + EXPECT_NEAR(calc_du_1[i], exp_du[order_u][1][i], 1e-13); + EXPECT_NEAR(calc_du_2[i], exp_du[order_u][2][i], 1e-13); + + EXPECT_NEAR(calc_dv_0[i], exp_dv[order_u][0][i], 1e-13); + EXPECT_NEAR(calc_dv_1[i], exp_dv[order_u][1][i], 1e-13); + EXPECT_NEAR(calc_dv_2[i], exp_dv[order_u][2][i], 1e-13); + } } } //------------------------------------------------------------------------------ -TEST(primal_bezierpatch, second_derivative_point) +TEST(primal_bezierpatch, rational_second_derivatives) { - SLIC_INFO("Testing bezier Patch derivative calculation for point"); - const int DIM = 3; using CoordType = double; using PointType = primal::Point; using VectorType = primal::Vector; using BezierPatchType = primal::BezierPatch; - const int order_u = 0; + const int max_order_u = 3; const int order_v = 4; - // Test on a linear Bezier patch to make sure the correct values are zero // clang-format off - PointType controlPoints[(order_u + 1) * (order_v + 1)] = { - PointType {0, 0, 0}, PointType{0, 4, 0}, PointType{0, 8, -3}, PointType{0, 12, 1}, PointType{0, 16, 3}}; + PointType controlPoints[(max_order_u + 1) * (order_v + 1)] = { + PointType {0, 0, 0}, PointType{0, 4, 0}, PointType{0, 8, -3}, PointType{0, 12, 1}, PointType{0, 16, 3}, + PointType {2, 0, 6}, PointType{2, 4, 5}, PointType{2, 8, 0}, PointType{4, 12, 2}, PointType{2, 16, 2}, + PointType {4, 0, 0}, PointType{4, 4, 5}, PointType{4, 8, 3}, PointType{2, 12, 3}, PointType{4, 16, 1}, + PointType {6, 0, 0}, PointType{6, 4, -3}, PointType{6, 8, 0}, PointType{6, 12, 2}, PointType{6, 16, 0}}; - double weights[(order_u + 1) * (order_v + 1)] = { - 1.0, 1.0, 1.0, 1.0, 1.0}; + double weights[(max_order_u + 1) * (order_v + 1)] = { + 1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 2.0, 3.0, 2.0, 1.0, + 1.0, 2.0, 3.0, 2.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 1.0}; + + // Exact rational values get unwieldy here. For example, exp_dudu[1][1][0] = -2903460000/991026973 exactly. + VectorType exp_dudu[4][3] = {{VectorType {0.0, 0.0, 0.0}, VectorType { 0.0, 0.0, 0.0}, VectorType {0.0, 0.0, 0.0}}, + {VectorType {0.0, 0.0, 0.0}, VectorType {-2.92974871432, -0.666653903476, -3.90942365198}, VectorType {0.0, 0.0, 0.0}}, + {VectorType {0.0, 0.0, -24.0}, VectorType {-2.45334507849, -1.03357131222, -4.32849911}, VectorType {0.0, 0.0, 0.0}}, + {VectorType {0.0, 0.0, -50.4}, VectorType { 0.0, -1.90355193931, -13.2112292415}, VectorType {0.0, 0.0, 0.0}}}; + + VectorType exp_dvdv[4][3] = {{VectorType { 0.0, 0.0, -36.0}, VectorType { 0.0, 0.0, 23.52}, VectorType { 0.0, 0.0, -24.0}}, + {VectorType { -2.048, -11.52, -65.984}, VectorType {-0.114397491782, -7.89784961786, 17.3438006414}, VectorType {-166.912, 107.52, -48.064}}, + {VectorType {-5.89824, -28.1088, -93.470976}, VectorType {-0.786421266682, -8.69476156044, 10.1439670088}, VectorType {66.10944, 148.6848, -113.57952}}, + {VectorType {-8.84736, -44.8512, -116.0229888}, VectorType { 0.0, -8.69476156044, 4.56797689827}, VectorType {54.19008, 44.8512, -84.39552}}}; + + VectorType exp_dudv[4][3] = {{VectorType { 0.0, 0.0, 0.0}, VectorType { 0.0, 0.0, 0.0}, VectorType { 0.0, 0.0, 0.0}}, + {VectorType { 4.8, 16.0, 6.4}, VectorType {0.882014338474, -4.30534194956, -5.33680771976}, VectorType {-11.2, 16.0, -10.4}}, + {VectorType {5.12, 25.6, 12.544}, VectorType {-2.58010892971, -3.12014017951, 0.484714839042}, VectorType {49.28, 6.4, -31.04}}, + {VectorType {0.96, 28.8, 19.872}, VectorType { -3.6032437554, 0.0, 5.97901269678}, VectorType {-2.88, -28.8, -0.48}}}; // clang-format on - BezierPatchType bPatch(controlPoints, weights, order_u, order_v); - const double u = 0.5, v = 0.5; - - PointType eval; - VectorType Du, Dv, DuDu, DvDv, DuDv; - bPatch.evaluate_second_derivatives(u, v, eval, Du, Dv, DuDu, DvDv, DuDv); + double u0 = 0.2, u1 = 0.5, u2 = 0.8; + double v0 = 0.0, v1 = 0.4, v2 = 1.0; - auto evaluate_test = bPatch.evaluate(u, v); - for(int i = 0; i < 3; ++i) + // For each test order, construct a Bezier patch using the first order_u + 1 + // rows of control points and weights + for(int order_u = 0; order_u <= max_order_u; ++order_u) { - EXPECT_NEAR(eval[i], evaluate_test[i], 1e-6); - } + BezierPatchType patch(controlPoints, weights, order_u, order_v); - auto partial_u_test = bPatch.du(u, v); - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(Du[i], partial_u_test[i], 1e-6); - } + VectorType calc_dudu_0 = patch.dudu(u0, v0); + VectorType calc_dudu_1 = patch.dudu(u1, v1); + VectorType calc_dudu_2 = patch.dudu(u2, v2); - auto partial_v_test = bPatch.dv(u, v); - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(Dv[i], partial_v_test[i], 1e-6); - } + VectorType calc_dvdv_0 = patch.dvdv(u0, v0); + VectorType calc_dvdv_1 = patch.dvdv(u1, v1); + VectorType calc_dvdv_2 = patch.dvdv(u2, v2); - auto partial_uu_test = bPatch.dudu(u, v); - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(DuDu[i], partial_uu_test[i], 1e-6); - } + VectorType calc_dudv_0 = patch.dudv(u0, v0); + VectorType calc_dudv_1 = patch.dudv(u1, v1); + VectorType calc_dudv_2 = patch.dudv(u2, v2); - auto partial_vv_test = bPatch.dvdv(u, v); - for(int i = 0; i < 3; ++i) - { - EXPECT_NEAR(DvDv[i], partial_vv_test[i], 1e-6); + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(calc_dudu_0[i], exp_dudu[order_u][0][i], 1e-10); + EXPECT_NEAR(calc_dudu_1[i], exp_dudu[order_u][1][i], 1e-10); + EXPECT_NEAR(calc_dudu_2[i], exp_dudu[order_u][2][i], 1e-10); + + EXPECT_NEAR(calc_dvdv_0[i], exp_dvdv[order_u][0][i], 1e-10); + EXPECT_NEAR(calc_dvdv_1[i], exp_dvdv[order_u][1][i], 1e-10); + EXPECT_NEAR(calc_dvdv_2[i], exp_dvdv[order_u][2][i], 1e-10); + + EXPECT_NEAR(calc_dudv_0[i], exp_dudv[order_u][0][i], 1e-10); + EXPECT_NEAR(calc_dudv_1[i], exp_dudv[order_u][1][i], 1e-10); + EXPECT_NEAR(calc_dudv_2[i], exp_dudv[order_u][2][i], 1e-10); + } + + // Swap the axes and check that the derivatives are correct + patch.swapAxes(); + + calc_dudu_0 = patch.dvdv(v0, u0); + calc_dudu_1 = patch.dvdv(v1, u1); + calc_dudu_2 = patch.dvdv(v2, u2); + + calc_dvdv_0 = patch.dudu(v0, u0); + calc_dvdv_1 = patch.dudu(v1, u1); + calc_dvdv_2 = patch.dudu(v2, u2); + + calc_dudv_0 = patch.dudv(v0, u0); + calc_dudv_1 = patch.dudv(v1, u1); + calc_dudv_2 = patch.dudv(v2, u2); + + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(calc_dudu_0[i], exp_dudu[order_u][0][i], 1e-10); + EXPECT_NEAR(calc_dudu_1[i], exp_dudu[order_u][1][i], 1e-10); + EXPECT_NEAR(calc_dudu_2[i], exp_dudu[order_u][2][i], 1e-10); + + EXPECT_NEAR(calc_dvdv_0[i], exp_dvdv[order_u][0][i], 1e-10); + EXPECT_NEAR(calc_dvdv_1[i], exp_dvdv[order_u][1][i], 1e-10); + EXPECT_NEAR(calc_dvdv_2[i], exp_dvdv[order_u][2][i], 1e-10); + + EXPECT_NEAR(calc_dudv_0[i], exp_dudv[order_u][0][i], 1e-10); + EXPECT_NEAR(calc_dudv_1[i], exp_dudv[order_u][1][i], 1e-10); + EXPECT_NEAR(calc_dudv_2[i], exp_dudv[order_u][2][i], 1e-10); + } } +} + +//------------------------------------------------------------------------------ +TEST(primal_bezierpatch, rational_batch_derivatives) +{ + const int DIM = 3; + using CoordType = double; + using PointType = primal::Point; + using VectorType = primal::Vector; + using BezierPatchType = primal::BezierPatch; + + const int max_order_u = 3; + const int order_v = 4; + + // clang-format off + PointType controlPoints[(max_order_u + 1) * (order_v + 1)] = { + PointType {0, 0, 0}, PointType{0, 4, 0}, PointType{0, 8, -3}, PointType{0, 12, 1}, PointType{0, 16, 3}, + PointType {2, 0, 6}, PointType{2, 4, 5}, PointType{2, 8, 0}, PointType{4, 12, 2}, PointType{2, 16, 2}, + PointType {4, 0, 0}, PointType{4, 4, 5}, PointType{4, 8, 3}, PointType{2, 12, 3}, PointType{4, 16, 1}, + PointType {6, 0, 0}, PointType{6, 4, -3}, PointType{6, 8, 0}, PointType{6, 12, 2}, PointType{6, 16, 0}}; + + double weights[(max_order_u + 1) * (order_v + 1)] = { + 1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 2.0, 3.0, 2.0, 1.0, + 1.0, 2.0, 3.0, 2.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 1.0}; + // clang-format on + + PointType batch1_val, batch2_val, batch3_val; + VectorType batch1_du, batch1_dv; + VectorType batch2_du, batch2_dv, batch2_dudv; + VectorType batch3_du, batch3_dv, batch3_dudu, batch3_dvdv, batch3_dudv; - auto partial_uv_test = bPatch.dudv(u, v); - for(int i = 0; i < 3; ++i) + const double u = 0.4, v = 0.6; + + // For each test order, construct a Bezier patch using the first order_u + 1 + // rows of control points and weights + for(int order_u = 0; order_u <= max_order_u; ++order_u) { - EXPECT_NEAR(DuDv[i], DuDv[i], 1e-6); + BezierPatchType patch(controlPoints, weights, order_u, order_v); + + patch.evaluate_first_derivatives(u, v, batch1_val, batch1_du, batch1_dv); + patch.evaluate_linear_derivatives(u, + v, + batch2_val, + batch2_du, + batch2_dv, + batch2_dudv); + patch.evaluate_second_derivatives(u, + v, + batch3_val, + batch3_du, + batch3_dv, + batch3_dudu, + batch3_dvdv, + batch3_dudv); + + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(patch.evaluate(u, v)[i], batch1_val[i], 1e-13); + EXPECT_NEAR(patch.du(u, v)[i], batch1_du[i], 1e-13); + EXPECT_NEAR(patch.dv(u, v)[i], batch1_dv[i], 1e-13); + + EXPECT_NEAR(patch.evaluate(u, v)[i], batch2_val[i], 1e-13); + EXPECT_NEAR(patch.du(u, v)[i], batch2_du[i], 1e-13); + EXPECT_NEAR(patch.dv(u, v)[i], batch2_dv[i], 1e-13); + EXPECT_NEAR(patch.dudv(u, v)[i], batch2_dudv[i], 1e-13); + + EXPECT_NEAR(patch.evaluate(u, v)[i], batch3_val[i], 1e-13); + EXPECT_NEAR(patch.du(u, v)[i], batch2_du[i], 1e-13); + EXPECT_NEAR(patch.dv(u, v)[i], batch2_dv[i], 1e-13); + EXPECT_NEAR(patch.dudu(u, v)[i], batch3_dudu[i], 1e-13); + EXPECT_NEAR(patch.dvdv(u, v)[i], batch3_dvdv[i], 1e-13); + EXPECT_NEAR(patch.dudv(u, v)[i], batch3_dudv[i], 1e-13); + } + + // Swap the axes and check that the derivatives are correct + patch.swapAxes(); + + patch.evaluate_first_derivatives(u, v, batch1_val, batch1_du, batch1_dv); + patch.evaluate_linear_derivatives(u, + v, + batch2_val, + batch2_du, + batch2_dv, + batch2_dudv); + patch.evaluate_second_derivatives(u, + v, + batch3_val, + batch3_du, + batch3_dv, + batch3_dudu, + batch3_dvdv, + batch3_dudv); + + for(int i = 0; i < DIM; ++i) + { + EXPECT_NEAR(patch.evaluate(u, v)[i], batch1_val[i], 1e-13); + EXPECT_NEAR(patch.du(u, v)[i], batch1_du[i], 1e-13); + EXPECT_NEAR(patch.dv(u, v)[i], batch1_dv[i], 1e-13); + + EXPECT_NEAR(patch.evaluate(u, v)[i], batch2_val[i], 1e-13); + EXPECT_NEAR(patch.du(u, v)[i], batch2_du[i], 1e-13); + EXPECT_NEAR(patch.dv(u, v)[i], batch2_dv[i], 1e-13); + EXPECT_NEAR(patch.dudv(u, v)[i], batch2_dudv[i], 1e-13); + + EXPECT_NEAR(patch.evaluate(u, v)[i], batch3_val[i], 1e-13); + EXPECT_NEAR(patch.du(u, v)[i], batch3_du[i], 1e-13); + EXPECT_NEAR(patch.dv(u, v)[i], batch3_dv[i], 1e-13); + EXPECT_NEAR(patch.dudu(u, v)[i], batch3_dudu[i], 1e-13); + EXPECT_NEAR(patch.dvdv(u, v)[i], batch3_dvdv[i], 1e-13); + EXPECT_NEAR(patch.dudv(u, v)[i], batch3_dudv[i], 1e-13); + } } } From a8fc8a8118cfe67be2d7b987657eb8436137b36d Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Sun, 20 Aug 2023 19:51:29 -0600 Subject: [PATCH 064/639] Tidy formatting --- src/axom/primal/tests/primal_bezier_curve.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/primal/tests/primal_bezier_curve.cpp b/src/axom/primal/tests/primal_bezier_curve.cpp index 8a3b0e8240..d6a3a707b0 100644 --- a/src/axom/primal/tests/primal_bezier_curve.cpp +++ b/src/axom/primal/tests/primal_bezier_curve.cpp @@ -230,8 +230,8 @@ TEST(primal_beziercurve_, second_derivative) for(int i = 0; i < DIM; ++i) { EXPECT_NEAR(calc_start[i], exp_vals[ord][0][i], 1e-14); - EXPECT_NEAR(calc_mid[i], exp_vals[ord][1][i], 1e-14); - EXPECT_NEAR(calc_end[i], exp_vals[ord][2][i], 1e-14); + EXPECT_NEAR(calc_mid[i], exp_vals[ord][1][i], 1e-14); + EXPECT_NEAR(calc_end[i], exp_vals[ord][2][i], 1e-14); } } } From e0c47e1354275d54f1b3fc4187ac96d5bb3cdf31 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Sun, 20 Aug 2023 20:02:43 -0600 Subject: [PATCH 065/639] Add test for new edge case --- src/axom/primal/tests/primal_polygon.cpp | 34 +++++++++++++++++------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/axom/primal/tests/primal_polygon.cpp b/src/axom/primal/tests/primal_polygon.cpp index bf448225b7..8ffe31002d 100644 --- a/src/axom/primal/tests/primal_polygon.cpp +++ b/src/axom/primal/tests/primal_polygon.cpp @@ -244,43 +244,57 @@ TEST(primal_polygon, convexity) poly.addVertex(PointType {0, 1}); EXPECT_TRUE(is_convex(poly)); - // Duplicate points should not affect convexity - vertices = axom::Array( + axom::Array convex_verts = axom::Array( {PointType {0, 0}, PointType {0, 1}, PointType {1, 1}, PointType {1, 0}}); + axom::Array concave_verts = axom::Array( + {PointType {0, 0}, PointType {0, 1}, PointType {0.1, 0.1}, PointType {1, 0}}); + axom::Array nonsimple_verts = axom::Array( + {PointType {0, 0}, PointType {1, 1}, PointType {0, 1}, PointType {1, 0}}); + poly.clear(); + + // Duplicate points and straight edges should not affect convexity for(int i = 0; i < 4; i++) { for(int j = 0; j < 3; j++) // Duplicate each element 3 times { - poly.addVertex(vertices[i]); + poly.addVertex(convex_verts[i]); } + + // Add midpoints between each duplicated vertex + poly.addVertex( + PointType::midpoint(convex_verts[i], convex_verts[(i + 1) % 4])); } EXPECT_TRUE(is_convex(poly)); // Verify checks up to rotation of vertices - vertices = axom::Array( - {PointType {0, 0}, PointType {1, 1}, PointType {1, 0}, PointType {0, 1}}); - for(int i = 0; i < 4; i++) { poly.clear(); for(int j = 0; j < 4; j++) { - poly.addVertex(vertices[(j + i) % 4]); + poly.addVertex(concave_verts[(j + i) % 4]); } EXPECT_FALSE(is_convex(poly)); } - vertices = axom::Array( - {PointType {0, 0}, PointType {0, 1}, PointType {1, 1}, PointType {1, 0}}); + for(int i = 0; i < 4; i++) + { + poly.clear(); + for(int j = 0; j < 4; j++) + { + poly.addVertex(nonsimple_verts[(j + i) % 4]); + } + EXPECT_FALSE(is_convex(poly)); + } for(int i = 0; i < 4; i++) { poly.clear(); for(int j = 0; j < 4; j++) { - poly.addVertex(vertices[(j + i) % 4]); + poly.addVertex(convex_verts[(j + i) % 4]); } EXPECT_TRUE(is_convex(poly)); } From 24af0c5da29ad4ce1be6ccbf8186938966e7bf4b Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 21 Aug 2023 13:52:08 -0700 Subject: [PATCH 066/639] Use Blueprint-specified coordset name, instead of assuming one. The Blueprint topology group specifies the coordset name, which may not match our assumed coordset name. --- RELEASE-NOTES.md | 8 +++ src/axom/quest/DistributedClosestPoint.hpp | 64 +++++++++++++------ src/axom/quest/MarchingCubes.cpp | 36 ++++++----- src/axom/quest/MarchingCubes.hpp | 16 ++--- ...est_distributed_distance_query_example.cpp | 13 ++-- .../examples/quest_marching_cubes_example.cpp | 4 +- 6 files changed, 90 insertions(+), 51 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 43b62cd8b5..cf36a9eefa 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -19,6 +19,14 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ ## [Unreleased] - Release date yyyy-mm-dd +### Changed +- `MarchingCubes` and `DistributedClosestPoint` classes changed from requiring the Blueprint + coordset name to requiring the Blueprint topology name. The changed interface methods are: + - `DistributedClosestPoint::setObjectMesh` + - `DistributedClosestPoint::computeClosestPoints` + - `MarchingCubes::MarchingCubes` + - `MarchingCubesSingleDomain::MarchingCubesSingleDomain` + ## [Version 0.8.1] - Release date 2023-08-16 ### Changed diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index 1967801cba..49be21ff1b 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -193,8 +193,8 @@ namespace mpi * \param [in] tag tag for MPI message * \param [in] comm MPI communicator to use * \param [in] request object holding state for the sent data - * \note Adapted from conduit's relay::mpi's \a send_using_schema and \a isend to use - * non-blocking \a MPI_Isend instead of blocking \a MPI_Send + * \note Adapted from conduit's relay::mpi's \a send_using_schema and \a isend + * to use non-blocking \a MPI_Isend instead of blocking \a MPI_Send */ inline int isend_using_schema(conduit::Node& node, int dest, @@ -424,11 +424,11 @@ class DistributedClosestPointImpl * Import object mesh points from the object blueprint mesh into internal memory. * * \param [in] mdMeshNode The blueprint mesh containing the object points. - * \param [in] valuesPath The path to the mesh points. + * \param [in] topologyName Name of the blueprint topology in \a mdMeshNode. * \note This function currently supports mesh blueprints with the "point" topology */ void importObjectPoints(const conduit::Node& mdMeshNode, - const std::string& valuesPath) + const std::string& topologyName) { // TODO: See if some of the copies in this method can be optimized out. @@ -438,6 +438,13 @@ class DistributedClosestPointImpl int ptCount = 0; for(const conduit::Node& domain : mdMeshNode.children()) { + const std::string coordsetName = + domain + .fetch_existing( + axom::fmt::format("topologies/{}/coordset", topologyName)) + .as_string(); + const std::string valuesPath = + axom::fmt::format("coordsets/{}/values", coordsetName); auto& values = domain.fetch_existing(valuesPath); const int N = internal::extractSize(values); ptCount += N; @@ -451,6 +458,13 @@ class DistributedClosestPointImpl for(conduit::index_t d = 0; d < mdMeshNode.number_of_children(); ++d) { const conduit::Node& domain = mdMeshNode.child(d); + const std::string coordsetName = + domain + .fetch_existing( + axom::fmt::format("topologies/{}/coordset", topologyName)) + .as_string(); + const std::string valuesPath = + axom::fmt::format("coordsets/{}/values", coordsetName); auto& values = domain.fetch_existing(valuesPath); @@ -663,7 +677,7 @@ class DistributedClosestPointImpl */ void node_copy_query_to_xfer(conduit::Node& queryNode, conduit::Node& xferNode, - const std::string& coordset) const + const std::string& topologyName) const { xferNode["homeRank"] = m_rank; xferNode["is_first"] = 1; @@ -671,11 +685,16 @@ class DistributedClosestPointImpl conduit::Node& xferDoms = xferNode["xferDoms"]; for(auto& queryDom : queryNode.children()) { + const std::string coordsetName = + queryDom + .fetch_existing( + axom::fmt::format("topologies/{}/coordset", topologyName)) + .as_string(); const std::string& domName = queryDom.name(); conduit::Node& xferDom = xferDoms[domName]; conduit::Node& fields = queryDom.fetch_existing("fields"); conduit::Node& queryCoords = - queryDom.fetch_existing(fmt::format("coordsets/{}", coordset)); + queryDom.fetch_existing(fmt::format("coordsets/{}", coordsetName)); conduit::Node& queryCoordsValues = queryCoords.fetch_existing("values"); // clang-format off @@ -819,10 +838,10 @@ class DistributedClosestPointImpl * * \param queryMesh The root node of a mesh blueprint for the query points * Can be empty if there are no query points for the calling rank - * \param coordset The coordinate set for the query points + * \param topologyName The topology name identifying the query points * - * When the query mesh contains query points, it uses the \a coordset coordinate set - * of the provided blueprint mesh and contains the following fields: + * The named topology is used to identify the points in the query mesh. + * On completion, the query mesh contains the following fields: * - cp_rank: Will hold the rank of the object point containing the closest point * - cp_domain_index: will hold the index of the object domain containing * the closest points. @@ -844,7 +863,7 @@ class DistributedClosestPointImpl * using check_send_requests(). */ void computeClosestPoints(conduit::Node& queryMesh_, - const std::string& coordset) const + const std::string& topologyName) const { SLIC_ASSERT_MSG( isBVHTreeInitialized(), @@ -868,7 +887,7 @@ class DistributedClosestPointImpl { xferNodes[m_rank] = std::make_shared(); conduit::Node& xferNode = *xferNodes[m_rank]; - node_copy_query_to_xfer(queryMesh, xferNode, coordset); + node_copy_query_to_xfer(queryMesh, xferNode, topologyName); xferNode["homeRank"] = m_rank; } @@ -1598,12 +1617,13 @@ class DistributedClosestPoint * \brief Sets the object mesh for the query * * \param [in] meshNode Conduit node for the object mesh - * \param [in] coordset The name of the coordset for the object mesh's coordinates + * \param [in] topologyName The name of the topology for the object mesh * * \pre \a meshNode must follow the mesh blueprint convention. * \pre Dimension of the mesh must be 2D or 3D */ - void setObjectMesh(const conduit::Node& meshNode, const std::string& coordset) + void setObjectMesh(const conduit::Node& meshNode, + const std::string& topologyName) { SLIC_ASSERT(this->isValidBlueprint(meshNode)); @@ -1620,7 +1640,6 @@ class DistributedClosestPoint const conduit::Node& mdMeshNode(isMultidomain ? meshNode : *tmpNode); auto domainCount = conduit::blueprint::mesh::number_of_domains(mdMeshNode); - const std::string valuesPath = fmt::format("coordsets/{}/values", coordset); // Extract the dimension from the coordinate values group // use allreduce since some ranks might be empty @@ -1628,10 +1647,15 @@ class DistributedClosestPoint int localDim = -1; if(domainCount > 0) { - const conduit::Node& domain0(mdMeshNode[0]); - SLIC_ASSERT(domain0.has_path(valuesPath)); - auto& values = domain0.fetch_existing(valuesPath); - localDim = internal::extractDimension(values); + const conduit::Node& domain0 = mdMeshNode.child(0); + const conduit::Node& topology = + domain0.fetch_existing("topologies/" + topologyName); + const std::string coordsetName = + topology.fetch_existing("coordset").as_string(); + const conduit::Node& coordset = + domain0.fetch_existing("coordsets/" + coordsetName); + const conduit::Node& coordsetValues = coordset.fetch_existing("values"); + localDim = internal::extractDimension(coordsetValues); } int dim = -1; MPI_Allreduce(&localDim, &dim, 1, MPI_INT, MPI_MAX, m_mpiComm); @@ -1643,10 +1667,10 @@ class DistributedClosestPoint switch(m_dimension) { case 2: - m_dcp_2->importObjectPoints(mdMeshNode, valuesPath); + m_dcp_2->importObjectPoints(mdMeshNode, topologyName); break; case 3: - m_dcp_3->importObjectPoints(mdMeshNode, valuesPath); + m_dcp_3->importObjectPoints(mdMeshNode, topologyName); break; } diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index d7f4e1d298..c4bc6b51c9 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -15,11 +15,11 @@ namespace quest { MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, const conduit::Node& bpMesh, - const std::string& coordsetName, + const std::string& topologyName, const std::string& maskField) : m_runtimePolicy(runtimePolicy) , m_singles() - , m_coordsetPath("coordsets/" + coordsetName) + , m_topologyName(topologyName) , m_fcnPath() , m_maskPath(maskField.empty() ? std::string() : "fields/" + maskField) { @@ -31,8 +31,10 @@ MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, m_singles.reserve(conduit::blueprint::mesh::number_of_domains(bpMesh)); for(auto& dom : bpMesh.children()) { - m_singles.emplace_back( - new MarchingCubesSingleDomain(m_runtimePolicy, dom, coordsetName, maskField)); + m_singles.emplace_back(new MarchingCubesSingleDomain(m_runtimePolicy, + dom, + m_topologyName, + maskField)); } } @@ -131,12 +133,12 @@ void MarchingCubes::populateContourMesh( MarchingCubesSingleDomain::MarchingCubesSingleDomain(RuntimePolicy runtimePolicy, const conduit::Node& dom, - const std::string& coordsetName, + const std::string& topologyName, const std::string& maskField) : m_runtimePolicy(runtimePolicy) , m_dom(nullptr) , m_ndim(0) - , m_coordsetPath("coordsets/" + coordsetName) + , m_topologyName(topologyName) , m_fcnPath() , m_maskPath(maskField.empty() ? std::string() : "fields/" + maskField) { @@ -153,9 +155,13 @@ void MarchingCubesSingleDomain::setDomain(const conduit::Node& dom) SLIC_ASSERT_MSG( !conduit::blueprint::mesh::is_multi_domain(dom), "MarchingCubesSingleDomain is single-domain only. Try MarchingCubes."); + SLIC_ASSERT( + dom.fetch_existing("topologies/" + m_topologyName + "/type").as_string() == + "structured"); - SLIC_ASSERT(dom.has_path(m_coordsetPath)); - SLIC_ASSERT(dom["topologies/mesh/type"].as_string() == "structured"); + const std::string coordsetPath = "coordsets/" + + dom.fetch_existing("topologies/" + m_topologyName + "/coordset").as_string(); + SLIC_ASSERT(dom.has_path(coordsetPath)); if(!m_maskPath.empty()) { @@ -164,14 +170,12 @@ void MarchingCubesSingleDomain::setDomain(const conduit::Node& dom) m_dom = &dom; - const conduit::Node& dimsNode = - m_dom->fetch_existing("topologies/mesh/elements/dims"); - - m_ndim = dimsNode.number_of_children(); - + m_ndim = conduit::blueprint::mesh::coordset::dims( + dom.fetch_existing("coordsets/coords")); SLIC_ASSERT(m_ndim >= 2 && m_ndim <= 3); - const conduit::Node& coordsValues = dom[m_coordsetPath + "/values"]; + const conduit::Node& coordsValues = + dom.fetch_existing(coordsetPath + "/values"); bool isInterleaved = conduit::blueprint::mcarray::is_interleaved(coordsValues); SLIC_ASSERT_MSG( !isInterleaved, @@ -193,7 +197,9 @@ void MarchingCubesSingleDomain::computeIsocontour(double contourVal) "You must call setFunctionField before computeIsocontour."); allocateImpl(); - m_impl->initialize(*m_dom, m_coordsetPath, m_fcnPath, m_maskPath); + const std::string coordsetPath = "coordsets/" + + m_dom->fetch_existing("topologies/" + m_topologyName + "/coordset").as_string(); + m_impl->initialize(*m_dom, coordsetPath, m_fcnPath, m_maskPath); m_impl->setContourValue(contourVal); m_impl->markCrossings(); m_impl->scanCrossings(); diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 2e0bb275d1..ead301f191 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -119,7 +119,7 @@ class MarchingCubes * The simplest policy is RuntimePolicy::seq, which specifies * running sequentially on the CPU. * \param [in] bpMesh Blueprint multi-domain mesh containing scalar field. - * \param [in] coordsetName Name of blueprint point coordinate set. + * \param [in] topologyName Name of Blueprint topology to use in \a bpMesh. * \param [in] maskField Cell-based std::int32_t mask field. If provided, * cells where this field evaluates to false are skipped. * @@ -137,7 +137,7 @@ class MarchingCubes */ MarchingCubes(RuntimePolicy runtimePolicy, const conduit::Node &bpMesh, - const std::string &coordsetName, + const std::string &topologyName, const std::string &maskField = {}); /*! @@ -178,7 +178,7 @@ class MarchingCubes //! @brief Single-domain implementations. axom::Array> m_singles; - const std::string m_coordsetPath; + const std::string m_topologyName; std::string m_fcnPath; std::string m_maskPath; @@ -206,7 +206,7 @@ class MarchingCubesSingleDomain * The simplest policy is RuntimePolicy::seq, which specifies * running sequentially on the CPU. * \param [in] dom Blueprint single-domain mesh containing scalar field. - * \param [in] coordsetName Name of blueprint point coordinate set. + * \param [in] topologyName Name of Blueprint topology to use in \a dom * \param [in] maskField Cell-based std::int32_t mask field. If provided, * cells where this field evaluates to false are skipped. * @@ -225,7 +225,7 @@ class MarchingCubesSingleDomain */ MarchingCubesSingleDomain(RuntimePolicy runtimePolicy, const conduit::Node &dom, - const std::string &coordsetName, + const std::string &topologyName, const std::string &maskfield); /*! @@ -319,8 +319,8 @@ class MarchingCubesSingleDomain const conduit::Node *m_dom; int m_ndim; - //!@brief Path to coordinate set in m_dom. - const std::string m_coordsetPath; + //!@brief Name of Blueprint topology in m_dom. + const std::string m_topologyName; //!@brief Path to nodal scalar function in m_dom. std::string m_fcnPath; @@ -339,7 +339,7 @@ class MarchingCubesSingleDomain { //!@brief Prepare internal data for operating on the given domain. virtual void initialize(const conduit::Node &dom, - const std::string &coordsetPath, + const std::string &topologyName, const std::string &fcnPath, const std::string &maskPath) = 0; //!@brief Set the contour value diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index 35f09e762e..d676435ddc 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -256,7 +256,7 @@ struct BlueprintParticleMesh return m_fieldsGroups[groupIdx]; } - const std::string& get_topology_name() const { return m_topologyName; } + const std::string& getTopologyName() const { return m_topologyName; } const std::string& getCoordsetName() const { return m_coordsetName; } /// Gets the MPI rank for this mesh @@ -305,7 +305,7 @@ struct BlueprintParticleMesh int dimension() const { return m_dimension; } /*! - @brief Read a blueprint mesh. + @brief Read a blueprint mesh and store it internally in m_group. */ void read_blueprint_mesh(const std::string& meshFilename) { @@ -589,7 +589,6 @@ struct BlueprintParticleMesh slic::flushStreams(); return false; } - // info.print(); } return true; } @@ -682,6 +681,7 @@ class ObjectMeshWrapper /// Get a pointer to the root group for this mesh sidre::Group* getBlueprintGroup() const { return m_objectMesh.root_group(); } + std::string getTopologyName() const { return m_objectMesh.getTopologyName(); } std::string getCoordsetName() const { return m_objectMesh.getCoordsetName(); } void setVerbosity(bool verbose) { m_verbose = verbose; } @@ -856,6 +856,7 @@ class QueryMeshWrapper sidre::Group* getBlueprintGroup() const { return m_queryMesh.root_group(); } + std::string getTopologyName() const { return m_queryMesh.getTopologyName(); } std::string getCoordsetName() const { return m_queryMesh.getCoordsetName(); } /// Returns an array containing the positions of the mesh vertices @@ -989,7 +990,7 @@ class QueryMeshWrapper assert(m_queryMesh.topo_group(di) == m_queryMesh.domain_group(di) ->getGroup("topologies") - ->getGroup(m_queryMesh.get_topology_name())); + ->getGroup(m_queryMesh.getTopologyName())); assert(m_queryMesh.fields_group(di) == m_queryMesh.domain_group(di)->getGroup("fields")); } @@ -1423,7 +1424,7 @@ int main(int argc, char** argv) // To test support for single-domain format, use single-domain when possible. query.setObjectMesh( objectMeshNode.number_of_children() == 1 ? objectMeshNode[0] : objectMeshNode, - objectMeshWrapper.getCoordsetName()); + objectMeshWrapper.getTopologyName()); // Build the spatial index over the object on each rank SLIC_INFO(init_str); @@ -1438,7 +1439,7 @@ int main(int argc, char** argv) queryTimer.start(); query.computeClosestPoints( queryMeshNode.number_of_children() == 1 ? queryMeshNode[0] : queryMeshNode, - queryMeshWrapper.getCoordsetName()); + queryMeshWrapper.getTopologyName()); queryTimer.stop(); auto getDoubleMinMax = diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index f1a1556537..191f9439d1 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -653,7 +653,7 @@ struct BlueprintStructuredMesh #else conduit::relay::io::blueprint::load_mesh(meshFilename, _mdMesh); #endif - assert(conduit::blueprint::mesh::is_multi_domain(_mdMesh)); + SLIC_ASSERT(conduit::blueprint::mesh::is_multi_domain(_mdMesh)); _domCount = conduit::blueprint::mesh::number_of_domains(_mdMesh); if(_domCount > 0) @@ -1479,7 +1479,7 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) // Create marching cubes algorithm object and set some parameters quest::MarchingCubes mc(params.policy, computationalMesh.asConduitNode(), - "coords"); + "mesh"); //--------------------------------------------------------------------------- // params specify which tests to run. From d7b6d08dea8646f66a902fcc41b1eb374ce2e208 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 23 Aug 2023 11:00:38 -0700 Subject: [PATCH 067/639] limit artifact lifetime --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcdb6f2e89..f821b1adf0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,6 +36,7 @@ stages: - ${ALLOC_COMMAND} ${ASSIGN_ID} python3 scripts/llnl_scripts/build_src.py -v --host-config ${HOST_CONFIG} --extra-cmake-options '-DENABLE_DOCS=OFF ${EXTRA_CMAKE_OPTIONS}' --build-type ${BUILD_TYPE:-Debug} ${EXTRA_OPTIONS} - echo -e "\e[0Ksection_end:$(date +%s):src_build_and_test\r\e[0K" artifacts: + expire_in: 2 weeks paths: - _axom_build_and_test_*/output.log*.txt - _axom_build_and_test_*/build-*/output.log*.txt @@ -48,6 +49,7 @@ stages: - ${ALLOC_COMMAND} python3 scripts/llnl_scripts/build_tpls.py -v --spec="${SPEC} ${EXTRA_SPEC}" --directory=${FULL_BUILD_ROOT} - echo -e "\e[0Ksection_end:$(date +%s):full_build_and_test\r\e[0K" artifacts: + expire_in: 2 weeks paths: - ${FULL_BUILD_ROOT}/${SYS_TYPE}/*/_axom_build_and_test_*/output.log*.txt - ${FULL_BUILD_ROOT}/${SYS_TYPE}/*/_axom_build_and_test_*/build-*/output.log*.txt From 7faf2e98fd9de3c192e2ca03656c6884ab31e982 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 25 Aug 2023 10:58:57 -0700 Subject: [PATCH 068/639] MarchingCubes with ghost data is working. Code is a bit dirty. --- src/axom/quest/CMakeLists.txt | 1 + src/axom/quest/MarchingCubes.cpp | 14 +- src/axom/quest/MarchingCubes.hpp | 4 + src/axom/quest/MeshViewUtil.hpp | 389 ++++++++++++------ src/axom/quest/detail/MarchingCubesImpl.hpp | 268 +++++++----- .../examples/quest_marching_cubes_example.cpp | 169 +++++--- 6 files changed, 567 insertions(+), 278 deletions(-) diff --git a/src/axom/quest/CMakeLists.txt b/src/axom/quest/CMakeLists.txt index aecc6e21cb..9da01c49f6 100644 --- a/src/axom/quest/CMakeLists.txt +++ b/src/axom/quest/CMakeLists.txt @@ -58,6 +58,7 @@ set( quest_headers interface/signed_distance.hpp util/mesh_helpers.hpp + MeshViewUtil.hpp ) set( quest_sources diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index c4bc6b51c9..887c54a7c5 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -20,7 +20,9 @@ MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, : m_runtimePolicy(runtimePolicy) , m_singles() , m_topologyName(topologyName) + , m_fcnFieldName() , m_fcnPath() + , m_maskFieldName(maskField) , m_maskPath(maskField.empty() ? std::string() : "fields/" + maskField) { const bool isMultidomain = conduit::blueprint::mesh::is_multi_domain(bpMesh); @@ -40,6 +42,7 @@ MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, void MarchingCubes::setFunctionField(const std::string& fcnField) { + m_fcnFieldName = fcnField; m_fcnPath = "fields/" + fcnField; for(auto& s : m_singles) { @@ -49,7 +52,7 @@ void MarchingCubes::setFunctionField(const std::string& fcnField) void MarchingCubes::computeIsocontour(double contourVal) { - SLIC_ASSERT_MSG(!m_fcnPath.empty(), + SLIC_ASSERT_MSG(!m_fcnFieldName.empty(), "You must call setFunctionField before computeIsocontour."); for(int dId = 0; dId < m_singles.size(); ++dId) @@ -139,7 +142,9 @@ MarchingCubesSingleDomain::MarchingCubesSingleDomain(RuntimePolicy runtimePolicy , m_dom(nullptr) , m_ndim(0) , m_topologyName(topologyName) + , m_fcnFieldName() , m_fcnPath() + , m_maskFieldName(maskField) , m_maskPath(maskField.empty() ? std::string() : "fields/" + maskField) { SLIC_ASSERT_MSG( @@ -184,6 +189,7 @@ void MarchingCubesSingleDomain::setDomain(const conduit::Node& dom) void MarchingCubesSingleDomain::setFunctionField(const std::string& fcnField) { + m_fcnFieldName = fcnField; m_fcnPath = "fields/" + fcnField; SLIC_ASSERT(m_dom->has_path(m_fcnPath)); SLIC_ASSERT(m_dom->fetch_existing(m_fcnPath + "/association").as_string() == @@ -193,13 +199,11 @@ void MarchingCubesSingleDomain::setFunctionField(const std::string& fcnField) void MarchingCubesSingleDomain::computeIsocontour(double contourVal) { - SLIC_ASSERT_MSG(!m_fcnPath.empty(), + SLIC_ASSERT_MSG(!m_fcnFieldName.empty(), "You must call setFunctionField before computeIsocontour."); allocateImpl(); - const std::string coordsetPath = "coordsets/" + - m_dom->fetch_existing("topologies/" + m_topologyName + "/coordset").as_string(); - m_impl->initialize(*m_dom, coordsetPath, m_fcnPath, m_maskPath); + m_impl->initialize(*m_dom, m_topologyName, m_fcnFieldName, m_maskFieldName); m_impl->setContourValue(contourVal); m_impl->markCrossings(); m_impl->scanCrossings(); diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index ead301f191..1972053081 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -179,7 +179,9 @@ class MarchingCubes //! @brief Single-domain implementations. axom::Array> m_singles; const std::string m_topologyName; + std::string m_fcnFieldName; std::string m_fcnPath; + std::string m_maskFieldName; std::string m_maskPath; void setMesh(const conduit::Node &bpMesh); @@ -322,9 +324,11 @@ class MarchingCubesSingleDomain //!@brief Name of Blueprint topology in m_dom. const std::string m_topologyName; + std::string m_fcnFieldName; //!@brief Path to nodal scalar function in m_dom. std::string m_fcnPath; + const std::string m_maskFieldName; //!@brief Path to mask in m_dom. const std::string m_maskPath; diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 6a17e443c5..3af2412bea 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -8,10 +8,12 @@ #include "axom/config.hpp" #include "axom/core.hpp" +#include "axom/core/WhereMacro.hpp" #include "axom/fmt.hpp" #include "conduit_blueprint_mesh.hpp" +#include "conduit_blueprint_mcarray.hpp" #include #include @@ -23,22 +25,54 @@ namespace axom { namespace quest { +namespace internal +{ + template + constexpr T BADINDEX = std::numeric_limits::max(); + template + inline axom::StackArray makeStackArray(T v=std::numeric_limits::max()) + { + axom::StackArray rval; + for(int d=0; d + inline axom::StackArray makeStackArray(const T* v) + { + axom::StackArray rval; + for(int d=0; d +template class MeshViewUtil { public: + using CoordsViewsType = axom::StackArray, DIM>; + using ConstCoordsViewsType = axom::StackArray, DIM>; //@{ //@name Setting up @@ -82,6 +116,8 @@ class MeshViewUtil m_cdom = m_dom; m_ctopology = m_topology; m_ccoordset = m_coordset; + + computeCoordsDataLayout(); } /*! @@ -94,13 +130,13 @@ class MeshViewUtil , m_topologyName(topologyName) { const std::string topoPath = "topologies/" + m_topologyName; - SLIC_ASSERT(m_dom->has_path(topoPath)); + SLIC_ASSERT(m_cdom->has_path(topoPath)); m_ctopology = &m_cdom->fetch_existing(topoPath); SLIC_ASSERT(m_ctopology->fetch_existing("type").as_string() == "structured"); const std::string coordsetPath = - "coordsets/" + m_dom->fetch_existing(topoPath + "/coordset").as_string(); + "coordsets/" + m_cdom->fetch_existing(topoPath + "/coordset").as_string(); m_ccoordset = &m_cdom->fetch_existing(coordsetPath); SLIC_ASSERT( m_ccoordset->fetch_existing("type").as_string() == "explicit"); @@ -108,9 +144,11 @@ class MeshViewUtil int dim = conduit::blueprint::mesh::coordset::dims(*m_ccoordset); if(dim != DIM) { - SLIC_ERROR(axom::fmt::format("MeshViewUtil template parameter DIM={} doesn't match mesh topology dimension ({})", - DIM, dim)); + SLIC_ERROR(axom::fmt::format("MeshViewUtil mesh topology dimension ({}) doesn't match template parameter DIM={}", + dim, DIM)); } + + computeCoordsDataLayout(); } //@} @@ -208,6 +246,22 @@ class MeshViewUtil return rval; } + /*! + @brief Return the array strides for nodal coordinates. + */ + axom::StackArray getCoordsStrides() const + { + return m_coordsStrides; + } + + /*! + @brief Return the array index offsets for nodal coordinates. + */ + axom::StackArray getCoordsOffsets() const + { + return m_coordsOffsets; + } + /*! @brief Return number of points, including ghosts. */ @@ -269,61 +323,6 @@ class MeshViewUtil return rval; } - /*! - @brief Get the strides of the coordinates data array. - If strides are not specified, assume direction 0 is - fastest (Conduit's default striding). - */ - axom::StackArray getCoordsStrides() const - { - axom::StackArray rval; - auto stridesPtr = getCoordsStridesPtr(); - if(stridesPtr) - { - for(int d=0; dfetch_existing("elements/dims"); - const conduit::int32* rval = nullptr; - if(topologyDims.has_child("offsets")) - { - rval = topologyDims.fetch_existing("offsets").as_int32_ptr(); - } - return rval; - } - - axom::StackArray getCoordsOffsets() const - { - auto offsetsPtr = getCoordsOffsetsPtr(); - axom::StackArray rval; - for(int d=0; dfetch_existing("fields/" + fieldName); - const conduit::int32* rval = fieldNode.has_child("strides") ? - fieldNode.fetch_existing("strides").as_int32_ptr() : nullptr; - return rval; - } - /*! @brief Get the strides of a named field data. If strides are not specified, assume direction 0 is @@ -384,46 +371,52 @@ class MeshViewUtil //@{ //!@name Data views - /*! - @brief Return views to all the coordinates. - */ - axom::Array> getCoordsViews() + CoordsViewsType getCoordsViews(bool withGhosts = false) { conduit::Node& valuesNode = getCoordSet().fetch_existing("values"); - const axom::IndexType coordValuesCount = - valuesNode[0].dtype().number_of_elements(); - - axom::Array> rval(DIM); - - // Shape of allocated memory, including ghosts. - axom::StackArray memShape; + axom::StackArray, DIM> rval; + for(int d=0; d(dataValues, m_coordsMemShape, m_coordsStrides); + } - auto stridesPtr = getCoordsStridesPtr(); - if(stridesPtr) + if(withGhosts == false) { - axom::StackArray strides; + axom::StackArray offsets = conduitIndicesToMultidimIndices( + m_ctopology->fetch_existing("elements/dims"), "offsets", 0); + axom::StackArray counts = m_domainShape; + for(int d=0; d(dataValues, memShape, strides); - } - assert(strides == getCoordsStrides()); } - else + + return rval; + } + + ConstCoordsViewsType getConstCoordsViews(bool withGhosts = false) const + { + const conduit::Node& valuesNode = getCoordSet().fetch_existing("values"); + axom::StackArray, DIM> rval; + for(int d=0; d strides = getCoordsStrides(); + auto* dataValues = valuesNode[d].as_double_ptr(); + rval[d] = axom::ArrayView(dataValues, m_coordsMemShape, m_coordsStrides); + } + + if(withGhosts == false) + { + axom::StackArray offsets = conduitIndicesToMultidimIndices( + m_ctopology->fetch_existing("elements/dims"), "offsets", 0); + axom::StackArray counts = m_domainShape; + for(int d=0; d(dataValues, memShape, strides); + auto rval1 = rval[d]; + rval[d] = rval1.subspan(offsets, counts); } } @@ -433,41 +426,115 @@ class MeshViewUtil /*! @brief Return view to a scalar field variable. */ - axom::ArrayView getFieldView(const std::string& fieldName) + template + axom::ArrayView getFieldView(const std::string& fieldName, + bool withGhosts = false) { + if(!m_dom) + { + SLIC_ERROR("Cannot use getFieldView from MeshViewUtil initialized with a const conduit::Node. Use getConstFieldView."); + } +// std::cout<<__WHERE << " in getFieldView with " << fieldName << std::endl; +// m_dom->print(); conduit::Node& fieldNode = m_dom->fetch_existing("fields/" + fieldName); + const std::string association = fieldNode.fetch_existing("association").as_string(); conduit::Node& valuesNode = fieldNode.fetch_existing("values"); const axom::IndexType valuesCount = valuesNode.dtype().number_of_elements(); - axom::ArrayView rval; - - // Shape of allocated memory, including ghosts. - axom::StackArray memShape; - - auto stridesPtr = fieldNode.has_child("strides") ? - fieldNode.fetch_existing("strides").as_int32_ptr() : nullptr; - axom::StackArray strides = getFieldStrides(fieldName); - - double* dataValues = valuesNode.as_double_ptr();// TODO: Use template parameter T. + SLIC_ASSERT_MSG(association == "vertex" || association == "element", + "MeshViewUtil only supports vertex and element-based fields right now."); + const bool onVertex = association == "vertex"; - if(stridesPtr) + axom::StackArray strides = conduitIndicesToMultidimIndices(fieldNode, "strides"); + if(fieldNode.has_child("strides")) { + const conduit::int32* stridesPtr = fieldNode.fetch_existing("strides").as_int32_ptr(); + for(int d=0; d shape; + for(int d=0; d rval(dataValues, shape, strides); + + if(withGhosts == false) + { + axom::StackArray offsets = conduitIndicesToMultidimIndices(fieldNode, "offsets", 0); + axom::StackArray counts = m_domainShape; + for(int d=0; d + axom::ArrayView getConstFieldView(const std::string& fieldName, + bool withGhosts = false) + { +// std::cout<<__WHERE << " in getFieldView with " << fieldName << std::endl; +// m_cdom->print(); + const conduit::Node& fieldNode = m_cdom->fetch_existing("fields/" + fieldName); + const std::string association = fieldNode.fetch_existing("association").as_string(); + const conduit::Node& valuesNode = fieldNode.fetch_existing("values"); + const axom::IndexType valuesCount = valuesNode.dtype().number_of_elements(); + + SLIC_ASSERT_MSG(association == "vertex" || association == "element", + "MeshViewUtil only supports vertex and element-based fields right now."); + const bool onVertex = association == "vertex"; + + axom::StackArray strides = conduitIndicesToMultidimIndices(fieldNode, "strides"); + if(fieldNode.has_child("strides")) + { + const conduit::int32* stridesPtr = fieldNode.fetch_existing("strides").as_int32_ptr(); + for(int d=0; d(dataValues, memShape, strides); + + axom::StackArray shape; + for(int d=0; d rval(dataValues, shape, strides); + + if(withGhosts == false) + { + axom::StackArray offsets = conduitIndicesToMultidimIndices(fieldNode, "offsets", 0); + axom::StackArray counts = m_domainShape; + for(int d=0; d& strides, - const axom::StackArray& offsets) + void createField( const std::string& fieldName, + const std::string& association, + const conduit::DataType& dtype, + const axom::StackArray& strides, + const axom::StackArray& offsets) { if(m_dom->has_path("fields/" + fieldName)) { @@ -501,7 +569,7 @@ class MeshViewUtil auto realExtents = getRealExtents(association); - conduit::Node& fieldNode = m_dom->fetch_existing("fields")[fieldName]; + conduit::Node& fieldNode = m_dom->fetch("fields/" + fieldName); fieldNode["association"] = association; fieldNode["topology"] = m_topologyName; @@ -539,6 +607,8 @@ class MeshViewUtil } fieldNode["values"].set(dtype); +// std::cout<<__WHERE << " After crating field " << fieldName << std::endl; +// m_dom->print(); } //@} @@ -550,6 +620,67 @@ class MeshViewUtil const conduit::Node* m_ctopology = nullptr; const conduit::Node* m_ccoordset = nullptr; std::string m_topologyName; + + axom::StackArray m_domainShape; + axom::StackArray m_coordsStrides; + axom::StackArray m_coordsOffsets; + axom::StackArray m_coordsMemShape; + + axom::StackArray conduitIndicesToMultidimIndices( + const conduit::Node& node, const std::string& path, + axom::IndexType defaultVal=std::numeric_limits::max()) const + { + if(node.has_path(path)) + { + const conduit::int32* ptr = node.fetch_existing(path).as_int32_ptr(); + return internal::makeStackArray(ptr); + } + return internal::makeStackArray(defaultVal); + } + + void computeCoordsDataLayout() + { + const conduit::Node& topologyDims = m_ctopology->fetch_existing("elements/dims"); + + const std::string coordsetName = m_ctopology->fetch_existing("coordset").as_string(); + const conduit::Node& coordsValues = + m_cdom->fetch_existing(axom::fmt::format("coordsets/{}/values", coordsetName)); + + const axom::IndexType coordValuesCount = + coordsValues[0].dtype().number_of_elements(); + + const bool coordsAreInterleaved = + conduit::blueprint::mcarray::is_interleaved(coordsValues); + + for(int i = 0; i < DIM; ++i) + { + m_domainShape[i] = topologyDims[i].as_int(); + } + + m_coordsOffsets = conduitIndicesToMultidimIndices(topologyDims, "offsets", 0); + + if(topologyDims.has_child("strides")) + { + const conduit::int32* stridesPtr = topologyDims.fetch_existing("strides").as_int32_ptr(); + for(int d=0; d& a) return; } +template +class StructuredIndexer { + axom::StackArray m_strides; + axom::StackArray m_slowestDirs; +public: + //!@brief Constructor for row- or column major indexing. + StructuredIndexer(const axom::StackArray& lengths, bool rowMajor) + { + if(rowMajor) + { + for(int d=0; d=0; --d) + { + m_strides[d] = m_strides[d+1] * lengths[d+1]; + } + } + } + + //!@brief Constructor for arbitrary-stride indexing. + StructuredIndexer(const axom::StackArray& strides) + : m_strides(strides) + { + for(int d=0; d& slowestDirs() const + { + return m_slowestDirs; + } + + //!@brief Strides. + axom::StackArray& strides() const + { + return m_strides; + } + + //!@brief Convert multidimensional index to flat index. + T toFlatIndex(const axom::StackArray& multiIndex) const + { + T rval = numerics::dot_product(multiIndex.data(), m_strides.data()); + } + + //!@brief Convert flat index to multidimensional index. + axom::StackArray toMultiIndex(T flatIndex) const + { + axom::StackArray multiIndex; + for(int d = 0; d mvu(dom); - m_coordsViews = mvu.getCoordsViews(); -#else - { - const conduit::Node& coordValues = - dom.fetch_existing(coordsetPath + "/values"); - if(dimsNode.has_child("strides")) - { - const auto* stridesPtr = dimsNode.fetch_existing("strides").as_int32_ptr(); - StackArray strides; - for(IndexType d=0; d(coordsPtr, m_pShape, strides); - } - } - else - { - assert(false); // Temporarily not supported, since supporting ghosts. - const bool isInterleaved = - conduit::blueprint::mcarray::is_interleaved(coordValues); - const int coordSp = isInterleaved ? DIM : 1; - for(int d = 0; d < DIM; ++d) - { - const double* coordsPtr = coordValues[d].as_double_ptr(); - m_coordsViews[d] = - axom::ArrayView(coordsPtr, m_pShape, coordSp); - } - } - } -#endif + axom::quest::MeshViewUtil mvu(dom, topologyName); + m_coordsViews = mvu.getConstCoordsViews(false); - // Nodal function - { - auto& fcnValues = dom.fetch_existing(fcnPath + "/values"); - const double* fcnPtr = fcnValues.as_double_ptr(); - if(dom.fetch_existing(fcnPath).has_child("strides")) - { - const auto* stridesPtr = dom.fetch_existing(fcnPath + "/strides").as_int32_ptr(); - StackArray strides; - for(IndexType d=0; d(fcnPtr, m_pShape, strides); - } - else - { - m_fcnView = axom::ArrayView(fcnPtr, m_pShape); - } - } + m_fcnView = mvu.template getConstFieldView(fcnFieldName, false); + // TODO: set up m_maskView, but first fix getFieldView to support more than double data types. - // Mask - { - const int* maskPtr = nullptr; - if(!maskPath.empty()) - { - auto& maskValues = dom.fetch_existing(maskPath + "/values"); - maskPtr = maskValues.as_int_ptr(); - } - if(maskPtr) - { - m_maskView = - axom::ArrayView(maskPtr, m_cShape); - } - } - - m_caseIds = axom::Array(m_cShape); + /* + TODO: To get good cache performance, we should make m_caseIds + row-major if fcn is that way, and vice versa. However, Array + only support column-major, so we're stuck with that for now. + */ + m_caseIds = axom::Array(m_bShape); + m_caseIds.fill(0); } //!@brief Set a value to find the contour for. @@ -198,8 +215,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase template typename std::enable_if::type markCrossings_dim() { - m_caseIds.fill(0); - MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); #if defined(AXOM_USE_RAJA) @@ -227,8 +242,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase template typename std::enable_if::type markCrossings_dim() { - m_caseIds.fill(0); - MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); #if defined(AXOM_USE_RAJA) @@ -301,12 +314,19 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { // clang-format off double nodalValues[CELL_CORNER_COUNT] = +#if 1 + {fcnView(i , j ), + fcnView(i + 1, j ), + fcnView(i + 1, j + 1), + fcnView(i , j + 1)}; +#else {fcnView(j , i ), fcnView(j , i + 1), fcnView(j + 1, i + 1), fcnView(j + 1, i )}; +#endif // clang-format on - caseIdsView(j, i) = computeCrossingCase(nodalValues); + caseIdsView(i, j) = computeCrossingCase(nodalValues); } } @@ -320,6 +340,16 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { // clang-format off double nodalValues[CELL_CORNER_COUNT] = +#if 1 + {fcnView(i + 1, j , k ), + fcnView(i + 1, j + 1, k ), + fcnView(i , j + 1, k ), + fcnView(i , j , k ), + fcnView(i + 1, j , k + 1), + fcnView(i + 1, j + 1, k + 1), + fcnView(i , j + 1, k + 1), + fcnView(i , j , k + 1)}; +#else {fcnView(k , j , i + 1), fcnView(k , j + 1, i + 1), fcnView(k , j + 1, i ), @@ -328,8 +358,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase fcnView(k + 1, j + 1, i + 1), fcnView(k + 1, j + 1, i ), fcnView(k + 1, j , i )}; +#endif // clang-format on - caseIdsView(k, j, i) = computeCrossingCase(nodalValues); + caseIdsView(i, j, k) = computeCrossingCase(nodalValues); } } }; // MarkCrossings_Util @@ -469,6 +500,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { double contourVal; MIdx bStrides; + StructuredIndexer indexer; axom::ArrayView fcnView; axom::StackArray, DIM> coordsViews; ComputeContour_Util( @@ -479,6 +511,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase coordsViews_) : contourVal(contourVal_) , bStrides(bStrides_) + , indexer(bStrides_) , fcnView(fcnView_) , coordsViews(coordsViews_) { } @@ -492,11 +525,23 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const auto& x = coordsViews[0]; const auto& y = coordsViews[1]; - const auto c = multidim_cell_index(cellNum); + // const auto c = multidim_cell_index(cellNum); + const auto c = indexer.toMultiIndex(cellNum); const auto& i = c[0]; const auto& j = c[1]; // clang-format off +#if 1 + cornerCoords[0] = { x(i , j ), y(i , j ) }; + cornerCoords[1] = { x(i + 1, j ), y(i + 1, j ) }; + cornerCoords[2] = { x(i + 1, j + 1), y(i + 1, j + 1) }; + cornerCoords[3] = { x(i , j + 1), y(i , j + 1) }; + + cornerValues[0] = fcnView(i , j ); + cornerValues[1] = fcnView(i + 1, j ); + cornerValues[2] = fcnView(i + 1, j + 1); + cornerValues[3] = fcnView(i , j + 1); +#else cornerCoords[0] = { x(j , i ), y(j , i ) }; cornerCoords[1] = { x(j , i + 1), y(j , i + 1) }; cornerCoords[2] = { x(j + 1, i + 1), y(j + 1, i + 1) }; @@ -506,6 +551,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase cornerValues[1] = fcnView(j , i + 1); cornerValues[2] = fcnView(j + 1, i + 1); cornerValues[3] = fcnView(j + 1, i ); +#endif // clang-format on } template @@ -518,12 +564,32 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const auto& y = coordsViews[1]; const auto& z = coordsViews[2]; - const auto c = multidim_cell_index(cellNum); + // const auto c = multidim_cell_index(cellNum); + const auto c = indexer.toMultiIndex(cellNum); const auto& i = c[0]; const auto& j = c[1]; const auto& k = c[2]; // clang-format off +#if 1 + cornerCoords[0] = { x(i+1, j , k ), y(i+1, j , k ), z(i+1, j , k ) }; + cornerCoords[1] = { x(i+1, j+1, k ), y(i+1, j+1, k ), z(i+1, j+1, k ) }; + cornerCoords[2] = { x(i , j+1, k ), y(i , j+1, k ), z(i , j+1, k ) }; + cornerCoords[3] = { x(i , j , k ), y(i , j , k ), z(i , j , k ) }; + cornerCoords[4] = { x(i+1, j , k+1), y(i+1, j , k+1), z(i+1, j , k+1) }; + cornerCoords[5] = { x(i+1, j+1, k+1), y(i+1, j+1, k+1), z(i+1, j+1, k+1) }; + cornerCoords[6] = { x(i , j+1, k+1), y(i , j+1, k+1), z(i , j+1, k+1) }; + cornerCoords[7] = { x(i , j , k+1), y(i , j , k+1), z(i , j , k+1) }; + + cornerValues[0] = fcnView(i+1, j , k ); + cornerValues[1] = fcnView(i+1, j+1, k ); + cornerValues[2] = fcnView(i , j+1, k ); + cornerValues[3] = fcnView(i , j , k ); + cornerValues[4] = fcnView(i+1, j , k+1); + cornerValues[5] = fcnView(i+1, j+1, k+1); + cornerValues[6] = fcnView(i , j+1, k+1); + cornerValues[7] = fcnView(i , j , k+1); +#else cornerCoords[0] = { x(k , j , i+1), y(k , j , i+1), z(k , j , i+1) }; cornerCoords[1] = { x(k , j+1, i+1), y(k , j+1, i+1), z(k , j+1, i+1) }; cornerCoords[2] = { x(k , j+1, i ), y(k , j+1, i ), z(k , j+1, i ) }; @@ -541,6 +607,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase cornerValues[5] = fcnView(k+1, j+1, i+1); cornerValues[6] = fcnView(k+1, j+1, i ); cornerValues[7] = fcnView(k+1, j , i ); +#endif // clang-format on } @@ -674,7 +741,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase auto cellCornersView = m_contourCellCorners.view(); auto cellParentsView = m_contourCellParents.view(); - ComputeContour_Util ccu(m_contourVal, m_bStrides, m_fcnView, m_coordsViews); + ComputeContour_Util ccu(m_contourVal, m_caseIds.strides(), m_fcnView, m_coordsViews); auto loopBody = AXOM_LAMBDA(axom::IndexType iCrossing) { @@ -784,9 +851,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase /*! @brief Output contour mesh to a mint::UnstructuredMesh object. - - mint uses host memory. If internal memory isn't on the host, - make a temporary copy of it on the host. */ void populateContourMesh( axom::mint::UnstructuredMesh& mesh, @@ -794,6 +858,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { auto internalAllocatorID = axom::execution_space::allocatorID(); auto hostAllocatorID = axom::execution_space::allocatorID(); + + /* + mint uses host memory. If internal memory is on the host, use + it. Otherwise, make a temporary copy of it on the host. + */ if(internalAllocatorID == hostAllocatorID) { populateContourMesh(mesh, @@ -827,9 +896,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase void populateContourMesh( axom::mint::UnstructuredMesh& mesh, const std::string& cellIdField, - axom::Array contourNodeCoords, - axom::Array contourCellCorners, - axom::Array contourCellParents) const + const axom::Array contourNodeCoords, + const axom::Array contourCellCorners, + const axom::Array contourCellParents) const { if(!cellIdField.empty() && !mesh.hasField(cellIdField, axom::mint::CELL_CENTERED)) @@ -857,19 +926,21 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase mesh.appendCell(cornerIds); } axom::IndexType numComponents = -1; - axom::IndexType* dstPtr = + axom::IndexType* cellIdPtr = mesh.getFieldPtr(cellIdField, axom::mint::CELL_CENTERED, numComponents); SLIC_ASSERT(numComponents == DIM); // Bump corner indices by priorCellCount to avoid indices // used by other parents domains. - axom::ArrayView> dstView( - (axom::StackArray*)dstPtr, + axom::ArrayView> cellIdView( + (axom::StackArray*)cellIdPtr, priorCellCount + addedCellCount); + StructuredIndexer si(m_caseIds.shape(), false); for(axom::IndexType i = 0; i < addedCellCount; ++i) { - dstView[priorCellCount + i] = multidim_cell_index(contourCellParents[i]); + cellIdView[priorCellCount + i] = si.toMultiIndex(contourCellParents[i]); + // cellIdView[priorCellCount + i] = multidim_cell_index(contourCellParents[i]); } } } @@ -921,7 +992,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase , caseNum(caseNum_) , firstSurfaceCellId(std::numeric_limits::max()) { } - axom::IndexType parentCellNum; //!< @brief Flat index of parent cell. + axom::IndexType parentCellNum; //!< @brief Flat index of parent cell in m_caseIds. std::uint16_t caseNum; //!< @brief Index in cases2D or cases3D axom::IndexType firstSurfaceCellId; //!< @brief First index for generated cells. }; @@ -932,6 +1003,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase MIdx m_cShape; //!< @brief Cell-centered array shape for ArrayViews. MIdx m_pShape; //!< @brief Node-centered array shape for ArrayViews. MIdx m_bStrides; //!< @brief Strides for m_bShape arrays. + MIdx m_fastestDir; //!< @brief Directions, from fastest to slowest striding. // Views of parent domain data. // DIM coordinate components, each on a DIM-dimensional mesh. diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 5787683fdc..abcba0f586 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -263,18 +263,15 @@ void putConduitDataInNewMemorySpace(conduit::Node& node, const std::string& path, int allocId) { - SLIC_ASSERT(node.has_path(path)); - conduit::Node& dataNode = node[path]; + conduit::Node& dataNode = node.fetch_existing(path); SLIC_ASSERT(!dataNode.dtype().is_empty() && !dataNode.dtype().is_object() && !dataNode.dtype().is_list()); std::size_t count = dataNode.dtype().number_of_elements(); - // dataNode.print(); T* oldPtr = static_cast(dataNode.data_ptr()); T* newPtr = axom::allocate(count, allocId); axom::copy(newPtr, oldPtr, count * sizeof(T)); dataNode.set_external(newPtr, count); - dataNode.print(); } Input params; @@ -661,8 +658,8 @@ struct BlueprintStructuredMesh SLIC_ASSERT(conduit::blueprint::mesh::is_multi_domain(_mdMesh)); _domCount = conduit::blueprint::mesh::number_of_domains(_mdMesh); -std::cout<<__WHERE<<"mdMesh:"< 0) { _coordsAreStrided = _mdMesh[0].fetch_existing("topologies/mesh/elements/dims").has_child("strides"); @@ -726,6 +723,8 @@ void saveMesh(const conduit::Node& mesh, const std::string& filename) /// Write blueprint mesh to disk void saveMesh(const sidre::Group& mesh, const std::string& filename) { +// std::cout<<__WHERE<<"Saving mesh to " << filename << std::endl; +// mesh.print(); conduit::Node tmpMesh; mesh.createNativeLayout(tmpMesh); { @@ -810,6 +809,7 @@ axom::StackArray flatToMultidimIndex( template struct ContourTestBase { + static constexpr auto MemorySpace = axom::execution_space::memory_space; ContourTestBase() : m_parentCellIdField("parentCellIds") , m_domainIdField("domainIdField") @@ -898,48 +898,60 @@ struct ContourTestBase for(int domId = 0; domId < bpMesh.domainCount(); ++domId) { conduit::Node& dom = bpMesh.domain(domId); - axom::quest::MeshViewUtil mvu(dom, "mesh"); + axom::quest::MeshViewUtil::memory_space> mvu(dom, "mesh"); -#if 1 // Create nodal function data with ghosts like node coords. - mvu.createNodalField( functionName(), "vertex", - conduit::DataType::float64(mvu.getCoordsCountWithGhosts()), - mvu.getCoordsStrides(), - mvu.getCoordsOffsets()); -#else - // Create nodal function data. - conduit::Node& fieldNode = dom["fields"][functionName()]; - fieldNode["association"] = "vertex"; - fieldNode["topology"] = "mesh"; - fieldNode["volume_dependent"] = "false"; - fieldNode["values"].set(conduit::DataType::float64(mvu.getCoordsCountWithGhosts())); -#endif + mvu.createField( functionName(), "vertex", + conduit::DataType::float64(mvu.getCoordsCountWithGhosts()), + mvu.getCoordsStrides(), + mvu.getCoordsOffsets() ); - // TODO: Not correctly setting up fieldNode with stride. See Conduit example. - // Set the function value at the nodes. - // value(pt) is the virtual function defining the - // distance in a derived class. - const axom::Array> coordsViews = mvu.getCoordsViews(); - axom::ArrayView fieldView = mvu.getFieldView(functionName()); + const auto coordsViews = mvu.getConstCoordsViews(false); + axom::ArrayView fieldView = mvu.template getFieldView(functionName(), false); populateNodalDistance(coordsViews, fieldView); } } - void populateNodalDistance( - const axom::Array>& coordsViews, - axom::ArrayView& fieldView) + template + typename std::enable_if::type populateNodalDistance( + const axom::StackArray, DIM>& coordsViews, + axom::ArrayView& fieldView) { - SLIC_ASSERT(coordsViews[0].size() == fieldView.size()); SLIC_ASSERT(coordsViews[0].shape() == fieldView.shape()); - auto pointCount = fieldView.size(); - for(axom::IndexType n=0; n pt; - for(int d = 0; d < DIM; ++d) + for(axom::IndexType i=0; i pt; + for(int d = 0; d < DIM; ++d) + { + pt[d] = coordsViews[d](i,j); + } + fieldView(i,j) = value(pt); + } + } + } + template + typename std::enable_if::type populateNodalDistance( + const axom::StackArray, DIM>& coordsViews, + axom::ArrayView& fieldView) + { + SLIC_ASSERT(coordsViews[0].shape() == fieldView.shape()); + const auto& shape = fieldView.shape(); + for(axom::IndexType k=0; k pt; + for(int d = 0; d < DIM; ++d) + { + pt[d] = coordsViews[d](i,j,k); + } + fieldView(i,j,k) = value(pt); + } } - fieldView.flatIndex(n) = value(pt); } } @@ -1045,6 +1057,60 @@ struct ContourTestBase auto domainIdView = getDomainIdView(contourMesh); const axom::IndexType domainCount = computationalMesh.domainCount(); +#if 1 + axom::Array::ConstCoordsViewsType> allCoordsViews(domainCount); + for(int n=0; n mvu(dom, "mesh"); + allCoordsViews[n] = mvu.getConstCoordsViews(false); + } + + for(axom::IndexType cn = 0; cn < cellCount; ++cn) + { + axom::IndexType domainId = domainIdView[cn]; + typename axom::quest::MeshViewUtil::ConstCoordsViewsType& coordsViews + = allCoordsViews[domainId]; + + axom::StackArray parentCellIdx = parentCellIdxView[cn]; + axom::StackArray upperIdx = parentCellIdx; + addToStackArray(upperIdx, 1); + + axom::primal::Point lower, upper; + for(int d = 0; d < DIM; ++d) + { + lower[d] = coordsViews[d][parentCellIdx]; + upper[d] = coordsViews[d][upperIdx]; + } + axom::primal::BoundingBox parentCellBox(lower, upper); + double tol = errorTolerance(); + axom::primal::BoundingBox big(parentCellBox); + axom::primal::BoundingBox small(parentCellBox); + big.expand(tol); + small.expand(-tol); + + // WRONG: the node ids should increased by the number of nodes in all previous domains. + axom::IndexType* cellNodeIds = contourMesh.getCellNodeIDs(cn); + const axom::IndexType cellNodeCount = contourMesh.getNumberOfCellNodes(cn); + + for(axom::IndexType nn = 0; nn < cellNodeCount; ++nn) + { + axom::primal::Point nodeCoords; + contourMesh.getNode(cellNodeIds[nn], nodeCoords.data()); + + if(!big.contains(nodeCoords) || small.contains(nodeCoords)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("checkContourCellLimits: node {} at {} is not " + "on parent cell boundary.", + cellNodeIds[nn], + nodeCoords)); + } + } + } +#else axom::Array> coordsViews(domainCount * DIM); // Get info about the computational domains available for look-up. @@ -1112,6 +1178,7 @@ struct ContourTestBase } } } +#endif SLIC_INFO_IF(params.isVerbose(), axom::fmt::format("checkContourCellLimits: found {} nodes " @@ -1137,14 +1204,18 @@ struct ContourTestBase const axom::IndexType domainCount = computationalMesh.domainCount(); // Nodal values of functions for each domain. - axom::Array> fcnViews(domainCount); - // Whether computational cells have parts of the contour mesh. + axom::Array> fcnViews(domainCount); + // Whether a computational cell has parts of the contour mesh. axom::Array> hasContours(domainCount); for(axom::IndexType domId = 0; domId < domainCount; ++domId) { + const auto& dom = computationalMesh.domain(domId); + axom::quest::MeshViewUtil mvu(dom, "mesh"); + axom::StackArray domLengths; computationalMesh.domainLengths(domId, domLengths); + assert(domLengths == mvu.getRealExtents("element")); axom::Array& hasContour = hasContours[domId]; hasContour.resize(domLengths, false); @@ -1155,10 +1226,10 @@ struct ContourTestBase // domLengths = domLengths + 1; addToStackArray(domLengths, 1); - conduit::Node& dom = computationalMesh.domain(domId); - double* fcnPtr = - dom.fetch_existing("fields/" + functionName() + "/values").as_double_ptr(); - fcnViews[domId] = axom::ArrayView(fcnPtr, domLengths); + fcnViews[domId] = mvu.template getConstFieldView(functionName(), false); + // double* fcnPtr = + // dom.fetch_existing("fields/" + functionName() + "/values").as_double_ptr(); + // fcnViews[domId] = axom::ArrayView(fcnPtr, domLengths); } for(axom::IndexType cn = 0; cn < cellCount; ++cn) { @@ -1169,13 +1240,17 @@ struct ContourTestBase } // Verify that marked cells contain the contour value - // unmarked ones don't. + // and unmarked ones don't. for(axom::IndexType domId = 0; domId < domainCount; ++domId) { + const auto& dom = computationalMesh.domain(domId); + axom::quest::MeshViewUtil mvu(dom, "mesh"); + axom::StackArray domLengths; computationalMesh.domainLengths(domId, domLengths); + assert(domLengths == mvu.getRealExtents("element")); - axom::ArrayView& fcnView = fcnViews[domId]; + const auto& fcnView = fcnViews[domId]; const axom::IndexType cellCount = product(domLengths); for(axom::IndexType cellId = 0; cellId < cellCount; ++cellId) @@ -1199,7 +1274,7 @@ struct ContourTestBase } } - reverse(cornerIdx); + // reverse(cornerIdx); double fcnValue = fcnView[cornerIdx]; minFcnValue = std::min(minFcnValue, fcnValue); maxFcnValue = std::max(maxFcnValue, fcnValue); @@ -1229,6 +1304,7 @@ struct ContourTestBase return errCount; } +#if 0 void getCoordsViews(conduit::Node& domain, const std::string& coordsetPath, axom::ArrayView coordsViews[DIM]) @@ -1253,6 +1329,7 @@ struct ContourTestBase axom::ArrayView(coordsPtr, coordsViewShape, coordSp); } } +#endif /** * Change cp_domain data from a local index to a global domain index From 64a028a33d8ef2be9b4555acfb1ed32c813856a9 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 25 Aug 2023 13:35:41 -0700 Subject: [PATCH 069/639] Remove dead code. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 50 ---------- .../examples/quest_marching_cubes_example.cpp | 99 +------------------ 2 files changed, 1 insertion(+), 148 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index e4ae769dd3..8b195fd793 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -314,17 +314,10 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { // clang-format off double nodalValues[CELL_CORNER_COUNT] = -#if 1 {fcnView(i , j ), fcnView(i + 1, j ), fcnView(i + 1, j + 1), fcnView(i , j + 1)}; -#else - {fcnView(j , i ), - fcnView(j , i + 1), - fcnView(j + 1, i + 1), - fcnView(j + 1, i )}; -#endif // clang-format on caseIdsView(i, j) = computeCrossingCase(nodalValues); } @@ -340,7 +333,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { // clang-format off double nodalValues[CELL_CORNER_COUNT] = -#if 1 {fcnView(i + 1, j , k ), fcnView(i + 1, j + 1, k ), fcnView(i , j + 1, k ), @@ -349,16 +341,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase fcnView(i + 1, j + 1, k + 1), fcnView(i , j + 1, k + 1), fcnView(i , j , k + 1)}; -#else - {fcnView(k , j , i + 1), - fcnView(k , j + 1, i + 1), - fcnView(k , j + 1, i ), - fcnView(k , j , i ), - fcnView(k + 1, j , i + 1), - fcnView(k + 1, j + 1, i + 1), - fcnView(k + 1, j + 1, i ), - fcnView(k + 1, j , i )}; -#endif // clang-format on caseIdsView(i, j, k) = computeCrossingCase(nodalValues); } @@ -531,7 +513,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const auto& j = c[1]; // clang-format off -#if 1 cornerCoords[0] = { x(i , j ), y(i , j ) }; cornerCoords[1] = { x(i + 1, j ), y(i + 1, j ) }; cornerCoords[2] = { x(i + 1, j + 1), y(i + 1, j + 1) }; @@ -541,17 +522,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase cornerValues[1] = fcnView(i + 1, j ); cornerValues[2] = fcnView(i + 1, j + 1); cornerValues[3] = fcnView(i , j + 1); -#else - cornerCoords[0] = { x(j , i ), y(j , i ) }; - cornerCoords[1] = { x(j , i + 1), y(j , i + 1) }; - cornerCoords[2] = { x(j + 1, i + 1), y(j + 1, i + 1) }; - cornerCoords[3] = { x(j + 1, i ), y(j + 1, i ) }; - - cornerValues[0] = fcnView(j , i ); - cornerValues[1] = fcnView(j , i + 1); - cornerValues[2] = fcnView(j + 1, i + 1); - cornerValues[3] = fcnView(j + 1, i ); -#endif // clang-format on } template @@ -571,7 +541,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const auto& k = c[2]; // clang-format off -#if 1 cornerCoords[0] = { x(i+1, j , k ), y(i+1, j , k ), z(i+1, j , k ) }; cornerCoords[1] = { x(i+1, j+1, k ), y(i+1, j+1, k ), z(i+1, j+1, k ) }; cornerCoords[2] = { x(i , j+1, k ), y(i , j+1, k ), z(i , j+1, k ) }; @@ -589,25 +558,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase cornerValues[5] = fcnView(i+1, j+1, k+1); cornerValues[6] = fcnView(i , j+1, k+1); cornerValues[7] = fcnView(i , j , k+1); -#else - cornerCoords[0] = { x(k , j , i+1), y(k , j , i+1), z(k , j , i+1) }; - cornerCoords[1] = { x(k , j+1, i+1), y(k , j+1, i+1), z(k , j+1, i+1) }; - cornerCoords[2] = { x(k , j+1, i ), y(k , j+1, i ), z(k , j+1, i ) }; - cornerCoords[3] = { x(k , j , i ), y(k , j , i ), z(k , j , i ) }; - cornerCoords[4] = { x(k+1, j , i+1), y(k+1, j , i+1), z(k+1, j , i+1) }; - cornerCoords[5] = { x(k+1, j+1, i+1), y(k+1, j+1, i+1), z(k+1, j+1, i+1) }; - cornerCoords[6] = { x(k+1, j+1, i ), y(k+1, j+1, i ), z(k+1, j+1, i ) }; - cornerCoords[7] = { x(k+1, j , i ), y(k+1, j , i ), z(k+1, j , i ) }; - - cornerValues[0] = fcnView(k , j , i+1); - cornerValues[1] = fcnView(k , j+1, i+1); - cornerValues[2] = fcnView(k , j+1, i ); - cornerValues[3] = fcnView(k , j , i ); - cornerValues[4] = fcnView(k+1, j , i+1); - cornerValues[5] = fcnView(k+1, j+1, i+1); - cornerValues[6] = fcnView(k+1, j+1, i ); - cornerValues[7] = fcnView(k+1, j , i ); -#endif // clang-format on } diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index abcba0f586..a20608359b 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -1057,7 +1057,6 @@ struct ContourTestBase auto domainIdView = getDomainIdView(contourMesh); const axom::IndexType domainCount = computationalMesh.domainCount(); -#if 1 axom::Array::ConstCoordsViewsType> allCoordsViews(domainCount); for(int n=0; n> coordsViews(domainCount * DIM); - - // Get info about the computational domains available for look-up. - axom::Array> domainLengths(domainCount); - for(axom::IndexType n = 0; n < domainCount; ++n) - { - auto& domain = computationalMesh.domain(n); - axom::ArrayView* domainCoordsView = - &coordsViews[DIM * n]; - getCoordsViews(domain, computationalMesh.coordsetPath(), domainCoordsView); - - axom::Array domLengths = - computationalMesh.domainLengths(n); - for(int d = 0; d < DIM; ++d) - { - domainLengths[n][d] = domLengths[d]; - } - } - - for(axom::IndexType cn = 0; cn < cellCount; ++cn) - { - axom::IndexType domainId = domainIdView[cn]; - - axom::StackArray parentCellIdx = - parentCellIdxView[cn]; - reverse(parentCellIdx); // ArrayView expects indices in reverse order. - // This should work but breaks gcc11 on 64-bit linux: - // axom::StackArray upperIdx = parentCellIdx + 1; - axom::StackArray upperIdx = parentCellIdx; - addToStackArray(upperIdx, 1); - - axom::ArrayView* domainCoordsView = - &coordsViews[DIM * domainId]; - axom::primal::Point lower, upper; - for(int d = 0; d < DIM; ++d) - { - lower[d] = domainCoordsView[d][parentCellIdx]; - upper[d] = domainCoordsView[d][upperIdx]; - } - axom::primal::BoundingBox parentCellBox(lower, upper); - double tol = errorTolerance(); - axom::primal::BoundingBox big(parentCellBox); - axom::primal::BoundingBox small(parentCellBox); - big.expand(tol); - small.expand(-tol); - - // WRONG: the node ids should increased by the number of nodes in all previous domains. - axom::IndexType* cellNodeIds = contourMesh.getCellNodeIDs(cn); - const axom::IndexType cellNodeCount = contourMesh.getNumberOfCellNodes(cn); - - for(axom::IndexType nn = 0; nn < cellNodeCount; ++nn) - { - axom::primal::Point nodeCoords; - contourMesh.getNode(cellNodeIds[nn], nodeCoords.data()); - - if(!big.contains(nodeCoords) || small.contains(nodeCoords)) - { - ++errCount; - SLIC_INFO_IF( - params.isVerbose(), - axom::fmt::format("checkContourCellLimits: node {} at {} is not " - "on parent cell boundary.", - cellNodeIds[nn], - nodeCoords)); - } - } - } -#endif SLIC_INFO_IF(params.isVerbose(), axom::fmt::format("checkContourCellLimits: found {} nodes " @@ -1304,33 +1234,6 @@ struct ContourTestBase return errCount; } -#if 0 - void getCoordsViews(conduit::Node& domain, - const std::string& coordsetPath, - axom::ArrayView coordsViews[DIM]) - { - const conduit::Node& dimsNode = - domain.fetch_existing("topologies/mesh/elements/dims"); - axom::StackArray coordsViewShape; - for(int d = 0; d < DIM; ++d) - { - coordsViewShape[d] = 1 + dimsNode[DIM - 1 - d].as_int(); - } - - const conduit::Node& coordValues = - domain.fetch_existing(coordsetPath + "/values"); - bool isInterleaved = conduit::blueprint::mcarray::is_interleaved(coordValues); - const int coordSp = isInterleaved ? DIM : 1; - - for(int d = 0; d < DIM; ++d) - { - auto* coordsPtr = coordValues[d].as_double_ptr(); - coordsViews[d] = - axom::ArrayView(coordsPtr, coordsViewShape, coordSp); - } - } -#endif - /** * Change cp_domain data from a local index to a global domain index * by adding rank offsets. @@ -1598,7 +1501,7 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) params.planeNormal()); planarTest->computeNodalDistance(computationalMesh); } - computationalMesh.printMeshInfo(); + if(params.isVerbose()) { computationalMesh.printMeshInfo(); } // Write computational mesh with contour functions. saveMesh(computationalMesh.asConduitNode(), params.fieldsFile); From 60de2c2908e8a1855404fef07173042ede8370e9 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 25 Aug 2023 16:12:16 -0700 Subject: [PATCH 070/639] Update tests using multidimensional meshes. Add a test for ghost layers in MarchingCubes. Combine ghost option from gen-strided-structured-mesh.py into gen-multidom-structured-mesh.py. Regenerated data files. --- data | 2 +- src/axom/quest/examples/CMakeLists.txt | 6 +- src/tools/gen-multidom-structured-mesh.py | 121 ++++++++++----- src/tools/gen-strided-structured-mesh.py | 181 ---------------------- 4 files changed, 90 insertions(+), 220 deletions(-) delete mode 100755 src/tools/gen-strided-structured-mesh.py diff --git a/data b/data index 0cc49bf58a..04ecb2babe 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 0cc49bf58a6f41e3602e6112d8ba9ebd4b8906f6 +Subproject commit 04ecb2babe63284af18501e945fc049f11f569c4 diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index 89ccb01662..c882c1bdae 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -231,10 +231,12 @@ if(CONDUIT_FOUND) endif() # Non-zero empty-rank probability tests domain underloading case - set(_meshes "mdmesh.2x1" "mdmesh.2x3" "mdmesh.2x2x1") + set(_meshes "mdmesh.2x1" "mdmesh.2x3" "mdmesh.2x2x1" "mdmeshg.2x2x1") # The amc.* files were generated by these commands: - # src/tools/gen-multidom-structured-mesh.py -ml=0,0 -mu=2,2 -ms=20,20 -dc=2,2 -o amc_mesh.2x2 + # src/tools/gen-multidom-structured-mesh.py -ml=0,0 -mu=2,2 -ms=100,100 -dc=2,1 -o mdmesh.2x1 + # src/tools/gen-multidom-structured-mesh.py -ml=0,0 -mu=2,2 -ms=100,100 -dc=2,3 -o mdmesh.2x3 # src/tools/gen-multidom-structured-mesh.py -ml=0,0,0 -mu=2,2,2 -ms=20,20,15 -dc=2,2,1 -o mdmesh.2x2x1 + # src/tools/gen-multidom-structured-mesh.py -ml=0,0,0 -mu=2,2,2 -ms=20,20,15 -dc=2,2,1 -o mdmeshg.2x2x1 --strided foreach(_pol ${_policies}) foreach(_mesh ${_meshes}) # Determine problem dimension by mesh filename. diff --git a/src/tools/gen-multidom-structured-mesh.py b/src/tools/gen-multidom-structured-mesh.py index aa3de00354..34c398ce4b 100755 --- a/src/tools/gen-multidom-structured-mesh.py +++ b/src/tools/gen-multidom-structured-mesh.py @@ -17,14 +17,15 @@ import numpy as np def i_c(s): - '''Integer coordinates.''' + '''Convert comma-separated string to list of integers.''' return list(map(int, s.split(','))) + def f_c(s): - '''Floating point coordinates.''' + '''Convert comma-separated string to list of floating point numbers.''' return list(map(float, s.split(','))) from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter -ps = ArgumentParser(description='Write a blueprint multidomain unstructured mesh.', +ps = ArgumentParser(description='Write a blueprint strided-unstructured mesh.', formatter_class=ArgumentDefaultsHelpFormatter) ps.add_argument('--useList', action='store_true', help='Put domains in a list instead of a map') ps.add_argument('-ml', type=f_c, default=(0.,0.), help='Mesh lower coordinates') @@ -32,6 +33,7 @@ def f_c(s): ps.add_argument('-ms', type=i_c, default=(3,3), help='Logical size of mesh (cells)') ps.add_argument('-dc', type=i_c, default=(1,1), help='Domain counts in each index direction') ps.add_argument('-o', '--output', type=str, default='mdmesh', help='Output file base name') +ps.add_argument('--strided', action='store_true', help='Use strided_structured (has ghosts)') opts,unkn = ps.parse_known_args() print(opts, unkn) if(unkn): @@ -51,6 +53,12 @@ def f_c(s): if sum(goodDc) < dim: raise RuntimeError(f'ms ({opts.ms}) must be >= dc ({opts.dc}) in all directions.') +# Number of phony nodes on left and right sides, for strided option +if opts.strided: + npnl, npnr = 2, 1 +else: + npnl, npnr = 0, 0 + def scale_structured_domain(n, startCoord, endCoord): '''This function scales and shifts a blueprint structured domain after it has been created. There's no way to specify the physical extent @@ -58,26 +66,53 @@ def scale_structured_domain(n, startCoord, endCoord): can tell. ''' + #print(f'Rescaling to {startCoord} -> {endCoord}') + + ndim = n['coordsets/coords/values'].number_of_children() + + domLens = n['topologies/mesh/elements/dims'] + dirs = 'ij' if ndim == 2 else 'ijk' + domLens = [ domLens[d] for d in dirs ] + domLens = np.array(domLens) domPhysicalSize = np.array(endCoord) - np.array(startCoord) - xyz = 'xyz' + #print(f'domLens={domLens} domPhysicalSize={domPhysicalSize}') assert(n['topologies/mesh/type'] == 'structured') - ndim = n['coordsets/coords/values'].number_of_children() assert(len(startCoord) >= ndim) assert(len(domPhysicalSize) >= ndim) + + coordArrayLens = domLens + 1 + npnl + npnr + #print(f'coordArrayLens={coordArrayLens}') + + xyz = 'xyz' for d in range(ndim): coords = n['coordsets/coords/values'][d] - minC, maxC = min(coords), max(coords) + coords = np.reshape(coords, np.flip(coordArrayLens)) + + # realCoords excludes the ghost layers. + if ndim == 2: + if npnr == 0: + realCoords = coords[npnl:, npnl:] + else: + realCoords = coords[npnl:-npnr, npnl:-npnr] + else: + if npnr == 0: + realCoords = coords[npnl:, npnl:, npnl:] + else: + realCoords = coords[npnl:-npnr, npnl:-npnr, npnl:-npnr] + + minC, maxC = np.amin(realCoords), np.amax(realCoords) curRange = maxC - minC shift = startCoord[d] - minC + scale = domPhysicalSize[d]/curRange coords = (coords - minC) * domPhysicalSize[d]/curRange + startCoord[d] n['coordsets/coords/values'][xyz[d]] = coords domType = 'structured' -domCounts = opts.dc if dim == 3 else (*opts.dc, 1) -meshSize = opts.ms if dim == 3 else (*opts.ms, 1) -meshLower = opts.ml if dim == 3 else (*opts.ml, 0) -meshUpper = opts.mu if dim == 3 else (*opts.mu, 0) +domCounts = opts.dc if dim == 3 else (*opts.dc, 1) # domCounts must be length 3, even for 2D. +meshSize = opts.ms +meshLower = opts.ml +meshUpper = opts.mu # Convert to np.array to use element-wise arithmetic. domCounts = np.array(domCounts, dtype=np.int) @@ -85,26 +120,20 @@ def scale_structured_domain(n, startCoord, endCoord): meshLower = np.array(meshLower) meshUpper = np.array(meshUpper) -domPhysicalSize = (meshUpper - meshLower)/domCounts +domPhysicalSize = (meshUpper - meshLower)/domCounts[:dim] cellPhysicalSize = (meshUpper - meshLower)/meshSize -domSize = meshSize//domCounts -domSizeRem = meshSize % domCounts +domSize = meshSize//domCounts[:dim] +domSizeRem = meshSize % domCounts[:dim] print(f'meshSize={meshSize} cells, domCounts={domCounts} domSize={domSize} domSizeRem={domSizeRem}') -def domain_size(di, dj, dk): - rval = np.array(domSize) - rval += (di,dj,dk) < domSizeRem - rval[0:dim] += 1 - return rval - -def domain_index_begin(di, dj, dk): - '''Compute first cell index of domain (di, dj, dk).''' - idx = np.array( (di, dj, dk) ) - std = np.array(domSize) * (di, dj, dk) - extra = np.where( idx < domSizeRem, idx, domSizeRem ) +def domain_index_begin(di, dj, dk=None): + '''Compute first cell index of the domain with multi-dimensional index (di, dj, dk).''' + ds = (di, dj) if dim == 2 else (di, dj, dk) + idx = np.array(ds) + std = domSize * ds + extra = np.where( idx < domSizeRem[:dim], idx, domSizeRem[:dim] ) begin = std + extra - #print(di, dj, dk, f'begin={begin}, std={std}, extra={extra}') return begin mdMesh = conduit.Node() @@ -114,25 +143,45 @@ def domain_index_begin(di, dj, dk): if opts.useList: dom = mdMesh.append() else: - domName = f'domain_{di:1d}_{dj:1d}' if len(opts.dc) == 2 else f'domain_{di:1d}_{dj:1d}_{dk:1d}' + domName = f'domain_{di:1d}_{dj:1d}' + if len(opts.dc) == 3: domName += f'_{dk:1d}' dom = mdMesh[domName] cellStart = domain_index_begin(di, dj, dk) - cellEnd = domain_index_begin(di+1, dj+1, dk+1) - pointCounts = cellEnd - cellStart + (1, 1, 1 if dim == 3 else 0) - #print(di, dj, dk, f'{cellStart} -> {cellEnd}, {pointCounts}') - - conduit.blueprint.mesh.examples.basic(domType, *pointCounts, dom) + cellEnd = domain_index_begin(di+1, dj+1, dk+1 if dim == 3 else 0) + pointCounts = cellEnd - cellStart + 1 + #print(f'cellStart={cellStart} cellEnd={cellEnd} pointCounts={pointCounts}') + + elemExtents = (cellEnd - cellStart) + (npnl + npnr + 1) + vertExtents = np.array(pointCounts) + (npnl + npnr) + elemOffset = np.full(dim, npnl) + vertOffset = np.full(dim, npnl) + #print(f'\n{domName}: {cellStart} -> {cellEnd}') + + pointCounts3 = pointCounts if len(pointCounts) == 3 else (*pointCounts, 0) + if opts.strided: + desc = conduit.Node() + desc['vertex_data/shape'].set(vertExtents) + desc['vertex_data/origin'].set(vertOffset) + desc['element_data/shape'].set(elemExtents) + desc['element_data/origin'].set(elemOffset) + #print(f'\ndesc({di},{dj},{dk}):', end=''); print(desc) + conduit.blueprint.mesh.examples.strided_structured(desc, *pointCounts3, dom) + if dom.has_child("state"): dom.remove_child("state") + else: + conduit.blueprint.mesh.examples.basic(domType, *pointCounts3, dom) - domLower = meshLower + cellStart * cellPhysicalSize - domUpper = meshLower + cellEnd * cellPhysicalSize + domLower = meshLower[:dim] + cellStart * cellPhysicalSize[:dim] + domUpper = meshLower[:dim] + cellEnd * cellPhysicalSize[:dim] scale_structured_domain(dom, domLower, domUpper) + #print(dom) -# print(mdMesh) +#print('mdMesh:'); print(mdMesh) info = conduit.Node() if not conduit.blueprint.mesh.verify(mdMesh, info): - print(info) + print("Mesh failed blueprint verification. Info:") + print(info) -conduit.relay.io.blueprint.save_mesh(mdMesh,opts.output, "hdf5") +conduit.relay.io.blueprint.save_mesh(mdMesh, opts.output, "hdf5") print(f'Wrote mesh {opts.output}') diff --git a/src/tools/gen-strided-structured-mesh.py b/src/tools/gen-strided-structured-mesh.py deleted file mode 100755 index 8c7f44f790..0000000000 --- a/src/tools/gen-strided-structured-mesh.py +++ /dev/null @@ -1,181 +0,0 @@ -#!/usr/bin/env python3 - -# gen-strided-structured-mesh.py -# Write a simple strided-structured blueprint mesh for testing. - -# This script requires a conduit installation configured with python3 and hdf5. -# Make sure PYTHONPATH includes /path/to/conduit/install/python-modules - -try: - import conduit - import conduit.blueprint - import conduit.relay -except ModuleNotFoundError as e: - print(f'{e}\nMake sure your PYTHONPATH includes /path/to/conduit/install/python-modules\nConduit must be configured with python and hdf5.') - exit(-1) - -import numpy as np - -def i_c(s): - '''Convert comma-separated string to list of integers.''' - return list(map(int, s.split(','))) - -def f_c(s): - '''Convert comma-separated string to list of floating point numbers.''' - return list(map(float, s.split(','))) - -from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter -ps = ArgumentParser(description='Write a blueprint strided-unstructured mesh.', - formatter_class=ArgumentDefaultsHelpFormatter) -ps.add_argument('--useList', action='store_true', help='Put domains in a list instead of a map') -ps.add_argument('-ml', type=f_c, default=(0.,0.), help='Mesh lower coordinates') -ps.add_argument('-mu', type=f_c, default=(1.,1.), help='Mesh upper coordinates') -ps.add_argument('-ms', type=i_c, default=(3,3), help='Logical size of mesh (cells)') -ps.add_argument('-dc', type=i_c, default=(1,1), help='Domain counts in each index direction') -ps.add_argument('--strided', action='store_true', help='Use strided_structured (has ghosts)') -ps.add_argument('-o', '--output', type=str, default='mdmesh', help='Output file base name') -opts,unkn = ps.parse_known_args() -print(opts, unkn) -if(unkn): - print("Unrecognized arguments:", *unkn) - quit(1) - -dim = len(opts.dc) - -if dim not in (2,3) \ - or len(opts.ms) != dim \ - or len(opts.ml) != dim \ - or len(opts.mu) != dim: - raise RuntimeError('dc, ms, ml and mu options must have the same dimensions (2 or 3)') - -# Must have enough cells for requested partitioning. -goodDc = [opts.ms[i] >= opts.dc[i] for i in range(dim)] -if sum(goodDc) < dim: - raise RuntimeError(f'ms ({opts.ms}) must be >= dc ({opts.dc}) in all directions.') - -def scale_structured_domain(n, startCoord, endCoord): - '''This function scales and shifts a blueprint structured domain after - it has been created. There's no way to specify the physical extent - of a domain using conduit.blueprint.mesh.examples.basic, as far as I - can tell. - - ''' - print(f'Rescaling to {startCoord} -> {endCoord}') - - ndim = n['coordsets/coords/values'].number_of_children() - - domLens = n['topologies/mesh/elements/dims'] - dirs = 'ij' if ndim == 2 else 'ijk' - domLens = [ domLens[d] for d in dirs ] - domLens = np.array(domLens) - domPhysicalSize = np.array(endCoord) - np.array(startCoord) - #print(f'domLens={domLens} domPhysicalSize={domPhysicalSize}') - assert(n['topologies/mesh/type'] == 'structured') - assert(len(startCoord) >= ndim) - assert(len(domPhysicalSize) >= ndim) - - coordArrayLens = domLens + 1 + npnl + npnr - print(f'coordArrayLens={coordArrayLens}') - - xyz = 'xyz' - for d in range(ndim): - coords = n['coordsets/coords/values'][d] - coords = np.reshape(coords, np.flip(coordArrayLens)) - - # realCoords excludes the ghost layers. - if ndim == 2: - realCoords = coords[npnl:, npnl:] if npnr == 0 else coords[npnl:-npnr, npnl:-npnr] - else: - realCoords = coords[npnl:, npnl:, npnl:] if npnr == 0 else coords[npnl:-npnr, npnl:-npnr, npnl:-npnr] - minC, maxC = np.amin(realCoords), np.amax(realCoords) - curRange = maxC - minC - shift = startCoord[d] - minC - scale = domPhysicalSize[d]/curRange - coords = (coords - minC) * domPhysicalSize[d]/curRange + startCoord[d] - n['coordsets/coords/values'][xyz[d]] = coords - -domType = 'structured' - -domCounts = opts.dc if dim == 3 else (*opts.dc, 1) # domCounts must be length 3, even for 2D. -meshSize = opts.ms -meshLower = opts.ml -meshUpper = opts.mu - -# Convert to np.array to use element-wise arithmetic. -domCounts = np.array(domCounts, dtype=np.int) -meshSize = np.array(meshSize, dtype=np.int) -meshLower = np.array(meshLower) -meshUpper = np.array(meshUpper) - -domPhysicalSize = (meshUpper - meshLower)/domCounts[:dim] -cellPhysicalSize = (meshUpper - meshLower)/meshSize - -domSize = meshSize//domCounts[:dim] -domSizeRem = meshSize % domCounts[:dim] -#print(f'meshSize={meshSize} cells, domCounts={domCounts} domSize={domSize} domSizeRem={domSizeRem}') -#print(f'meshLower={meshLower} meshUpper={meshUpper}') - -def domain_index_begin(di, dj, dk=None): - '''Compute first cell index of the domain with multi-dimensional index (di, dj, dk).''' - ds = (di, dj) if dim == 2 else (di, dj, dk) - idx = np.array(ds) - std = domSize * ds - extra = np.where( idx < domSizeRem[:dim], idx, domSizeRem[:dim] ) - begin = std + extra - return begin - -# Number of phony nodes on left and right sides, for strided option -if opts.strided: - npnl, npnr = 2, 1 -else: - npnl, npnr = 0, 0 - -mdMesh = conduit.Node() -for dk in range(domCounts[2]): - for dj in range(domCounts[1]): - for di in range(domCounts[0]): - if opts.useList: - dom = mdMesh.append() - else: - domName = f'domain_{di:1d}_{dj:1d}' - if len(opts.dc) == 3: domName += f'_{dk:1d}' - dom = mdMesh[domName] - - cellStart = domain_index_begin(di, dj, dk) - cellEnd = domain_index_begin(di+1, dj+1, dk+1 if dim == 3 else 0) - pointCounts = cellEnd - cellStart + 1 - print(f'cellStart={cellStart} cellEnd={cellEnd} pointCounts={pointCounts}') - - elemExtents = (cellEnd - cellStart) + (npnl + npnr + 1) - vertExtents = np.array(pointCounts) + (npnl + npnr) - elemOffset = np.full(dim, npnl) - vertOffset = np.full(dim, npnl) - #print(f'\n{domName}: {cellStart} -> {cellEnd}') - - pointCounts3 = pointCounts if len(pointCounts) == 3 else (*pointCounts, 0) - if opts.strided: - desc = conduit.Node() - desc['vertex_data/shape'].set(vertExtents) - desc['vertex_data/origin'].set(vertOffset) - desc['element_data/shape'].set(elemExtents) - desc['element_data/origin'].set(elemOffset) - print(f'\ndesc({di},{dj},{dk}):', end=''); print(desc) - conduit.blueprint.mesh.examples.strided_structured(desc, *pointCounts3, dom) - if dom.has_child("state"): dom.remove_child("state") - else: - conduit.blueprint.mesh.examples.basic(domType, *pointCounts3, dom) - - domLower = meshLower[:dim] + cellStart * cellPhysicalSize[:dim] - domUpper = meshLower[:dim] + cellEnd * cellPhysicalSize[:dim] - scale_structured_domain(dom, domLower, domUpper) - #print(dom) - -print('mdMesh:'); print(mdMesh) - -info = conduit.Node() -if not conduit.blueprint.mesh.verify(mdMesh, info): - print("Mesh failed blueprint verification. Info:") - print(info) - -conduit.relay.io.blueprint.save_mesh(mdMesh, opts.output, "hdf5") -print(f'Wrote mesh {opts.output}') From 29c4674570504a49fe678c503ec41eb193156b42 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 25 Aug 2023 18:25:33 -0700 Subject: [PATCH 071/639] Fix bugs causing failures on devices. Mark some methods for device execution. Manually moving data between host and device where needed for the tests. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 8 ++++---- .../examples/quest_marching_cubes_example.cpp | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 8b195fd793..ceb8f4a9f1 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -88,25 +88,25 @@ class StructuredIndexer { } //!@brief Directions, ordered from slowest to fastest. - axom::StackArray& slowestDirs() const + AXOM_HOST_DEVICE axom::StackArray& slowestDirs() const { return m_slowestDirs; } //!@brief Strides. - axom::StackArray& strides() const + AXOM_HOST_DEVICE axom::StackArray& strides() const { return m_strides; } //!@brief Convert multidimensional index to flat index. - T toFlatIndex(const axom::StackArray& multiIndex) const + AXOM_HOST_DEVICE T toFlatIndex(const axom::StackArray& multiIndex) const { T rval = numerics::dot_product(multiIndex.data(), m_strides.data()); } //!@brief Convert flat index to multidimensional index. - axom::StackArray toMultiIndex(T flatIndex) const + AXOM_HOST_DEVICE axom::StackArray toMultiIndex(T flatIndex) const { axom::StackArray multiIndex; for(int d = 0; d(count, allocId); axom::copy(newPtr, oldPtr, count * sizeof(T)); dataNode.set_external(newPtr, count); + // Don't delete oldPtr. Conduit took care of that. } Input params; @@ -781,6 +782,9 @@ static void addToStackArray(axom::StackArray& a, U b) The flatId corresponds to the multidimensional index through an order that advances the first index fastest. + + TODO: This has been superceded by StructuredIndexer. Eventually, I + want to rename move StructuredIndexer to axom::core::ArrayIndexer. */ template axom::StackArray flatToMultidimIndex( @@ -868,6 +872,13 @@ struct ContourTestBase mc.getContourCellCount()); mc.populateContourMesh(contourMesh, m_parentCellIdField, m_domainIdField); + // Move node function data back to host for verification. + if(allocatorId != axom::execution_space::allocatorID()) + { + computationalMesh.putMeshDataInNewMemorySpace( + axom::fmt::format("fields/{}/values", functionName()), axom::execution_space::allocatorID()); + } + int localErrCount = 0; if(params.checkResults) { @@ -910,6 +921,13 @@ struct ContourTestBase axom::ArrayView fieldView = mvu.template getFieldView(functionName(), false); populateNodalDistance(coordsViews, fieldView); } + // Conduit doesn't support putting array data on devices + // very well, so move it to devices after allocating. + if(allocatorId != axom::execution_space::allocatorID()) + { + bpMesh.putMeshDataInNewMemorySpace( + axom::fmt::format("fields/{}/values", functionName()), allocatorId); + } } template typename std::enable_if::type populateNodalDistance( From 869d88da5216c1ab703c3271359a614741016375 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 29 Aug 2023 12:43:33 -0700 Subject: [PATCH 072/639] Delete conduit's external data when no longer needed. --- src/axom/quest/examples/quest_marching_cubes_example.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index bcbede042d..422179ef8c 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -269,10 +269,11 @@ void putConduitDataInNewMemorySpace(conduit::Node& node, std::size_t count = dataNode.dtype().number_of_elements(); T* oldPtr = static_cast(dataNode.data_ptr()); + bool deleteOld = dataNode.is_data_external(); T* newPtr = axom::allocate(count, allocId); axom::copy(newPtr, oldPtr, count * sizeof(T)); dataNode.set_external(newPtr, count); - // Don't delete oldPtr. Conduit took care of that. + if(deleteOld) { axom::deallocate(oldPtr); } } Input params; From af8fdc74ebbbdd4e25549929aedfed6784c14d17 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 31 Aug 2023 18:38:15 -0700 Subject: [PATCH 073/639] Use only HOST or DEVICE memory in MarchingCubes tests. Don't use the default unified memory, which hides part of what we're testing--whether we hve the data in the correct location. --- src/axom/quest/MeshViewUtil.hpp | 23 +- src/axom/quest/detail/MarchingCubesImpl.hpp | 18 +- .../examples/quest_marching_cubes_example.cpp | 238 +++++++++--------- 3 files changed, 146 insertions(+), 133 deletions(-) diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 3af2412bea..225272fbfb 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -377,8 +377,8 @@ class MeshViewUtil axom::StackArray, DIM> rval; for(int d=0; d(dataValues, m_coordsMemShape, m_coordsStrides); + auto* dataPtr = valuesNode[d].as_double_ptr(); + rval[d] = axom::ArrayView(dataPtr, m_coordsMemShape, m_coordsStrides); } if(withGhosts == false) @@ -403,8 +403,8 @@ class MeshViewUtil axom::StackArray, DIM> rval; for(int d=0; d(dataValues, m_coordsMemShape, m_coordsStrides); + auto* dataPtr = valuesNode[d].as_double_ptr(); + rval[d] = axom::ArrayView(dataPtr, m_coordsMemShape, m_coordsStrides); } if(withGhosts == false) @@ -425,6 +425,9 @@ class MeshViewUtil /*! @brief Return view to a scalar field variable. + + WARNING: The view returned has an allocator id determined by MemSpace, + regardless of the memory type. */ template axom::ArrayView getFieldView(const std::string& fieldName, @@ -468,8 +471,8 @@ class MeshViewUtil } shape[DIM-1] = valuesCount / strides[DIM-1]; - T* dataValues = valuesNode.as_double_ptr();// TODO: Use template parameter T. - axom::ArrayView rval(dataValues, shape, strides); + T* dataPtr = valuesNode.as_double_ptr();// TODO: Use template parameter T. + axom::ArrayView rval(dataPtr, shape, strides); if(withGhosts == false) { @@ -524,8 +527,8 @@ class MeshViewUtil } shape[DIM-1] = valuesCount / strides[DIM-1]; - const T* dataValues = valuesNode.as_double_ptr();// TODO: Use template parameter T. - axom::ArrayView rval(dataValues, shape, strides); + const T* dataPtr = valuesNode.as_double_ptr();// TODO: Use template parameter T. + axom::ArrayView rval(dataPtr, shape, strides); if(withGhosts == false) { @@ -551,6 +554,10 @@ class MeshViewUtil big enough for the strides specified. @param [in] strides Data strides. Set to zero for no ghosts and default strides. @param [in] offsets Data index offsets. + + Field data allocation is done by Conduit, so the data lives in + host memory. Conduit currently doesn't provide a means to allocate + the array in device memory. */ void createField( const std::string& fieldName, const std::string& association, diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index ceb8f4a9f1..4786a8354f 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -513,15 +513,15 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const auto& j = c[1]; // clang-format off - cornerCoords[0] = { x(i , j ), y(i , j ) }; - cornerCoords[1] = { x(i + 1, j ), y(i + 1, j ) }; - cornerCoords[2] = { x(i + 1, j + 1), y(i + 1, j + 1) }; - cornerCoords[3] = { x(i , j + 1), y(i , j + 1) }; - - cornerValues[0] = fcnView(i , j ); - cornerValues[1] = fcnView(i + 1, j ); - cornerValues[2] = fcnView(i + 1, j + 1); - cornerValues[3] = fcnView(i , j + 1); + cornerCoords[0] = { x(i , j ), y(i , j ) }; + cornerCoords[1] = { x(i+1, j ), y(i+1, j ) }; + cornerCoords[2] = { x(i+1, j+1), y(i+1, j+1) }; + cornerCoords[3] = { x(i , j+1), y(i , j+1) }; + + cornerValues[0] = fcnView(i , j ); + cornerValues[1] = fcnView(i+1, j ); + cornerValues[2] = fcnView(i+1, j+1); + cornerValues[3] = fcnView(i , j+1); // clang-format on } template diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 422179ef8c..d5465dd969 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -20,6 +20,7 @@ #include "axom/slic.hpp" #include "axom/primal.hpp" #include "axom/mint/mesh/UnstructuredMesh.hpp" +#include "axom/mint/execution/internal/structured_exec.hpp" #include "axom/quest/MarchingCubes.hpp" #include "axom/quest/MeshViewUtil.hpp" #include "axom/sidre.hpp" @@ -215,8 +216,8 @@ struct Input } }; -//!@brief Our allocatorId, based on execution policy. -static int allocatorId = axom::INVALID_ALLOCATOR_ID; // Set in main. +//!@brief Our allocator id, based on execution policy. +static int s_allocatorId = axom::INVALID_ALLOCATOR_ID; // Set in main. static int allocatorIdForPolicy(quest::MarchingCubesRuntimePolicy policy) { //--------------------------------------------------------------------------- @@ -239,13 +240,15 @@ static int allocatorIdForPolicy(quest::MarchingCubesRuntimePolicy policy) #ifdef _AXOM_MC_USE_CUDA else if(policy == axom::quest::MarchingCubesRuntimePolicy::cuda) { - aid = axom::execution_space>::allocatorID(); + // aid = axom::execution_space>::allocatorID(); + aid = axom::getUmpireResourceAllocatorID(umpire::resource::Device); } #endif #ifdef _AXOM_MC_USE_HIP else if(policy == axom::quest::MarchingCubesRuntimePolicy::hip) { - aid = axom::execution_space>::allocatorID(); + // aid = axom::execution_space>::allocatorID(); + aid = axom::getUmpireResourceAllocatorID(umpire::resource::Device); } #endif #endif @@ -259,9 +262,9 @@ static int allocatorIdForPolicy(quest::MarchingCubesRuntimePolicy policy) //!@brief Put a conduit::Node array data into the specified memory space. template -void putConduitDataInNewMemorySpace(conduit::Node& node, - const std::string& path, - int allocId) +void moveConduitDataToNewMemorySpace(conduit::Node& node, + const std::string& path, + int allocId) { conduit::Node& dataNode = node.fetch_existing(path); SLIC_ASSERT(!dataNode.dtype().is_empty() && !dataNode.dtype().is_object() && @@ -308,14 +311,6 @@ struct BlueprintStructuredMesh } _maxSpacing = maxSpacing(); - - putMeshDataInNewMemorySpace(_coordsetPath + "/values/x", allocatorId); - putMeshDataInNewMemorySpace(_coordsetPath + "/values/y", allocatorId); - if(_ndims == 3) - { - putMeshDataInNewMemorySpace(_coordsetPath + "/values/z", - allocatorId); - } } /// Return the blueprint mesh in a conduit::Node @@ -324,6 +319,9 @@ struct BlueprintStructuredMesh /// Get number of domains in the multidomain mesh axom::IndexType domainCount() const { return _domCount; } + //// Whether mesh is empty locally. + bool empty() const { return _domCount == 0; } + /// Get domain group. conduit::Node& domain(axom::IndexType domainIdx) { @@ -625,11 +623,11 @@ struct BlueprintStructuredMesh supports, i.e., not custom user data. */ template - void putMeshDataInNewMemorySpace(const std::string& path, int allocId) + void moveMeshDataToNewMemorySpace(const std::string& path, int allocId) { for(auto& dom : _mdMesh.children()) { - putConduitDataInNewMemorySpace(dom, path, allocId); + moveConduitDataToNewMemorySpace(dom, path, allocId); } } @@ -660,8 +658,6 @@ struct BlueprintStructuredMesh SLIC_ASSERT(conduit::blueprint::mesh::is_multi_domain(_mdMesh)); _domCount = conduit::blueprint::mesh::number_of_domains(_mdMesh); -// std::cout<<__WHERE<<"mdMesh:"< 0) { _coordsAreStrided = _mdMesh[0].fetch_existing("topologies/mesh/elements/dims").has_child("strides"); @@ -725,8 +721,6 @@ void saveMesh(const conduit::Node& mesh, const std::string& filename) /// Write blueprint mesh to disk void saveMesh(const sidre::Group& mesh, const std::string& filename) { -// std::cout<<__WHERE<<"Saving mesh to " << filename << std::endl; -// mesh.print(); conduit::Node tmpMesh; mesh.createNativeLayout(tmpMesh); { @@ -815,6 +809,7 @@ template struct ContourTestBase { static constexpr auto MemorySpace = axom::execution_space::memory_space; + using PointType = axom::primal::Point; ContourTestBase() : m_parentCellIdField("parentCellIds") , m_domainIdField("domainIdField") @@ -829,16 +824,11 @@ struct ContourTestBase //!@brief Return function value at a point. virtual AXOM_HOST_DEVICE double value( - const axom::primal::Point& pt) const = 0; + const PointType& pt) const = 0; //!@brief Return error tolerance for contour mesh accuracy check. virtual double errorTolerance() const = 0; - //!@brief Set nodal distances given nodal coordinates. - virtual void fillNodalValuesFromCoords( - axom::ArrayView coordsViews[DIM], - axom::ArrayView& fieldView) const = 0; - const std::string m_parentCellIdField; const std::string m_domainIdField; @@ -846,6 +836,47 @@ struct ContourTestBase { SLIC_INFO(banner(axom::fmt::format("Testing {} contour.", name()))); + // Conduit data is in host memory, move to devices for testing. + if(s_allocatorId != axom::execution_space::allocatorID()) + { + const std::string axes[3] = {"x", "y", "z"}; + for(int d=0; d(computationalMesh.coordsetPath() + "/values/" + axes[d], s_allocatorId); + } + computationalMesh.moveMeshDataToNewMemorySpace(axom::fmt::format("fields/{}/values", functionName()), s_allocatorId); + } + +#if defined (AXOM_USE_UMPIRE) + /* + Make sure data is correctly on host or device. + We don't test with Unified memory because it's too forgiving. + */ + if(!computationalMesh.empty()) + { + std::string resourceName = "HOST"; + umpire::ResourceManager& rm = umpire::ResourceManager::getInstance(); + const std::string dataPath = axom::fmt::format("fields/{}/values", functionName()); + void* dataPtr = computationalMesh.domain(0).fetch_existing(dataPath).data_ptr(); + bool dataFromUmpire = rm.hasAllocator(dataPtr); + if(dataFromUmpire) + { + umpire::Allocator allocator = rm.getAllocator(dataPtr); + resourceName = allocator.getName(); + } + SLIC_INFO(axom::fmt::format("Testing with policy {} and function data on {}", params.policy, resourceName)); + if(params.policy == quest::MarchingCubesRuntimePolicy::seq || + params.policy == quest::MarchingCubesRuntimePolicy::omp ) + { + SLIC_ASSERT(resourceName == "HOST"); + } + else + { + SLIC_ASSERT(resourceName == "DEVICE"); + } + } +#endif + mc.setFunctionField(functionName()); axom::utilities::Timer computeTimer(false); @@ -861,6 +892,17 @@ struct ContourTestBase mc.getContourCellCount(), mc.getContourNodeCount())); + // Return conduit data to host memory. + if(s_allocatorId != axom::execution_space::allocatorID()) + { + const std::string axes[3] = {"x", "y", "z"}; + for(int d=0; d(computationalMesh.coordsetPath() + "/values/" + axes[d], axom::execution_space::allocatorID()); + } + computationalMesh.moveMeshDataToNewMemorySpace(axom::fmt::format("fields/{}/values", functionName()), axom::execution_space::allocatorID()); + } + // Put mesh mesh in a mint object for error checking and output. std::string sidreGroupName = name() + "_mesh"; sidre::DataStore objectDS; @@ -873,13 +915,6 @@ struct ContourTestBase mc.getContourCellCount()); mc.populateContourMesh(contourMesh, m_parentCellIdField, m_domainIdField); - // Move node function data back to host for verification. - if(allocatorId != axom::execution_space::allocatorID()) - { - computationalMesh.putMeshDataInNewMemorySpace( - axom::fmt::format("fields/{}/values", functionName()), axom::execution_space::allocatorID()); - } - int localErrCount = 0; if(params.checkResults) { @@ -917,31 +952,49 @@ struct ContourTestBase conduit::DataType::float64(mvu.getCoordsCountWithGhosts()), mvu.getCoordsStrides(), mvu.getCoordsOffsets() ); + } + for(int domId = 0; domId < bpMesh.domainCount(); ++domId) + { + conduit::Node& dom = bpMesh.domain(domId); + axom::quest::MeshViewUtil::memory_space> mvu(dom, "mesh"); const auto coordsViews = mvu.getConstCoordsViews(false); axom::ArrayView fieldView = mvu.template getFieldView(functionName(), false); + const auto& fieldShape = fieldView.shape(); + for(int d=0; d::allocatorID()) - { - bpMesh.putMeshDataInNewMemorySpace( - axom::fmt::format("fields/{}/values", functionName()), allocatorId); - } } template typename std::enable_if::type populateNodalDistance( const axom::StackArray, DIM>& coordsViews, axom::ArrayView& fieldView) { - SLIC_ASSERT(coordsViews[0].shape() == fieldView.shape()); - const auto& shape = fieldView.shape(); - for(axom::IndexType j=0; j::loop2d_policy; + RAJA::kernel( + RAJA::make_tuple(iRange, jRange), + AXOM_LAMBDA(axom::IndexType i, axom::IndexType j) { + PointType pt; + for(int d = 0; d < DIM; ++d) + { + pt[d] = coordsViews[d](i,j); + } + // auto v = value(pt); + fieldView(i,j) = 0.0; // value(pt); + }); +#else + for(axom::IndexType j=0; j pt; + PointType pt; for(int d = 0; d < DIM; ++d) { pt[d] = coordsViews[d](i,j); @@ -949,21 +1002,23 @@ struct ContourTestBase fieldView(i,j) = value(pt); } } +#endif } template typename std::enable_if::type populateNodalDistance( const axom::StackArray, DIM>& coordsViews, axom::ArrayView& fieldView) { - SLIC_ASSERT(coordsViews[0].shape() == fieldView.shape()); - const auto& shape = fieldView.shape(); - for(axom::IndexType k=0; k pt; + PointType pt; for(int d = 0; d < DIM; ++d) { pt[d] = coordsViews[d](i,j,k); @@ -1000,7 +1055,7 @@ struct ContourTestBase double tol = errorTolerance(); int errCount = 0; const axom::IndexType nodeCount = contourMesh.getNumberOfNodes(); - axom::primal::Point pt; + PointType pt; for(axom::IndexType i = 0; i < nodeCount; ++i) { contourMesh.getNode(i, pt.data()); @@ -1094,7 +1149,7 @@ struct ContourTestBase axom::StackArray upperIdx = parentCellIdx; addToStackArray(upperIdx, 1); - axom::primal::Point lower, upper; + PointType lower, upper; for(int d = 0; d < DIM; ++d) { lower[d] = coordsViews[d][parentCellIdx]; @@ -1113,7 +1168,7 @@ struct ContourTestBase for(axom::IndexType nn = 0; nn < cellNodeCount; ++nn) { - axom::primal::Point nodeCoords; + PointType nodeCoords; contourMesh.getNode(cellNodeIds[nn], nodeCoords.data()); if(!big.contains(nodeCoords) || small.contains(nodeCoords)) @@ -1301,9 +1356,11 @@ struct ContourTestBase template struct RoundContourTest : public ContourTestBase { - RoundContourTest(const axom::primal::Point& pt) + static constexpr auto MemorySpace = axom::execution_space::memory_space; + using PointType = axom::primal::Point; + RoundContourTest(const PointType& center) : ContourTestBase() - , _sphere(pt, 0.0) + , _sphere(center, 0.0) , _errTol(1e-3) { } virtual ~RoundContourTest() { } @@ -1317,7 +1374,7 @@ struct RoundContourTest : public ContourTestBase return std::string("dist_to_center"); } - AXOM_HOST_DEVICE double value(const axom::primal::Point& pt) const override + AXOM_HOST_DEVICE double value(const PointType& pt) const override { return _sphere.computeSignedDistance(pt); } @@ -1329,34 +1386,6 @@ struct RoundContourTest : public ContourTestBase double maxSpacing = bsm.maxSpacing(); _errTol = 0.1 * maxSpacing; } - - void fillNodalValuesFromCoords(axom::ArrayView coordsViews_[DIM], - axom::ArrayView& fieldView) const override - { - // TODO: Assert that coordsViews_ and fieldView have the same shape. - const axom::IndexType pointCount = fieldView.size(); - - axom::ArrayView coordsViews[DIM]; - for(int d = 0; d < DIM; ++d) - { - coordsViews[d] = coordsViews_[d]; - } - - // Duplicate member data so devices don't have to use the this pointer. - const auto sphere = _sphere; - - auto loopBody = AXOM_LAMBDA(int n) - { - axom::primal::Point pt; - for(int d = 0; d < DIM; ++d) - { - pt[d] = coordsViews[d].flatIndex(n); - } - fieldView.flatIndex(n) = sphere.computeSignedDistance(pt); - }; - - axom::for_all(0, pointCount, loopBody); - } }; /*! @@ -1365,13 +1394,15 @@ struct RoundContourTest : public ContourTestBase template struct PlanarContourTest : public ContourTestBase { + static constexpr auto MemorySpace = axom::execution_space::memory_space; + using PointType = axom::primal::Point; /*! @brief Constructor. @param inPlane [in] A point in the plane. @param perpDir [in] Perpendicular direction on positive side. */ - PlanarContourTest(const axom::primal::Point& inPlane, + PlanarContourTest(const PointType& inPlane, const axom::primal::Vector& perpDir) : ContourTestBase() , _plane(perpDir.unitVector(), inPlane) @@ -1386,39 +1417,12 @@ struct PlanarContourTest : public ContourTestBase return std::string("dist_to_plane"); } - AXOM_HOST_DEVICE double value(const axom::primal::Point& pt) const override + AXOM_HOST_DEVICE double value(const PointType& pt) const override { return _plane.signedDistance(pt); } double errorTolerance() const override { return 1e-15; } - - void fillNodalValuesFromCoords(axom::ArrayView coordsViews_[DIM], - axom::ArrayView& fieldView) const override - { - const axom::IndexType pointCount = fieldView.size(); - - axom::ArrayView coordsViews[DIM]; - for(int d = 0; d < DIM; ++d) - { - coordsViews[d] = coordsViews_[d]; - } - - // Duplicate member data so devices don't have to use the this pointer. - const auto plane = _plane; - - auto loopBody = AXOM_LAMBDA(int n) - { - axom::primal::Point pt; - for(int d = 0; d < DIM; ++d) - { - pt[d] = coordsViews[d].flatIndex(n); - } - fieldView.flatIndex(n) = plane.signedDistance(pt); - }; - - axom::for_all(0, pointCount, loopBody); - } }; /// Utility function to transform blueprint node storage. @@ -1607,7 +1611,9 @@ int main(int argc, char** argv) exit(retval); } - allocatorId = allocatorIdForPolicy(params.policy); + s_allocatorId = allocatorIdForPolicy(params.policy); + umpire::ResourceManager& rm = umpire::ResourceManager::getInstance(); + umpire::Allocator allocator = rm.getAllocator(s_allocatorId); //--------------------------------------------------------------------------- // Load computational mesh. From 2d24f171dc261cf5d0b9446874d0f4f707be00b1 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 1 Sep 2023 09:47:07 -0700 Subject: [PATCH 074/639] Reformat. --- src/axom/quest/MeshViewUtil.hpp | 458 ++++++++++-------- src/axom/quest/detail/MarchingCubesImpl.hpp | 56 ++- ...est_distributed_distance_query_example.cpp | 8 +- .../examples/quest_marching_cubes_example.cpp | 148 ++++-- 4 files changed, 389 insertions(+), 281 deletions(-) diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 225272fbfb..73aa5d57bd 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -27,29 +27,29 @@ namespace quest { namespace internal { - template - constexpr T BADINDEX = std::numeric_limits::max(); - template - inline axom::StackArray makeStackArray(T v=std::numeric_limits::max()) +template +constexpr T BADINDEX = std::numeric_limits::max(); +template +inline axom::StackArray makeStackArray(T v = std::numeric_limits::max()) +{ + axom::StackArray rval; + for(int d = 0; d < DIM; ++d) { - axom::StackArray rval; - for(int d=0; d - inline axom::StackArray makeStackArray(const T* v) + return rval; +} +template +inline axom::StackArray makeStackArray(const T* v) +{ + axom::StackArray rval; + for(int d = 0; d < DIM; ++d) { - axom::StackArray rval; - for(int d=0; d +template class MeshViewUtil { public: - using CoordsViewsType = axom::StackArray, DIM>; - using ConstCoordsViewsType = axom::StackArray, DIM>; + using CoordsViewsType = + axom::StackArray, DIM>; + using ConstCoordsViewsType = + axom::StackArray, DIM>; //@{ //@name Setting up @@ -88,37 +90,40 @@ class MeshViewUtil MeshViewUtil(conduit::Node& bpDomain, const std::string& topologyName = "") : m_dom(&bpDomain) , m_topologyName(topologyName) + { + if(m_topologyName.empty()) { - if(m_topologyName.empty()) - { - m_topologyName = bpDomain.fetch_existing("topologies")[0].name(); - } + m_topologyName = bpDomain.fetch_existing("topologies")[0].name(); + } - const std::string topoPath = "topologies/" + m_topologyName; - SLIC_ASSERT(m_dom->has_path(topoPath)); - m_topology = &m_dom->fetch_existing(topoPath); + const std::string topoPath = "topologies/" + m_topologyName; + SLIC_ASSERT(m_dom->has_path(topoPath)); + m_topology = &m_dom->fetch_existing(topoPath); - SLIC_ASSERT(m_topology->fetch_existing("type").as_string() == "structured"); + SLIC_ASSERT(m_topology->fetch_existing("type").as_string() == "structured"); - const std::string coordsetPath = - "coordsets/" + m_dom->fetch_existing(topoPath + "/coordset").as_string(); - m_coordset = &m_dom->fetch_existing(coordsetPath); + const std::string coordsetPath = + "coordsets/" + m_dom->fetch_existing(topoPath + "/coordset").as_string(); + m_coordset = &m_dom->fetch_existing(coordsetPath); - SLIC_ASSERT( m_coordset->fetch_existing("type").as_string() == "explicit"); + SLIC_ASSERT(m_coordset->fetch_existing("type").as_string() == "explicit"); - int dim = conduit::blueprint::mesh::coordset::dims(*m_coordset); - if(dim != DIM) - { - SLIC_ERROR(axom::fmt::format("MeshViewUtil template parameter DIM={} doesn't match mesh topology dimension ({})", - DIM, dim)); - } + int dim = conduit::blueprint::mesh::coordset::dims(*m_coordset); + if(dim != DIM) + { + SLIC_ERROR( + axom::fmt::format("MeshViewUtil template parameter DIM={} doesn't " + "match mesh topology dimension ({})", + DIM, + dim)); + } - m_cdom = m_dom; - m_ctopology = m_topology; - m_ccoordset = m_coordset; + m_cdom = m_dom; + m_ctopology = m_topology; + m_ccoordset = m_coordset; - computeCoordsDataLayout(); - } + computeCoordsDataLayout(); + } /*! @brief Constructor @@ -128,30 +133,32 @@ class MeshViewUtil MeshViewUtil(const conduit::Node& bpDomain, const std::string& topologyName) : m_cdom(&bpDomain) , m_topologyName(topologyName) - { - const std::string topoPath = "topologies/" + m_topologyName; - SLIC_ASSERT(m_cdom->has_path(topoPath)); - m_ctopology = &m_cdom->fetch_existing(topoPath); + { + const std::string topoPath = "topologies/" + m_topologyName; + SLIC_ASSERT(m_cdom->has_path(topoPath)); + m_ctopology = &m_cdom->fetch_existing(topoPath); - SLIC_ASSERT(m_ctopology->fetch_existing("type").as_string() == "structured"); + SLIC_ASSERT(m_ctopology->fetch_existing("type").as_string() == "structured"); - const std::string coordsetPath = - "coordsets/" + m_cdom->fetch_existing(topoPath + "/coordset").as_string(); - m_ccoordset = &m_cdom->fetch_existing(coordsetPath); + const std::string coordsetPath = + "coordsets/" + m_cdom->fetch_existing(topoPath + "/coordset").as_string(); + m_ccoordset = &m_cdom->fetch_existing(coordsetPath); - SLIC_ASSERT( m_ccoordset->fetch_existing("type").as_string() == "explicit"); + SLIC_ASSERT(m_ccoordset->fetch_existing("type").as_string() == "explicit"); - int dim = conduit::blueprint::mesh::coordset::dims(*m_ccoordset); - if(dim != DIM) - { - SLIC_ERROR(axom::fmt::format("MeshViewUtil mesh topology dimension ({}) doesn't match template parameter DIM={}", - dim, DIM)); - } - - computeCoordsDataLayout(); + int dim = conduit::blueprint::mesh::coordset::dims(*m_ccoordset); + if(dim != DIM) + { + SLIC_ERROR( + axom::fmt::format("MeshViewUtil mesh topology dimension ({}) doesn't " + "match template parameter DIM={}", + dim, + DIM)); } - //@} + computeCoordsDataLayout(); + } + //@} //@{ //!@name Blueprint data organization @@ -160,37 +167,21 @@ class MeshViewUtil @return the Conduit node at "topologies/". */ - const conduit::Node& getTopology() - { - return *m_topology; - } - const conduit::Node& getTopology() const - { - return *m_ctopology; - } + const conduit::Node& getTopology() { return *m_topology; } + const conduit::Node& getTopology() const { return *m_ctopology; } /*! @brief Get the coordinates conduit::Node for the named topology. */ - conduit::Node& getCoordSet() - { - return *m_coordset; - } - const conduit::Node& getCoordSet() const - { - return *m_ccoordset; - } + conduit::Node& getCoordSet() { return *m_coordset; } + const conduit::Node& getCoordSet() const { return *m_ccoordset; } /*! @brief Get the spatial dimension of the named topology. */ - conduit::index_t getTopologyDim() const - { - return DIM; - } + conduit::index_t getTopologyDim() const { return DIM; } //@} - //@{ //!@name Sizes and shapes /*! @@ -201,7 +192,8 @@ class MeshViewUtil */ axom::StackArray getDomainShape() const { - const conduit::Node& dimsNode = m_ctopology->fetch_existing("elements/dims"); + const conduit::Node& dimsNode = + m_ctopology->fetch_existing("elements/dims"); axom::StackArray rval; for(int i = 0; i < DIM; ++i) { @@ -215,7 +207,7 @@ class MeshViewUtil axom::StackArray rval = getDomainShape(); if(association == "vertex") { - for(int d=0; d strides; - for(int d=0; dfetch_existing("elements/dims"); + const conduit::Node& topologyDims = + m_ctopology->fetch_existing("elements/dims"); const conduit::int32* rval = nullptr; if(topologyDims.has_child("strides")) { @@ -328,7 +323,8 @@ class MeshViewUtil */ axom::IndexType getFieldCountWithGhosts(const std::string& fieldName) const { - const conduit::Node& valuesNode = m_cdom->fetch_existing("field/" + fieldName + "values"); + const conduit::Node& valuesNode = + m_cdom->fetch_existing("field/" + fieldName + "values"); axom::IndexType rval = valuesNode.dtype().number_of_elements(); return rval; } @@ -338,17 +334,20 @@ class MeshViewUtil If strides are not specified, assume direction 0 is fastest (Conduit's default striding). */ - axom::StackArray getFieldStrides(const std::string& fieldName) const + axom::StackArray getFieldStrides( + const std::string& fieldName) const { const conduit::Node& fieldNode = m_dom->fetch_existing("fields/" + fieldName); - const bool atVertex = fieldNode.fetch_existing("association").as_string() == "vertex"; - const conduit::int32* stridesPtr = fieldNode.has_child("strides") ? - fieldNode.fetch_existing("strides").as_int32_ptr() : nullptr; + const bool atVertex = + fieldNode.fetch_existing("association").as_string() == "vertex"; + const conduit::int32* stridesPtr = fieldNode.has_child("strides") + ? fieldNode.fetch_existing("strides").as_int32_ptr() + : nullptr; axom::StackArray rval; if(stridesPtr) { - for(int d=0; d, DIM> rval; - for(int d=0; d(dataPtr, m_coordsMemShape, m_coordsStrides); + rval[d] = axom::ArrayView(dataPtr, + m_coordsMemShape, + m_coordsStrides); } if(withGhosts == false) { - axom::StackArray offsets = conduitIndicesToMultidimIndices( - m_ctopology->fetch_existing("elements/dims"), "offsets", 0); + axom::StackArray offsets = + conduitIndicesToMultidimIndices( + m_ctopology->fetch_existing("elements/dims"), + "offsets", + 0); axom::StackArray counts = m_domainShape; - for(int d=0; d, DIM> rval; - for(int d=0; d(dataPtr, m_coordsMemShape, m_coordsStrides); + rval[d] = axom::ArrayView(dataPtr, + m_coordsMemShape, + m_coordsStrides); } if(withGhosts == false) { - axom::StackArray offsets = conduitIndicesToMultidimIndices( - m_ctopology->fetch_existing("elements/dims"), "offsets", 0); + axom::StackArray offsets = + conduitIndicesToMultidimIndices( + m_ctopology->fetch_existing("elements/dims"), + "offsets", + 0); axom::StackArray counts = m_domainShape; - for(int d=0; d + template axom::ArrayView getFieldView(const std::string& fieldName, bool withGhosts = false) { if(!m_dom) { - SLIC_ERROR("Cannot use getFieldView from MeshViewUtil initialized with a const conduit::Node. Use getConstFieldView."); + SLIC_ERROR( + "Cannot use getFieldView from MeshViewUtil initialized with a const " + "conduit::Node. Use getConstFieldView."); } -// std::cout<<__WHERE << " in getFieldView with " << fieldName << std::endl; -// m_dom->print(); conduit::Node& fieldNode = m_dom->fetch_existing("fields/" + fieldName); - const std::string association = fieldNode.fetch_existing("association").as_string(); + const std::string association = + fieldNode.fetch_existing("association").as_string(); conduit::Node& valuesNode = fieldNode.fetch_existing("values"); const axom::IndexType valuesCount = valuesNode.dtype().number_of_elements(); - SLIC_ASSERT_MSG(association == "vertex" || association == "element", - "MeshViewUtil only supports vertex and element-based fields right now."); + SLIC_ASSERT_MSG( + association == "vertex" || association == "element", + "MeshViewUtil only supports vertex and element-based fields right now."); const bool onVertex = association == "vertex"; - axom::StackArray strides = conduitIndicesToMultidimIndices(fieldNode, "strides"); + axom::StackArray strides = + conduitIndicesToMultidimIndices(fieldNode, "strides"); if(fieldNode.has_child("strides")) { - const conduit::int32* stridesPtr = fieldNode.fetch_existing("strides").as_int32_ptr(); - for(int d=0; d shape; - for(int d=0; d rval(dataPtr, shape, strides); if(withGhosts == false) { - axom::StackArray offsets = conduitIndicesToMultidimIndices(fieldNode, "offsets", 0); + axom::StackArray offsets = + conduitIndicesToMultidimIndices(fieldNode, "offsets", 0); axom::StackArray counts = m_domainShape; - for(int d=0; d - axom::ArrayView getConstFieldView(const std::string& fieldName, - bool withGhosts = false) + template + axom::ArrayView getConstFieldView( + const std::string& fieldName, + bool withGhosts = false) { -// std::cout<<__WHERE << " in getFieldView with " << fieldName << std::endl; -// m_cdom->print(); - const conduit::Node& fieldNode = m_cdom->fetch_existing("fields/" + fieldName); - const std::string association = fieldNode.fetch_existing("association").as_string(); + const conduit::Node& fieldNode = + m_cdom->fetch_existing("fields/" + fieldName); + const std::string association = + fieldNode.fetch_existing("association").as_string(); const conduit::Node& valuesNode = fieldNode.fetch_existing("values"); const axom::IndexType valuesCount = valuesNode.dtype().number_of_elements(); - SLIC_ASSERT_MSG(association == "vertex" || association == "element", - "MeshViewUtil only supports vertex and element-based fields right now."); + SLIC_ASSERT_MSG( + association == "vertex" || association == "element", + "MeshViewUtil only supports vertex and element-based fields right now."); const bool onVertex = association == "vertex"; - axom::StackArray strides = conduitIndicesToMultidimIndices(fieldNode, "strides"); + axom::StackArray strides = + conduitIndicesToMultidimIndices(fieldNode, "strides"); if(fieldNode.has_child("strides")) { - const conduit::int32* stridesPtr = fieldNode.fetch_existing("strides").as_int32_ptr(); - for(int d=0; d shape; - for(int d=0; d rval(dataPtr, shape, strides); if(withGhosts == false) { - axom::StackArray offsets = conduitIndicesToMultidimIndices(fieldNode, "offsets", 0); + axom::StackArray offsets = + conduitIndicesToMultidimIndices(fieldNode, "offsets", 0); axom::StackArray counts = m_domainShape; - for(int d=0; d& strides, - const axom::StackArray& offsets) + void createField(const std::string& fieldName, + const std::string& association, + const conduit::DataType& dtype, + const axom::StackArray& strides, + const axom::StackArray& offsets) + { + if(m_dom->has_path("fields/" + fieldName)) { - if(m_dom->has_path("fields/" + fieldName)) - { - SLIC_ERROR(axom::fmt::format("Cannot create field {}. It already exists.", fieldName)); - } - if(association != "vertex" && association != "element") - { - SLIC_ERROR(axom::fmt::format("Not yet supporting association '{}'.", association)); - } + SLIC_ERROR( + axom::fmt::format("Cannot create field {}. It already exists.", + fieldName)); + } + if(association != "vertex" && association != "element") + { + SLIC_ERROR( + axom::fmt::format("Not yet supporting association '{}'.", association)); + } - auto realExtents = getRealExtents(association); + auto realExtents = getRealExtents(association); - conduit::Node& fieldNode = m_dom->fetch("fields/" + fieldName); - fieldNode["association"] = association; - fieldNode["topology"] = m_topologyName; + conduit::Node& fieldNode = m_dom->fetch("fields/" + fieldName); + fieldNode["association"] = association; + fieldNode["topology"] = m_topologyName; + { + fieldNode["strides"].set(conduit::DataType::int32(DIM)); + std::int32_t* tmpPtr = fieldNode["strides"].as_int32_ptr(); + for(int d = 0; d < DIM; ++d) { - fieldNode["strides"].set(conduit::DataType::int32(DIM)); - std::int32_t* tmpPtr = fieldNode["strides"].as_int32_ptr(); - for(int d=0; dprint(); } + auto extras = dtype.number_of_elements() - + strides[slowDir] * (offsets[slowDir] + realExtents[slowDir]); + if(extras < 0) + { + SLIC_ERROR( + axom::fmt::format("Insufficient space allocated for data, given the " + "offsets and strides.")); + } + + fieldNode["values"].set(dtype); + } //@} private: @@ -634,8 +674,9 @@ class MeshViewUtil axom::StackArray m_coordsMemShape; axom::StackArray conduitIndicesToMultidimIndices( - const conduit::Node& node, const std::string& path, - axom::IndexType defaultVal=std::numeric_limits::max()) const + const conduit::Node& node, + const std::string& path, + axom::IndexType defaultVal = std::numeric_limits::max()) const { if(node.has_path(path)) { @@ -647,11 +688,13 @@ class MeshViewUtil void computeCoordsDataLayout() { - const conduit::Node& topologyDims = m_ctopology->fetch_existing("elements/dims"); + const conduit::Node& topologyDims = + m_ctopology->fetch_existing("elements/dims"); - const std::string coordsetName = m_ctopology->fetch_existing("coordset").as_string(); - const conduit::Node& coordsValues = - m_cdom->fetch_existing(axom::fmt::format("coordsets/{}/values", coordsetName)); + const std::string coordsetName = + m_ctopology->fetch_existing("coordset").as_string(); + const conduit::Node& coordsValues = m_cdom->fetch_existing( + axom::fmt::format("coordsets/{}/values", coordsetName)); const axom::IndexType coordValuesCount = coordsValues[0].dtype().number_of_elements(); @@ -668,26 +711,29 @@ class MeshViewUtil if(topologyDims.has_child("strides")) { - const conduit::int32* stridesPtr = topologyDims.fetch_existing("strides").as_int32_ptr(); - for(int d=0; d& a) return; } -template -class StructuredIndexer { +template +class StructuredIndexer +{ axom::StackArray m_strides; axom::StackArray m_slowestDirs; + public: //!@brief Constructor for row- or column major indexing. StructuredIndexer(const axom::StackArray& lengths, bool rowMajor) { if(rowMajor) { - for(int d=0; d=0; --d) + for(int d = 0; d < DIM; ++d) { - m_strides[d] = m_strides[d+1] * lengths[d+1]; + m_slowestDirs[d] = d; + } + m_strides[DIM - 1] = 1; + for(int d = DIM - 2; d >= 0; --d) + { + m_strides[d] = m_strides[d + 1] * lengths[d + 1]; } } } @@ -74,10 +82,13 @@ class StructuredIndexer { StructuredIndexer(const axom::StackArray& strides) : m_strides(strides) { - for(int d=0; d toMultiIndex(T flatIndex) const { axom::StackArray multiIndex; - for(int d = 0; d::max()) { } - axom::IndexType parentCellNum; //!< @brief Flat index of parent cell in m_caseIds. - std::uint16_t caseNum; //!< @brief Index in cases2D or cases3D + axom::IndexType parentCellNum; //!< @brief Flat index of parent cell in m_caseIds. + std::uint16_t caseNum; //!< @brief Index in cases2D or cases3D axom::IndexType firstSurfaceCellId; //!< @brief First index for generated cells. }; private: const int m_allocatorID; //!< @brief ExecSpace-based allocator ID for all internal data MIdx m_bShape; //!< @brief Blueprint cell data shape. - MIdx m_cShape; //!< @brief Cell-centered array shape for ArrayViews. - MIdx m_pShape; //!< @brief Node-centered array shape for ArrayViews. - MIdx m_bStrides; //!< @brief Strides for m_bShape arrays. + MIdx m_cShape; //!< @brief Cell-centered array shape for ArrayViews. + MIdx m_pShape; //!< @brief Node-centered array shape for ArrayViews. + MIdx m_bStrides; //!< @brief Strides for m_bShape arrays. MIdx m_fastestDir; //!< @brief Directions, from fastest to slowest striding. // Views of parent domain data. diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index 98dadeb28c..702f1a449f 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -326,10 +326,14 @@ struct BlueprintParticleMesh conduit::blueprint::mesh::number_of_domains(mdMesh); if(domCount > 0) { - m_coordsAreStrided = mdMesh[0].fetch_existing("topologies/mesh/elements/dims").has_child("strides"); + m_coordsAreStrided = mdMesh[0] + .fetch_existing("topologies/mesh/elements/dims") + .has_child("strides"); if(m_coordsAreStrided) { - SLIC_WARNING(axom::fmt::format("Mesh '{}' is strided. Stride support is under development.", meshFilename)); + SLIC_WARNING(axom::fmt::format( + "Mesh '{}' is strided. Stride support is under development.", + meshFilename)); } } diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index d5465dd969..168e5e1389 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -276,7 +276,10 @@ void moveConduitDataToNewMemorySpace(conduit::Node& node, T* newPtr = axom::allocate(count, allocId); axom::copy(newPtr, oldPtr, count * sizeof(T)); dataNode.set_external(newPtr, count); - if(deleteOld) { axom::deallocate(oldPtr); } + if(deleteOld) + { + axom::deallocate(oldPtr); + } } Input params; @@ -660,10 +663,14 @@ struct BlueprintStructuredMesh if(_domCount > 0) { - _coordsAreStrided = _mdMesh[0].fetch_existing("topologies/mesh/elements/dims").has_child("strides"); + _coordsAreStrided = _mdMesh[0] + .fetch_existing("topologies/mesh/elements/dims") + .has_child("strides"); if(_coordsAreStrided) { - SLIC_WARNING(axom::fmt::format("Mesh '{}' is strided. Stride support is under development.", meshFilename)); + SLIC_WARNING(axom::fmt::format( + "Mesh '{}' is strided. Stride support is under development.", + meshFilename)); } const conduit::Node coordsetNode = _mdMesh[0].fetch_existing(_coordsetPath); _ndims = conduit::blueprint::mesh::coordset::dims(coordsetNode); @@ -808,7 +815,8 @@ axom::StackArray flatToMultidimIndex( template struct ContourTestBase { - static constexpr auto MemorySpace = axom::execution_space::memory_space; + static constexpr auto MemorySpace = + axom::execution_space::memory_space; using PointType = axom::primal::Point; ContourTestBase() : m_parentCellIdField("parentCellIds") @@ -823,8 +831,7 @@ struct ContourTestBase virtual std::string functionName() const = 0; //!@brief Return function value at a point. - virtual AXOM_HOST_DEVICE double value( - const PointType& pt) const = 0; + virtual AXOM_HOST_DEVICE double value(const PointType& pt) const = 0; //!@brief Return error tolerance for contour mesh accuracy check. virtual double errorTolerance() const = 0; @@ -840,14 +847,18 @@ struct ContourTestBase if(s_allocatorId != axom::execution_space::allocatorID()) { const std::string axes[3] = {"x", "y", "z"}; - for(int d=0; d(computationalMesh.coordsetPath() + "/values/" + axes[d], s_allocatorId); + computationalMesh.moveMeshDataToNewMemorySpace( + computationalMesh.coordsetPath() + "/values/" + axes[d], + s_allocatorId); } - computationalMesh.moveMeshDataToNewMemorySpace(axom::fmt::format("fields/{}/values", functionName()), s_allocatorId); + computationalMesh.moveMeshDataToNewMemorySpace( + axom::fmt::format("fields/{}/values", functionName()), + s_allocatorId); } -#if defined (AXOM_USE_UMPIRE) +#if defined(AXOM_USE_UMPIRE) /* Make sure data is correctly on host or device. We don't test with Unified memory because it's too forgiving. @@ -856,17 +867,22 @@ struct ContourTestBase { std::string resourceName = "HOST"; umpire::ResourceManager& rm = umpire::ResourceManager::getInstance(); - const std::string dataPath = axom::fmt::format("fields/{}/values", functionName()); - void* dataPtr = computationalMesh.domain(0).fetch_existing(dataPath).data_ptr(); + const std::string dataPath = + axom::fmt::format("fields/{}/values", functionName()); + void* dataPtr = + computationalMesh.domain(0).fetch_existing(dataPath).data_ptr(); bool dataFromUmpire = rm.hasAllocator(dataPtr); if(dataFromUmpire) { umpire::Allocator allocator = rm.getAllocator(dataPtr); resourceName = allocator.getName(); } - SLIC_INFO(axom::fmt::format("Testing with policy {} and function data on {}", params.policy, resourceName)); + SLIC_INFO( + axom::fmt::format("Testing with policy {} and function data on {}", + params.policy, + resourceName)); if(params.policy == quest::MarchingCubesRuntimePolicy::seq || - params.policy == quest::MarchingCubesRuntimePolicy::omp ) + params.policy == quest::MarchingCubesRuntimePolicy::omp) { SLIC_ASSERT(resourceName == "HOST"); } @@ -896,11 +912,15 @@ struct ContourTestBase if(s_allocatorId != axom::execution_space::allocatorID()) { const std::string axes[3] = {"x", "y", "z"}; - for(int d=0; d(computationalMesh.coordsetPath() + "/values/" + axes[d], axom::execution_space::allocatorID()); + computationalMesh.moveMeshDataToNewMemorySpace( + computationalMesh.coordsetPath() + "/values/" + axes[d], + axom::execution_space::allocatorID()); } - computationalMesh.moveMeshDataToNewMemorySpace(axom::fmt::format("fields/{}/values", functionName()), axom::execution_space::allocatorID()); + computationalMesh.moveMeshDataToNewMemorySpace( + axom::fmt::format("fields/{}/values", functionName()), + axom::execution_space::allocatorID()); } // Put mesh mesh in a mint object for error checking and output. @@ -945,33 +965,44 @@ struct ContourTestBase for(int domId = 0; domId < bpMesh.domainCount(); ++domId) { conduit::Node& dom = bpMesh.domain(domId); - axom::quest::MeshViewUtil::memory_space> mvu(dom, "mesh"); + axom::quest::MeshViewUtil::memory_space> + mvu(dom, "mesh"); // Create nodal function data with ghosts like node coords. - mvu.createField( functionName(), "vertex", - conduit::DataType::float64(mvu.getCoordsCountWithGhosts()), - mvu.getCoordsStrides(), - mvu.getCoordsOffsets() ); + mvu.createField(functionName(), + "vertex", + conduit::DataType::float64(mvu.getCoordsCountWithGhosts()), + mvu.getCoordsStrides(), + mvu.getCoordsOffsets()); } for(int domId = 0; domId < bpMesh.domainCount(); ++domId) { conduit::Node& dom = bpMesh.domain(domId); - axom::quest::MeshViewUtil::memory_space> mvu(dom, "mesh"); + axom::quest::MeshViewUtil::memory_space> + mvu(dom, "mesh"); const auto coordsViews = mvu.getConstCoordsViews(false); - axom::ArrayView fieldView = mvu.template getFieldView(functionName(), false); + axom::ArrayView fieldView = + mvu.template getFieldView(functionName(), false); const auto& fieldShape = fieldView.shape(); - for(int d=0; d typename std::enable_if::type populateNodalDistance( - const axom::StackArray, DIM>& coordsViews, + const axom::StackArray, DIM>& + coordsViews, axom::ArrayView& fieldView) { const auto& fieldShape = fieldView.shape(); - for(int d=0; d typename std::enable_if::type populateNodalDistance( - const axom::StackArray, DIM>& coordsViews, + const axom::StackArray, DIM>& + coordsViews, axom::ArrayView& fieldView) { const auto& fieldShape = fieldView.shape(); - for(int d=0; d::ConstCoordsViewsType> allCoordsViews(domainCount); - for(int n=0; n::ConstCoordsViewsType> + allCoordsViews(domainCount); + for(int n = 0; n < domainCount; ++n) { - const auto &dom = computationalMesh.domain(n); + const auto& dom = computationalMesh.domain(n); axom::quest::MeshViewUtil mvu(dom, "mesh"); allCoordsViews[n] = mvu.getConstCoordsViews(false); } @@ -1142,10 +1178,11 @@ struct ContourTestBase for(axom::IndexType cn = 0; cn < cellCount; ++cn) { axom::IndexType domainId = domainIdView[cn]; - typename axom::quest::MeshViewUtil::ConstCoordsViewsType& coordsViews - = allCoordsViews[domainId]; + typename axom::quest::MeshViewUtil::ConstCoordsViewsType& + coordsViews = allCoordsViews[domainId]; - axom::StackArray parentCellIdx = parentCellIdxView[cn]; + axom::StackArray parentCellIdx = + parentCellIdxView[cn]; axom::StackArray upperIdx = parentCellIdx; addToStackArray(upperIdx, 1); @@ -1208,7 +1245,8 @@ struct ContourTestBase const axom::IndexType domainCount = computationalMesh.domainCount(); // Nodal values of functions for each domain. - axom::Array> fcnViews(domainCount); + axom::Array> fcnViews( + domainCount); // Whether a computational cell has parts of the contour mesh. axom::Array> hasContours(domainCount); @@ -1230,9 +1268,10 @@ struct ContourTestBase // domLengths = domLengths + 1; addToStackArray(domLengths, 1); - fcnViews[domId] = mvu.template getConstFieldView(functionName(), false); + fcnViews[domId] = + mvu.template getConstFieldView(functionName(), false); // double* fcnPtr = - // dom.fetch_existing("fields/" + functionName() + "/values").as_double_ptr(); + // dom.fetch_existing("fields/" + functionName() + "/values").as_double_ptr(); // fcnViews[domId] = axom::ArrayView(fcnPtr, domLengths); } for(axom::IndexType cn = 0; cn < cellCount; ++cn) @@ -1356,7 +1395,8 @@ struct ContourTestBase template struct RoundContourTest : public ContourTestBase { - static constexpr auto MemorySpace = axom::execution_space::memory_space; + static constexpr auto MemorySpace = + axom::execution_space::memory_space; using PointType = axom::primal::Point; RoundContourTest(const PointType& center) : ContourTestBase() @@ -1394,7 +1434,8 @@ struct RoundContourTest : public ContourTestBase template struct PlanarContourTest : public ContourTestBase { - static constexpr auto MemorySpace = axom::execution_space::memory_space; + static constexpr auto MemorySpace = + axom::execution_space::memory_space; using PointType = axom::primal::Point; /*! @brief Constructor. @@ -1524,7 +1565,10 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) params.planeNormal()); planarTest->computeNodalDistance(computationalMesh); } - if(params.isVerbose()) { computationalMesh.printMeshInfo(); } + if(params.isVerbose()) + { + computationalMesh.printMeshInfo(); + } // Write computational mesh with contour functions. saveMesh(computationalMesh.asConduitNode(), params.fieldsFile); From d86180a9a92eef46464ec0c03287ff9e632efa30 Mon Sep 17 00:00:00 2001 From: "Noah S. Elliott" Date: Fri, 1 Sep 2023 10:13:44 -0700 Subject: [PATCH 075/639] Add deep copy methods for Group and View --- src/axom/sidre/core/Group.cpp | 83 ++++++++++++++++++ src/axom/sidre/core/Group.hpp | 49 +++++++++-- src/axom/sidre/core/View.cpp | 97 +++++++++++++++++++++ src/axom/sidre/core/View.hpp | 12 +++ src/axom/sidre/tests/sidre_group.cpp | 126 +++++++++++++++++++++++++++ 5 files changed, 362 insertions(+), 5 deletions(-) diff --git a/src/axom/sidre/core/Group.cpp b/src/axom/sidre/core/Group.cpp index 562ae37925..598be0448e 100644 --- a/src/axom/sidre/core/Group.cpp +++ b/src/axom/sidre/core/Group.cpp @@ -966,6 +966,39 @@ View* Group::copyView(View* view) return copy; } +/* + ************************************************************************* + * + * Create a deep copy of given View and attach to this Group. + * + * The deep copy performs a copy of all described data. + * + ************************************************************************* + */ +View* Group::deepCopyView(View* view) +{ + if(view == nullptr || hasChildView(view->getName())) + { + SLIC_CHECK_MSG( + view != nullptr, + SIDRE_GROUP_LOG_PREPEND << "Null pointer provided, no View to copy."); + + if(view != nullptr) + { + SLIC_CHECK_MSG(!hasChildView(view->getName()), + SIDRE_GROUP_LOG_PREPEND + << "Group already has a View named '" << view->getName() + << "' so View copy operation cannot happen"); + } + + return nullptr; + } + + View* copy = createView(view->getName()); + view->deepCopyView(copy); + return copy; +} + //////////////////////////////////////////////////////////////////////// // // Child Group query methods. @@ -1373,6 +1406,56 @@ Group* Group::copyGroup(Group* group) return res; } +/* + ************************************************************************* + * + * Create a deep copy of given Group and make it a child of this Group. + * + * The deep copy of a Group will copy the group hierarchy and deep copy + * all Views within the hierarchy. + * + ************************************************************************* + */ +Group* Group::deepCopyGroup(Group* group) +{ + if(group == nullptr || hasChildGroup(group->getName())) + { + SLIC_CHECK_MSG( + group != nullptr, + SIDRE_GROUP_LOG_PREPEND << "Null pointer provided, no Group to copy."); + + if(group != nullptr) + { + SLIC_CHECK_MSG(!hasChildGroup(group->getName()), + SIDRE_GROUP_LOG_PREPEND + << "Invalid copy operation. Group already has " + << "a child named '" << group->getName() << "'."); + } + + return nullptr; + } + + Group* res = createGroup(group->getName()); + + // copy child Groups to new Group + IndexType gidx = group->getFirstValidGroupIndex(); + while(indexIsValid(gidx)) + { + res->deepCopyGroup(group->getGroup(gidx)); + gidx = group->getNextValidGroupIndex(gidx); + } + + // copy Views to new Group + IndexType vidx = group->getFirstValidViewIndex(); + while(indexIsValid(vidx)) + { + res->deepCopyView(group->getView(vidx)); + vidx = group->getNextValidViewIndex(vidx); + } + + return res; +} + /* ************************************************************************* * diff --git a/src/axom/sidre/core/Group.hpp b/src/axom/sidre/core/Group.hpp index 782dd833c7..c1f3f73be6 100644 --- a/src/axom/sidre/core/Group.hpp +++ b/src/axom/sidre/core/Group.hpp @@ -896,14 +896,34 @@ class Group * the View is not copied. The new View object is associated with * the same data as the original. * - * If given Group pointer is null or Group already has a child Group with - * same name as given Group, method is a no-op. + * If given View pointer is null or Group already has a View with + * same name as given View, method is a no-op. * - * \return pointer to given argument Group object or nullptr if Group - * is not moved into this Group. + * \return pointer to given argument View object or nullptr if View + * is not copied into this Group. */ View* copyView(View* view); + /*! + * \brief Create a deep copy of given View object and add it to this Group. + * + * Note that for Views that use sidre Buffers or external data, the + * deep copy performs a copy of the data described by the View + * into a new Buffer attached to the destination View. If the source View + * describes only part of a Buffer or part of an external array, due to + * strides and or offsets into the data, only the values seen by the + * description will be copied into the new View. The new View will have + * a Buffer that is the exact size of the number of values that are copied, + * with an offset of zero and a stride of one. + * + * If given View pointer is null or Group already has a View with + * same name as given View, method is a no-op. + * + * \return pointer to given argument Group object or nullptr if View + * is not copied into this Group. + */ + View* deepCopyView(View* view); + //@} //@{ @@ -1242,10 +1262,29 @@ class Group * same name as given Group, method is a no-op. * * \return pointer to given argument Group object or nullptr if Group - * is not moved into this Group. + * is not copied into this Group. */ Group* copyGroup(Group* group); + /*! + * \brief Create a deep copy of Group hierarchy rooted at given Group and + * make it a child of this Group. + * + * Note that all Views in the Group hierarchy are deep copied as well. + * + * The deep copy of the Group creates a duplicate of the entire Group + * hierarchy and performs a deep copy of the data described by the Views + * in the hierarchy. The Views in the new Group hierarchy will all allocate + * and use new Buffers to hold their copied data. + * + * If given Group pointer is null or Group already has a child Group with + * same name as given Group, method is a no-op. + * + * \return pointer to given argument Group object or nullptr if Group + * is not copied into this Group. + */ + Group* deepCopyGroup(Group* group); + //@} //@{ diff --git a/src/axom/sidre/core/View.cpp b/src/axom/sidre/core/View.cpp index 6e1ea37ddf..96d5edea54 100644 --- a/src/axom/sidre/core/View.cpp +++ b/src/axom/sidre/core/View.cpp @@ -1037,6 +1037,103 @@ void View::copyView(View* copy) const } } +/* + ************************************************************************* + * + * PRIVATE method copy the contents of this into a undescribed EMPTY view. + * + ************************************************************************* + */ +void View::deepCopyView(View* copy) const +{ + SLIC_ASSERT_MSG(copy->m_state == EMPTY && !copy->isDescribed(), + SIDRE_VIEW_LOG_PREPEND + << "deepCopyView can only copy into undescribed view " + << "with empty state."); +#if 1 + if(isDescribed()) + { + copy->describe(m_schema.dtype()); + if(hasBuffer() || m_state == EXTERNAL) + { + copy->allocate(getTypeID(), getNumElements()); + } + } + + switch(m_state) + { + case EMPTY: + // Nothing more to do + break; + case STRING: + case SCALAR: + copy->m_node = m_node; + copy->m_state = m_state; + copy->m_is_applied = true; + break; + case EXTERNAL: + if(!copy->isAllocated()) + { + copy->allocate(); + } + if(isApplied()) + { + copy->apply(); + } + { + IndexType stride = getStride(); + IndexType src_offset = getOffset(); + IndexType dst_offset = copy->getOffset(); + IndexType num_bytes = getBytesPerElement(); + IndexType j = 0; + for(IndexType i = 0; i < getNumElements(); ++i) + { + char* copy_dst = + static_cast(copy->getVoidPtr()) + (dst_offset + i) * num_bytes; + const char* copy_src = + static_cast(getVoidPtr()) + (src_offset + j) * num_bytes; + axom::copy(copy_dst, copy_src, num_bytes); + + j += stride; + } + } + break; + case BUFFER: + if(isAllocated() && !copy->isAllocated()) + { + copy->allocate(); + } + if(isApplied()) + { + copy->apply(); + } + if(hasBuffer()) + { + IndexType stride = getStride(); + IndexType src_offset = getOffset(); + IndexType dst_offset = copy->getOffset(); + IndexType num_bytes = getBytesPerElement(); + IndexType j = 0; + for(IndexType i = 0; i < getNumElements(); ++i) + { + char* copy_dst = + static_cast(copy->getVoidPtr()) + (dst_offset + i) * num_bytes; + const char* copy_src = + static_cast(getVoidPtr()) + (src_offset + j) * num_bytes; + axom::copy(copy_dst, copy_src, num_bytes); + + j += stride; + } + } + break; + default: + SLIC_ASSERT_MSG(false, + SIDRE_VIEW_LOG_PREPEND << "View is in unexpected state: " + << getStateStringName(m_state)); + } +#endif +} + /* ************************************************************************* * diff --git a/src/axom/sidre/core/View.hpp b/src/axom/sidre/core/View.hpp index 3d153e46a6..efa84434b4 100644 --- a/src/axom/sidre/core/View.hpp +++ b/src/axom/sidre/core/View.hpp @@ -1370,6 +1370,18 @@ class View */ void copyView(View* copy) const; + /*! + * \brief Deep copy view contents into an undescribed EMPTY view. + * + * For SCALAR and STRING the data is copied and the state is preserved. + * For BUFFER and EXTERNAL, the data described by this View is copied into a + * new Buffer that is of the size needed to hold the copied data. Any + * parts of the source Buffer or external array that are not seen due + * to offsets and strides in the description will not be copied. The copied + * View will have BUFFER state with zero offset and a stride of one. + */ + void deepCopyView(View* copy) const; + /*! * \brief Add view description and references to it's data to a conduit tree. */ diff --git a/src/axom/sidre/tests/sidre_group.cpp b/src/axom/sidre/tests/sidre_group.cpp index 01a1ac24a8..5294897e78 100644 --- a/src/axom/sidre/tests/sidre_group.cpp +++ b/src/axom/sidre/tests/sidre_group.cpp @@ -1489,6 +1489,132 @@ TEST(sidre_group, groups_move_copy) delete ds; } +//------------------------------------------------------------------------------ +TEST(sidre_group, group_deep_copy) +{ + DataStore* ds = new DataStore(); + Group* flds = ds->getRoot()->createGroup("fields"); + + Group* ga = flds->createGroup("a"); + Group* gb = flds->createGroup("b"); + + double dval0 = 100.0; + double dval1 = 301.0; + + ga->createView("i0")->setScalar(1); + ga->createView("d0")->setScalar(dval0); + gb->createView("d1")->setScalar(dval1); + gb->createView("s0")->setString("my string"); + + // check that all sub groups exist + EXPECT_TRUE(flds->hasGroup("a")); + EXPECT_TRUE(flds->hasGroup("b")); + + int viewlen = 8; + View* ownsbuf = ga->createViewAndAllocate("ownsbuf", DataType::c_int(viewlen)); + + int* int_vals = ownsbuf->getData(); + for(int i = 0; i < viewlen; ++i) + { + int_vals[i] = i + 1; + } + + IndexType buflen = 24; + Buffer* dbuff = ds->createBuffer()->allocate(FLOAT64_ID, buflen); + + dbuff->allocate(); + conduit::float64* buf_ptr = dbuff->getData(); + + for(int i = 0; i < buflen; ++i) + { + buf_ptr[i] = 2.0 * conduit::float64(i); + } + + const int NUM_VIEWS = 4; + int size[NUM_VIEWS] = {5, 4, 10, 11}; + int stride[NUM_VIEWS] = {3, 2, 2, 1}; + int offset[NUM_VIEWS] = {2, 9, 0, 10}; + std::string names[NUM_VIEWS] = {"viewa", "viewb", "viewc", "viewd"}; + + for(int i = 0; i < NUM_VIEWS; ++i) + { + ga->createView(names[i], dbuff)->apply(size[i], offset[i], stride[i]); + } + + const int extlen = 30; + conduit::float64 ext_array[extlen]; + for(int i = 0; i < extlen; ++i) + { + ext_array[i] = -1.0 * conduit::float64(i); + } + + for(int i = 0; i < NUM_VIEWS; ++i) + { + gb->createView(names[i], ext_array) + ->apply(FLOAT64_ID, size[i], offset[i], stride[i]); + } + + Group* deep_copy = ds->getRoot()->createGroup("deep_copy"); + deep_copy->deepCopyGroup(flds); + + EXPECT_TRUE(deep_copy->hasGroup("fields/a")); + EXPECT_TRUE(deep_copy->hasGroup("fields/b")); + + Group* copy_ga = deep_copy->getGroup("fields/a"); + Group* copy_gb = deep_copy->getGroup("fields/b"); + + int io_val = copy_ga->getView("i0")->getScalar(); + EXPECT_EQ(io_val, 1); + EXPECT_NEAR(copy_ga->getView("d0")->getScalar(), dval0, 1.0e-12); + EXPECT_NEAR(copy_gb->getView("d1")->getScalar(), dval1, 1.0e-12); + EXPECT_EQ(copy_gb->getView("s0")->getString(), std::string("my string")); + + for(int i = 0; i < NUM_VIEWS; ++i) + { + EXPECT_TRUE(copy_ga->hasView(names[i])); + View* copy_view = copy_ga->getView(names[i]); + EXPECT_TRUE(copy_view->hasBuffer()); + + // The deep copy creates a compact buffer in the copied View, associated + // only with that View. + Buffer* buffer = copy_view->getBuffer(); + EXPECT_EQ(buffer->getNumViews(), 1); + EXPECT_EQ(buffer->getNumElements(), size[i]); + EXPECT_EQ(copy_view->getOffset(), 0); + EXPECT_EQ(copy_view->getStride(), 1); + + conduit::float64* fdata = copy_view->getData(); + for(int j = 0; j < size[i]; ++j) + { + EXPECT_NEAR(fdata[j], 2.0 * (offset[i] + j * stride[i]), 1.0e-12); + } + } + + for(int i = 0; i < NUM_VIEWS; ++i) + { + EXPECT_TRUE(copy_gb->hasView(names[i])); + View* copy_view = copy_gb->getView(names[i]); + EXPECT_TRUE(copy_view->hasBuffer()); + + // The deep copy creates a compact buffer in the copied View, associated + // only with that View. Here external data was copied to internal + // buffers. + Buffer* buffer = copy_view->getBuffer(); + EXPECT_EQ(buffer->getNumViews(), 1); + EXPECT_EQ(buffer->getNumElements(), size[i]); + EXPECT_EQ(copy_view->getOffset(), 0); + EXPECT_EQ(copy_view->getStride(), 1); + + conduit::float64* fdata = copy_view->getData(); + for(int j = 0; j < size[i]; ++j) + { + EXPECT_NEAR(fdata[j], -1.0 * (offset[i] + j * stride[i]), 1.0e-12); + } + } + + delete ds; +} + //------------------------------------------------------------------------------ TEST(sidre_group, create_destroy_view_and_buffer2) { From 2450f184e97a92e6f806f375585556d64c01f9f3 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 1 Sep 2023 10:13:14 -0700 Subject: [PATCH 076/639] Clean up and remove unneeded code. --- src/axom/quest/MeshViewUtil.hpp | 105 +++++++---- src/axom/quest/detail/MarchingCubesImpl.hpp | 118 ++++--------- ...est_distributed_distance_query_example.cpp | 1 - .../examples/quest_marching_cubes_example.cpp | 167 ++---------------- 4 files changed, 118 insertions(+), 273 deletions(-) diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 73aa5d57bd..2d4e95714c 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -8,12 +8,15 @@ #include "axom/config.hpp" #include "axom/core.hpp" -#include "axom/core/WhereMacro.hpp" #include "axom/fmt.hpp" #include "conduit_blueprint_mesh.hpp" #include "conduit_blueprint_mcarray.hpp" +#ifdef AXOM_USE_MPI + #include "conduit_blueprint_mpi.hpp" + #include "conduit_relay_mpi_io_blueprint.hpp" +#endif #include #include @@ -64,7 +67,7 @@ inline axom::StackArray makeStackArray(const T* v) meshes. They are also topology specific, with the topology name given to the constructor. - TODO: Figure out a more appropriate place for this file. + TODO: Figure out if there's a better place for this utility. It's only in axom/quest because the initial need was there. */ template @@ -97,31 +100,24 @@ class MeshViewUtil } const std::string topoPath = "topologies/" + m_topologyName; - SLIC_ASSERT(m_dom->has_path(topoPath)); m_topology = &m_dom->fetch_existing(topoPath); - SLIC_ASSERT(m_topology->fetch_existing("type").as_string() == "structured"); - const std::string coordsetPath = "coordsets/" + m_dom->fetch_existing(topoPath + "/coordset").as_string(); m_coordset = &m_dom->fetch_existing(coordsetPath); - SLIC_ASSERT(m_coordset->fetch_existing("type").as_string() == "explicit"); + m_cdom = m_dom; + m_ctopology = m_topology; + m_ccoordset = m_coordset; - int dim = conduit::blueprint::mesh::coordset::dims(*m_coordset); - if(dim != DIM) + if(!isValid()) { SLIC_ERROR( - axom::fmt::format("MeshViewUtil template parameter DIM={} doesn't " - "match mesh topology dimension ({})", - DIM, - dim)); + "Invalid domain in MeshViewUtil. Domain must be blueprint-valid," + " structured, with exlicit coordinates and dimension equal to " + " the template DIM parameter."); } - m_cdom = m_dom; - m_ctopology = m_topology; - m_ccoordset = m_coordset; - computeCoordsDataLayout(); } @@ -138,26 +134,49 @@ class MeshViewUtil SLIC_ASSERT(m_cdom->has_path(topoPath)); m_ctopology = &m_cdom->fetch_existing(topoPath); - SLIC_ASSERT(m_ctopology->fetch_existing("type").as_string() == "structured"); - const std::string coordsetPath = "coordsets/" + m_cdom->fetch_existing(topoPath + "/coordset").as_string(); m_ccoordset = &m_cdom->fetch_existing(coordsetPath); - SLIC_ASSERT(m_ccoordset->fetch_existing("type").as_string() == "explicit"); - - int dim = conduit::blueprint::mesh::coordset::dims(*m_ccoordset); - if(dim != DIM) + if(!isValid()) { SLIC_ERROR( - axom::fmt::format("MeshViewUtil mesh topology dimension ({}) doesn't " - "match template parameter DIM={}", - dim, - DIM)); + "Invalid domain in MeshViewUtil. Domain must be blueprint-valid," + " structured, with exlicit coordinates. and dimension equal to " + " the template DIM parameter."); } computeCoordsDataLayout(); } + + /*! + @brief Whether the domain is a valid one for this utility. + + In addition to checking for blueprint validity (unless \a + checkBlueprint is false), this method checks against its own + requirements. + */ + bool isValid(bool checkBlueprint = false) const + { + bool rval = true; + if(checkBlueprint) + { + conduit::Node info; +#ifdef AXOM_USE_MPI + rval = rval && + conduit::blueprint::mpi::verify("mesh", *m_cdom, info, MPI_COMM_WORLD); +#else + rval = rval && conduit::blueprint::verify("mesh", *m_cdom, info); +#endif + } + rval = + rval && (m_ctopology->fetch_existing("type").as_string() == "structured"); + rval = + rval && (m_ccoordset->fetch_existing("type").as_string() == "explicit"); + rval = + rval && (conduit::blueprint::mesh::coordset::dims(*m_ccoordset) == DIM); + return true; + } //@} //@{ @@ -202,6 +221,7 @@ class MeshViewUtil return rval; } + //! @brief Return the real (ghost-free) extents of mesh data. axom::StackArray getRealExtents(const std::string& association) { axom::StackArray rval = getDomainShape(); @@ -219,8 +239,9 @@ class MeshViewUtil else { SLIC_ERROR( - "MeshVieuUtil only supports element and vertex data association for " - "now."); + axom::fmt::format("MeshVieuUtil only supports element and vertex data " + "association for now, not '{}'.", + association)); } return rval; @@ -241,7 +262,7 @@ class MeshViewUtil } /*! - @brief Return the array strides for nodal coordinates. + @brief Return the array strides for ghost-free nodal coordinates. */ axom::StackArray getCoordsStrides() const { @@ -330,7 +351,7 @@ class MeshViewUtil } /*! - @brief Get the strides of a named field data. + @brief Get the strides of a named Blueprint field. If strides are not specified, assume direction 0 is fastest (Conduit's default striding). */ @@ -369,6 +390,7 @@ class MeshViewUtil //@{ //!@name Data views + //!@brief Return the views of the DIM coordinates component data. CoordsViewsType getCoordsViews(bool withGhosts = false) { conduit::Node& valuesNode = getCoordSet().fetch_existing("values"); @@ -403,6 +425,7 @@ class MeshViewUtil return rval; } + //!@brief Return the views of the DIM coordinates component data. ConstCoordsViewsType getConstCoordsViews(bool withGhosts = false) const { const conduit::Node& valuesNode = getCoordSet().fetch_existing("values"); @@ -440,8 +463,12 @@ class MeshViewUtil /*! @brief Return view to a scalar field variable. - WARNING: The view returned has an allocator id determined by MemSpace, - regardless of the memory type. + WARNING: The view returned has an allocator id determined by + \a MemSpace, regardless of the memory type. + + WARNING: Assuming, without checking, that the field contains + data of type \a T. User is responsible for using the correct + type. */ template axom::ArrayView getFieldView(const std::string& fieldName, @@ -492,7 +519,7 @@ class MeshViewUtil } shape[DIM - 1] = valuesCount / strides[DIM - 1]; - T* dataPtr = valuesNode.as_double_ptr(); // TODO: Use template parameter T. + T* dataPtr = static_cast(valuesNode.data_ptr()); axom::ArrayView rval(dataPtr, shape, strides); if(withGhosts == false) @@ -513,6 +540,13 @@ class MeshViewUtil /*! @brief Return view to a scalar field variable. + + WARNING: The view returned has an allocator id determined by + \a MemSpace, regardless of the memory type. + + WARNING: Assuming, without checking, that the field contains + data of type \a T. User is responsible for using the correct + type. */ template axom::ArrayView getConstFieldView( @@ -559,9 +593,8 @@ class MeshViewUtil } shape[DIM - 1] = valuesCount / strides[DIM - 1]; - const T* dataPtr = - valuesNode.as_double_ptr(); // TODO: Use template parameter T. - axom::ArrayView rval(dataPtr, shape, strides); + const T* dataPtr = static_cast(valuesNode.data_ptr()); + axom::ArrayView rval(dataPtr, shape, strides); if(withGhosts == false) { diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 8d298b0177..0d7bfc7fb3 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -12,7 +12,6 @@ #include "axom/mint/execution/internal/structured_exec.hpp" #include "conduit_blueprint.hpp" #include "axom/fmt.hpp" -#include "axom/core/WhereMacro.hpp" namespace axom { @@ -42,6 +41,9 @@ static void reverse(axom::StackArray& a) return; } +/*! + @brief Indexing into a multidimensional structured array. +*/ template class StructuredIndexer { @@ -98,26 +100,26 @@ class StructuredIndexer } } - //!@brief Directions, ordered from slowest to fastest. - AXOM_HOST_DEVICE axom::StackArray& slowestDirs() const + //!@brief Index directions, ordered from slowest to fastest. + inline AXOM_HOST_DEVICE axom::StackArray& slowestDirs() const { return m_slowestDirs; } //!@brief Strides. - AXOM_HOST_DEVICE axom::StackArray& strides() const + inline AXOM_HOST_DEVICE axom::StackArray& strides() const { return m_strides; } //!@brief Convert multidimensional index to flat index. - AXOM_HOST_DEVICE T toFlatIndex(const axom::StackArray& multiIndex) const + inline AXOM_HOST_DEVICE T toFlatIndex(const axom::StackArray& multiIndex) const { T rval = numerics::dot_product(multiIndex.data(), m_strides.data()); } //!@brief Convert flat index to multidimensional index. - AXOM_HOST_DEVICE axom::StackArray toMultiIndex(T flatIndex) const + inline AXOM_HOST_DEVICE axom::StackArray toMultiIndex(T flatIndex) const { axom::StackArray multiIndex; for(int d = 0; d < DIM; ++d) @@ -157,7 +159,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase @param dom Blueprint structured mesh domain @param coordsetPath Where coordinates are in dom @param fcnFieldName Name of nodal function is in dom - @param maskFieldName Name of cell mask function is in dom + @param maskFieldName Name of integer cell mask function is in dom Set up views to domain data and allocate other data to work on the given domain. @@ -168,36 +170,19 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_HOST void initialize(const conduit::Node& dom, const std::string& topologyName, const std::string& fcnFieldName, - const std::string& maskFieldName) override + const std::string& maskFieldName = {}) override { clear(); - // Data sizes - const conduit::Node& dimsNode = - dom.fetch_existing("topologies/mesh/elements/dims"); - for(int d = 0; d < DIM; ++d) - { - m_bShape[d] = dimsNode[d].as_int(); - } - m_cShape = m_bShape; - reverse(m_cShape); - // This should work but breaks gcc11 on 64-bit linux: - // m_pShape = m_cShape + 1; - m_pShape = m_cShape; - add_to_StackArray(m_pShape, 1); - - m_bStrides[0] = 1; - for(int d = 1; d < DIM; ++d) - { - m_bStrides[d] = m_bStrides[d - 1] * m_bShape[d - 1]; - } - - // Domain's node coordinates axom::quest::MeshViewUtil mvu(dom, topologyName); - m_coordsViews = mvu.getConstCoordsViews(false); + m_bShape = mvu.getDomainShape(); + m_coordsViews = mvu.getConstCoordsViews(false); m_fcnView = mvu.template getConstFieldView(fcnFieldName, false); - // TODO: set up m_maskView, but first fix getFieldView to support more than double data types. + if(!maskFieldName.empty()) + { + m_maskView = mvu.template getConstFieldView(maskFieldName, false); + } /* TODO: To get good cache performance, we should make m_caseIds @@ -229,8 +214,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); #if defined(AXOM_USE_RAJA) - RAJA::RangeSegment jRange(0, m_cShape[0]); - RAJA::RangeSegment iRange(0, m_cShape[1]); + RAJA::RangeSegment jRange(0, m_bShape[1]); + RAJA::RangeSegment iRange(0, m_bShape[0]); using EXEC_POL = typename axom::mint::internal::structured_exec::loop2d_policy; RAJA::kernel( @@ -239,9 +224,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase mcu.computeCaseId(i, j); }); #else - for(int j = 0; j < m_cShape[0]; ++j) + for(int j = 0; j < m_bShape[1]; ++j) { - for(int i = 0; i < m_cShape[1]; ++i) + for(int i = 0; i < m_bShape[0]; ++i) { mcu.computeCaseId(i, j); } @@ -256,9 +241,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); #if defined(AXOM_USE_RAJA) - RAJA::RangeSegment kRange(0, m_cShape[0]); - RAJA::RangeSegment jRange(0, m_cShape[1]); - RAJA::RangeSegment iRange(0, m_cShape[2]); + RAJA::RangeSegment kRange(0, m_bShape[2]); + RAJA::RangeSegment jRange(0, m_bShape[1]); + RAJA::RangeSegment iRange(0, m_bShape[0]); using EXEC_POL = typename axom::mint::internal::structured_exec::loop3d_policy; RAJA::kernel( @@ -267,11 +252,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase mcu.computeCaseId(i, j, k); }); #else - for(int k = 0; k < m_cShape[0]; ++k) + for(int k = 0; k < m_bShape[2]; ++k) { - for(int j = 0; j < m_cShape[1]; ++j) + for(int j = 0; j < m_bShape[1]; ++j) { - for(int i = 0; i < m_cShape[2]; ++i) + for(int i = 0; i < m_bShape[0]; ++i) { mcu.computeCaseId(i, j, k); } @@ -320,8 +305,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type computeCaseId(axom::IndexType i, axom::IndexType j) const { - const bool skipZone = !maskView.empty() && bool(maskView(j, i)); - if(!skipZone) + const bool useZone = maskView.empty() || bool(maskView(i, j)); + if(useZone) { // clang-format off double nodalValues[CELL_CORNER_COUNT] = @@ -339,8 +324,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type computeCaseId(axom::IndexType i, axom::IndexType j, axom::IndexType k) const { - const bool skipZone = !maskView.empty() && bool(maskView(k, j, i)); - if(!skipZone) + const bool useZone = maskView.empty() || bool(maskView(i, j, k)); + if(useZone) { // clang-format off double nodalValues[CELL_CORNER_COUNT] = @@ -518,7 +503,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const auto& x = coordsViews[0]; const auto& y = coordsViews[1]; - // const auto c = multidim_cell_index(cellNum); const auto c = indexer.toMultiIndex(cellNum); const auto& i = c[0]; const auto& j = c[1]; @@ -545,7 +529,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const auto& y = coordsViews[1]; const auto& z = coordsViews[2]; - // const auto c = multidim_cell_index(cellNum); const auto c = indexer.toMultiIndex(cellNum); const auto& i = c[0]; const auto& j = c[1]; @@ -671,18 +654,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase crossingPt[d] = p1[d] + w * (p2[d] - p1[d]); } } - - AXOM_HOST_DEVICE inline axom::StackArray - multidim_cell_index(axom::IndexType flatId) const - { - axom::StackArray rval; - for(int d = DIM - 1; d >= 0; --d) - { - rval[d] = flatId / bStrides[d]; - flatId -= rval[d] * bStrides[d]; - } - return rval; - } }; // ComputeContour_Util void computeContour() override @@ -797,22 +768,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase return cases3D[iCase][iEdge]; } - /*! - @brief Compute multidimensional index from flat cell index - in domain data. - */ - AXOM_HOST_DEVICE inline axom::StackArray - multidim_cell_index(axom::IndexType flatId) const - { - axom::StackArray rval; - for(int d = DIM - 1; d >= 0; --d) - { - rval[d] = flatId / m_bStrides[d]; - flatId -= rval[d] * m_bStrides[d]; - } - return rval; - } - /*! @brief Output contour mesh to a mint::UnstructuredMesh object. */ @@ -856,7 +811,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase } //!@brief Output contour mesh to a mint::UnstructuredMesh object. - // TODO: If cellIdField was allocated by user, we should look at its strides/offsets. void populateContourMesh( axom::mint::UnstructuredMesh& mesh, const std::string& cellIdField, @@ -904,7 +858,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase for(axom::IndexType i = 0; i < addedCellCount; ++i) { cellIdView[priorCellCount + i] = si.toMultiIndex(contourCellParents[i]); - // cellIdView[priorCellCount + i] = multidim_cell_index(contourCellParents[i]); } } } @@ -938,8 +891,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase @brief Constructor. */ MarchingCubesImpl() - : m_allocatorID(execution_space::allocatorID()) - , m_crossings(0, 0) + : m_crossings(0, 0) , m_contourNodeCoords(0, 0) , m_contourCellCorners(0, 0) , m_contourCellParents(0, 0) @@ -962,12 +914,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase }; private: - const int m_allocatorID; //!< @brief ExecSpace-based allocator ID for all internal data - MIdx m_bShape; //!< @brief Blueprint cell data shape. - MIdx m_cShape; //!< @brief Cell-centered array shape for ArrayViews. - MIdx m_pShape; //!< @brief Node-centered array shape for ArrayViews. - MIdx m_bStrides; //!< @brief Strides for m_bShape arrays. - MIdx m_fastestDir; //!< @brief Directions, from fastest to slowest striding. + MIdx m_bShape; //!< @brief Blueprint cell data shape. // Views of parent domain data. // DIM coordinate components, each on a DIM-dimensional mesh. @@ -985,6 +932,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase //!@brief Number of parent cells crossing the contour surface. axom::IndexType m_crossingCount = 0; + //!@brief Number of contour surface cells from crossings. axom::IndexType m_contourCellCount = 0; axom::IndexType getContourCellCount() const override diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index 702f1a449f..bc3db77de5 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -17,7 +17,6 @@ #include "axom/quest.hpp" #include "axom/slam.hpp" #include "axom/core/Types.hpp" -#include "axom/core/WhereMacro.hpp" #include "conduit_blueprint.hpp" #include "conduit_blueprint_mpi.hpp" diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 168e5e1389..472ff48eef 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -25,7 +25,6 @@ #include "axom/quest/MeshViewUtil.hpp" #include "axom/sidre.hpp" #include "axom/core/Types.hpp" -#include "axom/core/WhereMacro.hpp" #include "conduit_blueprint.hpp" #include "conduit_relay_io_blueprint.hpp" @@ -304,15 +303,6 @@ struct BlueprintStructuredMesh auto dl = domainLengths(d); SLIC_INFO(axom::fmt::format("dom[{}] size={}", d, dl)); } - if(_ndims == 2) - { - checkMeshStorage<2>(); - } - if(_ndims == 3) - { - checkMeshStorage<3>(); - } - _maxSpacing = maxSpacing(); } @@ -517,107 +507,6 @@ struct BlueprintStructuredMesh void printMeshInfo() const { _mdMesh.print(); } - //!@brief Get the shape of cell-based arrays for a domain. - template - axom::StackArray getCellsShape(int domainNum) - { - auto domLengths = domainLengths(domainNum); - axom::StackArray shape; - for(int i = 0; i < DIM; ++i) - { - shape[i] = domLengths[i]; - } - return shape; - } - - //!@brief Get the shape of node-based arrays for a domain. - template - axom::StackArray getNodesShape(int domainNum) - { - auto domLengths = domainLengths(domainNum); - axom::StackArray shape; - for(int i = 0; i < DIM; ++i) - { - shape[i] = 1 + domLengths[i]; - } - return shape; - } - - //!@brief Get an ArrayView of coordinates data for a domain. - template - axom::Array> get_coords_view(int domainNum) - { - axom::StackArray shape = getNodesShape(domainNum); - for(int d = 0; d < DIM / 2; ++d) - { - std::swap(shape[d], shape[DIM - 1 - d]); - } - - conduit::Node& dom = _mdMesh[domainNum]; - conduit::Node& coordsValues = dom.fetch_existing("coordsets/coords/values"); - axom::Array> coordsViews(DIM); - for(int d = 0; d < DIM; ++d) - { - double* ptr = coordsValues[d].as_double_ptr(); - coordsViews[d] = axom::ArrayView(ptr, shape); - } - return coordsViews; - } - - template - typename std::enable_if::type checkMeshStorage() - { - SLIC_ASSERT(dimension() == DIM); - for(int d = 0; d < _mdMesh.number_of_children(); ++d) - { - axom::Array> coordsViews = - get_coords_view(d); - const axom::StackArray& shape = - coordsViews[0].shape(); - - // Verify that i is slowest in m_coordsViews. - // It appears conduit stores column major and ArrayView computes offsets - // assuming row major. - int n = 0, errCount = 0; - for(int j = 0; j < shape[0]; ++j) - { - for(int i = 0; i < shape[1]; ++i) - { - errCount += (&coordsViews[0].data()[n++] != &coordsViews[0](j, i)); - } - } - assert(errCount == 0); - } - } - template - typename std::enable_if::type checkMeshStorage() - { - SLIC_ASSERT(dimension() == DIM); - for(int d = 0; d < _mdMesh.number_of_children(); ++d) - { - axom::Array> coordsViews = - get_coords_view(d); - const axom::StackArray& shape = - coordsViews[0].shape(); - - // Verify that i is slowest in m_coordsViews. - // It appears conduit stores column major and ArrayView computes offsets - // assuming row major. - int n = 0, errCount = 0; - for(int k = 0; k < shape[0]; ++k) - { - for(int j = 0; j < shape[1]; ++j) - { - for(int i = 0; i < shape[2]; ++i) - { - errCount += (&coordsViews[0].data()[n++] != &coordsViews[0](k, j, i)); - } - } - } - assert(errCount == 0); - } - } - /*! @param[in] path Path to existing data in the blueprint mesh, relative to each domain in the mesh. @@ -747,17 +636,6 @@ void saveMesh(const sidre::Group& mesh, const std::string& filename) saveMesh(tmpMesh, filename); } -//!@brief Reverse the order of a StackArray. -template -void reverse(axom::StackArray& a) -{ - for(int d = 0; d < DIM / 2; ++d) - { - std::swap(a[d], a[DIM - 1 - d]); - } - return; -} - template T product(const axom::StackArray& a) { @@ -1175,14 +1053,14 @@ struct ContourTestBase allCoordsViews[n] = mvu.getConstCoordsViews(false); } - for(axom::IndexType cn = 0; cn < cellCount; ++cn) + for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; ++contourCellNum) { - axom::IndexType domainId = domainIdView[cn]; + axom::IndexType domainId = domainIdView[contourCellNum]; typename axom::quest::MeshViewUtil::ConstCoordsViewsType& coordsViews = allCoordsViews[domainId]; axom::StackArray parentCellIdx = - parentCellIdxView[cn]; + parentCellIdxView[contourCellNum]; axom::StackArray upperIdx = parentCellIdx; addToStackArray(upperIdx, 1); @@ -1199,9 +1077,8 @@ struct ContourTestBase big.expand(tol); small.expand(-tol); - // WRONG: the node ids should increased by the number of nodes in all previous domains. - axom::IndexType* cellNodeIds = contourMesh.getCellNodeIDs(cn); - const axom::IndexType cellNodeCount = contourMesh.getNumberOfCellNodes(cn); + axom::IndexType* cellNodeIds = contourMesh.getCellNodeIDs(contourCellNum); + const axom::IndexType cellNodeCount = contourMesh.getNumberOfCellNodes(contourCellNum); for(axom::IndexType nn = 0; nn < cellNodeCount; ++nn) { @@ -1244,46 +1121,37 @@ struct ContourTestBase const axom::IndexType domainCount = computationalMesh.domainCount(); - // Nodal values of functions for each domain. + /* + Space to store function views and whether a computational cell + contains the contour. We set these up for all domains ahead + of time for accessing as needed later. + */ axom::Array> fcnViews( domainCount); - // Whether a computational cell has parts of the contour mesh. axom::Array> hasContours(domainCount); - for(axom::IndexType domId = 0; domId < domainCount; ++domId) { const auto& dom = computationalMesh.domain(domId); axom::quest::MeshViewUtil mvu(dom, "mesh"); - axom::StackArray domLengths; - computationalMesh.domainLengths(domId, domLengths); - assert(domLengths == mvu.getRealExtents("element")); + const axom::StackArray domLengths = mvu.getRealExtents("element"); axom::Array& hasContour = hasContours[domId]; hasContour.resize(domLengths, false); - // Add 1 to count nodes. Reverse to match Conduit data. - reverse(domLengths); - // This should work but breaks gcc11 on 64-bit linux: - // domLengths = domLengths + 1; - addToStackArray(domLengths, 1); - fcnViews[domId] = mvu.template getConstFieldView(functionName(), false); - // double* fcnPtr = - // dom.fetch_existing("fields/" + functionName() + "/values").as_double_ptr(); - // fcnViews[domId] = axom::ArrayView(fcnPtr, domLengths); } - for(axom::IndexType cn = 0; cn < cellCount; ++cn) + for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; ++contourCellNum) { - axom::IndexType domainId = domainIdView[cn]; + axom::IndexType domainId = domainIdView[contourCellNum]; const axom::StackArray& parentCellIdx = - parentCellIdxView[cn]; + parentCellIdxView[contourCellNum]; hasContours[domainId][parentCellIdx] = true; } - // Verify that marked cells contain the contour value - // and unmarked ones don't. + // Verify that cells marked by hasContours touches the contour + // and other cells don't. for(axom::IndexType domId = 0; domId < domainCount; ++domId) { const auto& dom = computationalMesh.domain(domId); @@ -1317,7 +1185,6 @@ struct ContourTestBase } } - // reverse(cornerIdx); double fcnValue = fcnView[cornerIdx]; minFcnValue = std::min(minFcnValue, fcnValue); maxFcnValue = std::max(maxFcnValue, fcnValue); @@ -1656,8 +1523,6 @@ int main(int argc, char** argv) } s_allocatorId = allocatorIdForPolicy(params.policy); - umpire::ResourceManager& rm = umpire::ResourceManager::getInstance(); - umpire::Allocator allocator = rm.getAllocator(s_allocatorId); //--------------------------------------------------------------------------- // Load computational mesh. From 88a8872ff44b013b0212f034804b9fff3e5fe688 Mon Sep 17 00:00:00 2001 From: "Noah S. Elliott" Date: Fri, 1 Sep 2023 14:08:23 -0700 Subject: [PATCH 077/639] Correct and clarify some comment text about deep copies --- src/axom/sidre/core/Group.hpp | 10 +++++----- src/axom/sidre/core/View.cpp | 3 +-- src/axom/sidre/core/View.hpp | 5 +++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/axom/sidre/core/Group.hpp b/src/axom/sidre/core/Group.hpp index c1f3f73be6..97e15d361e 100644 --- a/src/axom/sidre/core/Group.hpp +++ b/src/axom/sidre/core/Group.hpp @@ -899,8 +899,8 @@ class Group * If given View pointer is null or Group already has a View with * same name as given View, method is a no-op. * - * \return pointer to given argument View object or nullptr if View - * is not copied into this Group. + * \return pointer to the new copied View object or nullptr if a View + * is not successfully copied into this Group. */ View* copyView(View* view); @@ -919,7 +919,7 @@ class Group * If given View pointer is null or Group already has a View with * same name as given View, method is a no-op. * - * \return pointer to given argument Group object or nullptr if View + * \return pointer to the new copied View object or nullptr if a View * is not copied into this Group. */ View* deepCopyView(View* view); @@ -1261,7 +1261,7 @@ class Group * If given Group pointer is null or Group already has a child Group with * same name as given Group, method is a no-op. * - * \return pointer to given argument Group object or nullptr if Group + * \return pointer to the new copied Group object or nullptr if a Group * is not copied into this Group. */ Group* copyGroup(Group* group); @@ -1280,7 +1280,7 @@ class Group * If given Group pointer is null or Group already has a child Group with * same name as given Group, method is a no-op. * - * \return pointer to given argument Group object or nullptr if Group + * \return pointer to the new copied Group object or nullptr if a Group * is not copied into this Group. */ Group* deepCopyGroup(Group* group); diff --git a/src/axom/sidre/core/View.cpp b/src/axom/sidre/core/View.cpp index 96d5edea54..4b04f9c823 100644 --- a/src/axom/sidre/core/View.cpp +++ b/src/axom/sidre/core/View.cpp @@ -1050,7 +1050,7 @@ void View::deepCopyView(View* copy) const SIDRE_VIEW_LOG_PREPEND << "deepCopyView can only copy into undescribed view " << "with empty state."); -#if 1 + if(isDescribed()) { copy->describe(m_schema.dtype()); @@ -1131,7 +1131,6 @@ void View::deepCopyView(View* copy) const SIDRE_VIEW_LOG_PREPEND << "View is in unexpected state: " << getStateStringName(m_state)); } -#endif } /* diff --git a/src/axom/sidre/core/View.hpp b/src/axom/sidre/core/View.hpp index efa84434b4..ac98233b94 100644 --- a/src/axom/sidre/core/View.hpp +++ b/src/axom/sidre/core/View.hpp @@ -1363,7 +1363,7 @@ class View } /*! - * \brief Copy view contents into an undescribed EMPTY view. + * \brief Copy contents of this View contents into an undescribed EMPTY View. * * For SCALAR and STRING the data is copied; EXTERNAL, * data pointer is copied; BUFFER attaches the buffer. @@ -1371,7 +1371,8 @@ class View void copyView(View* copy) const; /*! - * \brief Deep copy view contents into an undescribed EMPTY view. + * \brief Deep copy contents of this View contents into an undescribed + * EMPTY View. * * For SCALAR and STRING the data is copied and the state is preserved. * For BUFFER and EXTERNAL, the data described by this View is copied into a From b18eae30f18144f1b602fd6a7a2f78ae001f8ccb Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 1 Sep 2023 15:11:13 -0700 Subject: [PATCH 078/639] Move array indexing code into its own file. Also reformat. --- src/axom/quest/ArrayIndexer.hpp | 107 +++++++++++++++++ src/axom/quest/CMakeLists.txt | 1 + src/axom/quest/detail/MarchingCubesImpl.hpp | 112 +----------------- .../examples/quest_marching_cubes_example.cpp | 52 ++------ 4 files changed, 124 insertions(+), 148 deletions(-) create mode 100644 src/axom/quest/ArrayIndexer.hpp diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp new file mode 100644 index 0000000000..98e9da439f --- /dev/null +++ b/src/axom/quest/ArrayIndexer.hpp @@ -0,0 +1,107 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +#include "axom/core/StackArray.hpp" +#include "axom/core/numerics/matvecops.hpp" + +namespace axom +{ +/*! + @brief Indexing into a multidimensional structured array. +*/ +template +class ArrayIndexer +{ + axom::StackArray m_strides; + axom::StackArray m_slowestDirs; + +public: + /*! + @brief Constructor for row- or column major indexing. + @param [in] lengths Lengths of the array + @param [in] order: c is column major; r is row major. + */ + ArrayIndexer(const axom::StackArray& lengths, char order) + { + SLIC_ASSERT(order == 'c' || order == 'r'); + if(order == 'r') + { + for(int d = 0; d < DIM; ++d) + { + m_slowestDirs[d] = DIM - 1 - d; + } + m_strides[0] = 1; + for(int d = 1; d < DIM; ++d) + { + m_strides[d] = m_strides[d - 1] * lengths[d - 1]; + } + } + else + { + for(int d = 0; d < DIM; ++d) + { + m_slowestDirs[d] = d; + } + m_strides[DIM - 1] = 1; + for(int d = DIM - 2; d >= 0; --d) + { + m_strides[d] = m_strides[d + 1] * lengths[d + 1]; + } + } + } + + //!@brief Constructor for arbitrary-stride indexing. + ArrayIndexer(const axom::StackArray& strides) : m_strides(strides) + { + for(int d = 0; d < DIM; ++d) + { + m_slowestDirs[d] = d; + } + for(int s = 0; s < DIM; ++s) + { + for(int d = s; d < DIM; ++d) + { + if(m_strides[m_slowestDirs[s]] < m_strides[m_slowestDirs[d]]) + { + std::swap(m_slowestDirs[s], m_slowestDirs[d]); + } + } + } + } + + //!@brief Index directions, ordered from slowest to fastest. + inline AXOM_HOST_DEVICE axom::StackArray& slowestDirs() const + { + return m_slowestDirs; + } + + //!@brief Strides. + inline AXOM_HOST_DEVICE axom::StackArray& strides() const + { + return m_strides; + } + + //!@brief Convert multidimensional index to flat index. + inline AXOM_HOST_DEVICE T toFlatIndex(const axom::StackArray& multiIndex) const + { + T rval = numerics::dot_product(multiIndex.begin(), m_strides.begin(), DIM); + return rval; + } + + //!@brief Convert flat index to multidimensional index. + inline AXOM_HOST_DEVICE axom::StackArray toMultiIndex(T flatIndex) const + { + axom::StackArray multiIndex; + for(int d = 0; d < DIM; ++d) + { + int dir = m_slowestDirs[d]; + multiIndex[dir] = flatIndex / m_strides[dir]; + flatIndex -= multiIndex[dir] * m_strides[dir]; + } + return multiIndex; + } +}; + +} // end namespace axom diff --git a/src/axom/quest/CMakeLists.txt b/src/axom/quest/CMakeLists.txt index 9da01c49f6..9e4df4520c 100644 --- a/src/axom/quest/CMakeLists.txt +++ b/src/axom/quest/CMakeLists.txt @@ -59,6 +59,7 @@ set( quest_headers util/mesh_helpers.hpp MeshViewUtil.hpp + ArrayIndexer.hpp ) set( quest_sources diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 0d7bfc7fb3..29661debf4 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -5,6 +5,7 @@ #include "axom/core/execution/execution_space.hpp" #include "axom/quest/MarchingCubes.hpp" +#include "axom/quest/ArrayIndexer.hpp" #include "axom/quest/detail/marching_cubes_lookup.hpp" #include "axom/quest/MeshViewUtil.hpp" #include "axom/primal/geometry/Point.hpp" @@ -30,108 +31,6 @@ static void add_to_StackArray(axom::StackArray& a, U b) } } -//!@brief Reverse the order of a StackArray. -template -static void reverse(axom::StackArray& a) -{ - for(int d = 0; d < DIM / 2; ++d) - { - std::swap(a[d], a[DIM - 1 - d]); - } - return; -} - -/*! - @brief Indexing into a multidimensional structured array. -*/ -template -class StructuredIndexer -{ - axom::StackArray m_strides; - axom::StackArray m_slowestDirs; - -public: - //!@brief Constructor for row- or column major indexing. - StructuredIndexer(const axom::StackArray& lengths, bool rowMajor) - { - if(rowMajor) - { - for(int d = 0; d < DIM; ++d) - { - m_slowestDirs[d] = DIM - 1 - d; - } - m_strides[0] = 1; - for(int d = 1; d < DIM; ++d) - { - m_strides[d] = m_strides[d - 1] * lengths[d - 1]; - } - } - else - { - for(int d = 0; d < DIM; ++d) - { - m_slowestDirs[d] = d; - } - m_strides[DIM - 1] = 1; - for(int d = DIM - 2; d >= 0; --d) - { - m_strides[d] = m_strides[d + 1] * lengths[d + 1]; - } - } - } - - //!@brief Constructor for arbitrary-stride indexing. - StructuredIndexer(const axom::StackArray& strides) - : m_strides(strides) - { - for(int d = 0; d < DIM; ++d) - { - m_slowestDirs[d] = d; - } - for(int s = 0; s < DIM; ++s) - { - for(int d = s; d < DIM; ++d) - { - if(m_strides[m_slowestDirs[s]] < m_strides[m_slowestDirs[d]]) - { - std::swap(m_slowestDirs[s], m_slowestDirs[d]); - } - } - } - } - - //!@brief Index directions, ordered from slowest to fastest. - inline AXOM_HOST_DEVICE axom::StackArray& slowestDirs() const - { - return m_slowestDirs; - } - - //!@brief Strides. - inline AXOM_HOST_DEVICE axom::StackArray& strides() const - { - return m_strides; - } - - //!@brief Convert multidimensional index to flat index. - inline AXOM_HOST_DEVICE T toFlatIndex(const axom::StackArray& multiIndex) const - { - T rval = numerics::dot_product(multiIndex.data(), m_strides.data()); - } - - //!@brief Convert flat index to multidimensional index. - inline AXOM_HOST_DEVICE axom::StackArray toMultiIndex(T flatIndex) const - { - axom::StackArray multiIndex; - for(int d = 0; d < DIM; ++d) - { - int dir = m_slowestDirs[d]; - multiIndex[dir] = flatIndex / m_strides[dir]; - flatIndex -= multiIndex[dir] * m_strides[dir]; - } - return multiIndex; - } -}; - /*! @brief Computations for MarchingCubesSingleDomain @@ -409,7 +308,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { loopBody(n); } - // assert(*crossingId == m_crossingCount); }); #else *crossingId = 0; @@ -478,7 +376,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { double contourVal; MIdx bStrides; - StructuredIndexer indexer; + axom::ArrayIndexer indexer; axom::ArrayView fcnView; axom::StackArray, DIM> coordsViews; ComputeContour_Util( @@ -840,6 +738,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase for(int n = 0; n < addedCellCount; ++n) { MIdx cornerIds = contourCellCorners[n]; + // Bump corner indices by priorNodeCount to avoid indices + // used by other parents domains. add_to_StackArray(cornerIds, priorNodeCount); mesh.appendCell(cornerIds); } @@ -849,12 +749,10 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::mint::CELL_CENTERED, numComponents); SLIC_ASSERT(numComponents == DIM); - // Bump corner indices by priorCellCount to avoid indices - // used by other parents domains. axom::ArrayView> cellIdView( (axom::StackArray*)cellIdPtr, priorCellCount + addedCellCount); - StructuredIndexer si(m_caseIds.shape(), false); + axom::ArrayIndexer si(m_caseIds.shape(), 'c'); for(axom::IndexType i = 0; i < addedCellCount; ++i) { cellIdView[priorCellCount + i] = si.toMultiIndex(contourCellParents[i]); diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 472ff48eef..68f5f1ff52 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -21,6 +21,7 @@ #include "axom/primal.hpp" #include "axom/mint/mesh/UnstructuredMesh.hpp" #include "axom/mint/execution/internal/structured_exec.hpp" +#include "axom/quest/ArrayIndexer.hpp" #include "axom/quest/MarchingCubes.hpp" #include "axom/quest/MeshViewUtil.hpp" #include "axom/sidre.hpp" @@ -81,8 +82,6 @@ struct Input std::size_t ndim {0}; - // TODO: Ensure that fcnCenter, inPlane and perpDir sizes match dimensionality. - double contourVal {1.0}; bool checkResults {false}; @@ -656,40 +655,6 @@ static void addToStackArray(axom::StackArray& a, U b) } } -/*! - @brief Compute multidmensional index corresponding to flat index - in rectangular index space. - - The flatId corresponds to the multidimensional index through - an order that advances the first index fastest. - - TODO: This has been superceded by StructuredIndexer. Eventually, I - want to rename move StructuredIndexer to axom::core::ArrayIndexer. -*/ -template -axom::StackArray flatToMultidimIndex( - axom::IndexType flatId, - const axom::StackArray& sizes) -{ - axom::IndexType strides[DIM] = {1}; - for(int d = 1; d < DIM; ++d) - { - strides[d] = strides[d - 1] * sizes[d - 1]; - } - if(flatId >= strides[DIM - 1] * sizes[DIM - 1]) - { - SLIC_ERROR("flatId is too big."); - } - - axom::StackArray rval; - for(int d = DIM - 1; d >= 0; --d) - { - rval[d] = flatId / strides[d]; - flatId -= rval[d] * strides[d]; - } - return rval; -} - template struct ContourTestBase { @@ -1053,7 +1018,8 @@ struct ContourTestBase allCoordsViews[n] = mvu.getConstCoordsViews(false); } - for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; ++contourCellNum) + for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; + ++contourCellNum) { axom::IndexType domainId = domainIdView[contourCellNum]; typename axom::quest::MeshViewUtil::ConstCoordsViewsType& @@ -1078,7 +1044,8 @@ struct ContourTestBase small.expand(-tol); axom::IndexType* cellNodeIds = contourMesh.getCellNodeIDs(contourCellNum); - const axom::IndexType cellNodeCount = contourMesh.getNumberOfCellNodes(contourCellNum); + const axom::IndexType cellNodeCount = + contourMesh.getNumberOfCellNodes(contourCellNum); for(axom::IndexType nn = 0; nn < cellNodeCount; ++nn) { @@ -1134,7 +1101,8 @@ struct ContourTestBase const auto& dom = computationalMesh.domain(domId); axom::quest::MeshViewUtil mvu(dom, "mesh"); - const axom::StackArray domLengths = mvu.getRealExtents("element"); + const axom::StackArray domLengths = + mvu.getRealExtents("element"); axom::Array& hasContour = hasContours[domId]; hasContour.resize(domLengths, false); @@ -1142,7 +1110,8 @@ struct ContourTestBase fcnViews[domId] = mvu.template getConstFieldView(functionName(), false); } - for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; ++contourCellNum) + for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; + ++contourCellNum) { axom::IndexType domainId = domainIdView[contourCellNum]; const axom::StackArray& parentCellIdx = @@ -1163,11 +1132,12 @@ struct ContourTestBase const auto& fcnView = fcnViews[domId]; + axom::ArrayIndexer rowMajor(domLengths, 'r'); const axom::IndexType cellCount = product(domLengths); for(axom::IndexType cellId = 0; cellId < cellCount; ++cellId) { axom::StackArray cellIdx = - flatToMultidimIndex(cellId, domLengths); + rowMajor.toMultiIndex(cellId); // Compute min and max function value in the cell. double minFcnValue = std::numeric_limits::max(); From 246b0668d4196afd48ef842e6ce0de864c26e036 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Fri, 8 Sep 2023 10:09:02 -0700 Subject: [PATCH 079/639] Add Quadrilateral primitive, operators, and tests --- src/axom/primal/CMakeLists.txt | 1 + src/axom/primal/docs/sphinx/primitive.rst | 2 + src/axom/primal/geometry/BoundingBox.hpp | 33 ++- src/axom/primal/geometry/Quadrilateral.hpp | 260 ++++++++++++++++++ .../primal/operators/compute_bounding_box.hpp | 13 + src/axom/primal/tests/CMakeLists.txt | 1 + .../tests/primal_compute_bounding_box.cpp | 24 ++ .../primal/tests/primal_quadrilateral.cpp | 45 +++ 8 files changed, 374 insertions(+), 5 deletions(-) create mode 100644 src/axom/primal/geometry/Quadrilateral.hpp create mode 100644 src/axom/primal/tests/primal_quadrilateral.cpp diff --git a/src/axom/primal/CMakeLists.txt b/src/axom/primal/CMakeLists.txt index 428d79c86f..64a5636039 100644 --- a/src/axom/primal/CMakeLists.txt +++ b/src/axom/primal/CMakeLists.txt @@ -38,6 +38,7 @@ set( primal_headers geometry/Tetrahedron.hpp geometry/Octahedron.hpp geometry/Triangle.hpp + geometry/Quadrilateral.hpp geometry/Vector.hpp ## operators diff --git a/src/axom/primal/docs/sphinx/primitive.rst b/src/axom/primal/docs/sphinx/primitive.rst index 8140e466c8..bc656f0033 100644 --- a/src/axom/primal/docs/sphinx/primitive.rst +++ b/src/axom/primal/docs/sphinx/primitive.rst @@ -6,8 +6,10 @@ Primal includes the following primitives: - Point - Segment, Ray, Vector - Plane, Triangle, Polygon +- Quadrilateral - Sphere - Tetrahedron +- Hexahedron - BoundingBox, OrientedBoundingBox Primal also provides the NumericArray class, which implements arithmetic diff --git a/src/axom/primal/geometry/BoundingBox.hpp b/src/axom/primal/geometry/BoundingBox.hpp index c6774a24c3..a93dfc0020 100644 --- a/src/axom/primal/geometry/BoundingBox.hpp +++ b/src/axom/primal/geometry/BoundingBox.hpp @@ -91,6 +91,15 @@ class BoundingBox AXOM_HOST_DEVICE explicit BoundingBox(const PointType& pt) : m_min(pt), m_max(pt) { } + /*! + * \brief Constructor. Creates a bounding box containing the + * initializer list of points. + * + * \param [in] pts an initializer list containing points + */ + AXOM_HOST_DEVICE + explicit BoundingBox(std::initializer_list pts); + /*! * \brief Constructor. Creates a bounding box containing the collection of * points. @@ -255,9 +264,9 @@ class BoundingBox * type. This should work as long as the two Ts are comparable with * operator<(). */ - template + template AXOM_HOST_DEVICE bool intersectsWith( - const BoundingBox& otherBB) const; + const BoundingBox& otherBB) const; /*! * \brief Checks that we have a valid bounding box. @@ -403,6 +412,18 @@ AXOM_HOST_DEVICE bool BoundingBox::contains( return true; } +//------------------------------------------------------------------------------ +template +AXOM_HOST_DEVICE BoundingBox::BoundingBox(std::initializer_list pts) +{ + clear(); + + for(const auto& pt : pts) + { + this->addPoint(pt); + } +} + //------------------------------------------------------------------------------ template AXOM_HOST_DEVICE BoundingBox::BoundingBox(const PointType* pts, int n) @@ -432,14 +453,16 @@ bool BoundingBox::contains(const BoundingBox& otherBB) //------------------------------------------------------------------------------ template -template +template AXOM_HOST_DEVICE bool BoundingBox::intersectsWith( - const BoundingBox& otherBB) const + const BoundingBox& otherBB) const { bool status = true; // AABBs cannot intersect if they are separated along any dimension - for(int i = 0; i < NDIMS; ++i) + constexpr int MinDims = NDIMS < OtherDims ? NDIMS : OtherDims; + + for(int i = 0; i < MinDims; ++i) { status &= detail::intersect_bbox_bbox(m_min[i], m_max[i], diff --git a/src/axom/primal/geometry/Quadrilateral.hpp b/src/axom/primal/geometry/Quadrilateral.hpp new file mode 100644 index 0000000000..ab4d3dd1c7 --- /dev/null +++ b/src/axom/primal/geometry/Quadrilateral.hpp @@ -0,0 +1,260 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +#ifndef AXOM_PRIMAL_QUADRILATERAL_HPP_ +#define AXOM_PRIMAL_QUADRILATERAL_HPP_ + +#include "axom/config.hpp" +#include "axom/core.hpp" +#include "axom/slic/interface/slic.hpp" +#include "axom/fmt.hpp" + +#include "axom/primal/constants.hpp" +#include "axom/primal/geometry/Point.hpp" +#include "axom/primal/geometry/Triangle.hpp" + +#include +#include + +namespace axom +{ +namespace primal +{ +// Forward declare the templated classes and operator functions +template +class Quadrilateral; + +/** + * \brief Overloaded output operator for quadrilaterals + */ +template +std::ostream& operator<<(std::ostream& os, const Quadrilateral& quad); + +/*! + * \accelerated + * \class Quadrilateral + * + * \brief Represents a quadrilateral geometric shape defined by four points. + * + * \accelerated + * + * \tparam T the coordinate type, e.g., double, float, etc. + * \tparam NDIMS the number of dimensions + * + * There are four vertices in the quadrilateral, labeled P through S as the + * constructor's arguments. They are accessible using the square-brackets + * operator, with P being index 0, Q index 1, R index 2, and S index 3. + * + * Here's a diagram showing a square with the labeled vertices. + * + * \verbatim + * + * Q +---------+ R +y + * | | + * | | ^ + * | | | + * | | | + * P +---------+ S -----> +x + * + * \endverbatim + */ +template +class Quadrilateral +{ +public: + using PointType = Point; + using TriangleType = Triangle; + + static constexpr int DIM = NDIMS; + static constexpr int NUM_QUAD_VERTS = 4; + +public: + /// \brief Default constructor. Creates a degenerate quadrilateral. + AXOM_HOST_DEVICE + Quadrilateral() = default; + + /*! + * \brief Custom Constructor. Creates a quadrilateral from the 4 points p, q, r, s. + * \param [in] p point instance corresponding to vertex P of the quadrilateral. + * \param [in] q point instance corresponding to vertex Q of the quadrilateral. + * \param [in] r point instance corresponding to vertex R of the quadrilateral. + * \param [in] s point instance corresponding to vertex S of the quadrilateral. + */ + AXOM_HOST_DEVICE + Quadrilateral(const PointType& p, + const PointType& q, + const PointType& r, + const PointType& s) + : m_points {p, q, r, s} + { } + + /*! + * \brief Quadrilateral constructor from an array of Points + * + * \param [in] pts An array containing at least 4 Points. + * + * \note It is the responsiblity of the caller to pass + * an array with at least 4 Points + */ + AXOM_HOST_DEVICE + explicit Quadrilateral(const PointType* pts) + { + for (int i = 0; i < NUM_QUAD_VERTS; i++) + { + m_points[i] = pts[i]; + } + } + + /*! + * \brief Quadrilateral constructor from an Array of Points. + * + * \param [in] pts An ArrayView containing 4 Points. + */ + AXOM_HOST_DEVICE + explicit Quadrilateral(const axom::ArrayView pts) + { + SLIC_ASSERT(pts.size() == NUM_QUAD_VERTS); + + for(int i = 0; i < NUM_QUAD_VERTS; i++) + { + m_points[i] = pts[i]; + } + } + + /*! + * \brief Quadrilateral constructor from an initializer list of Points + * + * \param [in] pts an initializer list containing 4 Points + */ + AXOM_HOST_DEVICE + explicit Quadrilateral(std::initializer_list pts) + { + SLIC_ASSERT(pts.size() == NUM_QUAD_VERTS); + + int i = 0; + for(const auto& pt : pts) + { + m_points[i] = pt; + i++; + } + } + + /*! + * \brief Index operator to get the i^th vertex + * \param idx The index of the desired vertex + * \pre idx is 0, 1 or 2 + */ + AXOM_HOST_DEVICE + PointType& operator[](int idx) + { + SLIC_ASSERT(idx >= 0 && idx < NUM_QUAD_VERTS); + return m_points[idx]; + } + + /*! + * \brief Index operator to get the i^th vertex + * \param idx The index of the desired vertex + * \pre idx is 0, 1 or 2 + */ + AXOM_HOST_DEVICE + const PointType& operator[](int idx) const + { + SLIC_ASSERT(idx >= 0 && idx < NUM_QUAD_VERTS); + return m_points[idx]; + } + + /// \brief Returns the area of the quadrilateral (2D specialization) + template + AXOM_HOST_DEVICE typename std::enable_if::type area() const + { + return axom::utilities::abs(signedArea()); + } + + /** + * \brief Returns the signed area of a 2D quadrilateral + * + * The area is positive when the vertices are oriented counter-clockwise. + * \note This function is only available for quadrilaterals in 2D since + * signed areas don't make sense for 3D quadrilaterals + * + * Compute the signed area by dividing the quadrilateral into two triangles + * as shown below and summing their signed area + * + * \verbatim + * + * q +----+ r +y + * | /| + * | / | ^ + * | / | | + * |/ | | + * p +----+ s -----> +x + * + * \endverbatim + */ + template + AXOM_HOST_DEVICE typename std::enable_if::type signedArea() const + { + const PointType& p = m_points[0]; + const PointType& q = m_points[1]; + const PointType& r = m_points[2]; + const PointType& s = m_points[3]; + + // clang-format off + return TriangleType{p, q, r}.signedArea() + + TriangleType{r, s, p}.signedArea(); + // clang-format on + } + + /*! + * \brief Returns the volume of the quadrilateral (synonym for area()) + * \sa area() + */ + AXOM_HOST_DEVICE double volume() const { return area(); } + + /*! + * \brief Returns the signed volume of a 2D quadrilateral (synonym for signedArea()) + * \sa signedArea() + */ + template + AXOM_HOST_DEVICE typename std::enable_if::type signedVolume() const + { + return signedArea(); + } + + /*! + * \brief Simple formatted print of a triangle instance + * \param os The output stream to write to + * \return A reference to the modified ostream + */ + std::ostream& print(std::ostream& os) const + { + os << "{" << m_points[0] << " " << m_points[1] << " " << m_points[2] << " " << m_points[3] << "}"; + + return os; + } + +private: + PointType m_points[NUM_QUAD_VERTS]; +}; + +//------------------------------------------------------------------------------ +/// Free functions implementing Quadrilateral's operators +//------------------------------------------------------------------------------ +template +std::ostream& operator<<(std::ostream& os, const Quadrilateral& quad) +{ + quad.print(os); + return os; +} + +} // namespace primal +} // namespace axom + +/// Overload to format a primal::Quadrilateral using fmt +template +struct axom::fmt::formatter> : ostream_formatter +{ }; + +#endif // AXOM_PRIMAL_QUADRILATERAL_HPP_ diff --git a/src/axom/primal/operators/compute_bounding_box.hpp b/src/axom/primal/operators/compute_bounding_box.hpp index dddbaa1620..47ea682bc2 100644 --- a/src/axom/primal/operators/compute_bounding_box.hpp +++ b/src/axom/primal/operators/compute_bounding_box.hpp @@ -21,6 +21,7 @@ #include "axom/primal/geometry/Hexahedron.hpp" #include "axom/primal/geometry/Point.hpp" #include "axom/primal/geometry/Triangle.hpp" +#include "axom/primal/geometry/Quadrilateral.hpp" #include "axom/primal/geometry/Vector.hpp" #include "axom/primal/geometry/OrientedBoundingBox.hpp" @@ -121,6 +122,18 @@ AXOM_HOST_DEVICE BoundingBox compute_bounding_box( return res; } +/*! + * \brief Creates a bounding box around a Quadrilateral + * \accelerated + * \param [in] quad The Quadrilateral + */ +template +AXOM_HOST_DEVICE BoundingBox compute_bounding_box( + const Quadrilateral &quad) +{ + return BoundingBox{quad[0], quad[1], quad[2], quad[3]}; +} + /*! * \brief Creates a bounding box around an Octahedron * diff --git a/src/axom/primal/tests/CMakeLists.txt b/src/axom/primal/tests/CMakeLists.txt index c86789fa3e..f00de2ff48 100644 --- a/src/axom/primal/tests/CMakeLists.txt +++ b/src/axom/primal/tests/CMakeLists.txt @@ -37,6 +37,7 @@ set( primal_tests primal_tetrahedron.cpp primal_octahedron.cpp primal_triangle.cpp + primal_quadrilateral.cpp primal_vector.cpp primal_winding_number.cpp primal_zip.cpp diff --git a/src/axom/primal/tests/primal_compute_bounding_box.cpp b/src/axom/primal/tests/primal_compute_bounding_box.cpp index 6060cdb0c7..8ca30b8d3c 100644 --- a/src/axom/primal/tests/primal_compute_bounding_box.cpp +++ b/src/axom/primal/tests/primal_compute_bounding_box.cpp @@ -129,6 +129,30 @@ TEST(primal_compute_bounding_box, merge_aligned_box_test) EXPECT_TRUE(bbox5.contains(bbox4)); } +TEST(primal_compute_bounding_box, compute_quad_2d_box_test) +{ + constexpr int DIM = 2; + using CoordinateType = double; + using PointType = primal::Point; + using BoundingBoxType = primal::BoundingBox; + using QuadrilateralType = primal::Octahedron; + + PointType p{-1.0, 0.1}; + PointType q{ 0.0, 1.0}; + PointType r{ 2.0, 0.0}; + PointType s{-0.1, 0.5}; + + QuadrilateralType quad{p, q, r, s}; + BoundingBoxType box = primal::compute_bounding_box(quad); + + EXPECT_TRUE(box.contains(p)); + EXPECT_TRUE(box.contains(q)); + EXPECT_TRUE(box.contains(r)); + EXPECT_TRUE(box.contains(s)); + EXPECT_EQ(box.getMin(), (PointType{-1.0, 0.0})); + EXPECT_EQ(box.getMax(), (PointType{2.0, 1.0})); +} + TEST(primal_compute_bounding_box, compute_oct_box_test) { static const int DIM = 3; diff --git a/src/axom/primal/tests/primal_quadrilateral.cpp b/src/axom/primal/tests/primal_quadrilateral.cpp new file mode 100644 index 0000000000..c51f951015 --- /dev/null +++ b/src/axom/primal/tests/primal_quadrilateral.cpp @@ -0,0 +1,45 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +#include "axom/config.hpp" +#include "axom/slic.hpp" +#include "axom/primal.hpp" + +#include "gtest/gtest.h" + +namespace primal = axom::primal; + +TEST(primal_quadrilateral, area_2D) +{ + constexpr int DIM = 2; + constexpr double EPS = 1e-12; + using CoordinateType = double; + using PointType = primal::Point; + using QuadrilateralType = primal::Quadrilateral; + + // This is a concave quadrilateral + QuadrilateralType quad{PointType{-1.0, 0.1}, + PointType{ 0.0, 1.0}, + PointType{ 2.0, 0.0}, + PointType{-0.1, 0.5}}; + + const CoordinateType signedArea = quad.signedArea(); + const CoordinateType area = quad.area(); + + EXPECT_NEAR(-0.755, signedArea, EPS); + EXPECT_NEAR(0.755, area, EPS); +} + +//---------------------------------------------------------------------- +//---------------------------------------------------------------------- + +int main(int argc, char* argv[]) +{ + ::testing::InitGoogleTest(&argc, argv); + axom::slic::SimpleLogger logger(axom::slic::message::Info); + + int result = RUN_ALL_TESTS(); + return result; +} From 58c1363b8129bb30e8c1a4183c8935c4868fa158 Mon Sep 17 00:00:00 2001 From: "Noah S. Elliott" Date: Fri, 8 Sep 2023 14:15:47 -0700 Subject: [PATCH 080/639] Address some review comments: Use updated loop syntax, add allocator ID for deep copy methods, and clarify documentation comments --- src/axom/sidre/core/Group.cpp | 34 +++++++++++++++------------------- src/axom/sidre/core/Group.hpp | 25 ++++++++++++++++++------- src/axom/sidre/core/View.cpp | 8 ++++---- src/axom/sidre/core/View.hpp | 2 +- 4 files changed, 38 insertions(+), 31 deletions(-) diff --git a/src/axom/sidre/core/Group.cpp b/src/axom/sidre/core/Group.cpp index 598be0448e..2a957d72fb 100644 --- a/src/axom/sidre/core/Group.cpp +++ b/src/axom/sidre/core/Group.cpp @@ -975,8 +975,10 @@ View* Group::copyView(View* view) * ************************************************************************* */ -View* Group::deepCopyView(View* view) +View* Group::deepCopyView(View* view, int allocID) { + allocID = getValidAllocatorID(allocID); + if(view == nullptr || hasChildView(view->getName())) { SLIC_CHECK_MSG( @@ -995,7 +997,7 @@ View* Group::deepCopyView(View* view) } View* copy = createView(view->getName()); - view->deepCopyView(copy); + view->deepCopyView(copy, allocID); return copy; } @@ -1388,19 +1390,15 @@ Group* Group::copyGroup(Group* group) Group* res = createGroup(group->getName()); // copy child Groups to new Group - IndexType gidx = group->getFirstValidGroupIndex(); - while(indexIsValid(gidx)) + for(auto& grp : group->groups()) { - res->copyGroup(group->getGroup(gidx)); - gidx = group->getNextValidGroupIndex(gidx); + res->copyGroup(&grp); } // copy Views to new Group - IndexType vidx = group->getFirstValidViewIndex(); - while(indexIsValid(vidx)) + for(auto& view : group->views()) { - res->copyView(group->getView(vidx)); - vidx = group->getNextValidViewIndex(vidx); + res->copyView(&view); } return res; @@ -1416,8 +1414,10 @@ Group* Group::copyGroup(Group* group) * ************************************************************************* */ -Group* Group::deepCopyGroup(Group* group) +Group* Group::deepCopyGroup(Group* group, int allocID) { + allocID = getValidAllocatorID(allocID); + if(group == nullptr || hasChildGroup(group->getName())) { SLIC_CHECK_MSG( @@ -1438,19 +1438,15 @@ Group* Group::deepCopyGroup(Group* group) Group* res = createGroup(group->getName()); // copy child Groups to new Group - IndexType gidx = group->getFirstValidGroupIndex(); - while(indexIsValid(gidx)) + for(auto& grp : group->groups()) { - res->deepCopyGroup(group->getGroup(gidx)); - gidx = group->getNextValidGroupIndex(gidx); + res->deepCopyGroup(&grp, allocID); } // copy Views to new Group - IndexType vidx = group->getFirstValidViewIndex(); - while(indexIsValid(vidx)) + for(auto& view : group->views()) { - res->deepCopyView(group->getView(vidx)); - vidx = group->getNextValidViewIndex(vidx); + res->deepCopyView(&view, allocID); } return res; diff --git a/src/axom/sidre/core/Group.hpp b/src/axom/sidre/core/Group.hpp index 97e15d361e..cb589bb787 100644 --- a/src/axom/sidre/core/Group.hpp +++ b/src/axom/sidre/core/Group.hpp @@ -890,7 +890,8 @@ class Group View* moveView(View* view); /*! - * \brief Create a copy of given View object and add it to this Group. + * \brief Create a (shallow) copy of given View object and add it to this + * Group. * * Note that View copying is a "shallow" copy; the data associated with * the View is not copied. The new View object is associated with @@ -899,6 +900,8 @@ class Group * If given View pointer is null or Group already has a View with * same name as given View, method is a no-op. * + * \sa deepCopyView + * * \return pointer to the new copied View object or nullptr if a View * is not successfully copied into this Group. */ @@ -922,7 +925,7 @@ class Group * \return pointer to the new copied View object or nullptr if a View * is not copied into this Group. */ - View* deepCopyView(View* view); + View* deepCopyView(View* view, int allocID = INVALID_ALLOCATOR_ID); //@} @@ -1248,8 +1251,8 @@ class Group Group* moveGroup(Group* group); /*! - * \brief Create a copy of Group hierarchy rooted at given Group and make it - * a child of this Group. + * \brief Create a (shallow) copy of Group hierarchy rooted at given + * Group and make it a child of this Group. * * Note that all Views in the Group hierarchy are copied as well. * @@ -1261,6 +1264,8 @@ class Group * If given Group pointer is null or Group already has a child Group with * same name as given Group, method is a no-op. * + * \sa deepCopyGroup + * * \return pointer to the new copied Group object or nullptr if a Group * is not copied into this Group. */ @@ -1274,16 +1279,22 @@ class Group * * The deep copy of the Group creates a duplicate of the entire Group * hierarchy and performs a deep copy of the data described by the Views - * in the hierarchy. The Views in the new Group hierarchy will all allocate - * and use new Buffers to hold their copied data. + * in the hierarchy. + * + * The Views in the new Group hierarchy will each allocate and use + * new Buffers to hold their copied data. Each Buffer will be sized to + * receive only the data values seen by the description of the original + * View and will have zero offset and a strid of one. * * If given Group pointer is null or Group already has a child Group with * same name as given Group, method is a no-op. * + * \sa deepCopyGroup + * * \return pointer to the new copied Group object or nullptr if a Group * is not copied into this Group. */ - Group* deepCopyGroup(Group* group); + Group* deepCopyGroup(Group* group, int allocID = INVALID_ALLOCATOR_ID); //@} diff --git a/src/axom/sidre/core/View.cpp b/src/axom/sidre/core/View.cpp index 4b04f9c823..ca8650ea2e 100644 --- a/src/axom/sidre/core/View.cpp +++ b/src/axom/sidre/core/View.cpp @@ -1044,7 +1044,7 @@ void View::copyView(View* copy) const * ************************************************************************* */ -void View::deepCopyView(View* copy) const +void View::deepCopyView(View* copy, int allocID) const { SLIC_ASSERT_MSG(copy->m_state == EMPTY && !copy->isDescribed(), SIDRE_VIEW_LOG_PREPEND @@ -1056,7 +1056,7 @@ void View::deepCopyView(View* copy) const copy->describe(m_schema.dtype()); if(hasBuffer() || m_state == EXTERNAL) { - copy->allocate(getTypeID(), getNumElements()); + copy->allocate(getTypeID(), getNumElements(), allocID); } } @@ -1074,7 +1074,7 @@ void View::deepCopyView(View* copy) const case EXTERNAL: if(!copy->isAllocated()) { - copy->allocate(); + copy->allocate(allocID); } if(isApplied()) { @@ -1101,7 +1101,7 @@ void View::deepCopyView(View* copy) const case BUFFER: if(isAllocated() && !copy->isAllocated()) { - copy->allocate(); + copy->allocate(allocID); } if(isApplied()) { diff --git a/src/axom/sidre/core/View.hpp b/src/axom/sidre/core/View.hpp index ac98233b94..43798c7814 100644 --- a/src/axom/sidre/core/View.hpp +++ b/src/axom/sidre/core/View.hpp @@ -1381,7 +1381,7 @@ class View * to offsets and strides in the description will not be copied. The copied * View will have BUFFER state with zero offset and a stride of one. */ - void deepCopyView(View* copy) const; + void deepCopyView(View* copy, int allocID = INVALID_ALLOCATOR_ID) const; /*! * \brief Add view description and references to it's data to a conduit tree. From 1f1f5ab03bbad637f81c043683c9e28d1ce3b9f2 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 11 Sep 2023 10:06:05 -0700 Subject: [PATCH 081/639] Fix bad pointer cast when IndexType is not int32_t. --- src/axom/quest/MeshViewUtil.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 2d4e95714c..63001eab89 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -42,8 +42,8 @@ inline axom::StackArray makeStackArray(T v = std::numeric_limits::max } return rval; } -template -inline axom::StackArray makeStackArray(const T* v) +template +inline axom::StackArray makeStackArray(const U* v) { axom::StackArray rval; for(int d = 0; d < DIM; ++d) @@ -713,7 +713,7 @@ class MeshViewUtil { if(node.has_path(path)) { - const conduit::int32* ptr = node.fetch_existing(path).as_int32_ptr(); + const auto* ptr = node.fetch_existing(path).as_int32_ptr(); return internal::makeStackArray(ptr); } return internal::makeStackArray(defaultVal); @@ -744,7 +744,7 @@ class MeshViewUtil if(topologyDims.has_child("strides")) { - const conduit::int32* stridesPtr = + const auto* stridesPtr = topologyDims.fetch_existing("strides").as_int32_ptr(); for(int d = 0; d < DIM; ++d) { From 1d1ed9b028fb287edf837ee92f74af5c8ef25858 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Mon, 11 Sep 2023 15:39:19 -0700 Subject: [PATCH 082/639] Use right hand coordinate system for quadrilateral --- src/axom/primal/geometry/Quadrilateral.hpp | 49 +++++++++---------- .../tests/primal_compute_bounding_box.cpp | 18 +++---- .../primal/tests/primal_quadrilateral.cpp | 6 +-- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/src/axom/primal/geometry/Quadrilateral.hpp b/src/axom/primal/geometry/Quadrilateral.hpp index ab4d3dd1c7..1ad324ec5f 100644 --- a/src/axom/primal/geometry/Quadrilateral.hpp +++ b/src/axom/primal/geometry/Quadrilateral.hpp @@ -43,20 +43,20 @@ std::ostream& operator<<(std::ostream& os, const Quadrilateral& quad); * \tparam T the coordinate type, e.g., double, float, etc. * \tparam NDIMS the number of dimensions * - * There are four vertices in the quadrilateral, labeled P through S as the + * There are four vertices in the quadrilateral, labeled A through D as the * constructor's arguments. They are accessible using the square-brackets - * operator, with P being index 0, Q index 1, R index 2, and S index 3. + * operator, with A being index 0, B index 1, C index 2, and D index 3. * * Here's a diagram showing a square with the labeled vertices. * * \verbatim * - * Q +---------+ R +y + * D +---------+ C +y * | | * | | ^ * | | | * | | | - * P +---------+ S -----> +x + * A +---------+ B -----> +x * * \endverbatim */ @@ -72,22 +72,21 @@ class Quadrilateral public: /// \brief Default constructor. Creates a degenerate quadrilateral. - AXOM_HOST_DEVICE Quadrilateral() = default; /*! - * \brief Custom Constructor. Creates a quadrilateral from the 4 points p, q, r, s. - * \param [in] p point instance corresponding to vertex P of the quadrilateral. - * \param [in] q point instance corresponding to vertex Q of the quadrilateral. - * \param [in] r point instance corresponding to vertex R of the quadrilateral. - * \param [in] s point instance corresponding to vertex S of the quadrilateral. + * \brief Custom Constructor. Creates a quadrilateral from the 4 points A, B, C, and D. + * \param [in] A point corresponding to vertex A of the quadrilateral. + * \param [in] B point corresponding to vertex B of the quadrilateral. + * \param [in] C point corresponding to vertex C of the quadrilateral. + * \param [in] D point corresponding to vertex D of the quadrilateral. */ AXOM_HOST_DEVICE - Quadrilateral(const PointType& p, - const PointType& q, - const PointType& r, - const PointType& s) - : m_points {p, q, r, s} + Quadrilateral(const PointType& A, + const PointType& B, + const PointType& C, + const PointType& D) + : m_points {A, B, C, D} { } /*! @@ -184,26 +183,26 @@ class Quadrilateral * * \verbatim * - * q +----+ r +y + * D +----+ C +y * | /| * | / | ^ * | / | | * |/ | | - * p +----+ s -----> +x + * A +----+ B -----> +x * * \endverbatim */ template AXOM_HOST_DEVICE typename std::enable_if::type signedArea() const { - const PointType& p = m_points[0]; - const PointType& q = m_points[1]; - const PointType& r = m_points[2]; - const PointType& s = m_points[3]; + const PointType& A = m_points[0]; + const PointType& B = m_points[1]; + const PointType& C = m_points[2]; + const PointType& D = m_points[3]; // clang-format off - return TriangleType{p, q, r}.signedArea() + - TriangleType{r, s, p}.signedArea(); + return TriangleType{A, B, C}.signedArea() + + TriangleType{C, D, A}.signedArea(); // clang-format on } @@ -224,7 +223,7 @@ class Quadrilateral } /*! - * \brief Simple formatted print of a triangle instance + * \brief Simple formatted print of a quadrilateral instance * \param os The output stream to write to * \return A reference to the modified ostream */ @@ -236,7 +235,7 @@ class Quadrilateral } private: - PointType m_points[NUM_QUAD_VERTS]; + PointType m_points[NUM_QUAD_VERTS] = {Point(), Point(), Point(), Point()}; }; //------------------------------------------------------------------------------ diff --git a/src/axom/primal/tests/primal_compute_bounding_box.cpp b/src/axom/primal/tests/primal_compute_bounding_box.cpp index 8ca30b8d3c..74651c4b19 100644 --- a/src/axom/primal/tests/primal_compute_bounding_box.cpp +++ b/src/axom/primal/tests/primal_compute_bounding_box.cpp @@ -137,18 +137,18 @@ TEST(primal_compute_bounding_box, compute_quad_2d_box_test) using BoundingBoxType = primal::BoundingBox; using QuadrilateralType = primal::Octahedron; - PointType p{-1.0, 0.1}; - PointType q{ 0.0, 1.0}; - PointType r{ 2.0, 0.0}; - PointType s{-0.1, 0.5}; + PointType A{-1.0, 0.1}; + PointType B{-0.1, 0.5}; + PointType C{ 2.0, 0.0}; + PointType D{ 0.0, 1.0}; - QuadrilateralType quad{p, q, r, s}; + QuadrilateralType quad{A, B, C, D}; BoundingBoxType box = primal::compute_bounding_box(quad); - EXPECT_TRUE(box.contains(p)); - EXPECT_TRUE(box.contains(q)); - EXPECT_TRUE(box.contains(r)); - EXPECT_TRUE(box.contains(s)); + EXPECT_TRUE(box.contains(A)); + EXPECT_TRUE(box.contains(B)); + EXPECT_TRUE(box.contains(C)); + EXPECT_TRUE(box.contains(D)); EXPECT_EQ(box.getMin(), (PointType{-1.0, 0.0})); EXPECT_EQ(box.getMax(), (PointType{2.0, 1.0})); } diff --git a/src/axom/primal/tests/primal_quadrilateral.cpp b/src/axom/primal/tests/primal_quadrilateral.cpp index c51f951015..e664e9b7ab 100644 --- a/src/axom/primal/tests/primal_quadrilateral.cpp +++ b/src/axom/primal/tests/primal_quadrilateral.cpp @@ -21,14 +21,14 @@ TEST(primal_quadrilateral, area_2D) // This is a concave quadrilateral QuadrilateralType quad{PointType{-1.0, 0.1}, - PointType{ 0.0, 1.0}, + PointType{-0.1, 0.5}, PointType{ 2.0, 0.0}, - PointType{-0.1, 0.5}}; + PointType{ 0.0, 1.0}}; const CoordinateType signedArea = quad.signedArea(); const CoordinateType area = quad.area(); - EXPECT_NEAR(-0.755, signedArea, EPS); + EXPECT_NEAR(0.755, signedArea, EPS); EXPECT_NEAR(0.755, area, EPS); } From f941938e7e26fce370558bcef02a2d9e0b88344d Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Mon, 11 Sep 2023 15:42:04 -0700 Subject: [PATCH 083/639] Fix some documentation --- src/axom/primal/geometry/Quadrilateral.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/primal/geometry/Quadrilateral.hpp b/src/axom/primal/geometry/Quadrilateral.hpp index 1ad324ec5f..9e267a3d9f 100644 --- a/src/axom/primal/geometry/Quadrilateral.hpp +++ b/src/axom/primal/geometry/Quadrilateral.hpp @@ -143,7 +143,7 @@ class Quadrilateral /*! * \brief Index operator to get the i^th vertex * \param idx The index of the desired vertex - * \pre idx is 0, 1 or 2 + * \pre idx is 0, 1, 2, or 3 */ AXOM_HOST_DEVICE PointType& operator[](int idx) @@ -155,7 +155,7 @@ class Quadrilateral /*! * \brief Index operator to get the i^th vertex * \param idx The index of the desired vertex - * \pre idx is 0, 1 or 2 + * \pre idx is 0, 1, 2, or 3 */ AXOM_HOST_DEVICE const PointType& operator[](int idx) const From e72cfdfbfe0ea2da05db723eb1a8169843ddfc1b Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Mon, 11 Sep 2023 16:41:06 -0700 Subject: [PATCH 084/639] Fix build issues --- src/axom/primal/geometry/Quadrilateral.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/axom/primal/geometry/Quadrilateral.hpp b/src/axom/primal/geometry/Quadrilateral.hpp index 9e267a3d9f..caa5519328 100644 --- a/src/axom/primal/geometry/Quadrilateral.hpp +++ b/src/axom/primal/geometry/Quadrilateral.hpp @@ -235,7 +235,10 @@ class Quadrilateral } private: - PointType m_points[NUM_QUAD_VERTS] = {Point(), Point(), Point(), Point()}; + PointType m_points[NUM_QUAD_VERTS]{PointType{}, + PointType{}, + PointType{}, + PointType{}}; }; //------------------------------------------------------------------------------ From 26d8f58ebab522c8f4776913b994f0fc22ae70b9 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 08:31:55 -0700 Subject: [PATCH 085/639] Clang format fixes --- src/axom/primal/geometry/BoundingBox.hpp | 3 ++- src/axom/primal/geometry/Quadrilateral.hpp | 16 +++++++++------- .../primal/operators/compute_bounding_box.hpp | 2 +- .../primal/tests/primal_compute_bounding_box.cpp | 14 +++++++------- src/axom/primal/tests/primal_quadrilateral.cpp | 8 ++++---- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/axom/primal/geometry/BoundingBox.hpp b/src/axom/primal/geometry/BoundingBox.hpp index a93dfc0020..8175cb814f 100644 --- a/src/axom/primal/geometry/BoundingBox.hpp +++ b/src/axom/primal/geometry/BoundingBox.hpp @@ -414,7 +414,8 @@ AXOM_HOST_DEVICE bool BoundingBox::contains( //------------------------------------------------------------------------------ template -AXOM_HOST_DEVICE BoundingBox::BoundingBox(std::initializer_list pts) +AXOM_HOST_DEVICE BoundingBox::BoundingBox( + std::initializer_list pts) { clear(); diff --git a/src/axom/primal/geometry/Quadrilateral.hpp b/src/axom/primal/geometry/Quadrilateral.hpp index caa5519328..c8f0016779 100644 --- a/src/axom/primal/geometry/Quadrilateral.hpp +++ b/src/axom/primal/geometry/Quadrilateral.hpp @@ -100,7 +100,7 @@ class Quadrilateral AXOM_HOST_DEVICE explicit Quadrilateral(const PointType* pts) { - for (int i = 0; i < NUM_QUAD_VERTS; i++) + for(int i = 0; i < NUM_QUAD_VERTS; i++) { m_points[i] = pts[i]; } @@ -229,16 +229,17 @@ class Quadrilateral */ std::ostream& print(std::ostream& os) const { - os << "{" << m_points[0] << " " << m_points[1] << " " << m_points[2] << " " << m_points[3] << "}"; + os << "{" << m_points[0] << " " << m_points[1] << " " << m_points[2] << " " + << m_points[3] << "}"; return os; } private: - PointType m_points[NUM_QUAD_VERTS]{PointType{}, - PointType{}, - PointType{}, - PointType{}}; + PointType m_points[NUM_QUAD_VERTS] {PointType {}, + PointType {}, + PointType {}, + PointType {}}; }; //------------------------------------------------------------------------------ @@ -256,7 +257,8 @@ std::ostream& operator<<(std::ostream& os, const Quadrilateral& quad) /// Overload to format a primal::Quadrilateral using fmt template -struct axom::fmt::formatter> : ostream_formatter +struct axom::fmt::formatter> + : ostream_formatter { }; #endif // AXOM_PRIMAL_QUADRILATERAL_HPP_ diff --git a/src/axom/primal/operators/compute_bounding_box.hpp b/src/axom/primal/operators/compute_bounding_box.hpp index 47ea682bc2..ba0e000df1 100644 --- a/src/axom/primal/operators/compute_bounding_box.hpp +++ b/src/axom/primal/operators/compute_bounding_box.hpp @@ -131,7 +131,7 @@ template AXOM_HOST_DEVICE BoundingBox compute_bounding_box( const Quadrilateral &quad) { - return BoundingBox{quad[0], quad[1], quad[2], quad[3]}; + return BoundingBox {quad[0], quad[1], quad[2], quad[3]}; } /*! diff --git a/src/axom/primal/tests/primal_compute_bounding_box.cpp b/src/axom/primal/tests/primal_compute_bounding_box.cpp index 74651c4b19..927d197d8a 100644 --- a/src/axom/primal/tests/primal_compute_bounding_box.cpp +++ b/src/axom/primal/tests/primal_compute_bounding_box.cpp @@ -137,20 +137,20 @@ TEST(primal_compute_bounding_box, compute_quad_2d_box_test) using BoundingBoxType = primal::BoundingBox; using QuadrilateralType = primal::Octahedron; - PointType A{-1.0, 0.1}; - PointType B{-0.1, 0.5}; - PointType C{ 2.0, 0.0}; - PointType D{ 0.0, 1.0}; + PointType A {-1.0, 0.1}; + PointType B {-0.1, 0.5}; + PointType C {2.0, 0.0}; + PointType D {0.0, 1.0}; - QuadrilateralType quad{A, B, C, D}; + QuadrilateralType quad {A, B, C, D}; BoundingBoxType box = primal::compute_bounding_box(quad); EXPECT_TRUE(box.contains(A)); EXPECT_TRUE(box.contains(B)); EXPECT_TRUE(box.contains(C)); EXPECT_TRUE(box.contains(D)); - EXPECT_EQ(box.getMin(), (PointType{-1.0, 0.0})); - EXPECT_EQ(box.getMax(), (PointType{2.0, 1.0})); + EXPECT_EQ(box.getMin(), (PointType {-1.0, 0.0})); + EXPECT_EQ(box.getMax(), (PointType {2.0, 1.0})); } TEST(primal_compute_bounding_box, compute_oct_box_test) diff --git a/src/axom/primal/tests/primal_quadrilateral.cpp b/src/axom/primal/tests/primal_quadrilateral.cpp index e664e9b7ab..2d01107bf0 100644 --- a/src/axom/primal/tests/primal_quadrilateral.cpp +++ b/src/axom/primal/tests/primal_quadrilateral.cpp @@ -20,10 +20,10 @@ TEST(primal_quadrilateral, area_2D) using QuadrilateralType = primal::Quadrilateral; // This is a concave quadrilateral - QuadrilateralType quad{PointType{-1.0, 0.1}, - PointType{-0.1, 0.5}, - PointType{ 2.0, 0.0}, - PointType{ 0.0, 1.0}}; + QuadrilateralType quad {PointType {-1.0, 0.1}, + PointType {-0.1, 0.5}, + PointType {2.0, 0.0}, + PointType {0.0, 1.0}}; const CoordinateType signedArea = quad.signedArea(); const CoordinateType area = quad.area(); From 620a9c04e987b3849c0d5028885e46430b8e7962 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 12:59:53 -0700 Subject: [PATCH 086/639] Update doxygen for BoundingBox::intersectsWith --- src/axom/primal/geometry/BoundingBox.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/axom/primal/geometry/BoundingBox.hpp b/src/axom/primal/geometry/BoundingBox.hpp index 8175cb814f..68b311b483 100644 --- a/src/axom/primal/geometry/BoundingBox.hpp +++ b/src/axom/primal/geometry/BoundingBox.hpp @@ -260,9 +260,10 @@ class BoundingBox /*! * \param [in] otherBB the bounding box that we are checking. * \return status true if bb intersects otherBB, else false. - * \note We are allowing the other bounding box to have a different coordinate - * type. This should work as long as the two Ts are comparable with - * operator<(). + * \note We are allowing the other bounding box to have a different + * dimension and coordinate type. Only the coordinates in the + * overlapping dimensions are compared. If different coordinate + * types are used, they must be comparable with operator<(). */ template AXOM_HOST_DEVICE bool intersectsWith( From 3a07c13ab8b6f44599a4b156f2ce2fc2ad262b46 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 14:47:48 -0700 Subject: [PATCH 087/639] Add test cases --- src/axom/primal/tests/primal_boundingbox.cpp | 40 ++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/axom/primal/tests/primal_boundingbox.cpp b/src/axom/primal/tests/primal_boundingbox.cpp index e928ef7a67..dbda3d3b5e 100644 --- a/src/axom/primal/tests/primal_boundingbox.cpp +++ b/src/axom/primal/tests/primal_boundingbox.cpp @@ -392,6 +392,46 @@ TEST(primal_boundingBox, bb_add_box) EXPECT_EQ(bbox8, bbox1); } +//------------------------------------------------------------------------------ +TEST(primal_boundingBox, bb_different_dim) +{ + static const int DIM2D = 2; + using Point2D = primal::Point; + using BBox2D = primal::BoundingBox; + + static const int DIM3D = 3; + using Point3D = primal::Point; + using BBox3D = primal::BoundingBox; + + // Checking that a 2D point is in a 3D bounding box + BBox3D bbox3D {Point3D {0.0, 0.0, 0.0}, Point3D {1.0, 1.0, 1.0}}; + EXPECT_TRUE(bbox3D.contains(Point2D {0.5, 0.5, 0.5})); + EXPECT_FALSE(bbox3D.contains(Point2D {0.5, -0.5, 0.5})); + + // Checking that a 3D point is in a 2D bounding box + BBox2D bbox2D {Point2D {0.25, 0.25}, Point2D {0.75, 0.75}}; + EXPECT_TRUE(bbox2D.contains(Point3D {0.5, 0.5})); + EXPECT_FALSE(bbox2D.contains(Point3D {-0.5, 0.5})); + + // Checking that a 2D bounding box is in a 3D bounding box + EXPECT_TRUE(bbox3D.contains(bbox2D)); + EXPECT_FALSE(bbox3D.contains(BBox2D {Point2D {-1.0, 0.0}, Point2D {0.5, 0.5}})); + + // Checking that a 3D bounding box is in a 2D bounding box + EXPECT_TRUE(bbox2D.contains(BBox3D {Point3D {0.3, 0.3, 0.3}, Point3D {0.6, 0.6, 0.6}})); + EXPECT_FALSE(bbox2D.contains(bbox3D)); + + // Checking that a 2D bounding box intersects a 3D bounding box + EXPECT_TRUE(bbox3D.intersectsWith(BBox2D {Point2D {-1.0, 0.0}, Point2D {0.5, 0.5}})); + EXPECT_FALSE(bbox3D.intersectsWith(BBox2D {Point2D {-1.0, -1.0}, Point2D {-0.5, -0.5}})); + + // Checking that a 3D bounding box intersects a 2D bounding box + EXPECT_TRUE(bbox2D.intersectsWith(BBox3D {Point3D {0.0, 0.3, 0.0}, + Point3D {0.3, 1.0, 0.3}})); + EXPECT_FALSE(bbox2D.intersectsWith(BBox3D {Point3D {0.0, 0.0, 0.0}, + Point3D {0.2, 0.2, 0.3}})); +} + //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_different_coord_types) { From 29063e7c2a3bf48f58f0b1e8e411528c28093a24 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 15:41:17 -0700 Subject: [PATCH 088/639] Undo changes to BoundingBox --- src/axom/primal/geometry/BoundingBox.hpp | 41 ++++---------------- src/axom/primal/tests/primal_boundingbox.cpp | 40 ------------------- 2 files changed, 8 insertions(+), 73 deletions(-) diff --git a/src/axom/primal/geometry/BoundingBox.hpp b/src/axom/primal/geometry/BoundingBox.hpp index 68b311b483..c6774a24c3 100644 --- a/src/axom/primal/geometry/BoundingBox.hpp +++ b/src/axom/primal/geometry/BoundingBox.hpp @@ -91,15 +91,6 @@ class BoundingBox AXOM_HOST_DEVICE explicit BoundingBox(const PointType& pt) : m_min(pt), m_max(pt) { } - /*! - * \brief Constructor. Creates a bounding box containing the - * initializer list of points. - * - * \param [in] pts an initializer list containing points - */ - AXOM_HOST_DEVICE - explicit BoundingBox(std::initializer_list pts); - /*! * \brief Constructor. Creates a bounding box containing the collection of * points. @@ -260,14 +251,13 @@ class BoundingBox /*! * \param [in] otherBB the bounding box that we are checking. * \return status true if bb intersects otherBB, else false. - * \note We are allowing the other bounding box to have a different - * dimension and coordinate type. Only the coordinates in the - * overlapping dimensions are compared. If different coordinate - * types are used, they must be comparable with operator<(). + * \note We are allowing the other bounding box to have a different coordinate + * type. This should work as long as the two Ts are comparable with + * operator<(). */ - template + template AXOM_HOST_DEVICE bool intersectsWith( - const BoundingBox& otherBB) const; + const BoundingBox& otherBB) const; /*! * \brief Checks that we have a valid bounding box. @@ -413,19 +403,6 @@ AXOM_HOST_DEVICE bool BoundingBox::contains( return true; } -//------------------------------------------------------------------------------ -template -AXOM_HOST_DEVICE BoundingBox::BoundingBox( - std::initializer_list pts) -{ - clear(); - - for(const auto& pt : pts) - { - this->addPoint(pt); - } -} - //------------------------------------------------------------------------------ template AXOM_HOST_DEVICE BoundingBox::BoundingBox(const PointType* pts, int n) @@ -455,16 +432,14 @@ bool BoundingBox::contains(const BoundingBox& otherBB) //------------------------------------------------------------------------------ template -template +template AXOM_HOST_DEVICE bool BoundingBox::intersectsWith( - const BoundingBox& otherBB) const + const BoundingBox& otherBB) const { bool status = true; // AABBs cannot intersect if they are separated along any dimension - constexpr int MinDims = NDIMS < OtherDims ? NDIMS : OtherDims; - - for(int i = 0; i < MinDims; ++i) + for(int i = 0; i < NDIMS; ++i) { status &= detail::intersect_bbox_bbox(m_min[i], m_max[i], diff --git a/src/axom/primal/tests/primal_boundingbox.cpp b/src/axom/primal/tests/primal_boundingbox.cpp index dbda3d3b5e..e928ef7a67 100644 --- a/src/axom/primal/tests/primal_boundingbox.cpp +++ b/src/axom/primal/tests/primal_boundingbox.cpp @@ -392,46 +392,6 @@ TEST(primal_boundingBox, bb_add_box) EXPECT_EQ(bbox8, bbox1); } -//------------------------------------------------------------------------------ -TEST(primal_boundingBox, bb_different_dim) -{ - static const int DIM2D = 2; - using Point2D = primal::Point; - using BBox2D = primal::BoundingBox; - - static const int DIM3D = 3; - using Point3D = primal::Point; - using BBox3D = primal::BoundingBox; - - // Checking that a 2D point is in a 3D bounding box - BBox3D bbox3D {Point3D {0.0, 0.0, 0.0}, Point3D {1.0, 1.0, 1.0}}; - EXPECT_TRUE(bbox3D.contains(Point2D {0.5, 0.5, 0.5})); - EXPECT_FALSE(bbox3D.contains(Point2D {0.5, -0.5, 0.5})); - - // Checking that a 3D point is in a 2D bounding box - BBox2D bbox2D {Point2D {0.25, 0.25}, Point2D {0.75, 0.75}}; - EXPECT_TRUE(bbox2D.contains(Point3D {0.5, 0.5})); - EXPECT_FALSE(bbox2D.contains(Point3D {-0.5, 0.5})); - - // Checking that a 2D bounding box is in a 3D bounding box - EXPECT_TRUE(bbox3D.contains(bbox2D)); - EXPECT_FALSE(bbox3D.contains(BBox2D {Point2D {-1.0, 0.0}, Point2D {0.5, 0.5}})); - - // Checking that a 3D bounding box is in a 2D bounding box - EXPECT_TRUE(bbox2D.contains(BBox3D {Point3D {0.3, 0.3, 0.3}, Point3D {0.6, 0.6, 0.6}})); - EXPECT_FALSE(bbox2D.contains(bbox3D)); - - // Checking that a 2D bounding box intersects a 3D bounding box - EXPECT_TRUE(bbox3D.intersectsWith(BBox2D {Point2D {-1.0, 0.0}, Point2D {0.5, 0.5}})); - EXPECT_FALSE(bbox3D.intersectsWith(BBox2D {Point2D {-1.0, -1.0}, Point2D {-0.5, -0.5}})); - - // Checking that a 3D bounding box intersects a 2D bounding box - EXPECT_TRUE(bbox2D.intersectsWith(BBox3D {Point3D {0.0, 0.3, 0.0}, - Point3D {0.3, 1.0, 0.3}})); - EXPECT_FALSE(bbox2D.intersectsWith(BBox3D {Point3D {0.0, 0.0, 0.0}, - Point3D {0.2, 0.2, 0.3}})); -} - //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_different_coord_types) { From a1e130a2958ed1ce928c994de1f5487c2a6f41db Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 15:42:21 -0700 Subject: [PATCH 089/639] Remove constructor taking raw array --- src/axom/primal/geometry/Quadrilateral.hpp | 35 ++++++---------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/src/axom/primal/geometry/Quadrilateral.hpp b/src/axom/primal/geometry/Quadrilateral.hpp index c8f0016779..d257c6e2d0 100644 --- a/src/axom/primal/geometry/Quadrilateral.hpp +++ b/src/axom/primal/geometry/Quadrilateral.hpp @@ -90,19 +90,20 @@ class Quadrilateral { } /*! - * \brief Quadrilateral constructor from an array of Points - * - * \param [in] pts An array containing at least 4 Points. + * \brief Quadrilateral constructor from an initializer list of Points * - * \note It is the responsiblity of the caller to pass - * an array with at least 4 Points + * \param [in] pts an initializer list containing 4 Points */ AXOM_HOST_DEVICE - explicit Quadrilateral(const PointType* pts) + explicit Quadrilateral(std::initializer_list pts) { - for(int i = 0; i < NUM_QUAD_VERTS; i++) + SLIC_ASSERT(pts.size() == NUM_QUAD_VERTS); + + int i = 0; + for(const auto& pt : pts) { - m_points[i] = pts[i]; + m_points[i] = pt; + i++; } } @@ -122,24 +123,6 @@ class Quadrilateral } } - /*! - * \brief Quadrilateral constructor from an initializer list of Points - * - * \param [in] pts an initializer list containing 4 Points - */ - AXOM_HOST_DEVICE - explicit Quadrilateral(std::initializer_list pts) - { - SLIC_ASSERT(pts.size() == NUM_QUAD_VERTS); - - int i = 0; - for(const auto& pt : pts) - { - m_points[i] = pt; - i++; - } - } - /*! * \brief Index operator to get the i^th vertex * \param idx The index of the desired vertex From 8e64ec49a35fa570ebd53a3ce278e21388250048 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 15:44:15 -0700 Subject: [PATCH 090/639] Simplify initialization --- src/axom/primal/geometry/Quadrilateral.hpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/axom/primal/geometry/Quadrilateral.hpp b/src/axom/primal/geometry/Quadrilateral.hpp index d257c6e2d0..08ce7a26c4 100644 --- a/src/axom/primal/geometry/Quadrilateral.hpp +++ b/src/axom/primal/geometry/Quadrilateral.hpp @@ -219,10 +219,7 @@ class Quadrilateral } private: - PointType m_points[NUM_QUAD_VERTS] {PointType {}, - PointType {}, - PointType {}, - PointType {}}; + PointType m_points[NUM_QUAD_VERTS]{}; }; //------------------------------------------------------------------------------ From 27b1bc7369fc34fa44ac6775abb2965ce890ec67 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 15:49:15 -0700 Subject: [PATCH 091/639] Simplify compute_bounding_box operators --- .../primal/operators/compute_bounding_box.hpp | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/src/axom/primal/operators/compute_bounding_box.hpp b/src/axom/primal/operators/compute_bounding_box.hpp index ba0e000df1..5c321a177a 100644 --- a/src/axom/primal/operators/compute_bounding_box.hpp +++ b/src/axom/primal/operators/compute_bounding_box.hpp @@ -114,12 +114,7 @@ template AXOM_HOST_DEVICE BoundingBox compute_bounding_box( const Triangle &tri) { - BoundingBox res(tri[0]); - for(int i = 1; i < 3; i++) - { - res.addPoint(tri[i]); - } - return res; + return BoundingBox {tri[0], tri[1], tri[2]}; } /*! @@ -143,12 +138,8 @@ template AXOM_HOST_DEVICE BoundingBox compute_bounding_box( const Octahedron &oct) { - BoundingBox res(oct[0]); - for(int i = 1; i < 6; i++) - { - res.addPoint(oct[i]); - } - return res; + return BoundingBox {oct[0], oct[1], oct[2], + oct[3], oct[4], oct[5]}; } /*! @@ -160,12 +151,8 @@ template AXOM_HOST_DEVICE BoundingBox compute_bounding_box( const Hexahedron &hex) { - BoundingBox res(hex[0]); - for(int i = 1; i < 8; i++) - { - res.addPoint(hex[i]); - } - return res; + return BoundingBox {hex[0], hex[1], hex[2], hex[3], + hex[4], hex[5], hex[6], hex[7]}; } /*! @@ -194,12 +181,7 @@ template AXOM_HOST_DEVICE BoundingBox compute_bounding_box( const Tetrahedron &tet) { - BoundingBox res(tet[0]); - for(int i = 1; i < 4; i++) - { - res.addPoint(tet[i]); - } - return res; + return BoundingBox {tet[0], tet[1], tet[2], tet[3]}; } } // namespace primal From 7e6bcd4689bd69f5c6fe439c0a4b94b49d9de528 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 15:53:09 -0700 Subject: [PATCH 092/639] Add compute_bounding_box test for 3D quad --- .../tests/primal_compute_bounding_box.cpp | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/axom/primal/tests/primal_compute_bounding_box.cpp b/src/axom/primal/tests/primal_compute_bounding_box.cpp index 927d197d8a..0750757b08 100644 --- a/src/axom/primal/tests/primal_compute_bounding_box.cpp +++ b/src/axom/primal/tests/primal_compute_bounding_box.cpp @@ -153,6 +153,30 @@ TEST(primal_compute_bounding_box, compute_quad_2d_box_test) EXPECT_EQ(box.getMax(), (PointType {2.0, 1.0})); } +TEST(primal_compute_bounding_box, compute_quad_3d_box_test) +{ + constexpr int DIM = 3; + using CoordinateType = double; + using PointType = primal::Point; + using BoundingBoxType = primal::BoundingBox; + using QuadrilateralType = primal::Octahedron; + + PointType A {-1.0, 0.1, 0.0}; + PointType B {-0.1, 0.5, 0.0}; + PointType C {2.0, 0.0, 1.0}; + PointType D {0.0, 1.0, 1.0}; + + QuadrilateralType quad {A, B, C, D}; + BoundingBoxType box = primal::compute_bounding_box(quad); + + EXPECT_TRUE(box.contains(A)); + EXPECT_TRUE(box.contains(B)); + EXPECT_TRUE(box.contains(C)); + EXPECT_TRUE(box.contains(D)); + EXPECT_EQ(box.getMin(), (PointType {-1.0, 0.0, 0.0})); + EXPECT_EQ(box.getMax(), (PointType {2.0, 1.0, 1.0})); +} + TEST(primal_compute_bounding_box, compute_oct_box_test) { static const int DIM = 3; From b36e7e93abdea0936658882bac46a4283d0d88fd Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 16:06:34 -0700 Subject: [PATCH 093/639] Add tests for quadrilateral constructors --- .../primal/tests/primal_quadrilateral.cpp | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/axom/primal/tests/primal_quadrilateral.cpp b/src/axom/primal/tests/primal_quadrilateral.cpp index 2d01107bf0..e5e2535928 100644 --- a/src/axom/primal/tests/primal_quadrilateral.cpp +++ b/src/axom/primal/tests/primal_quadrilateral.cpp @@ -11,6 +11,47 @@ namespace primal = axom::primal; +TEST(primal_quadrilateral, construct_from_points) +{ + constexpr int DIM = 2; + using CoordinateType = double; + using PointType = primal::Point; + using QuadrilateralType = primal::Quadrilateral; + + PointType A {-1.0, 0.1}; + PointType B {-0.1, 0.5}; + PointType C {2.0, 0.0}; + PointType D {0.0, 1.0}; + + QuadrilateralType quad {A, B, C, D}; + + EXPECT_EQUAL(A, quad[0]); + EXPECT_EQUAL(B, quad[1]); + EXPECT_EQUAL(C, quad[2]); + EXPECT_EQUAL(D, quad[3]); +} + +TEST(primal_quadrilateral, construct_from_array_view) +{ + constexpr int DIM = 3; + constexpr double EPS = 1e-12; + using CoordinateType = double; + using PointType = primal::Point; + using QuadrilateralType = primal::Quadrilateral; + + // This is a concave quadrilateral + PointType quadPoints[QuadrilateralType::NUM_QUAD_VERTS] {PointType {-1.0, 0.1, 0.0}, + PointType {-0.1, 0.5, 0.0}, + PointType {2.0, 0.0, 1.0}, + PointType {0.0, 1.0, 1.0}}; + + QuadrilateralType quad {axom::ArrayView{quadPoints, QuadrilateralType::NUM_QUAD_VERTS}}; + + for (int i = 0; i < QuadrilateralType::NUM_QUAD_VERTS; ++i) { + EXPECT_EQUAL(quadPoints[i], quad[i]); + } +} + TEST(primal_quadrilateral, area_2D) { constexpr int DIM = 2; From dda024987698d56fd0df89f32930e76ed099aa8f Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 16:08:05 -0700 Subject: [PATCH 094/639] Use correct gtest macro --- src/axom/primal/tests/primal_quadrilateral.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/axom/primal/tests/primal_quadrilateral.cpp b/src/axom/primal/tests/primal_quadrilateral.cpp index e5e2535928..fd043ad2c8 100644 --- a/src/axom/primal/tests/primal_quadrilateral.cpp +++ b/src/axom/primal/tests/primal_quadrilateral.cpp @@ -25,10 +25,10 @@ TEST(primal_quadrilateral, construct_from_points) QuadrilateralType quad {A, B, C, D}; - EXPECT_EQUAL(A, quad[0]); - EXPECT_EQUAL(B, quad[1]); - EXPECT_EQUAL(C, quad[2]); - EXPECT_EQUAL(D, quad[3]); + EXPECT_EQ(A, quad[0]); + EXPECT_EQ(B, quad[1]); + EXPECT_EQ(C, quad[2]); + EXPECT_EQ(D, quad[3]); } TEST(primal_quadrilateral, construct_from_array_view) @@ -48,7 +48,7 @@ TEST(primal_quadrilateral, construct_from_array_view) QuadrilateralType quad {axom::ArrayView{quadPoints, QuadrilateralType::NUM_QUAD_VERTS}}; for (int i = 0; i < QuadrilateralType::NUM_QUAD_VERTS; ++i) { - EXPECT_EQUAL(quadPoints[i], quad[i]); + EXPECT_EQ(quadPoints[i], quad[i]); } } From e517fa0c52a5bdd37e787c1a7fa7b9017038aba6 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 16:09:34 -0700 Subject: [PATCH 095/639] Formatting --- src/axom/primal/geometry/Quadrilateral.hpp | 2 +- .../primal/operators/compute_bounding_box.hpp | 13 +++++++++---- src/axom/primal/tests/primal_quadrilateral.cpp | 15 +++++++++------ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/axom/primal/geometry/Quadrilateral.hpp b/src/axom/primal/geometry/Quadrilateral.hpp index 08ce7a26c4..8219a083a6 100644 --- a/src/axom/primal/geometry/Quadrilateral.hpp +++ b/src/axom/primal/geometry/Quadrilateral.hpp @@ -219,7 +219,7 @@ class Quadrilateral } private: - PointType m_points[NUM_QUAD_VERTS]{}; + PointType m_points[NUM_QUAD_VERTS] {}; }; //------------------------------------------------------------------------------ diff --git a/src/axom/primal/operators/compute_bounding_box.hpp b/src/axom/primal/operators/compute_bounding_box.hpp index 5c321a177a..0d73a4c9d5 100644 --- a/src/axom/primal/operators/compute_bounding_box.hpp +++ b/src/axom/primal/operators/compute_bounding_box.hpp @@ -138,8 +138,7 @@ template AXOM_HOST_DEVICE BoundingBox compute_bounding_box( const Octahedron &oct) { - return BoundingBox {oct[0], oct[1], oct[2], - oct[3], oct[4], oct[5]}; + return BoundingBox {oct[0], oct[1], oct[2], oct[3], oct[4], oct[5]}; } /*! @@ -151,8 +150,14 @@ template AXOM_HOST_DEVICE BoundingBox compute_bounding_box( const Hexahedron &hex) { - return BoundingBox {hex[0], hex[1], hex[2], hex[3], - hex[4], hex[5], hex[6], hex[7]}; + return BoundingBox {hex[0], + hex[1], + hex[2], + hex[3], + hex[4], + hex[5], + hex[6], + hex[7]}; } /*! diff --git a/src/axom/primal/tests/primal_quadrilateral.cpp b/src/axom/primal/tests/primal_quadrilateral.cpp index fd043ad2c8..938086548f 100644 --- a/src/axom/primal/tests/primal_quadrilateral.cpp +++ b/src/axom/primal/tests/primal_quadrilateral.cpp @@ -40,14 +40,17 @@ TEST(primal_quadrilateral, construct_from_array_view) using QuadrilateralType = primal::Quadrilateral; // This is a concave quadrilateral - PointType quadPoints[QuadrilateralType::NUM_QUAD_VERTS] {PointType {-1.0, 0.1, 0.0}, - PointType {-0.1, 0.5, 0.0}, - PointType {2.0, 0.0, 1.0}, - PointType {0.0, 1.0, 1.0}}; + PointType quadPoints[QuadrilateralType::NUM_QUAD_VERTS] { + PointType {-1.0, 0.1, 0.0}, + PointType {-0.1, 0.5, 0.0}, + PointType {2.0, 0.0, 1.0}, + PointType {0.0, 1.0, 1.0}}; - QuadrilateralType quad {axom::ArrayView{quadPoints, QuadrilateralType::NUM_QUAD_VERTS}}; + QuadrilateralType quad { + axom::ArrayView {quadPoints, QuadrilateralType::NUM_QUAD_VERTS}}; - for (int i = 0; i < QuadrilateralType::NUM_QUAD_VERTS; ++i) { + for(int i = 0; i < QuadrilateralType::NUM_QUAD_VERTS; ++i) + { EXPECT_EQ(quadPoints[i], quad[i]); } } From 50aab4ede69b58f1c2b491578428738db9064d29 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 16:21:48 -0700 Subject: [PATCH 096/639] Fix up default constructor --- src/axom/primal/geometry/Quadrilateral.hpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/axom/primal/geometry/Quadrilateral.hpp b/src/axom/primal/geometry/Quadrilateral.hpp index 8219a083a6..73a7b60329 100644 --- a/src/axom/primal/geometry/Quadrilateral.hpp +++ b/src/axom/primal/geometry/Quadrilateral.hpp @@ -72,7 +72,10 @@ class Quadrilateral public: /// \brief Default constructor. Creates a degenerate quadrilateral. - Quadrilateral() = default; + AXOM_HOST_DEVICE + Quadrilateral() + : m_points {PointType{}, PointType{}, PointType{}, PointType{}} + { } /*! * \brief Custom Constructor. Creates a quadrilateral from the 4 points A, B, C, and D. @@ -219,7 +222,7 @@ class Quadrilateral } private: - PointType m_points[NUM_QUAD_VERTS] {}; + PointType m_points[NUM_QUAD_VERTS]; }; //------------------------------------------------------------------------------ From 2ece781b123b8ace0f3e536e0a3e9964304ce1a2 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 16:25:41 -0700 Subject: [PATCH 097/639] Formatting --- src/axom/primal/geometry/Quadrilateral.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/primal/geometry/Quadrilateral.hpp b/src/axom/primal/geometry/Quadrilateral.hpp index 73a7b60329..b0fc10f3ba 100644 --- a/src/axom/primal/geometry/Quadrilateral.hpp +++ b/src/axom/primal/geometry/Quadrilateral.hpp @@ -74,7 +74,7 @@ class Quadrilateral /// \brief Default constructor. Creates a degenerate quadrilateral. AXOM_HOST_DEVICE Quadrilateral() - : m_points {PointType{}, PointType{}, PointType{}, PointType{}} + : m_points {PointType {}, PointType {}, PointType {}, PointType {}} { } /*! From 40e7e55f54947567560ab3d7198b8e6fe61486e0 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 12 Sep 2023 16:27:26 -0700 Subject: [PATCH 098/639] Add note about investigating other algorithms for computing area of quadrilateral --- src/axom/primal/geometry/Quadrilateral.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/axom/primal/geometry/Quadrilateral.hpp b/src/axom/primal/geometry/Quadrilateral.hpp index b0fc10f3ba..1cb28393d6 100644 --- a/src/axom/primal/geometry/Quadrilateral.hpp +++ b/src/axom/primal/geometry/Quadrilateral.hpp @@ -181,6 +181,8 @@ class Quadrilateral template AXOM_HOST_DEVICE typename std::enable_if::type signedArea() const { + // TODO: Investigate other algorithms for computing the area + // https://artofproblemsolving.com/wiki/index.php/Shoelace_Theorem const PointType& A = m_points[0]; const PointType& B = m_points[1]; const PointType& C = m_points[2]; From 7fcf84ed5e1f1969896f74b63ef5804eeef286bd Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Wed, 13 Sep 2023 13:17:41 -0700 Subject: [PATCH 099/639] Fix warnings and build errors --- src/axom/primal/geometry/BoundingBox.hpp | 11 +++++++++++ src/axom/primal/tests/primal_quadrilateral.cpp | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/axom/primal/geometry/BoundingBox.hpp b/src/axom/primal/geometry/BoundingBox.hpp index c6774a24c3..b48667736d 100644 --- a/src/axom/primal/geometry/BoundingBox.hpp +++ b/src/axom/primal/geometry/BoundingBox.hpp @@ -100,6 +100,17 @@ class BoundingBox AXOM_HOST_DEVICE BoundingBox(const PointType* pts, int n); + /*! + * \brief Constructor. Creates a bounding box containing the + * initializer list of points. + * + * \param [in] pts an initializer list containing points + */ + AXOM_HOST_DEVICE + explicit BoundingBox(std::initializer_list pts); + : BoundingBox {pts.begin(), static_cast(pts.size())} + { } + /*! * \brief Constructor. Creates a bounding box with a given min and max point * The code ensures that the bounds are valid, if shouldFixBounds is true. diff --git a/src/axom/primal/tests/primal_quadrilateral.cpp b/src/axom/primal/tests/primal_quadrilateral.cpp index 938086548f..65bd889c99 100644 --- a/src/axom/primal/tests/primal_quadrilateral.cpp +++ b/src/axom/primal/tests/primal_quadrilateral.cpp @@ -34,7 +34,6 @@ TEST(primal_quadrilateral, construct_from_points) TEST(primal_quadrilateral, construct_from_array_view) { constexpr int DIM = 3; - constexpr double EPS = 1e-12; using CoordinateType = double; using PointType = primal::Point; using QuadrilateralType = primal::Quadrilateral; From a8519b16963d57e85aa95652c70033ae9458c9d5 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Wed, 13 Sep 2023 15:23:56 -0700 Subject: [PATCH 100/639] Fix syntax errors --- src/axom/primal/geometry/BoundingBox.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/axom/primal/geometry/BoundingBox.hpp b/src/axom/primal/geometry/BoundingBox.hpp index b48667736d..f32da0a46a 100644 --- a/src/axom/primal/geometry/BoundingBox.hpp +++ b/src/axom/primal/geometry/BoundingBox.hpp @@ -107,7 +107,7 @@ class BoundingBox * \param [in] pts an initializer list containing points */ AXOM_HOST_DEVICE - explicit BoundingBox(std::initializer_list pts); + explicit BoundingBox(std::initializer_list pts) : BoundingBox {pts.begin(), static_cast(pts.size())} { } @@ -140,14 +140,14 @@ class BoundingBox * \return const reference to the min corner of the bounding box. */ AXOM_HOST_DEVICE - const PointType& getMin() const { return m_min; }; + const PointType& getMin() const { return m_min; } /*! * \brief Returns const reference to the max corner of the bounding box. * \return const reference to the max corner of the bounding box. */ AXOM_HOST_DEVICE - const PointType& getMax() const { return m_max; }; + const PointType& getMax() const { return m_max; } /*! * \brief Returns the centroid (midpoint) of the bounding box. @@ -161,7 +161,7 @@ class BoundingBox * \return Vector from min point to max point of bounding box. */ AXOM_HOST_DEVICE - VectorType range() const { return VectorType(m_min, m_max); }; + VectorType range() const { return VectorType(m_min, m_max); } /*! * \brief Updates bounds to include the provided point. @@ -184,7 +184,7 @@ class BoundingBox * \post d >= 1. */ AXOM_HOST_DEVICE - int dimension() const { return NDIMS; }; + int dimension() const { return NDIMS; } /*! * \brief Finds the longest dimension of the bounding box @@ -355,7 +355,7 @@ class BoundingBox AXOM_HOST_DEVICE inline void setMin(const PointType& newMin) { m_min = newMin; - }; + } /*! * \brief Sets the max point for this bounding box instance. @@ -364,7 +364,7 @@ class BoundingBox AXOM_HOST_DEVICE inline void setMax(const PointType& newMax) { m_max = newMax; - }; + } /*! * \brief Ensures that the bounds are valid. From aa6c669cae79cd85c352aa7df3ee4858fa6fabaa Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Wed, 13 Sep 2023 15:55:42 -0700 Subject: [PATCH 101/639] Use explicit constructor --- src/axom/spin/tests/spin_bvh.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/spin/tests/spin_bvh.cpp b/src/axom/spin/tests/spin_bvh.cpp index d839bae807..ac709c9dc5 100644 --- a/src/axom/spin/tests/spin_bvh.cpp +++ b/src/axom/spin/tests/spin_bvh.cpp @@ -1865,7 +1865,7 @@ AXOM_CUDA_TEST(spin_bvh, use_pool_allocator) 0, 1, AXOM_LAMBDA(axom::IndexType idx) { - boxes[idx] = {PointType(0.), PointType(1.)}; + boxes[idx] = BoxType {PointType(0.), PointType(1.)}; }); // construct a BVH with a single box From 9b1fe9505b09764d234f04cf6b038dd800939eb8 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 31 Aug 2023 21:27:08 -0700 Subject: [PATCH 102/639] Bugfix: SamplingShaper did not properly handle field names with underscores --- src/axom/quest/SamplingShaper.hpp | 2 - .../quest/detail/shaping/shaping_helpers.cpp | 5 +- .../quest/tests/quest_sampling_shaper.cpp | 94 +++++++++++++++++++ 3 files changed, 96 insertions(+), 5 deletions(-) diff --git a/src/axom/quest/SamplingShaper.hpp b/src/axom/quest/SamplingShaper.hpp index 6af41e507d..687ec0d3d0 100644 --- a/src/axom/quest/SamplingShaper.hpp +++ b/src/axom/quest/SamplingShaper.hpp @@ -464,8 +464,6 @@ class SamplingShaper : public Shaper void applyReplacementRules(const klee::Shape& shape) override { - using axom::utilities::string::rsplitN; - internal::ScopedLogLevelChanger logLevelChanger( this->isVerbose() ? slic::message::Debug : slic::message::Warning); diff --git a/src/axom/quest/detail/shaping/shaping_helpers.cpp b/src/axom/quest/detail/shaping/shaping_helpers.cpp index 7694a5ce65..3fe9de97d9 100644 --- a/src/axom/quest/detail/shaping/shaping_helpers.cpp +++ b/src/axom/quest/detail/shaping/shaping_helpers.cpp @@ -145,10 +145,9 @@ void computeVolumeFractions(const std::string& matField, QFunctionCollection& inoutQFuncs, int outputOrder) { - using axom::utilities::string::rsplitN; + SLIC_ASSERT(axom::utilities::string::startsWith(matField, "mat_inout_")); - auto matName = rsplitN(matField, 2, '_')[1]; - auto volFracName = axom::fmt::format("vol_frac_{}", matName); + const auto volFracName = axom::fmt::format("vol_frac_{}", matField.substr(10)); // Grab a pointer to the inout samples QFunc mfem::QuadratureFunction* inout = inoutQFuncs.Get(matField); diff --git a/src/axom/quest/tests/quest_sampling_shaper.cpp b/src/axom/quest/tests/quest_sampling_shaper.cpp index 6b0ae28283..db3067a478 100644 --- a/src/axom/quest/tests/quest_sampling_shaper.cpp +++ b/src/axom/quest/tests/quest_sampling_shaper.cpp @@ -1038,6 +1038,100 @@ units: cm } } +TEST_F(SamplingShaperTest2D, check_underscores) +{ + const auto& testname = + ::testing::UnitTest::GetInstance()->current_test_info()->name(); + + constexpr double radius = 1.5; + + const std::string shape_template = R"( +dimensions: 2 + +shapes: +- name: {2} + material: {3} + geometry: + format: c2c + path: {0} + units: cm + operators: + - scale: {1} +- name: {4} + material: {5} + geometry: + format: c2c + path: {0} + units: cm + operators: + - scale: {1} +- name: {6} + material: {7} + geometry: + format: c2c + path: {0} + units: cm + operators: + - scale: {1} +)"; + + const std::string shape_name {"shape"}; + const std::string mat_name {"mat"}; + + const std::string underscored_shape_name {"underscored_shape"}; + const std::string underscored_mat_name {"underscored_mat"}; + + const std::string double_underscored_shape_name {"double_underscored_shape"}; + const std::string double_underscored_mat_name {"double_underscored_mat"}; + + ScopedTemporaryFile contour_file(axom::fmt::format("{}.contour", testname), + unit_semicircle_contour); + + ScopedTemporaryFile shape_file(axom::fmt::format("{}.yaml", testname), + axom::fmt::format(shape_template, + contour_file.getFileName(), + radius, + shape_name, + mat_name, + underscored_shape_name, + underscored_mat_name, + double_underscored_shape_name, + double_underscored_mat_name)); + + if(very_verbose_output) + { + SLIC_INFO("Contour file: \n" << contour_file.getFileContents()); + SLIC_INFO("Shape file: \n" << shape_file.getFileContents()); + } + + this->validateShapeFile(shape_file.getFileName()); + this->initializeShaping(shape_file.getFileName()); + + this->runShaping(); + + // Collect and print registered fields + std::vector regFields; + for(const auto& pr : this->getDC().GetFieldMap()) + { + regFields.push_back(pr.first); + } + SLIC_INFO(axom::fmt::format("Registered fields: {}", + axom::fmt::join(regFields, ", "))); + + // check that output materials are present + EXPECT_TRUE(this->getDC().HasField(axom::fmt::format("vol_frac_{}", mat_name))); + EXPECT_TRUE(this->getDC().HasField( + axom::fmt::format("vol_frac_{}", underscored_mat_name))); + EXPECT_TRUE(this->getDC().HasField( + axom::fmt::format("vol_frac_{}", double_underscored_mat_name))); + + // Save meshes and fields + if(very_verbose_output) + { + this->getDC().Save(testname, axom::sidre::Group::getDefaultIOProtocol()); + } +} + //----------------------------------------------------------------------------- TEST_F(SamplingShaperTest3D, basic_tet) From 21b45c3f3b4d310bad8eb01792bd8cad6bf2b416 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 31 Aug 2023 21:32:12 -0700 Subject: [PATCH 103/639] Change logging level for message relating to replacement rules Users might want to know how replacement rules are getting applied in non-debug builds. --- src/axom/quest/SamplingShaper.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/quest/SamplingShaper.hpp b/src/axom/quest/SamplingShaper.hpp index 687ec0d3d0..99a3a5c692 100644 --- a/src/axom/quest/SamplingShaper.hpp +++ b/src/axom/quest/SamplingShaper.hpp @@ -511,7 +511,7 @@ class SamplingShaper : public Shaper } const bool shouldReplace = shape.replaces(otherMatName); - SLIC_DEBUG(axom::fmt::format( + SLIC_INFO(axom::fmt::format( "Should we replace material '{}' with shape '{}' of material '{}'? {}", otherMatName, shapeName, From a76e1d615690a0a326c3ec4f8ec0eb8fcb61a8f2 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 31 Aug 2023 21:53:12 -0700 Subject: [PATCH 104/639] Cleans up a utility function in the SamplingShaper --- src/axom/quest/SamplingShaper.hpp | 77 +++++++++---------------------- 1 file changed, 21 insertions(+), 56 deletions(-) diff --git a/src/axom/quest/SamplingShaper.hpp b/src/axom/quest/SamplingShaper.hpp index 99a3a5c692..13d602740c 100644 --- a/src/axom/quest/SamplingShaper.hpp +++ b/src/axom/quest/SamplingShaper.hpp @@ -657,71 +657,36 @@ class SamplingShaper : public Shaper /// This function is intended to help with debugging void printRegisteredFieldNames(const std::string& initialMessage) { - std::stringstream sstr; - sstr << "List of registered fields in the SamplingShaper " << initialMessage - << std::endl; - { - std::vector names; - for(auto kv : m_dc->GetFieldMap()) - { - names.push_back(kv.first); - } - sstr << fmt::format("\t* Data collection grid funcs: {}", - fmt::join(names, ", ")) - << std::endl; - } - { - std::vector names; - for(auto kv : m_dc->GetQFieldMap()) + // helper lambda to extract the keys of a map as a vector of strings + auto extractKeys = [](const auto& map) { + std::vector keys; + for(const auto& kv : map) { - names.push_back(kv.first); + keys.push_back(kv.first); } - sstr << fmt::format("\t* Data collection qfuncs: {}", - fmt::join(names, ", ")) - << std::endl; - } + return keys; + }; - { - std::vector names; - for(auto name : m_knownMaterials) - { - names.push_back(name); - } - sstr << fmt::format("\t* Known materials: {}", fmt::join(names, ", ")) - << std::endl; - } + std::stringstream sstr; + sstr << "List of registered fields in the SamplingShaper " << initialMessage + << fmt::format("\n\t* Data collection grid funcs: {}", + fmt::join(extractKeys(m_dc->GetFieldMap()), ", ")) + << fmt::format("\n\t* Data collection qfuncs: {}", + fmt::join(extractKeys(m_dc->GetQFieldMap()), ", ")) + << fmt::format("\n\t* Known materials: {}", + fmt::join(m_knownMaterials, ", ")); if(m_vfSampling == shaping::VolFracSampling::SAMPLE_AT_QPTS) { - { - std::vector names; - for(auto kv : m_inoutShapeQFuncs) - { - names.push_back(kv.first); - } - sstr << fmt::format("\t* Shape qfuncs: {}", fmt::join(names, ", ")) - << std::endl; - } - { - std::vector names; - for(auto kv : m_inoutMaterialQFuncs) - { - names.push_back(kv.first); - } - sstr << fmt::format("\t* Mat qfuncs: {}", fmt::join(names, ", ")) - << std::endl; - } + sstr << fmt::format("\n\t* Shape qfuncs: {}", + fmt::join(extractKeys(m_inoutShapeQFuncs), ", ")) + << fmt::format("\n\t* Mat qfuncs: {}", + fmt::join(extractKeys(m_inoutMaterialQFuncs), ", ")); } else if(m_vfSampling == shaping::VolFracSampling::SAMPLE_AT_DOFS) { - std::vector names; - for(auto kv : m_inoutDofs) - { - names.push_back(kv.first); - } - sstr << fmt::format("\t* Shape samples at DOFs: {}", - fmt::join(names, ", ")) - << std::endl; + sstr << fmt::format("\n\t* Shape samples at DOFs: {}", + fmt::join(extractKeys(m_inoutDofs), ", ")); } SLIC_INFO(sstr.str()); } From 06744938aa60fe3ccd586fd4673c518e3b4366f6 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 31 Aug 2023 23:26:58 -0700 Subject: [PATCH 105/639] Adds tests that use stl and c2c meshes in 2D and 3D This requires modifying the shape dimensions as we loop through the shapes rather than setting it as a constant for the entire collection. --- .../quest/tests/quest_sampling_shaper.cpp | 208 +++++++++++++++++- 1 file changed, 205 insertions(+), 3 deletions(-) diff --git a/src/axom/quest/tests/quest_sampling_shaper.cpp b/src/axom/quest/tests/quest_sampling_shaper.cpp index db3067a478..c05edbb539 100644 --- a/src/axom/quest/tests/quest_sampling_shaper.cpp +++ b/src/axom/quest/tests/quest_sampling_shaper.cpp @@ -166,7 +166,19 @@ class SamplingShaperTest : public ::testing::Test EXPECT_NE(nullptr, m_shaper) << "Shaper needs to be initialized via initializeShaping()"; - const auto shapeDim = m_shapeSet->getDimensions(); + // Define lambda to override default dimensions, when necessary + auto getShapeDim = [defaultDim = + m_shapeSet->getDimensions()](const auto& shape) { + static std::map format_dim = { + {"c2c", klee::Dimensions::Two}, + {"stl", klee::Dimensions::Three}}; + + const auto& format_str = shape.getGeometry().getFormat(); + return format_dim.find(format_str) != format_dim.end() + ? format_dim[format_str] + : defaultDim; + }; + for(const auto& shape : m_shapeSet->getShapes()) { SLIC_INFO_IF(very_verbose_output, @@ -174,6 +186,8 @@ class SamplingShaperTest : public ::testing::Test shape.getName(), shape.getMaterial())); + const auto shapeDim = getShapeDim(shape); + m_shaper->loadShape(shape); m_shaper->prepareShapeQuery(shapeDim, shape); m_shaper->runShapeQuery(shape); @@ -1132,6 +1146,110 @@ dimensions: 2 } } +TEST_F(SamplingShaperTest2D, contour_and_stl_2D) +{ + using Point2D = primal::Point; + using Point3D = primal::Point; + + const auto& testname = + ::testing::UnitTest::GetInstance()->current_test_info()->name(); + + constexpr double radius = 1.5; + + const std::string shape_template = R"( +dimensions: 2 + +shapes: +# preshape a background material; dimension should be default +- name: background + material: {3} + geometry: + format: none +# shape in a revolved sphere given as a c2c contour +- name: circle_shape + material: {4} + geometry: + format: c2c + path: {0} + units: cm + operators: + - scale: {2} +# shape in a sphere given as an stl surface mesh +- name: sphere_shape + material: {5} + geometry: + format: stl + path: {1} + units: cm +)"; + + const std::string background_material = "luminiferous_ether"; + const std::string circle_material = "steel"; + const std::string sphere_material = "vaccum"; + const std::string sphere_path = + axom::fmt::format("{}/quest/unit_sphere.stl", AXOM_DATA_DIR); + + ScopedTemporaryFile contour_file(axom::fmt::format("{}.contour", testname), + unit_circle_contour); + + ScopedTemporaryFile shape_file(axom::fmt::format("{}.yaml", testname), + axom::fmt::format(shape_template, + contour_file.getFileName(), + sphere_path, + radius, + background_material, + circle_material, + sphere_material)); + + if(very_verbose_output) + { + SLIC_INFO("Contour file: \n" << contour_file.getFileContents()); + SLIC_INFO("Shape file: \n" << shape_file.getFileContents()); + } + + // Create an initial background material set to 1 everywhere + std::map initialGridFunctions; + { + auto* vf = this->registerVolFracGridFunction("init_vf_bg"); + this->initializeVolFracGridFunction<2>( + vf, + [](int, const Point2D&, int) -> double { return 1.; }); + initialGridFunctions[background_material] = vf; + } + + this->validateShapeFile(shape_file.getFileName()); + this->initializeShaping(shape_file.getFileName(), initialGridFunctions); + + // set projector from 2D mesh points to 3D query points within STL + this->m_shaper->setPointProjector([](Point2D pt) { + return Point3D {pt[0], pt[1], 0.}; + }); + + this->m_shaper->setQuadratureOrder(8); + + this->runShaping(); + + // Check that the result has a volume fraction field associated with circle and sphere materials + constexpr double exp_volume_contour = M_PI * radius * radius; + constexpr double exp_volume_sphere = M_PI * 1. * 1.; + this->checkExpectedVolumeFractions(circle_material, + exp_volume_contour - exp_volume_sphere, + 3e-2); + this->checkExpectedVolumeFractions(sphere_material, exp_volume_sphere, 3e-2); + + for(const auto& vf_name : + {background_material, circle_material, sphere_material}) + { + EXPECT_TRUE(this->getDC().HasField(axom::fmt::format("vol_frac_{}", vf_name))); + } + + // Save meshes and fields + if(very_verbose_output) + { + this->getDC().Save(testname, axom::sidre::Group::getDefaultIOProtocol()); + } +} + //----------------------------------------------------------------------------- TEST_F(SamplingShaperTest3D, basic_tet) @@ -1591,8 +1709,7 @@ dimensions: 2 this->runShaping(); - // Check that the result has a volume fraction field associated with the tetrahedron material - // Scaling by a factor of 1/2 in each dimension should multiply the total volume by a factor of 8 + // Check that the result has a volume fraction field associated with the circle material constexpr double exp_volume = 4. / 3. * M_PI * radius * radius * radius; this->checkExpectedVolumeFractions(circle_material, exp_volume, 3e-2); @@ -1603,6 +1720,91 @@ dimensions: 2 } } +TEST_F(SamplingShaperTest3D, contour_and_stl_3D) +{ + using Point2D = primal::Point; + using Point3D = primal::Point; + + const auto& testname = + ::testing::UnitTest::GetInstance()->current_test_info()->name(); + + constexpr double radius = 1.5; + + const std::string shape_template = R"( +dimensions: 2 + +shapes: +# shape in a revolved sphere given as a c2c contour +- name: circle_shape + material: {3} + geometry: + format: c2c + path: {0} + units: cm + operators: + - scale: {2} +# shape in a sphere given as an stl surface mesh +- name: sphere_shape + material: {4} + geometry: + format: stl + path: {1} + units: cm +)"; + + const std::string circle_material = "steel"; + const std::string sphere_material = "void"; + const std::string sphere_path = + axom::fmt::format("{}/quest/unit_sphere.stl", AXOM_DATA_DIR); + + ScopedTemporaryFile contour_file(axom::fmt::format("{}.contour", testname), + unit_semicircle_contour); + + ScopedTemporaryFile shape_file(axom::fmt::format("{}.yaml", testname), + axom::fmt::format(shape_template, + contour_file.getFileName(), + sphere_path, + radius, + circle_material, + sphere_material)); + + if(very_verbose_output) + { + SLIC_INFO("Contour file: \n" << contour_file.getFileContents()); + SLIC_INFO("Shape file: \n" << shape_file.getFileContents()); + } + + this->validateShapeFile(shape_file.getFileName()); + this->initializeShaping(shape_file.getFileName()); + + // set projector from 3D points to axisymmetric plane + this->m_shaper->setPointProjector([](Point3D pt) { + const double& x = pt[0]; + const double& y = pt[1]; + const double& z = pt[2]; + return Point2D {z, sqrt(x * x + y * y)}; + }); + + // we need a higher quadrature order to resolve this shape at the (low) testing resolution + this->m_shaper->setQuadratureOrder(8); + + this->runShaping(); + + // Check that the result has a volume fraction field associated with sphere and circle materials + constexpr double exp_volume_contour = 4. / 3. * M_PI * radius * radius * radius; + constexpr double exp_volume_sphere = 4. / 3. * M_PI * 1. * 1. * 1.; + this->checkExpectedVolumeFractions(circle_material, + exp_volume_contour - exp_volume_sphere, + 3e-2); + this->checkExpectedVolumeFractions(sphere_material, exp_volume_sphere, 3e-2); + + // Save meshes and fields + if(very_verbose_output) + { + this->getDC().Save(testname, axom::sidre::Group::getDefaultIOProtocol()); + } +} + //----------------------------------------------------------------------------- int main(int argc, char* argv[]) { From 0feb8c9a14307a0742b4868b6fc25181e76f494c Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 5 Sep 2023 15:21:22 -0700 Subject: [PATCH 106/639] Updates RELEASE_NOTES --- RELEASE-NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index cf36a9eefa..c04b4bb1d5 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -27,6 +27,9 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - `MarchingCubes::MarchingCubes` - `MarchingCubesSingleDomain::MarchingCubesSingleDomain` +### Fixed +- quest's `SamplingShaper` now properly handles material names containing underscores + ## [Version 0.8.1] - Release date 2023-08-16 ### Changed From 170a3c5fbd08ce5e005fc6b8b659628916bc37c5 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Thu, 14 Sep 2023 09:03:42 -0700 Subject: [PATCH 107/639] Use member initializer and compiler generated default constructor --- src/axom/primal/geometry/Quadrilateral.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/axom/primal/geometry/Quadrilateral.hpp b/src/axom/primal/geometry/Quadrilateral.hpp index 1cb28393d6..b3ca9ba7b1 100644 --- a/src/axom/primal/geometry/Quadrilateral.hpp +++ b/src/axom/primal/geometry/Quadrilateral.hpp @@ -72,10 +72,7 @@ class Quadrilateral public: /// \brief Default constructor. Creates a degenerate quadrilateral. - AXOM_HOST_DEVICE - Quadrilateral() - : m_points {PointType {}, PointType {}, PointType {}, PointType {}} - { } + Quadrilateral() = default; /*! * \brief Custom Constructor. Creates a quadrilateral from the 4 points A, B, C, and D. @@ -224,7 +221,10 @@ class Quadrilateral } private: - PointType m_points[NUM_QUAD_VERTS]; + PointType m_points[NUM_QUAD_VERTS] {PointType {}, + PointType {}, + PointType {}, + PointType {}}; }; //------------------------------------------------------------------------------ From 9a25422d4ce082332122db8cbcf01a0428913b43 Mon Sep 17 00:00:00 2001 From: Brian Han Date: Tue, 19 Sep 2023 08:15:16 -0700 Subject: [PATCH 108/639] Add signedVolume() to Polyhedron class, add intel oneAPI config (#1186) --- RELEASE-NOTES.md | 5 + ...ppet-toss_4_x86_64_ib-intel@2022.1.0.cmake | 110 ++++++++++++++++++ .../azure-pipelines/linux-build_and_test.sh | 4 +- .../spack/configs/toss_4_x86_64_ib/spack.yaml | 15 +++ scripts/spack/specs.json | 3 +- src/axom/primal/geometry/Polyhedron.hpp | 66 +++++------ src/axom/primal/operators/clip.hpp | 35 +++--- .../primal/operators/detail/clip_impl.hpp | 12 +- .../primal/operators/intersection_volume.hpp | 53 +++++---- src/axom/primal/tests/primal_clip.cpp | 6 +- src/axom/primal/tests/primal_hexahedron.cpp | 56 ++++++++- src/axom/primal/tests/primal_polyhedron.cpp | 12 +- src/axom/quest/Discretize.cpp | 12 +- src/axom/quest/IntersectionShaper.hpp | 19 +-- src/axom/quest/detail/MarchingCubesImpl.hpp | 9 +- src/axom/quest/detail/PointFinder.hpp | 8 +- src/axom/quest/examples/CMakeLists.txt | 11 ++ .../examples/quest_bvh_two_pass.cpp} | 5 + src/axom/spin/ImplicitGrid.hpp | 7 +- src/axom/spin/UniformGrid.hpp | 7 +- src/axom/spin/docs/sphinx/bvh.rst | 8 +- src/axom/spin/examples/CMakeLists.txt | 14 --- src/axom/spin/policy/LinearBVH.hpp | 7 +- 23 files changed, 342 insertions(+), 142 deletions(-) create mode 100644 host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake rename src/axom/{spin/examples/spin_bvh_two_pass.cpp => quest/examples/quest_bvh_two_pass.cpp} (98%) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index c04b4bb1d5..24562fb93c 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -26,6 +26,11 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - `DistributedClosestPoint::computeClosestPoints` - `MarchingCubes::MarchingCubes` - `MarchingCubesSingleDomain::MarchingCubesSingleDomain` +- Primal: `Polyhedron::volume()` function changed from returning a signed + volume to an unsigned volume. The added `Polyhedron::signedVolume()` function + returns the signed volume. +- Primal: `intersection_volume()` operators changed from returning a signed + volume to an unsigned volume. ### Fixed - quest's `SamplingShaper` now properly handles material names containing underscores diff --git a/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake new file mode 100644 index 0000000000..3f04656c16 --- /dev/null +++ b/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake @@ -0,0 +1,110 @@ +#------------------------------------------------------------------------------ +# !!!! This is a generated file, edit at own risk !!!! +#------------------------------------------------------------------------------ +# CMake executable path: /usr/tce/bin/cmake +#------------------------------------------------------------------------------ + +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/hypre-2.24.0-qdjyl5ibcpl4nxb6t5godfgvi5bb6hac;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/parmetis-4.0.3-nqxoj5gqogj32hfo5ognkcb6vg24zdlc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/metis-5.1.0-tb5bijmooj2d6d2npjpajcj4fyu4yd4y;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/gmake-4.4.1-e3r4ry6vgi7zp4mbwfokypkutqwpctek;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/blt-0.5.3-i7qltms7ksyz4xltznzbtsafywrykq7b;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/usr/tce" CACHE PATH "") + +set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") + +#------------------------------------------------------------------------------ +# Compilers +#------------------------------------------------------------------------------ +# Compiler Spec: intel@=2022.1.0 +#------------------------------------------------------------------------------ +if(DEFINED ENV{SPACK_CC}) + + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/spack/lib/spack/env/intel/icc" CACHE PATH "") + + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/spack/lib/spack/env/intel/icpc" CACHE PATH "") + + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/spack/lib/spack/env/intel/ifort" CACHE PATH "") + +else() + + set(CMAKE_C_COMPILER "/usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icx" CACHE PATH "") + + set(CMAKE_CXX_COMPILER "/usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icpx" CACHE PATH "") + + set(CMAKE_Fortran_COMPILER "/usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/ifx" CACHE PATH "") + +endif() + +set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") + +set(ENABLE_FORTRAN ON CACHE BOOL "") + +#------------------------------------------------------------------------------ +# MPI +#------------------------------------------------------------------------------ + +set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0/bin/mpicc" CACHE PATH "") + +set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0/bin/mpicxx" CACHE PATH "") + +set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0/bin/mpif90" CACHE PATH "") + +set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") + +set(ENABLE_MPI ON CACHE BOOL "") + +set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") + +#------------------------------------------------------------------------------ +# Hardware +#------------------------------------------------------------------------------ + +#------------------------------------------------ +# Hardware Specifics +#------------------------------------------------ + +set(ENABLE_OPENMP ON CACHE BOOL "") + +set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") + +#------------------------------------------------------------------------------ +# TPLs +#------------------------------------------------------------------------------ + +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0" CACHE PATH "") + +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i" CACHE PATH "") + +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa" CACHE PATH "") + +set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj" CACHE PATH "") + +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg" CACHE PATH "") + +set(LUA_DIR "/usr" CACHE PATH "") + +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up" CACHE PATH "") + +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5" CACHE PATH "") + +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4" CACHE PATH "") + +# scr not built + +#------------------------------------------------------------------------------ +# Devtools +#------------------------------------------------------------------------------ + +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_05_18_11_52_05/._view/btoxy5ovdbouub2brzxcmjwzdhvzatlc" CACHE PATH "") + +set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0/bin/clang-format" CACHE PATH "") + +set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") + +set(ENABLE_DOCS ON CACHE BOOL "") + +set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") + +set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") + +set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") + +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") + + diff --git a/scripts/azure-pipelines/linux-build_and_test.sh b/scripts/azure-pipelines/linux-build_and_test.sh index 25b5ffc873..c6ec4dee87 100755 --- a/scripts/azure-pipelines/linux-build_and_test.sh +++ b/scripts/azure-pipelines/linux-build_and_test.sh @@ -33,9 +33,9 @@ if [[ "$DO_BUILD" == "yes" ]] ; then or_die cd build-$HOST_CONFIG-${BUILD_TYPE,,} echo "~~~~~~ BUILDING ~~~~~~~~" if [[ ${CMAKE_EXTRA_FLAGS} == *COVERAGE* ]] ; then - or_die make -j 10 + or_die make -j 8 else - or_die make -j 10 VERBOSE=1 + or_die make -j 8 VERBOSE=1 fi if [[ "${DO_TEST}" == "yes" ]] ; then echo "~~~~~~ RUNNING TESTS ~~~~~~~~" diff --git a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml index 031bdfc531..4918ee815b 100644 --- a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml @@ -46,6 +46,19 @@ spack: fc: /usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran spec: gcc@10.3.1 target: x86_64 + - compiler: + environment: {} + extra_rpaths: [] + flags: {} + modules: [] + operating_system: rhel8 + paths: + cc: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icx + cxx: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icpx + f77: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/ifx + fc: /usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/ifx + spec: intel@2022.1.0 + target: x86_64 packages: all: @@ -86,6 +99,8 @@ spack: prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6 - spec: mvapich2@2.3.6%gcc@10.3.1 process_managers=slurm arch=linux-rhel8-ivybridge prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1 + - spec: mvapich2@2.3.6%intel@2022.1.0 process_managers=slurm arch=linux-rhel8-ivybridge + prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0 netlib-lapack: buildable: false diff --git a/scripts/spack/specs.json b/scripts/spack/specs.json index c46194c663..15ee34e913 100644 --- a/scripts/spack/specs.json +++ b/scripts/spack/specs.json @@ -22,7 +22,8 @@ "toss_4_x86_64_ib": [ "gcc@10.3.1+devtools+hdf5+mfem+c2c", - "clang@14.0.6+devtools+hdf5+mfem+c2c" ], + "clang@14.0.6+devtools+hdf5+mfem+c2c", + "intel@2022.1.0+devtools+hdf5+mfem+c2c" ], "__comment__":"# Use amdgpu_target=gfx90a for tioga/rzvernal; and gfx908 for rznevada", "__comment__":"# -Wno-int-conversion flag needed for building HDF5", diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp index 2014463a71..eeaf71afc9 100644 --- a/src/axom/primal/geometry/Polyhedron.hpp +++ b/src/axom/primal/geometry/Polyhedron.hpp @@ -501,16 +501,18 @@ class Polyhedron } /*! - * \brief Finds the volume of the polyhedron. + * \brief Computes the signed volume of the polyhedron. * - * \return The volume of the polyhedron + * \return The signed volume of the polyhedron * * \note Function is based off moments() in Mike Owen's PolyClipper. * * \pre polyhedron vertex neighbors are defined, and polyhedron is 3D + * + * \sa volume() */ AXOM_HOST_DEVICE - double volume() const + double signedVolume() const { double retVol = 0.0; @@ -519,13 +521,13 @@ class Polyhedron return retVol; } - // Finds the volume of tetrahedrons formed from vertices of the Polyhedron - // faces and an arbitrary origin (the first vertex) + // Computes the signed volume of tetrahedra formed from vertices of the + // Polyhedron faces and an arbitrary origin (the first vertex) else { SLIC_CHECK_MSG( hasNeighbors(), - "Polyhedron::volume() is only valid with vertex neighbors."); + "Polyhedron::signedVolume() is only valid with vertex neighbors."); // faces is an overestimation int faces[MAX_VERTS * MAX_VERTS]; @@ -555,6 +557,13 @@ class Polyhedron return retVol / 6.; } + /*! + * \brief Returns the absolute (unsigned) volume of the polyhedron + * \sa signedVolume() + */ + AXOM_HOST_DEVICE + double volume() const { return axom::utilities::abs(signedVolume()); } + /*! * \brief Simple formatted print of a polyhedron instance * @@ -661,9 +670,9 @@ class Polyhedron * \brief Creates a Polyhedron from a given Hexahedron's vertices. * * \param [in] hex The hexahedron - * \param [in] checkSign If true (default is false), checks the volume of the - * Polyhedron is positive. If volume is negative, order of some - * vertices will be swapped. + * \param [in] checkSign If true (default is false), checks if the + * signed volume of the Polyhedron is positive. If signed volume + * is negative, order of some vertices will be swapped. * * \return A Polyhedron with the Hexahedron's vertices and added * vertex neighbors @@ -714,10 +723,10 @@ class Polyhedron poly.addNeighbors(6, {2, 7, 5}); poly.addNeighbors(7, {3, 4, 6}); - // Reverses order of vertices 1,3 and 5,7 if volume is negative + // Reverses order of vertices 1,3 and 5,7 if signed volume is negative if(checkSign) { - if(poly.volume() < 0) + if(poly.signedVolume() < 0) { axom::utilities::swap>(poly[1], poly[3]); axom::utilities::swap>(poly[5], poly[7]); @@ -731,9 +740,9 @@ class Polyhedron * \brief Creates a Polyhedron from a given Octahedron's vertices. * * \param [in] oct The octahedron - * \param [in] checkSign If true (default is false), checks the volume of the - * Polyhedron is positive. If volume is negative, order of some - * vertices will be swapped. + * \param [in] checkSign If true (default is false), checks if the + * signed volume of the Polyhedron is positive. If signed volume + * is negative, order of some vertices will be swapped. * * \return A Polyhedron with the Octahedron's vertices and added * vertex neighbors @@ -781,27 +790,12 @@ class Polyhedron poly.addNeighbors(5, {0, 1, 3, 4}); // Reverses order of vertices 1,2 and 4,5 if volume is negative. - // Expanded swap operations for HIP workaround. if(checkSign) { - double vol = poly.volume(); - if(vol < 0) + if(poly.signedVolume() < 0) { - PointType p2({poly[4][0], poly[4][1], poly[4][2]}); - poly[4][0] = poly[5][0]; - poly[4][1] = poly[5][1]; - poly[4][2] = poly[5][2]; - poly[5][0] = p2[0]; - poly[5][1] = p2[1]; - poly[5][2] = p2[2]; - - PointType p1({poly[1][0], poly[1][1], poly[1][2]}); - poly[1][0] = poly[2][0]; - poly[1][1] = poly[2][1]; - poly[1][2] = poly[2][2]; - poly[2][0] = p1[0]; - poly[2][1] = p1[1]; - poly[2][2] = p1[2]; + axom::utilities::swap(poly[1], poly[2]); + axom::utilities::swap(poly[4], poly[5]); } } @@ -812,9 +806,9 @@ class Polyhedron * \brief Creates a Polyhedron from a given Tetrahedron's vertices. * * \param [in] tet The tetrahedron - * \param [in] checkSign If true (default is false), checks the volume of the - * Polyhedron is positive. If volume is negative, order of some - * vertices will be swapped. + * \param [in] checkSign If true (default is false), checks if the + * signed volume of the Polyhedron is positive. If signed volume + * is negative, order of some vertices will be swapped. * * \return A Polyhedron with the Tetrahedron's vertices and added * vertex neighbors @@ -858,7 +852,7 @@ class Polyhedron poly.addNeighbors(2, {0, 3, 1}); poly.addNeighbors(3, {0, 1, 2}); - // Reverses order of vertices 1 and 2 if volume is negative + // Reverses order of vertices 1 and 2 if signed volume is negative if(checkSign) { if(tet.signedVolume() < 0) diff --git a/src/axom/primal/operators/clip.hpp b/src/axom/primal/operators/clip.hpp index b80a084081..6d0a82f1a4 100644 --- a/src/axom/primal/operators/clip.hpp +++ b/src/axom/primal/operators/clip.hpp @@ -117,9 +117,10 @@ Polygon clip(const Triangle& tri, const BoundingBox& bbox) * \param [in] hex The hexahedron to clip * \param [in] tet The tetrahedron to clip against * \param [in] eps The epsilon value - * \param [in] checkSign If true (default is false), checks the volume of the - * shapes are positive. If volume is negative, order of some - * vertices will be swapped. + * \param [in] checkSign If true (default is false), checks if the + * signed volume of each shape is positive. If the signed volume + * of that shape is negative, order of some vertices will be + * swapped for that shape. * * \return A polyhedron of the hexahedron clipped against the tetrahedron. * @@ -157,9 +158,10 @@ AXOM_HOST_DEVICE Polyhedron clip(const Hexahedron& hex, * \param [in] tet The tetrahedron to clip against * \param [in] hex The hexahedron to clip * \param [in] eps The epsilon value - * \param [in] checkSign If true (default is false), checks the volume of the - * shapes are positive. If volume is negative, order of some - * vertices will be swapped. + * \param [in] checkSign If true (default is false), checks if the + * signed volume of each shape is positive. If the signed volume + * of that shape is negative, order of some vertices will be + * swapped for that shape. * * \return A polyhedron of the hexahedron clipped against the tetrahedron. * @@ -197,9 +199,10 @@ AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, * \param [in] oct The octahedron to clip * \param [in] tet The tetrahedron to clip against * \param [in] eps The epsilon value - * \param [in] checkSign If true (default is false), checks the volume of the - * shapes are positive. If volume is negative, order of some - * vertices will be swapped. + * \param [in] checkSign If true (default is false), checks if the + * signed volume of each shape is positive. If the signed volume + * of that shape is negative, order of some vertices will be + * swapped for that shape. * * \return A polyhedron of the octahedron clipped against the tetrahedron. * @@ -238,9 +241,10 @@ AXOM_HOST_DEVICE Polyhedron clip(const Octahedron& oct, * \param [in] oct The octahedron to clip * \param [in] tet The tetrahedron to clip against * \param [in] eps The epsilon value - * \param [in] checkSign If true (default is false), checks the volume of the - * shapes are positive. If volume is negative, order of some - * vertices will be swapped. + * \param [in] checkSign If true (default is false), checks if the + * signed volume of each shape is positive. If the signed volume + * of that shape is negative, order of some vertices will be + * swapped for that shape. * * \return A polyhedron of the octahedron clipped against the tetrahedron. * @@ -277,9 +281,10 @@ AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, * \param [in] tet1 The tetrahedron to clip * \param [in] tet2 The tetrahedron to clip against * \param [in] eps The epsilon value - * \param [in] checkSign If true (default is false), checks the volume of the - * shapes are positive. If volume is negative, order of some - * vertices will be swapped. + * \param [in] checkSign If true (default is false), checks if the + * signed volume of each shape is positive. If the signed volume + * of that shape is negative, order of some vertices will be + * swapped for that shape. * * \return A polyhedron of the tetrahedron clipped against * the other tetrahedron. diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index d239028435..be013c98b5 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -486,7 +486,7 @@ AXOM_HOST_DEVICE Polyhedron clipPolyhedron( * \param [in] hex The hexahedron * \param [in] tet The tetrahedron * \param [in] eps The tolerance for plane point orientation. - * \param [in] checkSign Checks the volumes of the shapes are positive. + * \param [in] checkSign Check if the signed volume of each shape is positive. * \return The Polyhedron formed from clipping the hexahedron with a tetrahedron. * */ @@ -510,7 +510,7 @@ AXOM_HOST_DEVICE Polyhedron clipHexahedron( make_plane(tet[0], tet[3], tet[1]), make_plane(tet[0], tet[1], tet[2])}; - // Adjusts planes in case tetrahedron volume is negative + // Adjusts planes in case tetrahedron signed volume is negative if(checkSign) { PolyhedronType tet_poly = PolyhedronType::from_primitive(tet, checkSign); @@ -533,7 +533,7 @@ AXOM_HOST_DEVICE Polyhedron clipHexahedron( * \param [in] oct The octahedron * \param [in] tet The tetrahedron * \param [in] eps The tolerance for plane point orientation. - * \param [in] checkSign Checks the volumes of the shapes are positive. + * \param [in] checkSign Check if the signed volume of each shape is positive. * \return The Polyhedron formed from clipping the octahedron with a tetrahedron. * */ @@ -557,7 +557,7 @@ AXOM_HOST_DEVICE Polyhedron clipOctahedron( make_plane(tet[0], tet[3], tet[1]), make_plane(tet[0], tet[1], tet[2])}; - // Adjusts planes in case tetrahedron volume is negative + // Adjusts planes in case tetrahedron signed volume is negative if(checkSign) { PolyhedronType tet_poly = PolyhedronType::from_primitive(tet, checkSign); @@ -580,7 +580,7 @@ AXOM_HOST_DEVICE Polyhedron clipOctahedron( * \param [in] tet1 The tetrahedron to clip * \param [in] tet2 The tetrahedron to clip against * \param [in] eps The tolerance for plane point orientation. - * \param [in] checkSign Checks the volumes of the shapes are positive. + * \param [in] checkSign Check if the signed volume of each shape is positive. * \return The Polyhedron formed from clipping the tetrahedron with a tetrahedron. * */ @@ -604,7 +604,7 @@ AXOM_HOST_DEVICE Polyhedron clipTetrahedron( make_plane(tet2[0], tet2[3], tet2[1]), make_plane(tet2[0], tet2[1], tet2[2])}; - // Adjusts planes in case tetrahedron volume is negative + // Adjusts planes in case tetrahedron signed volume is negative if(checkSign) { PolyhedronType tet_poly = PolyhedronType::from_primitive(tet2, checkSign); diff --git a/src/axom/primal/operators/intersection_volume.hpp b/src/axom/primal/operators/intersection_volume.hpp index 7599b527d4..3b7a96fcb9 100644 --- a/src/axom/primal/operators/intersection_volume.hpp +++ b/src/axom/primal/operators/intersection_volume.hpp @@ -26,15 +26,17 @@ namespace axom namespace primal { /*! - * \brief Finds the intersection volume between a hexahedron and a tetrahedron + * \brief Finds the absolute (unsigned) intersection volume between + * a hexahedron and a tetrahedron * * \param [in] hex The hexahedron * \param [in] tet The tetrahedron * \param [in] eps The tolerance for determining the intersection - * \param [in] checkSign If true (default is false), checks the volumes of the - * shapes are positive. If volume is negative, order of some - * vertices will be swapped. - * + * \param [in] checkSign If true (default is false), checks if the + * signed volume of each shape is positive. If the signed volume + * of that shape is negative, order of some vertices will be + * swapped for that shape. + * \return Intersection volume between the hexahedron and tetrahedron * * \note checkSign flag does not guarantee the shapes' vertex orders @@ -52,14 +54,16 @@ AXOM_HOST_DEVICE T intersection_volume(const Hexahedron& hex, } /*! - * \brief Finds the intersection volume between a tetrahedron and a hexahedron + * \brief Finds the absolute (unsigned) intersection volume between + * a tetrahedron and a hexahedron * * \param [in] hex The tetrahedron * \param [in] tet The hexahedron * \param [in] eps The tolerance for determining the intersection - * \param [in] checkSign If true (default is false), checks the volumes of the - * shapes are positive. If volume is negative, order of some - * vertices will be swapped. + * \param [in] checkSign If true (default is false), checks if the + * signed volume of each shape is positive. If the signed volume + * of that shape is negative, order of some vertices will be + * swapped for that shape. * * \return Intersection volume between the tetrahedron and hexahedron * @@ -78,14 +82,16 @@ AXOM_HOST_DEVICE T intersection_volume(const Tetrahedron& tet, } /*! - * \brief Finds the intersection volume between a octahedron and a tetrahedron + * \brief Finds the absolute (unsigned) intersection volume between + * a octahedron and a tetrahedron * * \param [in] oct The octahedron * \param [in] tet The tetrahedron * \param [in] eps The tolerance for determining the intersection - * \param [in] checkSign If true (default is false), checks the volumes of the - * shapes are positive. If volume is negative, order of some - * vertices will be swapped. + * \param [in] checkSign If true (default is false), checks if the + * signed volume of each shape is positive. If the signed volume + * of that shape is negative, order of some vertices will be + * swapped for that shape. * * \return Intersection volume between the octahedron and tetrahedron * @@ -104,14 +110,16 @@ AXOM_HOST_DEVICE T intersection_volume(const Octahedron& oct, } /*! - * \brief Finds the intersection volume between a tetrahedron and a octahedron + * \brief Finds the absolute (unsigned) intersection volume between + * a tetrahedron and a octahedron * * \param [in] oct The tetrahedron * \param [in] tet The octahedron * \param [in] eps The tolerance for determining the intersection - * \param [in] checkSign If true (default is false), checks the volumes of the - * shapes are positive. If volume is negative, order of some - * vertices will be swapped. + * \param [in] checkSign If true (default is false), checks if the + * signed volume of each shape is positive. If the signed volume + * of that shape is negative, order of some vertices will be + * swapped for that shape. * * \return Intersection volume between the tetrahedron and octahedron * @@ -130,15 +138,16 @@ AXOM_HOST_DEVICE T intersection_volume(const Tetrahedron& tet, } /*! - * \brief Finds the intersection volume between a tetrahedron and another - * tetrahedron + * \brief Finds the absolute (unsigned) intersection volume between + * a tetrahedron and another tetrahedron * * \param [in] tet1 The tetrahedron * \param [in] tet2 The other tetrahedron * \param [in] eps The tolerance for determining the intersection - * \param [in] checkSign If true (default is false), checks the volumes of the - * shapes are positive. If volume is negative, order of some - * vertices will be swapped. + * \param [in] checkSign If true (default is false), checks if the + * signed volume of each shape is positive. If the signed volume + * of that shape is negative, order of some vertices will be + * swapped for that shape. * * \return Intersection volume between the tetrahedra * diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index 97257033f2..efaf0edf8f 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -41,6 +41,7 @@ using PolyhedronType = axom::primal::Polyhedron; TEST(primal_clip, simple_clip) { using namespace Primal3D; + constexpr double EPS = 1e-8; BoundingBoxType bbox; bbox.addPoint(PointType::zero()); bbox.addPoint(PointType::ones()); @@ -83,7 +84,10 @@ TEST(primal_clip, simple_clip) PolygonType poly = axom::primal::clip(tri, bbox); EXPECT_EQ(4, poly.numVertices()); - EXPECT_EQ(PointType(.5), poly.vertexMean()); + for(int dim = 0; dim < 3; ++dim) + { + EXPECT_NEAR(0.5, poly.vertexMean()[dim], EPS); + } SLIC_INFO("Intersection of triangle " << tri << " and bounding box " << bbox << " is polygon" << poly); diff --git a/src/axom/primal/tests/primal_hexahedron.cpp b/src/axom/primal/tests/primal_hexahedron.cpp index 86ff5021c3..3301d7c904 100644 --- a/src/axom/primal/tests/primal_hexahedron.cpp +++ b/src/axom/primal/tests/primal_hexahedron.cpp @@ -46,7 +46,7 @@ class HexahedronTest : public ::testing::Test protected: virtual void SetUp() { - EPS = 1e-12; + EPS = 1e-8; // Define coordinates for first hexahedron qData0[0] = QPoint {0, 0, 0}; @@ -78,11 +78,30 @@ class HexahedronTest : public ::testing::Test qData2[5] = QPoint {1.5, 1, 3.5}; qData2[6] = QPoint {3.5, 1, 3.5}; qData2[7] = QPoint {3.5, 1, 1.5}; + + // Reproducer Test Case + qData3[0] = + QPoint {-70 - (5.0 / 6.0), -165.0000000000000, -238.0000000000000}; + qData3[1] = + QPoint {-70 - (5.0 / 6.0), -143.0000000000000, -238.0000000000000}; + qData3[2] = + QPoint {-52.0000000000000, -143.0000000000000, -238.0000000000000}; + qData3[3] = + QPoint {-52.0000000000000, -165.0000000000000, -238.0000000000000}; + qData3[4] = + QPoint {-70 - (5.0 / 6.0), -165.0000000000000, -221.0000000000000}; + qData3[5] = + QPoint {-70 - (5.0 / 6.0), -143.0000000000000, -221.0000000000000}; + qData3[6] = + QPoint {-52.0000000000000, -143.0000000000000, -221.0000000000000}; + qData3[7] = + QPoint {-52.0000000000000, -165.0000000000000, -221.0000000000000}; } QPoint qData0[8]; QPoint qData1[8]; QPoint qData2[8]; + QPoint qData3[8]; double EPS; }; @@ -180,25 +199,58 @@ TEST_F(HexahedronTest, volume) const QPoint* pt0 = this->qData0; const QPoint* pt1 = this->qData1; const QPoint* pt2 = this->qData2; + const QPoint* pt3 = this->qData3; + + const QPoint non_planar_pt1 {0, -1, 0}; + const QPoint non_planar_pt2 {-0.5, -0.5, -0.5}; + const QPoint non_planar_pt3 {1.25, 1.25, 1.25}; // Initialize hexahedrons QHex hex0(pt0[0], pt0[1], pt0[2], pt0[3], pt0[4], pt0[5], pt0[6], pt0[7]); QHex hex1(pt1[0], pt1[1], pt1[2], pt1[3], pt1[4], pt1[5], pt1[6], pt1[7]); QHex hex2(pt2[0], pt2[1], pt2[2], pt2[3], pt2[4], pt2[5], pt2[6], pt2[7]); + QHex hex3(pt3[0], pt3[1], pt3[2], pt3[3], pt3[4], pt3[5], pt3[6], pt3[7]); + + // Hexahedron with one nonplanar side + QHex hex4(non_planar_pt1, pt0[1], pt0[2], pt0[3], pt0[4], pt0[5], pt0[6], pt0[7]); + + // Hexahedron with three nonplanar sides + QHex hex5(non_planar_pt2, pt0[1], pt0[2], pt0[3], pt0[4], pt0[5], pt0[6], pt0[7]); + + // Hexahedron with all nonplanar sides + QHex hex6(non_planar_pt2, + pt0[1], + pt0[2], + pt0[3], + pt0[4], + pt0[5], + non_planar_pt3, + pt0[7]); // Check volume EXPECT_DOUBLE_EQ(hex0.signedVolume(), 1); EXPECT_DOUBLE_EQ(hex1.signedVolume(), 1); EXPECT_DOUBLE_EQ(hex2.signedVolume(), 13); - + EXPECT_NEAR(hex3.signedVolume(), -7043.66666666, EPS); + EXPECT_DOUBLE_EQ(hex4.signedVolume(), 1.25); + EXPECT_DOUBLE_EQ(hex5.signedVolume(), 1.375); + EXPECT_DOUBLE_EQ(hex6.signedVolume(), 1.5625); EXPECT_DOUBLE_EQ(hex0.volume(), 1); EXPECT_DOUBLE_EQ(hex1.volume(), 1); EXPECT_DOUBLE_EQ(hex2.volume(), 13); + EXPECT_NEAR(hex3.volume(), 7043.66666666, EPS); + EXPECT_DOUBLE_EQ(hex4.volume(), 1.25); + EXPECT_DOUBLE_EQ(hex5.volume(), 1.375); + EXPECT_DOUBLE_EQ(hex6.volume(), 1.5625); // Check hexahedron volume against 24-tetrahedron subvolumes EXPECT_DOUBLE_EQ(hex0.volume(), volume_tet_decomp(hex0)); EXPECT_DOUBLE_EQ(hex1.volume(), volume_tet_decomp(hex1)); EXPECT_DOUBLE_EQ(hex2.volume(), volume_tet_decomp(hex2)); + EXPECT_DOUBLE_EQ(hex3.volume(), volume_tet_decomp(hex3)); + EXPECT_DOUBLE_EQ(hex4.volume(), volume_tet_decomp(hex4)); + EXPECT_DOUBLE_EQ(hex5.volume(), volume_tet_decomp(hex5)); + EXPECT_DOUBLE_EQ(hex6.volume(), volume_tet_decomp(hex6)); } TEST_F(HexahedronTest, equals) diff --git a/src/axom/primal/tests/primal_polyhedron.cpp b/src/axom/primal/tests/primal_polyhedron.cpp index 4f5f70a31b..9ca2d8d4d3 100644 --- a/src/axom/primal/tests/primal_polyhedron.cpp +++ b/src/axom/primal/tests/primal_polyhedron.cpp @@ -712,11 +712,11 @@ TEST(primal_polyhedron, polyhedron_from_primitive) axom::utilities::swap(hex[5], hex[7]); poly = Polyhedron3D::from_primitive(hex, false); - EXPECT_NEAR(-1.0, poly.volume(), EPS); + EXPECT_NEAR(-1.0, poly.signedVolume(), EPS); // Check sign poly = Polyhedron3D::from_primitive(hex, CHECK_SIGN); - EXPECT_NEAR(1.0, poly.volume(), EPS); + EXPECT_NEAR(1.0, poly.signedVolume(), EPS); // Valid octahedron Octahedron3D oct(Point3D {1, 0, 0}, @@ -734,11 +734,11 @@ TEST(primal_polyhedron, polyhedron_from_primitive) axom::utilities::swap(oct[4], oct[5]); poly = Polyhedron3D::from_primitive(oct, false); - EXPECT_NEAR(-0.6666, poly.volume(), EPS); + EXPECT_NEAR(-0.6666, poly.signedVolume(), EPS); // Check sign poly = Polyhedron3D::from_primitive(oct, CHECK_SIGN); - EXPECT_NEAR(0.6666, poly.volume(), EPS); + EXPECT_NEAR(0.6666, poly.signedVolume(), EPS); // Valid tetrahedron Tetrahedron3D tet(Point3D {1, 1, 1}, @@ -753,11 +753,11 @@ TEST(primal_polyhedron, polyhedron_from_primitive) axom::utilities::swap(tet[1], tet[2]); poly = Polyhedron3D::from_primitive(tet, false); - EXPECT_NEAR(-2.6666, poly.volume(), EPS); + EXPECT_NEAR(-2.6666, poly.signedVolume(), EPS); // Check sign poly = Polyhedron3D::from_primitive(tet, CHECK_SIGN); - EXPECT_NEAR(2.6666, poly.volume(), EPS); + EXPECT_NEAR(2.6666, poly.signedVolume(), EPS); } //------------------------------------------------------------------------------ diff --git a/src/axom/quest/Discretize.cpp b/src/axom/quest/Discretize.cpp index 771a2be2a7..b096341df8 100644 --- a/src/axom/quest/Discretize.cpp +++ b/src/axom/quest/Discretize.cpp @@ -188,7 +188,6 @@ double octPolyVolume(const OctType& o) { // Convert Octahedron into Polyhedrom PolyhedronType octPoly; - double octVolume; octPoly.addVertex(o[0]); octPoly.addVertex(o[1]); @@ -204,16 +203,7 @@ double octPolyVolume(const OctType& o) octPoly.addNeighbors(4, {0, 5, 3, 2}); octPoly.addNeighbors(5, {0, 1, 3, 4}); - octVolume = octPoly.volume(); - - // Flip sign if volume is negative - // (expected when vertex order is reversed) - if(octVolume < 0) - { - octVolume = -octVolume; - } - - return octVolume; + return octPoly.volume(); } } // namespace diff --git a/src/axom/quest/IntersectionShaper.hpp b/src/axom/quest/IntersectionShaper.hpp index 5e4cfcf287..400f4d09ae 100644 --- a/src/axom/quest/IntersectionShaper.hpp +++ b/src/axom/quest/IntersectionShaper.hpp @@ -518,7 +518,6 @@ class IntersectionShaper : public Shaper AXOM_LAMBDA(axom::IndexType i) { // Convert Octahedron into Polyhedrom PolyhedronType octPoly; - double octVolume; octPoly.addVertex(octs_view[i][0]); octPoly.addVertex(octs_view[i][1]); @@ -534,15 +533,7 @@ class IntersectionShaper : public Shaper octPoly.addNeighbors(4, {0, 5, 3, 2}); octPoly.addNeighbors(5, {0, 1, 3, 4}); - octVolume = octPoly.volume(); - - // Flip sign if volume is negative - // (expected when vertex order is reversed) - if(octVolume < 0) - { - octVolume = -octVolume; - } - total_oct_vol += octVolume; + total_oct_vol += octPoly.volume(); }); SLIC_INFO(axom::fmt::format( @@ -940,14 +931,8 @@ class IntersectionShaper : public Shaper // Poly is valid if(poly.numVertices() >= 4) { - double clip_volume = poly.volume(); - // Flip sign if negative - if(clip_volume < 0) - { - clip_volume = -clip_volume; - } RAJA::atomicAdd(overlap_volumes_view.data() + index, - clip_volume); + poly.volume()); } });); diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index aa9b317581..c3495f4100 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -388,7 +388,14 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase crossingsView[n].firstSurfaceCellId = prefixSumView[n]; }; #if defined(AXOM_USE_RAJA) - RAJA::exclusive_scan( + // Intel oneAPI compiler segfaults with OpenMP RAJA scan + #ifdef __INTEL_LLVM_COMPILER + using ScanPolicy = + typename axom::execution_space::loop_policy; + #else + using ScanPolicy = typename axom::execution_space::loop_policy; + #endif + RAJA::exclusive_scan( RAJA::make_span(addCellsView.data(), m_crossingCount), RAJA::make_span(prefixSumView.data(), m_crossingCount), RAJA::operators::plus {}); diff --git a/src/axom/quest/detail/PointFinder.hpp b/src/axom/quest/detail/PointFinder.hpp index e710d5ecc1..52d52b40d6 100644 --- a/src/axom/quest/detail/PointFinder.hpp +++ b/src/axom/quest/detail/PointFinder.hpp @@ -195,8 +195,14 @@ class PointFinder totalCountReduce += countsPtr[i]; }); - // Step 2: exclusive scan for offsets in candidate array + // Step 2: exclusive scan for offsets in candidate array + // Intel oneAPI compiler segfaults with OpenMP RAJA scan + #ifdef __INTEL_LLVM_COMPILER + using exec_policy = + typename axom::execution_space::loop_policy; + #else using exec_policy = typename axom::execution_space::loop_policy; + #endif RAJA::exclusive_scan(RAJA::make_span(counts.data(), npts), RAJA::make_span(offsets.data(), npts), RAJA::operators::plus {}); diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index 89ccb01662..bcd8732534 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -22,6 +22,17 @@ axom_add_executable( FOLDER axom/quest/examples ) +# BVH two pass example -------------------------------------------------------- +if (RAJA_FOUND AND UMPIRE_FOUND) + axom_add_executable( + NAME quest_bvh_two_pass_ex + SOURCES quest_bvh_two_pass.cpp + OUTPUT_DIR ${EXAMPLE_OUTPUT_DIRECTORY} + DEPENDS_ON ${quest_example_depends} + FOLDER axom/quest/examples + ) +endif() + # Shaping example ------------------------------------------------------------- if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI AND AXOM_ENABLE_SIDRE AND AXOM_ENABLE_MFEM_SIDRE_DATACOLLECTION diff --git a/src/axom/spin/examples/spin_bvh_two_pass.cpp b/src/axom/quest/examples/quest_bvh_two_pass.cpp similarity index 98% rename from src/axom/spin/examples/spin_bvh_two_pass.cpp rename to src/axom/quest/examples/quest_bvh_two_pass.cpp index e16db47c2e..e94e1c9597 100644 --- a/src/axom/spin/examples/spin_bvh_two_pass.cpp +++ b/src/axom/quest/examples/quest_bvh_two_pass.cpp @@ -107,7 +107,12 @@ void find_collisions_broadphase(const mint::Mesh* mesh, { using PointType = axom::primal::Point; using BoxType = axom::primal::BoundingBox; +// Intel oneAPI compiler segfaults with OpenMP RAJA scan +#ifdef __INTEL_LLVM_COMPILER + using exec_pol = typename axom::execution_space::loop_policy; +#else using exec_pol = typename axom::execution_space::loop_policy; +#endif using reduce_pol = typename axom::execution_space::reduce_policy; int allocatorId = axom::execution_space::allocatorID(); diff --git a/src/axom/spin/ImplicitGrid.hpp b/src/axom/spin/ImplicitGrid.hpp index 42bd4e8d6b..c53cc793d0 100644 --- a/src/axom/spin/ImplicitGrid.hpp +++ b/src/axom/spin/ImplicitGrid.hpp @@ -864,8 +864,13 @@ void ImplicitGrid::getCandidatesAsArray( totalCountReduce += outCounts[i]; }); - // Step 2: exclusive scan for offsets in candidate array + // Step 2: exclusive scan for offsets in candidate array + // Intel oneAPI compiler segfaults with OpenMP RAJA scan + #ifdef __INTEL_LLVM_COMPILER + using exec_policy = typename axom::execution_space::loop_policy; + #else using exec_policy = typename axom::execution_space::loop_policy; + #endif RAJA::exclusive_scan(RAJA::make_span(outCounts.data(), qsize), RAJA::make_span(outOffsets.data(), qsize), RAJA::operators::plus {}); diff --git a/src/axom/spin/UniformGrid.hpp b/src/axom/spin/UniformGrid.hpp index eeaf689ae1..b104bc2d7f 100644 --- a/src/axom/spin/UniformGrid.hpp +++ b/src/axom/spin/UniformGrid.hpp @@ -745,8 +745,13 @@ void UniformGrid::getCandidatesAsArray( totalCountReduce += counts_view[i]; }); - // Step 2: exclusive scan for offsets in candidate array + // Step 2: exclusive scan for offsets in candidate array + // Intel oneAPI compiler segfaults with OpenMP RAJA scan + #ifdef __INTEL_LLVM_COMPILER + using exec_policy = typename axom::execution_space::loop_policy; + #else using exec_policy = typename axom::execution_space::loop_policy; + #endif RAJA::exclusive_scan(RAJA::make_span(outCounts.data(), qsize), RAJA::make_span(outOffsets.data(), qsize), RAJA::operators::plus {}); diff --git a/src/axom/spin/docs/sphinx/bvh.rst b/src/axom/spin/docs/sphinx/bvh.rst index a1133436dd..343b58c084 100644 --- a/src/axom/spin/docs/sphinx/bvh.rst +++ b/src/axom/spin/docs/sphinx/bvh.rst @@ -94,7 +94,7 @@ might be used in a broad-phase collision detection problem. First, we initialize the BVH with the bounding boxes of all the query objects (mesh elements), and create a traverser object: -.. literalinclude:: ../../examples/spin_bvh_two_pass.cpp +.. literalinclude:: ../../../quest/examples/quest_bvh_two_pass.cpp :start-after: _bvh_traverse_init_start :end-before: _bvh_traverse_init_end :language: C++ @@ -104,7 +104,7 @@ in the mesh against each other, our query objects are bounding boxes. Thus, the traversal predicate tests if the query bounding box intersects with the bounding boxes of nodes in the BVH: -.. literalinclude:: ../../examples/spin_bvh_two_pass.cpp +.. literalinclude:: ../../../quest/examples/quest_bvh_two_pass.cpp :start-after: _bvh_traverse_predicate_start :end-before: _bvh_traverse_predicate_end :language: C++ @@ -114,7 +114,7 @@ traverse the BVH twice; for the first traversal we count the number of candidate intersections for each query object, allowing us to compute offset indices and total storage requirements for the collision pairs: -.. literalinclude:: ../../examples/spin_bvh_two_pass.cpp +.. literalinclude:: ../../../quest/examples/quest_bvh_two_pass.cpp :start-after: _bvh_traverse_first_pass_start :end-before: _bvh_traverse_first_pass_end :language: C++ @@ -123,7 +123,7 @@ After computing offset indices and allocating output arrays, we can then perform a second traversal through the BVH. This time, we will store candidate collision pairs when we reach a leaf node: -.. literalinclude:: ../../examples/spin_bvh_two_pass.cpp +.. literalinclude:: ../../../quest/examples/quest_bvh_two_pass.cpp :start-after: _bvh_traverse_second_pass_start :end-before: _bvh_traverse_second_pass_end :language: C++ diff --git a/src/axom/spin/examples/CMakeLists.txt b/src/axom/spin/examples/CMakeLists.txt index 1d4d5a174a..daae914a84 100644 --- a/src/axom/spin/examples/CMakeLists.txt +++ b/src/axom/spin/examples/CMakeLists.txt @@ -18,17 +18,3 @@ axom_add_executable( DEPENDS_ON ${spin_example_depends} FOLDER axom/spin/examples ) - -# Note: The following example uses quest to read in an STL file -# and mint for meshing -if (AXOM_ENABLE_QUEST AND RAJA_FOUND AND UMPIRE_FOUND) - - axom_add_executable( - NAME spin_bvh_two_pass_ex - SOURCES spin_bvh_two_pass.cpp - OUTPUT_DIR ${EXAMPLE_OUTPUT_DIRECTORY} - DEPENDS_ON quest - FOLDER axom/spin/examples - ) - -endif() diff --git a/src/axom/spin/policy/LinearBVH.hpp b/src/axom/spin/policy/LinearBVH.hpp index 2994f9773d..78a4003acc 100644 --- a/src/axom/spin/policy/LinearBVH.hpp +++ b/src/axom/spin/policy/LinearBVH.hpp @@ -354,8 +354,13 @@ axom::Array LinearBVH::findCandidatesImp total_count_reduce += count; });); - // STEP 2: exclusive scan to get offsets in candidate array for each query + // STEP 2: exclusive scan to get offsets in candidate array for each query + // Intel oneAPI compiler segfaults with OpenMP RAJA scan + #ifdef __INTEL_LLVM_COMPILER + using exec_policy = typename axom::execution_space::loop_policy; + #else using exec_policy = typename axom::execution_space::loop_policy; + #endif AXOM_PERF_MARK_SECTION( "exclusive_scan", RAJA::exclusive_scan(RAJA::make_span(counts.data(), numObjs), From 235a35b5e9cdb4a37eb2c7535887f76e16866dc5 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 19 Sep 2023 20:17:19 -0700 Subject: [PATCH 109/639] quest's SamplingShaper can now be used when mfem is configured for devices We were previously using `mfem::Vector::GetData()` which might access an invalid host pointer. Using `.HostRead()` and/or `.HostReadWrite()` ensures a valid host pointer. --- RELEASE-NOTES.md | 1 + src/axom/quest/detail/shaping/shaping_helpers.cpp | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 24562fb93c..b097ab5ced 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -34,6 +34,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ ### Fixed - quest's `SamplingShaper` now properly handles material names containing underscores +- quest's `SamplingShaper` can now be used with an mfem that is configured for (GPU) devices ## [Version 0.8.1] - Release date 2023-08-16 diff --git a/src/axom/quest/detail/shaping/shaping_helpers.cpp b/src/axom/quest/detail/shaping/shaping_helpers.cpp index 3fe9de97d9..6c9ac6d4ee 100644 --- a/src/axom/quest/detail/shaping/shaping_helpers.cpp +++ b/src/axom/quest/detail/shaping/shaping_helpers.cpp @@ -30,8 +30,8 @@ void replaceMaterial(mfem::QuadratureFunction* shapeQFunc, SLIC_ASSERT(materialQFunc->Size() == shapeQFunc->Size()); const int SZ = materialQFunc->Size(); - double* mData = materialQFunc->GetData(); - double* sData = shapeQFunc->GetData(); + double* mData = materialQFunc->HostReadWrite(); + double* sData = shapeQFunc->HostReadWrite(); if(shapeReplacesMaterial) { @@ -61,8 +61,8 @@ void copyShapeIntoMaterial(const mfem::QuadratureFunction* shapeQFunc, SLIC_ASSERT(materialQFunc->Size() == shapeQFunc->Size()); const int SZ = materialQFunc->Size(); - double* mData = materialQFunc->GetData(); - const double* sData = shapeQFunc->GetData(); + double* mData = materialQFunc->HostReadWrite(); + const double* sData = shapeQFunc->HostRead(); // When reuseExisting, don't reset material values; otherwise, just copy values over if(reuseExisting) @@ -114,9 +114,11 @@ void generatePositionsQFunction(mfem::Mesh* mesh, const int nq = ir.GetNPoints(); const auto* geomFactors = mesh->GetGeometricFactors(ir, mfem::GeometricFactors::COORDINATES); + geomFactors->X.HostRead(); mfem::QuadratureFunction* pos_coef = new mfem::QuadratureFunction(sp, dim); pos_coef->SetOwnsSpace(true); + pos_coef->HostReadWrite(); // Rearrange positions into quadrature function { @@ -186,6 +188,7 @@ void computeVolumeFractions(const std::string& matField, fes = new mfem::FiniteElementSpace(mesh, fec); volFrac = new mfem::GridFunction(fes); volFrac->MakeOwner(fec); + volFrac->HostReadWrite(); dc->RegisterField(volFracName, volFrac); } @@ -400,6 +403,7 @@ void computeVolumeFractionsIdentity(mfem::DataCollection* dc, mfem::FiniteElementSpace* fes = new mfem::FiniteElementSpace(mesh, fec); mfem::GridFunction* volFrac = new mfem::GridFunction(fes); volFrac->MakeOwner(fec); + volFrac->HostReadWrite(); dc->RegisterField(name, volFrac); (*volFrac) = (*inout); From 1a796f9e4b61386ef17c3b9967c372945fe747f8 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 22 Sep 2023 07:56:59 -0700 Subject: [PATCH 110/639] Attempt to fix missing conduit in windows build. --- src/axom/quest/examples/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index c882c1bdae..f168fb1bc2 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -207,6 +207,11 @@ if(AXOM_ENABLE_MPI AND AXOM_ENABLE_SIDRE AND HDF5_FOUND) endif() # Marching cubes example ------------------------------------------- +if(CONDUIT_FOUND AND AXOM_ENABLE_MPI) + list(APPEND quest_depends_on conduit::conduit + conduit::conduit_mpi) +endif() + if(CONDUIT_FOUND) axom_add_executable( NAME quest_marching_cubes_ex From 928f7bb6b0198b097b0ee12fe6fd1ad3adf47ae4 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Thu, 28 Sep 2023 15:05:07 -0700 Subject: [PATCH 111/639] Updates the release notes --- RELEASE-NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index b097ab5ced..0f24bbc80a 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -31,6 +31,9 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ returns the signed volume. - Primal: `intersection_volume()` operators changed from returning a signed volume to an unsigned volume. +- Primal: Adds a `Quadrilateral` primitive +- Primal: Adds a `compute_bounding_box()` operator for computing the bounding + box of a `Quadrilateral` ### Fixed - quest's `SamplingShaper` now properly handles material names containing underscores From 1591e4ac70f410a530612bb046f7ac40d8c1db27 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 18 Jul 2023 08:17:00 -0700 Subject: [PATCH 112/639] Adding hip to runtime policies --- src/tools/mesh_tester.cpp | 64 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/src/tools/mesh_tester.cpp b/src/tools/mesh_tester.cpp index e55011a541..2bb57cdbc2 100644 --- a/src/tools/mesh_tester.cpp +++ b/src/tools/mesh_tester.cpp @@ -50,6 +50,13 @@ using seq_exec = axom::SEQ_EXEC; #else using cuda_exec = seq_exec; #endif + + #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + constexpr int HIP_BLOCK_SIZE = 256; + using hip_exec = axom::HIP_EXEC; + #else + using hip_exec = seq_exec; + #endif #endif // clang-format on @@ -82,7 +89,8 @@ enum RuntimePolicy seq = 0, raja_seq = 1, raja_omp = 2, - raja_cuda = 3 + raja_cuda = 3, + raja_hip = 4 }; struct Input @@ -131,6 +139,9 @@ const std::map Input::s_validPolicies({ #ifdef AXOM_USE_CUDA , {"raja_cuda", raja_cuda} #endif + #ifdef AXOM_USE_HIP + , {"raja_hip", raja_hip} + #endif #endif }); // clang-format on @@ -170,6 +181,9 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) #ifdef AXOM_USE_CUDA pol_sstr << "\nSet to \'raja_cuda\' or 3 to use the RAJA CUDA policy."; #endif + #ifdef AXOM_USE_HIP + pol_sstr << "\nSet to \'raja_hip\' or 3 to use the RAJA HIP policy."; + #endif #endif app.add_option("-p, --policy", policy, pol_sstr.str()) @@ -238,6 +252,9 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) << ((method == "naive" || method == "bvh") && policy == raja_cuda ? " (use RAJA CUDA policy)" : "") + << ((method == "naive" || method == "bvh") && policy == raja_hip + ? " (use RAJA HIP policy)" + : "") << "\n weld threshold = " << weldThreshold << "\n " << (skipWeld ? "" : "not ") << "skipping weld" << "\n intersection tolerance = " << intersectionThreshold @@ -609,6 +626,14 @@ int main(int argc, char** argv) } #endif +#ifdef AXOM_USE_HIP + if(params.policy == raja_hip) + { + using GPUExec = axom::HIP_EXEC<256>; + axom::setDefaultAllocator(axom::execution_space::allocatorID()); + } +#endif + // _read_stl_file_start // Read file SLIC_INFO("Reading file: '" << params.stlInput << "'...\n"); @@ -684,6 +709,14 @@ int main(int argc, char** argv) params.intersectionThreshold); break; #endif + #ifdef AXOM_USE_HIP + case raja_hip: + collisions = + naiveIntersectionAlgorithm(surface_mesh, + degenerate, + params.intersectionThreshold); + break; + #endif #endif // AXOM_USE_RAJA && AXOM_USE_UMPIRE default: @@ -733,6 +766,15 @@ int main(int argc, char** argv) params.intersectionThreshold); break; #endif + #ifdef AXOM_USE_HIP + case raja_hip: + quest::findTriMeshIntersectionsBVH( + surface_mesh, + collisions, + degenerate, + params.intersectionThreshold); + break; + #endif #endif // AXOM_USE_RAJA && AXOM_USE_UMPIRE default: SLIC_ERROR("Unhandled runtime policy case " << params.policy); @@ -785,6 +827,16 @@ int main(int argc, char** argv) params.intersectionThreshold); break; #endif + #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + case raja_hip: + quest::findTriMeshIntersectionsImplicitGrid( + surface_mesh, + collisions, + degenerate, + params.resolution, + params.intersectionThreshold); + break; + #endif #endif // AXOM_USE_RAJA default: SLIC_ERROR("Unhandled runtime policy case " << params.policy); @@ -834,6 +886,16 @@ int main(int argc, char** argv) params.intersectionThreshold); break; #endif + #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + case raja_hip: + quest::findTriMeshIntersectionsUniformGrid( + surface_mesh, + collisions, + degenerate, + params.resolution, + params.intersectionThreshold); + break; + #endif #endif // AXOM_USE_RAJA default: SLIC_ERROR("Unhandled runtime policy case " << params.policy); From 488ae3d9a97998a7a3369f052a623ffc34f09853 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 24 Jul 2023 09:59:18 -0700 Subject: [PATCH 113/639] Add HIP policy for mesh_tester unit tests --- src/tools/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 325436a3b9..f4dd80d7b0 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -84,6 +84,9 @@ if(AXOM_ENABLE_QUEST) blt_list_append(TO _policies ELEMENTS "raja_omp" IF AXOM_ENABLE_OPENMP) blt_list_append(TO _policies ELEMENTS "raja_cuda" IF AXOM_ENABLE_CUDA) + #This needs to be guarded... + blt_list_append(TO _policies ELEMENTS "raja_hip" IF AXOM_ENABLE_HIP) + foreach(_method ${_methods}) foreach(_policy ${_policies}) From 58ff737ed588fc2484bbfbca49dc09ae7488535a Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 25 Jul 2023 13:32:51 -0700 Subject: [PATCH 114/639] Change HIP workaround flag to be Debug only instead of for all CMake build types --- .../rzvernal-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake | 2 +- .../rzvernal-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake | 2 +- scripts/spack/packages/axom/package.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/host-configs/rzvernal-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake b/host-configs/rzvernal-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake index ffac9bee7c..5d6731bb92 100644 --- a/host-configs/rzvernal-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake +++ b/host-configs/rzvernal-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake @@ -37,7 +37,7 @@ set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") set(ENABLE_FORTRAN ON CACHE BOOL "") -set(CMAKE_CXX_FLAGS "-O1" CACHE STRING "") +set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -DNDEBUG" CACHE STRING "") #------------------------------------------------------------------------------ # MPI diff --git a/host-configs/rzvernal-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake b/host-configs/rzvernal-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake index ab32c1faba..ad11165834 100644 --- a/host-configs/rzvernal-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake +++ b/host-configs/rzvernal-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake @@ -37,7 +37,7 @@ set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") set(ENABLE_FORTRAN ON CACHE BOOL "") -set(CMAKE_CXX_FLAGS "-O1" CACHE STRING "") +set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -DNDEBUG" CACHE STRING "") #------------------------------------------------------------------------------ # MPI diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py index 8f3b473e7d..21f82acdd5 100644 --- a/scripts/spack/packages/axom/package.py +++ b/scripts/spack/packages/axom/package.py @@ -241,7 +241,7 @@ def initconfig_compiler_entries(self): # Add optimization flag to workaround HIP compiler errors if "+rocm" in spec: if "crayCC" in self.compiler.cxx or spec.satisfies("%clang@16"): - entries.append(cmake_cache_string("CMAKE_CXX_FLAGS","-O1")) + entries.append(cmake_cache_string("CMAKE_CXX_FLAGS_DEBUG","-O1 -g -DNDEBUG")) return entries From 1bae85a41b38f5c86e665e13a3020a4a11305b6b Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 25 Jul 2023 13:33:49 -0700 Subject: [PATCH 115/639] Check for NDEBUG flag for mesh_tester HIP policy; mesh_tester unit test only for some optimization flags --- src/tools/CMakeLists.txt | 11 +++++++++-- src/tools/mesh_tester.cpp | 22 +++++++++++----------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index f4dd80d7b0..e7db0db633 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -84,8 +84,15 @@ if(AXOM_ENABLE_QUEST) blt_list_append(TO _policies ELEMENTS "raja_omp" IF AXOM_ENABLE_OPENMP) blt_list_append(TO _policies ELEMENTS "raja_cuda" IF AXOM_ENABLE_CUDA) - #This needs to be guarded... - blt_list_append(TO _policies ELEMENTS "raja_hip" IF AXOM_ENABLE_HIP) + # Test with HIP policy for select optimization flags. + # Check for Debug flags that have been overwritten. + if(AXOM_ENABLE_HIP) + if((CMAKE_BUILD_TYPE MATCHES "(Release|RelWithDebInfo)") OR + (CMAKE_BUILD_TYPE MATCHES "Debug" AND + CMAKE_CXX_FLAGS_DEBUG MATCHES "\-O1 \-g \-DNDEBUG")) + set (_policies ${_policies} "raja_hip") + endif() + endif() foreach(_method ${_methods}) foreach(_policy ${_policies}) diff --git a/src/tools/mesh_tester.cpp b/src/tools/mesh_tester.cpp index 2bb57cdbc2..60a7cd4f82 100644 --- a/src/tools/mesh_tester.cpp +++ b/src/tools/mesh_tester.cpp @@ -51,7 +51,7 @@ using seq_exec = axom::SEQ_EXEC; using cuda_exec = seq_exec; #endif - #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) && defined(NDEBUG) constexpr int HIP_BLOCK_SIZE = 256; using hip_exec = axom::HIP_EXEC; #else @@ -139,7 +139,7 @@ const std::map Input::s_validPolicies({ #ifdef AXOM_USE_CUDA , {"raja_cuda", raja_cuda} #endif - #ifdef AXOM_USE_HIP + #if defined(AXOM_USE_HIP) && defined(NDEBUG) , {"raja_hip", raja_hip} #endif #endif @@ -181,8 +181,8 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) #ifdef AXOM_USE_CUDA pol_sstr << "\nSet to \'raja_cuda\' or 3 to use the RAJA CUDA policy."; #endif - #ifdef AXOM_USE_HIP - pol_sstr << "\nSet to \'raja_hip\' or 3 to use the RAJA HIP policy."; + #if defined(AXOM_USE_HIP) && defined(NDEBUG) + pol_sstr << "\nSet to \'raja_hip\' or 4 to use the RAJA HIP policy."; #endif #endif @@ -626,7 +626,7 @@ int main(int argc, char** argv) } #endif -#ifdef AXOM_USE_HIP +#if defined(AXOM_USE_HIP) && defined(NDEBUG) if(params.policy == raja_hip) { using GPUExec = axom::HIP_EXEC<256>; @@ -709,12 +709,12 @@ int main(int argc, char** argv) params.intersectionThreshold); break; #endif - #ifdef AXOM_USE_HIP + #if defined(AXOM_USE_HIP) && defined(NDEBUG) case raja_hip: collisions = naiveIntersectionAlgorithm(surface_mesh, - degenerate, - params.intersectionThreshold); + degenerate, + params.intersectionThreshold); break; #endif #endif // AXOM_USE_RAJA && AXOM_USE_UMPIRE @@ -766,7 +766,7 @@ int main(int argc, char** argv) params.intersectionThreshold); break; #endif - #ifdef AXOM_USE_HIP + #if defined(AXOM_USE_HIP) && defined(NDEBUG) case raja_hip: quest::findTriMeshIntersectionsBVH( surface_mesh, @@ -827,7 +827,7 @@ int main(int argc, char** argv) params.intersectionThreshold); break; #endif - #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) && defined(NDEBUG) case raja_hip: quest::findTriMeshIntersectionsImplicitGrid( surface_mesh, @@ -886,7 +886,7 @@ int main(int argc, char** argv) params.intersectionThreshold); break; #endif - #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) && defined(NDEBUG) case raja_hip: quest::findTriMeshIntersectionsUniformGrid( surface_mesh, From 287562dd8430936edaabff91b6c6f3f5a85d1614 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 26 Jul 2023 10:04:27 -0700 Subject: [PATCH 116/639] Disable quest_inout_interface fortran example for RelWithDebInfo builds --- src/axom/quest/examples/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index bcd8732534..847547646e 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -387,7 +387,8 @@ if (ENABLE_FORTRAN) set(quest_fortran_examples quest_signed_distance_interface) # The inout Fortran example fails to compile with hipcc/amdflang in debug configurations - if("${CMAKE_Fortran_COMPILER}" MATCHES "amdflang$" AND "${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + if("${CMAKE_Fortran_COMPILER}" MATCHES "amdflang$" AND + CMAKE_BUILD_TYPE MATCHES "(Debug|RelWithDebInfo)") set(_has_inout_fortran_example FALSE) else() set(_has_inout_fortran_example TRUE) From a7d2e59d23cf3c6627cfd6f8a127513aa7889c4f Mon Sep 17 00:00:00 2001 From: Brian Han Date: Fri, 28 Jul 2023 14:49:17 -0700 Subject: [PATCH 117/639] Add reworked debug flags to tioga host-configs --- host-configs/tioga-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake | 2 +- host-configs/tioga-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/host-configs/tioga-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake b/host-configs/tioga-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake index 5054698ed3..64935539de 100644 --- a/host-configs/tioga-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake +++ b/host-configs/tioga-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake @@ -37,7 +37,7 @@ set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") set(ENABLE_FORTRAN ON CACHE BOOL "") -set(CMAKE_CXX_FLAGS "-O1" CACHE STRING "") +set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -DNDEBUG" CACHE STRING "") #------------------------------------------------------------------------------ # MPI diff --git a/host-configs/tioga-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake b/host-configs/tioga-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake index bf5bdb292f..a37c0d22c8 100644 --- a/host-configs/tioga-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake +++ b/host-configs/tioga-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake @@ -37,7 +37,7 @@ set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") set(ENABLE_FORTRAN ON CACHE BOOL "") -set(CMAKE_CXX_FLAGS "-O1" CACHE STRING "") +set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -DNDEBUG" CACHE STRING "") #------------------------------------------------------------------------------ # MPI From 1da67eb7bd04794c2045acb10f0cfa361ffe6707 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 12 Sep 2023 15:21:34 -0700 Subject: [PATCH 118/639] Clarify HIP workaround; add message if not testing mesh_tester with HIP; add cleanup --- scripts/spack/packages/axom/package.py | 3 ++- src/tools/CMakeLists.txt | 6 +++++- src/tools/mesh_tester.cpp | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py index 21f82acdd5..6a59377d50 100644 --- a/scripts/spack/packages/axom/package.py +++ b/scripts/spack/packages/axom/package.py @@ -238,7 +238,8 @@ def initconfig_compiler_entries(self): if "+cpp14" in spec and spec.satisfies("@:0.6.1"): entries.append(cmake_cache_string("BLT_CXX_STD", "c++14", "")) - # Add optimization flag to workaround HIP compiler errors + # Add optimization flag workaround for Debug builds with + # cray compiler or newer HIP if "+rocm" in spec: if "crayCC" in self.compiler.cxx or spec.satisfies("%clang@16"): entries.append(cmake_cache_string("CMAKE_CXX_FLAGS_DEBUG","-O1 -g -DNDEBUG")) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index e7db0db633..ec7fafc25d 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -90,7 +90,11 @@ if(AXOM_ENABLE_QUEST) if((CMAKE_BUILD_TYPE MATCHES "(Release|RelWithDebInfo)") OR (CMAKE_BUILD_TYPE MATCHES "Debug" AND CMAKE_CXX_FLAGS_DEBUG MATCHES "\-O1 \-g \-DNDEBUG")) - set (_policies ${_policies} "raja_hip") + list(APPEND _policies "raja_hip") + else() + message(STATUS + "HIP policy for mesh_tester executable is not being tested" + ) endif() endif() diff --git a/src/tools/mesh_tester.cpp b/src/tools/mesh_tester.cpp index 60a7cd4f82..eea2c6ecad 100644 --- a/src/tools/mesh_tester.cpp +++ b/src/tools/mesh_tester.cpp @@ -153,36 +153,36 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) "-m, --method", method, "Method to use. \n" - "Set to \'bvh\' to use the bounding volume hierarchy spatial index.\n" - "Set to \'naive\' to use the naive algorithm (without a spatial index).\n" - "Set to \'uniform\' to use the uniform grid spatial index.\n" - "Set to \'implicit\' to use the implicit grid spatial index.") + "Set to 'bvh' to use the bounding volume hierarchy spatial index.\n" + "Set to 'naive' to use the naive algorithm (without a spatial index).\n" + "Set to 'uniform' to use the uniform grid spatial index.\n" + "Set to 'implicit' to use the implicit grid spatial index.") ->capture_default_str() ->check(axom::CLI::IsMember {Input::s_validMethods}); app .add_option("-r,--resolution", resolution, - "With \'-m uniform\', set resolution of uniform grid. \n" + "With '-m uniform', set resolution of uniform grid. \n" "Set to less than 1 to use the uniform grid spatial index\n" "with a resolution of the cube root of the number of\n" "triangles.") ->capture_default_str(); std::stringstream pol_sstr; - pol_sstr << "With \'-m bvh\' or \'-m naive\', set runtime policy. \n" - << "Set to \'seq\' or 0 to use the sequential algorithm " + pol_sstr << "With '-m bvh' or '-m naive', set runtime policy. \n" + << "Set to 'seq' or 0 to use the sequential algorithm " << "(w/o RAJA)."; #ifdef AXOM_USE_RAJA - pol_sstr << "\nSet to \'raja_seq\' or 1 to use the RAJA sequential policy."; + pol_sstr << "\nSet to 'raja_seq' or 1 to use the RAJA sequential policy."; #ifdef AXOM_USE_OPENMP - pol_sstr << "\nSet to \'raja_omp\' or 2 to use the RAJA OpenMP policy."; + pol_sstr << "\nSet to 'raja_omp' or 2 to use the RAJA OpenMP policy."; #endif #ifdef AXOM_USE_CUDA - pol_sstr << "\nSet to \'raja_cuda\' or 3 to use the RAJA CUDA policy."; + pol_sstr << "\nSet to 'raja_cuda' or 3 to use the RAJA CUDA policy."; #endif #if defined(AXOM_USE_HIP) && defined(NDEBUG) - pol_sstr << "\nSet to \'raja_hip\' or 4 to use the RAJA HIP policy."; + pol_sstr << "\nSet to 'raja_hip' or 4 to use the RAJA HIP policy."; #endif #endif From a8a2de572bf6abf96b15d6b216a2a70226c3687f Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 10 Oct 2023 08:54:55 -0700 Subject: [PATCH 119/639] Don't specify coordset for input mesh. coordset is chosen from the specified blueprint mesh topology. --- .../examples/quest_marching_cubes_example.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 68f5f1ff52..175026d145 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -291,10 +291,8 @@ struct BlueprintStructuredMesh { public: explicit BlueprintStructuredMesh(const std::string& meshFile, - const std::string& coordset = "coords", - const std::string& topology = "mesh") - : _coordsetPath("coordsets/" + coordset) - , _topologyPath("topologies/" + topology) + const std::string& topologyName) + : _topologyPath("topologies/" + topologyName) { readBlueprintMesh(meshFile); for(int d = 0; d < _mdMesh.number_of_children(); ++d) @@ -527,8 +525,8 @@ struct BlueprintStructuredMesh conduit::Node _mdMesh; axom::IndexType _domCount; bool _coordsAreStrided = false; - const std::string _coordsetPath; const std::string _topologyPath; + std::string _coordsetPath; double _maxSpacing = -1.0; /*! @@ -551,8 +549,14 @@ struct BlueprintStructuredMesh if(_domCount > 0) { + SLIC_ASSERT(_mdMesh[0].has_path(_topologyPath)); + auto coordsetName = + _mdMesh[0].fetch_existing(_topologyPath + "/coordset").as_string(); + _coordsetPath = axom::fmt::format("coordsets/{}/", coordsetName); + SLIC_ASSERT(_mdMesh[0].has_path(_coordsetPath)); + _coordsAreStrided = _mdMesh[0] - .fetch_existing("topologies/mesh/elements/dims") + .fetch_existing(_topologyPath + "/elements/dims") .has_child("strides"); if(_coordsAreStrided) { @@ -1497,7 +1501,7 @@ int main(int argc, char** argv) //--------------------------------------------------------------------------- // Load computational mesh. //--------------------------------------------------------------------------- - BlueprintStructuredMesh computationalMesh(params.meshFile); + BlueprintStructuredMesh computationalMesh(params.meshFile, "mesh"); SLIC_INFO_IF( params.isVerbose(), From dce170cc8783ff3c871112106886ea67b2347dba Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 10 Oct 2023 09:24:37 -0700 Subject: [PATCH 120/639] Make blueprint mesh input more topology centric. When reading in mesh, coordset should not be set independent of topology. When creating, the two should be coordinated. --- ...est_distributed_distance_query_example.cpp | 56 +++++++++++++------ 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index d676435ddc..38ecb1cec7 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -216,11 +216,21 @@ struct BlueprintParticleMesh using PointArray2D = axom::Array; using PointArray3D = axom::Array; - explicit BlueprintParticleMesh(sidre::Group* group = nullptr, - const std::string& coordset = "coords", - const std::string& topology = "mesh") - : m_coordsetName(coordset) - , m_topologyName(topology) + explicit BlueprintParticleMesh(sidre::Group* group, + const std::string& topology, + const std::string& coordset) + : m_topologyName(topology) + , m_coordsetName(coordset) + , m_group(group) + , m_domainGroups() + { + MPI_Comm_rank(MPI_COMM_WORLD, &m_rank); + MPI_Comm_size(MPI_COMM_WORLD, &m_nranks); + } + + explicit BlueprintParticleMesh(sidre::Group* group) + : m_topologyName() + , m_coordsetName() , m_group(group) , m_domainGroups() { @@ -278,16 +288,16 @@ struct BlueprintParticleMesh return false; } - /// Returns the number of points in a particle mesh domain + /*! + @brief Returns the number of points in a particle mesh domain + including ghost points. + */ int numPoints(axom::IndexType dIdx) const { int rval = 0; auto* cg = m_coordsGroups[dIdx]; - //BTNG: The following if-check is probably not a use-case - if(cg != nullptr && cg->hasView("values/x")) - { - rval = cg->getView("values/x")->getNumElements(); - } + SLIC_ASSERT(cg != nullptr && cg->hasView("values/x")); + rval = cg->getView("values/x")->getNumElements(); return rval; } /// Returns the number of points in the particle mesh @@ -306,6 +316,10 @@ struct BlueprintParticleMesh /*! @brief Read a blueprint mesh and store it internally in m_group. + + If the topology wasn't specified in the constructor, the first + topology from the file is used. The coordset name will be + replaced with the one corresponding to the topology. */ void read_blueprint_mesh(const std::string& meshFilename) { @@ -323,13 +337,22 @@ struct BlueprintParticleMesh assert(conduit::blueprint::mesh::is_multi_domain(mdMesh)); conduit::index_t domCount = conduit::blueprint::mesh::number_of_domains(mdMesh); - if(domCount > 0) { + if(m_topologyName.empty()) + { + // No topology given. Pick the first one. + m_topologyName = mdMesh[0].fetch_existing("topologies")[0].name(); + } + auto topologyPath = axom::fmt::format("topologies/{}", m_topologyName); + + m_coordsetName = + mdMesh[0].fetch_existing(topologyPath + "/coordset").as_string(); const conduit::Node coordsetNode = mdMesh[0].fetch_existing("coordsets").fetch_existing(m_coordsetName); m_dimension = conduit::blueprint::mesh::coordset::dims(coordsetNode); } + MPI_Allreduce(MPI_IN_PLACE, &m_dimension, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD); SLIC_ASSERT(m_dimension > 0); @@ -431,7 +454,7 @@ struct BlueprintParticleMesh } // set the default connectivity - // Maybe be required by an old version of visit. May not be needed by newer versions of visit. + // May be required by an old version of visit. May not be needed by newer versions of visit. sidre::Array arr( m_topoGroups[domainIdx]->createView("elements/connectivity"), SZ, @@ -646,8 +669,9 @@ struct BlueprintParticleMesh } private: - const std::string m_coordsetName; - const std::string m_topologyName; + //!@brief Whether stride/offsets are given for blueprint mesh coordinates data. + std::string m_topologyName; + std::string m_coordsetName; /// Parent group for the entire mesh sidre::Group* m_group; /// Group for each domain in multidomain mesh @@ -671,7 +695,7 @@ class ObjectMeshWrapper public: using Circle = primal::Sphere; - ObjectMeshWrapper(sidre::Group* group) : m_objectMesh(group) + ObjectMeshWrapper(sidre::Group* group) : m_objectMesh(group, "mesh", "coords") { SLIC_ASSERT(group != nullptr); } From a302a5278db264b9afc7c2cd31731591b34f6704 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 10 Oct 2023 09:50:36 -0700 Subject: [PATCH 121/639] Verify that user specified a valid topology. Warn if user accidentally specified coordset, which the older interface required. --- src/axom/quest/DistributedClosestPoint.hpp | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index 49be21ff1b..41c373b5ba 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -1638,6 +1638,7 @@ class DistributedClosestPoint conduit::blueprint::mesh::to_multi_domain(meshNode, *tmpNode); } const conduit::Node& mdMeshNode(isMultidomain ? meshNode : *tmpNode); + verifyTopologyName(mdMeshNode, topologyName); auto domainCount = conduit::blueprint::mesh::number_of_domains(mdMeshNode); @@ -1778,6 +1779,30 @@ class DistributedClosestPoint return success; } + void verifyTopologyName(const conduit::Node& meshNode, + const std::string& topologyName) + { + std::string coordsetPath; + const std::string topologyPath = + axom::fmt::format("topologies/{}", topologyName); + for(axom::IndexType d = 0; d < meshNode.number_of_children(); ++d) + { + const auto& domain = meshNode.child(d); + if(!domain.has_path(topologyPath)) + { + auto errMsg = fmt::format("No such topology '{}' found.", topologyName); + if(domain.has_path("coordsets/" + topologyName)) + { + errMsg += fmt::format( + " You may have mistakenly specified a coordset name." + " The interface has changed to use topology name" + " instead of coordset."); + } + SLIC_ERROR(errMsg); + } + } + } + private: RuntimePolicy m_runtimePolicy {RuntimePolicy::seq}; MPI_Comm m_mpiComm; From 0351997d7c363bd179d417a25ff388dffe592198 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 10 Oct 2023 10:19:09 -0700 Subject: [PATCH 122/639] Remove bad comment. --- .../quest/examples/quest_distributed_distance_query_example.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index 38ecb1cec7..e49d31221f 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -669,7 +669,6 @@ struct BlueprintParticleMesh } private: - //!@brief Whether stride/offsets are given for blueprint mesh coordinates data. std::string m_topologyName; std::string m_coordsetName; /// Parent group for the entire mesh From 605649979825ee22a567f14bfcc2081f50722985 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 10 Oct 2023 13:55:54 -0700 Subject: [PATCH 123/639] Attempt to fix missing conduit_blueprint_mesh.hpp header. Problem happens on Windows and OSX CI tests. --- src/axom/quest/MeshViewUtil.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 63001eab89..632643ac8d 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -11,7 +11,7 @@ #include "axom/fmt.hpp" -#include "conduit_blueprint_mesh.hpp" +#include "conduit_blueprint.hpp" #include "conduit_blueprint_mcarray.hpp" #ifdef AXOM_USE_MPI #include "conduit_blueprint_mpi.hpp" From dafea6c993c80e091541e42aba40dac00c962d8d Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 10 Oct 2023 14:37:17 -0700 Subject: [PATCH 124/639] Guard MarchingCubes implementation against non-Conduit builds. --- src/axom/quest/MarchingCubes.cpp | 9 ++++++++- src/axom/quest/MarchingCubes.hpp | 13 +++++++++---- src/axom/quest/MeshViewUtil.hpp | 7 +++++-- src/axom/quest/detail/MarchingCubesImpl.hpp | 9 +++++++-- .../quest/examples/quest_marching_cubes_example.cpp | 8 +++++++- 5 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 887c54a7c5..5aa182cac0 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -3,10 +3,15 @@ // // SPDX-License-Identifier: (BSD-3-Clause) +#include "axom/config.hpp" + +// Implementation requires Conduit. +#ifdef AXOM_USE_CONDUIT +#include "conduit_blueprint.hpp" + #include "axom/core/execution/execution_space.hpp" #include "axom/quest/MarchingCubes.hpp" #include "axom/quest/detail/MarchingCubesImpl.hpp" -#include "conduit_blueprint.hpp" #include "axom/fmt.hpp" namespace axom @@ -259,5 +264,7 @@ void MarchingCubesSingleDomain::allocateImpl() } } +#endif // AXOM_USE_CONDUIT + } // end namespace quest } // end namespace axom diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 1972053081..21d65d4cb0 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -10,11 +10,15 @@ * compute isocontour from a scalar field in a blueprint mesh. */ -#ifndef AXOM_PRIMAL_MARCHINGCUBES_H_ -#define AXOM_PRIMAL_MARCHINGCUBES_H_ +#ifndef AXOM_QUEST_MARCHINGCUBES_H_ +#define AXOM_QUEST_MARCHINGCUBES_H_ -// Axom includes #include "axom/config.hpp" + +// Implementation requires Conduit. +#ifdef AXOM_USE_CONDUIT + +// Axom includes #include "axom/mint/mesh/UnstructuredMesh.hpp" // Conduit includes @@ -387,4 +391,5 @@ class MarchingCubesSingleDomain } // namespace quest } // namespace axom -#endif // AXOM_PRIMAL_ISOSURFACE_H_ +#endif // AXOM_USE_CONDUIT +#endif // AXOM_QUEST_MARCHINGCUBES_H_ diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 632643ac8d..c3153d385c 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -7,10 +7,12 @@ #define QUEST_MESH_VIEW_UTIL_H_ #include "axom/config.hpp" -#include "axom/core.hpp" -#include "axom/fmt.hpp" +// Implementation requires Conduit. +#ifdef AXOM_USE_CONDUIT +#include "axom/core.hpp" +#include "axom/fmt.hpp" #include "conduit_blueprint.hpp" #include "conduit_blueprint_mcarray.hpp" #ifdef AXOM_USE_MPI @@ -772,4 +774,5 @@ class MeshViewUtil } // end namespace quest } // end namespace axom +#endif // AXOM_USE_CONDUIT #endif // QUEST_MESH_VIEW_UTIL_H_ diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 29661debf4..6887886740 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -3,15 +3,19 @@ // // SPDX-License-Identifier: (BSD-3-Clause) +#include "axom/config.hpp" + +// Implementation requires Conduit. +#ifdef AXOM_USE_CONDUIT +#include "conduit_blueprint.hpp" + #include "axom/core/execution/execution_space.hpp" -#include "axom/quest/MarchingCubes.hpp" #include "axom/quest/ArrayIndexer.hpp" #include "axom/quest/detail/marching_cubes_lookup.hpp" #include "axom/quest/MeshViewUtil.hpp" #include "axom/primal/geometry/Point.hpp" #include "axom/primal/constants.hpp" #include "axom/mint/execution/internal/structured_exec.hpp" -#include "conduit_blueprint.hpp" #include "axom/fmt.hpp" namespace axom @@ -855,6 +859,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase double m_contourVal = 0.0; }; +#endif // AXOM_USE_CONDUIT } // end namespace marching_cubes } // end namespace detail diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 175026d145..6aaab329a4 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -14,8 +14,12 @@ for the function not varying linearly along mesh lines. */ -// Axom includes #include "axom/config.hpp" + +// Implementation requires Conduit. +#ifdef AXOM_USE_CONDUIT + +// Axom includes #include "axom/core.hpp" #include "axom/slic.hpp" #include "axom/primal.hpp" @@ -1610,3 +1614,5 @@ int main(int argc, char** argv) return errCount != 0; } + +#endif // AXOM_USE_CONDUIT From 41a84cb6533f7f4e6e9024671216d34f7018168c Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 10 Oct 2023 16:28:00 -0700 Subject: [PATCH 125/639] Reformat. --- src/axom/quest/MarchingCubes.cpp | 24 +-- src/axom/quest/MarchingCubes.hpp | 60 +++---- src/axom/quest/MeshViewUtil.hpp | 34 ++-- src/axom/quest/detail/MarchingCubesImpl.hpp | 74 ++++---- .../examples/quest_marching_cubes_example.cpp | 168 +++++++++--------- 5 files changed, 180 insertions(+), 180 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 5aa182cac0..02cedfce29 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -7,12 +7,12 @@ // Implementation requires Conduit. #ifdef AXOM_USE_CONDUIT -#include "conduit_blueprint.hpp" + #include "conduit_blueprint.hpp" -#include "axom/core/execution/execution_space.hpp" -#include "axom/quest/MarchingCubes.hpp" -#include "axom/quest/detail/MarchingCubesImpl.hpp" -#include "axom/fmt.hpp" + #include "axom/core/execution/execution_space.hpp" + #include "axom/quest/MarchingCubes.hpp" + #include "axom/quest/detail/MarchingCubesImpl.hpp" + #include "axom/fmt.hpp" namespace axom { @@ -226,7 +226,7 @@ void MarchingCubesSingleDomain::allocateImpl() : std::unique_ptr( new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); } -#ifdef _AXOM_MC_USE_OPENMP + #ifdef _AXOM_MC_USE_OPENMP else if(m_runtimePolicy == RuntimePolicy::omp) { m_impl = m_ndim == 2 @@ -235,8 +235,8 @@ void MarchingCubesSingleDomain::allocateImpl() : std::unique_ptr( new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>); } -#endif -#ifdef _AXOM_MC_USE_CUDA + #endif + #ifdef _AXOM_MC_USE_CUDA else if(m_runtimePolicy == RuntimePolicy::cuda) { m_impl = m_ndim == 2 @@ -245,8 +245,8 @@ void MarchingCubesSingleDomain::allocateImpl() : std::unique_ptr( new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); } -#endif -#ifdef _AXOM_MC_USE_HIP + #endif + #ifdef _AXOM_MC_USE_HIP else if(m_runtimePolicy == RuntimePolicy::hip) { m_impl = m_ndim == 2 @@ -255,7 +255,7 @@ void MarchingCubesSingleDomain::allocateImpl() : std::unique_ptr( new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>); } -#endif + #endif else { SLIC_ERROR(axom::fmt::format( @@ -264,7 +264,7 @@ void MarchingCubesSingleDomain::allocateImpl() } } -#endif // AXOM_USE_CONDUIT +#endif // AXOM_USE_CONDUIT } // end namespace quest } // end namespace axom diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 21d65d4cb0..043c97998a 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -18,28 +18,28 @@ // Implementation requires Conduit. #ifdef AXOM_USE_CONDUIT -// Axom includes -#include "axom/mint/mesh/UnstructuredMesh.hpp" - -// Conduit includes -#include "conduit_node.hpp" - -// C++ includes -#include - -// Add some helper preprocessor defines for using OPENMP, CUDA, and HIP policies -// within the marching cubes implementation. -#if defined(AXOM_USE_RAJA) - #ifdef AXOM_USE_OPENMP - #define _AXOM_MC_USE_OPENMP - #endif - #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) - #define _AXOM_MC_USE_CUDA + // Axom includes + #include "axom/mint/mesh/UnstructuredMesh.hpp" + + // Conduit includes + #include "conduit_node.hpp" + + // C++ includes + #include + + // Add some helper preprocessor defines for using OPENMP, CUDA, and HIP policies + // within the marching cubes implementation. + #if defined(AXOM_USE_RAJA) + #ifdef AXOM_USE_OPENMP + #define _AXOM_MC_USE_OPENMP + #endif + #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) + #define _AXOM_MC_USE_CUDA + #endif + #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + #define _AXOM_MC_USE_HIP + #endif #endif - #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) - #define _AXOM_MC_USE_HIP - #endif -#endif namespace axom { @@ -294,24 +294,24 @@ class MarchingCubesSingleDomain return true; case MarchingCubesRuntimePolicy::omp: -#ifdef _AXOM_MC_USE_OPENMP + #ifdef _AXOM_MC_USE_OPENMP return true; -#else + #else return false; -#endif + #endif case MarchingCubesRuntimePolicy::cuda: -#ifdef _AXOM_MC_USE_CUDA + #ifdef _AXOM_MC_USE_CUDA return true; -#else + #else return false; -#endif + #endif case MarchingCubesRuntimePolicy::hip: -#ifdef _AXOM_MC_USE_HIP + #ifdef _AXOM_MC_USE_HIP return true; -#else + #else return false; -#endif + #endif } return false; diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index c3153d385c..20b5be7297 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -11,20 +11,20 @@ // Implementation requires Conduit. #ifdef AXOM_USE_CONDUIT -#include "axom/core.hpp" -#include "axom/fmt.hpp" -#include "conduit_blueprint.hpp" -#include "conduit_blueprint_mcarray.hpp" -#ifdef AXOM_USE_MPI - #include "conduit_blueprint_mpi.hpp" - #include "conduit_relay_mpi_io_blueprint.hpp" -#endif - -#include -#include -#include -#include -#include + #include "axom/core.hpp" + #include "axom/fmt.hpp" + #include "conduit_blueprint.hpp" + #include "conduit_blueprint_mcarray.hpp" + #ifdef AXOM_USE_MPI + #include "conduit_blueprint_mpi.hpp" + #include "conduit_relay_mpi_io_blueprint.hpp" + #endif + + #include + #include + #include + #include + #include namespace axom { @@ -164,12 +164,12 @@ class MeshViewUtil if(checkBlueprint) { conduit::Node info; -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI rval = rval && conduit::blueprint::mpi::verify("mesh", *m_cdom, info, MPI_COMM_WORLD); -#else + #else rval = rval && conduit::blueprint::verify("mesh", *m_cdom, info); -#endif + #endif } rval = rval && (m_ctopology->fetch_existing("type").as_string() == "structured"); diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 6887886740..f749c38e2f 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -7,16 +7,16 @@ // Implementation requires Conduit. #ifdef AXOM_USE_CONDUIT -#include "conduit_blueprint.hpp" + #include "conduit_blueprint.hpp" -#include "axom/core/execution/execution_space.hpp" -#include "axom/quest/ArrayIndexer.hpp" -#include "axom/quest/detail/marching_cubes_lookup.hpp" -#include "axom/quest/MeshViewUtil.hpp" -#include "axom/primal/geometry/Point.hpp" -#include "axom/primal/constants.hpp" -#include "axom/mint/execution/internal/structured_exec.hpp" -#include "axom/fmt.hpp" + #include "axom/core/execution/execution_space.hpp" + #include "axom/quest/ArrayIndexer.hpp" + #include "axom/quest/detail/marching_cubes_lookup.hpp" + #include "axom/quest/MeshViewUtil.hpp" + #include "axom/primal/geometry/Point.hpp" + #include "axom/primal/constants.hpp" + #include "axom/mint/execution/internal/structured_exec.hpp" + #include "axom/fmt.hpp" namespace axom { @@ -116,7 +116,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); -#if defined(AXOM_USE_RAJA) + #if defined(AXOM_USE_RAJA) RAJA::RangeSegment jRange(0, m_bShape[1]); RAJA::RangeSegment iRange(0, m_bShape[0]); using EXEC_POL = @@ -126,7 +126,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_LAMBDA(axom::IndexType i, axom::IndexType j) { mcu.computeCaseId(i, j); }); -#else + #else for(int j = 0; j < m_bShape[1]; ++j) { for(int i = 0; i < m_bShape[0]; ++i) @@ -134,7 +134,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase mcu.computeCaseId(i, j); } } -#endif + #endif } //!@brief Populate m_caseIds with crossing indices. @@ -143,7 +143,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); -#if defined(AXOM_USE_RAJA) + #if defined(AXOM_USE_RAJA) RAJA::RangeSegment kRange(0, m_bShape[2]); RAJA::RangeSegment jRange(0, m_bShape[1]); RAJA::RangeSegment iRange(0, m_bShape[0]); @@ -154,7 +154,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_LAMBDA(axom::IndexType i, axom::IndexType j, axom::IndexType k) { mcu.computeCaseId(i, j, k); }); -#else + #else for(int k = 0; k < m_bShape[2]; ++k) { for(int j = 0; j < m_bShape[1]; ++j) @@ -165,7 +165,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase } } } -#endif + #endif } /*! @@ -257,7 +257,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { const axom::IndexType parentCellCount = m_caseIds.size(); auto caseIdsView = m_caseIds.view(); -#if defined(AXOM_USE_RAJA) + #if defined(AXOM_USE_RAJA) RAJA::ReduceSum vsum(0); RAJA::forall( RAJA::RangeSegment(0, parentCellCount), @@ -265,14 +265,14 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase vsum += bool(num_contour_cells(caseIdsView.flatIndex(n))); }); m_crossingCount = static_cast(vsum.get()); -#else + #else axom::IndexType vsum = 0; for(axom::IndexType n = 0; n < parentCellCount; ++n) { vsum += bool(num_contour_cells(caseIdsView.flatIndex(n))); } m_crossingCount = vsum; -#endif + #endif m_crossings.resize(m_crossingCount, {0, 0}); axom::ArrayView crossingsView = @@ -298,7 +298,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase } }; -#if defined(AXOM_USE_RAJA) + #if defined(AXOM_USE_RAJA) /* The m_crossings filling loop isn't data-parallel and shouldn't be parallelized. This contrived RAJA::forall forces it to run @@ -313,14 +313,14 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase loopBody(n); } }); -#else + #else *crossingId = 0; for(axom::IndexType n = 0; n < parentCellCount; ++n) { loopBody(n); } SLIC_ASSERT(*crossingId == m_crossingCount); -#endif + #endif axom::deallocate(crossingId); @@ -333,14 +333,14 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { crossingsView[n].firstSurfaceCellId = prefixSumView[n]; }; -#if defined(AXOM_USE_RAJA) + #if defined(AXOM_USE_RAJA) RAJA::exclusive_scan( RAJA::make_span(addCellsView.data(), m_crossingCount), RAJA::make_span(prefixSumView.data(), m_crossingCount), RAJA::operators::plus {}); RAJA::forall(RAJA::RangeSegment(0, m_crossingCount), copyFirstSurfaceCellId); -#else + #else if(m_crossingCount > 0) { prefixSumView[0] = 0; @@ -353,7 +353,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase copyFirstSurfaceCellId(i); } } -#endif + #endif // Data from the last crossing tells us how many contour cells there are. if(m_crossings.empty()) @@ -630,9 +630,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type num_contour_cells(int iCase) const { -#define _MC_LOOKUP_NUM_SEGMENTS -#include "marching_cubes_lookup.hpp" -#undef _MC_LOOKUP_NUM_SEGMENTS + #define _MC_LOOKUP_NUM_SEGMENTS + #include "marching_cubes_lookup.hpp" + #undef _MC_LOOKUP_NUM_SEGMENTS SLIC_ASSERT(iCase >= 0 && iCase < 16); return num_segments[iCase]; } @@ -641,9 +641,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type cases_table(int iCase, int iEdge) const { -#define _MC_LOOKUP_CASES2D -#include "marching_cubes_lookup.hpp" -#undef _MC_LOOKUP_CASES2D + #define _MC_LOOKUP_CASES2D + #include "marching_cubes_lookup.hpp" + #undef _MC_LOOKUP_CASES2D SLIC_ASSERT(iCase >= 0 && iCase < 16); return cases2D[iCase][iEdge]; } @@ -652,9 +652,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type num_contour_cells(int iCase) const { -#define _MC_LOOKUP_NUM_TRIANGLES -#include "marching_cubes_lookup.hpp" -#undef _MC_LOOKUP_NUM_TRIANGLES + #define _MC_LOOKUP_NUM_TRIANGLES + #include "marching_cubes_lookup.hpp" + #undef _MC_LOOKUP_NUM_TRIANGLES SLIC_ASSERT(iCase >= 0 && iCase < 256); return num_triangles[iCase]; } @@ -663,9 +663,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type cases_table(int iCase, int iEdge) const { -#define _MC_LOOKUP_CASES3D -#include "marching_cubes_lookup.hpp" -#undef _MC_LOOKUP_CASES3D + #define _MC_LOOKUP_CASES3D + #include "marching_cubes_lookup.hpp" + #undef _MC_LOOKUP_CASES3D SLIC_ASSERT(iCase >= 0 && iCase < 256); return cases3D[iCase][iEdge]; } @@ -859,7 +859,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase double m_contourVal = 0.0; }; -#endif // AXOM_USE_CONDUIT +#endif // AXOM_USE_CONDUIT } // end namespace marching_cubes } // end namespace detail diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 6aaab329a4..ce8fc20e4e 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -19,38 +19,38 @@ // Implementation requires Conduit. #ifdef AXOM_USE_CONDUIT -// Axom includes -#include "axom/core.hpp" -#include "axom/slic.hpp" -#include "axom/primal.hpp" -#include "axom/mint/mesh/UnstructuredMesh.hpp" -#include "axom/mint/execution/internal/structured_exec.hpp" -#include "axom/quest/ArrayIndexer.hpp" -#include "axom/quest/MarchingCubes.hpp" -#include "axom/quest/MeshViewUtil.hpp" -#include "axom/sidre.hpp" -#include "axom/core/Types.hpp" - -#include "conduit_blueprint.hpp" -#include "conduit_relay_io_blueprint.hpp" -#ifdef AXOM_USE_MPI - #include "conduit_blueprint_mpi.hpp" - #include "conduit_relay_mpi_io_blueprint.hpp" -#endif + // Axom includes + #include "axom/core.hpp" + #include "axom/slic.hpp" + #include "axom/primal.hpp" + #include "axom/mint/mesh/UnstructuredMesh.hpp" + #include "axom/mint/execution/internal/structured_exec.hpp" + #include "axom/quest/ArrayIndexer.hpp" + #include "axom/quest/MarchingCubes.hpp" + #include "axom/quest/MeshViewUtil.hpp" + #include "axom/sidre.hpp" + #include "axom/core/Types.hpp" + + #include "conduit_blueprint.hpp" + #include "conduit_relay_io_blueprint.hpp" + #ifdef AXOM_USE_MPI + #include "conduit_blueprint_mpi.hpp" + #include "conduit_relay_mpi_io_blueprint.hpp" + #endif -#include "axom/fmt.hpp" -#include "axom/CLI11.hpp" + #include "axom/fmt.hpp" + #include "axom/CLI11.hpp" -#ifdef AXOM_USE_MPI - #include "mpi.h" -#endif + #ifdef AXOM_USE_MPI + #include "mpi.h" + #endif -// C/C++ includes -#include -#include -#include -#include -#include + // C/C++ includes + #include + #include + #include + #include + #include namespace quest = axom::quest; namespace slic = axom::slic; @@ -430,9 +430,9 @@ struct BlueprintStructuredMesh } double rval = localRval; -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI MPI_Allreduce(&localRval, &rval, 1, MPI_DOUBLE, MPI_MAX, MPI_COMM_WORLD); -#endif + #endif return rval; } @@ -493,11 +493,11 @@ struct BlueprintStructuredMesh bool isValid() const { conduit::Node info; -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI if(!conduit::blueprint::mpi::verify("mesh", _mdMesh, info, MPI_COMM_WORLD)) -#else + #else if(!conduit::blueprint::verify("mesh", _mdMesh, info)) -#endif + #endif { SLIC_INFO("Invalid blueprint for mesh: \n" << info.to_yaml()); slic::flushStreams(); @@ -541,13 +541,13 @@ struct BlueprintStructuredMesh SLIC_ASSERT(!meshFilename.empty()); _mdMesh.reset(); -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI conduit::relay::mpi::io::blueprint::load_mesh(meshFilename, _mdMesh, MPI_COMM_WORLD); -#else + #else conduit::relay::io::blueprint::load_mesh(meshFilename, _mdMesh); -#endif + #endif SLIC_ASSERT(conduit::blueprint::mesh::is_multi_domain(_mdMesh)); _domCount = conduit::blueprint::mesh::number_of_domains(_mdMesh); @@ -571,9 +571,9 @@ struct BlueprintStructuredMesh const conduit::Node coordsetNode = _mdMesh[0].fetch_existing(_coordsetPath); _ndims = conduit::blueprint::mesh::coordset::dims(coordsetNode); } -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI MPI_Allreduce(MPI_IN_PLACE, &_ndims, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD); -#endif + #endif SLIC_ASSERT(_ndims > 0); SLIC_ASSERT(isValid()); @@ -585,15 +585,15 @@ void printTimingStats(axom::utilities::Timer& t, const std::string& description) { auto getDoubleMinMax = [](double inVal, double& minVal, double& maxVal, double& sumVal) { -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI MPI_Allreduce(&inVal, &minVal, 1, MPI_DOUBLE, MPI_MIN, MPI_COMM_WORLD); MPI_Allreduce(&inVal, &maxVal, 1, MPI_DOUBLE, MPI_MAX, MPI_COMM_WORLD); MPI_Allreduce(&inVal, &sumVal, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD); -#else + #else minVal = inVal; maxVal = inVal; sumVal = inVal; -#endif + #endif }; { @@ -611,14 +611,14 @@ void printTimingStats(axom::utilities::Timer& t, const std::string& description) /// Write blueprint mesh to disk void saveMesh(const conduit::Node& mesh, const std::string& filename) { -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI conduit::relay::mpi::io::blueprint::save_mesh(mesh, filename, "hdf5", MPI_COMM_WORLD); -#else + #else conduit::relay::io::blueprint::save_mesh(mesh, filename, "hdf5"); -#endif + #endif } /// Write blueprint mesh to disk @@ -628,11 +628,11 @@ void saveMesh(const sidre::Group& mesh, const std::string& filename) mesh.createNativeLayout(tmpMesh); { conduit::Node info; -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI if(!conduit::blueprint::mpi::verify("mesh", tmpMesh, info, MPI_COMM_WORLD)) -#else + #else if(!conduit::blueprint::verify("mesh", tmpMesh, info)) -#endif + #endif { SLIC_INFO("Invalid blueprint for mesh: \n" << info.to_yaml()); slic::flushStreams(); @@ -709,7 +709,7 @@ struct ContourTestBase s_allocatorId); } -#if defined(AXOM_USE_UMPIRE) + #if defined(AXOM_USE_UMPIRE) /* Make sure data is correctly on host or device. We don't test with Unified memory because it's too forgiving. @@ -742,14 +742,14 @@ struct ContourTestBase SLIC_ASSERT(resourceName == "DEVICE"); } } -#endif + #endif mc.setFunctionField(functionName()); axom::utilities::Timer computeTimer(false); -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI MPI_Barrier(MPI_COMM_WORLD); -#endif + #endif computeTimer.start(); mc.computeIsocontour(params.contourVal); computeTimer.stop(); @@ -855,7 +855,7 @@ struct ContourTestBase SLIC_ASSERT(coordsViews[d].shape() == fieldShape); } -#if defined(AXOM_USE_RAJA) + #if defined(AXOM_USE_RAJA) RAJA::RangeSegment iRange(0, fieldShape[0]); RAJA::RangeSegment jRange(0, fieldShape[1]); using EXEC_POL = @@ -871,7 +871,7 @@ struct ContourTestBase // auto v = value(pt); fieldView(i, j) = 0.0; // value(pt); }); -#else + #else for(axom::IndexType j = 0; j < fieldShape[1]; ++j) { for(axom::IndexType i = 0; i < fieldShape[0]; ++i) @@ -884,7 +884,7 @@ struct ContourTestBase fieldView(i, j) = value(pt); } } -#endif + #endif } template typename std::enable_if::type populateNodalDistance( @@ -1201,7 +1201,7 @@ struct ContourTestBase int localDomainCount, axom::mint::UnstructuredMesh& contourMesh) { -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI axom::Array starts(numRanks, numRanks); { axom::Array indivDomainCounts(numRanks, numRanks); @@ -1230,7 +1230,7 @@ struct ContourTestBase { domainIdPtr[i] += starts[myRank]; } -#endif + #endif } }; @@ -1342,18 +1342,18 @@ void initializeLogger() slic::LogStream* logStream; -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI std::string fmt = "[][]: \n"; - #ifdef AXOM_USE_LUMBERJACK + #ifdef AXOM_USE_LUMBERJACK const int RLIMIT = 8; logStream = new slic::LumberjackStream(&std::cout, MPI_COMM_WORLD, RLIMIT, fmt); - #else + #else logStream = new slic::SynchronizedStream(&std::cout, MPI_COMM_WORLD, fmt); - #endif -#else + #endif + #else std::string fmt = "[]: \n"; logStream = new slic::GenericOutputStream(&std::cout, fmt); -#endif // AXOM_USE_MPI + #endif // AXOM_USE_MPI slic::addStreamToAllMsgLevels(logStream); @@ -1437,11 +1437,11 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) int errCount = 0; if(params.checkResults) { -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI MPI_Allreduce(&localErrCount, &errCount, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); -#else + #else errCount = localErrCount; -#endif + #endif if(errCount) { @@ -1463,14 +1463,14 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) //------------------------------------------------------------------------------ int main(int argc, char** argv) { -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI MPI_Init(&argc, &argv); MPI_Comm_rank(MPI_COMM_WORLD, &myRank); MPI_Comm_size(MPI_COMM_WORLD, &numRanks); -#else + #else numRanks = 1; myRank = 0; -#endif + #endif initializeLogger(); //slic::setAbortOnWarning(true); @@ -1492,10 +1492,10 @@ int main(int argc, char** argv) retval = app.exit(e); } -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI MPI_Bcast(&retval, 1, MPI_INT, 0, MPI_COMM_WORLD); MPI_Finalize(); -#endif + #endif exit(retval); } @@ -1515,15 +1515,15 @@ int main(int argc, char** argv) slic::flushStreams(); auto getIntMinMax = [](int inVal, int& minVal, int& maxVal, int& sumVal) { -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI MPI_Allreduce(&inVal, &minVal, 1, MPI_INT, MPI_MIN, MPI_COMM_WORLD); MPI_Allreduce(&inVal, &maxVal, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD); MPI_Allreduce(&inVal, &sumVal, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); -#else + #else minVal = inVal; maxVal = inVal; sumVal = inVal; -#endif + #endif }; // Output some global mesh size stats @@ -1565,8 +1565,8 @@ int main(int argc, char** argv) errCount = testNdimInstance<3, axom::SEQ_EXEC>(computationalMesh); } } -#if defined(AXOM_USE_RAJA) - #ifdef AXOM_USE_OPENMP + #if defined(AXOM_USE_RAJA) + #ifdef AXOM_USE_OPENMP else if(params.policy == quest::MarchingCubesRuntimePolicy::omp) { if(params.ndim == 2) @@ -1578,8 +1578,8 @@ int main(int argc, char** argv) errCount = testNdimInstance<3, axom::OMP_EXEC>(computationalMesh); } } - #endif - #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) + #endif + #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) else if(params.policy == quest::MarchingCubesRuntimePolicy::cuda) { if(params.ndim == 2) @@ -1591,8 +1591,8 @@ int main(int argc, char** argv) errCount = testNdimInstance<3, axom::CUDA_EXEC<256>>(computationalMesh); } } - #endif - #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + #endif + #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) else if(params.policy == quest::MarchingCubesRuntimePolicy::hip) { if(params.ndim == 2) @@ -1604,15 +1604,15 @@ int main(int argc, char** argv) errCount = testNdimInstance<3, axom::HIP_EXEC<256>>(computationalMesh); } } + #endif #endif -#endif finalizeLogger(); -#ifdef AXOM_USE_MPI + #ifdef AXOM_USE_MPI MPI_Finalize(); -#endif + #endif return errCount != 0; } -#endif // AXOM_USE_CONDUIT +#endif // AXOM_USE_CONDUIT From 85dcbef33bf0e86c37789b424ab0f20c383a9500 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 10 Oct 2023 16:57:15 -0700 Subject: [PATCH 126/639] When user provides domain_id, use it for domain identifier. We have to map user's domain_id back to interation id for correctness testing. Remove utility to add rank offsets to the output mesh, because the user domain_ids are already offset. --- src/axom/quest/MarchingCubes.cpp | 15 +++- src/axom/quest/MarchingCubes.hpp | 11 +++ .../examples/quest_marching_cubes_example.cpp | 74 ++++++++----------- 3 files changed, 54 insertions(+), 46 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 02cedfce29..adb216f3e8 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -126,13 +126,16 @@ void MarchingCubes::populateContourMesh( auto* domainIdPtr = mesh.getFieldPtr(domainIdField, axom::mint::CELL_CENTERED); + + int userDomainId = single->getDomainId(dId); + // TODO: Verify that UnstructuredMesh only supports host memory. axom::detail::ArrayOps::fill( domainIdPtr, nPrev, nNew - nPrev, execution_space::allocatorID(), - dId); + userDomainId); } } SLIC_ASSERT(mesh.getNumberOfNodes() == contourNodeCount); @@ -202,6 +205,16 @@ void MarchingCubesSingleDomain::setFunctionField(const std::string& fcnField) SLIC_ASSERT(m_dom->has_path(m_fcnPath + "/values")); } +int MarchingCubesSingleDomain::getDomainId(int defaultId) const +{ + int rval = defaultId; + if(m_dom->has_path("state/domain_id")) + { + rval = m_dom->fetch_existing("state/domain_id").as_int(); + } + return rval; +} + void MarchingCubesSingleDomain::computeIsocontour(double contourVal) { SLIC_ASSERT_MSG(!m_fcnFieldName.empty(), diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 043c97998a..215a56b0bd 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -171,6 +171,11 @@ class MarchingCubes parent domain ids. If omitted, the data is not provided. If the fields aren't in the mesh, they will be created. + + Blueprint allows users to specify ids for the domains. If + "state/domain_id" exists in the domains, it is used as the domain + id. Otherwise, the domain's interation index within the + multidomain mesh is used. */ void populateContourMesh( axom::mint::UnstructuredMesh &mesh, @@ -241,6 +246,12 @@ class MarchingCubesSingleDomain */ void setFunctionField(const std::string &fcnField); + /*! + @brief Get the Blueprint domain id specified in \a state/domain_id + if it is provided, or use the given default if not provided. + */ + int getDomainId(int defaultId) const; + /*! * \brief Compute the isocontour. * diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index ce8fc20e4e..b48c26bbeb 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -799,8 +799,6 @@ struct ContourTestBase } // Write contour mesh to file. - addRankOffsetToContourMeshDomainIds(computationalMesh.domainCount(), - contourMesh); std::string outputName = name() + "_contour_mesh"; saveMesh(*meshGroup, outputName); SLIC_INFO(axom::fmt::format("Wrote {} contour in {}", name(), outputName)); @@ -1026,12 +1024,25 @@ struct ContourTestBase allCoordsViews[n] = mvu.getConstCoordsViews(false); } + std::map domainIdToContiguousId; + for(int n = 0; n < domainCount; ++n) + { + const auto& dom = computationalMesh.domain(n); + int domainId = n; + if(dom.has_path("state/domain_id")) + { + domainId = dom.fetch_existing("state/domain_id").value(); + } + domainIdToContiguousId[domainId] = n; + } + for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; ++contourCellNum) { axom::IndexType domainId = domainIdView[contourCellNum]; + axom::IndexType contiguousIndex = domainIdToContiguousId[domainId]; typename axom::quest::MeshViewUtil::ConstCoordsViewsType& - coordsViews = allCoordsViews[domainId]; + coordsViews = allCoordsViews[contiguousIndex]; axom::StackArray parentCellIdx = parentCellIdxView[contourCellNum]; @@ -1118,13 +1129,27 @@ struct ContourTestBase fcnViews[domId] = mvu.template getConstFieldView(functionName(), false); } + + std::map domainIdToContiguousId; + for(int n = 0; n < domainCount; ++n) + { + const auto& dom = computationalMesh.domain(n); + int domainId = n; + if(dom.has_path("state/domain_id")) + { + domainId = dom.fetch_existing("state/domain_id").value(); + } + domainIdToContiguousId[domainId] = n; + } + for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; ++contourCellNum) { axom::IndexType domainId = domainIdView[contourCellNum]; + axom::IndexType contiguousId = domainIdToContiguousId[domainId]; const axom::StackArray& parentCellIdx = parentCellIdxView[contourCellNum]; - hasContours[domainId][parentCellIdx] = true; + hasContours[contiguousId][parentCellIdx] = true; } // Verify that cells marked by hasContours touches the contour @@ -1191,47 +1216,6 @@ struct ContourTestBase errCount)); return errCount; } - - /** - * Change cp_domain data from a local index to a global domain index - * by adding rank offsets. - * This is an optional step to make domain ids globally unique. - */ - void addRankOffsetToContourMeshDomainIds( - int localDomainCount, - axom::mint::UnstructuredMesh& contourMesh) - { - #ifdef AXOM_USE_MPI - axom::Array starts(numRanks, numRanks); - { - axom::Array indivDomainCounts(numRanks, numRanks); - indivDomainCounts.fill(-1); - MPI_Allgather(&localDomainCount, - 1, - MPI_INT, - indivDomainCounts.data(), - 1, - MPI_INT, - MPI_COMM_WORLD); - starts[0] = 0; - for(int i = 1; i < numRanks; ++i) - { - starts[i] = starts[i - 1] + indivDomainCounts[i - 1]; - } - } - - const std::string domainIdField = m_domainIdField; - auto* domainIdPtr = - contourMesh.getFieldPtr(domainIdField, - axom::mint::CELL_CENTERED); - int cellCount = contourMesh.getNumberOfCells(); - - for(int i = 0; i < cellCount; ++i) - { - domainIdPtr[i] += starts[myRank]; - } - #endif - } }; /*! From 0d1aa0bb4d53789959da57fed9cca7d239fc0853 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 11 Oct 2023 12:22:00 -0700 Subject: [PATCH 127/639] install base requirements for RTD --- .readthedocs.yml | 4 ++++ src/docs/requirements.txt | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 3298e7ed40..b2f8cfefac 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -10,6 +10,10 @@ build: os: ubuntu-22.04 tools: python: "3.11" + apt_packages: + - ghostscript + - graphviz + - texlive-full # Build documentation in the docs/ directory with Sphinx sphinx: diff --git a/src/docs/requirements.txt b/src/docs/requirements.txt index 93120e66c8..0a42ee80cd 100644 --- a/src/docs/requirements.txt +++ b/src/docs/requirements.txt @@ -1 +1,3 @@ -docutils<0.18 +docutils +sphinx==6.2.1 +sphinx-rtd-theme==1.2.2 From c57ca207957ebb929a0191188b7de49db6800a01 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 11 Oct 2023 14:43:30 -0700 Subject: [PATCH 128/639] fix various warnings --- src/axom/sidre/docs/sphinx/query_data.rst | 2 +- src/docs/doxygen/Doxyfile.in | 1 - src/docs/sphinx/quickstart_guide/zero_to_axom.rst | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/axom/sidre/docs/sphinx/query_data.rst b/src/axom/sidre/docs/sphinx/query_data.rst index b0543cf662..a9b440247c 100644 --- a/src/axom/sidre/docs/sphinx/query_data.rst +++ b/src/axom/sidre/docs/sphinx/query_data.rst @@ -3,7 +3,7 @@ .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) -.. _dataconcepts-label: +.. _datastore-queries-label: =========================== Datastore Queries diff --git a/src/docs/doxygen/Doxyfile.in b/src/docs/doxygen/Doxyfile.in index 015383c699..13879398d5 100644 --- a/src/docs/doxygen/Doxyfile.in +++ b/src/docs/doxygen/Doxyfile.in @@ -800,7 +800,6 @@ INPUT = @PROJECT_SOURCE_DIR@/axom/doxygen_mainpage.md \ @PROJECT_SOURCE_DIR@/axom/quest \ @PROJECT_SOURCE_DIR@/axom/quest/doxygen_mainpage.md \ @PROJECT_SOURCE_DIR@/axom/quest/interface \ - @PROJECT_SOURCE_DIR@/axom/quest/stl \ @PROJECT_SOURCE_DIR@/axom/sidre/doxygen_mainpage.md \ @PROJECT_SOURCE_DIR@/axom/sidre/core \ @PROJECT_SOURCE_DIR@/axom/sidre/spio \ diff --git a/src/docs/sphinx/quickstart_guide/zero_to_axom.rst b/src/docs/sphinx/quickstart_guide/zero_to_axom.rst index 20e3a91742..29dd1794d5 100644 --- a/src/docs/sphinx/quickstart_guide/zero_to_axom.rst +++ b/src/docs/sphinx/quickstart_guide/zero_to_axom.rst @@ -127,8 +127,8 @@ See: ``examples/axom/using-with-blt`` Makefile-based build system example ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. literalinclude:: ../../../examples/using-with-make/Makefile +.. literalinclude:: ../../../examples/using-with-make/Makefile.in :language: make - :lines: 20-25 + :lines: 28-39 See: ``examples/axom/using-with-make`` From 095298306d026ae86debcc9d27805b914f27529b Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 11 Oct 2023 14:57:16 -0700 Subject: [PATCH 129/639] fix another warning --- src/docs/doxygen/Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/doxygen/Doxyfile.in b/src/docs/doxygen/Doxyfile.in index 13879398d5..d1cb3e837b 100644 --- a/src/docs/doxygen/Doxyfile.in +++ b/src/docs/doxygen/Doxyfile.in @@ -2373,7 +2373,7 @@ INTERACTIVE_SVG = YES # found. If left blank, it is assumed the dot tool can be found in the path. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_PATH = @DOT_PATH@ +DOT_PATH = # The DOTFILE_DIRS tag can be used to specify one or more directories that # contain dot files that are included in the documentation (see the \dotfile From 7116c7e45c5c44f0ca711fef30e3d1b75a23715b Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 11 Oct 2023 15:07:47 -0700 Subject: [PATCH 130/639] attempt --- src/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf.py b/src/conf.py index 8008a8b2a2..199ccb86be 100644 --- a/src/conf.py +++ b/src/conf.py @@ -244,7 +244,7 @@ # primal, quest, sphinx: # override wide tables in RTD theme # (Thanks to https://rackerlabs.github.io/docs-rackspace/tools/rtd-tables.html) -html_context = { 'css_files': [ '_static/theme_overrides.css', ], } +#html_context = { 'css_files': [ '_static/theme_overrides.css', ], } # -- Options for LaTeX output --------------------------------------------- From ea03779c5118b91b03b054edfabe559c1526bc60 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 11 Oct 2023 15:26:30 -0700 Subject: [PATCH 131/639] try to add back css --- src/conf.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/conf.py b/src/conf.py index 199ccb86be..7addd05e36 100644 --- a/src/conf.py +++ b/src/conf.py @@ -54,6 +54,7 @@ 'sphinx.ext.graphviz', 'sphinx.ext.autodoc', 'sphinx.ext.doctest', + 'sphinxcontrib.jquery', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.mathjax' @@ -244,7 +245,14 @@ # primal, quest, sphinx: # override wide tables in RTD theme # (Thanks to https://rackerlabs.github.io/docs-rackspace/tools/rtd-tables.html) -#html_context = { 'css_files': [ '_static/theme_overrides.css', ], } +# These folders are copied to the documentation's HTML output +html_static_path = ['docs/sphinx/_static/theme_overrides.css'] + +# These paths are either relative to html_static_path +# or fully qualified paths (eg. https://...) +html_css_files = [ + '_static/theme_overrides.css', +] # -- Options for LaTeX output --------------------------------------------- From 24fd70a32de27ade43479d17253b24fdc941590a Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 11 Oct 2023 15:37:11 -0700 Subject: [PATCH 132/639] add logo --- src/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf.py b/src/conf.py index 7addd05e36..ccea6af02e 100644 --- a/src/conf.py +++ b/src/conf.py @@ -254,6 +254,7 @@ '_static/theme_overrides.css', ] +html_logo = "../share/axom/logo/axom-logo.png" # -- Options for LaTeX output --------------------------------------------- From 9f5bf5a7cca3f9da8c5b74249792e2a3dec7fbab Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 11 Oct 2023 16:04:24 -0700 Subject: [PATCH 133/639] fix logo --- src/conf.py | 2 +- src/docs/sphinx/_static/theme_overrides.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/conf.py b/src/conf.py index ccea6af02e..6fec6d3f32 100644 --- a/src/conf.py +++ b/src/conf.py @@ -254,7 +254,7 @@ '_static/theme_overrides.css', ] -html_logo = "../share/axom/logo/axom-logo.png" +html_logo = "../share/axom/logo/axom_logo.png" # -- Options for LaTeX output --------------------------------------------- diff --git a/src/docs/sphinx/_static/theme_overrides.css b/src/docs/sphinx/_static/theme_overrides.css index 63ee6cc74c..82998c75ee 100644 --- a/src/docs/sphinx/_static/theme_overrides.css +++ b/src/docs/sphinx/_static/theme_overrides.css @@ -11,3 +11,7 @@ overflow: visible !important; } } + +a img.logo { + transform: scale(.75) +} From 2f2bd2c9558ad261554f8ad3dc3e677bbe00ebe7 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 11 Oct 2023 16:47:53 -0700 Subject: [PATCH 134/639] remove obsolete options --- src/docs/doxygen/Doxyfile.in | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/src/docs/doxygen/Doxyfile.in b/src/docs/doxygen/Doxyfile.in index d1cb3e837b..82f8c1d8f2 100644 --- a/src/docs/doxygen/Doxyfile.in +++ b/src/docs/doxygen/Doxyfile.in @@ -231,12 +231,6 @@ TAB_SIZE = 4 ALIASES = "accelerated=\xrefitem accelerated_list \"\"\"\"" \ "collective=\xrefitem collective_list \"\"\"\"" -# This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding "class=itcl::class" -# will allow you to use the command class in the itcl::class meaning. - -TCL_SUBST = - # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources # only. Doxygen will then generate output that is more tailored for C. For # instance, some of the names that are used will be different. The list of all @@ -1080,13 +1074,6 @@ VERBATIM_HEADERS = NO ALPHABETICAL_INDEX = YES -# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in -# which the alphabetical index list will be split. -# Minimum value: 1, maximum value: 20, default value: 5. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -COLS_IN_ALPHA_INDEX = 5 - # In case all classes in a project start with a common prefix, all classes will # be put under the same header in the alphabetical index. The IGNORE_PREFIX tag # can be used to specify a prefix (or a list of prefixes) that should be ignored @@ -2147,12 +2134,6 @@ EXTERNAL_GROUPS = YES EXTERNAL_PAGES = YES -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of 'which perl'). -# The default file (with absolute path) is: /usr/bin/perl. - -PERL_PATH = @SAMRAI_PERL@ - #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- @@ -2166,15 +2147,6 @@ PERL_PATH = @SAMRAI_PERL@ CLASS_DIAGRAMS = YES -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see: -# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. From bf6c9d305cc5043aaa0dbe6a921ebdde2500c84c Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 11 Oct 2023 17:02:23 -0700 Subject: [PATCH 135/639] add transparent logo (thanks kenny) --- share/axom/logo/axom_logo_transparent.png | Bin 0 -> 27447 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 share/axom/logo/axom_logo_transparent.png diff --git a/share/axom/logo/axom_logo_transparent.png b/share/axom/logo/axom_logo_transparent.png new file mode 100644 index 0000000000000000000000000000000000000000..d539728952e2ccab6d990a04ca0266195c52475f GIT binary patch literal 27447 zcmd?QWm_E26E?c+vatB#4vRx@g6l%iK!D(G!QBZ2*+qf`g5(E;;KAKJxCagH8eD@r zhyS_GdA`K+YOd+&neMu~YO3n)>PU4}1sqHYOaK6YqogRS0RRAz000Ua1ns4T0#{A$ znOpk04O)o<0QU1rveH@~7Ydj#(7*hIy2v-U+D^I$UZ*U;NZg zw`)*c%*XJWq3z#u|1&KF35P);sKEaVF6zZy>fje)r&eDXotFR~HS?L&hSZZsg#NXA z#AvP_1A6YQNZPu~ep8TNnfiC7w?T_KREa07_;i^{1{}ZTCN;~5Ao-duWapxxX z)y0_jzMk;>zjx!+PJhT7bk;mW;OpR_z84ixuc);`Gq243&1A`JQ~syA-0gR&1Nkvw z;M+s-Fcp;9@iQTU_8Hms*UBiOmPe31@ z7o6nAt4nAK&1CB7Wcsiv;t2;)!PRfkT9Os{U54#!n(YU7M|=(XhrwwIoku^I&^o@1 zHhK}1Yd{A~%`mVh=1l*65!YamlL=VdbFs76@{yamU&vEW-pi;-u)mib(|nh5*Hmqi zCC>Nd-CR~#VYk3wCRQ1HOW$Y8f?rJ;Gm;v59{~LE9lEjOn}zvq*q<`JH8W=Nc+umU zg7m%W7regU|Eot`ICir%03TqizJ6Ql@oJd`mRBCn+$y*aK>kssqU;@eRd2{}5voI6 zA>>^(#!z?urE1hyfIqEX-rnTBt;?y0_E_y#Yr)v}0Q2M3Uy#5#6a*J6_g;;*Y|eW> zRg>IP9b&n|i}5`(8!DX9$IBsdl#f$OGbB&VxBDi&34vnNrHZ2oEoE{Yt9&vysQP66 zd4**Yl1uQW&^4yA-ezeKcMbPS$`=eqiL*;ON&WppexK#LmCzO%ZfQth8KoC;s&0Yg zMj&w{cFb{96Oh*LNDCRvA>rKx5#B5QfL@9A5?a8b{*k8S!BrZpe_SSp{U#Bs>VPl3Lqby>3P|bOZF?t!S1#LPuz{W3C6KUls1Af+mt!8Lx~Hqt3!xe9 ze?CyZ^w9aeAMSy@24RaAjD{fkkx(y?j3}#t_cSQd)FI3vQ2Xtv5y{OpOMZY_Yn6<7 z#YU-G&PqhjW#v^JJ%se)KIgQmw`25WWBLp?A&q;Zg}OOhks`E} z#_hJJn=6V3g#SF!}tM^I}OV_t9p#l`hEURWy3A31KMvb6j zX2Ou@qT%b{)91Q%kdK9wB|JjC-@+EX3umaJv|`TBpbDSh4)Y;{Vk15JRZ<3!+o~-UP(eMxe2-xc$CrlN=RFQi{@g>yyIP6Qs0({_MTe5#XRLxc zsSg7Pyb#F=8z}S)1JQ~Ta-c1eZRa(NciujX?ChM(xsjsBMqXght?WIVE&E8B^Di1#AK)yFp%fnCmn2dx?i*O)yNx_H;b>$kLsxC63J;5GGm)j4*|E}{NwJDX zu29rd*K3RkmqtOdRR{v&cb=lh**RsO9&}#^t(rc4J{>9>{ipxrVgmMjRu07}<^5rN zH{T?3*OgDw_wH_?vj?O0kgTcqKVcJ(bjocC=6r#fa18WiOu;yluhD2T-xMqC)Za%hqp*akSme+U5x4++Omvwc-7`Xw&~qL2Q__ zmrkfY@!R_$Sx}ExN;Bt~c3!mpXO*M%>lQVgKeOx>2PzMNq)h0ce_gog&I;Opgav1! z1Ykd@RBlSeh#l*%3%GGvst)Wal>Q1jS_-lrm7*`jaAXP-Y^Vcy?g&uvo32GMav&*| z-z4dMZ6rs1Tm0^wWl7BLfX*5kZo%bT)J+`_ z(dq#dRm6N*S*K)PnVBn&%V9xGgyRs-cl|z~ECp7PP41t;_=_|4!pr{j-K|xLV3Xz( zpIY$)MQ3PD^>5krSE56{5a{GL8^GtX4{mx)J#hZ`uf z|4AuJ!@owkm<$q8Nr^287hnX^dS9ltq!2eneS z-fTY0a6fO;P5oT6kx3-%iaQXHi73b$Tc|&uMJK}ehj@!|fuEVTp{Seb>anwRf~K5h zNI06;4Ub>cI*I`UkXPS|Ji<-iF9%>auOG&O_jp$m-x=vR)66Dux0flc7ewqY`uRPLjncMjoZN~hvFq)8U?mK?E1o zz_)En;EtrocSB_?@i-#cC+5(?)Fd3bRx4=vfKuY?gVxy|EurZr(99Dz=XaLp zKqj7Wxi}9%5h=`j8|;^g(n(BJXw3dbK-ON<>vtspO12i76qg?_G5RMRw-V^QesN8W zq!bpcgBsXWk?r?*q5@@>z>xQNa9i=9C+^)u(zp9x5~E_A^#%$ z7rBZoa^rSxoTDwvO*aUAIfwyf&kYXa`9RdZd;wREq7XBjy)6>1UE#CI0ju|#^Eiiy zAH`e2PWmOt7n}HnjPpe48i?=XZVfiMUGCn^`xN*kV&rHMh3OELN1w5h;SuW}N*QaB zMa1j$Fa5vZDeT`BuP7JS{#=o}g3$?cV=z|ptG$coxck3_5ZXrvzY6eFB#t2n-rpvn znH=OSji=OOA3Ci+$F&(s*B1M=0gxf0f^0_cGph;W%yRqgvZeM$qoTYH1sa}2*l2P8 zd%7DhvPiq%&V1E}6MLla63Uem&~gMfHxw~Vu{fI{;MpHex<5<+?K?Ts8uQ~Noz2qG zK+#S!4XA3R*bqY$1dqB|Bsw%9*+jlVymFc~Lh`un6?#?KZ#odKZ!wt=HvIK& zNq4*zq#qen5MOHPd958Sgzfj|b#-3-zhLQG0(YAGqo>G;jn~ec(z7IQ12BZ$C;{q0 zJ-7f=QPJNrv@{0N1%=#_q$&lM5{cee4*V9=e+W1_(262YXTOpjqlI>f%iu#o-Up>x;11v2gakr=;wdI2d`#6Ss0MdyP)}XyI?fEXv>Ro7HyNJyE%Xx znf@~qz<)%a1|aF`(7wJSM;Z#R;IlU(zZG-<3D(BYLVM65@s>2^af%O16j`W`Yw`9xqKq;9^`CqH<5m8-Yf`WoNeG?yJKgxb^>HU> z`cmc%v<~3@2X;H>4mC%q9mQ7;M6lqG_E1+WywM0RRRy8SyxDh;wTkQcmhjZA17c*{ zo9vg>G)IhA6G%SWbU%LS88B75seVJ7)Iq{5dxw8${)ZuBrk6&u7fR%hAwtBat-{0v zwLBsI|^Rm%1cCutuaN0k~=J zYrs&{l^2lC9fgiA{ip@S{Jtc^f2I;pzub-rhMYnGN|NUX5e!{(mG!+Z!qrqb>ESeo zQtcyP#p0&Tx|6k zBgx8+*JKf1DmK~BEBEhs6ZLjeC$<5ZxMrqATACKBI^tO@4Z&zE1W`>)#Xr(Bc}L`b z4g+~I+|qe(Ch7JLsC?q>N&;8{t8vZ|e2xxsAYgXRR&Vw7e2L@n>IrR~i;HwD1X&0Q zP(&~>!bu3|DqCX+9}Z8y=fo*I&#-k!bfAfSm!=JP+QoUEB9!HnSeL@Q@WCP?Vk7#Q zcOewz8H5c#1Y}~k%g#L~S<WkgtKyQY4A@HBt%)$M*PyB-zXBHFP}l4Zb4Z+QCe@3PQs z8~5S6>l@roAS*o645wB)3li{C8|qc+s|b)u6@Y&5R<-v`MX&rvI!pU}y{RdorYzM^ z)nPUsD#I^(-ELWfhKblkH7cPoXkDaK5+D>3N~@<$QkK8o zG%>;{o_KZFK+%*;-~mdmkn)T6X#?YK9?YMN1Z>yqA^j`Pg|u09hZiVRqn&Vy4!sWT zovh%tZE+3{_*?Z7e*$|kkjzYPx52;7)Q<@=a>nMHn>}J3ss8+?Zy75R+Qu30vW<{2 zOQF$_{Hffy%%uT8C^G)r1kt5)8OoU2FEn4Q4@Pgi5To5i+XWz9gF#A$LTR6!*QY3y z10`HuGFWk!tkBY2B7pt}!F9J0T|0dR^Gf`Fm!p6{Cra>_;E?l&G9(IOe1Y-0N40iM z2(Kkb*ycIAUO-)tdwiW>du)EG&FkXzba>EBN}Il_)1aMDBF0d7lv@)Ha=;T~(+o<6 zfy#DMi)q<4{7;?=KG&5X$YPKPfa~FiVPe(U z5G1h;UI-SIW!L-K#PF{<+(kTlr@4KttAg}a!uHX4A3$~>Vbi*JjAM|og&3s~YIA?` zl>pr({7FrbtCTsg`VV|qYn0SkZo##f!nLNm=E_5Xzm)W6)mHe}RIqWHNime|9MBlL zsJUEP13==do>@<2{*erjNB}id)~b5$!3p++Spo7@!PTlCsX3=B%Qqy((obrs=?Bc& z6--cJe=BxOZrB&LkYy01BxH>=?70#P7(aBTn@6c4;W-%@5BLH!jif#3d~lg?vX055 zBndMrFe4*3xTa~zlcgK4od7qW@s;Jr39=xi(4I>yDse~toS1Sp#nJ&(VQFuiQp6k&Q?J{z;Z?5;UPo6l5z}w^qCz^`YNalFZjG0HOHKbjU|Om@Gj<)hmtJTe)j;=kI?X z8{AC`mf}s&zU&Mowrhz8nzJT9ZA`js@f6A~n&v=-m(T;gT{TGxIH{ok(IK#eDSBfC zH;T{4{TT+*3`5ch&TEXvTf}@NYd^VH->J<9&!7ECUzEolUyH8CpdyJIb9nYq zVCGiNf5h;BlaYgZcov1ZY*e(iFbb>^viyiPe*(MjdAAaI3fLl-ZW4ny~2W>T$#W6+Bu37!ZPiSsIW zjE_OwjrUWB3F%LP(rM1hTZsq{I+=>v@$&W{jwxJ=i6;ZJ0EQSb$<app;y!l`N*##;Tnh2KQEw za+FEXG>m6J*1YsTe2Ahh`yYN`x=Yks&_Xz)_b3_)kPaqmaXTJhQDMDPw_~~dBR4^j zgN#{LwS(1wQJMUk)It4~fV`#hFN_NOdkbnOm}gtPYd_ZR35`FaXDgq&)0FBlrrYr4 zmtlVPNEVJA5A1n?!JkoykxM%}{fN%x7k+$DIy+p(P z-&%2yxzjm|eqCQZN|b;6m(gjMBOV#)g(k@!a^Y{n3V1uF{4~7iO|bHQpfn&Gd77v@ zew^AsVQ1cTNQ(~N3TX3nIQ=0mpF1nye%|& z-Mt?d@Rz$%(SD|Bizg#Xt=`!4UvJwHb?lsR{F)cZU%#1YKJBU8nCfk9JU&44)Csgv zK0Ck;zTATw?8sQA88^fq-puoMQWU@Gjk383RBU!6v~3oL47H4JJyzj{U}6-DRVJGX zBBpMOvfgF$9PRD9KhJaDTN<>$^`{pZhg{>cM3d-oKQ>wm&s*zHo_A1N8lLR0AvJX$ z6z2rfLLE<={H8-oY(77!PNJ}YbA75ecqN}rtN>GJIw-(Rk@e!OE)6GK6S^p?x6<#} zAafaBH2L@&I|`Q`Q!1Ma+a6aN^$#w*b!(jYu}LeP+koXWcCEx)yf+zJBrsc@FNkn+R7{!EzDtZ5l| zD6>_L^!k@ORFjg%J{Lwr+66GlIK#PNL}j6TuqCSPRGBq{1)lr(3M9AIo1IfS4f8H5MdoKQ)l;_DNes(M9s3rccgawzrQK0;DlM_;` z#NS!H`#$PPVIauge6K_f)`Q#Cm?&*+rR&g4DpY-&@25Xfd@>q(hv@zX44y`nUpAo8lbR6P0#Qeh z6#7*YN94?vh$yssk*npfIsp&DM@IW~&)~xWftnxo)!m>>@3y2a(I!eC@B@Tj7#cBE z_KjIw}XPhPd0QJOeX_M;vOd<~#5rv%YTvBFnDH z5hJGcSJg_i(9-LVWmRKkag5>h(Zn1Yb*mg&lf`7D9XR5R(838t%TdhqouHkpa)NKF z&gSh*Tb{PH`PC}CJ+rq*c^>6M?jZNi?Emb7tQq!DWkMZwWV)UQIYL_`>KPya+yep> zs)kXilV75o-PcPVV^iID5{D>(!t^&=!xoR{n6IQiS{yCZQQ8jnV+VWTBD`Xe8D9sp zLll`#C+I41VLaAn6|CM9>0E1<#mkk&DJMBmV=ZYDw#hb3vnRP|)Nl5k*HGc=_Fjt~ z7uyK}$zxH6i70fqfKW#+vtv0^cC!z0DC$!qLd*QOE$FmV**tR(L#EI4>8s&O=l70l z;puBEGMOAd$h?dOE}pIKZf{@E66b>Q8x4+zj?2&rtnRpKoSl2;_5g=dHRQ88gW=0G@fTb>`6?Od>9h9Pz3^gVSVIbtQ#17toNiIxRHvPXK zH0*64Alr(G2@hFd#NcYpCCISCrJO-fcYJ$WF5~>3%Gu_P+w7`vtaRwFqCjk$(AF9t>E6eg1uEc9KM|I`nB;9P6U1sqxG@?B9+ioZ)a z+-YPoY^8p^a~*~vjR%pHBYZ;5B5eFw!=u=5<%mLuPiEQB?{oL)U1xd*U`7q@Yw|xE zl$r^8*nDT(|CO3ri2InY9ZzfJ%CN;UH5WK%W{FYgE@L z`Fobu$*VCi9sW&blYX93S+zA@coxN3N`7G5hH)ZkN`?6G$8$UKl%13NCe#;!!Y?kq zB$*s0gVMV9&L!c(L~kPAeAb|gtfd~ha=z?s>FGF3IQKsuC2X}p8}Hf$|MK~v9cGZ; z2T0g4OAl}9*9~a#cGa(1Ph`c9d~p|3lwfbl{FK!;g1NARJ)00qv)Wabl5N|EKm_O*F(D(MG> zEBIkOqlGSR*A-fgu8FTzuLEt$R%{YE9-tHes84J(B%A1z)s&LXvOgZalxV~An#=i! z`Hih{n*QVO?@Jj%1{8jz~veH->%H@Bhmciiq9sMN=xYxN^z9GakTQQJsZoK zFR5r2g+k5%adyHUT#3Do5Z>1a+=EgODl_YHDZ;!#S<~U}RCM-*iu|E-Jt_X)v~IHN zJ5CNE1b-hlRMG)8wmWa?HKhKa(xf6sfyOtN{l>h%+Ff0NMG}&wS;Iv0S?m1lN*cES*n^S(ymzH-)7c~+MaCN;k>tL@L)_G zN%&4N9SPKe1$t(QB*ET(y3n0>=>#xJLTk(LpH92+az;{x&@)$AP^A7Wgg+V$Y@dr8 z>iu5u<`K{aAs6)8Esu}!>+7U7}O-$u=FI_s>SW6+lj}-XXMENmsma=El z>ovJ2i&AZ)eFO^>Q@s%Z%wl}?(KyGO4=z1CoBxqkN>=(bnFuvx{I4onzKa{8C1_LCoR{HS z{d?!SsZ*`?YW^Ivxl@h6e)uUS;C^xSih{$&8fVJ3m(jW-(thwmrlzkp)M??p6J4AF zsy5MLSqxhc*Pk~2V^*#()IVJ-`{A~0+8F>_{mZ|vz$h|@FFC>|r3bD`V7>?K;>8!! z2cX2`#pJ|oz})1>7ix@x_n(X{NN+?u2SVIESob7qc_T5x;-hc}$IQ=RN0^KG9EbM@S ziFwRloRxAJr_Zt%>D_te^C9t^Il9y#IPf8x@F8v}EX`&xSHjy(eAC-FS&-}0p1!#e z>GeZ3=QZl99n9l@=N{_)MZvJfu%qHH2TJ>|+Pqzn63+O@ozniEPa3d*Ch6Vhh`M(G zm}B?a7c=m1akp16i8AX5JdTrhN1`3iXZw0kqsOc>EIRIV=}BVSL#yp-!9kfOWWY|9_GHy=k18#SzFdm7tW^tu4gxAa zfxe2CvZBaXpvz!k{xfxg3Zv_Ec=jYGdW^I?2&NW3b$~jzuSGO^6g$;K8!FG+@Om0y z0#;BuXLn)`w4^&>IO@Mt?>J+h zfORwy#L=4I5uFHt0M93Z8ut;QZozaoj9&W2q{9)7ubT9v>DuICVu*Wi=lT{wOR&_d z2aFro)7UPFGzxmWtaf0ZyvkEs>MCwQ>WhgUyQ#d4rrayr=QhGwB9m@2gT%JzUye;0 z4<-T}X`*~FK~*x4<#STUec9N`dp?jwt9X+&wPl54c@8>h-7&d;ko-H0!-^v1hzE^F zX0n_07`@BoKvoVc$YDEWs(xFx;QPqr>3j?IroHW!pzkXv!H$30lM(|HW zCc!HT|H@szcx~&?Ag9p=VBo3vWn-|JdKwex8y9T9J>BTyOw5UKD~Sgsmu+y3sVG)5UH9D@WxgXRwQnJvnkMm)Xe(nXZxhlqPz#_}&Q?r+}WQ zMd{l|jaz=o=iX~V`k-SB`b&}#<$xJtK%}^k?lMFPAaC>?#<27S_O6-I!icisJQXWH z!}W(IzjeV*)qC12Zqz#hWq?5?e>ARh%_>N4o@ zvXy&leabw)SGh?9u(9*?bf zcFl2GAgt+xia_gctZyo~tJUCImB5XX2t~1NQd58Y$Nl!FA@0iVu@QD93Qmx;L+X-j z$5lRw5RtcGKnNayF6O<y1m@My z5XGGe6CT&aimh_hoMaWa1Mk|J#=hDa*$ADYSBNzuhKYEXEYN($`*UqUl2~)0{WJF# zXB|niQEz$>P4r!g53n83;ZxvJU@gX-T;789nAJewWr=AvL#+5jfC+vkp>4|J!kF0N zT)iW=n9V08XvX7g(4(%P9Mad@KJ(!(%Nrb`&?0GV8b;nP8^&xy_M2y}gQ3m}ucb<9lZ2?pWP7}J9xE@Quki-;N+-u!$k^u4 zB1P3P3XBWDxJ)04KfiLzacqg@2FwPdr6*HBazphH1HTj5cOaCNZ_jQV=c~cQU*s;X zD+0ZQPaUMLU#$I8vP9l2uk|e7T_;}Pc+c?NXI@I4Dan74YEy4&6$BP&%GSn7uprea zbS|6u_eT^Fs7j3EI(20>sF|uEk#}Bs;;3i%arP(}m$?c+Dj5pJR)K_hzb>Z1GvP-_ z@V5&+UAjxcMDK6a&SsdOhB3{TH_^`zT3PFdLI(g9EC5-Po&N+E>Tqu~8GC5ptTJ?u zi-qY+*ViG|3!&tw8kpb8C?C;rgS~A}LDJDw+!$k3&*!7z*lJOU>UWEr(qWswkJi^qUd>izN8B=$dNql6q z1#C`_{j@#XF3*k)>7khsmlASeJtbW6LFVFMJ|C?<#VqFt3}>I_(BA7A1D)!&lAnLl z*rduT^d3R_9^?Jvs1QPRD>;qfUvsx;=1OtnS`=N zbFrCyTp$qv7`$&)Fnv_jRk-Uv39606DEjbZI8z@A%GQs-r?Qa4{6^*6QKY5pv*gAi z#uB4CVRP^9#-Z_DA9TcK;fSQZ@(doJmN>ko+Ht=!!{=2JNb;ZI@O5rY%eOjjf4*-Y zo1}NJ`9O`(tR$Zz{?^6%AEj_jr&{t)YSdSlh$4OM8^%CwX;(+M^HZSWm+qg$v(8kDT_06YNEqYftq;O8ha)BMTgNumB)M3|!a)qD~v#B~1gga#q0G00Ul z<9+eg%yo$NX&i;0{Kow7E9%t-AWlu_lr0 z_BepUmkgXxIA^4q2TS?*pH8yHkVi2FDy{`QLbG@q+i3Cx2hFtc*Eo83S1CqK)RCqS zK=!Ku;{7QR51*c+NJo|2K%4?$OQZ;1RihRax(o+nL_NjyOfa~^(0(7OIvZ=mbJIhp zmPPt>5sdS&6vy%xO;#^~ormVMCNNwk^F0SoUXbPIxZHf&XxB9ikmB27T}Ai*;yLk` zI~cPG3jPa&(?EY3pf9Ps63R;cC|eLE0@6n)l3x~SnKV)NEu-kIdvl=i2&uMj~cjN#Z zD8hErR2sY?5mCi*-QIvw`%?Ip!2ZQNx@qNFpTAJ$@AQgv_f$~I6X1h;~XBCz*m0gPWE=ClAt)i0U0 zoU#_xHj^^VXTKB6?>?SAKYk=+(C9A&1qQ+uVee}bnjfzg9q6Y9%}()xZbFtU!e6EX zPFvmC+wN^DUz>emdELo`Ax-pAFWs)?Csh6)oPb+mEb-!IB?B``-73E_NSQf! zYQZm4G|5xR{y850h+YG@+H_;vAxX+ZxS_zR+fUFDqfT-F$9a_TAKZ<7-4u-(ry@b0 z9rX0*dN4xCG;9h>o6X2QJJ-Hak9}v4fSue1sGfe4Vb~XKuQ=Ksp%c5QGj6B9(We}s zu2MqZs#-$Ea3OLnrT@uH>^s?9h(DX&2FhwHo5|I^M}12tl(n;ac+oIrt1vk*7nM8J z^mZImPv(*OLL;|dxCj-H5b6%_17vx&!TwP>jz-4WgDDNwS%Gv&RQp#$(~)B4uJ>0* zRih_wOwR97%LzLx&aJ3DvdALntGI|;y3}1};3RZX1U*qx{XgdYw(07~+F1BeH;AIn zpo->JG4{@acTacGC04CJg@$a~moA5KqW#Ziiprrvf!ogOCK?@{ppGOw0D(p3C&g!W z?6Pl-p)SJZ$QOQR1MyNNA|16tNaoTtcP^3RD6|dsMsLqLzjrrrUMYWxags+)2G<>B z_=ExP_U1-=)hXPlKUE+|KEjtnj1@#6x#^nVB0HHf+?$h6Y-3~kQV~sW6UTzcH2*Gs zwn}D?JK&YUB;!TTGQ}jLL80m~*cE8-GM+s*JJ!TU{zpTj@5(~>g#edej_!q)doy}M zCDYjW zY%E(gfMZ%FnjKNOLn2sAn6g&&GrIt}wko8K_n)x@Dui1Bf==ecY_IX5K!iEhI_z44 zQB{}ZIht6wxho4Jczx$uq_bl2LDH~I+7g+`h-bc26T{==1*FJsP<%alRYLqh2@scG zpXRIRIN3&&y2+aOQcNC#{T8#H>EPZ<%3?IrGI4@01|)maHdfr0$*a&-#aHit^q8{j z!j_AO2WBlAtDL!H(s+;H_@8~={9y|q*u4@0TSSHp2Iz^lZ>GqGJ=?3q%}#qsO=Y=%oywfPz%ub5`R6}YlyTBE!C45=?e=RH zPwy0rUc0X<3egTC^F%xmHvqFC8h;Iuhcnxm4yOKP0PK4iuH*|CzPABiL7i(@+~Oze z+j3Ped`V|s@@1tHZ;!wrU1D{i8RlCL|F;DDITjp=1%KBhl~&&40Fx_P+Y5JX{nCHp ztoVhMDq677*k&kGmmu7e5IvIyWYZLSGFhdZNVyYLGM}){e%en)AIB(H#CNW<%g^tZbY%YcMI55A zX@R!5!4efPM{Q`k2QvaM?g=>e)f* z-DDlGa}7q3`imFn{{@Y+Hm1Luppca%(N#EtjEC2C0=C8(QEb?DF(Z5bF|k!KiR7g} zjV&5sp>T33g>Kit+{l>?&4gb4)zc4`ZqltU9~!IX9{4Z`HVwx_wFa9vH6*E3#CKj# zsJ)~5xEJ8@zxv|%>8h27Ffody1+$u9s(=wOwqKODIA22JLYlS;#+MDqgiW)|*%-H% z;PVd!4Dw9gJ(aT1e|<2Psc;!XG^PBKFS-P9qlQ=7cHi6O{-4V#`qy&TZGlS9OY31DWg%PK! zQCG8BIxxhtJhr&y9Vk^xjZp#Zn5yF6Np>lz)XGFQ57p{3bX`Vyiys>4d<-v2V_j3B zJO!`^+@?#_d#+$kdmq+o9v7Z}t&#AfZJYRxE@wBS4T2!(@R}MQChnOVGRmAcw3N>amIo=$ z2G_mVcUS?=xL|}#UaezFaZKkPYQkUnoH!u`^NQ_1w`I~_FF#8c4NMZdkgtgr%u=Fd z`reU$a<`^E$T)B6_Otz)Cbk`L@}+mWaj6!d+VD%aez5qR{=54VCsr99ytJe8F~`TV zMUA~xw*kx%nUqlsqrj9uY&N3R|4z%;oxqkB$2tpNwKWGaiR8ezM!zFu-er7*za~cz zNE3SIR=n#uc-T#MTv=0r0vvAvS#e(~J$HrPnxr2?61Z6kw4-t*HD>Gk((UrnAI2mL zUS-?{lxzYzK-^6%YRX~3GuBDr0`?a+76EZ~N?7TF%;nnL^htLwW!FyPb?mRS@Uz?!jOw?i)p36*wngK7N<-q0&FQtn6B-aKCA&!AG}U8k3gb7?er&~} zZBa&)Co3nCfnjR@wY+P6kA5vpi6Nzb+0Gp`c`7uOh1X>^sXLwmB;^)%CB-nk0=}TR~;BOF1V1 z&_(HGxW|fMTN;p~zOymG!}-Pkd+2#z=l`6HBeB+_C6=QkcH*GbV2?2%d_OOeG3<_R zqIM7w8iCfQC>0-CzeQpA6!S^Q`EkO~!C;9{S@Cgi$Mp{jIGP$Du_{ynzO!-c?R`Tj zlv$(X{lM@G#4Vg!~1SL(V$R9h#&-)7;LY(Ftntg+;mK? z?S5>7Hg*BukJFCF7u-k99k(*$YgxF^wQ`%jxbbF1eZjYM#`t^O6x?+*#J}7hQf0TG z%ezYL@Gz4_#{84TQSKE-!H%Cp7lw#LMUCoNYZ6vvmt!kuE9C?V{?y-k0mp{gI$pAf2o>_qj_;ZdY|A?WMirBG0ZqBVTEq^ z1?UXCrnSO3xGzB*1{d2(s9xB&jI`hACjM%^Ln1Dk)Xw%n4OkM-_t1-bmdY~Tmm&qu z{`!Z1djEcA$6R_WJDW>Nxhf(O_ySDUP#ClRGWvb{>lO1aZn_*CEbX>z`gfH0Wz*_Y z?jZAEnQ@=N>ec!bANt!ftCy7cXOq(owIrw^szJjCo%^}3)ltiMrgJ3eb4l4)67{#P z?t^zQWuGkRaSm(3``2IjPc*h|^~+4&l8>?0>r1vP>8Fd-Ms~tC+fNk6gA6;wm{Im4 z`tQ15BA(*!IL{x~<1TL4PGf}8#0bY*84D&|^aeQ|!pfm@Na@b5og-%F79S^PQ*%m( zJz=-oM%9#Wh?U}w0BFmV#VdWg#inq9J>2N=iD7$ABk7bTNv8X6tmvV-yk_faFdL- z8pnj-mjx(RqKbB?Rl=GzyJasw_M#|ZBFqw3G(6nIhPpoL*Jt`P%4q6N8B4;nA(oLm zInBFwWO4M*leSJ#;^6SNZ?6~7>OYrmXm?EzYn8FcTT;tt7JJo8hVxfNzx${=M_?-< z>?tCR<*|a_5dngop}>>t;<6&2?}L5*10l@72?{Lqym|D_n-l%Xd$ zvza-P$glt`PypbOwmpXvRy07TomstJ8G<;HI4&=|NJ)@exHR|*j)#H002@Ppa8!;} z2N*TE=ZzdSUUX%q?m1W}h5XcMOUzmbl=SGWen2k!J$y%rtgl!clah%nrIC;hkbU#5 zItf1cuHV@N!8mff)u^h>rgVV+=$r)mD1!pu*U7K<%Vp0xiTR{@p_4tQZE$tj!c5$T zx_B(IO%S*#bpy&e^4{!Z;GC~F@(+Z8I{itZ!`vdrpD}^GD2UrE9XM_PI2jD}K}w_V zDs`%%_N7&Yra6|~y88z*1hn8_e(>_Ei2kIXO904C2_KdEnI9%4hi^8Jr$?FtP?|R) zDb|bMeI`g@=w&e*dxffKQtTpj;;QDlL0DYC-;B$W6!^%cy__z1y%d%A-@;S*hd&;` zEIm3-bdH6jWnYuc{ae#}c>3x)%n~Bl$L-Hg#+}^# zU;dG0TNi1$HwEtrROb_q3y_Mz*k-sT9}*d?cTJ`>c8_fDm8O2^OgjBG(8${|)d=sf zB3(|$t5Gp(f1{C5ghJFnpNM0oobSP!|M8i*{-a2UtX~X&brUYbh_uE8Cr5KAXX_&@ z_~pzH0g59Cz5#?+g*c^j==Df)nW6>PMti_e-IGpA}u8hBSpb7T*?QMY)%T_8+L_PUYS-T;LBJ)`>ls^7?w>dRf7&~%zo^1)0ngAK zL-)|#AYDp|G!jxnN{bBL9nv73N(j;*-2({H-Q5k+%^82^`|i%4aQ4l<*%xcCcfGOR z6^~QHvKuroch*Om7E|uM^Gix%z17}KA&)RU2eYkniDnV?^Fe~^RjlEYr`5hRm=->g zPmaS_hGv6gjhC-?P^?OWSg@7)qjfM(c9#8~*N0sB^6x|5o3>BP0ZATP3)URwoZ74Q zPVq$_ui9B5w`*g-fPMl%`B%zhAyohx6T_>177ySWQQtCa?ekZTMof%gZ*>Pb3Mj$eDM4i{})eKtV zlnM`-T7EZ&0&kNe`Z47k`IPM&5a0Ld*UX&R-*@XuG`rWuKB9k{f8xGPx4l@=`D1L@ z9ul-h5ifuo?cgZ_ytM%A>6xTG>3T{8K$di*cMvL&>aM+V9soRzhZQaN@<>q{-9E8v zhzA+S+Q?n`OpE$>iX8D%_V@zd5B@Sytd~YI#_RjlpfC)Bl@PU@E1jlV1f5%Oyr(c`t3scApN6beJ2Xw$aBKFUDWuQ-;+Oy-_KY97K)k?6rAggmNi1gEm8bz`O~ z0xS8mTNLdWU{V4=3WA|lMPBs#Qk`wqs^ob7WK3IvEJBo<`HwUdx3nU+uICtLtyB5S z6-+rOa^|~a%N_XU0gI(CT^w3*D%9_FZ>=@blwwmz=!VIxBVXrztY82XoTYlfuoVWJ zwD)^$E&Ni3YypZKYBL^Fn?7)B4AIk6jWj4eZ?1eQ%W|z91UgaEZh6O0{gn?f?ubM7 zsUYO3w*{GwqXLFU`J&czSK0%KBhX@T0)`C693o*&?6EDi>plrE{U(RU+O=UzBA4zp zYVRX>+#LVDXAhD>97cRCCiQYRdI7T24c7kwdKU~DddVwh`6W1HF(QGed0Y)Q-D01z z`gZOwsJzIT+7l_#q9A5ZKmp+-B8#1$n^9OYbw#OuZLqGSlKbhn?M$)A?@PdOVsx+X zwX4>AQz$Ed&tonOK|YG+PTmUt@*U6|QJMiEFHQ9~PQc8jGiJh_rHKfJG*7_@53q{8 zhn_~aN_ce?#U+PF(Lee%*v;TUbZr);r`}uml!#1K=Eng-HUqs3Wqd(1OY89XgKZJ2 zv@Ob?`n(zu?PSQ5ENxY3{oJ#fDV53PhJjRL*rr`qAu_1w|8lfmHT>e z1BUL|hpI%VJunHu#@W>S%gSv{xv%F-j^bq9^WE6B-NkRwUp7 zgs*B5o|b;0K>5?Jxa&0z=m`{cB z)Kr21+$2@{6M*!gh;o#GiSTJL1_CmQ^pfv|>&gl<>Lzl43^7?W{B}*3w+pu=NOsO0 z4<*QbRpJmRI%K4;vizkWMkczfsE`a4zms#jAhz>MxV^%`THfYBvl5I&sWLM*tVIARYv$!D;+>xJhws ziC)P2p;0;mp@=|*1CT3B6K}+d0}zl>#wt!P1PixZiaX&By6n8<0U{6$KF_x?W@E~) z+iR2KZ2*I3>N!{#!YvXy>27K9AG2)C*=|<6Pk*7J#g4_clN&fL0(2ORF8eCm^1Bw4 zr4*e7#H(?twDJu7Z+r)s%BMI2?N#IPo8~{o7i8$GN3JF3lqn`ZG5M3D5vEy2I+{#C z9IcMWBlCZLUe)s9yZV|q8Xd)?fm-%%ZV& zF!=Ve*m}7{-z8y>D(&{X^Vy00B#T36EnKIPYx0x@GQPl!+I#IiQ;&sUX@_j?2)qPH znN~nz+l1X#eQ(~2L&D|mM|-_?@AMM{CX!6N6_QV&f@lo9fPzK4+WXkIHd_&>gA5kv z477$achIs%%_i_# zSt53&HIqn5X#Bx4E5(aMF~jpb=$lA64u|XwZP{yj&bG&Z3zH2zMSn9Dd1%5tVj>;g zkCeP4A%{G3javy%jrL)!DHzo#}|o+xiI1Hy4ZP2ab49qqQf{Y;hx!v$MH^w&=fE9s7N|iCD%ts8>q=AlJ88g@> zT$6V26c&u?gG5m*(nk|zjvk|}Nklp?#iWot z>5~6G@WgT*>kNt-p$A1^T-*Ihh$M1Ub{&|l$e1>*_!+O&sd%KQ)dMhr=G#%SEYn2Z zBd}zjjv5v(cmPank1x;+`qNXUXzyS{2H?X4(Gu8XH&U;K%QY0f(!YzWY%}NkDM&kQ zSE$v{%V;t$K!ymYQ5AGXa@q>ye5%8x%6Nl%6zYKAsR@t`s*9fk;)zX+>Io(B&L+Pe zx9f1(IJr5H}^3ik>!}>fMF&LpUZyV#crd_Vj zeq%sl@LH&Sn7Iqlu7}ZvGj_;tI?d{iVcp+a@m>t^JCgNN%HNuc@B~&E1YD|{s zl<%#%G=GL#?Aj`qGuRq2Sfm807z^i44h4Pnw7NPe%y|Xilkn_P&wjqwrp$+FR}j@U zTiuBIYiYBuSTDG8mp=vt!w=-g8Q5lI7Es{DUF+&&yKoOjP({}fzX|v7_=O~i0yyF%kk;3s z@vnI9{?kP*A$RnRhY~V7LYoC1SH&|Z^QOV`w9@{A8cn4s6j`uIhi_2-Y6|&H65&ss z5=Ty=g%E_O^CJKJvLA+;>%wz&u!%m(8m#=_YomaZ#kXU@aSa7PFatT@%PGIIhG#B+ z9E4cL%|!d9QOEaiE%jygEs8f$JDYkJL6y>)S8nrTqnHu9vd<+wjcEtJ4CRd2hBXDR z3HgW>*;f3`j!=h)^aFX;=p5MTkFLKVt(BV( zpg=NskCDId5(peUYE8c|mA^Mdk6oBnFbhB>wg*Bq8rOL^jVvePe*@OIo^1g@kxH z7ack^flDk>YM#G!WFcIs-bRhYM(^f4zo`P9H2oxbpu8kJFJ^QBV4=4zp`Z z8l?6jx>(iklSlxdKlK{~I7veXg9DewKWJ9+xcSnIUoJ0=(y`=6?r;$w=REbhQ-ZL% z#$-Gep{@~eewXHQj_*$z-QRSAY3-Ba8LiM#bd1jK}gIz{^} z&gGbg^Fn@(rwUbfh*_PeB4J$oXdez3gBfFn#d>seF>X2Cgds@m{yxEt8(iv~k%nCX zfhgHrX3SVMsVnz04Mo0p_RetkXwaRojU8)G)gL1oxMXG<+E%YeI(e#A?9p`2^!@FN zz3fgg-})+jWX=ZZObCZruBT`^Z=K)CL&--j@`}=5Z+ei}c8EtlN^W4)BX0NZ4yC#q zic|jP9P0GW#E5x|$`oPx9(0wVYw9v3gE^-0$q*8-Hp7h0$@vN3G6t3j1jKhJl#TLK zz1qR6VUAM3X0fO+N1?{9O`|wzJ;=$x-69IPrX58kRyL`_=fLgGZj z58mJIeoLCzZ2R|4aDjsq8)_`WJ~4%ZZ0N>jGYZ|kpd`kyU1C^xg2$uey4khG8wh{S zQI^;cDP&UH)=WtcN9n!_@`D@~(YpDVmzeNV46Jl+(6=*Q*Gdyw$$RR0xY)dN-qu2P5d6iQ2q%bu=ANy?Qm8 zm)pL@k_6d7YFcXDyly%BeVUiQG~*AeFVEVjvHxayIrl)WuLA8inPI1k3HO=2hCyTR zELZQX6DAq%)v4N4s^xZK?|P((%yvqFzaIy53U*?n!hirOvx_SD`a8N4Kg{GC3;IQ8 zDRNGxakX^P=;2{CF5=GD;G{%`8T5jq=eWMklg-MKQ<| zT<8_~HHbiY_k7UBXegvJ6^{rO+ocfAJ(fi<0Jd`t=Jok><;RM$4Y%a2BT4%aGvgJH z%5B_P1Yvugod7S?2fSp(J+pMiVPyws72^c&%XoB6F*W&YO#?}E2G!9CV({#e5y!jWBX63j868EqZp zIMLCa>ialS)JHNrflG44J-_>a9N2}3BMd$ch{ul%jTlBQlm0lh3M0S$>wR!Rk}YP^ z1N({mML$93sL`VlC-qxjli2QvzN3Z)%D~iO;E1cDd*Mo}#Wn`#2xll8XqxjKpU8Wa z1wB3zowbML*W`nx8ehzkWyE)>Lp$VCSNE3ad%USl)KjaDYJ0}@^#b|~e~&(e<}tHU zJ|8o}jQX>8`2a4kjgv~4_096o6#%P0f2}XzRItT#v(2$@yRI^Ow8;pjH1Rvvy`Fk&^rq+ivdgz3Lhv%0z}fK(?Ems)KhVW;;JXkg(5nKk ziG6F|w&!xM8jm3#g0wKC{*;+3$9G=y`3`zAG+9&ua!F5IdAn!%bEa#1w$QcN!ZPMn zKDND!?ls7&OK7p9Q+aJ(cig5|FR1L2*i@yC6+`C(HX9EVlVE~@j6;KPFZUsX<>d3s zaS|;cCOfVKpd(d3%-8&Mzyn~h4l#%nr*N7mBte_N$6GQ8-&nxRjoJJF&Oa8%sX3jy zxXHY15(4;b5Xjv>QQ(<8s~95T&~G*MWL~%)t|ur^Z=(i;&HbeQRVDMA&+kcqP6ywB zzj2>BAj#%XxT@fOL(hz`;GNjfyzl+BQlKuUYexiQ?`lmzc2>S~u<9=#|9s?CSAzrtn(( zh8_n+nX0bgwT1}bc~a_0Yb6ae;lsg;cy}pYfVoYm2i#YW{9A?=(Bd2xR^PtvVI==o{{`U^3wTYHDJ}R8ShbEGfHuqzfz1FR z(T|X^K{o3)_aWXsJ%BJr?U*a@HHs_yZ9v{)9b@Q_glb1Ja`3wlvPbzkxN#hf7W@?QS^={U zvc4~eY{3;MM16@!IPp{IlrZkC6`+&plBC>=7FbyUh8~yQxr}%8@sf;xG+#8Jh4;03 zwrW%gct2pVnd&D?jr<5N)S3WDi?XnYR?3)R3hunnQ_TvJl(8*GWucJ*S3wGE&^S#D=zkZKWQHrl!KXQX+W;nWIao&PtZS{QbSY{s)(3q z5jNvh@O_jgktkAeS5cPo!*p**#=-~0S?c9H>``qzk|f>g1{;PLz7(m=nM7OHeP?V` zSM+fEyU*OK_*0D0zBx==pq*9z=a{%9k@FZXK)QN76{s62%`5EbXx^4&5%&h6=${rTfDT%}M*37p zNLi*tBrfW+Syr}M-p2VL*vdhV$9)M*+xy5GMmE3BEXQnT5zv2Js-e zax1wwho^71C`aFY$O1P-S~D`$b(5Vmfz8k@LG;*`JB6;dOz~L*+7%>MbdL_Wi;)b9 zOo-z?Yt1i)rkF)~y$P|TNqb)>Im+f>rju*C#{gA+M1UiJG?Q4mgmE1I@1YIZ(J#qQ9#4n($eq*rz_su2j;|k9D8v^TzK*nVtLvn6 z?m?H9H9A-{^DMcpJMn^M3Iv0B3-((VT92&J&?23`foiz0800uV%eGx0M-8f~w1nK@uXkOjlJt z7o1j=`ImXr5BJgd`$SSV00Xjv1p-GgQL7A(;=Vur6l2KmJ3d8~RvS{baYIX1{D$=VN+9@;(k>Vh#C~nH&rc52R1%HP>1# z>Lvt9$e-n_qw|z0uI+dCD=-;_UVOP38uO}TOo(OfDsGtXHE-B@Up`qI7L)h2Brjwu ziJQBo5U&piHR1^Vb{%f;!ZOF%a@*~GFF)aTf2&rTEIp@QRMS7XR%>r91HF-Kn zxM|&$nC>a_$rswSVeMZr@L3qX>&+J$HS2~FJNZGQ(?QaEtP+(C@BMxc zPoND}N_7oN%6ggJZlM^it9qvzx6|n=4D%{$48I_|uVwfv5~d|qv^qJv?Pajy0h>#vEwh4#sS-W}EQDe;d8jy<}e&wV*^^XETZ8q?Rkwb zDI=;Q3tMX2B&lqN&i5JtoQ5+58GC{-c}-&D{1J)2dspA)<6PJP2G{y={mz1IH<)wc z#Xn`~o$vB~u&UN)`?VFU7wE;gg03#}Rv!UTwK7tali5BJDUefEKC+Jut1E?7$&m|$ z6mrRhA#MLO(&W)Sg*ZZ_oga-g)Rg1-Nw>i%@glj(Wo>r*5zM!~?WN^BcNz@QFoOBX zhJQX?UH4*7Q*KnEAyvN609+0asq1U~(E?c50Y=U3i14<)w;P)}F%bb|y9^yE6yzeW5kyD9b4r$IoOQBSWSKGKE$9*{N99({kL2 zrlQ~<_^>3!B!*Gm$YY-!Xpw+e z^#k&sMNoq}bvNu zH{hDWi@o~8cH^8%lzG1bKFzffzqcE5fsvse_z-nH)}8`$du+29JEU*FW@4FD$~IWY z3Svze2WgnQu9@-RPK=$(m#{z{+oLScQ%XbIYGV<57b&VsgqfZ%TW%Dter6WxqnG@; z)ckM0*%G~FjdXd3z15Sb^(n*q{NSdSn~@7Be9D$V=5SKA!)OF~=LY^Y_ZeJp&2++q>K) zw6izAfw095M0?Gu$_`R;=n+yUIW{CcjF;D8nE&`Ar|G~K9@XDGt_#hd_Pp2l#NjXm z7lzUgE=*}6$*;L5FPsz5HGS<|nSXJq@*F}(4B;a}Lv8Ne&_~k8YH*~+W(MrofWS3a z=J1NzwCc7*&G+ZozY?efaiql8m9ri?_}}urqBQe%`+{bBVJA{=KUpOX$t{%AJ+#<@$ESk_mh40OlJ)0(ZR1g<5oitz168ZO!hCUYvc2rLW=TKY6= zqCXn>r%s2F0(P%IMsStHM(jLk!A5(Q64KoXaG_??!88^lb9~O<%6~L96)b!JR6e^D|tyATsqm_`G z$dOEuh1^dGl|W>!T3N28D^;|kE5n~=av%YOj~T&h)2Eq>yI(1GVL2Dk6r+&f#-8WjU?3_!_QHj>I&@_!UE#A z%HBY|bG@_(6tGY<=fCvaI3D~dT{Q{kcL+DLM^G`Iak6mmJiC3Ge^PxOC5n5xK;?sC zYDtn|%#4_)T5|2RN;8kixuDmI{=9%ClFt@N^3ZtV`EEoq6Yr@;pVw_Irl_-f%;KU@ z8Ioe4AT~!t{oCi(O`f++5(PncH*Ct__~I-Ss04|d4OG56jWX$AkI{RqAWt(?nPXhT zktmbi=UBeh2vGIBC3u<}!f!uIQ|alSgg{gq>)7uEA#sb=kltYvD&=3wObnSsSmq*i zbww9Kf0fwy>4#b>U0ktm-;IFA$88K0)+4b4g1(_XgaPJk7f>y6bC? z${(=Q*$z;Ux0Xv*-zov5>v3C|+}zR3P~Xi|+aPNF*+@?_g2j{p&!D*vWk5e4RgW%_ zyjqaZ;>?BXgdtoRZ$6}-|A>2WdG>xeZ`(S+%fp?z0*y~mwT`k1)%3Qpr@OC!*g?=; z2_TiHC>1~N_sWlxS)-|WL?zF2LUGw4wFi|79iH|{2+4z-Su%%YR(2?5`i-ICtrhEe zT&B1&S($tQzvqiw?lDpBzvgTN#OrpvnPOezJd*O;&quRC<=6F%a<};S-hEP4noJKZl8hNEDRl zFLb*wcUidpNvzaLv+O6`fqY>9D&x^RqBr_hJ6Z12wn`_LB<*LRt<|SYmsHX3?EJfM zJP~|MjbGZjz+z1F7^v@hUuu;i+$fA}&q z#;&qO)$7#A|H(CmKvg(U|C5lG;>e>9VnwF}FE(9J?@r3id-wK> zY{duPW!G6jRd{sG-*yE$0*MHjR3+WoWyS9X!ubwLCiFHQNhELEtG2LibQRYyRQ2P0 z4(G^215wTu)xHJ7dt_@YcGTKB?kiEeVNB4;Gv_G06nkT&!0{@zst??;2~ve&8-gYq z_5Q?|2Xq}Yv_Bosos_~gQXwznw4_&|Nh}RAy}}2g=rW=Pe$oE}d`lD}T_^vCZ`;Bl zRnJg?P^*g;^XXkM0(#>mpxu)jzxbU-e4t%XL&6anrwR&&%mCnzAPY>`I{##$N=8bI z=!FZTypbrms~UarnxY|aY))PnZ?Qgm*8CGL3)+ZY)o(w>*%j=+q?8X#;=PZ#TW5pl zE0n`|PgF|zXeu;{>DRUR$3EW~lqYEr&`WAKW+z}$;1uL#jHj%!t=Gi&>8yF0?*((w=mUqU>;~`y;&ziSv+ine> zMoW>C(wA1_;sk5LYJwq~2CL6*nuzRHMrDhnID-K**umN5hCFGN+H8dkZr2I(xYO29 z?H|al>ei;s^uiXo%`2}>LQH(8eY;w7ub+0}{%=bSE)%l zyo~&0Gt`)mfN5U@5bVy0mtrg8HaKDb>jf?0W8~@hLh!2UK1=cb@y7a{1t4t(lJJC6 z%Xf7E%DS5vu=pOxN?9$Q%Qz7$O>9*5*wn3Zq*}Lu@vMl&Q_*(Pyc5Zs)mc&N`L##W z<&R-?_eeY6n_yvzwCFccg|XBxD+)|6>ys}@*{OnLq@N5qdc|>Ea>>%NU+E8a{?Z`&<~T zzIBoI+dyYd83r;ZT-)`qTWiee_BrB?>U^|w>J5^1+|I**Q%_i0|J|SFh3Z$N&alQ${2K3ZsqXoS&+Z6eh7WUU6n8=pW35_n>T| zh@2A(l9t){C7zQJ5iv=-OpA20Ikk5biTR=~tI|^4sXAk@y|C!i*qc*XwvF7}UQKJ$ zfy{nPihkC_|A~ha5CB%M>LUI}=1H6?ya;ox`h0y>B>$nqbHOJ6NN9KXV~?pU6jcKv zOBqOVeM~xK3>_AX`E__wkfiz(3}s9kY3?~T;(zYDwmDchtSE&gqx>&;W~|fB#pP?E z{``JOa|Dmx4?rVbsrff>Ke&qSgrj=xbioez{9j~^h;+O#EjJq07yav7H~v{esB4kP z-oKrd$ZW^J{NyTT_36YN{&^lXav&|7{W8^I3(o1Eqc#Y@^zJdb(NJFFwKIw|M`d>G*;vutbwyFPc{QO;76z zef#}if%fw&91ZbNswq+I)MLPS(r`8oLg1w)BmmkCaf(NRb9gYm2mb@!#0iRu+NxE8 z)Wz8vKW`@=rpRyxNk5e!|1SWjqj@*S`xUj@oas Date: Wed, 11 Oct 2023 17:06:05 -0700 Subject: [PATCH 136/639] adjust color and use transparent logo --- README.md | 2 +- src/conf.py | 2 +- src/docs/sphinx/_static/theme_overrides.css | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b16bc79a45..e99023dcaa 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [comment]: # (#################################################################) -# Axom +# Axom [![Azure Pipelines Build Status](https://dev.azure.com/axom/axom/_apis/build/status/LLNL.axom?branchName=develop)](https://dev.azure.com/axom/axom/_build/latest?definitionId=1&branchName=develop) [![Documentation Status](https://readthedocs.org/projects/axom/badge/?version=develop)](https://axom.readthedocs.io/en/develop/?badge=develop) diff --git a/src/conf.py b/src/conf.py index 6fec6d3f32..ae802e577e 100644 --- a/src/conf.py +++ b/src/conf.py @@ -254,7 +254,7 @@ '_static/theme_overrides.css', ] -html_logo = "../share/axom/logo/axom_logo.png" +html_logo = "../share/axom/logo/axom_logo_transparent.png" # -- Options for LaTeX output --------------------------------------------- diff --git a/src/docs/sphinx/_static/theme_overrides.css b/src/docs/sphinx/_static/theme_overrides.css index 82998c75ee..2b9dcf80da 100644 --- a/src/docs/sphinx/_static/theme_overrides.css +++ b/src/docs/sphinx/_static/theme_overrides.css @@ -15,3 +15,8 @@ a img.logo { transform: scale(.75) } + +/* Sidebar header (and topbar for mobile) */ +.wy-side-nav-search, .wy-nav-top { + background: #343131; +} From 929c9a797d08a54092222ba45153352fb1abb0c3 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 11 Oct 2023 17:17:24 -0700 Subject: [PATCH 137/639] try to fix color --- src/docs/sphinx/_static/theme_overrides.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/sphinx/_static/theme_overrides.css b/src/docs/sphinx/_static/theme_overrides.css index 2b9dcf80da..31b3a96aa7 100644 --- a/src/docs/sphinx/_static/theme_overrides.css +++ b/src/docs/sphinx/_static/theme_overrides.css @@ -17,6 +17,6 @@ a img.logo { } /* Sidebar header (and topbar for mobile) */ -.wy-side-nav-search, .wy-nav-top { +.wy-side-nav-search, .wy-nav-top, .wy-nav-side { background: #343131; } From f44ed06349261aad2913be48d1c4af16793e395a Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 11 Oct 2023 17:25:55 -0700 Subject: [PATCH 138/639] fix path of override --- src/conf.py | 2 +- src/docs/sphinx/_static/theme_overrides.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf.py b/src/conf.py index ae802e577e..e227c224eb 100644 --- a/src/conf.py +++ b/src/conf.py @@ -251,7 +251,7 @@ # These paths are either relative to html_static_path # or fully qualified paths (eg. https://...) html_css_files = [ - '_static/theme_overrides.css', + 'theme_overrides.css', ] html_logo = "../share/axom/logo/axom_logo_transparent.png" diff --git a/src/docs/sphinx/_static/theme_overrides.css b/src/docs/sphinx/_static/theme_overrides.css index 31b3a96aa7..2b9dcf80da 100644 --- a/src/docs/sphinx/_static/theme_overrides.css +++ b/src/docs/sphinx/_static/theme_overrides.css @@ -17,6 +17,6 @@ a img.logo { } /* Sidebar header (and topbar for mobile) */ -.wy-side-nav-search, .wy-nav-top, .wy-nav-side { +.wy-side-nav-search, .wy-nav-top { background: #343131; } From c119fcb61f866b9c11431166bebecfacd65307c4 Mon Sep 17 00:00:00 2001 From: Jacob Spainhour Date: Fri, 13 Oct 2023 01:09:17 -0600 Subject: [PATCH 139/639] Add missing doxygen comments --- src/axom/primal/geometry/BezierPatch.hpp | 91 ++++++++++++++++++- .../operators/detail/winding_number_impl.hpp | 1 + src/axom/primal/operators/winding_number.hpp | 19 ++++ 3 files changed, 107 insertions(+), 4 deletions(-) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index 2dd654c6ab..50eff3e337 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -546,7 +546,12 @@ class BezierPatch } } - /// Return an isocurve for a fixed value of u + /*! + * \brief Returns an isocurve with a fixed value of u + * + * \param [in] u Parameter value fixed in the isocurve + * \return c The isocurve C(v) = S(u, v) for fixed u + */ BezierCurveType isocurve_u(T u) const { using axom::utilities::lerp; @@ -662,7 +667,12 @@ class BezierPatch } } - /// Return an isocurve for a fixed value of v + /*! + * \brief Returns an isocurve with a fixed value of v + * + * \param [in] v Parameter value fixed in the isocurve + * \return c The isocurve C(u) = S(u, v) for fixed v + */ BezierCurveType isocurve_v(T v) const { using axom::utilities::lerp; @@ -799,6 +809,17 @@ class BezierPatch } } + /*! + * \brief Evaluates all first derivatives Bezier patch at (\a u, \a v) + * + * \param [in] u Parameter value at which to evaluate on the first axis + * \param [in] v Parameter value at which to evaluate on the second axis + * \param [out] eval The point value of the Bezier patch at (u, v) + * \param [out] Du The vector value of S_u(u, v) + * \param [out] Dv The vector value of S_v(u, v) + * + * \note We typically evaluate the patch at \a u and \a v between 0 and 1 + */ void evaluate_first_derivatives(T u, T v, Point& eval, @@ -958,6 +979,18 @@ class BezierPatch } } + /*! + * \brief Evaluates all linear derivatives Bezier patch at (\a u, \a v) + * + * \param [in] u Parameter value at which to evaluate on the first axis + * \param [in] v Parameter value at which to evaluate on the second axis + * \param [out] eval The point value of the Bezier patch at (u, v) + * \param [out] Du The vector value of S_u(u, v) + * \param [out] Dv The vector value of S_v(u, v) + * \param [out] DuDv The vector value of S_uv(u, v) == S_vu(u, v) + * + * \note We typically evaluate the patch at \a u and \a v between 0 and 1 + */ void evaluate_linear_derivatives(T u, T v, Point& eval, @@ -1124,6 +1157,20 @@ class BezierPatch } } + /*! + * \brief Evaluates all second derivatives Bezier patch at (\a u, \a v) + * + * \param [in] u Parameter value at which to evaluate on the first axis + * \param [in] v Parameter value at which to evaluate on the second axis + * \param [out] eval The point value of the Bezier patch at (u, v) + * \param [out] Du The vector value of S_u(u, v) + * \param [out] Dv The vector value of S_v(u, v) + * \param [out] DuDu The vector value of S_uu(u, v) + * \param [out] DvDv The vector value of S_vv(u, v) + * \param [out] DuDv The vector value of S_uv(u, v) == S_vu(u, v) + * + * \note We typically evaluate the patch at \a u and \a v between 0 and 1 + */ void evaluate_second_derivatives(T u, T v, Point& eval, @@ -1379,12 +1426,21 @@ class BezierPatch * * \param [in] u parameter value at which to evaluate on the first axis * \param [in] v parameter value at which to evaluate on the second axis - * \return vec a tangent vector of the Bezier patch at (u, v) + * \return vec a tangent vector in u of the Bezier patch at (u, v) * * \note We typically find the tangent of the patch at \a u and \a v between 0 and 1 */ VectorType du(T u, T v) const { return isocurve_v(v).dt(u); } + /*! + * \brief Computes the second derivative of a Bezier patch at (\a u, \a v) along the u axis + * + * \param [in] u Parameter value at which to evaluate on the first axis + * \param [in] v Parameter value at which to evaluate on the second axis + * \return vec The vector value of S_uu(u, v) + * + * \note We typically find the tangent of the patch at \a u and \a v between 0 and 1 + */ VectorType dudu(T u, T v) const { return isocurve_v(v).dtdt(u); } /*! @@ -1392,14 +1448,32 @@ class BezierPatch * * \param [in] u parameter value at which to evaluate on the first axis * \param [in] v parameter value at which to evaluate on the second axis - * \return vec a tangent vector of the Bezier patch at (u, v) + * \return vec a tangent vector in v of the Bezier patch at (u, v) * * \note We typically find the tangent of the patch at \a u and \a v between 0 and 1 */ VectorType dv(T u, T v) const { return isocurve_u(u).dt(v); } + /*! + * \brief Computes the second derivative of a Bezier patch at (\a u, \a v) along the v axis + * + * \param [in] u Parameter value at which to evaluate on the first axis + * \param [in] v Parameter value at which to evaluate on the second axis + * \return vec The vector value of S_vv(u, v) + * + * \note We typically find the tangent of the patch at \a u and \a v between 0 and 1 + */ VectorType dvdv(T u, T v) const { return isocurve_u(u).dtdt(v); } + /*! + * \brief Computes the mixed second derivative of a Bezier patch at (\a u, \a v) + * + * \param [in] u Parameter value at which to evaluate on the first axis + * \param [in] v Parameter value at which to evaluate on the second axis + * \return vec The vector value of S_uv(u, v) == S_vu(u, v) + * + * \note We typically find the tangent of the patch at \a u and \a v between 0 and 1 + */ VectorType dudv(T u, T v) const { using axom::utilities::lerp; @@ -1551,6 +1625,15 @@ class BezierPatch } } + /*! + * \brief Computes the mixed second derivative of a Bezier patch at (\a u, \a v) + * + * \param [in] u Parameter value at which to evaluate on the first axis + * \param [in] v Parameter value at which to evaluate on the second axis + * \return vec The vector value of S_uv(u, v) == S_vu(u, v) + * + * \note We typically find the tangent of the patch at \a u and \a v between 0 and 1 + */ VectorType dvdu(T u, T v) const { return dudv(u, v); } /*! diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 4a03d84a38..97cb6b222d 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -384,6 +384,7 @@ double stokes_winding_number(const Point& query, * \param [in] quad_rule The mfem quadrature rule object * \param [in] quad_coarse The integral evaluated on the original curve * \param [in] quad_tol The maximum relative error allowed in each quadrature + * \param [in] depth The current recursive depth * * Recursively apply quadrature for one of three possible integrals along two halfs * of a curve. The sum of this integral along the subcurves should be equal to to diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index 041b90279e..d4112c6ad1 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -454,6 +454,25 @@ int winding_number(const Point& query, } #ifdef AXOM_USE_MFEM + +/* + * \brief Computes the solid angle winding number for a Bezier patch + * + * \param [in] query The query point to test + * \param [in] bPatch The Bezier patch object + * \param [in] edge_tol The physical distance level at which objects are + * considered indistinguishable + * \param [in] quad_tol The maximum relative error allowed in the quadrature + * \param [in] EPS Miscellaneous numerical tolerance level for nonphysical distances + * \param [in] depth The current recursive depth + * + * Computes the generalized winding number for a Bezier patch using Stokes theorem. + * + * \note Warning: This algorithm is only tested to high accuracy for queries within + * 1e-5 of the surface. Otherwise, it will return less accurate results. + * + * \return double The generalized winding number. + */ template double winding_number(const Point& query, const BezierPatch& bPatch, From 87df4c14e9a7ddb643ec43d8bfec9c05e5041b27 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 13 Oct 2023 16:35:03 -0700 Subject: [PATCH 140/639] Update outdated documentation. I forgot to update the sphinx doc when I changed the interface. --- src/axom/quest/docs/sphinx/isosurface_detection.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/quest/docs/sphinx/isosurface_detection.rst b/src/axom/quest/docs/sphinx/isosurface_detection.rst index 33bcbeaa92..1a7ba6c151 100644 --- a/src/axom/quest/docs/sphinx/isosurface_detection.rst +++ b/src/axom/quest/docs/sphinx/isosurface_detection.rst @@ -78,7 +78,7 @@ size constraints. Any number of domains is allowed, including zero. Blueprint convention allows for named coordinate sets and scalar fields. Here, we tell the ``MarchingCubes`` constructor that the -coordinate set name is "coordset", and the name of the nodal scalar +topology is "mesh", and the name of the nodal scalar field is "scalarFieldName". The constructor's ``quest::MarchingCubesRuntimePolicy::seq`` argument @@ -91,7 +91,7 @@ and HIP. conduit::Node blueprintMesh = blueprint_mesh_from_user(); quest::MarchingCubes mc(quest::MarchingCubesRuntimePolicy::seq, blueprintMesh, - "coordset", + "mesh", "scalarFieldName"); Run the algorithm: From c4a62ce6d3fa250a3280cd65aae1308fbb81fbd0 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 17 Oct 2023 10:29:55 -0700 Subject: [PATCH 141/639] Add missing sphinx extension --- scripts/spack/packages/axomdevtools/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/spack/packages/axomdevtools/package.py b/scripts/spack/packages/axomdevtools/package.py index b80f815775..e1e1042156 100644 --- a/scripts/spack/packages/axomdevtools/package.py +++ b/scripts/spack/packages/axomdevtools/package.py @@ -18,4 +18,5 @@ class Axomdevtools(BundlePackage): depends_on("graphviz") depends_on("py-sphinx") depends_on("py-shroud") + depends_on("py-sphinxcontrib-jquery") depends_on("llvm+clang@10.0.0") From e2f708928913fbffef60368b2232e4f8cf3c3918 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 17 Oct 2023 14:03:54 -0700 Subject: [PATCH 142/639] Update rzansel configs with jquery dependency --- ...lueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake | 24 +++++++++---------- ..._3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake | 20 ++++++++-------- ...l-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake | 20 ++++++++-------- ...eos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake | 20 ++++++++-------- ...l-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake | 20 ++++++++-------- ...eos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake | 20 ++++++++-------- .../configs/blueos_3_ppc64le_ib_p9/spack.yaml | 6 ++--- 7 files changed, 65 insertions(+), 65 deletions(-) diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake index 4ba0042877..a052c969be 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1/umpire-2023.06.0-x4j2bn55oz5hlsbgawepoej3kc3s3ama;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1/raja-2023.06.0-r2xeiifolea4xkrfluvkeehaynhvaipr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1/camp-2023.06.0-55emwjpfri4sr52rqvnfb5fiqitgkyml;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1/mfem-4.5.2-dbebdqverfh4lwgj5nal5d2vgmmvl4xb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1/hypre-2.24.0-vrxf2vyvdlmylt5u2cu3vy4dqdc76yvq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1/lua-5.4.4-o6kjgr3nt6ssvrj3mmonawxj3sbbcnel;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1/conduit-0.8.8-yguteoqfyvdqs5qgcsxlvykqbn3jy6fl;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1/parmetis-4.0.3-aivfy5rovu5bwsiryry63apan5cdtc4m;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1/metis-5.1.0-k7t53hncr4qxzqoyzhekte5rqrorclyh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1/hdf5-1.8.22-ydeu5u4foixvz5oczqac5otuky4jq7en;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1/zlib-1.2.13-aple3eiihvtvpurrdvosba4qab7rgdnr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1/c2c-1.8.0-alkiietbi3stbihkzci37tecdzdyxpwh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1/blt-0.5.3-e5rbowq4pvwwuchttguahzyjcpa5zvgr;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/umpire-2023.06.0-h6wvcftrmg6w5e7etumawlsf5trgvsl7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/raja-2023.06.0-jra4z7ctml3mpzsuixtbegawg7g75cec;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/camp-2023.06.0-abpqpyhwsuhzu4csmdy2nejqzrkfqh7a;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/mfem-4.5.2-dbebdqverfh4lwgj5nal5d2vgmmvl4xb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/hypre-2.24.0-vrxf2vyvdlmylt5u2cu3vy4dqdc76yvq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/lua-5.4.4-o6kjgr3nt6ssvrj3mmonawxj3sbbcnel;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/conduit-0.8.8-6vxxfa5atbct57263kwixtpa5jz54kew;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/parmetis-4.0.3-aivfy5rovu5bwsiryry63apan5cdtc4m;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/metis-5.1.0-k7t53hncr4qxzqoyzhekte5rqrorclyh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/hdf5-1.8.22-x626yhzvwnx7ssrmgl3lnvncx7s5nbkf;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/zlib-1.2.13-aple3eiihvtvpurrdvosba4qab7rgdnr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/c2c-1.8.0-alkiietbi3stbihkzci37tecdzdyxpwh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/blt-0.5.3-e5rbowq4pvwwuchttguahzyjcpa5zvgr;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -79,23 +79,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-yguteoqfyvdqs5qgcsxlvykqbn3jy6fl" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-6vxxfa5atbct57263kwixtpa5jz54kew" CACHE PATH "") set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-alkiietbi3stbihkzci37tecdzdyxpwh" CACHE PATH "") set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-dbebdqverfh4lwgj5nal5d2vgmmvl4xb" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-ydeu5u4foixvz5oczqac5otuky4jq7en" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-x626yhzvwnx7ssrmgl3lnvncx7s5nbkf" CACHE PATH "") set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-o6kjgr3nt6ssvrj3mmonawxj3sbbcnel" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-r2xeiifolea4xkrfluvkeehaynhvaipr" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-jra4z7ctml3mpzsuixtbegawg7g75cec" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-x4j2bn55oz5hlsbgawepoej3kc3s3ama" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-h6wvcftrmg6w5e7etumawlsf5trgvsl7" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-55emwjpfri4sr52rqvnfb5fiqitgkyml" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-abpqpyhwsuhzu4csmdy2nejqzrkfqh7a" CACHE PATH "") # scr not built @@ -103,7 +103,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-55emwjpfri4sr52rqvnfb5fiqitgkyml" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_04_18_13_41_48/._view/srxt35kojgk77f2222mk6mgv7z5jyyzz" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_10_17_10_41_04/._view/5gug4et2qymmckk7yvtub4qcapp3figm" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") @@ -117,6 +117,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake index 1bb2d87f8e..8066a97eda 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/umpire-2023.06.0-pfofk6xf3eat7ptoitibuzmnycnwrlfb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/raja-2023.06.0-26jb32x7kl6lvfhvwvzv6seoiyjd2fe4;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/camp-2023.06.0-mbobtec63kl2etao43ylvvln3ivokfzn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/cub-2.1.0-p5pq3qyp3tthknvf4evygd4yaoay32tu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/mfem-4.5.2-5aoi62ejerozb42y5awjlgucluokakho;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/hypre-2.24.0-cfxkqrgvzhhkau6afaoohfe3zvmxhr7l;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/lua-5.4.4-27btgrl45gsrfpectq4nqwg3uep2lbcn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/conduit-0.8.8-k25pxkfamv77gz7cplvupfseutwule7o;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/parmetis-4.0.3-ae4f6v6uuhhbv776uy73zl4zqoralhbc;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/metis-5.1.0-ttpdauwjjvuesdbpa2pzh2inam3xgg7u;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/hdf5-1.8.22-ix4txea5c6dbzixdj3ef6dstpnlt6xvb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/zlib-1.2.13-ywvuuomigfzzbq4fxcgkdrnvnnwkj7zt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/c2c-1.8.0-icsf7aewc7ocohld45ibjxvygujkq3zd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2/blt-0.5.3-pytnag7yitffjizxs6mtsgj6amwvpd4v;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.8.14;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/umpire-2023.06.0-mgplvx55qtfnxdwb4cicp2bpu4z2koxq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/raja-2023.06.0-itml4o7c6upowd3s2uvk5wj23cywocev;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/camp-2023.06.0-s2bfmphdqig3ci4pdvkfvygprydcppyl;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/cub-2.1.0-p5pq3qyp3tthknvf4evygd4yaoay32tu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/mfem-4.5.2-5aoi62ejerozb42y5awjlgucluokakho;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/hypre-2.24.0-cfxkqrgvzhhkau6afaoohfe3zvmxhr7l;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/lua-5.4.4-27btgrl45gsrfpectq4nqwg3uep2lbcn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/conduit-0.8.8-k25pxkfamv77gz7cplvupfseutwule7o;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/parmetis-4.0.3-ae4f6v6uuhhbv776uy73zl4zqoralhbc;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/metis-5.1.0-ttpdauwjjvuesdbpa2pzh2inam3xgg7u;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/hdf5-1.8.22-ix4txea5c6dbzixdj3ef6dstpnlt6xvb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/zlib-1.2.13-ywvuuomigfzzbq4fxcgkdrnvnnwkj7zt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/c2c-1.8.0-icsf7aewc7ocohld45ibjxvygujkq3zd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/blt-0.5.3-pytnag7yitffjizxs6mtsgj6amwvpd4v;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -107,7 +107,7 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/clang-10.0.1.2" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-k25pxkfamv77gz7cplvupfseutwule7o" CACHE PATH "") @@ -119,11 +119,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-ix4txea5c6dbzixdj3ef6dstpnlt6xvb" CACHE PA set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-27btgrl45gsrfpectq4nqwg3uep2lbcn" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-26jb32x7kl6lvfhvwvzv6seoiyjd2fe4" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-itml4o7c6upowd3s2uvk5wj23cywocev" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-pfofk6xf3eat7ptoitibuzmnycnwrlfb" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-mgplvx55qtfnxdwb4cicp2bpu4z2koxq" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-mbobtec63kl2etao43ylvvln3ivokfzn" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-s2bfmphdqig3ci4pdvkfvygprydcppyl" CACHE PATH "") # scr not built @@ -131,7 +131,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-mbobtec63kl2etao43ylvvln3ivokfzn" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_04_18_13_41_48/._view/srxt35kojgk77f2222mk6mgv7z5jyyzz" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_10_17_10_41_04/._view/5gug4et2qymmckk7yvtub4qcapp3figm" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") @@ -145,6 +145,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake index afc2eb18c5..54e1d3cbf5 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.1/umpire-2023.06.0-bftoz5wfuvfwldjwe3szsi54hdpw2hfi;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.1/raja-2023.06.0-tv34emklwgpl4ddrggbpkthu6utweo2a;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.1/camp-2023.06.0-vuk2xmgpzxl2xb2jupm3uxqxbgrzrmbf;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.1/lua-5.4.4-e7cdhkbaxuyqljoyozzxrt2n57erhszx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.1/conduit-0.8.8-3li2jcc2mecqbanoew5tznr4uzl2k2jg;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.1/parmetis-4.0.3-c2ub4mddqt7faykccls5eae7xogpi32w;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.1/metis-5.1.0-t6qk2khpceidsormndy6gj56qbnehxai;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.1/hdf5-1.8.22-nydokvym7klek6hqoyijbwf3tbmd32ux;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.1/zlib-1.2.13-zd2x25bmmjwxhw7siucfywjgk7oc262j;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.1/c2c-1.8.0-zgwmbota3vhdxcdjlwxbhomlwllwhvnc;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.1/blt-0.5.3-zghdcshuqlqnbrezcylwnefie7pkvsab;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/umpire-2023.06.0-g7qmb2qhubkm3azuvfmqs76otesjurcs;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/raja-2023.06.0-tvlbnpgx2hbiu3bjvx44ozxhvusclguk;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/camp-2023.06.0-civqzez47ip24ln7c5q6gofaniemdr54;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/lua-5.4.4-e7cdhkbaxuyqljoyozzxrt2n57erhszx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/conduit-0.8.8-3li2jcc2mecqbanoew5tznr4uzl2k2jg;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/parmetis-4.0.3-c2ub4mddqt7faykccls5eae7xogpi32w;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/metis-5.1.0-t6qk2khpceidsormndy6gj56qbnehxai;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/hdf5-1.8.22-nydokvym7klek6hqoyijbwf3tbmd32ux;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/zlib-1.2.13-zd2x25bmmjwxhw7siucfywjgk7oc262j;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/c2c-1.8.0-zgwmbota3vhdxcdjlwxbhomlwllwhvnc;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/blt-0.5.3-zghdcshuqlqnbrezcylwnefie7pkvsab;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -71,7 +71,7 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-3li2jcc2mecqbanoew5tznr4uzl2k2jg" CACHE PATH "") @@ -83,11 +83,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-nydokvym7klek6hqoyijbwf3tbmd32ux" CACHE PA set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-e7cdhkbaxuyqljoyozzxrt2n57erhszx" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-tv34emklwgpl4ddrggbpkthu6utweo2a" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-tvlbnpgx2hbiu3bjvx44ozxhvusclguk" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-bftoz5wfuvfwldjwe3szsi54hdpw2hfi" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-g7qmb2qhubkm3azuvfmqs76otesjurcs" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-vuk2xmgpzxl2xb2jupm3uxqxbgrzrmbf" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-civqzez47ip24ln7c5q6gofaniemdr54" CACHE PATH "") # scr not built @@ -95,7 +95,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-vuk2xmgpzxl2xb2jupm3uxqxbgrzrmbf" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_04_18_13_41_48/._view/srxt35kojgk77f2222mk6mgv7z5jyyzz" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_10_17_10_41_04/._view/5gug4et2qymmckk7yvtub4qcapp3figm" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") @@ -109,6 +109,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake index c086aae93b..c28aa612f3 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.2/umpire-2023.06.0-mhaqbzgmrizieszsedhkq5j6zr56mtue;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.2/raja-2023.06.0-5ao6zh3anztpvifl7pi3lx6dalgabreh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.2/camp-2023.06.0-5yw6pcjgrzzupk3ptfneaygwjewo7sx6;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.2/cub-2.1.0-zpxcavwsek3eamis6c2ekyd4wpc2aff7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.2/lua-5.4.4-uzsm5gerahtqcinqqfwleer62mlgl6xt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.2/conduit-0.8.8-pslusbff27xjqw5sct3jnddyeqlyide3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.2/parmetis-4.0.3-bcniwrmmygfl3ngqqy4ogyuopuilgfy2;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.2/metis-5.1.0-tht2h2hqk4psrvunj7egarksgyayew3d;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.2/hdf5-1.8.22-h2labsbvwxgxwvphjb5i357an3dgjhqp;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.2/zlib-1.2.13-obyznlavcvoyytpvwwyi65s5ngcnpigv;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.2/c2c-1.8.0-snpbqgmnulnruetig5di7nef2gir354f;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.2/blt-0.5.3-umf5hhz3yl7vspds2fejsjdbmy2npyqb;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.8.14;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/umpire-2023.06.0-rgprey5lhrxtjnaqmm56x5t4zfwv7n2f;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/raja-2023.06.0-aszr6mr5prbpfd3qqcb7ukntna6a3rfb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/camp-2023.06.0-54bzgyk2if7ilhc2saaia3flihlvkqhu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/cub-2.1.0-zpxcavwsek3eamis6c2ekyd4wpc2aff7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/lua-5.4.4-uzsm5gerahtqcinqqfwleer62mlgl6xt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/conduit-0.8.8-pslusbff27xjqw5sct3jnddyeqlyide3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/parmetis-4.0.3-bcniwrmmygfl3ngqqy4ogyuopuilgfy2;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/metis-5.1.0-tht2h2hqk4psrvunj7egarksgyayew3d;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/hdf5-1.8.22-h2labsbvwxgxwvphjb5i357an3dgjhqp;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/zlib-1.2.13-obyznlavcvoyytpvwwyi65s5ngcnpigv;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/c2c-1.8.0-snpbqgmnulnruetig5di7nef2gir354f;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/blt-0.5.3-umf5hhz3yl7vspds2fejsjdbmy2npyqb;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -99,7 +99,7 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/gcc-8.3.1.2" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-pslusbff27xjqw5sct3jnddyeqlyide3" CACHE PATH "") @@ -111,11 +111,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-h2labsbvwxgxwvphjb5i357an3dgjhqp" CACHE PA set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-uzsm5gerahtqcinqqfwleer62mlgl6xt" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-5ao6zh3anztpvifl7pi3lx6dalgabreh" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-aszr6mr5prbpfd3qqcb7ukntna6a3rfb" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-mhaqbzgmrizieszsedhkq5j6zr56mtue" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-rgprey5lhrxtjnaqmm56x5t4zfwv7n2f" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-5yw6pcjgrzzupk3ptfneaygwjewo7sx6" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-54bzgyk2if7ilhc2saaia3flihlvkqhu" CACHE PATH "") # scr not built @@ -123,7 +123,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-5yw6pcjgrzzupk3ptfneaygwjewo7sx6" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_04_18_13_41_48/._view/srxt35kojgk77f2222mk6mgv7z5jyyzz" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_10_17_10_41_04/._view/5gug4et2qymmckk7yvtub4qcapp3figm" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") @@ -137,6 +137,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake index 14069119a2..56f561a0af 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1/umpire-2023.06.0-gfmhpqkxawfjbwtufn3qeg6gkzmlahr7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1/raja-2023.06.0-pkp4pk4dybnbq74652a2ayzf6zvzonsy;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1/camp-2023.06.0-ilclfpsbzrbirjnwqimbnwoanvxwcvwd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1/mfem-4.5.2-5tpknd5eztbbomidbr3qcs75hyvdqegw;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1/hypre-2.24.0-kgmrxqyc3pjlwgzvgbchceub5u4v4tgt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1/lua-5.4.4-22nibaxxfzwid5jk3udivaptba2xtw4r;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1/conduit-0.8.8-tnyxf6f7sh7kg3pzvt5acfp4btsprsp7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1/parmetis-4.0.3-zsfvlzuxwixta5mjt4dqwikslhx6l6dd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1/metis-5.1.0-hpfbnba3mgk2opmqn3efr2mmda76yacg;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1/hdf5-1.8.22-eduvgrxspycy6xfw2t6i6uogdtzgnygm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1/zlib-1.2.13-tnpzx5nxltbrlx27lozjehkg2lkb7lew;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1/c2c-1.8.0-vxyvicuyswybrekljpj7khd56uobpc62;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1/blt-0.5.3-zleps37vlw57krmv2zruxq6bpxpn6fik;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/umpire-2023.06.0-cmose4tqzlwsrjjhoklstt6ga3yym6ni;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/raja-2023.06.0-uqr6nybua6ic5xjwqd75hqtngiz6wjwb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/camp-2023.06.0-3k5jzo2qageywkgo7i65ybqksjqbu67j;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/mfem-4.5.2-5tpknd5eztbbomidbr3qcs75hyvdqegw;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/hypre-2.24.0-kgmrxqyc3pjlwgzvgbchceub5u4v4tgt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/lua-5.4.4-22nibaxxfzwid5jk3udivaptba2xtw4r;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/conduit-0.8.8-tnyxf6f7sh7kg3pzvt5acfp4btsprsp7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/parmetis-4.0.3-zsfvlzuxwixta5mjt4dqwikslhx6l6dd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/metis-5.1.0-hpfbnba3mgk2opmqn3efr2mmda76yacg;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/hdf5-1.8.22-eduvgrxspycy6xfw2t6i6uogdtzgnygm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/zlib-1.2.13-tnpzx5nxltbrlx27lozjehkg2lkb7lew;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/c2c-1.8.0-vxyvicuyswybrekljpj7khd56uobpc62;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/blt-0.5.3-zleps37vlw57krmv2zruxq6bpxpn6fik;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/xl/xlc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/xl/xlc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/xl/xlc++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/xl/xlc++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/xl/xlf90" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/xl/xlf90" CACHE PATH "") else() @@ -83,7 +83,7 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-tnyxf6f7sh7kg3pzvt5acfp4btsprsp7" CACHE PATH "") @@ -95,11 +95,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-eduvgrxspycy6xfw2t6i6uogdtzgnygm" CACHE PA set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-22nibaxxfzwid5jk3udivaptba2xtw4r" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-pkp4pk4dybnbq74652a2ayzf6zvzonsy" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-uqr6nybua6ic5xjwqd75hqtngiz6wjwb" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-gfmhpqkxawfjbwtufn3qeg6gkzmlahr7" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-cmose4tqzlwsrjjhoklstt6ga3yym6ni" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-ilclfpsbzrbirjnwqimbnwoanvxwcvwd" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-3k5jzo2qageywkgo7i65ybqksjqbu67j" CACHE PATH "") # scr not built @@ -107,7 +107,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-ilclfpsbzrbirjnwqimbnwoanvxwcvwd" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_04_18_13_41_48/._view/srxt35kojgk77f2222mk6mgv7z5jyyzz" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_10_17_10_41_04/._view/5gug4et2qymmckk7yvtub4qcapp3figm" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") @@ -121,6 +121,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake index d96438a2ce..90f4231d4a 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/umpire-2023.06.0-3rafuldohvpy7vxbdjpv3khllaqhgwp5;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/raja-2023.06.0-rzllz6mlecs2kg7dtqwqtl7wvw34ul2q;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/camp-2023.06.0-zpwybznbb32yltcpzmiplykwdlqe2afw;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/cub-2.1.0-45sgqog6spfots46rohzcokfoaxjil4p;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/mfem-4.5.2-264o4xkxhcafenixttd6lw5k466a62b3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/hypre-2.24.0-x2zforves4hmpcuwjskxbvxu55i5kpfx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/lua-5.4.4-6yyyruucztcz5p4w33mhydqn5kiywkjn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/conduit-0.8.8-pil6joltz2jsp4vcdsfgndntfkqoi3na;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/parmetis-4.0.3-ogq2nkkjvarhjgaweb6b5lglfcmes3hm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/metis-5.1.0-7ojc3lx2y6dk2g7gvl6m5n4fq5yewukb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/hdf5-1.8.22-y23h3hgemr7s6terq2mvsz5if5u327sr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/zlib-1.2.13-nd6r3ccnozxmd7jdwyxbgvqg5y2bn3ds;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/c2c-1.8.0-ckwviu4jwtot52xykd3kuryozuw5o35p;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2/blt-0.5.3-47zfyusaljp2e7x3lsq3iggqvapxox6t;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.8.14;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.2.0;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/umpire-2023.06.0-5pojmv2de7q5pimrh253hwamycx7jfl7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/raja-2023.06.0-7et5l25lkvvjz2r772uabj7hrstg3y2z;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/camp-2023.06.0-q4hulo6jzt2wnuzzj5jjmlvkdtu4ckdj;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/cub-2.1.0-45sgqog6spfots46rohzcokfoaxjil4p;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/mfem-4.5.2-264o4xkxhcafenixttd6lw5k466a62b3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/hypre-2.24.0-x2zforves4hmpcuwjskxbvxu55i5kpfx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/lua-5.4.4-6yyyruucztcz5p4w33mhydqn5kiywkjn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/conduit-0.8.8-pil6joltz2jsp4vcdsfgndntfkqoi3na;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/parmetis-4.0.3-ogq2nkkjvarhjgaweb6b5lglfcmes3hm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/metis-5.1.0-7ojc3lx2y6dk2g7gvl6m5n4fq5yewukb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/hdf5-1.8.22-y23h3hgemr7s6terq2mvsz5if5u327sr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/zlib-1.2.13-nd6r3ccnozxmd7jdwyxbgvqg5y2bn3ds;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/c2c-1.8.0-ckwviu4jwtot52xykd3kuryozuw5o35p;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/blt-0.5.3-47zfyusaljp2e7x3lsq3iggqvapxox6t;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.2.0;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/xl/xlc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/xl/xlc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/xl/xlc++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/xl/xlc++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/spack/lib/spack/env/xl/xlf90" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/xl/xlf90" CACHE PATH "") else() @@ -111,7 +111,7 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_18_11_07/xl-16.1.1.2" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-pil6joltz2jsp4vcdsfgndntfkqoi3na" CACHE PATH "") @@ -123,11 +123,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-y23h3hgemr7s6terq2mvsz5if5u327sr" CACHE PA set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-6yyyruucztcz5p4w33mhydqn5kiywkjn" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-rzllz6mlecs2kg7dtqwqtl7wvw34ul2q" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-7et5l25lkvvjz2r772uabj7hrstg3y2z" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-3rafuldohvpy7vxbdjpv3khllaqhgwp5" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-5pojmv2de7q5pimrh253hwamycx7jfl7" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-zpwybznbb32yltcpzmiplykwdlqe2afw" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-q4hulo6jzt2wnuzzj5jjmlvkdtu4ckdj" CACHE PATH "") # scr not built @@ -135,7 +135,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-zpwybznbb32yltcpzmiplykwdlqe2afw" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_04_18_13_41_48/._view/srxt35kojgk77f2222mk6mgv7z5jyyzz" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_10_17_10_41_04/._view/5gug4et2qymmckk7yvtub4qcapp3figm" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") @@ -149,6 +149,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml index 226af97b89..b048866918 100644 --- a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -323,11 +323,11 @@ spack: - spec: cppcheck@2.9 prefix: /collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9 doxygen: - version: [1.8.14] + version: [1.9.6] buildable: false externals: - - spec: doxygen@1.8.14 - prefix: /collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.8.14 + - spec: doxygen@1.9.6 + prefix: /collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6 graphviz: version: [7.1.0] buildable: false From 5a96c23a35771e781c77aa0b7aa41213cd321018 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 18 Oct 2023 09:08:03 -0700 Subject: [PATCH 143/639] Update doxygen version for toss_4_x86_64_ib --- scripts/spack/configs/toss_4_x86_64_ib/spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml index 4918ee815b..87feb05b89 100644 --- a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml @@ -298,11 +298,11 @@ spack: - spec: cppcheck@2.9 prefix: /collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9 doxygen: - version: [1.8.14] + version: [1.9.6] buildable: false externals: - - spec: doxygen@1.8.14 - prefix: /collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.8.14 + - spec: doxygen@1.9.6 + prefix: /collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6 # TODO: make installed clang 14.0.6 work llvm: version: [10.0.0] From e38af97e44d496ff67f79c2703b567e92becd670 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 18 Oct 2023 09:08:16 -0700 Subject: [PATCH 144/639] Update host-configs for rzwhippet --- ...hippet-toss_4_x86_64_ib-clang@14.0.6.cmake | 24 +++++++++---------- ...zwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake | 24 +++++++++---------- ...ppet-toss_4_x86_64_ib-intel@2022.1.0.cmake | 14 +++++------ 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/host-configs/rzwhippet-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/rzwhippet-toss_4_x86_64_ib-clang@14.0.6.cmake index 8020c21cb5..eca36f01f5 100644 --- a/host-configs/rzwhippet-toss_4_x86_64_ib-clang@14.0.6.cmake +++ b/host-configs/rzwhippet-toss_4_x86_64_ib-clang@14.0.6.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/clang-14.0.6/umpire-2022.10.0-uodpwwx6coxrf3isbzabbolovpq7umem;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/clang-14.0.6/raja-2022.10.5-b77ownnc7eiwf34g76faw47gcxzrp6p2;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/clang-14.0.6/camp-2022.10.1-vgacotbv33odgskjpihdzflygusbjcp2;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/clang-14.0.6/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/clang-14.0.6/hypre-2.24.0-bwh42bebp4hiuwzlwcthpgkawape6dp3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/clang-14.0.6/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/clang-14.0.6/parmetis-4.0.3-jthqwflsj5bpe6onwsb5r2zi5wbx6pq4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/clang-14.0.6/metis-5.1.0-imzig3eih3itpztvvk4yildzgq6aeelo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/clang-14.0.6/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/clang-14.0.6/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/clang-14.0.6/gmake-4.4.1-6lgy76r7dbvqm6mbwb2jkpcuycf7tb27;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/clang-14.0.6/blt-0.5.3-xa3bmu75nkolqiewb5ftk5tp2jpzw57n;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/hypre-2.24.0-bwh42bebp4hiuwzlwcthpgkawape6dp3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/parmetis-4.0.3-jthqwflsj5bpe6onwsb5r2zi5wbx6pq4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/metis-5.1.0-imzig3eih3itpztvvk4yildzgq6aeelo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/gmake-4.4.1-6lgy76r7dbvqm6mbwb2jkpcuycf7tb27;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/blt-0.5.3-xa3bmu75nkolqiewb5ftk5tp2jpzw57n;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -47,12 +47,12 @@ set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6/bin set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6/bin/mpif90" CACHE PATH "") -set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") - set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") set(ENABLE_MPI ON CACHE BOOL "") +set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") + #------------------------------------------------------------------------------ # Hardware #------------------------------------------------------------------------------ @@ -69,7 +69,7 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/clang-14.0.6" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy" CACHE PATH "") @@ -81,11 +81,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl" CACHE PA set(LUA_DIR "/usr" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2022.10.5-b77ownnc7eiwf34g76faw47gcxzrp6p2" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2022.10.0-uodpwwx6coxrf3isbzabbolovpq7umem" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2022.10.1-vgacotbv33odgskjpihdzflygusbjcp2" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he" CACHE PATH "") # scr not built @@ -93,7 +93,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2022.10.1-vgacotbv33odgskjpihdzflygusbjcp2" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_05_18_11_52_05/._view/btoxy5ovdbouub2brzxcmjwzdhvzatlc" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_10_17_16_15_32/._view/ypfidjpdm7fhkqcpekza67w5xgiaw7yg" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0/bin/clang-format" CACHE PATH "") @@ -107,6 +107,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/rzwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake b/host-configs/rzwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake index dc41f1ea22..cece8ea159 100644 --- a/host-configs/rzwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake +++ b/host-configs/rzwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/gcc-10.3.1/umpire-2022.10.0-qnxnt3o54jhszr4d4qjliewtek4w5dqf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/gcc-10.3.1/raja-2022.10.5-emvpcryyxpdsitaoke4uksoqup5sfxjr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/gcc-10.3.1/camp-2022.10.1-ecm3kxkv7wdg4mttgiwmhhanwbjyxq3l;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/gcc-10.3.1/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/gcc-10.3.1/hypre-2.24.0-lof7hdy7wsyuei436d6uhilprsgmr3ik;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/gcc-10.3.1/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/gcc-10.3.1/parmetis-4.0.3-lq6aryhur6qn3trc2qxizvz4nae5ngzf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/gcc-10.3.1/metis-5.1.0-pyrzcrzqvl6q27kk637o2nwi3j7ibseb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/gcc-10.3.1/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/gcc-10.3.1/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/gcc-10.3.1/gmake-4.4.1-y2kaxrqjbg3dcwo7dzfphztusfjqoowq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/gcc-10.3.1/blt-0.5.3-iljv7wrfi4r5i4drs4yf65rgsuunaxjn;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/hypre-2.24.0-lof7hdy7wsyuei436d6uhilprsgmr3ik;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/parmetis-4.0.3-lq6aryhur6qn3trc2qxizvz4nae5ngzf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/metis-5.1.0-pyrzcrzqvl6q27kk637o2nwi3j7ibseb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/gmake-4.4.1-y2kaxrqjbg3dcwo7dzfphztusfjqoowq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/blt-0.5.3-iljv7wrfi4r5i4drs4yf65rgsuunaxjn;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -45,12 +45,12 @@ set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1/bin/m set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1/bin/mpif90" CACHE PATH "") -set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") - set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") set(ENABLE_MPI ON CACHE BOOL "") +set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") + #------------------------------------------------------------------------------ # Hardware #------------------------------------------------------------------------------ @@ -67,7 +67,7 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_13_22_05_10/gcc-10.3.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu" CACHE PATH "") @@ -79,11 +79,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv" CACHE PA set(LUA_DIR "/usr" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2022.10.5-emvpcryyxpdsitaoke4uksoqup5sfxjr" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2022.10.0-qnxnt3o54jhszr4d4qjliewtek4w5dqf" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2022.10.1-ecm3kxkv7wdg4mttgiwmhhanwbjyxq3l" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp" CACHE PATH "") # scr not built @@ -91,7 +91,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2022.10.1-ecm3kxkv7wdg4mttgiwmhhanwbjyxq3l" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_05_18_11_52_05/._view/btoxy5ovdbouub2brzxcmjwzdhvzatlc" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_10_17_16_15_32/._view/ypfidjpdm7fhkqcpekza67w5xgiaw7yg" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0/bin/clang-format" CACHE PATH "") @@ -105,6 +105,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake index 3f04656c16..d88ec5b52e 100644 --- a/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake +++ b/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/hypre-2.24.0-qdjyl5ibcpl4nxb6t5godfgvi5bb6hac;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/parmetis-4.0.3-nqxoj5gqogj32hfo5ognkcb6vg24zdlc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/metis-5.1.0-tb5bijmooj2d6d2npjpajcj4fyu4yd4y;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/gmake-4.4.1-e3r4ry6vgi7zp4mbwfokypkutqwpctek;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0/blt-0.5.3-i7qltms7ksyz4xltznzbtsafywrykq7b;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/usr/tce" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/hypre-2.24.0-qdjyl5ibcpl4nxb6t5godfgvi5bb6hac;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/parmetis-4.0.3-nqxoj5gqogj32hfo5ognkcb6vg24zdlc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/metis-5.1.0-tb5bijmooj2d6d2npjpajcj4fyu4yd4y;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/gmake-4.4.1-e3r4ry6vgi7zp4mbwfokypkutqwpctek;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/blt-0.5.3-i7qltms7ksyz4xltznzbtsafywrykq7b;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/usr/tce" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/spack/lib/spack/env/intel/icc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/intel/icc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/spack/lib/spack/env/intel/icpc" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/intel/icpc" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/spack/lib/spack/env/intel/ifort" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/intel/ifort" CACHE PATH "") else() @@ -67,7 +67,7 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_08_30_10_09_12/intel-2022.1.0" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i" CACHE PATH "") @@ -91,7 +91,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_05_18_11_52_05/._view/btoxy5ovdbouub2brzxcmjwzdhvzatlc" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_10_17_16_15_32/._view/ypfidjpdm7fhkqcpekza67w5xgiaw7yg" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0/bin/clang-format" CACHE PATH "") @@ -105,6 +105,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") From 2062dbdb9a01b325d5efdf5ad0e6d1d3340c763d Mon Sep 17 00:00:00 2001 From: Brian Han Date: Wed, 18 Oct 2023 16:43:29 -0700 Subject: [PATCH 145/639] Update host-configs for lassen --- ...lueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake | 24 +++++++++---------- ..._3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake | 20 ++++++++-------- ...n-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake | 20 ++++++++-------- ...eos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake | 20 ++++++++-------- ...n-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake | 20 ++++++++-------- ...eos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake | 20 ++++++++-------- 6 files changed, 62 insertions(+), 62 deletions(-) diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake index 8472ab379d..76e222b901 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1/umpire-2023.06.0-x4j2bn55oz5hlsbgawepoej3kc3s3ama;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1/raja-2023.06.0-r2xeiifolea4xkrfluvkeehaynhvaipr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1/camp-2023.06.0-55emwjpfri4sr52rqvnfb5fiqitgkyml;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1/mfem-4.5.2-dbebdqverfh4lwgj5nal5d2vgmmvl4xb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1/hypre-2.24.0-vrxf2vyvdlmylt5u2cu3vy4dqdc76yvq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1/lua-5.4.4-o6kjgr3nt6ssvrj3mmonawxj3sbbcnel;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1/conduit-0.8.8-yguteoqfyvdqs5qgcsxlvykqbn3jy6fl;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1/parmetis-4.0.3-aivfy5rovu5bwsiryry63apan5cdtc4m;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1/metis-5.1.0-k7t53hncr4qxzqoyzhekte5rqrorclyh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1/hdf5-1.8.22-ydeu5u4foixvz5oczqac5otuky4jq7en;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1/zlib-1.2.13-aple3eiihvtvpurrdvosba4qab7rgdnr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1/c2c-1.8.0-alkiietbi3stbihkzci37tecdzdyxpwh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1/blt-0.5.3-e5rbowq4pvwwuchttguahzyjcpa5zvgr;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/umpire-2023.06.0-h6wvcftrmg6w5e7etumawlsf5trgvsl7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/raja-2023.06.0-jra4z7ctml3mpzsuixtbegawg7g75cec;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/camp-2023.06.0-abpqpyhwsuhzu4csmdy2nejqzrkfqh7a;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/mfem-4.5.2-dbebdqverfh4lwgj5nal5d2vgmmvl4xb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/hypre-2.24.0-vrxf2vyvdlmylt5u2cu3vy4dqdc76yvq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/lua-5.4.4-o6kjgr3nt6ssvrj3mmonawxj3sbbcnel;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/conduit-0.8.8-6vxxfa5atbct57263kwixtpa5jz54kew;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/parmetis-4.0.3-aivfy5rovu5bwsiryry63apan5cdtc4m;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/metis-5.1.0-k7t53hncr4qxzqoyzhekte5rqrorclyh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/hdf5-1.8.22-x626yhzvwnx7ssrmgl3lnvncx7s5nbkf;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/zlib-1.2.13-aple3eiihvtvpurrdvosba4qab7rgdnr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/c2c-1.8.0-alkiietbi3stbihkzci37tecdzdyxpwh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/blt-0.5.3-e5rbowq4pvwwuchttguahzyjcpa5zvgr;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -79,23 +79,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-yguteoqfyvdqs5qgcsxlvykqbn3jy6fl" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-6vxxfa5atbct57263kwixtpa5jz54kew" CACHE PATH "") set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-alkiietbi3stbihkzci37tecdzdyxpwh" CACHE PATH "") set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-dbebdqverfh4lwgj5nal5d2vgmmvl4xb" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-ydeu5u4foixvz5oczqac5otuky4jq7en" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-x626yhzvwnx7ssrmgl3lnvncx7s5nbkf" CACHE PATH "") set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-o6kjgr3nt6ssvrj3mmonawxj3sbbcnel" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-r2xeiifolea4xkrfluvkeehaynhvaipr" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-jra4z7ctml3mpzsuixtbegawg7g75cec" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-x4j2bn55oz5hlsbgawepoej3kc3s3ama" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-h6wvcftrmg6w5e7etumawlsf5trgvsl7" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-55emwjpfri4sr52rqvnfb5fiqitgkyml" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-abpqpyhwsuhzu4csmdy2nejqzrkfqh7a" CACHE PATH "") # scr not built @@ -103,7 +103,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-55emwjpfri4sr52rqvnfb5fiqitgkyml" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_04_18_13_41_48/._view/srxt35kojgk77f2222mk6mgv7z5jyyzz" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_10_17_10_41_04/._view/5gug4et2qymmckk7yvtub4qcapp3figm" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") @@ -117,6 +117,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake index 57ca460d66..e8884a9003 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/umpire-2023.06.0-pfofk6xf3eat7ptoitibuzmnycnwrlfb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/raja-2023.06.0-26jb32x7kl6lvfhvwvzv6seoiyjd2fe4;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/camp-2023.06.0-mbobtec63kl2etao43ylvvln3ivokfzn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/cub-2.1.0-p5pq3qyp3tthknvf4evygd4yaoay32tu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/mfem-4.5.2-5aoi62ejerozb42y5awjlgucluokakho;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/hypre-2.24.0-cfxkqrgvzhhkau6afaoohfe3zvmxhr7l;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/lua-5.4.4-27btgrl45gsrfpectq4nqwg3uep2lbcn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/conduit-0.8.8-k25pxkfamv77gz7cplvupfseutwule7o;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/parmetis-4.0.3-ae4f6v6uuhhbv776uy73zl4zqoralhbc;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/metis-5.1.0-ttpdauwjjvuesdbpa2pzh2inam3xgg7u;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/hdf5-1.8.22-ix4txea5c6dbzixdj3ef6dstpnlt6xvb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/zlib-1.2.13-ywvuuomigfzzbq4fxcgkdrnvnnwkj7zt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/c2c-1.8.0-icsf7aewc7ocohld45ibjxvygujkq3zd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2/blt-0.5.3-pytnag7yitffjizxs6mtsgj6amwvpd4v;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.8.14;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/umpire-2023.06.0-mgplvx55qtfnxdwb4cicp2bpu4z2koxq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/raja-2023.06.0-itml4o7c6upowd3s2uvk5wj23cywocev;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/camp-2023.06.0-s2bfmphdqig3ci4pdvkfvygprydcppyl;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/cub-2.1.0-p5pq3qyp3tthknvf4evygd4yaoay32tu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/mfem-4.5.2-5aoi62ejerozb42y5awjlgucluokakho;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/hypre-2.24.0-cfxkqrgvzhhkau6afaoohfe3zvmxhr7l;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/lua-5.4.4-27btgrl45gsrfpectq4nqwg3uep2lbcn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/conduit-0.8.8-k25pxkfamv77gz7cplvupfseutwule7o;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/parmetis-4.0.3-ae4f6v6uuhhbv776uy73zl4zqoralhbc;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/metis-5.1.0-ttpdauwjjvuesdbpa2pzh2inam3xgg7u;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/hdf5-1.8.22-ix4txea5c6dbzixdj3ef6dstpnlt6xvb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/zlib-1.2.13-ywvuuomigfzzbq4fxcgkdrnvnnwkj7zt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/c2c-1.8.0-icsf7aewc7ocohld45ibjxvygujkq3zd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/blt-0.5.3-pytnag7yitffjizxs6mtsgj6amwvpd4v;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -107,7 +107,7 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/clang-10.0.1.2" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-k25pxkfamv77gz7cplvupfseutwule7o" CACHE PATH "") @@ -119,11 +119,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-ix4txea5c6dbzixdj3ef6dstpnlt6xvb" CACHE PA set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-27btgrl45gsrfpectq4nqwg3uep2lbcn" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-26jb32x7kl6lvfhvwvzv6seoiyjd2fe4" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-itml4o7c6upowd3s2uvk5wj23cywocev" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-pfofk6xf3eat7ptoitibuzmnycnwrlfb" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-mgplvx55qtfnxdwb4cicp2bpu4z2koxq" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-mbobtec63kl2etao43ylvvln3ivokfzn" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-s2bfmphdqig3ci4pdvkfvygprydcppyl" CACHE PATH "") # scr not built @@ -131,7 +131,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-mbobtec63kl2etao43ylvvln3ivokfzn" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_04_18_13_41_48/._view/srxt35kojgk77f2222mk6mgv7z5jyyzz" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_10_17_10_41_04/._view/5gug4et2qymmckk7yvtub4qcapp3figm" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") @@ -145,6 +145,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake index 9322b541b8..8894fb7c27 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.1/umpire-2023.06.0-bftoz5wfuvfwldjwe3szsi54hdpw2hfi;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.1/raja-2023.06.0-tv34emklwgpl4ddrggbpkthu6utweo2a;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.1/camp-2023.06.0-vuk2xmgpzxl2xb2jupm3uxqxbgrzrmbf;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.1/lua-5.4.4-e7cdhkbaxuyqljoyozzxrt2n57erhszx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.1/conduit-0.8.8-3li2jcc2mecqbanoew5tznr4uzl2k2jg;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.1/parmetis-4.0.3-c2ub4mddqt7faykccls5eae7xogpi32w;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.1/metis-5.1.0-t6qk2khpceidsormndy6gj56qbnehxai;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.1/hdf5-1.8.22-nydokvym7klek6hqoyijbwf3tbmd32ux;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.1/zlib-1.2.13-zd2x25bmmjwxhw7siucfywjgk7oc262j;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.1/c2c-1.8.0-zgwmbota3vhdxcdjlwxbhomlwllwhvnc;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.1/blt-0.5.3-zghdcshuqlqnbrezcylwnefie7pkvsab;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/umpire-2023.06.0-g7qmb2qhubkm3azuvfmqs76otesjurcs;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/raja-2023.06.0-tvlbnpgx2hbiu3bjvx44ozxhvusclguk;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/camp-2023.06.0-civqzez47ip24ln7c5q6gofaniemdr54;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/lua-5.4.4-e7cdhkbaxuyqljoyozzxrt2n57erhszx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/conduit-0.8.8-3li2jcc2mecqbanoew5tznr4uzl2k2jg;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/parmetis-4.0.3-c2ub4mddqt7faykccls5eae7xogpi32w;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/metis-5.1.0-t6qk2khpceidsormndy6gj56qbnehxai;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/hdf5-1.8.22-nydokvym7klek6hqoyijbwf3tbmd32ux;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/zlib-1.2.13-zd2x25bmmjwxhw7siucfywjgk7oc262j;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/c2c-1.8.0-zgwmbota3vhdxcdjlwxbhomlwllwhvnc;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/blt-0.5.3-zghdcshuqlqnbrezcylwnefie7pkvsab;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -71,7 +71,7 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-3li2jcc2mecqbanoew5tznr4uzl2k2jg" CACHE PATH "") @@ -83,11 +83,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-nydokvym7klek6hqoyijbwf3tbmd32ux" CACHE PA set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-e7cdhkbaxuyqljoyozzxrt2n57erhszx" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-tv34emklwgpl4ddrggbpkthu6utweo2a" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-tvlbnpgx2hbiu3bjvx44ozxhvusclguk" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-bftoz5wfuvfwldjwe3szsi54hdpw2hfi" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-g7qmb2qhubkm3azuvfmqs76otesjurcs" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-vuk2xmgpzxl2xb2jupm3uxqxbgrzrmbf" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-civqzez47ip24ln7c5q6gofaniemdr54" CACHE PATH "") # scr not built @@ -95,7 +95,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-vuk2xmgpzxl2xb2jupm3uxqxbgrzrmbf" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_04_18_13_41_48/._view/srxt35kojgk77f2222mk6mgv7z5jyyzz" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_10_17_10_41_04/._view/5gug4et2qymmckk7yvtub4qcapp3figm" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") @@ -109,6 +109,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake index 20b77bd2a6..beb1b7219e 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.2/umpire-2023.06.0-mhaqbzgmrizieszsedhkq5j6zr56mtue;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.2/raja-2023.06.0-5ao6zh3anztpvifl7pi3lx6dalgabreh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.2/camp-2023.06.0-5yw6pcjgrzzupk3ptfneaygwjewo7sx6;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.2/cub-2.1.0-zpxcavwsek3eamis6c2ekyd4wpc2aff7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.2/lua-5.4.4-uzsm5gerahtqcinqqfwleer62mlgl6xt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.2/conduit-0.8.8-pslusbff27xjqw5sct3jnddyeqlyide3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.2/parmetis-4.0.3-bcniwrmmygfl3ngqqy4ogyuopuilgfy2;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.2/metis-5.1.0-tht2h2hqk4psrvunj7egarksgyayew3d;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.2/hdf5-1.8.22-h2labsbvwxgxwvphjb5i357an3dgjhqp;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.2/zlib-1.2.13-obyznlavcvoyytpvwwyi65s5ngcnpigv;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.2/c2c-1.8.0-snpbqgmnulnruetig5di7nef2gir354f;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.2/blt-0.5.3-umf5hhz3yl7vspds2fejsjdbmy2npyqb;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.8.14;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/umpire-2023.06.0-rgprey5lhrxtjnaqmm56x5t4zfwv7n2f;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/raja-2023.06.0-aszr6mr5prbpfd3qqcb7ukntna6a3rfb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/camp-2023.06.0-54bzgyk2if7ilhc2saaia3flihlvkqhu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/cub-2.1.0-zpxcavwsek3eamis6c2ekyd4wpc2aff7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/lua-5.4.4-uzsm5gerahtqcinqqfwleer62mlgl6xt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/conduit-0.8.8-pslusbff27xjqw5sct3jnddyeqlyide3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/parmetis-4.0.3-bcniwrmmygfl3ngqqy4ogyuopuilgfy2;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/metis-5.1.0-tht2h2hqk4psrvunj7egarksgyayew3d;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/hdf5-1.8.22-h2labsbvwxgxwvphjb5i357an3dgjhqp;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/zlib-1.2.13-obyznlavcvoyytpvwwyi65s5ngcnpigv;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/c2c-1.8.0-snpbqgmnulnruetig5di7nef2gir354f;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/blt-0.5.3-umf5hhz3yl7vspds2fejsjdbmy2npyqb;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -99,7 +99,7 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/gcc-8.3.1.2" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-pslusbff27xjqw5sct3jnddyeqlyide3" CACHE PATH "") @@ -111,11 +111,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-h2labsbvwxgxwvphjb5i357an3dgjhqp" CACHE PA set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-uzsm5gerahtqcinqqfwleer62mlgl6xt" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-5ao6zh3anztpvifl7pi3lx6dalgabreh" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-aszr6mr5prbpfd3qqcb7ukntna6a3rfb" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-mhaqbzgmrizieszsedhkq5j6zr56mtue" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-rgprey5lhrxtjnaqmm56x5t4zfwv7n2f" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-5yw6pcjgrzzupk3ptfneaygwjewo7sx6" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-54bzgyk2if7ilhc2saaia3flihlvkqhu" CACHE PATH "") # scr not built @@ -123,7 +123,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-5yw6pcjgrzzupk3ptfneaygwjewo7sx6" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_04_18_13_41_48/._view/srxt35kojgk77f2222mk6mgv7z5jyyzz" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_10_17_10_41_04/._view/5gug4et2qymmckk7yvtub4qcapp3figm" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") @@ -137,6 +137,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake index 4842c4a1c2..6f4180275e 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1/umpire-2023.06.0-gfmhpqkxawfjbwtufn3qeg6gkzmlahr7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1/raja-2023.06.0-pkp4pk4dybnbq74652a2ayzf6zvzonsy;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1/camp-2023.06.0-ilclfpsbzrbirjnwqimbnwoanvxwcvwd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1/mfem-4.5.2-5tpknd5eztbbomidbr3qcs75hyvdqegw;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1/hypre-2.24.0-kgmrxqyc3pjlwgzvgbchceub5u4v4tgt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1/lua-5.4.4-22nibaxxfzwid5jk3udivaptba2xtw4r;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1/conduit-0.8.8-tnyxf6f7sh7kg3pzvt5acfp4btsprsp7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1/parmetis-4.0.3-zsfvlzuxwixta5mjt4dqwikslhx6l6dd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1/metis-5.1.0-hpfbnba3mgk2opmqn3efr2mmda76yacg;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1/hdf5-1.8.22-eduvgrxspycy6xfw2t6i6uogdtzgnygm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1/zlib-1.2.13-tnpzx5nxltbrlx27lozjehkg2lkb7lew;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1/c2c-1.8.0-vxyvicuyswybrekljpj7khd56uobpc62;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1/blt-0.5.3-zleps37vlw57krmv2zruxq6bpxpn6fik;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/umpire-2023.06.0-cmose4tqzlwsrjjhoklstt6ga3yym6ni;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/raja-2023.06.0-uqr6nybua6ic5xjwqd75hqtngiz6wjwb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/camp-2023.06.0-3k5jzo2qageywkgo7i65ybqksjqbu67j;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/mfem-4.5.2-5tpknd5eztbbomidbr3qcs75hyvdqegw;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/hypre-2.24.0-kgmrxqyc3pjlwgzvgbchceub5u4v4tgt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/lua-5.4.4-22nibaxxfzwid5jk3udivaptba2xtw4r;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/conduit-0.8.8-tnyxf6f7sh7kg3pzvt5acfp4btsprsp7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/parmetis-4.0.3-zsfvlzuxwixta5mjt4dqwikslhx6l6dd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/metis-5.1.0-hpfbnba3mgk2opmqn3efr2mmda76yacg;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/hdf5-1.8.22-eduvgrxspycy6xfw2t6i6uogdtzgnygm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/zlib-1.2.13-tnpzx5nxltbrlx27lozjehkg2lkb7lew;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/c2c-1.8.0-vxyvicuyswybrekljpj7khd56uobpc62;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/blt-0.5.3-zleps37vlw57krmv2zruxq6bpxpn6fik;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/xl/xlc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/xl/xlc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/xl/xlc++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/xl/xlc++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/xl/xlf90" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/xl/xlf90" CACHE PATH "") else() @@ -83,7 +83,7 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-tnyxf6f7sh7kg3pzvt5acfp4btsprsp7" CACHE PATH "") @@ -95,11 +95,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-eduvgrxspycy6xfw2t6i6uogdtzgnygm" CACHE PA set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-22nibaxxfzwid5jk3udivaptba2xtw4r" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-pkp4pk4dybnbq74652a2ayzf6zvzonsy" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-uqr6nybua6ic5xjwqd75hqtngiz6wjwb" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-gfmhpqkxawfjbwtufn3qeg6gkzmlahr7" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-cmose4tqzlwsrjjhoklstt6ga3yym6ni" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-ilclfpsbzrbirjnwqimbnwoanvxwcvwd" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-3k5jzo2qageywkgo7i65ybqksjqbu67j" CACHE PATH "") # scr not built @@ -107,7 +107,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-ilclfpsbzrbirjnwqimbnwoanvxwcvwd" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_04_18_13_41_48/._view/srxt35kojgk77f2222mk6mgv7z5jyyzz" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_10_17_10_41_04/._view/5gug4et2qymmckk7yvtub4qcapp3figm" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") @@ -121,6 +121,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake index 39850d2f7e..9f7d4c893a 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/umpire-2023.06.0-3rafuldohvpy7vxbdjpv3khllaqhgwp5;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/raja-2023.06.0-rzllz6mlecs2kg7dtqwqtl7wvw34ul2q;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/camp-2023.06.0-zpwybznbb32yltcpzmiplykwdlqe2afw;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/cub-2.1.0-45sgqog6spfots46rohzcokfoaxjil4p;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/mfem-4.5.2-264o4xkxhcafenixttd6lw5k466a62b3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/hypre-2.24.0-x2zforves4hmpcuwjskxbvxu55i5kpfx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/lua-5.4.4-6yyyruucztcz5p4w33mhydqn5kiywkjn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/conduit-0.8.8-pil6joltz2jsp4vcdsfgndntfkqoi3na;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/parmetis-4.0.3-ogq2nkkjvarhjgaweb6b5lglfcmes3hm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/metis-5.1.0-7ojc3lx2y6dk2g7gvl6m5n4fq5yewukb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/hdf5-1.8.22-y23h3hgemr7s6terq2mvsz5if5u327sr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/zlib-1.2.13-nd6r3ccnozxmd7jdwyxbgvqg5y2bn3ds;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/c2c-1.8.0-ckwviu4jwtot52xykd3kuryozuw5o35p;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2/blt-0.5.3-47zfyusaljp2e7x3lsq3iggqvapxox6t;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.8.14;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.2.0;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/umpire-2023.06.0-5pojmv2de7q5pimrh253hwamycx7jfl7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/raja-2023.06.0-7et5l25lkvvjz2r772uabj7hrstg3y2z;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/camp-2023.06.0-q4hulo6jzt2wnuzzj5jjmlvkdtu4ckdj;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/cub-2.1.0-45sgqog6spfots46rohzcokfoaxjil4p;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/mfem-4.5.2-264o4xkxhcafenixttd6lw5k466a62b3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/hypre-2.24.0-x2zforves4hmpcuwjskxbvxu55i5kpfx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/lua-5.4.4-6yyyruucztcz5p4w33mhydqn5kiywkjn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/conduit-0.8.8-pil6joltz2jsp4vcdsfgndntfkqoi3na;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/parmetis-4.0.3-ogq2nkkjvarhjgaweb6b5lglfcmes3hm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/metis-5.1.0-7ojc3lx2y6dk2g7gvl6m5n4fq5yewukb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/hdf5-1.8.22-y23h3hgemr7s6terq2mvsz5if5u327sr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/zlib-1.2.13-nd6r3ccnozxmd7jdwyxbgvqg5y2bn3ds;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/c2c-1.8.0-ckwviu4jwtot52xykd3kuryozuw5o35p;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/blt-0.5.3-47zfyusaljp2e7x3lsq3iggqvapxox6t;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.2.0;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/xl/xlc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/xl/xlc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/xl/xlc++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/xl/xlc++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/spack/lib/spack/env/xl/xlf90" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/xl/xlf90" CACHE PATH "") else() @@ -111,7 +111,7 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_07_26_17_42_42/xl-16.1.1.2" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-pil6joltz2jsp4vcdsfgndntfkqoi3na" CACHE PATH "") @@ -123,11 +123,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-y23h3hgemr7s6terq2mvsz5if5u327sr" CACHE PA set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-6yyyruucztcz5p4w33mhydqn5kiywkjn" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-rzllz6mlecs2kg7dtqwqtl7wvw34ul2q" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-7et5l25lkvvjz2r772uabj7hrstg3y2z" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-3rafuldohvpy7vxbdjpv3khllaqhgwp5" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-5pojmv2de7q5pimrh253hwamycx7jfl7" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-zpwybznbb32yltcpzmiplykwdlqe2afw" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-q4hulo6jzt2wnuzzj5jjmlvkdtu4ckdj" CACHE PATH "") # scr not built @@ -135,7 +135,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-zpwybznbb32yltcpzmiplykwdlqe2afw" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_04_18_13_41_48/._view/srxt35kojgk77f2222mk6mgv7z5jyyzz" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/2023_10_17_10_41_04/._view/5gug4et2qymmckk7yvtub4qcapp3figm" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") @@ -149,6 +149,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") From 0f58aaed84b7c9b756415e78ed25b8758e652a7d Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 23 Oct 2023 11:15:42 -0700 Subject: [PATCH 146/639] Remove toss 3 rzgenie host-configs --- ...zgenie-toss_3_x86_64_ib-clang@10.0.0.cmake | 136 ------------------ ...rzgenie-toss_3_x86_64_ib-clang@9.0.0.cmake | 116 --------------- ...toss_3_x86_64_ib-gcc@8.1.0_nofortran.cmake | 128 ----------------- .../rzgenie-toss_3_x86_64_ib-gcc@8.3.1.cmake | 130 ----------------- ...zgenie-toss_3_x86_64_ib-intel@19.0.4.cmake | 116 --------------- 5 files changed, 626 deletions(-) delete mode 100644 host-configs/rzgenie-toss_3_x86_64_ib-clang@10.0.0.cmake delete mode 100644 host-configs/rzgenie-toss_3_x86_64_ib-clang@9.0.0.cmake delete mode 100644 host-configs/rzgenie-toss_3_x86_64_ib-gcc@8.1.0_nofortran.cmake delete mode 100644 host-configs/rzgenie-toss_3_x86_64_ib-gcc@8.3.1.cmake delete mode 100644 host-configs/rzgenie-toss_3_x86_64_ib-intel@19.0.4.cmake diff --git a/host-configs/rzgenie-toss_3_x86_64_ib-clang@10.0.0.cmake b/host-configs/rzgenie-toss_3_x86_64_ib-clang@10.0.0.cmake deleted file mode 100644 index 8dde121f5d..0000000000 --- a/host-configs/rzgenie-toss_3_x86_64_ib-clang@10.0.0.cmake +++ /dev/null @@ -1,136 +0,0 @@ -#------------------------------------------------------------------------------ -# !!!! This is a generated file, edit at own risk !!!! -#------------------------------------------------------------------------------ -# CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake -#------------------------------------------------------------------------------ - -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/umpire-2023.06.0-z2h5kuxhzuk2ngcw67dwkhsqn7sltlq6;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/scr-3.0.1-adlfle3mstudvzjj3jcl5i52xiq4awvu;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/spath-0.2.0-wqlfyvi364xtbgefjc6l3nd6go7fmpew;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/er-0.2.0-fggkkdogojtdhw4ev6qcjnnpmg4wf3ad;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/shuffile-0.2.0-5cvrs5bt7gz3flr4vf35p2qcvmwhkqm7;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/redset-0.2.0-eruhluyu3zolyubz6old5esoe6s7egnw;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/rankstr-0.1.0-6likqktizvniim2xk5bwqzgrxzgegqiu;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/dtcmp-1.1.4-36lvuzlbgpldrpgq45tjypw4ueuasbye;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/lwgrp-1.0.5-7uynxmvjh5mioqxhmecf3373gi6c3wet;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/axl-0.7.1-c2kw4eaq2hlqoxkulm37ha6smv4rg4eo;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/kvtree-1.3.0-nguzbsyrpbv2a3t5ff7fk75iwhnqbpu3;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/raja-2023.06.0-l7kla4y4ico2fy5xo6c3ppxbbbhu4nyt;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/camp-2023.06.0-axyc4xacawmyaisubksrhutnemqy2f2j;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/mfem-4.5.2-tgwkub4fbu6y3espxylvfr6j7tckcv66;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/hypre-2.24.0-yurrucgn7r7ue6pblx3rq6wxlj2seitx;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/lua-5.4.4-jhnm2657v5fkpuw6nwmvwi6g62f5v7db;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/ncurses-6.4-dqyeo6k4n3exna7br27zcoynyhhkcnq5;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/conduit-0.8.8-d6u5xy5jwoy73cj26v2guvoc4spmjphw;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/parmetis-4.0.3-sq7p4yzdffk4xxarmknaswkzauirozca;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/metis-5.1.0-kh3dxirgwdtvoon5iqdzedgh73suanet;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/hdf5-1.8.22-xfyqrfajjk54crvde7pgnyvpp5r2icbg;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/c2c-1.8.0-wi6af4qoa35kfgmuso32x7hjyb24qtv3;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/gmake-4.4.1-5ves23fzy2xoislpirqho4whgttpy6sk;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0/blt-0.5.3-e5zxyfyfkpordzyjdfugcdgeikzirlwy;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3-clang-10.0.0;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") - -set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") - -#------------------------------------------------------------------------------ -# Compilers -#------------------------------------------------------------------------------ -# Compiler Spec: clang@=10.0.0 -#------------------------------------------------------------------------------ -if(DEFINED ENV{SPACK_CC}) - - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/clang/clang" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/clang/clang++" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/clang/gfortran" CACHE PATH "") - -else() - - set(CMAKE_C_COMPILER "/usr/tce/packages/clang/clang-10.0.0/bin/clang" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/tce/packages/clang/clang-10.0.0/bin/clang++" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran" CACHE PATH "") - -endif() - -set(CMAKE_C_FLAGS "--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1" CACHE STRING "") - -set(CMAKE_CXX_FLAGS "--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1" CACHE STRING "") - -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - -set(ENABLE_FORTRAN ON CACHE BOOL "") - -set(BLT_EXE_LINKER_FLAGS " -Wl,-rpath,/usr/tce/packages/clang/clang-10.0.0/lib" CACHE STRING "Adds a missing libstdc++ rpath") - -#------------------------------------------------------------------------------ -# MPI -#------------------------------------------------------------------------------ - -set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-10.0.0/bin/mpicc" CACHE PATH "") - -set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-10.0.0/bin/mpicxx" CACHE PATH "") - -set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-10.0.0/bin/mpif90" CACHE PATH "") - -set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") - -set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") - -set(ENABLE_MPI ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# Hardware -#------------------------------------------------------------------------------ - -#------------------------------------------------ -# Hardware Specifics -#------------------------------------------------ - -set(ENABLE_OPENMP ON CACHE BOOL "") - -set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# TPLs -#------------------------------------------------------------------------------ - -set(TPL_ROOT "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-10.0.0" CACHE PATH "") - -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-d6u5xy5jwoy73cj26v2guvoc4spmjphw" CACHE PATH "") - -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-wi6af4qoa35kfgmuso32x7hjyb24qtv3" CACHE PATH "") - -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-tgwkub4fbu6y3espxylvfr6j7tckcv66" CACHE PATH "") - -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-xfyqrfajjk54crvde7pgnyvpp5r2icbg" CACHE PATH "") - -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-jhnm2657v5fkpuw6nwmvwi6g62f5v7db" CACHE PATH "") - -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-l7kla4y4ico2fy5xo6c3ppxbbbhu4nyt" CACHE PATH "") - -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-z2h5kuxhzuk2ngcw67dwkhsqn7sltlq6" CACHE PATH "") - -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-axyc4xacawmyaisubksrhutnemqy2f2j" CACHE PATH "") - -set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-adlfle3mstudvzjj3jcl5i52xiq4awvu" CACHE PATH "") - -set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-nguzbsyrpbv2a3t5ff7fk75iwhnqbpu3" CACHE PATH "") - -set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-36lvuzlbgpldrpgq45tjypw4ueuasbye" CACHE PATH "") - -set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-wqlfyvi364xtbgefjc6l3nd6go7fmpew" CACHE PATH "") - -set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-c2kw4eaq2hlqoxkulm37ha6smv4rg4eo" CACHE PATH "") - -set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-7uynxmvjh5mioqxhmecf3373gi6c3wet" CACHE PATH "") - -set(ER_DIR "${TPL_ROOT}/er-0.2.0-fggkkdogojtdhw4ev6qcjnnpmg4wf3ad" CACHE PATH "") - -set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-6likqktizvniim2xk5bwqzgrxzgegqiu" CACHE PATH "") - -set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-eruhluyu3zolyubz6old5esoe6s7egnw" CACHE PATH "") - -set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-5cvrs5bt7gz3flr4vf35p2qcvmwhkqm7" CACHE PATH "") - -set(LIBYOGRT_DIR "/usr" CACHE PATH "") - -#------------------------------------------------------------------------------ -# Devtools -#------------------------------------------------------------------------------ - -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/2023_04_18_13_40_46/._view/2axci4znbttcg4i676h7tlgjoffyysqt" CACHE PATH "") - -set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") - -set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") - -set(ENABLE_DOCS ON CACHE BOOL "") - -set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") - -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") - -set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") - -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") - - diff --git a/host-configs/rzgenie-toss_3_x86_64_ib-clang@9.0.0.cmake b/host-configs/rzgenie-toss_3_x86_64_ib-clang@9.0.0.cmake deleted file mode 100644 index de0eee36d6..0000000000 --- a/host-configs/rzgenie-toss_3_x86_64_ib-clang@9.0.0.cmake +++ /dev/null @@ -1,116 +0,0 @@ -#------------------------------------------------------------------------------ -# !!!! This is a generated file, edit at own risk !!!! -#------------------------------------------------------------------------------ -# CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake -#------------------------------------------------------------------------------ - -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/umpire-2023.06.0-pxc3luewglsrjheqbmy4ethzzhtkp4wa;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/raja-2023.06.0-7s6l5urylci3jmqtttose3jarycrizpp;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/camp-2023.06.0-ojipssq33pvvq6qwllhxtb3rm7mygyby;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/mfem-4.5.2-os7vuxxmcxl2kwlxktmcyzfijg7nbcxn;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/hypre-2.24.0-k5mky734f76cd3wf4nsn7cu6ojb4qlng;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/lua-5.4.4-llfbtjxhew4bndeno5yiuhcsnhonmhx3;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/ncurses-6.4-vibranrcfja4nnd7363fxffvddp6cvan;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/conduit-0.8.8-adu2oxc6b3dgj2euult7r5jbqdhe4jsc;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/parmetis-4.0.3-feep6z2o6motj6ewaiyypzfixyvfuj6x;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/metis-5.1.0-gm5mheorgemz444kl4u452kpk37st3ip;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/hdf5-1.8.22-m6ch4naxrmq7eve3se5wkyetakirqp2x;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/c2c-1.8.0-l2mnatxn4h33nrbij5s5iq5fwy3egoch;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/gmake-4.4.1-7g2ykynv7s3hgjbm4qcxafa7ejhblyso;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0/blt-0.5.3-au7nouiccwpfdujjkvk66k33g4d7fw3g;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3-clang-9.0.0;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") - -set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") - -#------------------------------------------------------------------------------ -# Compilers -#------------------------------------------------------------------------------ -# Compiler Spec: clang@=9.0.0 -#------------------------------------------------------------------------------ -if(DEFINED ENV{SPACK_CC}) - - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/clang/clang" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/clang/clang++" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/clang/gfortran" CACHE PATH "") - -else() - - set(CMAKE_C_COMPILER "/usr/tce/packages/clang/clang-9.0.0/bin/clang" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/tce/packages/clang/clang-9.0.0/bin/clang++" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran" CACHE PATH "") - -endif() - -set(CMAKE_C_FLAGS "--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1" CACHE STRING "") - -set(CMAKE_CXX_FLAGS "--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1" CACHE STRING "") - -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - -set(ENABLE_FORTRAN ON CACHE BOOL "") - -set(BLT_EXE_LINKER_FLAGS " -Wl,-rpath,/usr/tce/packages/clang/clang-9.0.0/lib" CACHE STRING "Adds a missing libstdc++ rpath") - -#------------------------------------------------------------------------------ -# MPI -#------------------------------------------------------------------------------ - -set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-9.0.0/bin/mpicc" CACHE PATH "") - -set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-9.0.0/bin/mpicxx" CACHE PATH "") - -set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-9.0.0/bin/mpif90" CACHE PATH "") - -set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") - -set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") - -set(ENABLE_MPI ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# Hardware -#------------------------------------------------------------------------------ - -#------------------------------------------------ -# Hardware Specifics -#------------------------------------------------ - -set(ENABLE_OPENMP ON CACHE BOOL "") - -set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# TPLs -#------------------------------------------------------------------------------ - -set(TPL_ROOT "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/clang-9.0.0" CACHE PATH "") - -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-adu2oxc6b3dgj2euult7r5jbqdhe4jsc" CACHE PATH "") - -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-l2mnatxn4h33nrbij5s5iq5fwy3egoch" CACHE PATH "") - -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-os7vuxxmcxl2kwlxktmcyzfijg7nbcxn" CACHE PATH "") - -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-m6ch4naxrmq7eve3se5wkyetakirqp2x" CACHE PATH "") - -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-llfbtjxhew4bndeno5yiuhcsnhonmhx3" CACHE PATH "") - -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-7s6l5urylci3jmqtttose3jarycrizpp" CACHE PATH "") - -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-pxc3luewglsrjheqbmy4ethzzhtkp4wa" CACHE PATH "") - -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-ojipssq33pvvq6qwllhxtb3rm7mygyby" CACHE PATH "") - -# scr not built - -#------------------------------------------------------------------------------ -# Devtools -#------------------------------------------------------------------------------ - -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/2023_04_18_13_40_46/._view/2axci4znbttcg4i676h7tlgjoffyysqt" CACHE PATH "") - -set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") - -set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") - -set(ENABLE_DOCS ON CACHE BOOL "") - -set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") - -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") - -set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") - -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") - - diff --git a/host-configs/rzgenie-toss_3_x86_64_ib-gcc@8.1.0_nofortran.cmake b/host-configs/rzgenie-toss_3_x86_64_ib-gcc@8.1.0_nofortran.cmake deleted file mode 100644 index 8cd863d8f2..0000000000 --- a/host-configs/rzgenie-toss_3_x86_64_ib-gcc@8.1.0_nofortran.cmake +++ /dev/null @@ -1,128 +0,0 @@ -#------------------------------------------------------------------------------ -# !!!! This is a generated file, edit at own risk !!!! -#------------------------------------------------------------------------------ -# CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake -#------------------------------------------------------------------------------ - -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/umpire-2023.06.0-gjdqn4ak7icylqiws4oiocqeozqayl52;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/scr-3.0.1-57v5d2kgeskys7pvhqumaeudj4jc62e3;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/spath-0.2.0-i4jj5grbwakdvhlhify3kzz5opomwyny;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/er-0.2.0-pmsfzcrxgdwyozmi5p5hkyztamh3mwax;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/shuffile-0.2.0-vwjpmnvcdx34bibz47kw4us5zgx7shbl;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/redset-0.2.0-qb5orvh6dzrfl3bkdm5qokkkwsjshq3c;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/rankstr-0.1.0-svws2lhtrvsl2enn2mkfn3pksjhu3h5v;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/dtcmp-1.1.4-xjhkvaqwwurxrjwuemnm7q3aye5mes76;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/lwgrp-1.0.5-tvd246ukitcjukvnlaovhvjnmufcioex;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/axl-0.7.1-xfrinfrl23xnds6psui7rhfn4m7kjfl7;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/kvtree-1.3.0-ausnjow5nnsworkbrptparlvmdir5f3c;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/raja-2023.06.0-7dt45inc7wkugafoj6i23gwtmp2sjsvz;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/camp-2023.06.0-4tyifsgcn4nbb7bpmz37hjwvaw5dtwrk;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/lua-5.4.4-57tfdw4tof6qhsuxnaaznfmsrplldoz2;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/ncurses-6.4-jcr73xssadvreprbmfpbk2xnf3p6hzax;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/conduit-0.8.8-fiv75zpvehkazrqkdevc2jixmmdkldwk;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/parmetis-4.0.3-zpcbdbwhfrjpxznnnubo2hlp7idf5uwz;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/metis-5.1.0-cr54mbalvgkv33vcfdckbre3zu7gxuzw;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/hdf5-1.8.22-zl7uzlzpzb55jzwdixp2duowqnq7ef2e;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/c2c-1.8.0-bxnyix3t2vt2hestvo3ig4kod7yyjhiz;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/gmake-4.4.1-iodcwdajnghbmtscfiuu5ockdpruvaay;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0/blt-0.5.3-clo3ueqx6blmg6it4hbxc2jopdnn77vu;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.1.0;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") - -set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") - -#------------------------------------------------------------------------------ -# Compilers -#------------------------------------------------------------------------------ -# Compiler Spec: gcc@=8.1.0 -#------------------------------------------------------------------------------ -if(DEFINED ENV{SPACK_CC}) - - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/gcc/g++" CACHE PATH "") - - # No Fortran compiler defined in spec -else() - - set(CMAKE_C_COMPILER "/usr/tce/packages/gcc/gcc-8.1.0/bin/gcc" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/tce/packages/gcc/gcc-8.1.0/bin/g++" CACHE PATH "") - - # No Fortran compiler defined in spec -endif() - -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - -set(ENABLE_FORTRAN OFF CACHE BOOL "") - -#------------------------------------------------------------------------------ -# MPI -#------------------------------------------------------------------------------ - -set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.1.0/bin/mpicc" CACHE PATH "") - -set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.1.0/bin/mpicxx" CACHE PATH "") - -set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.1.0/bin/mpif90" CACHE PATH "") - -set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") - -set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") - -set(ENABLE_MPI ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# Hardware -#------------------------------------------------------------------------------ - -#------------------------------------------------ -# Hardware Specifics -#------------------------------------------------ - -set(ENABLE_OPENMP ON CACHE BOOL "") - -set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# TPLs -#------------------------------------------------------------------------------ - -set(TPL_ROOT "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.1.0" CACHE PATH "") - -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-fiv75zpvehkazrqkdevc2jixmmdkldwk" CACHE PATH "") - -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-bxnyix3t2vt2hestvo3ig4kod7yyjhiz" CACHE PATH "") - -# MFEM not built - -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-zl7uzlzpzb55jzwdixp2duowqnq7ef2e" CACHE PATH "") - -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-57tfdw4tof6qhsuxnaaznfmsrplldoz2" CACHE PATH "") - -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-7dt45inc7wkugafoj6i23gwtmp2sjsvz" CACHE PATH "") - -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-gjdqn4ak7icylqiws4oiocqeozqayl52" CACHE PATH "") - -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-4tyifsgcn4nbb7bpmz37hjwvaw5dtwrk" CACHE PATH "") - -set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-57v5d2kgeskys7pvhqumaeudj4jc62e3" CACHE PATH "") - -set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-ausnjow5nnsworkbrptparlvmdir5f3c" CACHE PATH "") - -set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-xjhkvaqwwurxrjwuemnm7q3aye5mes76" CACHE PATH "") - -set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-i4jj5grbwakdvhlhify3kzz5opomwyny" CACHE PATH "") - -set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-xfrinfrl23xnds6psui7rhfn4m7kjfl7" CACHE PATH "") - -set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-tvd246ukitcjukvnlaovhvjnmufcioex" CACHE PATH "") - -set(ER_DIR "${TPL_ROOT}/er-0.2.0-pmsfzcrxgdwyozmi5p5hkyztamh3mwax" CACHE PATH "") - -set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-svws2lhtrvsl2enn2mkfn3pksjhu3h5v" CACHE PATH "") - -set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-qb5orvh6dzrfl3bkdm5qokkkwsjshq3c" CACHE PATH "") - -set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-vwjpmnvcdx34bibz47kw4us5zgx7shbl" CACHE PATH "") - -set(LIBYOGRT_DIR "/usr" CACHE PATH "") - -#------------------------------------------------------------------------------ -# Devtools -#------------------------------------------------------------------------------ - -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/2023_04_18_13_40_46/._view/2axci4znbttcg4i676h7tlgjoffyysqt" CACHE PATH "") - -set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") - -set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") - -set(ENABLE_DOCS ON CACHE BOOL "") - -set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") - -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") - -set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") - -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") - - diff --git a/host-configs/rzgenie-toss_3_x86_64_ib-gcc@8.3.1.cmake b/host-configs/rzgenie-toss_3_x86_64_ib-gcc@8.3.1.cmake deleted file mode 100644 index e20408cdd4..0000000000 --- a/host-configs/rzgenie-toss_3_x86_64_ib-gcc@8.3.1.cmake +++ /dev/null @@ -1,130 +0,0 @@ -#------------------------------------------------------------------------------ -# !!!! This is a generated file, edit at own risk !!!! -#------------------------------------------------------------------------------ -# CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake -#------------------------------------------------------------------------------ - -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/umpire-2023.06.0-4lqubknlmrlwyto2dmh7hkuxfc7dnmyr;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/scr-3.0.1-5c6fxrzejvkngts2gvaji25m3aikqotq;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/spath-0.2.0-cyf7c2ckovj7asynsnujlmcadwivwgo5;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/er-0.2.0-s6lj66k6o7udxbs5nivliay3ynkbmtue;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/shuffile-0.2.0-bzfolkf7fgnbja5ezrj6yymcb4tat6ya;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/redset-0.2.0-bnahpcvz5vrxvqgnmojdkddlbj7nb6kk;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/rankstr-0.1.0-5gksa6boymqygb3vxg7gffg7mh7mhz2f;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/dtcmp-1.1.4-gyi6h3ontslodbkt7wrbvbusj6ugpsj4;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/lwgrp-1.0.5-gaxorio4wbj6rwb25wlmevijp4mxq6nd;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/axl-0.7.1-qxdmeyuoryegcqelx3nmnph5cmryxexr;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/kvtree-1.3.0-hgauqgxu2ywylnfvwbfgq45xbkz2rb3z;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/raja-2023.06.0-ibkvsozbs444xs2aulxi2d6oz3oxkpd4;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/camp-2023.06.0-jmcfsgj7oqds43xfe64sufk2lbwilvg7;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/mfem-4.5.2-swbpowqpbmk6dhiur7juteihcw5zyae6;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/hypre-2.24.0-s6sb4aierrpgfdi3bez7mwji53zoplzu;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/lua-5.4.4-jn6kavdbewwqf7hqiltjzevvxnwuzk6x;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/ncurses-6.4-nofrz54iun2qczh2wzjlbszqqo3nqtm3;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/conduit-0.8.8-4fl5aa5u5q534xzce7x4dg5rg263xmde;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/parmetis-4.0.3-gb6lyk4lbx5nrh7cmixhbx4g2oxb2pzf;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/metis-5.1.0-yfdg6ffxtu6cy2yzzedexxhtcojuxjg4;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/hdf5-1.8.22-kswk4j5erlowjuscpcwda3mbomiqbvhd;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/c2c-1.8.0-s73y627jl7vz2g5pbhxpkf7ikcjjoivf;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/gmake-4.4.1-2hex2dpiveahunyaxdqatq3mdu65a67p;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1/blt-0.5.3-sdn67yf6o75nerspuntv2kxkl3ayhvnv;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.3.1;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") - -set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") - -#------------------------------------------------------------------------------ -# Compilers -#------------------------------------------------------------------------------ -# Compiler Spec: gcc@=8.3.1 -#------------------------------------------------------------------------------ -if(DEFINED ENV{SPACK_CC}) - - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/gcc/g++" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") - -else() - - set(CMAKE_C_COMPILER "/usr/tce/packages/gcc/gcc-8.3.1/bin/gcc" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/tce/packages/gcc/gcc-8.3.1/bin/g++" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran" CACHE PATH "") - -endif() - -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - -set(ENABLE_FORTRAN ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# MPI -#------------------------------------------------------------------------------ - -set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.3.1/bin/mpicc" CACHE PATH "") - -set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.3.1/bin/mpicxx" CACHE PATH "") - -set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.3.1/bin/mpif90" CACHE PATH "") - -set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") - -set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") - -set(ENABLE_MPI ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# Hardware -#------------------------------------------------------------------------------ - -#------------------------------------------------ -# Hardware Specifics -#------------------------------------------------ - -set(ENABLE_OPENMP ON CACHE BOOL "") - -set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# TPLs -#------------------------------------------------------------------------------ - -set(TPL_ROOT "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/gcc-8.3.1" CACHE PATH "") - -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-4fl5aa5u5q534xzce7x4dg5rg263xmde" CACHE PATH "") - -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-s73y627jl7vz2g5pbhxpkf7ikcjjoivf" CACHE PATH "") - -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-swbpowqpbmk6dhiur7juteihcw5zyae6" CACHE PATH "") - -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-kswk4j5erlowjuscpcwda3mbomiqbvhd" CACHE PATH "") - -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-jn6kavdbewwqf7hqiltjzevvxnwuzk6x" CACHE PATH "") - -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-ibkvsozbs444xs2aulxi2d6oz3oxkpd4" CACHE PATH "") - -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-4lqubknlmrlwyto2dmh7hkuxfc7dnmyr" CACHE PATH "") - -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-jmcfsgj7oqds43xfe64sufk2lbwilvg7" CACHE PATH "") - -set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-5c6fxrzejvkngts2gvaji25m3aikqotq" CACHE PATH "") - -set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-hgauqgxu2ywylnfvwbfgq45xbkz2rb3z" CACHE PATH "") - -set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-gyi6h3ontslodbkt7wrbvbusj6ugpsj4" CACHE PATH "") - -set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-cyf7c2ckovj7asynsnujlmcadwivwgo5" CACHE PATH "") - -set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-qxdmeyuoryegcqelx3nmnph5cmryxexr" CACHE PATH "") - -set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-gaxorio4wbj6rwb25wlmevijp4mxq6nd" CACHE PATH "") - -set(ER_DIR "${TPL_ROOT}/er-0.2.0-s6lj66k6o7udxbs5nivliay3ynkbmtue" CACHE PATH "") - -set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-5gksa6boymqygb3vxg7gffg7mh7mhz2f" CACHE PATH "") - -set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-bnahpcvz5vrxvqgnmojdkddlbj7nb6kk" CACHE PATH "") - -set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-bzfolkf7fgnbja5ezrj6yymcb4tat6ya" CACHE PATH "") - -set(LIBYOGRT_DIR "/usr" CACHE PATH "") - -#------------------------------------------------------------------------------ -# Devtools -#------------------------------------------------------------------------------ - -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/2023_04_18_13_40_46/._view/2axci4znbttcg4i676h7tlgjoffyysqt" CACHE PATH "") - -set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") - -set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") - -set(ENABLE_DOCS ON CACHE BOOL "") - -set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") - -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") - -set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") - -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") - - diff --git a/host-configs/rzgenie-toss_3_x86_64_ib-intel@19.0.4.cmake b/host-configs/rzgenie-toss_3_x86_64_ib-intel@19.0.4.cmake deleted file mode 100644 index 7741e5fc6a..0000000000 --- a/host-configs/rzgenie-toss_3_x86_64_ib-intel@19.0.4.cmake +++ /dev/null @@ -1,116 +0,0 @@ -#------------------------------------------------------------------------------ -# !!!! This is a generated file, edit at own risk !!!! -#------------------------------------------------------------------------------ -# CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake -#------------------------------------------------------------------------------ - -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/umpire-2023.06.0-spxsyq3od3jpw7xarmaf27zkhpreokce;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/raja-2023.06.0-ddsf5gvw3o7fmxx6tqaboufen5rtq3z4;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/camp-2023.06.0-pl43tuxmbj3l3humx76qa2dnglwieb7u;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/mfem-4.5.2-gncr6owa7f72rqhpzooxegqm7mmpzrxo;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/hypre-2.24.0-3nrszj6z3zarr6ret4vogidku5l3dk4h;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/lua-5.4.4-zljt4isbv6foy6qelg5nbabt2qdrny22;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/ncurses-6.4-kdjhmjhd6mde3prcrx4n6yuon7ifsg6b;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/conduit-0.8.8-oe5nxzus2z6e4fkaig2qw6jjznvmbc54;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/parmetis-4.0.3-gll7fwyzerdprkjo6pfqtg53ucbtcwgh;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/metis-5.1.0-sbxpvwpfbuqmi7xahz577tegotyhxi7n;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/hdf5-1.8.22-q7z46mq5v45ezkpbskhjgzpovqwwjorl;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/c2c-1.8.0-a52qggtffivtdp7ef2zw5bdapzo3zg5o;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/gmake-4.4.1-mubwfgd2o6j6mfms6bkw5ppbzpitibqs;/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4/blt-0.5.3-ujtkyhrx64yk64oy2jpcsgxpbdz7tzsn;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3-intel-19.0.0;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") - -set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") - -#------------------------------------------------------------------------------ -# Compilers -#------------------------------------------------------------------------------ -# Compiler Spec: intel@=19.0.4 -#------------------------------------------------------------------------------ -if(DEFINED ENV{SPACK_CC}) - - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/intel/icc" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/intel/icpc" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/spack/lib/spack/env/intel/ifort" CACHE PATH "") - -else() - - set(CMAKE_C_COMPILER "/usr/tce/packages/intel/intel-19.0.4/bin/icc" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/tce/packages/intel/intel-19.0.4/bin/icpc" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/usr/tce/packages/intel/intel-19.0.4/bin/ifort" CACHE PATH "") - -endif() - -set(CMAKE_C_FLAGS "-gcc-name=/usr/tce/packages/gcc/gcc-8.1.0/bin/gcc" CACHE STRING "") - -set(CMAKE_CXX_FLAGS "-gxx-name=/usr/tce/packages/gcc/gcc-8.1.0/bin/g++" CACHE STRING "") - -set(CMAKE_Fortran_FLAGS "-gcc-name=/usr/tce/packages/gcc/gcc-8.1.0/bin/gcc" CACHE STRING "") - -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - -set(ENABLE_FORTRAN ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# MPI -#------------------------------------------------------------------------------ - -set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-intel-19.0.0/bin/mpicc" CACHE PATH "") - -set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-intel-19.0.0/bin/mpicxx" CACHE PATH "") - -set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3-intel-19.0.0/bin/mpif90" CACHE PATH "") - -set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") - -set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") - -set(ENABLE_MPI ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# Hardware -#------------------------------------------------------------------------------ - -#------------------------------------------------ -# Hardware Specifics -#------------------------------------------------ - -set(ENABLE_OPENMP OFF CACHE BOOL "") - -set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# TPLs -#------------------------------------------------------------------------------ - -set(TPL_ROOT "/usr/WS1/axom/libs/toss_3_x86_64_ib/2023_07_26_17_28_34/intel-19.0.4" CACHE PATH "") - -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-oe5nxzus2z6e4fkaig2qw6jjznvmbc54" CACHE PATH "") - -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-a52qggtffivtdp7ef2zw5bdapzo3zg5o" CACHE PATH "") - -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-gncr6owa7f72rqhpzooxegqm7mmpzrxo" CACHE PATH "") - -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-q7z46mq5v45ezkpbskhjgzpovqwwjorl" CACHE PATH "") - -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-zljt4isbv6foy6qelg5nbabt2qdrny22" CACHE PATH "") - -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-ddsf5gvw3o7fmxx6tqaboufen5rtq3z4" CACHE PATH "") - -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-spxsyq3od3jpw7xarmaf27zkhpreokce" CACHE PATH "") - -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-pl43tuxmbj3l3humx76qa2dnglwieb7u" CACHE PATH "") - -# scr not built - -#------------------------------------------------------------------------------ -# Devtools -#------------------------------------------------------------------------------ - -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/2023_04_18_13_40_46/._view/2axci4znbttcg4i676h7tlgjoffyysqt" CACHE PATH "") - -set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") - -set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") - -set(ENABLE_DOCS ON CACHE BOOL "") - -set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") - -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") - -set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") - -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") - - From 2134a22b0c7f76287dbfb493969ceae1f111a1d7 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 23 Oct 2023 11:16:04 -0700 Subject: [PATCH 147/639] Add new toss 4 rzgenie host-configs --- ...zgenie-toss_4_x86_64_ib-clang@14.0.6.cmake | 112 ++++++++++++++++++ .../rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake | 110 +++++++++++++++++ ...enie-toss_4_x86_64_ib-intel@2022.1.0.cmake | 110 +++++++++++++++++ 3 files changed, 332 insertions(+) create mode 100644 host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake create mode 100644 host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake create mode 100644 host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake new file mode 100644 index 0000000000..e508345b68 --- /dev/null +++ b/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake @@ -0,0 +1,112 @@ +#------------------------------------------------------------------------------ +# !!!! This is a generated file, edit at own risk !!!! +#------------------------------------------------------------------------------ +# CMake executable path: /usr/tce/bin/cmake +#------------------------------------------------------------------------------ + +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/hypre-2.24.0-bwh42bebp4hiuwzlwcthpgkawape6dp3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/parmetis-4.0.3-jthqwflsj5bpe6onwsb5r2zi5wbx6pq4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/metis-5.1.0-imzig3eih3itpztvvk4yildzgq6aeelo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/gmake-4.4.1-6lgy76r7dbvqm6mbwb2jkpcuycf7tb27;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/blt-0.5.3-xa3bmu75nkolqiewb5ftk5tp2jpzw57n;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") + +set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") + +#------------------------------------------------------------------------------ +# Compilers +#------------------------------------------------------------------------------ +# Compiler Spec: clang@=14.0.6 +#------------------------------------------------------------------------------ +if(DEFINED ENV{SPACK_CC}) + + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/clang/clang" CACHE PATH "") + + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/clang/clang++" CACHE PATH "") + + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + +else() + + set(CMAKE_C_COMPILER "/usr/tce/packages/clang/clang-14.0.6/bin/clang" CACHE PATH "") + + set(CMAKE_CXX_COMPILER "/usr/tce/packages/clang/clang-14.0.6/bin/clang++" CACHE PATH "") + + set(CMAKE_Fortran_COMPILER "/usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran" CACHE PATH "") + +endif() + +set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") + +set(ENABLE_FORTRAN ON CACHE BOOL "") + +set(BLT_EXE_LINKER_FLAGS " -Wl,-rpath,/usr/tce/packages/clang/clang-14.0.6/lib" CACHE STRING "Adds a missing libstdc++ rpath") + +#------------------------------------------------------------------------------ +# MPI +#------------------------------------------------------------------------------ + +set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6/bin/mpicc" CACHE PATH "") + +set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6/bin/mpicxx" CACHE PATH "") + +set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6/bin/mpif90" CACHE PATH "") + +set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") + +set(ENABLE_MPI ON CACHE BOOL "") + +set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") + +#------------------------------------------------------------------------------ +# Hardware +#------------------------------------------------------------------------------ + +#------------------------------------------------ +# Hardware Specifics +#------------------------------------------------ + +set(ENABLE_OPENMP ON CACHE BOOL "") + +set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") + +#------------------------------------------------------------------------------ +# TPLs +#------------------------------------------------------------------------------ + +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6" CACHE PATH "") + +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy" CACHE PATH "") + +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt" CACHE PATH "") + +set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy" CACHE PATH "") + +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl" CACHE PATH "") + +set(LUA_DIR "/usr" CACHE PATH "") + +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh" CACHE PATH "") + +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy" CACHE PATH "") + +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he" CACHE PATH "") + +# scr not built + +#------------------------------------------------------------------------------ +# Devtools +#------------------------------------------------------------------------------ + +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_10_17_16_15_32/._view/ypfidjpdm7fhkqcpekza67w5xgiaw7yg" CACHE PATH "") + +set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0/bin/clang-format" CACHE PATH "") + +set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") + +set(ENABLE_DOCS ON CACHE BOOL "") + +set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") + +set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") + +set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") + +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") + + diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake new file mode 100644 index 0000000000..26dc90a0e6 --- /dev/null +++ b/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake @@ -0,0 +1,110 @@ +#------------------------------------------------------------------------------ +# !!!! This is a generated file, edit at own risk !!!! +#------------------------------------------------------------------------------ +# CMake executable path: /usr/tce/bin/cmake +#------------------------------------------------------------------------------ + +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/hypre-2.24.0-lof7hdy7wsyuei436d6uhilprsgmr3ik;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/parmetis-4.0.3-lq6aryhur6qn3trc2qxizvz4nae5ngzf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/metis-5.1.0-pyrzcrzqvl6q27kk637o2nwi3j7ibseb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/gmake-4.4.1-y2kaxrqjbg3dcwo7dzfphztusfjqoowq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/blt-0.5.3-iljv7wrfi4r5i4drs4yf65rgsuunaxjn;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE PATH "") + +set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") + +#------------------------------------------------------------------------------ +# Compilers +#------------------------------------------------------------------------------ +# Compiler Spec: gcc@=10.3.1 +#------------------------------------------------------------------------------ +if(DEFINED ENV{SPACK_CC}) + + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/gcc/g++" CACHE PATH "") + + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + +else() + + set(CMAKE_C_COMPILER "/usr/tce/packages/gcc/gcc-10.3.1/bin/gcc" CACHE PATH "") + + set(CMAKE_CXX_COMPILER "/usr/tce/packages/gcc/gcc-10.3.1/bin/g++" CACHE PATH "") + + set(CMAKE_Fortran_COMPILER "/usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran" CACHE PATH "") + +endif() + +set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") + +set(ENABLE_FORTRAN ON CACHE BOOL "") + +#------------------------------------------------------------------------------ +# MPI +#------------------------------------------------------------------------------ + +set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1/bin/mpicc" CACHE PATH "") + +set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1/bin/mpicxx" CACHE PATH "") + +set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1/bin/mpif90" CACHE PATH "") + +set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") + +set(ENABLE_MPI ON CACHE BOOL "") + +set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") + +#------------------------------------------------------------------------------ +# Hardware +#------------------------------------------------------------------------------ + +#------------------------------------------------ +# Hardware Specifics +#------------------------------------------------ + +set(ENABLE_OPENMP ON CACHE BOOL "") + +set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") + +#------------------------------------------------------------------------------ +# TPLs +#------------------------------------------------------------------------------ + +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1" CACHE PATH "") + +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu" CACHE PATH "") + +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j" CACHE PATH "") + +set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr" CACHE PATH "") + +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv" CACHE PATH "") + +set(LUA_DIR "/usr" CACHE PATH "") + +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq" CACHE PATH "") + +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr" CACHE PATH "") + +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp" CACHE PATH "") + +# scr not built + +#------------------------------------------------------------------------------ +# Devtools +#------------------------------------------------------------------------------ + +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_10_17_16_15_32/._view/ypfidjpdm7fhkqcpekza67w5xgiaw7yg" CACHE PATH "") + +set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0/bin/clang-format" CACHE PATH "") + +set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") + +set(ENABLE_DOCS ON CACHE BOOL "") + +set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") + +set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") + +set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") + +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") + + diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake new file mode 100644 index 0000000000..5bc263df9e --- /dev/null +++ b/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake @@ -0,0 +1,110 @@ +#------------------------------------------------------------------------------ +# !!!! This is a generated file, edit at own risk !!!! +#------------------------------------------------------------------------------ +# CMake executable path: /usr/tce/bin/cmake +#------------------------------------------------------------------------------ + +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/hypre-2.24.0-qdjyl5ibcpl4nxb6t5godfgvi5bb6hac;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/conduit-0.8.8-32edlc6hrwpchrywdw5xdhcrhiqqjg6n;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/parmetis-4.0.3-nqxoj5gqogj32hfo5ognkcb6vg24zdlc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/metis-5.1.0-tb5bijmooj2d6d2npjpajcj4fyu4yd4y;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/hdf5-1.8.22-e7opxg2skchlv6z6hd4pre35bd6pqv22;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/gmake-4.4.1-e3r4ry6vgi7zp4mbwfokypkutqwpctek;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/blt-0.5.3-i7qltms7ksyz4xltznzbtsafywrykq7b;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/usr/tce" CACHE PATH "") + +set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") + +#------------------------------------------------------------------------------ +# Compilers +#------------------------------------------------------------------------------ +# Compiler Spec: intel@=2022.1.0 +#------------------------------------------------------------------------------ +if(DEFINED ENV{SPACK_CC}) + + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/intel/icc" CACHE PATH "") + + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/intel/icpc" CACHE PATH "") + + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/intel/ifort" CACHE PATH "") + +else() + + set(CMAKE_C_COMPILER "/usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icx" CACHE PATH "") + + set(CMAKE_CXX_COMPILER "/usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icpx" CACHE PATH "") + + set(CMAKE_Fortran_COMPILER "/usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/ifx" CACHE PATH "") + +endif() + +set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") + +set(ENABLE_FORTRAN ON CACHE BOOL "") + +#------------------------------------------------------------------------------ +# MPI +#------------------------------------------------------------------------------ + +set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0/bin/mpicc" CACHE PATH "") + +set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0/bin/mpicxx" CACHE PATH "") + +set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0/bin/mpif90" CACHE PATH "") + +set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") + +set(ENABLE_MPI ON CACHE BOOL "") + +set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") + +#------------------------------------------------------------------------------ +# Hardware +#------------------------------------------------------------------------------ + +#------------------------------------------------ +# Hardware Specifics +#------------------------------------------------ + +set(ENABLE_OPENMP ON CACHE BOOL "") + +set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") + +#------------------------------------------------------------------------------ +# TPLs +#------------------------------------------------------------------------------ + +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0" CACHE PATH "") + +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-32edlc6hrwpchrywdw5xdhcrhiqqjg6n" CACHE PATH "") + +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa" CACHE PATH "") + +set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj" CACHE PATH "") + +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-e7opxg2skchlv6z6hd4pre35bd6pqv22" CACHE PATH "") + +set(LUA_DIR "/usr" CACHE PATH "") + +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up" CACHE PATH "") + +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5" CACHE PATH "") + +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4" CACHE PATH "") + +# scr not built + +#------------------------------------------------------------------------------ +# Devtools +#------------------------------------------------------------------------------ + +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_10_17_16_15_32/._view/ypfidjpdm7fhkqcpekza67w5xgiaw7yg" CACHE PATH "") + +set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0/bin/clang-format" CACHE PATH "") + +set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") + +set(ENABLE_DOCS ON CACHE BOOL "") + +set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") + +set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") + +set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") + +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") + + From 001c325a2ea392ce0138570a7e1f8bb0f8dd21a5 Mon Sep 17 00:00:00 2001 From: Brian Han Date: Mon, 23 Oct 2023 15:38:18 -0700 Subject: [PATCH 148/639] Update host-configs for quartz --- ...quartz-toss_4_x86_64_ib-clang@14.0.6.cmake | 20 ++-- .../quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake | 20 ++-- ...artz-toss_4_x86_64_ib-intel@2022.1.0.cmake | 110 ++++++++++++++++++ 3 files changed, 130 insertions(+), 20 deletions(-) create mode 100644 host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake diff --git a/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake index c35ae5747e..d1c0bdea03 100644 --- a/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake +++ b/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/clang-14.0.6/umpire-2023.06.0-o2m7hsis7okxq3yg3xtw5yfe4hqadwxj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/clang-14.0.6/raja-2023.06.0-inhp4zxtm4f67dvepecvxgd7lfkwffj4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/clang-14.0.6/camp-2023.06.0-nsfwjtpvvqciayarnoqbncabzlvvr4pz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/clang-14.0.6/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/clang-14.0.6/hypre-2.24.0-bwh42bebp4hiuwzlwcthpgkawape6dp3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/clang-14.0.6/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/clang-14.0.6/parmetis-4.0.3-jthqwflsj5bpe6onwsb5r2zi5wbx6pq4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/clang-14.0.6/metis-5.1.0-imzig3eih3itpztvvk4yildzgq6aeelo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/clang-14.0.6/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/clang-14.0.6/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/clang-14.0.6/gmake-4.4.1-6lgy76r7dbvqm6mbwb2jkpcuycf7tb27;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/clang-14.0.6/blt-0.5.3-xa3bmu75nkolqiewb5ftk5tp2jpzw57n;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/hypre-2.24.0-bwh42bebp4hiuwzlwcthpgkawape6dp3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/parmetis-4.0.3-jthqwflsj5bpe6onwsb5r2zi5wbx6pq4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/metis-5.1.0-imzig3eih3itpztvvk4yildzgq6aeelo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/gmake-4.4.1-6lgy76r7dbvqm6mbwb2jkpcuycf7tb27;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/blt-0.5.3-xa3bmu75nkolqiewb5ftk5tp2jpzw57n;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -69,7 +69,7 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/clang-14.0.6" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy" CACHE PATH "") @@ -81,11 +81,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl" CACHE PA set(LUA_DIR "/usr" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-inhp4zxtm4f67dvepecvxgd7lfkwffj4" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-o2m7hsis7okxq3yg3xtw5yfe4hqadwxj" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-nsfwjtpvvqciayarnoqbncabzlvvr4pz" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he" CACHE PATH "") # scr not built @@ -93,7 +93,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-nsfwjtpvvqciayarnoqbncabzlvvr4pz" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_05_18_11_52_05/._view/btoxy5ovdbouub2brzxcmjwzdhvzatlc" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_10_17_16_15_32/._view/ypfidjpdm7fhkqcpekza67w5xgiaw7yg" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0/bin/clang-format" CACHE PATH "") @@ -107,6 +107,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake b/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake index 39e54b5ea6..d9410bffed 100644 --- a/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake +++ b/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/gcc-10.3.1/umpire-2023.06.0-yvwkknlopetovjrbxfs3qjhifjsf4xmh;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/gcc-10.3.1/raja-2023.06.0-sq37cauj2vgwwkl66vngtztqu34pemzs;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/gcc-10.3.1/camp-2023.06.0-gjcfvl7y56sgldblilf4pktgdlnhflzp;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/gcc-10.3.1/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/gcc-10.3.1/hypre-2.24.0-lof7hdy7wsyuei436d6uhilprsgmr3ik;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/gcc-10.3.1/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/gcc-10.3.1/parmetis-4.0.3-lq6aryhur6qn3trc2qxizvz4nae5ngzf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/gcc-10.3.1/metis-5.1.0-pyrzcrzqvl6q27kk637o2nwi3j7ibseb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/gcc-10.3.1/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/gcc-10.3.1/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/gcc-10.3.1/gmake-4.4.1-y2kaxrqjbg3dcwo7dzfphztusfjqoowq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/gcc-10.3.1/blt-0.5.3-iljv7wrfi4r5i4drs4yf65rgsuunaxjn;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.8.14;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/hypre-2.24.0-lof7hdy7wsyuei436d6uhilprsgmr3ik;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/parmetis-4.0.3-lq6aryhur6qn3trc2qxizvz4nae5ngzf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/metis-5.1.0-pyrzcrzqvl6q27kk637o2nwi3j7ibseb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/gmake-4.4.1-y2kaxrqjbg3dcwo7dzfphztusfjqoowq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/blt-0.5.3-iljv7wrfi4r5i4drs4yf65rgsuunaxjn;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -67,7 +67,7 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_07_27_04_50_44/gcc-10.3.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu" CACHE PATH "") @@ -79,11 +79,11 @@ set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv" CACHE PA set(LUA_DIR "/usr" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-sq37cauj2vgwwkl66vngtztqu34pemzs" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-yvwkknlopetovjrbxfs3qjhifjsf4xmh" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-gjcfvl7y56sgldblilf4pktgdlnhflzp" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp" CACHE PATH "") # scr not built @@ -91,7 +91,7 @@ set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-gjcfvl7y56sgldblilf4pktgdlnhflzp" CACHE # Devtools #------------------------------------------------------------------------------ -set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_05_18_11_52_05/._view/btoxy5ovdbouub2brzxcmjwzdhvzatlc" CACHE PATH "") +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_10_17_16_15_32/._view/ypfidjpdm7fhkqcpekza67w5xgiaw7yg" CACHE PATH "") set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0/bin/clang-format" CACHE PATH "") @@ -105,6 +105,6 @@ set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "" set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.8.14/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") diff --git a/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake new file mode 100644 index 0000000000..da75f66931 --- /dev/null +++ b/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake @@ -0,0 +1,110 @@ +#------------------------------------------------------------------------------ +# !!!! This is a generated file, edit at own risk !!!! +#------------------------------------------------------------------------------ +# CMake executable path: /usr/tce/bin/cmake +#------------------------------------------------------------------------------ + +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/hypre-2.24.0-qdjyl5ibcpl4nxb6t5godfgvi5bb6hac;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/parmetis-4.0.3-nqxoj5gqogj32hfo5ognkcb6vg24zdlc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/metis-5.1.0-tb5bijmooj2d6d2npjpajcj4fyu4yd4y;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/gmake-4.4.1-e3r4ry6vgi7zp4mbwfokypkutqwpctek;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/blt-0.5.3-i7qltms7ksyz4xltznzbtsafywrykq7b;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/usr/tce" CACHE PATH "") + +set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") + +#------------------------------------------------------------------------------ +# Compilers +#------------------------------------------------------------------------------ +# Compiler Spec: intel@=2022.1.0 +#------------------------------------------------------------------------------ +if(DEFINED ENV{SPACK_CC}) + + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/spack/lib/spack/env/intel/icc" CACHE PATH "") + + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/spack/lib/spack/env/intel/icpc" CACHE PATH "") + + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/spack/lib/spack/env/intel/ifort" CACHE PATH "") + +else() + + set(CMAKE_C_COMPILER "/usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icx" CACHE PATH "") + + set(CMAKE_CXX_COMPILER "/usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/icpx" CACHE PATH "") + + set(CMAKE_Fortran_COMPILER "/usr/tce/packages/intel/intel-2022.1.0/compiler/2022.1.0/linux/bin/ifx" CACHE PATH "") + +endif() + +set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") + +set(ENABLE_FORTRAN ON CACHE BOOL "") + +#------------------------------------------------------------------------------ +# MPI +#------------------------------------------------------------------------------ + +set(MPI_C_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0/bin/mpicc" CACHE PATH "") + +set(MPI_CXX_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0/bin/mpicxx" CACHE PATH "") + +set(MPI_Fortran_COMPILER "/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0/bin/mpif90" CACHE PATH "") + +set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") + +set(ENABLE_MPI ON CACHE BOOL "") + +set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "") + +#------------------------------------------------------------------------------ +# Hardware +#------------------------------------------------------------------------------ + +#------------------------------------------------ +# Hardware Specifics +#------------------------------------------------ + +set(ENABLE_OPENMP ON CACHE BOOL "") + +set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") + +#------------------------------------------------------------------------------ +# TPLs +#------------------------------------------------------------------------------ + +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0" CACHE PATH "") + +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i" CACHE PATH "") + +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa" CACHE PATH "") + +set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj" CACHE PATH "") + +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg" CACHE PATH "") + +set(LUA_DIR "/usr" CACHE PATH "") + +set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up" CACHE PATH "") + +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5" CACHE PATH "") + +set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4" CACHE PATH "") + +# scr not built + +#------------------------------------------------------------------------------ +# Devtools +#------------------------------------------------------------------------------ + +set(DEVTOOLS_ROOT "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/2023_10_17_16_15_32/._view/ypfidjpdm7fhkqcpekza67w5xgiaw7yg" CACHE PATH "") + +set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0/bin/clang-format" CACHE PATH "") + +set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") + +set(ENABLE_DOCS ON CACHE BOOL "") + +set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") + +set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") + +set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") + +set(DOXYGEN_EXECUTABLE "${DEVTOOLS_ROOT}/doxygen-1.9.6/bin/doxygen" CACHE PATH "") + + From 87333d007e00da657f4556c628227a09a1af0b47 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 24 Oct 2023 14:58:02 -0700 Subject: [PATCH 149/639] Documentation comment change. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index f749c38e2f..1197a1cf85 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -60,7 +60,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase /*! @brief Initialize data to a blueprint domain. @param dom Blueprint structured mesh domain - @param coordsetPath Where coordinates are in dom + @param topologyName Name of mesh topology (see blueprint + mesh documentation) @param fcnFieldName Name of nodal function is in dom @param maskFieldName Name of integer cell mask function is in dom From 74021d7f7be27ce3c4f8b9c432114a7f93486cd2 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 26 Oct 2023 08:44:45 -0700 Subject: [PATCH 150/639] Reformat. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index daf27cdf33..241da7d87a 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -334,14 +334,14 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { crossingsView[n].firstSurfaceCellId = prefixSumView[n]; }; -#if defined(AXOM_USE_RAJA) - // Intel oneAPI compiler segfaults with OpenMP RAJA scan - #ifdef __INTEL_LLVM_COMPILER + #if defined(AXOM_USE_RAJA) + // Intel oneAPI compiler segfaults with OpenMP RAJA scan + #ifdef __INTEL_LLVM_COMPILER using ScanPolicy = typename axom::execution_space::loop_policy; - #else + #else using ScanPolicy = typename axom::execution_space::loop_policy; - #endif + #endif RAJA::exclusive_scan( RAJA::make_span(addCellsView.data(), m_crossingCount), RAJA::make_span(prefixSumView.data(), m_crossingCount), From 340f836439e23e25a2d2b809d863f536f5d47279 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 26 Sep 2023 15:55:12 -0700 Subject: [PATCH 151/639] Verify right-handedness for hexahedra; adjust hexahedral diagrams --- src/axom/primal/geometry/Hexahedron.hpp | 18 ++++----- src/axom/primal/geometry/Polyhedron.hpp | 17 ++++---- src/axom/primal/tests/primal_hexahedron.cpp | 44 ++++++++++++++++----- src/axom/primal/tests/primal_polyhedron.cpp | 9 +++++ 4 files changed, 62 insertions(+), 26 deletions(-) diff --git a/src/axom/primal/geometry/Hexahedron.hpp b/src/axom/primal/geometry/Hexahedron.hpp index cceb18f060..bb3256c197 100644 --- a/src/axom/primal/geometry/Hexahedron.hpp +++ b/src/axom/primal/geometry/Hexahedron.hpp @@ -39,16 +39,16 @@ namespace primal * * \verbatim * - * U +---------+ V +y - * |\ |\ +z - * | \ | \ < ^ - * | T + --------+ W \ | - * Q +---|-----+ R | \| + * S +---------+ R +y + * |\ |\ + * | \ | \ ^ + * | W + --------+ V | + * P +---|-----+ Q | | * \ | \ | -----> +x - * \ | \ | - * \ | \ | - * P +----------+ S - * + * \ | \ | \ + * \ | \ | \ + * T +----------+ U > + * +z * \endverbatim * */ diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp index eeaf71afc9..a520212d21 100644 --- a/src/axom/primal/geometry/Polyhedron.hpp +++ b/src/axom/primal/geometry/Polyhedron.hpp @@ -680,15 +680,16 @@ class Polyhedron * \note The Hexahedron is assumed to have a specific vertex order: * \verbatim * - * 7--------6 +y - * /| /| +z - * / | / | ^ > - * 3--------2 | | / - * | 4-----|--5 |/ + * 3--------2 +y + * /| /| + * / | / | ^ + * 7--------6 | | + * | 0-----|--1 | * | / | / -----> +x - * |/ |/ - * 0--------1 - * + * |/ |/ / + * 4--------5 / + * < + * +z * \endverbatim * * The Polyhedron's vertex neighbors are created assuming this vertex diff --git a/src/axom/primal/tests/primal_hexahedron.cpp b/src/axom/primal/tests/primal_hexahedron.cpp index 3301d7c904..99f8561746 100644 --- a/src/axom/primal/tests/primal_hexahedron.cpp +++ b/src/axom/primal/tests/primal_hexahedron.cpp @@ -48,17 +48,43 @@ class HexahedronTest : public ::testing::Test { EPS = 1e-8; - // Define coordinates for first hexahedron + /* + * Define coordinates for first hexahedron: + * + * 7 +---------+ 6 +z + * |\ |\ +y + * | \ | \ < ^ + * | 4 + --------+ 5 \ | + * 3 +---|-----+ 2 | \| + * \ | \ | -----> +x + * \ | \ | + * \ | \ | + * 0 +----------+ 1 + * + */ qData0[0] = QPoint {0, 0, 0}; - qData0[1] = QPoint {0, 0, 1}; - qData0[2] = QPoint {1, 0, 1}; - qData0[3] = QPoint {1, 0, 0}; - qData0[4] = QPoint {0, 1, 0}; - qData0[5] = QPoint {0, 1, 1}; + qData0[1] = QPoint {1, 0, 0}; + qData0[2] = QPoint {1, 1, 0}; + qData0[3] = QPoint {0, 1, 0}; + qData0[4] = QPoint {0, 0, 1}; + qData0[5] = QPoint {1, 0, 1}; qData0[6] = QPoint {1, 1, 1}; - qData0[7] = QPoint {1, 1, 0}; - - // Define coordinates for second hexahedron + qData0[7] = QPoint {0, 1, 1}; + + /* + * Define coordinates for second hexahedron: + * + * 3 +---------+ 2 +y + * |\ |\ + * | \ | \ ^ + * | 7 + --------+ 6 | + * 0 +---|-----+ 1 | | + * \ | \ | -----> +x + * \ | \ | \ + * \ | \ | \ + * 4 +----------+ 5 > + * +z + */ qData1[0] = QPoint {-1, 0, 0}; qData1[1] = QPoint {0, 0, 0}; qData1[2] = QPoint {0, 1, 0}; diff --git a/src/axom/primal/tests/primal_polyhedron.cpp b/src/axom/primal/tests/primal_polyhedron.cpp index 9ca2d8d4d3..643a42300a 100644 --- a/src/axom/primal/tests/primal_polyhedron.cpp +++ b/src/axom/primal/tests/primal_polyhedron.cpp @@ -707,6 +707,10 @@ TEST(primal_polyhedron, polyhedron_from_primitive) poly = Polyhedron3D::from_primitive(hex, false); EXPECT_NEAR(1.0, poly.volume(), EPS); + // Check signed volume + EXPECT_NEAR(1.0, poly.signedVolume(), EPS); + EXPECT_NEAR(hex.signedVolume(), poly.signedVolume(), EPS); + // Negative volume axom::utilities::swap(hex[1], hex[3]); axom::utilities::swap(hex[5], hex[7]); @@ -749,11 +753,16 @@ TEST(primal_polyhedron, polyhedron_from_primitive) poly = Polyhedron3D::from_primitive(tet, false); EXPECT_NEAR(2.6666, poly.volume(), EPS); + // Check signed volume + EXPECT_NEAR(2.6666, poly.signedVolume(), EPS); + EXPECT_NEAR(tet.signedVolume(), poly.signedVolume(), EPS); + // Negative volume axom::utilities::swap(tet[1], tet[2]); poly = Polyhedron3D::from_primitive(tet, false); EXPECT_NEAR(-2.6666, poly.signedVolume(), EPS); + EXPECT_NEAR(tet.signedVolume(), poly.signedVolume(), EPS); // Check sign poly = Polyhedron3D::from_primitive(tet, CHECK_SIGN); From ac4f49581ebb3bea3de86525f2e271b844716cf2 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 26 Sep 2023 16:10:02 -0700 Subject: [PATCH 152/639] More hex fixes --- src/axom/primal/geometry/Hexahedron.hpp | 2 +- src/axom/primal/geometry/Polyhedron.hpp | 10 +++++----- src/axom/primal/tests/primal_hexahedron.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/axom/primal/geometry/Hexahedron.hpp b/src/axom/primal/geometry/Hexahedron.hpp index bb3256c197..fcb0cbcf52 100644 --- a/src/axom/primal/geometry/Hexahedron.hpp +++ b/src/axom/primal/geometry/Hexahedron.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp index a520212d21..850ea2cf8d 100644 --- a/src/axom/primal/geometry/Polyhedron.hpp +++ b/src/axom/primal/geometry/Polyhedron.hpp @@ -228,14 +228,14 @@ class NeighborCollection * * 
  *
- *          4--------5          +y
- *         /|       /|               +z
+ *          4--------7          +z
+ *         /|       /|               +y
  *        / |      / |           ^  >
- *       7--------6  |           | /
- *       |  0-----|--1           |/
+ *       5--------6  |           | /
+ *       |  0-----|--3           |/
  *       | /      | /            -----> +x
  *       |/       |/
- *       3--------2
+ *       1--------2
  *
  *
* diff --git a/src/axom/primal/tests/primal_hexahedron.cpp b/src/axom/primal/tests/primal_hexahedron.cpp index 99f8561746..eed83835c4 100644 --- a/src/axom/primal/tests/primal_hexahedron.cpp +++ b/src/axom/primal/tests/primal_hexahedron.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) From 0263d2b3ac2292562c8d64b099fb6c7ea0bbc053 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 26 Sep 2023 16:29:12 -0700 Subject: [PATCH 153/639] Fix tetrahedron axes --- src/axom/primal/geometry/Polyhedron.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp index 850ea2cf8d..a5f3e79030 100644 --- a/src/axom/primal/geometry/Polyhedron.hpp +++ b/src/axom/primal/geometry/Polyhedron.hpp @@ -817,8 +817,8 @@ class Polyhedron * \note The Tetrahedron is assumed to have a specific vertex order: * \verbatim * - * 3 +y - * / \\ +z + * 3 +z + * / \\ +y * / \ \ ^ > * / \ \ | / * / \ \ |/ From 03b5146c3fa08511fae28aab7caa5d189dedbc6d Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 27 Sep 2023 08:43:54 -0700 Subject: [PATCH 154/639] Adjust octahedron example diagram --- src/axom/primal/geometry/Polyhedron.hpp | 43 +++++++++++++------------ 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp index a5f3e79030..b75cfe50a4 100644 --- a/src/axom/primal/geometry/Polyhedron.hpp +++ b/src/axom/primal/geometry/Polyhedron.hpp @@ -228,14 +228,16 @@ class NeighborCollection * * 
  *
- *          4--------7          +z
- *         /|       /|               +y
- *        / |      / |           ^  >
- *       5--------6  |           | /
- *       |  0-----|--3           |/
+ *          3--------2          +y
+ *         /|       /|
+ *        / |      / |           ^
+ *       7--------6  |           |
+ *       |  0-----|--1           |
  *       | /      | /            -----> +x
- *       |/       |/
- *       1--------2
+ *       |/       |/            /
+ *       4--------5            /
+ *                            <
+ *                           +z
  *
  *
* @@ -680,16 +682,15 @@ class Polyhedron * \note The Hexahedron is assumed to have a specific vertex order: * \verbatim * - * 3--------2 +y - * /| /| - * / | / | ^ - * 7--------6 | | - * | 0-----|--1 | + * 4--------7 +z + * /| /| +y + * / | / | ^ > + * 5--------6 | | / + * | 0-----|--3 |/ * | / | / -----> +x - * |/ |/ / - * 4--------5 / - * < - * +z + * |/ |/ + * 1--------2 + * * \endverbatim * * The Polyhedron's vertex neighbors are created assuming this vertex @@ -751,14 +752,14 @@ class Polyhedron * \note The Octahedron is assumed to have a specific vertex order: * \verbatim * - * 0 +y - * /\ +z - * 4 --/ \-- 5 ^ > + * 3 +z + * /\ +y + * 0 --/ \-- 2 ^ > * \/ \ / | / * / \ |/ - * 2 -------- 1 -----> +x + * 4 -------- 5 -----> +x * \/ - * 3 + * 1 * * \endverbatim * From 6473a560008006a1133c0e1d4b493cce1f61931a Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 3 Oct 2023 13:09:32 -0700 Subject: [PATCH 155/639] Fix octahedron vertex ordering for second triangle face --- src/axom/primal/geometry/Polyhedron.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp index b75cfe50a4..109d5592fc 100644 --- a/src/axom/primal/geometry/Polyhedron.hpp +++ b/src/axom/primal/geometry/Polyhedron.hpp @@ -752,12 +752,12 @@ class Polyhedron * \note The Octahedron is assumed to have a specific vertex order: * \verbatim * - * 3 +z + * 4 +z * /\ +y * 0 --/ \-- 2 ^ > * \/ \ / | / * / \ |/ - * 4 -------- 5 -----> +x + * 5 -------- 3 -----> +x * \/ * 1 * From 1a447d9c048f1f2cede779a51bbd31fde4f10201 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 3 Oct 2023 13:47:43 -0700 Subject: [PATCH 156/639] More sanity checks --- src/axom/primal/tests/primal_polyhedron.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/axom/primal/tests/primal_polyhedron.cpp b/src/axom/primal/tests/primal_polyhedron.cpp index 643a42300a..1a11a9f8c3 100644 --- a/src/axom/primal/tests/primal_polyhedron.cpp +++ b/src/axom/primal/tests/primal_polyhedron.cpp @@ -255,6 +255,7 @@ TEST(primal_polyhedron, polyhedron_octahedron) octA.addNeighbors(octA[5], {0, 1, 3, 4}); EXPECT_NEAR(1.3333, octA.volume(), EPS); + EXPECT_NEAR(1.3333, octA.signedVolume(), EPS); PolyhedronType octB; octB.addVertex({1, 0, 0}); @@ -272,6 +273,7 @@ TEST(primal_polyhedron, polyhedron_octahedron) octB.addNeighbors(octB[5], {0, 1, 3, 4}); EXPECT_NEAR(0.6666, octB.volume(), EPS); + EXPECT_NEAR(0.6666, octB.signedVolume(), EPS); } //------------------------------------------------------------------------------ @@ -717,6 +719,7 @@ TEST(primal_polyhedron, polyhedron_from_primitive) poly = Polyhedron3D::from_primitive(hex, false); EXPECT_NEAR(-1.0, poly.signedVolume(), EPS); + EXPECT_NEAR(-1.0, hex.signedVolume(), EPS); // Check sign poly = Polyhedron3D::from_primitive(hex, CHECK_SIGN); From c5aecceadffb46918898c2a3c30fcae408b301bf Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 3 Oct 2023 16:11:19 -0700 Subject: [PATCH 157/639] Add note about coordinate system to docs; add additonal ascii drawing for octahedron --- src/axom/primal/docs/sphinx/primitive.rst | 3 ++ src/axom/primal/geometry/Polyhedron.hpp | 2 ++ src/axom/primal/tests/primal_octahedron.cpp | 37 +++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/src/axom/primal/docs/sphinx/primitive.rst b/src/axom/primal/docs/sphinx/primitive.rst index bc656f0033..9520f16e47 100644 --- a/src/axom/primal/docs/sphinx/primitive.rst +++ b/src/axom/primal/docs/sphinx/primitive.rst @@ -11,6 +11,9 @@ Primal includes the following primitives: - Tetrahedron - Hexahedron - BoundingBox, OrientedBoundingBox +- Polyhedron + +.. note:: Primitives in Axom use a right-handed coordinate system. Primal also provides the NumericArray class, which implements arithmetic operations on numerical tuples and supports Primal's Point and Vector classes. diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp index 109d5592fc..2cf3f0918f 100644 --- a/src/axom/primal/geometry/Polyhedron.hpp +++ b/src/axom/primal/geometry/Polyhedron.hpp @@ -750,6 +750,8 @@ class Polyhedron * vertex neighbors * * \note The Octahedron is assumed to have a specific vertex order: + * (view looking down from +z axis): + * * \verbatim * * 4 +z diff --git a/src/axom/primal/tests/primal_octahedron.cpp b/src/axom/primal/tests/primal_octahedron.cpp index 5dd131a8d0..f1a2d37477 100644 --- a/src/axom/primal/tests/primal_octahedron.cpp +++ b/src/axom/primal/tests/primal_octahedron.cpp @@ -32,6 +32,21 @@ class OctahedronTest : public ::testing::Test { EPS = 1e-12; + /* + * Define coordinates for first octahedron + * (view looking down from +z axis): + * + * 4 +z + * /\ +y + * 0 --/ \-- 2 ^ > + * \/ \ / | / + * / \ |/ + * 5 -------- 3 -----> +x + * \/ + * 1 + * + */ + // Define coordinates for first octahedron qData0[0] = QPoint::make_point(1, 0, 0); qData0[1] = QPoint::make_point(1, 1, 0); @@ -40,6 +55,28 @@ class OctahedronTest : public ::testing::Test qData0[4] = QPoint::make_point(0, 0, 1); qData0[5] = QPoint::make_point(1, 0, 1); + /* + * Define coordinates for second octahedron (regular octahedron): + * + * 3 +z + * / \\ +y + * / \ \ ^ > + * / \ \ | / + * / \ \ |/ + * 4- - - - -\- 2 -----> +x + * / \ / + * /_____________/ + * 5 1 + * \ / + * \ / + * \ / + * \ / + * \ / + * \ / + * \/ + * 0 + */ + // Define coordinates for second octahedron qData1[0] = QPoint::make_point(0, 0, -1); qData1[1] = QPoint::make_point(1, 0, 0); From f1a8fc7b5eafb72f67006aaab6266a188eadc7d8 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 27 Oct 2023 12:22:43 -0700 Subject: [PATCH 158/639] Replace virtual function with functor for device execution. --- .../examples/quest_marching_cubes_example.cpp | 99 ++++++++++++++----- 1 file changed, 75 insertions(+), 24 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index b48c26bbeb..b93ffb27cf 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -663,15 +663,21 @@ static void addToStackArray(axom::StackArray& a, U b) } } -template +/** + ValueFunctorType is a copy-able functor that returns the scalar + function value. It should have operator(const PointType &) return + a double. +*/ +template struct ContourTestBase { static constexpr auto MemorySpace = axom::execution_space::memory_space; using PointType = axom::primal::Point; - ContourTestBase() + ContourTestBase(const ValueFunctorType& valueFunctor) : m_parentCellIdField("parentCellIds") , m_domainIdField("domainIdField") + , m_valueFunctor(valueFunctor) { } virtual ~ContourTestBase() { } @@ -681,14 +687,12 @@ struct ContourTestBase //!@brief Return field name for storing nodal function. virtual std::string functionName() const = 0; - //!@brief Return function value at a point. - virtual AXOM_HOST_DEVICE double value(const PointType& pt) const = 0; - //!@brief Return error tolerance for contour mesh accuracy check. virtual double errorTolerance() const = 0; const std::string m_parentCellIdField; const std::string m_domainIdField; + ValueFunctorType m_valueFunctor; int runTest(BlueprintStructuredMesh& computationalMesh, quest::MarchingCubes& mc) { @@ -854,6 +858,7 @@ struct ContourTestBase } #if defined(AXOM_USE_RAJA) + auto valueFunctor = m_valueFunctor; RAJA::RangeSegment iRange(0, fieldShape[0]); RAJA::RangeSegment jRange(0, fieldShape[1]); using EXEC_POL = @@ -866,8 +871,7 @@ struct ContourTestBase { pt[d] = coordsViews[d](i, j); } - // auto v = value(pt); - fieldView(i, j) = 0.0; // value(pt); + fieldView(i, j) = valueFunctor(pt); }); #else for(axom::IndexType j = 0; j < fieldShape[1]; ++j) @@ -879,11 +883,12 @@ struct ContourTestBase { pt[d] = coordsViews[d](i, j); } - fieldView(i, j) = value(pt); + fieldView(i, j) = m_valueFunctor(pt); } } #endif } + template typename std::enable_if::type populateNodalDistance( const axom::StackArray, DIM>& @@ -896,6 +901,24 @@ struct ContourTestBase SLIC_ASSERT(coordsViews[d].shape() == fieldShape); } + #if defined(AXOM_USE_RAJA) + auto valueFunctor = m_valueFunctor; + RAJA::RangeSegment iRange(0, fieldShape[0]); + RAJA::RangeSegment jRange(0, fieldShape[1]); + RAJA::RangeSegment kRange(0, fieldShape[2]); + using EXEC_POL = + typename axom::mint::internal::structured_exec::loop3d_policy; + RAJA::kernel( + RAJA::make_tuple(iRange, jRange, kRange), + AXOM_LAMBDA(axom::IndexType i, axom::IndexType j, axom::IndexType k) { + PointType pt; + for(int d = 0; d < DIM; ++d) + { + pt[d] = coordsViews[d](i, j, k); + } + fieldView(i, j, k) = valueFunctor(pt); + }); + #else for(axom::IndexType k = 0; k < fieldShape[2]; ++k) { for(axom::IndexType j = 0; j < fieldShape[1]; ++j) @@ -907,10 +930,11 @@ struct ContourTestBase { pt[d] = coordsViews[d](i, j, k); } - fieldView(i, j, k) = value(pt); + fieldView(i, j, k) = m_valueFunctor(pt); } } } + #endif } /* @@ -943,7 +967,7 @@ struct ContourTestBase for(axom::IndexType i = 0; i < nodeCount; ++i) { contourMesh.getNode(i, pt.data()); - double analyticalVal = value(pt); + double analyticalVal = m_valueFunctor(pt); double diff = std::abs(analyticalVal - contourVal); if(diffPtr) { @@ -1221,19 +1245,39 @@ struct ContourTestBase /*! @brief Function providing distance from a point. */ +template +struct RoundFunctor +{ + using PointType = axom::primal::Point; + const axom::primal::Sphere _sphere; + RoundFunctor(const PointType& center) : _sphere(center, 0.0) { } + double operator()(const PointType& pt) const + { + return _sphere.computeSignedDistance(pt); + } +}; template -struct RoundContourTest : public ContourTestBase +struct RoundContourTest + : public ContourTestBase> { static constexpr auto MemorySpace = axom::execution_space::memory_space; using PointType = axom::primal::Point; + using FunctorType = RoundFunctor; + /*! + @brief Constructor. + + @param center [in] Center of ring or sphere + */ RoundContourTest(const PointType& center) - : ContourTestBase() + : ContourTestBase(FunctorType(center)) , _sphere(center, 0.0) + , _roundFunctor(center) , _errTol(1e-3) { } virtual ~RoundContourTest() { } const axom::primal::Sphere _sphere; + FunctorType _roundFunctor; double _errTol; virtual std::string name() const override { return std::string("round"); } @@ -1243,11 +1287,6 @@ struct RoundContourTest : public ContourTestBase return std::string("dist_to_center"); } - AXOM_HOST_DEVICE double value(const PointType& pt) const override - { - return _sphere.computeSignedDistance(pt); - } - double errorTolerance() const override { return _errTol; } void setToleranceByLongestEdge(const BlueprintStructuredMesh& bsm) @@ -1260,12 +1299,28 @@ struct RoundContourTest : public ContourTestBase /*! @brief Function providing signed distance from a plane. */ +template +struct PlanarFunctor +{ + using PointType = axom::primal::Point; + const axom::primal::Plane _plane; + PlanarFunctor(const axom::primal::Vector& perpDir, + const PointType& inPlane) + : _plane(perpDir.unitVector(), inPlane) + { } + double operator()(const PointType& pt) const + { + return _plane.signedDistance(pt); + } +}; template -struct PlanarContourTest : public ContourTestBase +struct PlanarContourTest + : public ContourTestBase> { static constexpr auto MemorySpace = axom::execution_space::memory_space; using PointType = axom::primal::Point; + using FunctorType = PlanarFunctor; /*! @brief Constructor. @@ -1274,7 +1329,8 @@ struct PlanarContourTest : public ContourTestBase */ PlanarContourTest(const PointType& inPlane, const axom::primal::Vector& perpDir) - : ContourTestBase() + : ContourTestBase( + FunctorType(perpDir.unitVector(), inPlane)) , _plane(perpDir.unitVector(), inPlane) { } virtual ~PlanarContourTest() { } @@ -1287,11 +1343,6 @@ struct PlanarContourTest : public ContourTestBase return std::string("dist_to_plane"); } - AXOM_HOST_DEVICE double value(const PointType& pt) const override - { - return _plane.signedDistance(pt); - } - double errorTolerance() const override { return 1e-15; } }; From 749981a4710cc38f43fbf3164adb53895ee79913 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 27 Oct 2023 15:25:09 -0700 Subject: [PATCH 159/639] Unhardwire some strings and prefer topology for finding dimension. --- src/axom/quest/MarchingCubes.cpp | 4 ++-- src/axom/quest/examples/quest_marching_cubes_example.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index adb216f3e8..841b4ea06b 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -183,8 +183,8 @@ void MarchingCubesSingleDomain::setDomain(const conduit::Node& dom) m_dom = &dom; - m_ndim = conduit::blueprint::mesh::coordset::dims( - dom.fetch_existing("coordsets/coords")); + m_ndim = conduit::blueprint::mesh::topology::dims( + dom.fetch_existing(axom::fmt::format("topologies/{}", m_topologyName))); SLIC_ASSERT(m_ndim >= 2 && m_ndim <= 3); const conduit::Node& coordsValues = diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index b93ffb27cf..bbf2afdb75 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -456,7 +456,7 @@ struct BlueprintStructuredMesh double rval = 0.0; - const conduit::Node& cVals = dom.fetch_existing("coordsets/coords/values"); + const conduit::Node& cVals = dom.fetch_existing(_coordsetPath + "/values"); if(_ndims == 2) { axom::ArrayView xs(cVals["x"].as_double_ptr(), @@ -556,7 +556,7 @@ struct BlueprintStructuredMesh SLIC_ASSERT(_mdMesh[0].has_path(_topologyPath)); auto coordsetName = _mdMesh[0].fetch_existing(_topologyPath + "/coordset").as_string(); - _coordsetPath = axom::fmt::format("coordsets/{}/", coordsetName); + _coordsetPath = axom::fmt::format("coordsets/{}", coordsetName); SLIC_ASSERT(_mdMesh[0].has_path(_coordsetPath)); _coordsAreStrided = _mdMesh[0] From 5a7a07ba26a3c172c69e880ac67d40830ce158ed Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 27 Oct 2023 16:22:19 -0700 Subject: [PATCH 160/639] Guard header from multiple includes. --- src/axom/quest/ArrayIndexer.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index 98e9da439f..63acb93942 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -3,6 +3,9 @@ // // SPDX-License-Identifier: (BSD-3-Clause) +#ifndef QUEST_ARRAYINDEXER_HPP_ +#define QUEST_ARRAYINDEXER_HPP_ + #include "axom/core/StackArray.hpp" #include "axom/core/numerics/matvecops.hpp" @@ -10,6 +13,9 @@ namespace axom { /*! @brief Indexing into a multidimensional structured array. + + Supports row-major and column-major ordering and arbitrary + permutations of the indices. */ template class ArrayIndexer @@ -105,3 +111,5 @@ class ArrayIndexer }; } // end namespace axom + +#endif // QUEST_ARRAYINDEXER_HPP_ From 503d9db895c12a15062c9f50256889e0e047a148 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 27 Oct 2023 12:39:14 -0700 Subject: [PATCH 161/639] Working implementation of MarchingCubesImplA. The new implemenatation removes the slow sequential GPU loop. --- src/axom/quest/MarchingCubes.cpp | 33 +- src/axom/quest/MarchingCubes.hpp | 53 +- src/axom/quest/detail/MarchingCubesImpl.hpp | 75 +- src/axom/quest/detail/MarchingCubesImplA.hpp | 851 ++++++++++++++++++ .../examples/quest_marching_cubes_example.cpp | 4 + src/tools/gen-multidom-structured-mesh.py | 4 +- 6 files changed, 973 insertions(+), 47 deletions(-) create mode 100644 src/axom/quest/detail/MarchingCubesImplA.hpp diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 841b4ea06b..ddd96d7938 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -12,6 +12,7 @@ #include "axom/core/execution/execution_space.hpp" #include "axom/quest/MarchingCubes.hpp" #include "axom/quest/detail/MarchingCubesImpl.hpp" + #include "axom/quest/detail/MarchingCubesImplA.hpp" #include "axom/fmt.hpp" namespace axom @@ -30,9 +31,8 @@ MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, , m_maskFieldName(maskField) , m_maskPath(maskField.empty() ? std::string() : "fields/" + maskField) { - const bool isMultidomain = conduit::blueprint::mesh::is_multi_domain(bpMesh); SLIC_ASSERT_MSG( - isMultidomain, + conduit::blueprint::mesh::is_multi_domain(bpMesh), "MarchingCubes class input mesh must be in multidomain format."); m_singles.reserve(conduit::blueprint::mesh::number_of_domains(bpMesh)); @@ -187,11 +187,9 @@ void MarchingCubesSingleDomain::setDomain(const conduit::Node& dom) dom.fetch_existing(axom::fmt::format("topologies/{}", m_topologyName))); SLIC_ASSERT(m_ndim >= 2 && m_ndim <= 3); - const conduit::Node& coordsValues = - dom.fetch_existing(coordsetPath + "/values"); - bool isInterleaved = conduit::blueprint::mcarray::is_interleaved(coordsValues); SLIC_ASSERT_MSG( - !isInterleaved, + !conduit::blueprint::mcarray::is_interleaved( + dom.fetch_existing(coordsetPath + "/values")), "MarchingCubes currently requires contiguous coordinates layout."); } @@ -220,12 +218,27 @@ void MarchingCubesSingleDomain::computeIsocontour(double contourVal) SLIC_ASSERT_MSG(!m_fcnFieldName.empty(), "You must call setFunctionField before computeIsocontour."); - allocateImpl(); + if(1) + { + m_impl = axom::quest::detail::marching_cubes::newMarchingCubesImplA( + m_runtimePolicy, + *m_dom, + m_topologyName, + m_fcnFieldName, + m_maskFieldName); + } + else + { + m_impl = + axom::quest::detail::marching_cubes::newMarchingCubesImpl(m_runtimePolicy, + *m_dom, + m_topologyName, + m_fcnFieldName, + m_maskFieldName); + } m_impl->initialize(*m_dom, m_topologyName, m_fcnFieldName, m_maskFieldName); m_impl->setContourValue(contourVal); - m_impl->markCrossings(); - m_impl->scanCrossings(); - m_impl->computeContour(); + m_impl->computeContourMesh(); } void MarchingCubesSingleDomain::allocateImpl() diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 215a56b0bd..1383264b94 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -204,9 +204,6 @@ class MarchingCubes */ class MarchingCubesSingleDomain { - template - friend class detail::marching_cubes::MarchingCubesImpl; - public: using RuntimePolicy = MarchingCubesRuntimePolicy; /*! @@ -328,25 +325,6 @@ class MarchingCubesSingleDomain return false; } -private: - MarchingCubesRuntimePolicy m_runtimePolicy; - /*! - \brief Computational mesh as a conduit::Node. - */ - const conduit::Node *m_dom; - int m_ndim; - - //!@brief Name of Blueprint topology in m_dom. - const std::string m_topologyName; - - std::string m_fcnFieldName; - //!@brief Path to nodal scalar function in m_dom. - std::string m_fcnPath; - - const std::string m_maskFieldName; - //!@brief Path to mask in m_dom. - const std::string m_maskPath; - /*! @brief Base class for implementations templated on dimension and execution space. @@ -363,16 +341,8 @@ class MarchingCubesSingleDomain const std::string &maskPath) = 0; //!@brief Set the contour value virtual void setContourValue(double contourVal) = 0; - //@{ - //!@name Phases of the computation - //!@brief Mark domain cells that cross the contour. - virtual void markCrossings() = 0; - //!@brief Precompute some metadata for contour mesh. - virtual void scanCrossings() = 0; - //!@brief Generate the contour mesh in internal data format. - virtual void computeContour() = 0; - //!@brief Get the number of contour mesh cells generated. - //@} + //!@brief Compute the contour mesh. + virtual void computeContourMesh() = 0; virtual axom::IndexType getContourCellCount() const = 0; /*! @brief Populate output mesh object with generated contour. @@ -386,6 +356,25 @@ class MarchingCubesSingleDomain virtual ~ImplBase() { } }; +private: + MarchingCubesRuntimePolicy m_runtimePolicy; + /*! + \brief Computational mesh as a conduit::Node. + */ + const conduit::Node *m_dom; + int m_ndim; + + //!@brief Name of Blueprint topology in m_dom. + const std::string m_topologyName; + + std::string m_fcnFieldName; + //!@brief Path to nodal scalar function in m_dom. + std::string m_fcnPath; + + const std::string m_maskFieldName; + //!@brief Path to mask in m_dom. + const std::string m_maskPath; + std::unique_ptr m_impl; //!@brief Allocate implementation object and set m_impl. void allocateImpl(); diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 241da7d87a..db7ae83261 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -103,13 +103,20 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase m_contourVal = contourVal; } + void computeContourMesh() override + { + markCrossings(); + scanCrossings(); + computeContour(); + } + /*! @brief Implementation of virtual markCrossings. Virtual methods cannot be templated, so this implementation delegates to a name templated on DIM. */ - void markCrossings() override { markCrossings_dim(); } + void markCrossings() { markCrossings_dim(); } //!@brief Populate m_caseIds with crossing indices. template @@ -254,7 +261,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase We sum up the number of contour surface cells from the crossings, allocate space, then populate it. */ - void scanCrossings() override + void scanCrossings() { const axom::IndexType parentCellCount = m_caseIds.size(); auto caseIdsView = m_caseIds.view(); @@ -566,7 +573,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase } }; // ComputeContour_Util - void computeContour() override + void computeContour() { auto crossingsView = m_crossings.view(); @@ -867,6 +874,68 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase double m_contourVal = 0.0; }; + +static std::unique_ptr +newMarchingCubesImpl(MarchingCubesRuntimePolicy runtimePolicy, + const conduit::Node& dom, + const std::string& topologyName, + const std::string& fcnFieldName, + const std::string& maskFieldName) +{ + using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; + using RuntimePolicy = axom::quest::MarchingCubesRuntimePolicy; + + int dim = conduit::blueprint::mesh::topology::dims( + dom.fetch_existing(axom::fmt::format("topologies/{}", topologyName))); + SLIC_ASSERT(dim >= 2 && dim <= 3); + std::unique_ptr impl; + if(runtimePolicy == RuntimePolicy::seq) + { + impl = dim == 2 + ? std::unique_ptr( + new MarchingCubesImpl<2, axom::SEQ_EXEC, axom::SEQ_EXEC>) + : std::unique_ptr( + new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); + } + #ifdef _AXOM_MC_USE_OPENMP + else if(runtimePolicy == RuntimePolicy::omp) + { + impl = dim == 2 + ? std::unique_ptr( + new MarchingCubesImpl<2, axom::OMP_EXEC, axom::SEQ_EXEC>) + : std::unique_ptr( + new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>); + } + #endif + #ifdef _AXOM_MC_USE_CUDA + else if(runtimePolicy == RuntimePolicy::cuda) + { + impl = dim == 2 + ? std::unique_ptr( + new MarchingCubesImpl<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>) + : std::unique_ptr( + new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); + } + #endif + #ifdef _AXOM_MC_USE_HIP + else if(runtimePolicy == RuntimePolicy::hip) + { + impl = dim == 2 + ? std::unique_ptr( + new MarchingCubesImpl<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>) + : std::unique_ptr( + new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>); + } + #endif + else + { + SLIC_ERROR(axom::fmt::format( + "MarchingCubesSingleDomain has no implementation for runtime policy {}", + runtimePolicy)); + } + impl->initialize(dom, topologyName, fcnFieldName, maskFieldName); + return impl; +} #endif // AXOM_USE_CONDUIT } // end namespace marching_cubes diff --git a/src/axom/quest/detail/MarchingCubesImplA.hpp b/src/axom/quest/detail/MarchingCubesImplA.hpp new file mode 100644 index 0000000000..ec36a0643d --- /dev/null +++ b/src/axom/quest/detail/MarchingCubesImplA.hpp @@ -0,0 +1,851 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +#include "axom/config.hpp" + +// Implementation requires Conduit. +#ifdef AXOM_USE_CONDUIT + #include "conduit_blueprint.hpp" + + #include "axom/core/execution/execution_space.hpp" + #include "axom/quest/ArrayIndexer.hpp" + #include "axom/quest/detail/marching_cubes_lookup.hpp" + #include "axom/quest/MeshViewUtil.hpp" + #include "axom/primal/geometry/Point.hpp" + #include "axom/primal/constants.hpp" + #include "axom/mint/execution/internal/structured_exec.hpp" + #include "axom/fmt.hpp" + +namespace axom +{ +namespace quest +{ +namespace detail +{ +namespace marching_cubes +{ + +/*! + @brief Computations for MarchingCubesSingleDomain + + Spatial dimension templating is here, to keep out of higher level + classes MarchCubes and MarchingCubesSingleDomain. + + ExecSpace is the general execution space, like axom::SEQ_EXEC and + axom::CUDA_EXEC<256>. +*/ +template +class MarchingCubesImplA : public MarchingCubesSingleDomain::ImplBase +{ +public: + using Point = axom::primal::Point; + using MIdx = axom::StackArray; + using LoopPolicy = typename execution_space::loop_policy; + using ReducePolicy = typename execution_space::reduce_policy; + static constexpr auto MemorySpace = execution_space::memory_space; + /*! + @brief Initialize data to a blueprint domain. + @param dom Blueprint structured mesh domain + @param topologyName Name of mesh topology (see blueprint + mesh documentation) + @param fcnFieldName Name of nodal function is in dom + @param maskFieldName Name of integer cell mask function is in dom + + Set up views to domain data and allocate other data to work on the + given domain. + + The above data from the domain MUST be in a memory space + compatible with ExecSpace. + */ + AXOM_HOST void initialize(const conduit::Node& dom, + const std::string& topologyName, + const std::string& fcnFieldName, + const std::string& maskFieldName = {}) override + { + clear(); + + axom::quest::MeshViewUtil mvu(dom, topologyName); + + m_bShape = mvu.getDomainShape(); + m_coordsViews = mvu.getConstCoordsViews(false); + m_fcnView = mvu.template getConstFieldView(fcnFieldName, false); + if(!maskFieldName.empty()) + { + m_maskView = mvu.template getConstFieldView(maskFieldName, false); + } + + /* + TODO: To get good cache performance, we should make m_caseIds + row-major if fcn is that way, and vice versa. However, Array + only support column-major, so we're stuck with that for now. + */ + m_caseIds = axom::Array(m_bShape); + m_caseIds.fill(0); + } + + //!@brief Set a value to find the contour for. + void setContourValue(double contourVal) override + { + m_contourVal = contourVal; + } + + void computeContourMesh() override + { + markCrossings(); + scanCrossings(); + } + + /*! + @brief Implementation of virtual markCrossings. + + Virtual methods cannot be templated, so this implementation + delegates to a name templated on DIM. + */ + void markCrossings() { markCrossings_dim(); } + + //!@brief Populate m_caseIds with crossing indices. + template + typename std::enable_if::type markCrossings_dim() + { + MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); + + #if defined(AXOM_USE_RAJA) + RAJA::RangeSegment jRange(0, m_bShape[1]); + RAJA::RangeSegment iRange(0, m_bShape[0]); + using EXEC_POL = + typename axom::mint::internal::structured_exec::loop2d_policy; + RAJA::kernel( + RAJA::make_tuple(iRange, jRange), + AXOM_LAMBDA(axom::IndexType i, axom::IndexType j) { + mcu.computeCaseId(i, j); + }); + #else + for(int j = 0; j < m_bShape[1]; ++j) + { + for(int i = 0; i < m_bShape[0]; ++i) + { + mcu.computeCaseId(i, j); + } + } + #endif + } + + //!@brief Populate m_caseIds with crossing indices. + template + typename std::enable_if::type markCrossings_dim() + { + MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); + + #if defined(AXOM_USE_RAJA) + RAJA::RangeSegment kRange(0, m_bShape[2]); + RAJA::RangeSegment jRange(0, m_bShape[1]); + RAJA::RangeSegment iRange(0, m_bShape[0]); + using EXEC_POL = + typename axom::mint::internal::structured_exec::loop3d_policy; + RAJA::kernel( + RAJA::make_tuple(iRange, jRange, kRange), + AXOM_LAMBDA(axom::IndexType i, axom::IndexType j, axom::IndexType k) { + mcu.computeCaseId(i, j, k); + }); + #else + for(int k = 0; k < m_bShape[2]; ++k) + { + for(int j = 0; j < m_bShape[1]; ++j) + { + for(int i = 0; i < m_bShape[0]; ++i) + { + mcu.computeCaseId(i, j, k); + } + } + } + #endif + } + + /*! + @brief Implementation used by MarchingCubesImplA::markCrossings_dim() + containing just the objects needed for that part, to be made available + on devices. + */ + struct MarkCrossings_Util + { + axom::ArrayView caseIdsView; + axom::ArrayView fcnView; + axom::ArrayView maskView; + double contourVal; + MarkCrossings_Util(axom::Array& caseIds, + axom::ArrayView& fcnView_, + axom::ArrayView& maskView_, + double contourVal_) + : caseIdsView(caseIds.view()) + , fcnView(fcnView_) + , maskView(maskView_) + , contourVal(contourVal_) + { } + + //!@brief Compute the case index into cases2D or cases3D. + AXOM_HOST_DEVICE inline int computeCrossingCase(const double* f) const + { + int index = 0; + for(int n = 0; n < CELL_CORNER_COUNT; ++n) + { + if(f[n] >= contourVal) + { + const int bit = (1 << n); + index |= bit; + } + } + return index; + } + + template + AXOM_HOST_DEVICE inline typename std::enable_if::type + computeCaseId(axom::IndexType i, axom::IndexType j) const + { + const bool useZone = maskView.empty() || bool(maskView(i, j)); + if(useZone) + { + // clang-format off + double nodalValues[CELL_CORNER_COUNT] = + {fcnView(i , j ), + fcnView(i + 1, j ), + fcnView(i + 1, j + 1), + fcnView(i , j + 1)}; + // clang-format on + caseIdsView(i, j) = computeCrossingCase(nodalValues); + } + } + + //!@brief Populate m_caseIds with crossing indices. + template + AXOM_HOST_DEVICE inline typename std::enable_if::type + computeCaseId(axom::IndexType i, axom::IndexType j, axom::IndexType k) const + { + const bool useZone = maskView.empty() || bool(maskView(i, j, k)); + if(useZone) + { + // clang-format off + double nodalValues[CELL_CORNER_COUNT] = + {fcnView(i + 1, j , k ), + fcnView(i + 1, j + 1, k ), + fcnView(i , j + 1, k ), + fcnView(i , j , k ), + fcnView(i + 1, j , k + 1), + fcnView(i + 1, j + 1, k + 1), + fcnView(i , j + 1, k + 1), + fcnView(i , j , k + 1)}; + // clang-format on + caseIdsView(i, j, k) = computeCrossingCase(nodalValues); + } + } + }; // MarkCrossings_Util + + /*! + @brief Populate the 1D m_contourNodeCoords, m_contourCellCorners + and m_contourCellParents arrays that defines the unstructured + contour mesh. + */ + void scanCrossings() + { + #ifdef __INTEL_LLVM_COMPILER + // Intel oneAPI compiler segfaults with OpenMP RAJA scan + using ScanPolicy = + typename axom::execution_space::loop_policy; + #else + using ScanPolicy = typename axom::execution_space::loop_policy; + #endif + + const axom::IndexType parentCellCount = m_caseIds.size(); + auto caseIdsView = m_caseIds.view(); + + #if defined(AXOM_USE_RAJA) + // Compute number of surface facets added by each parent cell. + m_addFacets.resize(parentCellCount); + const axom::ArrayView addFacetsView = m_addFacets.view(); + axom::for_all(0, parentCellCount, + AXOM_LAMBDA(axom::IndexType parentCellId) { + addFacetsView.flatIndex(parentCellId) = + num_contour_cells( + caseIdsView.flatIndex(parentCellId)); + }); + + // Compute index of first facet added by each parent cell + // (whether the cell generates any facet!). + m_firstFacetIds.resize(parentCellCount); + const axom::ArrayView firstFacetIdsView = + m_firstFacetIds.view(); + RAJA::exclusive_scan( + RAJA::make_span(addFacetsView.data(), parentCellCount), + RAJA::make_span(firstFacetIdsView.data(), parentCellCount), + RAJA::operators::plus {}); + + // m_addFacets and m_firstFacetIds, combined with m_caseIds, + // are all we need to compute the surface mesh. + #else + SLIC_ERROR("Incomplete coding in scanCrossings!"); + #endif + + // Compute number of facets in domain. + // In case data is on device, copy to host before computing. + axom::IndexType firstFacetIds_back=0; + axom::IndexType addFacets_back=0; + axom::copy(&firstFacetIds_back, + m_firstFacetIds.data() + m_firstFacetIds.size() - 1, + sizeof(firstFacetIds_back)); + axom::copy(&addFacets_back, + m_addFacets.data() + m_addFacets.size() - 1, + sizeof(addFacets_back)); + m_facetCount = firstFacetIds_back + addFacets_back; + + // Allocate space for surface mesh. + const axom::IndexType cornersCount = DIM * m_facetCount; + m_contourCellParents.resize(m_facetCount); + m_contourCellCorners.resize(m_facetCount); + m_contourNodeCoords.resize(cornersCount); + + // + // Fill in surface mesh data. + // + + auto contourCellParentsView = m_contourCellParents.view(); + auto contourCellCornersView = m_contourCellCorners.view(); + auto contourNodeCoordsView = m_contourNodeCoords.view(); + + ComputeContour_Util ccu(m_contourVal, + m_caseIds.strides(), + m_fcnView, + m_coordsViews); + auto gen_for_parent_cell = + AXOM_LAMBDA(axom::IndexType parentCellId) + { + Point cornerCoords[CELL_CORNER_COUNT]; + double cornerValues[CELL_CORNER_COUNT]; + ccu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); + + auto additionalFacets = addFacetsView[parentCellId]; + auto firstFacetId = firstFacetIdsView[parentCellId]; + + auto caseId = caseIdsView.flatIndex(parentCellId); + + for(axom::IndexType fId = 0; fId < additionalFacets; ++fId) + { + axom::IndexType newFacetId = firstFacetId + fId; + axom::IndexType firstCornerId = newFacetId * DIM; + + contourCellParentsView[newFacetId] = parentCellId; + + for(axom::IndexType d = 0; d < DIM; ++d) + { + axom::IndexType newCornerId = firstCornerId + d; + contourCellCornersView[newFacetId][d] = newCornerId; + + int edge = cases_table(caseId, fId*DIM + d); + ccu.linear_interp(edge, + cornerCoords, + cornerValues, + contourNodeCoordsView[newCornerId]); + } + } + }; + axom::for_all(0, parentCellCount, gen_for_parent_cell); + + } + + /*! + @brief Implementation used by MarchingCubesImplA::computeContour(). + containing just the objects needed for that part, to be made available + on devices. + */ + struct ComputeContour_Util + { + double contourVal; + MIdx bStrides; + axom::ArrayIndexer indexer; + axom::ArrayView fcnView; + axom::StackArray, DIM> coordsViews; + ComputeContour_Util( + double contourVal_, + const MIdx& bStrides_, + const axom::ArrayView& fcnView_, + const axom::StackArray, DIM> + coordsViews_) + : contourVal(contourVal_) + , bStrides(bStrides_) + , indexer(bStrides_) + , fcnView(fcnView_) + , coordsViews(coordsViews_) + { } + + template + AXOM_HOST_DEVICE typename std::enable_if::type + get_corner_coords_and_values(IndexType cellNum, + Point cornerCoords[], + double cornerValues[]) const + { + const auto& x = coordsViews[0]; + const auto& y = coordsViews[1]; + + const auto c = indexer.toMultiIndex(cellNum); + const auto& i = c[0]; + const auto& j = c[1]; + + // clang-format off + cornerCoords[0] = { x(i , j ), y(i , j ) }; + cornerCoords[1] = { x(i+1, j ), y(i+1, j ) }; + cornerCoords[2] = { x(i+1, j+1), y(i+1, j+1) }; + cornerCoords[3] = { x(i , j+1), y(i , j+1) }; + + cornerValues[0] = fcnView(i , j ); + cornerValues[1] = fcnView(i+1, j ); + cornerValues[2] = fcnView(i+1, j+1); + cornerValues[3] = fcnView(i , j+1); + // clang-format on + } + template + AXOM_HOST_DEVICE typename std::enable_if::type + get_corner_coords_and_values(IndexType cellNum, + Point cornerCoords[], + double cornerValues[]) const + { + const auto& x = coordsViews[0]; + const auto& y = coordsViews[1]; + const auto& z = coordsViews[2]; + + const auto c = indexer.toMultiIndex(cellNum); + const auto& i = c[0]; + const auto& j = c[1]; + const auto& k = c[2]; + + // clang-format off + cornerCoords[0] = { x(i+1, j , k ), y(i+1, j , k ), z(i+1, j , k ) }; + cornerCoords[1] = { x(i+1, j+1, k ), y(i+1, j+1, k ), z(i+1, j+1, k ) }; + cornerCoords[2] = { x(i , j+1, k ), y(i , j+1, k ), z(i , j+1, k ) }; + cornerCoords[3] = { x(i , j , k ), y(i , j , k ), z(i , j , k ) }; + cornerCoords[4] = { x(i+1, j , k+1), y(i+1, j , k+1), z(i+1, j , k+1) }; + cornerCoords[5] = { x(i+1, j+1, k+1), y(i+1, j+1, k+1), z(i+1, j+1, k+1) }; + cornerCoords[6] = { x(i , j+1, k+1), y(i , j+1, k+1), z(i , j+1, k+1) }; + cornerCoords[7] = { x(i , j , k+1), y(i , j , k+1), z(i , j , k+1) }; + + cornerValues[0] = fcnView(i+1, j , k ); + cornerValues[1] = fcnView(i+1, j+1, k ); + cornerValues[2] = fcnView(i , j+1, k ); + cornerValues[3] = fcnView(i , j , k ); + cornerValues[4] = fcnView(i+1, j , k+1); + cornerValues[5] = fcnView(i+1, j+1, k+1); + cornerValues[6] = fcnView(i , j+1, k+1); + cornerValues[7] = fcnView(i , j , k+1); + // clang-format on + } + + //!@brief Interpolate for the contour location crossing a parent edge. + template + AXOM_HOST_DEVICE typename std::enable_if::type linear_interp( + int edgeIdx, + const Point cornerCoords[4], + const double nodeValues[4], + Point& crossingPt) const + { + // STEP 0: get the edge node indices + // 2 nodes define the edge. n1 and n2 are the indices of + // the nodes w.r.t. the square or cubic zone. There is a + // agreed-on ordering of these indices in the arrays xx, yy, + // zz, nodeValues, crossingPt. + int n1 = edgeIdx; + int n2 = (edgeIdx == 3) ? 0 : edgeIdx + 1; + + // STEP 1: get the fields and coordinates from the two points + const double f1 = nodeValues[n1]; + const double f2 = nodeValues[n2]; + + const Point& p1 = cornerCoords[n1]; + const Point& p2 = cornerCoords[n2]; + + // STEP 2: check whether the interpolated point is at one of the two corners. + if(axom::utilities::isNearlyEqual(contourVal, f1) || + axom::utilities::isNearlyEqual(f1, f2)) + { + crossingPt = p1; + return; + } + + if(axom::utilities::isNearlyEqual(contourVal, f2)) + { + crossingPt = p2; + return; + } + + // STEP 3: point is in between the edge points, interpolate its position + constexpr double ptiny = axom::primal::PRIMAL_TINY; + const double df = f2 - f1 + ptiny; //add ptiny to avoid division by zero + const double w = (contourVal - f1) / df; + for(int d = 0; d < DIM; ++d) + { + crossingPt[d] = p1[d] + w * (p2[d] - p1[d]); + } + } + + //!@brief Interpolate for the contour location crossing a parent edge. + template + AXOM_HOST_DEVICE typename std::enable_if::type linear_interp( + int edgeIdx, + const Point cornerCoords[8], + const double nodeValues[8], + Point& crossingPt) const + { + // STEP 0: get the edge node indices + // 2 nodes define the edge. n1 and n2 are the indices of + // the nodes w.r.t. the square or cubic zone. There is a + // agreed-on ordering of these indices in the arrays + // cornerCoords, nodeValues, hex_edge_table. + const int hex_edge_table[] = { + 0, 1, 1, 2, 2, 3, 3, 0, // base + 4, 5, 5, 6, 6, 7, 7, 4, // top + 0, 4, 1, 5, 2, 6, 3, 7 // vertical + }; + + int n1 = hex_edge_table[edgeIdx * 2]; + int n2 = hex_edge_table[edgeIdx * 2 + 1]; + + // STEP 1: get the fields and coordinates from the two points + const double f1 = nodeValues[n1]; + const double f2 = nodeValues[n2]; + + const Point& p1 = cornerCoords[n1]; + const Point& p2 = cornerCoords[n2]; + + // STEP 2: check whether the interpolated point is at one of the two corners. + if(axom::utilities::isNearlyEqual(contourVal, f1) || + axom::utilities::isNearlyEqual(f1, f2)) + { + crossingPt = p1; + return; + } + + if(axom::utilities::isNearlyEqual(contourVal, f2)) + { + crossingPt = p2; + return; + } + + // STEP 3: point is not at corner; interpolate its position + constexpr double ptiny = axom::primal::PRIMAL_TINY; + const double df = f2 - f1 + ptiny; //add ptiny to avoid division by zero + const double w = (contourVal - f1) / df; + for(int d = 0; d < DIM; ++d) + { + crossingPt[d] = p1[d] + w * (p2[d] - p1[d]); + } + } + }; // ComputeContour_Util + + // These 4 functions provide access to the look-up table + // whether on host or device. Is there a more elegant way + // to put static 1D and 2D arrays on both host and device? BTNG. + + template + AXOM_HOST_DEVICE inline typename std::enable_if::type + num_contour_cells(int iCase) const + { + #define _MC_LOOKUP_NUM_SEGMENTS + #include "marching_cubes_lookup.hpp" + #undef _MC_LOOKUP_NUM_SEGMENTS + SLIC_ASSERT(iCase >= 0 && iCase < 16); + return num_segments[iCase]; + } + + template + AXOM_HOST_DEVICE inline typename std::enable_if::type + cases_table(int iCase, int iEdge) const + { + #define _MC_LOOKUP_CASES2D + #include "marching_cubes_lookup.hpp" + #undef _MC_LOOKUP_CASES2D + SLIC_ASSERT(iCase >= 0 && iCase < 16); + return cases2D[iCase][iEdge]; + } + + template + AXOM_HOST_DEVICE inline typename std::enable_if::type + num_contour_cells(int iCase) const + { + #define _MC_LOOKUP_NUM_TRIANGLES + #include "marching_cubes_lookup.hpp" + #undef _MC_LOOKUP_NUM_TRIANGLES + SLIC_ASSERT(iCase >= 0 && iCase < 256); + return num_triangles[iCase]; + } + + template + AXOM_HOST_DEVICE inline typename std::enable_if::type + cases_table(int iCase, int iEdge) const + { + #define _MC_LOOKUP_CASES3D + #include "marching_cubes_lookup.hpp" + #undef _MC_LOOKUP_CASES3D + SLIC_ASSERT(iCase >= 0 && iCase < 256); + return cases3D[iCase][iEdge]; + } + + /*! + @brief Output contour mesh to a mint::UnstructuredMesh object. + */ + void populateContourMesh( + axom::mint::UnstructuredMesh& mesh, + const std::string& cellIdField) const override + { + auto internalAllocatorID = axom::execution_space::allocatorID(); + auto hostAllocatorID = axom::execution_space::allocatorID(); + + /* + mint uses host memory. If internal memory is on the host, use + it. Otherwise, make a temporary copy of it on the host. + */ + if(internalAllocatorID == hostAllocatorID) + { + populateContourMesh(mesh, + cellIdField, + m_contourNodeCoords, + m_contourCellCorners, + m_contourCellParents); + } + else + { + axom::Array contourNodeCoords( + m_contourNodeCoords, + hostAllocatorID); + axom::Array contourCellCorners( + m_contourCellCorners, + hostAllocatorID); + axom::Array contourCellParents( + m_contourCellParents, + hostAllocatorID); + + populateContourMesh(mesh, + cellIdField, + contourNodeCoords, + contourCellCorners, + contourCellParents); + } + } + + //!@brief Output contour mesh to a mint::UnstructuredMesh object. + void populateContourMesh( + axom::mint::UnstructuredMesh& mesh, + const std::string& cellIdField, + const axom::Array contourNodeCoords, + const axom::Array contourCellCorners, + const axom::Array contourCellParents) const + { + if(!cellIdField.empty() && + !mesh.hasField(cellIdField, axom::mint::CELL_CENTERED)) + { + mesh.createField(cellIdField, + axom::mint::CELL_CENTERED, + DIM); + } + + const axom::IndexType addedCellCount = contourCellCorners.size(); + const axom::IndexType addedNodeCount = contourNodeCoords.size(); + if(addedCellCount != 0) + { + const axom::IndexType priorCellCount = mesh.getNumberOfCells(); + const axom::IndexType priorNodeCount = mesh.getNumberOfNodes(); + mesh.reserveNodes(priorNodeCount + addedNodeCount); + mesh.reserveCells(priorCellCount + addedCellCount); + + mesh.appendNodes((double*)contourNodeCoords.data(), + contourNodeCoords.size()); + for(int n = 0; n < addedCellCount; ++n) + { + MIdx cornerIds = contourCellCorners[n]; + // Bump corner indices by priorNodeCount to avoid indices + // used by other parents domains. + for(int d = 0; d < DIM; ++d) + { + cornerIds[d] += priorNodeCount; + } + mesh.appendCell(cornerIds); + } + axom::IndexType numComponents = -1; + axom::IndexType* cellIdPtr = + mesh.getFieldPtr(cellIdField, + axom::mint::CELL_CENTERED, + numComponents); + SLIC_ASSERT(numComponents == DIM); + axom::ArrayView> cellIdView( + (axom::StackArray*)cellIdPtr, + priorCellCount + addedCellCount); + axom::ArrayIndexer si(m_caseIds.shape(), 'c'); + for(axom::IndexType i = 0; i < addedCellCount; ++i) + { + cellIdView[priorCellCount + i] = si.toMultiIndex(contourCellParents[i]); + } + } + } + + //!@brief Compute the case index into cases2D or cases3D. + AXOM_HOST_DEVICE inline int compute_crossing_case(const double* f) const + { + int index = 0; + for(int n = 0; n < CELL_CORNER_COUNT; ++n) + { + if(f[n] >= m_contourVal) + { + const int bit = (1 << n); + index |= bit; + } + } + return index; + } + + //!@brief Clear data so you can rerun with a different contour value. + void clear() + { + m_contourNodeCoords.clear(); + m_contourCellCorners.clear(); + m_contourCellParents.clear(); + m_crossingCount = 0; + m_facetCount = 0; + } + + /*! + @brief Constructor. + */ + MarchingCubesImplA() + : m_contourNodeCoords(0, 0) + , m_contourCellCorners(0, 0) + , m_contourCellParents(0, 0) + { } + + /*! + @brief Info for a parent cell intersecting the contour surface. + */ + struct CrossingInfo + { + CrossingInfo() { } + CrossingInfo(axom::IndexType parentCellNum_, std::uint16_t caseNum_) + : parentCellNum(parentCellNum_) + , caseNum(caseNum_) + , firstSurfaceCellId(std::numeric_limits::max()) + { } + axom::IndexType parentCellNum; //!< @brief Flat index of parent cell in m_caseIds. + std::uint16_t caseNum; //!< @brief Index in cases2D or cases3D + axom::IndexType firstSurfaceCellId; //!< @brief First index for generated cells. + }; + +private: + MIdx m_bShape; //!< @brief Blueprint cell data shape. + + // Views of parent domain data. + // DIM coordinate components, each on a DIM-dimensional mesh. + using CoordViews = + axom::StackArray, DIM>; + CoordViews m_coordsViews; + axom::ArrayView m_fcnView; + axom::ArrayView m_maskView; + + //!@brief Crossing case for each computational mesh cell. + axom::Array m_caseIds; + + //!@brief Number of parent cells crossing the contour surface. + axom::IndexType m_crossingCount = 0; + + //!@brief Number of surface mesh facets added by computational mesh cells. + axom::Array m_addFacets; + + //!@brief First index of facets in computational mesh cells. + axom::Array m_firstFacetIds; + + //!@brief Number of contour surface cells from crossings. + axom::IndexType m_facetCount = 0; + axom::IndexType getContourCellCount() const override + { + return m_facetCount; + } + + //!@brief Number of corners (nodes) on each parent cell. + static constexpr std::uint8_t CELL_CORNER_COUNT = (DIM == 3) ? 8 : 4; + + //!@name Internal representation of generated contour mesh. + //@{ + //!@brief Coordinates of generated surface mesh nodes. + axom::Array m_contourNodeCoords; + + //!@brief Corners (index into m_contourNodeCoords) of generated contour cells. + axom::Array m_contourCellCorners; + + //!@brief Flat index of computational cell crossing the contour cell. + axom::Array m_contourCellParents; + //@} + + double m_contourVal = 0.0; +}; + +static std::unique_ptr newMarchingCubesImplA( + MarchingCubesRuntimePolicy runtimePolicy, + const conduit::Node &dom, + const std::string &topologyName, + const std::string &fcnFieldName, + const std::string &maskFieldName) +{ + using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; + using RuntimePolicy = axom::quest::MarchingCubesRuntimePolicy; + + int dim = conduit::blueprint::mesh::topology::dims( + dom.fetch_existing(axom::fmt::format("topologies/{}", topologyName))); + SLIC_ASSERT(dim >= 2 && dim <= 3); + std::unique_ptr impl; + if(runtimePolicy == RuntimePolicy::seq) + { + impl = dim == 2 + ? std::unique_ptr( + new MarchingCubesImplA<2, axom::SEQ_EXEC>) + : std::unique_ptr( + new MarchingCubesImplA<3, axom::SEQ_EXEC>); + } +#ifdef _AXOM_MC_USE_OPENMP + else if(runtimePolicy == RuntimePolicy::omp) + { + impl = dim == 2 + ? std::unique_ptr( + new MarchingCubesImplA<2, axom::OMP_EXEC>) + : std::unique_ptr( + new MarchingCubesImplA<3, axom::OMP_EXEC>); + } +#endif +#ifdef _AXOM_MC_USE_CUDA + else if(runtimePolicy == RuntimePolicy::cuda) + { + impl = dim == 2 + ? std::unique_ptr( + new MarchingCubesImplA<2, axom::CUDA_EXEC<256>>) + : std::unique_ptr( + new MarchingCubesImplA<3, axom::CUDA_EXEC<256>>); + } +#endif +#ifdef _AXOM_MC_USE_HIP + else if(runtimePolicy == RuntimePolicy::hip) + { + impl = dim == 2 + ? std::unique_ptr( + new MarchingCubesImplA<2, axom::HIP_EXEC<256>>) + : std::unique_ptr( + new MarchingCubesImplA<3, axom::HIP_EXEC<256>>); + } +#endif + else + { + SLIC_ERROR(axom::fmt::format( + "MarchingCubesSingleDomain has no implementation for runtime policy {}", + runtimePolicy)); + } + impl->initialize(dom, topologyName, fcnFieldName, maskFieldName); + return impl; +} +#endif // AXOM_USE_CONDUIT + +} // end namespace marching_cubes +} // end namespace detail +} // end namespace quest +} // end namespace axom diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index bbf2afdb75..593bcb59ad 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -788,7 +788,11 @@ struct ContourTestBase meshGroup, mc.getContourNodeCount(), mc.getContourCellCount()); + axom::utilities::Timer extractTimer(false); + extractTimer.start(); mc.populateContourMesh(contourMesh, m_parentCellIdField, m_domainIdField); + extractTimer.stop(); + printTimingStats(extractTimer, name() + " extract"); int localErrCount = 0; if(params.checkResults) diff --git a/src/tools/gen-multidom-structured-mesh.py b/src/tools/gen-multidom-structured-mesh.py index 34c398ce4b..3c7ca07e12 100755 --- a/src/tools/gen-multidom-structured-mesh.py +++ b/src/tools/gen-multidom-structured-mesh.py @@ -115,8 +115,8 @@ def scale_structured_domain(n, startCoord, endCoord): meshUpper = opts.mu # Convert to np.array to use element-wise arithmetic. -domCounts = np.array(domCounts, dtype=np.int) -meshSize = np.array(meshSize, dtype=np.int) +domCounts = np.array(domCounts, dtype=int) +meshSize = np.array(meshSize, dtype=int) meshLower = np.array(meshLower) meshUpper = np.array(meshUpper) From 552019724b965769561d84b6860c220016f76f83 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sun, 29 Oct 2023 08:15:53 -0700 Subject: [PATCH 162/639] Remove redundant initialization. --- src/axom/quest/MarchingCubes.cpp | 63 +------------------- src/axom/quest/MarchingCubes.hpp | 2 - src/axom/quest/detail/MarchingCubesImpl.hpp | 13 ++-- src/axom/quest/detail/MarchingCubesImplA.hpp | 17 +++--- 4 files changed, 17 insertions(+), 78 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index ddd96d7938..acee953a68 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -221,75 +221,18 @@ void MarchingCubesSingleDomain::computeIsocontour(double contourVal) if(1) { m_impl = axom::quest::detail::marching_cubes::newMarchingCubesImplA( - m_runtimePolicy, - *m_dom, - m_topologyName, - m_fcnFieldName, - m_maskFieldName); + m_runtimePolicy, m_ndim); } else { - m_impl = - axom::quest::detail::marching_cubes::newMarchingCubesImpl(m_runtimePolicy, - *m_dom, - m_topologyName, - m_fcnFieldName, - m_maskFieldName); + m_impl = axom::quest::detail::marching_cubes::newMarchingCubesImpl( + m_runtimePolicy, m_ndim); } m_impl->initialize(*m_dom, m_topologyName, m_fcnFieldName, m_maskFieldName); m_impl->setContourValue(contourVal); m_impl->computeContourMesh(); } -void MarchingCubesSingleDomain::allocateImpl() -{ - using namespace detail::marching_cubes; - if(m_runtimePolicy == RuntimePolicy::seq) - { - m_impl = m_ndim == 2 - ? std::unique_ptr( - new MarchingCubesImpl<2, axom::SEQ_EXEC, axom::SEQ_EXEC>) - : std::unique_ptr( - new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); - } - #ifdef _AXOM_MC_USE_OPENMP - else if(m_runtimePolicy == RuntimePolicy::omp) - { - m_impl = m_ndim == 2 - ? std::unique_ptr( - new MarchingCubesImpl<2, axom::OMP_EXEC, axom::SEQ_EXEC>) - : std::unique_ptr( - new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>); - } - #endif - #ifdef _AXOM_MC_USE_CUDA - else if(m_runtimePolicy == RuntimePolicy::cuda) - { - m_impl = m_ndim == 2 - ? std::unique_ptr( - new MarchingCubesImpl<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>) - : std::unique_ptr( - new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); - } - #endif - #ifdef _AXOM_MC_USE_HIP - else if(m_runtimePolicy == RuntimePolicy::hip) - { - m_impl = m_ndim == 2 - ? std::unique_ptr( - new MarchingCubesImpl<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>) - : std::unique_ptr( - new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>); - } - #endif - else - { - SLIC_ERROR(axom::fmt::format( - "MarchingCubesSingleDomain has no implementation for runtime policy {}", - m_runtimePolicy)); - } -} - #endif // AXOM_USE_CONDUIT } // end namespace quest diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 1383264b94..c5aeb0967f 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -376,8 +376,6 @@ class MarchingCubesSingleDomain const std::string m_maskPath; std::unique_ptr m_impl; - //!@brief Allocate implementation object and set m_impl. - void allocateImpl(); /*! * \brief Set the blueprint single-domain mesh. diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index db7ae83261..6b058f2a67 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -76,6 +76,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const std::string& fcnFieldName, const std::string& maskFieldName = {}) override { + SLIC_ASSERT( + conduit::blueprint::mesh::topology::dims( + dom.fetch_existing(axom::fmt::format("topologies/{}", topologyName))) + == DIM); + clear(); axom::quest::MeshViewUtil mvu(dom, topologyName); @@ -877,16 +882,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase static std::unique_ptr newMarchingCubesImpl(MarchingCubesRuntimePolicy runtimePolicy, - const conduit::Node& dom, - const std::string& topologyName, - const std::string& fcnFieldName, - const std::string& maskFieldName) + int dim) { using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; using RuntimePolicy = axom::quest::MarchingCubesRuntimePolicy; - int dim = conduit::blueprint::mesh::topology::dims( - dom.fetch_existing(axom::fmt::format("topologies/{}", topologyName))); SLIC_ASSERT(dim >= 2 && dim <= 3); std::unique_ptr impl; if(runtimePolicy == RuntimePolicy::seq) @@ -933,7 +933,6 @@ newMarchingCubesImpl(MarchingCubesRuntimePolicy runtimePolicy, "MarchingCubesSingleDomain has no implementation for runtime policy {}", runtimePolicy)); } - impl->initialize(dom, topologyName, fcnFieldName, maskFieldName); return impl; } #endif // AXOM_USE_CONDUIT diff --git a/src/axom/quest/detail/MarchingCubesImplA.hpp b/src/axom/quest/detail/MarchingCubesImplA.hpp index ec36a0643d..c0194d65b5 100644 --- a/src/axom/quest/detail/MarchingCubesImplA.hpp +++ b/src/axom/quest/detail/MarchingCubesImplA.hpp @@ -64,6 +64,11 @@ class MarchingCubesImplA : public MarchingCubesSingleDomain::ImplBase const std::string& fcnFieldName, const std::string& maskFieldName = {}) override { + SLIC_ASSERT( + conduit::blueprint::mesh::topology::dims( + dom.fetch_existing(axom::fmt::format("topologies/{}", topologyName))) + == DIM); + clear(); axom::quest::MeshViewUtil mvu(dom, topologyName); @@ -782,18 +787,13 @@ class MarchingCubesImplA : public MarchingCubesSingleDomain::ImplBase double m_contourVal = 0.0; }; -static std::unique_ptr newMarchingCubesImplA( - MarchingCubesRuntimePolicy runtimePolicy, - const conduit::Node &dom, - const std::string &topologyName, - const std::string &fcnFieldName, - const std::string &maskFieldName) +static std::unique_ptr +newMarchingCubesImplA( MarchingCubesRuntimePolicy runtimePolicy, + int dim) { using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; using RuntimePolicy = axom::quest::MarchingCubesRuntimePolicy; - int dim = conduit::blueprint::mesh::topology::dims( - dom.fetch_existing(axom::fmt::format("topologies/{}", topologyName))); SLIC_ASSERT(dim >= 2 && dim <= 3); std::unique_ptr impl; if(runtimePolicy == RuntimePolicy::seq) @@ -840,7 +840,6 @@ static std::unique_ptr newMarc "MarchingCubesSingleDomain has no implementation for runtime policy {}", runtimePolicy)); } - impl->initialize(dom, topologyName, fcnFieldName, maskFieldName); return impl; } #endif // AXOM_USE_CONDUIT From d3aea416392c25b9724adf6b0d1dd9bd086b4505 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sun, 29 Oct 2023 09:08:50 -0700 Subject: [PATCH 163/639] Reformat and silence a warning. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 9 +++------ src/axom/quest/examples/quest_marching_cubes_example.cpp | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 6b058f2a67..e133fb67c0 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -76,10 +76,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const std::string& fcnFieldName, const std::string& maskFieldName = {}) override { - SLIC_ASSERT( - conduit::blueprint::mesh::topology::dims( - dom.fetch_existing(axom::fmt::format("topologies/{}", topologyName))) - == DIM); + SLIC_ASSERT(conduit::blueprint::mesh::topology::dims(dom.fetch_existing( + axom::fmt::format("topologies/{}", topologyName))) == DIM); clear(); @@ -881,8 +879,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase }; static std::unique_ptr -newMarchingCubesImpl(MarchingCubesRuntimePolicy runtimePolicy, - int dim) +newMarchingCubesImpl(MarchingCubesRuntimePolicy runtimePolicy, int dim) { using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; using RuntimePolicy = axom::quest::MarchingCubesRuntimePolicy; diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 593bcb59ad..3ee005e082 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -841,10 +841,9 @@ struct ContourTestBase const auto coordsViews = mvu.getConstCoordsViews(false); axom::ArrayView fieldView = mvu.template getFieldView(functionName(), false); - const auto& fieldShape = fieldView.shape(); for(int d = 0; d < DIM; ++d) { - SLIC_ASSERT(coordsViews[d].shape() == fieldShape); + SLIC_ASSERT(coordsViews[d].shape() == fieldView.shape()); } populateNodalDistance(coordsViews, fieldView); } From a94f5a4f174d693bbd27ce3b1cf92be8faf7cf7c Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sun, 29 Oct 2023 22:31:51 -0700 Subject: [PATCH 164/639] Choose MarchingCubesImpl for host, MarchingCubesImplA for devices. This decision is based on performance. --- src/axom/quest/MarchingCubes.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index acee953a68..15f91da17a 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -218,15 +218,20 @@ void MarchingCubesSingleDomain::computeIsocontour(double contourVal) SLIC_ASSERT_MSG(!m_fcnFieldName.empty(), "You must call setFunctionField before computeIsocontour."); - if(1) + // We have 2 implementations. MarchingCubesImpl is faster on the host + // and MarchingCubesImplA is faster on GPUs. Both work in all cases, + // but we choose the best one for performance. + if(m_runtimePolicy == axom::quest::MarchingCubesRuntimePolicy::seq) { - m_impl = axom::quest::detail::marching_cubes::newMarchingCubesImplA( - m_runtimePolicy, m_ndim); + m_impl = + axom::quest::detail::marching_cubes::newMarchingCubesImpl(m_runtimePolicy, + m_ndim); } else { - m_impl = axom::quest::detail::marching_cubes::newMarchingCubesImpl( - m_runtimePolicy, m_ndim); + m_impl = + axom::quest::detail::marching_cubes::newMarchingCubesImplA(m_runtimePolicy, + m_ndim); } m_impl->initialize(*m_dom, m_topologyName, m_fcnFieldName, m_maskFieldName); m_impl->setContourValue(contourVal); From ba4c30e6d1ca75e9e701ca1dd4c5b0c00b527add Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 30 Oct 2023 10:28:14 -0700 Subject: [PATCH 165/639] Add +scr variant; enable scr test with SCR_FOUND --- scripts/spack/specs.json | 4 ++-- src/cmake/thirdparty/SetupAxomThirdParty.cmake | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/spack/specs.json b/scripts/spack/specs.json index 15ee34e913..c6527f25b7 100644 --- a/scripts/spack/specs.json +++ b/scripts/spack/specs.json @@ -21,8 +21,8 @@ "intel@19.0.4~openmp+devtools+mfem+c2c" ], "toss_4_x86_64_ib": - [ "gcc@10.3.1+devtools+hdf5+mfem+c2c", - "clang@14.0.6+devtools+hdf5+mfem+c2c", + [ "gcc@10.3.1+devtools+hdf5+mfem+c2c+scr", + "clang@14.0.6+devtools+hdf5+mfem+c2c+scr", "intel@2022.1.0+devtools+hdf5+mfem+c2c" ], "__comment__":"# Use amdgpu_target=gfx90a for tioga/rzvernal; and gfx908 for rznevada", diff --git a/src/cmake/thirdparty/SetupAxomThirdParty.cmake b/src/cmake/thirdparty/SetupAxomThirdParty.cmake index a7ba6e59dc..077c486fc8 100644 --- a/src/cmake/thirdparty/SetupAxomThirdParty.cmake +++ b/src/cmake/thirdparty/SetupAxomThirdParty.cmake @@ -234,6 +234,7 @@ if (SCR_DIR) TREAT_INCLUDES_AS_SYSTEM ON EXPORTABLE ON) blt_list_append(TO TPL_DEPS ELEMENTS scr) + set(SCR_FOUND ON CACHE BOOL "") else() message(STATUS "SCR support is OFF") endif() From e1d00e2ddf5756c487db39e7f5f95fe8f4ae9cfb Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 30 Oct 2023 14:43:48 -0700 Subject: [PATCH 166/639] update rzgenie host-configs with +scr --- ...zgenie-toss_4_x86_64_ib-clang@14.0.6.cmake | 32 +++++++++++++++---- .../rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake | 32 +++++++++++++++---- ...enie-toss_4_x86_64_ib-intel@2022.1.0.cmake | 14 ++++---- 3 files changed, 59 insertions(+), 19 deletions(-) diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake index e508345b68..5de9fdf653 100644 --- a/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake +++ b/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/hypre-2.24.0-bwh42bebp4hiuwzlwcthpgkawape6dp3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/parmetis-4.0.3-jthqwflsj5bpe6onwsb5r2zi5wbx6pq4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/metis-5.1.0-imzig3eih3itpztvvk4yildzgq6aeelo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/gmake-4.4.1-6lgy76r7dbvqm6mbwb2jkpcuycf7tb27;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6/blt-0.5.3-xa3bmu75nkolqiewb5ftk5tp2jpzw57n;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/scr-3.0.1-5edtc4k2wstti2dh4kp2tno7rmwr3lyd;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/spath-0.2.0-gvlnzegcdph7ien3w4tjcxevblf2xe4r;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/libyogrt-1.33-3joihut3xh67qmtalrqadzujfzxwpodj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/er-0.2.0-befo66qsdjjulpnhaxvhk4uil45ynd6u;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/shuffile-0.2.0-j5blkpa2h3keb562qb5pdnfiuzyaecfd;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/redset-0.2.0-tllpyzklkik7oa32us3tigl7vdvil42o;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/rankstr-0.1.0-jkgwo3kyvegaapdtm67mg4aknu44foyn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/dtcmp-1.1.4-u376uqcnt3y7ebu5ocfvk7bovkr2febv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/lwgrp-1.0.5-am6sfml4trdhzlds365vbepezgdvdocz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/axl-0.7.1-t7yboywzjziqb3hbgidynhbk5vd33jc7;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/kvtree-1.3.0-4zcbvvaqpbkdt7xc4pbu7urlkdywjjd7;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/hypre-2.24.0-bwh42bebp4hiuwzlwcthpgkawape6dp3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/parmetis-4.0.3-jthqwflsj5bpe6onwsb5r2zi5wbx6pq4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/metis-5.1.0-imzig3eih3itpztvvk4yildzgq6aeelo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/gmake-4.4.1-6lgy76r7dbvqm6mbwb2jkpcuycf7tb27;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/blt-0.5.3-xa3bmu75nkolqiewb5ftk5tp2jpzw57n;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -69,7 +69,7 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/clang-14.0.6" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy" CACHE PATH "") @@ -87,7 +87,27 @@ set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy" C set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he" CACHE PATH "") -# scr not built +set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-5edtc4k2wstti2dh4kp2tno7rmwr3lyd" CACHE PATH "") + +set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-4zcbvvaqpbkdt7xc4pbu7urlkdywjjd7" CACHE PATH "") + +set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-u376uqcnt3y7ebu5ocfvk7bovkr2febv" CACHE PATH "") + +set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-gvlnzegcdph7ien3w4tjcxevblf2xe4r" CACHE PATH "") + +set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-t7yboywzjziqb3hbgidynhbk5vd33jc7" CACHE PATH "") + +set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-am6sfml4trdhzlds365vbepezgdvdocz" CACHE PATH "") + +set(ER_DIR "${TPL_ROOT}/er-0.2.0-befo66qsdjjulpnhaxvhk4uil45ynd6u" CACHE PATH "") + +set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-jkgwo3kyvegaapdtm67mg4aknu44foyn" CACHE PATH "") + +set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-tllpyzklkik7oa32us3tigl7vdvil42o" CACHE PATH "") + +set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-j5blkpa2h3keb562qb5pdnfiuzyaecfd" CACHE PATH "") + +set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-3joihut3xh67qmtalrqadzujfzxwpodj" CACHE PATH "") #------------------------------------------------------------------------------ # Devtools diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake index 26dc90a0e6..f88cf9eaeb 100644 --- a/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake +++ b/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/hypre-2.24.0-lof7hdy7wsyuei436d6uhilprsgmr3ik;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/parmetis-4.0.3-lq6aryhur6qn3trc2qxizvz4nae5ngzf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/metis-5.1.0-pyrzcrzqvl6q27kk637o2nwi3j7ibseb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/gmake-4.4.1-y2kaxrqjbg3dcwo7dzfphztusfjqoowq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1/blt-0.5.3-iljv7wrfi4r5i4drs4yf65rgsuunaxjn;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/scr-3.0.1-znr5hvdmrpg2wwtcrepv3bzh32visddj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/spath-0.2.0-scp7lun3jtdgorfmd4mzhtieqkjko57q;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/libyogrt-1.33-riegwpsbfjywz6pumvit2eadroiosowy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/er-0.2.0-m7mypt2brwrodmfun3ya2cwpkuwpccnv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/shuffile-0.2.0-74ysb2qi6xkrx7u5vsa2jnmcqof3q4je;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/redset-0.2.0-7bhg5tua2jns5ob7r6stbgitzlfggdax;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/rankstr-0.1.0-yuunbkeetjd4y563p4dzxp23rsdcc6tr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/dtcmp-1.1.4-bk55ioptacxzxnpxcgu27vwk2nacb35s;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/lwgrp-1.0.5-zhpxnopjtpr5cchaqufivi2sn4crkgwn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/axl-0.7.1-b3zz33f7lmeal5thbfyuc6cmbdfek2vv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/kvtree-1.3.0-oeqjobwdjxemywgc77pfuv4nnpxk6buj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/hypre-2.24.0-lof7hdy7wsyuei436d6uhilprsgmr3ik;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/parmetis-4.0.3-lq6aryhur6qn3trc2qxizvz4nae5ngzf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/metis-5.1.0-pyrzcrzqvl6q27kk637o2nwi3j7ibseb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/gmake-4.4.1-y2kaxrqjbg3dcwo7dzfphztusfjqoowq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/blt-0.5.3-iljv7wrfi4r5i4drs4yf65rgsuunaxjn;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -67,7 +67,7 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/gcc-10.3.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu" CACHE PATH "") @@ -85,7 +85,27 @@ set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr" C set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp" CACHE PATH "") -# scr not built +set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-znr5hvdmrpg2wwtcrepv3bzh32visddj" CACHE PATH "") + +set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-oeqjobwdjxemywgc77pfuv4nnpxk6buj" CACHE PATH "") + +set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-bk55ioptacxzxnpxcgu27vwk2nacb35s" CACHE PATH "") + +set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-scp7lun3jtdgorfmd4mzhtieqkjko57q" CACHE PATH "") + +set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-b3zz33f7lmeal5thbfyuc6cmbdfek2vv" CACHE PATH "") + +set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-zhpxnopjtpr5cchaqufivi2sn4crkgwn" CACHE PATH "") + +set(ER_DIR "${TPL_ROOT}/er-0.2.0-m7mypt2brwrodmfun3ya2cwpkuwpccnv" CACHE PATH "") + +set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-yuunbkeetjd4y563p4dzxp23rsdcc6tr" CACHE PATH "") + +set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-7bhg5tua2jns5ob7r6stbgitzlfggdax" CACHE PATH "") + +set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-74ysb2qi6xkrx7u5vsa2jnmcqof3q4je" CACHE PATH "") + +set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-riegwpsbfjywz6pumvit2eadroiosowy" CACHE PATH "") #------------------------------------------------------------------------------ # Devtools diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake index 5bc263df9e..653e160d35 100644 --- a/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake +++ b/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/hypre-2.24.0-qdjyl5ibcpl4nxb6t5godfgvi5bb6hac;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/conduit-0.8.8-32edlc6hrwpchrywdw5xdhcrhiqqjg6n;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/parmetis-4.0.3-nqxoj5gqogj32hfo5ognkcb6vg24zdlc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/metis-5.1.0-tb5bijmooj2d6d2npjpajcj4fyu4yd4y;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/hdf5-1.8.22-e7opxg2skchlv6z6hd4pre35bd6pqv22;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/gmake-4.4.1-e3r4ry6vgi7zp4mbwfokypkutqwpctek;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0/blt-0.5.3-i7qltms7ksyz4xltznzbtsafywrykq7b;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/usr/tce" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/hypre-2.24.0-qdjyl5ibcpl4nxb6t5godfgvi5bb6hac;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/parmetis-4.0.3-nqxoj5gqogj32hfo5ognkcb6vg24zdlc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/metis-5.1.0-tb5bijmooj2d6d2npjpajcj4fyu4yd4y;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/gmake-4.4.1-e3r4ry6vgi7zp4mbwfokypkutqwpctek;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/blt-0.5.3-i7qltms7ksyz4xltznzbtsafywrykq7b;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/usr/tce" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/intel/icc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/intel/icc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/intel/icpc" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/intel/icpc" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/spack/lib/spack/env/intel/ifort" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/intel/ifort" CACHE PATH "") else() @@ -67,15 +67,15 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_09_45_05/intel-2022.1.0" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-32edlc6hrwpchrywdw5xdhcrhiqqjg6n" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i" CACHE PATH "") set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa" CACHE PATH "") set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-e7opxg2skchlv6z6hd4pre35bd6pqv22" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg" CACHE PATH "") set(LUA_DIR "/usr" CACHE PATH "") From 16a43d8cc322abafad9c58046bf5755e6918c41e Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 31 Oct 2023 08:49:27 -0700 Subject: [PATCH 167/639] update rzwhippet configs with +scr --- ...hippet-toss_4_x86_64_ib-clang@14.0.6.cmake | 32 +++++++++++++++---- ...zwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake | 32 +++++++++++++++---- ...ppet-toss_4_x86_64_ib-intel@2022.1.0.cmake | 10 +++--- 3 files changed, 57 insertions(+), 17 deletions(-) diff --git a/host-configs/rzwhippet-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/rzwhippet-toss_4_x86_64_ib-clang@14.0.6.cmake index eca36f01f5..6f74d8f18d 100644 --- a/host-configs/rzwhippet-toss_4_x86_64_ib-clang@14.0.6.cmake +++ b/host-configs/rzwhippet-toss_4_x86_64_ib-clang@14.0.6.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/hypre-2.24.0-bwh42bebp4hiuwzlwcthpgkawape6dp3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/parmetis-4.0.3-jthqwflsj5bpe6onwsb5r2zi5wbx6pq4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/metis-5.1.0-imzig3eih3itpztvvk4yildzgq6aeelo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/gmake-4.4.1-6lgy76r7dbvqm6mbwb2jkpcuycf7tb27;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6/blt-0.5.3-xa3bmu75nkolqiewb5ftk5tp2jpzw57n;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/scr-3.0.1-5edtc4k2wstti2dh4kp2tno7rmwr3lyd;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/spath-0.2.0-gvlnzegcdph7ien3w4tjcxevblf2xe4r;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/libyogrt-1.33-3joihut3xh67qmtalrqadzujfzxwpodj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/er-0.2.0-befo66qsdjjulpnhaxvhk4uil45ynd6u;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/shuffile-0.2.0-j5blkpa2h3keb562qb5pdnfiuzyaecfd;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/redset-0.2.0-tllpyzklkik7oa32us3tigl7vdvil42o;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/rankstr-0.1.0-jkgwo3kyvegaapdtm67mg4aknu44foyn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/dtcmp-1.1.4-u376uqcnt3y7ebu5ocfvk7bovkr2febv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/lwgrp-1.0.5-am6sfml4trdhzlds365vbepezgdvdocz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/axl-0.7.1-t7yboywzjziqb3hbgidynhbk5vd33jc7;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/kvtree-1.3.0-4zcbvvaqpbkdt7xc4pbu7urlkdywjjd7;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/hypre-2.24.0-bwh42bebp4hiuwzlwcthpgkawape6dp3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/parmetis-4.0.3-jthqwflsj5bpe6onwsb5r2zi5wbx6pq4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/metis-5.1.0-imzig3eih3itpztvvk4yildzgq6aeelo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/gmake-4.4.1-6lgy76r7dbvqm6mbwb2jkpcuycf7tb27;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6/blt-0.5.3-xa3bmu75nkolqiewb5ftk5tp2jpzw57n;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -69,7 +69,7 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/clang-14.0.6" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/clang-14.0.6" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy" CACHE PATH "") @@ -87,7 +87,27 @@ set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy" C set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he" CACHE PATH "") -# scr not built +set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-5edtc4k2wstti2dh4kp2tno7rmwr3lyd" CACHE PATH "") + +set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-4zcbvvaqpbkdt7xc4pbu7urlkdywjjd7" CACHE PATH "") + +set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-u376uqcnt3y7ebu5ocfvk7bovkr2febv" CACHE PATH "") + +set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-gvlnzegcdph7ien3w4tjcxevblf2xe4r" CACHE PATH "") + +set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-t7yboywzjziqb3hbgidynhbk5vd33jc7" CACHE PATH "") + +set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-am6sfml4trdhzlds365vbepezgdvdocz" CACHE PATH "") + +set(ER_DIR "${TPL_ROOT}/er-0.2.0-befo66qsdjjulpnhaxvhk4uil45ynd6u" CACHE PATH "") + +set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-jkgwo3kyvegaapdtm67mg4aknu44foyn" CACHE PATH "") + +set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-tllpyzklkik7oa32us3tigl7vdvil42o" CACHE PATH "") + +set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-j5blkpa2h3keb562qb5pdnfiuzyaecfd" CACHE PATH "") + +set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-3joihut3xh67qmtalrqadzujfzxwpodj" CACHE PATH "") #------------------------------------------------------------------------------ # Devtools diff --git a/host-configs/rzwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake b/host-configs/rzwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake index cece8ea159..6fb273f7d8 100644 --- a/host-configs/rzwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake +++ b/host-configs/rzwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/hypre-2.24.0-lof7hdy7wsyuei436d6uhilprsgmr3ik;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/parmetis-4.0.3-lq6aryhur6qn3trc2qxizvz4nae5ngzf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/metis-5.1.0-pyrzcrzqvl6q27kk637o2nwi3j7ibseb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/gmake-4.4.1-y2kaxrqjbg3dcwo7dzfphztusfjqoowq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1/blt-0.5.3-iljv7wrfi4r5i4drs4yf65rgsuunaxjn;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/scr-3.0.1-znr5hvdmrpg2wwtcrepv3bzh32visddj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/spath-0.2.0-scp7lun3jtdgorfmd4mzhtieqkjko57q;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/libyogrt-1.33-riegwpsbfjywz6pumvit2eadroiosowy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/er-0.2.0-m7mypt2brwrodmfun3ya2cwpkuwpccnv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/shuffile-0.2.0-74ysb2qi6xkrx7u5vsa2jnmcqof3q4je;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/redset-0.2.0-7bhg5tua2jns5ob7r6stbgitzlfggdax;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/rankstr-0.1.0-yuunbkeetjd4y563p4dzxp23rsdcc6tr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/dtcmp-1.1.4-bk55ioptacxzxnpxcgu27vwk2nacb35s;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/lwgrp-1.0.5-zhpxnopjtpr5cchaqufivi2sn4crkgwn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/axl-0.7.1-b3zz33f7lmeal5thbfyuc6cmbdfek2vv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/kvtree-1.3.0-oeqjobwdjxemywgc77pfuv4nnpxk6buj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/hypre-2.24.0-lof7hdy7wsyuei436d6uhilprsgmr3ik;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/parmetis-4.0.3-lq6aryhur6qn3trc2qxizvz4nae5ngzf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/metis-5.1.0-pyrzcrzqvl6q27kk637o2nwi3j7ibseb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/gmake-4.4.1-y2kaxrqjbg3dcwo7dzfphztusfjqoowq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1/blt-0.5.3-iljv7wrfi4r5i4drs4yf65rgsuunaxjn;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -67,7 +67,7 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/gcc-10.3.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/gcc-10.3.1" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu" CACHE PATH "") @@ -85,7 +85,27 @@ set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr" C set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp" CACHE PATH "") -# scr not built +set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-znr5hvdmrpg2wwtcrepv3bzh32visddj" CACHE PATH "") + +set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-oeqjobwdjxemywgc77pfuv4nnpxk6buj" CACHE PATH "") + +set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-bk55ioptacxzxnpxcgu27vwk2nacb35s" CACHE PATH "") + +set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-scp7lun3jtdgorfmd4mzhtieqkjko57q" CACHE PATH "") + +set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-b3zz33f7lmeal5thbfyuc6cmbdfek2vv" CACHE PATH "") + +set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-zhpxnopjtpr5cchaqufivi2sn4crkgwn" CACHE PATH "") + +set(ER_DIR "${TPL_ROOT}/er-0.2.0-m7mypt2brwrodmfun3ya2cwpkuwpccnv" CACHE PATH "") + +set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-yuunbkeetjd4y563p4dzxp23rsdcc6tr" CACHE PATH "") + +set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-7bhg5tua2jns5ob7r6stbgitzlfggdax" CACHE PATH "") + +set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-74ysb2qi6xkrx7u5vsa2jnmcqof3q4je" CACHE PATH "") + +set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-riegwpsbfjywz6pumvit2eadroiosowy" CACHE PATH "") #------------------------------------------------------------------------------ # Devtools diff --git a/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake index d88ec5b52e..a85085a337 100644 --- a/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake +++ b/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/hypre-2.24.0-qdjyl5ibcpl4nxb6t5godfgvi5bb6hac;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/parmetis-4.0.3-nqxoj5gqogj32hfo5ognkcb6vg24zdlc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/metis-5.1.0-tb5bijmooj2d6d2npjpajcj4fyu4yd4y;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/gmake-4.4.1-e3r4ry6vgi7zp4mbwfokypkutqwpctek;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0/blt-0.5.3-i7qltms7ksyz4xltznzbtsafywrykq7b;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/usr/tce" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/intel-2022.1.0/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/intel-2022.1.0/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/intel-2022.1.0/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/intel-2022.1.0/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/intel-2022.1.0/hypre-2.24.0-qdjyl5ibcpl4nxb6t5godfgvi5bb6hac;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/intel-2022.1.0/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/intel-2022.1.0/parmetis-4.0.3-nqxoj5gqogj32hfo5ognkcb6vg24zdlc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/intel-2022.1.0/metis-5.1.0-tb5bijmooj2d6d2npjpajcj4fyu4yd4y;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/intel-2022.1.0/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/intel-2022.1.0/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/intel-2022.1.0/gmake-4.4.1-e3r4ry6vgi7zp4mbwfokypkutqwpctek;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/intel-2022.1.0/blt-0.5.3-i7qltms7ksyz4xltznzbtsafywrykq7b;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/usr/tce" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/intel/icc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/spack/lib/spack/env/intel/icc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/intel/icpc" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/spack/lib/spack/env/intel/icpc" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/spack/lib/spack/env/intel/ifort" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/spack/lib/spack/env/intel/ifort" CACHE PATH "") else() @@ -67,7 +67,7 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_18_08_27_25/intel-2022.1.0" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_15_05_41/intel-2022.1.0" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i" CACHE PATH "") From 1ea8966183b769b5b1c2f1bad9cab45558fed6af Mon Sep 17 00:00:00 2001 From: Brian Han Date: Tue, 31 Oct 2023 11:25:53 -0700 Subject: [PATCH 168/639] Add +scr to quartz configs --- ...quartz-toss_4_x86_64_ib-clang@14.0.6.cmake | 32 +++++++++++++++---- .../quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake | 32 +++++++++++++++---- ...artz-toss_4_x86_64_ib-intel@2022.1.0.cmake | 10 +++--- 3 files changed, 57 insertions(+), 17 deletions(-) diff --git a/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake index d1c0bdea03..cdef17bde7 100644 --- a/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake +++ b/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/hypre-2.24.0-bwh42bebp4hiuwzlwcthpgkawape6dp3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/parmetis-4.0.3-jthqwflsj5bpe6onwsb5r2zi5wbx6pq4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/metis-5.1.0-imzig3eih3itpztvvk4yildzgq6aeelo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/gmake-4.4.1-6lgy76r7dbvqm6mbwb2jkpcuycf7tb27;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6/blt-0.5.3-xa3bmu75nkolqiewb5ftk5tp2jpzw57n;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/scr-3.0.1-5edtc4k2wstti2dh4kp2tno7rmwr3lyd;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/spath-0.2.0-gvlnzegcdph7ien3w4tjcxevblf2xe4r;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/libyogrt-1.33-3joihut3xh67qmtalrqadzujfzxwpodj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/er-0.2.0-befo66qsdjjulpnhaxvhk4uil45ynd6u;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/shuffile-0.2.0-j5blkpa2h3keb562qb5pdnfiuzyaecfd;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/redset-0.2.0-tllpyzklkik7oa32us3tigl7vdvil42o;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/rankstr-0.1.0-jkgwo3kyvegaapdtm67mg4aknu44foyn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/dtcmp-1.1.4-u376uqcnt3y7ebu5ocfvk7bovkr2febv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/lwgrp-1.0.5-am6sfml4trdhzlds365vbepezgdvdocz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/axl-0.7.1-t7yboywzjziqb3hbgidynhbk5vd33jc7;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/kvtree-1.3.0-4zcbvvaqpbkdt7xc4pbu7urlkdywjjd7;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/hypre-2.24.0-bwh42bebp4hiuwzlwcthpgkawape6dp3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/parmetis-4.0.3-jthqwflsj5bpe6onwsb5r2zi5wbx6pq4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/metis-5.1.0-imzig3eih3itpztvvk4yildzgq6aeelo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/gmake-4.4.1-6lgy76r7dbvqm6mbwb2jkpcuycf7tb27;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/blt-0.5.3-xa3bmu75nkolqiewb5ftk5tp2jpzw57n;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -69,7 +69,7 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_50_23/clang-14.0.6" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy" CACHE PATH "") @@ -87,7 +87,27 @@ set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy" C set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he" CACHE PATH "") -# scr not built +set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-5edtc4k2wstti2dh4kp2tno7rmwr3lyd" CACHE PATH "") + +set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-4zcbvvaqpbkdt7xc4pbu7urlkdywjjd7" CACHE PATH "") + +set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-u376uqcnt3y7ebu5ocfvk7bovkr2febv" CACHE PATH "") + +set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-gvlnzegcdph7ien3w4tjcxevblf2xe4r" CACHE PATH "") + +set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-t7yboywzjziqb3hbgidynhbk5vd33jc7" CACHE PATH "") + +set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-am6sfml4trdhzlds365vbepezgdvdocz" CACHE PATH "") + +set(ER_DIR "${TPL_ROOT}/er-0.2.0-befo66qsdjjulpnhaxvhk4uil45ynd6u" CACHE PATH "") + +set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-jkgwo3kyvegaapdtm67mg4aknu44foyn" CACHE PATH "") + +set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-tllpyzklkik7oa32us3tigl7vdvil42o" CACHE PATH "") + +set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-j5blkpa2h3keb562qb5pdnfiuzyaecfd" CACHE PATH "") + +set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-3joihut3xh67qmtalrqadzujfzxwpodj" CACHE PATH "") #------------------------------------------------------------------------------ # Devtools diff --git a/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake b/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake index d9410bffed..2b6a9ab43c 100644 --- a/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake +++ b/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/hypre-2.24.0-lof7hdy7wsyuei436d6uhilprsgmr3ik;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/parmetis-4.0.3-lq6aryhur6qn3trc2qxizvz4nae5ngzf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/metis-5.1.0-pyrzcrzqvl6q27kk637o2nwi3j7ibseb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/gmake-4.4.1-y2kaxrqjbg3dcwo7dzfphztusfjqoowq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1/blt-0.5.3-iljv7wrfi4r5i4drs4yf65rgsuunaxjn;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/scr-3.0.1-znr5hvdmrpg2wwtcrepv3bzh32visddj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/spath-0.2.0-scp7lun3jtdgorfmd4mzhtieqkjko57q;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/libyogrt-1.33-riegwpsbfjywz6pumvit2eadroiosowy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/er-0.2.0-m7mypt2brwrodmfun3ya2cwpkuwpccnv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/shuffile-0.2.0-74ysb2qi6xkrx7u5vsa2jnmcqof3q4je;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/redset-0.2.0-7bhg5tua2jns5ob7r6stbgitzlfggdax;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/rankstr-0.1.0-yuunbkeetjd4y563p4dzxp23rsdcc6tr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/dtcmp-1.1.4-bk55ioptacxzxnpxcgu27vwk2nacb35s;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/lwgrp-1.0.5-zhpxnopjtpr5cchaqufivi2sn4crkgwn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/axl-0.7.1-b3zz33f7lmeal5thbfyuc6cmbdfek2vv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/kvtree-1.3.0-oeqjobwdjxemywgc77pfuv4nnpxk6buj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/hypre-2.24.0-lof7hdy7wsyuei436d6uhilprsgmr3ik;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/parmetis-4.0.3-lq6aryhur6qn3trc2qxizvz4nae5ngzf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/metis-5.1.0-pyrzcrzqvl6q27kk637o2nwi3j7ibseb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/gmake-4.4.1-y2kaxrqjbg3dcwo7dzfphztusfjqoowq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/blt-0.5.3-iljv7wrfi4r5i4drs4yf65rgsuunaxjn;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -67,7 +67,7 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_13_04_53/gcc-10.3.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu" CACHE PATH "") @@ -85,7 +85,27 @@ set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr" C set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp" CACHE PATH "") -# scr not built +set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-znr5hvdmrpg2wwtcrepv3bzh32visddj" CACHE PATH "") + +set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-oeqjobwdjxemywgc77pfuv4nnpxk6buj" CACHE PATH "") + +set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-bk55ioptacxzxnpxcgu27vwk2nacb35s" CACHE PATH "") + +set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-scp7lun3jtdgorfmd4mzhtieqkjko57q" CACHE PATH "") + +set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-b3zz33f7lmeal5thbfyuc6cmbdfek2vv" CACHE PATH "") + +set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-zhpxnopjtpr5cchaqufivi2sn4crkgwn" CACHE PATH "") + +set(ER_DIR "${TPL_ROOT}/er-0.2.0-m7mypt2brwrodmfun3ya2cwpkuwpccnv" CACHE PATH "") + +set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-yuunbkeetjd4y563p4dzxp23rsdcc6tr" CACHE PATH "") + +set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-7bhg5tua2jns5ob7r6stbgitzlfggdax" CACHE PATH "") + +set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-74ysb2qi6xkrx7u5vsa2jnmcqof3q4je" CACHE PATH "") + +set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-riegwpsbfjywz6pumvit2eadroiosowy" CACHE PATH "") #------------------------------------------------------------------------------ # Devtools diff --git a/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake index da75f66931..18071e9fc8 100644 --- a/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake +++ b/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake @@ -4,7 +4,7 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/hypre-2.24.0-qdjyl5ibcpl4nxb6t5godfgvi5bb6hac;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/parmetis-4.0.3-nqxoj5gqogj32hfo5ognkcb6vg24zdlc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/metis-5.1.0-tb5bijmooj2d6d2npjpajcj4fyu4yd4y;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/gmake-4.4.1-e3r4ry6vgi7zp4mbwfokypkutqwpctek;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0/blt-0.5.3-i7qltms7ksyz4xltznzbtsafywrykq7b;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/usr/tce" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/hypre-2.24.0-qdjyl5ibcpl4nxb6t5godfgvi5bb6hac;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/parmetis-4.0.3-nqxoj5gqogj32hfo5ognkcb6vg24zdlc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/metis-5.1.0-tb5bijmooj2d6d2npjpajcj4fyu4yd4y;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/gmake-4.4.1-e3r4ry6vgi7zp4mbwfokypkutqwpctek;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/blt-0.5.3-i7qltms7ksyz4xltznzbtsafywrykq7b;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/usr/tce" CACHE PATH "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +15,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/spack/lib/spack/env/intel/icc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/intel/icc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/spack/lib/spack/env/intel/icpc" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/intel/icpc" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/spack/lib/spack/env/intel/ifort" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/intel/ifort" CACHE PATH "") else() @@ -67,7 +67,7 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_23_14_27_32/intel-2022.1.0" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0" CACHE PATH "") set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i" CACHE PATH "") From 99fdde64612b30031c1269a6bf01b51d99b70cd1 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 31 Oct 2023 13:31:58 -0700 Subject: [PATCH 169/639] Let appropriate users build devtools --- scripts/llnl_scripts/build_devtools.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/llnl_scripts/build_devtools.py b/scripts/llnl_scripts/build_devtools.py index b358faa02a..2a366cbc90 100755 --- a/scripts/llnl_scripts/build_devtools.py +++ b/scripts/llnl_scripts/build_devtools.py @@ -50,9 +50,6 @@ def main(): if not os.path.exists(build_dir): os.makedirs(build_dir) else: - if getpass.getuser() != "atk": - print("ERROR: Only shared user 'atk' can install into shared directory. Use -d option.") - return 1 build_dir = get_shared_devtool_dir() build_dir = os.path.abspath(build_dir) From c9b0e37ad474b462007fe198853237fa8e5ff6bd Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 31 Oct 2023 16:15:08 -0700 Subject: [PATCH 170/639] Revert "Let appropriate users build devtools" - Very useful guard This reverts commit 99fdde64612b30031c1269a6bf01b51d99b70cd1. --- scripts/llnl_scripts/build_devtools.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/llnl_scripts/build_devtools.py b/scripts/llnl_scripts/build_devtools.py index 2a366cbc90..b358faa02a 100755 --- a/scripts/llnl_scripts/build_devtools.py +++ b/scripts/llnl_scripts/build_devtools.py @@ -50,6 +50,9 @@ def main(): if not os.path.exists(build_dir): os.makedirs(build_dir) else: + if getpass.getuser() != "atk": + print("ERROR: Only shared user 'atk' can install into shared directory. Use -d option.") + return 1 build_dir = get_shared_devtool_dir() build_dir = os.path.abspath(build_dir) From 8e3a6d17a77607d981a38f69ffbf2057205f53d4 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 1 Nov 2023 14:19:14 -0700 Subject: [PATCH 171/639] Rename MarchingCubes implementation class names and reformat. --- src/axom/quest/CMakeLists.txt | 2 +- src/axom/quest/MarchingCubes.cpp | 20 ++++---- src/axom/quest/MarchingCubes.hpp | 10 +--- ...mplA.hpp => MarchingCubesFullParallel.hpp} | 29 ++++++----- ...Impl.hpp => MarchingCubesPartParallel.hpp} | 49 ++++++++++--------- 5 files changed, 55 insertions(+), 55 deletions(-) rename src/axom/quest/detail/{MarchingCubesImplA.hpp => MarchingCubesFullParallel.hpp} (96%) rename src/axom/quest/detail/{MarchingCubesImpl.hpp => MarchingCubesPartParallel.hpp} (94%) diff --git a/src/axom/quest/CMakeLists.txt b/src/axom/quest/CMakeLists.txt index 9e4df4520c..8c0f4c7f14 100644 --- a/src/axom/quest/CMakeLists.txt +++ b/src/axom/quest/CMakeLists.txt @@ -111,7 +111,7 @@ endif() blt_list_append( TO quest_headers - ELEMENTS MarchingCubes.hpp detail/MarchingCubesImpl.hpp + ELEMENTS MarchingCubes.hpp detail/MarchingCubesPartParallel.hpp detail/MarchingCubesFullParallel.hpp IF CONDUIT_FOUND ) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 15f91da17a..2419ed1beb 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -11,8 +11,8 @@ #include "axom/core/execution/execution_space.hpp" #include "axom/quest/MarchingCubes.hpp" - #include "axom/quest/detail/MarchingCubesImpl.hpp" - #include "axom/quest/detail/MarchingCubesImplA.hpp" + #include "axom/quest/detail/MarchingCubesPartParallel.hpp" + #include "axom/quest/detail/MarchingCubesFullParallel.hpp" #include "axom/fmt.hpp" namespace axom @@ -218,20 +218,20 @@ void MarchingCubesSingleDomain::computeIsocontour(double contourVal) SLIC_ASSERT_MSG(!m_fcnFieldName.empty(), "You must call setFunctionField before computeIsocontour."); - // We have 2 implementations. MarchingCubesImpl is faster on the host - // and MarchingCubesImplA is faster on GPUs. Both work in all cases, + // We have 2 implementations. MarchingCubesPartParallel is faster on the host + // and MarchingCubesFullParallel is faster on GPUs. Both work in all cases, // but we choose the best one for performance. if(m_runtimePolicy == axom::quest::MarchingCubesRuntimePolicy::seq) { - m_impl = - axom::quest::detail::marching_cubes::newMarchingCubesImpl(m_runtimePolicy, - m_ndim); + m_impl = axom::quest::detail::marching_cubes::newMarchingCubesPartParallel( + m_runtimePolicy, + m_ndim); } else { - m_impl = - axom::quest::detail::marching_cubes::newMarchingCubesImplA(m_runtimePolicy, - m_ndim); + m_impl = axom::quest::detail::marching_cubes::newMarchingCubesFullParallel( + m_runtimePolicy, + m_ndim); } m_impl->initialize(*m_dom, m_topologyName, m_fcnFieldName, m_maskFieldName); m_impl->setContourValue(contourVal); diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index c5aeb0967f..eafb2b474f 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -64,15 +64,6 @@ inline auto format_as(MarchingCubesRuntimePolicy pol) return fmt::underlying(pol); } -namespace detail -{ -namespace marching_cubes -{ -template -class MarchingCubesImpl; -} -} // namespace detail - class MarchingCubesSingleDomain; /*! @@ -343,6 +334,7 @@ class MarchingCubesSingleDomain virtual void setContourValue(double contourVal) = 0; //!@brief Compute the contour mesh. virtual void computeContourMesh() = 0; + //!@brief Return number of contour mesh facets generated. virtual axom::IndexType getContourCellCount() const = 0; /*! @brief Populate output mesh object with generated contour. diff --git a/src/axom/quest/detail/MarchingCubesImplA.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp similarity index 96% rename from src/axom/quest/detail/MarchingCubesImplA.hpp rename to src/axom/quest/detail/MarchingCubesFullParallel.hpp index c0194d65b5..f9ca67110b 100644 --- a/src/axom/quest/detail/MarchingCubesImplA.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -35,9 +35,12 @@ namespace marching_cubes ExecSpace is the general execution space, like axom::SEQ_EXEC and axom::CUDA_EXEC<256>. + + See MarchingCubesImpl for the difference between that class and + MarchingCubesFullParallel. */ template -class MarchingCubesImplA : public MarchingCubesSingleDomain::ImplBase +class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase { public: using Point = axom::primal::Point; @@ -169,7 +172,7 @@ class MarchingCubesImplA : public MarchingCubesSingleDomain::ImplBase } /*! - @brief Implementation used by MarchingCubesImplA::markCrossings_dim() + @brief Implementation used by MarchingCubesFullParallel::markCrossings_dim() containing just the objects needed for that part, to be made available on devices. */ @@ -358,7 +361,7 @@ class MarchingCubesImplA : public MarchingCubesSingleDomain::ImplBase } /*! - @brief Implementation used by MarchingCubesImplA::computeContour(). + @brief Implementation used by MarchingCubesFullParallel::computeContour(). containing just the objects needed for that part, to be made available on devices. */ @@ -717,7 +720,7 @@ class MarchingCubesImplA : public MarchingCubesSingleDomain::ImplBase /*! @brief Constructor. */ - MarchingCubesImplA() + MarchingCubesFullParallel() : m_contourNodeCoords(0, 0) , m_contourCellCorners(0, 0) , m_contourCellParents(0, 0) @@ -788,7 +791,7 @@ class MarchingCubesImplA : public MarchingCubesSingleDomain::ImplBase }; static std::unique_ptr -newMarchingCubesImplA( MarchingCubesRuntimePolicy runtimePolicy, +newMarchingCubesFullParallel( MarchingCubesRuntimePolicy runtimePolicy, int dim) { using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; @@ -800,18 +803,18 @@ newMarchingCubesImplA( MarchingCubesRuntimePolicy runtimePolicy, { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImplA<2, axom::SEQ_EXEC>) + new MarchingCubesFullParallel<2, axom::SEQ_EXEC>) : std::unique_ptr( - new MarchingCubesImplA<3, axom::SEQ_EXEC>); + new MarchingCubesFullParallel<3, axom::SEQ_EXEC>); } #ifdef _AXOM_MC_USE_OPENMP else if(runtimePolicy == RuntimePolicy::omp) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImplA<2, axom::OMP_EXEC>) + new MarchingCubesFullParallel<2, axom::OMP_EXEC>) : std::unique_ptr( - new MarchingCubesImplA<3, axom::OMP_EXEC>); + new MarchingCubesFullParallel<3, axom::OMP_EXEC>); } #endif #ifdef _AXOM_MC_USE_CUDA @@ -819,9 +822,9 @@ newMarchingCubesImplA( MarchingCubesRuntimePolicy runtimePolicy, { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImplA<2, axom::CUDA_EXEC<256>>) + new MarchingCubesFullParallel<2, axom::CUDA_EXEC<256>>) : std::unique_ptr( - new MarchingCubesImplA<3, axom::CUDA_EXEC<256>>); + new MarchingCubesFullParallel<3, axom::CUDA_EXEC<256>>); } #endif #ifdef _AXOM_MC_USE_HIP @@ -829,9 +832,9 @@ newMarchingCubesImplA( MarchingCubesRuntimePolicy runtimePolicy, { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImplA<2, axom::HIP_EXEC<256>>) + new MarchingCubesFullParallel<2, axom::HIP_EXEC<256>>) : std::unique_ptr( - new MarchingCubesImplA<3, axom::HIP_EXEC<256>>); + new MarchingCubesFullParallel<3, axom::HIP_EXEC<256>>); } #endif else diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesPartParallel.hpp similarity index 94% rename from src/axom/quest/detail/MarchingCubesImpl.hpp rename to src/axom/quest/detail/MarchingCubesPartParallel.hpp index e133fb67c0..441fc8e19d 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesPartParallel.hpp @@ -26,14 +26,6 @@ namespace detail { namespace marching_cubes { -template -static void add_to_StackArray(axom::StackArray& a, U b) -{ - for(int d = 0; d < DIM; ++d) - { - a[d] += b; - } -} /*! @brief Computations for MarchingCubesSingleDomain @@ -45,9 +37,19 @@ static void add_to_StackArray(axom::StackArray& a, U b) axom::CUDA_EXEC<256>. SequentialExecSpace is used for loops that cannot be parallelized but must access data allocated for ExecSpace. Use something like axom::SEQ_EXEC or axom::CUDA_EXEC<1>. + + The difference between MarchingCubesPartParallel and MarchingCubesFullParallel + is how they compute indices for the unstructured surface mesh. + - MarchingCubesPartParallel uses sequential loop, and skips over parents + cells that don't touch the surface contour. It processes less data + but is not data-parallel. + - MarchingCubesFullParallel that checks all parents cells. + It process more data but is data-parallel. + We've observed that MarchingCubesPartParallel is faster for seq policy + and MarchingCubesPartParallel is faster on the GPU. */ template -class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase +class MarchingCubesPartParallel : public MarchingCubesSingleDomain::ImplBase { public: using Point = axom::primal::Point; @@ -180,7 +182,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase } /*! - @brief Implementation used by MarchingCubesImpl::markCrossings_dim() + @brief Implementation used by MarchingCubesPartParallel::markCrossings_dim() containing just the objects needed for that part, to be made available on devices. */ @@ -390,7 +392,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase } /*! - @brief Implementation used by MarchingCubesImpl::computeContour(). + @brief Implementation used by MarchingCubesPartParallel::computeContour(). containing just the objects needed for that part, to be made available on devices. */ @@ -762,7 +764,10 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase MIdx cornerIds = contourCellCorners[n]; // Bump corner indices by priorNodeCount to avoid indices // used by other parents domains. - add_to_StackArray(cornerIds, priorNodeCount); + for(int d = 0; d < DIM; ++d) + { + cornerIds[d] += priorNodeCount; + } mesh.appendCell(cornerIds); } axom::IndexType numComponents = -1; @@ -810,7 +815,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase /*! @brief Constructor. */ - MarchingCubesImpl() + MarchingCubesPartParallel() : m_crossings(0, 0) , m_contourNodeCoords(0, 0) , m_contourCellCorners(0, 0) @@ -879,7 +884,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase }; static std::unique_ptr -newMarchingCubesImpl(MarchingCubesRuntimePolicy runtimePolicy, int dim) +newMarchingCubesPartParallel(MarchingCubesRuntimePolicy runtimePolicy, int dim) { using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; using RuntimePolicy = axom::quest::MarchingCubesRuntimePolicy; @@ -890,18 +895,18 @@ newMarchingCubesImpl(MarchingCubesRuntimePolicy runtimePolicy, int dim) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::SEQ_EXEC, axom::SEQ_EXEC>) + new MarchingCubesPartParallel<2, axom::SEQ_EXEC, axom::SEQ_EXEC>) : std::unique_ptr( - new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); + new MarchingCubesPartParallel<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); } #ifdef _AXOM_MC_USE_OPENMP else if(runtimePolicy == RuntimePolicy::omp) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::OMP_EXEC, axom::SEQ_EXEC>) + new MarchingCubesPartParallel<2, axom::OMP_EXEC, axom::SEQ_EXEC>) : std::unique_ptr( - new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>); + new MarchingCubesPartParallel<3, axom::OMP_EXEC, axom::SEQ_EXEC>); } #endif #ifdef _AXOM_MC_USE_CUDA @@ -909,9 +914,9 @@ newMarchingCubesImpl(MarchingCubesRuntimePolicy runtimePolicy, int dim) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>) + new MarchingCubesPartParallel<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>) : std::unique_ptr( - new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); + new MarchingCubesPartParallel<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); } #endif #ifdef _AXOM_MC_USE_HIP @@ -919,9 +924,9 @@ newMarchingCubesImpl(MarchingCubesRuntimePolicy runtimePolicy, int dim) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>) + new MarchingCubesPartParallel<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>) : std::unique_ptr( - new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>); + new MarchingCubesPartParallel<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>); } #endif else From 235e8a8c38eaf59781b0767c02911e98277a47d0 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 2 Nov 2023 16:02:10 -0700 Subject: [PATCH 172/639] Make choice of marching cubes data-parallelism run-time selectable. --- src/axom/quest/MarchingCubes.cpp | 9 +++-- src/axom/quest/MarchingCubes.hpp | 39 +++++++++++++++++++ .../examples/quest_marching_cubes_example.cpp | 17 ++++++++ 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 2419ed1beb..03ba4805b1 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -63,6 +63,7 @@ void MarchingCubes::computeIsocontour(double contourVal) for(int dId = 0; dId < m_singles.size(); ++dId) { std::unique_ptr& single = m_singles[dId]; + single->setDataParallelism(m_dataParallelism); single->computeIsocontour(contourVal); } } @@ -219,9 +220,11 @@ void MarchingCubesSingleDomain::computeIsocontour(double contourVal) "You must call setFunctionField before computeIsocontour."); // We have 2 implementations. MarchingCubesPartParallel is faster on the host - // and MarchingCubesFullParallel is faster on GPUs. Both work in all cases, - // but we choose the best one for performance. - if(m_runtimePolicy == axom::quest::MarchingCubesRuntimePolicy::seq) + // and MarchingCubesFullParallel is faster on GPUs. Both work in all cases. + // but we can choose based on runtime policy or by user choice + if( m_dataParallelism == axom::quest::MarchingCubesDataParallelism::partialParallel || + (m_dataParallelism == axom::quest::MarchingCubesDataParallelism::byPolicy && + m_runtimePolicy == axom::quest::MarchingCubesRuntimePolicy::seq) ) { m_impl = axom::quest::detail::marching_cubes::newMarchingCubesPartParallel( m_runtimePolicy, diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index eafb2b474f..a07634872e 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -58,6 +58,22 @@ enum class MarchingCubesRuntimePolicy hip = 3 }; +/*! + @brief Enum for implementation. + + Partial parallel implementation uses a non-parallizable loop and + processes less data. It has been shown to work well on CPUs. + Full parallel implementation processes more data, but parallelizes + fully and has been shown to work well on GPUs. byPolicy chooses + based on runtime policy. +*/ +enum class MarchingCubesDataParallelism + { + byPolicy = 0, + partialParallel = 1, + fullParallel = 2 + }; + /// Utility function to allow formating a MarchingCubesRuntimePolicy inline auto format_as(MarchingCubesRuntimePolicy pol) { @@ -173,9 +189,23 @@ class MarchingCubes const std::string &cellIdField = {}, const std::string &domainIdField = {}); + + /*! + @brief Set choice of data-parallelism implementation. + + By default, choice is MarchingCubesDataParallelism::byPolicy. + */ + void setDataParallelism( MarchingCubesDataParallelism dataPar ) + { + m_dataParallelism = dataPar; + } + private: MarchingCubesRuntimePolicy m_runtimePolicy; + //@brief Choice of full or partial data-parallelism, or byPolicy. + MarchingCubesDataParallelism m_dataParallelism = MarchingCubesDataParallelism::byPolicy; + //! @brief Single-domain implementations. axom::Array> m_singles; const std::string m_topologyName; @@ -227,6 +257,11 @@ class MarchingCubesSingleDomain const std::string &topologyName, const std::string &maskfield); + void setDataParallelism( MarchingCubesDataParallelism &dataPar ) + { + m_dataParallelism = dataPar; + } + /*! @brief Specify the field containing the nodal scalar function in the input mesh. @@ -350,6 +385,10 @@ class MarchingCubesSingleDomain private: MarchingCubesRuntimePolicy m_runtimePolicy; + + //@brief Choice of full or partial data-parallelism, or byPolicy. + MarchingCubesDataParallelism m_dataParallelism = MarchingCubesDataParallelism::byPolicy; + /*! \brief Computational mesh as a conduit::Node. */ diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 3ee005e082..5b82309676 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -93,6 +93,8 @@ struct Input quest::MarchingCubesRuntimePolicy policy { quest::MarchingCubesRuntimePolicy::seq}; + quest::MarchingCubesDataParallelism dataParallelism = quest::MarchingCubesDataParallelism::byPolicy; + private: bool _verboseOutput {false}; @@ -114,6 +116,15 @@ struct Input }; // clang-format on + // clang-format off + const std::map s_validImplChoices + { + {"byPolicy", quest::MarchingCubesDataParallelism::byPolicy} + , {"partialParallel", quest::MarchingCubesDataParallelism::partialParallel} + , {"fullParallel", quest::MarchingCubesDataParallelism::fullParallel} + }; + // clang-format on + public: bool isVerbose() const { return _verboseOutput; } @@ -124,6 +135,11 @@ struct Input ->capture_default_str() ->transform(axom::CLI::CheckedTransformer(s_validPolicies)); + app.add_option("--dataParallelism", dataParallelism) + ->description("Set full or partial data-parallelism, or by-policy") + ->capture_default_str() + ->transform(axom::CLI::CheckedTransformer(s_validImplChoices)); + app.add_option("-m,--mesh-file", meshFile) ->description( "Path to multidomain computational mesh following conduit blueprint " @@ -755,6 +771,7 @@ struct ContourTestBase MPI_Barrier(MPI_COMM_WORLD); #endif computeTimer.start(); + mc.setDataParallelism(params.dataParallelism); mc.computeIsocontour(params.contourVal); computeTimer.stop(); printTimingStats(computeTimer, name() + " contour"); From c9547118f361eb9f795cf07afb83588609c33e23 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 2 Nov 2023 21:37:58 -0700 Subject: [PATCH 173/639] Reformat. --- src/axom/quest/MarchingCubes.cpp | 7 +- src/axom/quest/MarchingCubes.hpp | 21 +-- .../detail/MarchingCubesFullParallel.hpp | 150 ++++++++---------- .../detail/MarchingCubesPartParallel.hpp | 1 - .../examples/quest_marching_cubes_example.cpp | 3 +- 5 files changed, 86 insertions(+), 96 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 03ba4805b1..24e0ce3593 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -222,9 +222,10 @@ void MarchingCubesSingleDomain::computeIsocontour(double contourVal) // We have 2 implementations. MarchingCubesPartParallel is faster on the host // and MarchingCubesFullParallel is faster on GPUs. Both work in all cases. // but we can choose based on runtime policy or by user choice - if( m_dataParallelism == axom::quest::MarchingCubesDataParallelism::partialParallel || - (m_dataParallelism == axom::quest::MarchingCubesDataParallelism::byPolicy && - m_runtimePolicy == axom::quest::MarchingCubesRuntimePolicy::seq) ) + if(m_dataParallelism == + axom::quest::MarchingCubesDataParallelism::partialParallel || + (m_dataParallelism == axom::quest::MarchingCubesDataParallelism::byPolicy && + m_runtimePolicy == axom::quest::MarchingCubesRuntimePolicy::seq)) { m_impl = axom::quest::detail::marching_cubes::newMarchingCubesPartParallel( m_runtimePolicy, diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index a07634872e..19d8293da4 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -68,11 +68,11 @@ enum class MarchingCubesRuntimePolicy based on runtime policy. */ enum class MarchingCubesDataParallelism - { - byPolicy = 0, - partialParallel = 1, - fullParallel = 2 - }; +{ + byPolicy = 0, + partialParallel = 1, + fullParallel = 2 +}; /// Utility function to allow formating a MarchingCubesRuntimePolicy inline auto format_as(MarchingCubesRuntimePolicy pol) @@ -189,13 +189,12 @@ class MarchingCubes const std::string &cellIdField = {}, const std::string &domainIdField = {}); - /*! @brief Set choice of data-parallelism implementation. By default, choice is MarchingCubesDataParallelism::byPolicy. */ - void setDataParallelism( MarchingCubesDataParallelism dataPar ) + void setDataParallelism(MarchingCubesDataParallelism dataPar) { m_dataParallelism = dataPar; } @@ -204,7 +203,8 @@ class MarchingCubes MarchingCubesRuntimePolicy m_runtimePolicy; //@brief Choice of full or partial data-parallelism, or byPolicy. - MarchingCubesDataParallelism m_dataParallelism = MarchingCubesDataParallelism::byPolicy; + MarchingCubesDataParallelism m_dataParallelism = + MarchingCubesDataParallelism::byPolicy; //! @brief Single-domain implementations. axom::Array> m_singles; @@ -257,7 +257,7 @@ class MarchingCubesSingleDomain const std::string &topologyName, const std::string &maskfield); - void setDataParallelism( MarchingCubesDataParallelism &dataPar ) + void setDataParallelism(MarchingCubesDataParallelism &dataPar) { m_dataParallelism = dataPar; } @@ -387,7 +387,8 @@ class MarchingCubesSingleDomain MarchingCubesRuntimePolicy m_runtimePolicy; //@brief Choice of full or partial data-parallelism, or byPolicy. - MarchingCubesDataParallelism m_dataParallelism = MarchingCubesDataParallelism::byPolicy; + MarchingCubesDataParallelism m_dataParallelism = + MarchingCubesDataParallelism::byPolicy; /*! \brief Computational mesh as a conduit::Node. diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index f9ca67110b..5f09652f94 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -26,7 +26,6 @@ namespace detail { namespace marching_cubes { - /*! @brief Computations for MarchingCubesSingleDomain @@ -67,10 +66,8 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase const std::string& fcnFieldName, const std::string& maskFieldName = {}) override { - SLIC_ASSERT( - conduit::blueprint::mesh::topology::dims( - dom.fetch_existing(axom::fmt::format("topologies/{}", topologyName))) - == DIM); + SLIC_ASSERT(conduit::blueprint::mesh::topology::dims(dom.fetch_existing( + axom::fmt::format("topologies/{}", topologyName))) == DIM); clear(); @@ -271,12 +268,13 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase // Compute number of surface facets added by each parent cell. m_addFacets.resize(parentCellCount); const axom::ArrayView addFacetsView = m_addFacets.view(); - axom::for_all(0, parentCellCount, - AXOM_LAMBDA(axom::IndexType parentCellId) { - addFacetsView.flatIndex(parentCellId) = - num_contour_cells( - caseIdsView.flatIndex(parentCellId)); - }); + axom::for_all( + 0, + parentCellCount, + AXOM_LAMBDA(axom::IndexType parentCellId) { + addFacetsView.flatIndex(parentCellId) = + num_contour_cells(caseIdsView.flatIndex(parentCellId)); + }); // Compute index of first facet added by each parent cell // (whether the cell generates any facet!). @@ -288,22 +286,22 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase RAJA::make_span(firstFacetIdsView.data(), parentCellCount), RAJA::operators::plus {}); - // m_addFacets and m_firstFacetIds, combined with m_caseIds, - // are all we need to compute the surface mesh. + // m_addFacets and m_firstFacetIds, combined with m_caseIds, + // are all we need to compute the surface mesh. #else SLIC_ERROR("Incomplete coding in scanCrossings!"); #endif // Compute number of facets in domain. // In case data is on device, copy to host before computing. - axom::IndexType firstFacetIds_back=0; - axom::IndexType addFacets_back=0; + axom::IndexType firstFacetIds_back = 0; + axom::IndexType addFacets_back = 0; axom::copy(&firstFacetIds_back, - m_firstFacetIds.data() + m_firstFacetIds.size() - 1, - sizeof(firstFacetIds_back)); + m_firstFacetIds.data() + m_firstFacetIds.size() - 1, + sizeof(firstFacetIds_back)); axom::copy(&addFacets_back, - m_addFacets.data() + m_addFacets.size() - 1, - sizeof(addFacets_back)); + m_addFacets.data() + m_addFacets.size() - 1, + sizeof(addFacets_back)); m_facetCount = firstFacetIds_back + addFacets_back; // Allocate space for surface mesh. @@ -324,40 +322,38 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_caseIds.strides(), m_fcnView, m_coordsViews); - auto gen_for_parent_cell = - AXOM_LAMBDA(axom::IndexType parentCellId) - { - Point cornerCoords[CELL_CORNER_COUNT]; - double cornerValues[CELL_CORNER_COUNT]; - ccu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); + auto gen_for_parent_cell = AXOM_LAMBDA(axom::IndexType parentCellId) + { + Point cornerCoords[CELL_CORNER_COUNT]; + double cornerValues[CELL_CORNER_COUNT]; + ccu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); - auto additionalFacets = addFacetsView[parentCellId]; - auto firstFacetId = firstFacetIdsView[parentCellId]; + auto additionalFacets = addFacetsView[parentCellId]; + auto firstFacetId = firstFacetIdsView[parentCellId]; - auto caseId = caseIdsView.flatIndex(parentCellId); + auto caseId = caseIdsView.flatIndex(parentCellId); - for(axom::IndexType fId = 0; fId < additionalFacets; ++fId) + for(axom::IndexType fId = 0; fId < additionalFacets; ++fId) + { + axom::IndexType newFacetId = firstFacetId + fId; + axom::IndexType firstCornerId = newFacetId * DIM; + + contourCellParentsView[newFacetId] = parentCellId; + + for(axom::IndexType d = 0; d < DIM; ++d) { - axom::IndexType newFacetId = firstFacetId + fId; - axom::IndexType firstCornerId = newFacetId * DIM; - - contourCellParentsView[newFacetId] = parentCellId; - - for(axom::IndexType d = 0; d < DIM; ++d) - { - axom::IndexType newCornerId = firstCornerId + d; - contourCellCornersView[newFacetId][d] = newCornerId; - - int edge = cases_table(caseId, fId*DIM + d); - ccu.linear_interp(edge, - cornerCoords, - cornerValues, - contourNodeCoordsView[newCornerId]); - } + axom::IndexType newCornerId = firstCornerId + d; + contourCellCornersView[newFacetId][d] = newCornerId; + + int edge = cases_table(caseId, fId * DIM + d); + ccu.linear_interp(edge, + cornerCoords, + cornerValues, + contourNodeCoordsView[newCornerId]); } - }; + } + }; axom::for_all(0, parentCellCount, gen_for_parent_cell); - } /*! @@ -767,10 +763,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase //!@brief Number of contour surface cells from crossings. axom::IndexType m_facetCount = 0; - axom::IndexType getContourCellCount() const override - { - return m_facetCount; - } + axom::IndexType getContourCellCount() const override { return m_facetCount; } //!@brief Number of corners (nodes) on each parent cell. static constexpr std::uint8_t CELL_CORNER_COUNT = (DIM == 3) ? 8 : 4; @@ -791,8 +784,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase }; static std::unique_ptr -newMarchingCubesFullParallel( MarchingCubesRuntimePolicy runtimePolicy, - int dim) +newMarchingCubesFullParallel(MarchingCubesRuntimePolicy runtimePolicy, int dim) { using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; using RuntimePolicy = axom::quest::MarchingCubesRuntimePolicy; @@ -801,47 +793,43 @@ newMarchingCubesFullParallel( MarchingCubesRuntimePolicy runtimePolicy, std::unique_ptr impl; if(runtimePolicy == RuntimePolicy::seq) { - impl = dim == 2 - ? std::unique_ptr( - new MarchingCubesFullParallel<2, axom::SEQ_EXEC>) - : std::unique_ptr( - new MarchingCubesFullParallel<3, axom::SEQ_EXEC>); + impl = dim == 2 ? std::unique_ptr( + new MarchingCubesFullParallel<2, axom::SEQ_EXEC>) + : std::unique_ptr( + new MarchingCubesFullParallel<3, axom::SEQ_EXEC>); } -#ifdef _AXOM_MC_USE_OPENMP + #ifdef _AXOM_MC_USE_OPENMP else if(runtimePolicy == RuntimePolicy::omp) { - impl = dim == 2 - ? std::unique_ptr( - new MarchingCubesFullParallel<2, axom::OMP_EXEC>) - : std::unique_ptr( - new MarchingCubesFullParallel<3, axom::OMP_EXEC>); + impl = dim == 2 ? std::unique_ptr( + new MarchingCubesFullParallel<2, axom::OMP_EXEC>) + : std::unique_ptr( + new MarchingCubesFullParallel<3, axom::OMP_EXEC>); } -#endif -#ifdef _AXOM_MC_USE_CUDA + #endif + #ifdef _AXOM_MC_USE_CUDA else if(runtimePolicy == RuntimePolicy::cuda) { - impl = dim == 2 - ? std::unique_ptr( - new MarchingCubesFullParallel<2, axom::CUDA_EXEC<256>>) - : std::unique_ptr( - new MarchingCubesFullParallel<3, axom::CUDA_EXEC<256>>); + impl = dim == 2 ? std::unique_ptr( + new MarchingCubesFullParallel<2, axom::CUDA_EXEC<256>>) + : std::unique_ptr( + new MarchingCubesFullParallel<3, axom::CUDA_EXEC<256>>); } -#endif -#ifdef _AXOM_MC_USE_HIP + #endif + #ifdef _AXOM_MC_USE_HIP else if(runtimePolicy == RuntimePolicy::hip) { - impl = dim == 2 - ? std::unique_ptr( - new MarchingCubesFullParallel<2, axom::HIP_EXEC<256>>) - : std::unique_ptr( - new MarchingCubesFullParallel<3, axom::HIP_EXEC<256>>); + impl = dim == 2 ? std::unique_ptr( + new MarchingCubesFullParallel<2, axom::HIP_EXEC<256>>) + : std::unique_ptr( + new MarchingCubesFullParallel<3, axom::HIP_EXEC<256>>); } -#endif + #endif else { SLIC_ERROR(axom::fmt::format( - "MarchingCubesSingleDomain has no implementation for runtime policy {}", - runtimePolicy)); + "MarchingCubesSingleDomain has no implementation for runtime policy {}", + runtimePolicy)); } return impl; } diff --git a/src/axom/quest/detail/MarchingCubesPartParallel.hpp b/src/axom/quest/detail/MarchingCubesPartParallel.hpp index 441fc8e19d..09c4ad257e 100644 --- a/src/axom/quest/detail/MarchingCubesPartParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesPartParallel.hpp @@ -26,7 +26,6 @@ namespace detail { namespace marching_cubes { - /*! @brief Computations for MarchingCubesSingleDomain diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 5b82309676..a2b8d71ae1 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -93,7 +93,8 @@ struct Input quest::MarchingCubesRuntimePolicy policy { quest::MarchingCubesRuntimePolicy::seq}; - quest::MarchingCubesDataParallelism dataParallelism = quest::MarchingCubesDataParallelism::byPolicy; + quest::MarchingCubesDataParallelism dataParallelism = + quest::MarchingCubesDataParallelism::byPolicy; private: bool _verboseOutput {false}; From 17f451836434720f5b4e2e8b4e8ba214f9d0384b Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 3 Nov 2023 13:09:54 -0700 Subject: [PATCH 174/639] Add RELEASE-NOTES documentation. --- RELEASE-NOTES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 0f24bbc80a..147c0eddf0 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -20,6 +20,11 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ ## [Unreleased] - Release date yyyy-mm-dd ### Changed +- `MarchingCubes` allows user to select the underlying data-parallel implementation + - `fullParallel` works best on GPUs. + - `partialParallel` reduces the amount of data processed and works best with + `MarchingCubesRuntimePolicy::seq`. + - `byPolicy` (the default) selects the implementation based the runtime policy. - `MarchingCubes` and `DistributedClosestPoint` classes changed from requiring the Blueprint coordset name to requiring the Blueprint topology name. The changed interface methods are: - `DistributedClosestPoint::setObjectMesh` From 5270e463c51666e8e26c9edd0e4aa1010c1644c3 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 3 Nov 2023 18:05:13 -0700 Subject: [PATCH 175/639] Fix false positive in MarchingCubes test. One problem is shrinking the parent cell so much that it flips and becomes larger. Other is floating point comparison. --- .../examples/quest_marching_cubes_example.cpp | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index a2b8d71ae1..c590a5730e 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -1103,9 +1103,7 @@ struct ContourTestBase axom::primal::BoundingBox parentCellBox(lower, upper); double tol = errorTolerance(); axom::primal::BoundingBox big(parentCellBox); - axom::primal::BoundingBox small(parentCellBox); big.expand(tol); - small.expand(-tol); axom::IndexType* cellNodeIds = contourMesh.getCellNodeIDs(contourCellNum); const axom::IndexType cellNodeCount = @@ -1116,7 +1114,7 @@ struct ContourTestBase PointType nodeCoords; contourMesh.getNode(cellNodeIds[nn], nodeCoords.data()); - if(!big.contains(nodeCoords) || small.contains(nodeCoords)) + if(!big.contains(nodeCoords)) { ++errCount; SLIC_INFO_IF( @@ -1238,19 +1236,23 @@ struct ContourTestBase maxFcnValue = std::max(maxFcnValue, fcnValue); } - const bool touchesContour = - (minFcnValue <= params.contourVal && maxFcnValue >= params.contourVal); - const bool hasCont = hasContours[domId][cellIdx]; - if(touchesContour != hasCont) - { - ++errCount; - SLIC_INFO_IF(params.isVerbose(), - axom::fmt::format( - "checkCellsContainingContour: cell {}: hasContour " - "({}) and touchesContour ({}) don't agree.", - cellIdx, - hasCont, - touchesContour)); + // If the min or max values in the cell is close to params.contourVal + // touchesContour and hasCont can go either way. So don't check. + if( minFcnValue != params.contourVal && maxFcnValue != params.contourVal ) { + const bool touchesContour = + (minFcnValue <= params.contourVal && maxFcnValue >= params.contourVal); + const bool hasCont = hasContours[domId][cellIdx]; + if(touchesContour != hasCont) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format( + "checkCellsContainingContour: cell {}: hasContour " + "({}) and touchesContour ({}) don't agree.", + cellIdx, + hasCont, + touchesContour)); + } } } } From 904875b013980a25540c9ec186322f509aa28dd7 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 3 Nov 2023 22:59:19 -0700 Subject: [PATCH 176/639] Add gyroid test case for MarchingCubes. --- src/axom/quest/examples/CMakeLists.txt | 3 + .../examples/quest_marching_cubes_example.cpp | 113 +++++++++++++++++- 2 files changed, 112 insertions(+), 4 deletions(-) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index 0941e760dc..d518f59084 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -264,9 +264,11 @@ if(CONDUIT_FOUND) if(_ndim EQUAL 2) set(_dir 1.0 0.4) set(_center 1.0 0.4) + set(_scale 3 3) elseif(_ndim EQUAL 3) set(_dir 1.0 0.4 1.2) set(_center 1.0 0.4 1.2) + set(_scale 3 3 1.5) endif() set(_test "quest_marching_cubes_run_${_ndim}D_${_pol}_${_mesh}") @@ -278,6 +280,7 @@ if(CONDUIT_FOUND) --fields-file ${_test}.field --dir ${_dir} --center ${_center} + --scale ${_scale} --contourVal 1.25 --check-results --verbose diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index c590a5730e..5f3df5e659 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -79,6 +79,10 @@ struct Input bool usingRound {false}; std::vector fcnCenter; + // Scaling factor for gyroid function + bool usingGyroid {false}; + std::vector gyroidScale; + // Parameters for planar contour function bool usingPlanar {false}; std::vector inPlane; @@ -162,6 +166,13 @@ struct Input ->description("Center for distance-from-point function (x,y[,z])") ->expected(2, 3); + auto* gyroidOption = app.add_option_group( + "gyroidOption", + "Options for setting up gyroid function"); + gyroidOption->add_option("--scale", gyroidScale) + ->description("Scaling factor for gyroid function (x,y[,z])") + ->expected(2, 3); + auto* distFromPlaneOption = app.add_option_group( "distFromPlaneOption", "Options for setting up distance-from-plane function"); @@ -193,18 +204,20 @@ struct Input ndim = std::max(ndim, fcnCenter.size()); ndim = std::max(ndim, inPlane.size()); ndim = std::max(ndim, perpDir.size()); + ndim = std::max(ndim, gyroidScale.size()); SLIC_ASSERT_MSG((fcnCenter.empty() || fcnCenter.size() == ndim) && (inPlane.empty() || inPlane.size() == ndim) && - (perpDir.empty() || perpDir.size() == ndim), + (perpDir.empty() || perpDir.size() == ndim) && + (gyroidScale.empty() || gyroidScale.size() == ndim), "fcnCenter, inPlane and perpDir must have consistent sizes " "if specified."); usingPlanar = !perpDir.empty(); usingRound = !fcnCenter.empty(); + usingGyroid = !gyroidScale.empty(); SLIC_ASSERT_MSG( - usingPlanar || usingRound, - "You must specify a planar scalar function or a round scalar" - " function or both."); + usingPlanar || usingRound || usingGyroid, + "No functions specified. Please specify a comibnation of round, gyroid or planar functions."); // inPlane defaults to origin if omitted. if(usingPlanar && inPlane.empty()) @@ -220,6 +233,13 @@ struct Input return axom::primal::Point(fcnCenter.data()); } + template + axom::primal::Point gyroidScaleFactor() const + { + SLIC_ASSERT(gyroidScale.size() == DIM); + return axom::primal::Point(gyroidScale.data()); + } + template axom::primal::Point inplanePoint() const { @@ -1314,11 +1334,82 @@ struct RoundContourTest void setToleranceByLongestEdge(const BlueprintStructuredMesh& bsm) { + // Heuristic of appropriate error tolerance. double maxSpacing = bsm.maxSpacing(); _errTol = 0.1 * maxSpacing; } }; +/*! + @brief Function for approximate gyroid surface +*/ +template +struct GyroidFunctor +{ + using PointType = axom::primal::Point; + const PointType _scale; + const double _offset; + GyroidFunctor(const PointType& scale, double offset) : _scale(scale), _offset(offset) { } + double operator()(const PointType& pt) const + { + if( DIM == 3 ) + { + return sin(pt[0]*_scale[0])*cos(pt[1]*_scale[1]) + + sin(pt[1]*_scale[1])*cos(pt[2]*_scale[2]) + + sin(pt[2]*_scale[2])*cos(pt[0]*_scale[0]) + + _offset; + } + else + { + // Use the 3D function, with z=0. + return sin(pt[0]*_scale[0])*cos(pt[1]*_scale[1]) + + sin(pt[1]*_scale[1]) + + _offset; + } + } +}; +template +struct GyroidContourTest + : public ContourTestBase> +{ + static constexpr auto MemorySpace = + axom::execution_space::memory_space; + using PointType = axom::primal::Point; + using FunctorType = GyroidFunctor; + /*! + @brief Constructor. + + @param scale [in] Gyroid function scaling factors + */ + GyroidContourTest(const PointType& scale, double offset) + : ContourTestBase(FunctorType(scale, offset)) + , _scale(scale) + , _gyroidFunctor(scale, offset) + , _errTol(1e-3) + { } + virtual ~GyroidContourTest() { } + const PointType _scale; + FunctorType _gyroidFunctor; + double _errTol; + + virtual std::string name() const override { return std::string("gyroid"); } + + virtual std::string functionName() const override + { + return std::string("gyroid_fcn"); + } + + double errorTolerance() const override { return _errTol; } + + void setToleranceByLongestEdge(const BlueprintStructuredMesh& bsm) + { + // Heuristic of appropriate error tolerance. + double maxSpacing = bsm.maxSpacing(); + axom::primal::Vector v(_scale); + _errTol = 0.1 * v.norm() * maxSpacing; + } +}; + /*! @brief Function providing signed distance from a plane. */ @@ -1452,6 +1543,7 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) //--------------------------------------------------------------------------- std::shared_ptr> roundTest; + std::shared_ptr> gyroidTest; std::shared_ptr> planarTest; if(params.usingRound) @@ -1461,6 +1553,13 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) roundTest->setToleranceByLongestEdge(computationalMesh); roundTest->computeNodalDistance(computationalMesh); } + if(params.usingGyroid) + { + gyroidTest = std::make_shared>( + params.gyroidScaleFactor(), params.contourVal); + gyroidTest->setToleranceByLongestEdge(computationalMesh); + gyroidTest->computeNodalDistance(computationalMesh); + } if(params.usingPlanar) { planarTest = std::make_shared>( @@ -1490,6 +1589,12 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) } slic::flushStreams(); + if(gyroidTest) + { + localErrCount += gyroidTest->runTest(computationalMesh, mc); + } + slic::flushStreams(); + // Check results int errCount = 0; From 747960b997e8d44dbc343f0e90e058c606d98195 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sun, 5 Nov 2023 10:12:17 -0800 Subject: [PATCH 177/639] Reformat. --- .../examples/quest_marching_cubes_example.cpp | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 5f3df5e659..b238e1709c 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -166,9 +166,9 @@ struct Input ->description("Center for distance-from-point function (x,y[,z])") ->expected(2, 3); - auto* gyroidOption = app.add_option_group( - "gyroidOption", - "Options for setting up gyroid function"); + auto* gyroidOption = + app.add_option_group("gyroidOption", + "Options for setting up gyroid function"); gyroidOption->add_option("--scale", gyroidScale) ->description("Scaling factor for gyroid function (x,y[,z])") ->expected(2, 3); @@ -215,9 +215,9 @@ struct Input usingPlanar = !perpDir.empty(); usingRound = !fcnCenter.empty(); usingGyroid = !gyroidScale.empty(); - SLIC_ASSERT_MSG( - usingPlanar || usingRound || usingGyroid, - "No functions specified. Please specify a comibnation of round, gyroid or planar functions."); + SLIC_ASSERT_MSG(usingPlanar || usingRound || usingGyroid, + "No functions specified. Please specify a comibnation of " + "round, gyroid or planar functions."); // inPlane defaults to origin if omitted. if(usingPlanar && inPlane.empty()) @@ -830,7 +830,7 @@ struct ContourTestBase extractTimer.start(); mc.populateContourMesh(contourMesh, m_parentCellIdField, m_domainIdField); extractTimer.stop(); - printTimingStats(extractTimer, name() + " extract"); + // printTimingStats(extractTimer, name() + " extract"); int localErrCount = 0; if(params.checkResults) @@ -1258,9 +1258,10 @@ struct ContourTestBase // If the min or max values in the cell is close to params.contourVal // touchesContour and hasCont can go either way. So don't check. - if( minFcnValue != params.contourVal && maxFcnValue != params.contourVal ) { - const bool touchesContour = - (minFcnValue <= params.contourVal && maxFcnValue >= params.contourVal); + if(minFcnValue != params.contourVal && maxFcnValue != params.contourVal) + { + const bool touchesContour = (minFcnValue <= params.contourVal && + maxFcnValue >= params.contourVal); const bool hasCont = hasContours[domId][cellIdx]; if(touchesContour != hasCont) { @@ -1349,22 +1350,23 @@ struct GyroidFunctor using PointType = axom::primal::Point; const PointType _scale; const double _offset; - GyroidFunctor(const PointType& scale, double offset) : _scale(scale), _offset(offset) { } + GyroidFunctor(const PointType& scale, double offset) + : _scale(scale) + , _offset(offset) + { } double operator()(const PointType& pt) const { - if( DIM == 3 ) + if(DIM == 3) { - return sin(pt[0]*_scale[0])*cos(pt[1]*_scale[1]) - + sin(pt[1]*_scale[1])*cos(pt[2]*_scale[2]) - + sin(pt[2]*_scale[2])*cos(pt[0]*_scale[0]) - + _offset; + return sin(pt[0] * _scale[0]) * cos(pt[1] * _scale[1]) + + sin(pt[1] * _scale[1]) * cos(pt[2] * _scale[2]) + + sin(pt[2] * _scale[2]) * cos(pt[0] * _scale[0]) + _offset; } else { // Use the 3D function, with z=0. - return sin(pt[0]*_scale[0])*cos(pt[1]*_scale[1]) - + sin(pt[1]*_scale[1]) - + _offset; + return sin(pt[0] * _scale[0]) * cos(pt[1] * _scale[1]) + + sin(pt[1] * _scale[1]) + _offset; } } }; @@ -1556,7 +1558,8 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) if(params.usingGyroid) { gyroidTest = std::make_shared>( - params.gyroidScaleFactor(), params.contourVal); + params.gyroidScaleFactor(), + params.contourVal); gyroidTest->setToleranceByLongestEdge(computationalMesh); gyroidTest->computeNodalDistance(computationalMesh); } From 8554e29145749f19a866ecb3041a582592e4b1c4 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sun, 5 Nov 2023 11:16:39 -0800 Subject: [PATCH 178/639] Fix incomplete coding for non-RAJA build. --- .../detail/MarchingCubesFullParallel.hpp | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index 5f09652f94..67298e79ae 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -264,10 +264,11 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase const axom::IndexType parentCellCount = m_caseIds.size(); auto caseIdsView = m_caseIds.view(); - #if defined(AXOM_USE_RAJA) // Compute number of surface facets added by each parent cell. m_addFacets.resize(parentCellCount); const axom::ArrayView addFacetsView = m_addFacets.view(); + + #if defined(AXOM_USE_RAJA) axom::for_all( 0, parentCellCount, @@ -275,12 +276,20 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase addFacetsView.flatIndex(parentCellId) = num_contour_cells(caseIdsView.flatIndex(parentCellId)); }); + #else + for(axom::IndexType pcId = 0; pcId < parentCellCount; ++pcId) + { + addFacetsView.flatIndex(pcId) = + num_contour_cells(caseIdsView.flatIndex(pcId)); + } + #endif // Compute index of first facet added by each parent cell // (whether the cell generates any facet!). m_firstFacetIds.resize(parentCellCount); const axom::ArrayView firstFacetIdsView = m_firstFacetIds.view(); + #if defined(AXOM_USE_RAJA) RAJA::exclusive_scan( RAJA::make_span(addFacetsView.data(), parentCellCount), RAJA::make_span(firstFacetIdsView.data(), parentCellCount), @@ -289,7 +298,12 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase // m_addFacets and m_firstFacetIds, combined with m_caseIds, // are all we need to compute the surface mesh. #else - SLIC_ERROR("Incomplete coding in scanCrossings!"); + firstFacetIdsView[0] = 0; + for(axom::IndexType pcId = 1; pcId < parentCellCount; ++pcId) + { + firstFacetIdsView[pcId] = + firstFacetIdsView[pcId - 1] + addFacetsView[pcId - 1]; + } #endif // Compute number of facets in domain. @@ -353,7 +367,15 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase } } }; + #if defined(AXOM_USE_RAJA) axom::for_all(0, parentCellCount, gen_for_parent_cell); + #else + firstFacetIdsView[0] = 0; + for(axom::IndexType pcId = 1; pcId < parentCellCount; ++pcId) + { + gen_for_parent_cell(pcId); + } + #endif } /*! From c24783b8aa03662a9b18bfae0df30f100682209b Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 7 Nov 2023 14:52:20 -0800 Subject: [PATCH 179/639] Implement tet plane clipping --- src/axom/primal/operators/clip.hpp | 76 +++++++++++ .../primal/operators/detail/clip_impl.hpp | 87 +++++++++++++ src/axom/primal/tests/primal_clip.cpp | 118 ++++++++++++++++++ 3 files changed, 281 insertions(+) diff --git a/src/axom/primal/operators/clip.hpp b/src/axom/primal/operators/clip.hpp index 6d0a82f1a4..017cbbea61 100644 --- a/src/axom/primal/operators/clip.hpp +++ b/src/axom/primal/operators/clip.hpp @@ -304,6 +304,82 @@ AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet1, return detail::clipTetrahedron(tet1, tet2, eps, checkSign); } +/*! + * \brief Clips a 3D tetrahedron against a plane in 3D, returning + * the geometric intersection as a polyhedron + * + * This function clips the tetrahedron against the given plane. This + * involves finding new vertices at the intersection of the polyhedron + * edges and the plane, removing vertices from the polyhedron that are + * below the plane, and redefining the neighbors for each vertex (a + * vertex is a neighbor of another vertex if there is an edge between + * them). + * + * \param [in] tet The tetrahedron to clip + * \param [in] plane The plane used to clip the tetrahedron + * \param [in] eps The tolerance used when computing on which side of the + * plane a point lies + * \param [in] checkSign If true (default is false), checks if the signed + * volume of the tetrahedron is positive. If the signed volume + * of the tetrahedron is negative, the order of some vertices + * will be swapped in order to obtain a positive signed volume. + * + * \return The polyhedron obtained from clipping the tetrahedron against + * the plane. + * + * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. + * + * \note checkSign flag does not guarantee the shapes' vertex orders + * will be valid. It is the responsiblity of the caller to pass + * shapes with a valid vertex order. + */ +template +AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, + const Plane& plane, + double eps = 1.e-10, + bool checkSign = false) +{ + return detail::clipTetrahedron(tet, plane, eps, checkSign); +} + +/*! + * \brief Clips a 3D tetrahedron against a plane in 3D, returning + * the geometric intersection as a polyhedron + * + * This function clips the tetrahedron against the given plane. This + * involves finding new vertices at the intersection of the polyhedron + * edges and the plane, removing vertices from the polyhedron that are + * below the plane, and redefining the neighbors for each vertex (a + * vertex is a neighbor of another vertex if there is an edge between + * them). + * + * \param [in] plane The plane used to clip the tetrahedron + * \param [in] tet The tetrahedron to clip + * \param [in] eps The tolerance used when computing on which side of the + * plane a point lies + * \param [in] checkSign If true (default is false), checks if the signed + * volume of the tetrahedron is positive. If the signed volume + * of the tetrahedron is negative, the order of some vertices + * will be swapped in order to obtain a positive signed volume. + * + * \return The polyhedron obtained from clipping the tetrahedron against + * the plane. + * + * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. + * + * \note checkSign flag does not guarantee the shapes' vertex orders + * will be valid. It is the responsiblity of the caller to pass + * shapes with a valid vertex order. + */ +template +AXOM_HOST_DEVICE Polyhedron clip(const Plane& plane, + const Tetrahedron& tet, + double eps = 1.e-10, + bool checkSign = false) +{ + return clip(tet, plane, eps, checkSign); +} + } // namespace primal } // namespace axom diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index be013c98b5..9d17363284 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -399,6 +399,68 @@ AXOM_HOST_DEVICE void poly_clip_reindex(Polyhedron& poly, } } +/*! + * \brief Finds the polyhedron formed from clipping a polyhedron with a plane + * + * \param [in] poly The polyhedron to clip + * \param [in] plane The plane used to clip the polyhedron + * \param [in] eps The tolerance for plane point orientation + * + * \return The polyhedron formed from clipping the input polyhedron with a plane + */ +template +AXOM_HOST_DEVICE Polyhedron clipPolyhedron( + Polyhedron& poly, + const Plane& plane, + double eps) +{ + using BoxType = BoundingBox; + + // Check that plane intersects Polyhedron + if (intersect(plane, BoxType(&poly[0], poly.numVertices()), true, eps)) + { + int numVerts = poly.numVertices(); + + // Each bit value indicates if that Polyhedron vertex is formed from + // Polyhedron clipping with a plane. + unsigned int clipped = 0; + + // Clip polyhedron against current plane, generating extra vertices + // where edges meet the plane. + poly_clip_vertices(poly, plane, eps, clipped); + + // Adjust connectivity to link up newly-generated vertices. + poly_clip_fix_nbrs(poly, plane, numVerts, eps, clipped); + + // Reindex polyhedron connectivity by removing vertices on the negative + // side of the plane. + poly_clip_reindex(poly, clipped); + } + + // If entire polyhedron is below a plane (points can be on the plane), + // it is completely removed. + else + { + bool completeClip = true; + + for (int i = 0; i < poly.numVertices(); i++) + { + if (plane.getOrientation(poly[i], eps) == ON_POSITIVE_SIDE) + { + completeClip = false; + break; + } + } + + if (completeClip) + { + poly.clear(); + } + } + + return poly; +} + /*! * \brief Finds the clipped intersection Polyhedron between Polyhedron * poly and an array of Planes. @@ -620,6 +682,31 @@ AXOM_HOST_DEVICE Polyhedron clipTetrahedron( return clipPolyhedron(poly, planesView, eps); } +/*! + * \brief Finds the polyhedron formed from clipping a tetrahedron by a plane. + * + * \param [in] tet The tetrahedron to clip + * \param [in] plane The plane used to clip the tetrahedron + * \param [in] eps The tolerance for plane point orientation + * \param [in] checkSign Check if the signed volume of each shape is positive + * + * \return The polyhedron formed from clipping a tetrahedron by a plane + */ +template +AXOM_HOST_DEVICE Polyhedron clipTetrahedron( + const Tetrahedron& tet, + const Plane& plane, + double eps, + bool checkSign) +{ + using PolyhedronType = Polyhedron; + + // Initialize our polyhedron to return + PolyhedronType poly = PolyhedronType::from_primitive(tet, checkSign); + + return clipPolyhedron(poly, plane, eps); +} + } // namespace detail } // namespace primal } // namespace axom diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index efaf0edf8f..a5cf3f2730 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -1294,6 +1294,124 @@ TEST(primal_clip, tet_tet_clip_special_case_1) EPS); } +TEST(primal_clip, tet_plane_no_intersect_below) +{ + using namespace Primal3D; + constexpr double EPS = 1e-10; + constexpr bool CHECK_SIGN = true; + + // Tet and plane do not intersect + TetrahedronType tet(PointType {0.0, 0.0, 0.0}, + PointType {1.0, 0.0, 0.0}, + PointType {0.0, 1.0, 0.0}, + PointType {0.0, 0.0, 1.0}); + + PlaneType plane(VectorType {0.0, 0.0, -1.0}, PointType {0.0, 0.0, -0.5}); + + PolyhedronType poly = axom::primal::clip(tet, plane, EPS, CHECK_SIGN); + + EXPECT_NEAR(0.0, poly.volume(), EPS); +} + +TEST(primal_clip, tet_plane_no_intersect_above) +{ + using namespace Primal3D; + constexpr double EPS = 1e-10; + constexpr bool CHECK_SIGN = true; + + // Tet and plane do not intersect + TetrahedronType tet(PointType {0.0, 0.0, 0.0}, + PointType {1.0, 0.0, 0.0}, + PointType {0.0, 1.0, 0.0}, + PointType {0.0, 0.0, 1.0}); + + PlaneType plane(VectorType {0.0, 0.0, 1.0}, PointType {0.0, 0.0, -0.5}); + + PolyhedronType poly = axom::primal::clip(tet, plane, EPS, CHECK_SIGN); + + EXPECT_NEAR(tet.volume(), poly.volume(), EPS); +} + +TEST(primal_clip, tet_plane_borders_face_below) +{ + using namespace Primal3D; + constexpr double EPS = 1e-10; + constexpr bool CHECK_SIGN = true; + + // Tet and plane do not intersect, but border each other + TetrahedronType tet(PointType {0.0, 0.0, 0.0}, + PointType {1.0, 0.0, 0.0}, + PointType {0.0, 1.0, 0.0}, + PointType {0.0, 0.0, 1.0}); + + constexpr double planeOffset = 0.0; + PlaneType plane(VectorType {0.0, 0.0, -1.0}, planeOffset); + + PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); + + EXPECT_NEAR(0.0, poly.volume(), EPS); +} + +TEST(primal_clip, tet_plane_borders_face_above) +{ + using namespace Primal3D; + constexpr double EPS = 1e-10; + constexpr bool CHECK_SIGN = true; + + // Tet and plane do not intersect, but border each other + TetrahedronType tet(PointType {0.0, 0.0, 0.0}, + PointType {1.0, 0.0, 0.0}, + PointType {0.0, 1.0, 0.0}, + PointType {0.0, 0.0, 1.0}); + + constexpr double planeOffset = 0.0; + PlaneType plane(VectorType {0.0, 0.0, 1.0}, planeOffset); + + PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); + + EXPECT_NEAR(tet.volume(), poly.volume(), EPS); +} + +TEST(primal_clip, tet_plane_intersects_two_faces) +{ + using namespace Primal3D; + constexpr double EPS = 1e-10; + constexpr bool CHECK_SIGN = true; + + // Tet and plane do not intersect, but border each other + TetrahedronType tet(PointType {0.0, 0.0, 0.0}, + PointType {1.0, 0.0, 0.0}, + PointType {0.0, 1.0, 0.0}, + PointType {0.0, 0.0, 1.0}); + + constexpr double planeOffset = 0.5; + PlaneType plane(VectorType {0.5, 0.5, -0.5}, planeOffset); + + PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); + + EXPECT_NEAR(tet.volume()/2.0, poly.volume(), EPS); +} + +TEST(primal_clip, tet_plane_intersects_three_faces) +{ + using namespace Primal3D; + constexpr double EPS = 1e-10; + constexpr bool CHECK_SIGN = true; + + // Tet and plane do not intersect, but border each other + TetrahedronType tet(PointType {0.0, 0.0, 0.0}, + PointType {1.0, 0.0, 0.0}, + PointType {0.0, 1.0, 0.0}, + PointType {0.0, 0.0, 1.0}); + + constexpr double planeOffset = 0.5; + PlaneType plane(VectorType {0.0, 0.0, -1.0}, planeOffset); + + PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); + + EXPECT_NEAR(0.125, poly.volume(), EPS); +} + //------------------------------------------------------------------------------ int main(int argc, char* argv[]) { From dce2edab517c00d612258702f791f21c84d22ba0 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Wed, 8 Nov 2023 09:26:37 -0800 Subject: [PATCH 180/639] Clean up tet plane clip tests --- src/axom/primal/tests/primal_clip.cpp | 101 ++++++++++++++++++++++---- 1 file changed, 87 insertions(+), 14 deletions(-) diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index a5cf3f2730..59a18346b6 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -1294,13 +1294,13 @@ TEST(primal_clip, tet_tet_clip_special_case_1) EPS); } -TEST(primal_clip, tet_plane_no_intersect_below) +TEST(primal_clip, tet_plane_intersect_none_below) { using namespace Primal3D; constexpr double EPS = 1e-10; constexpr bool CHECK_SIGN = true; - // Tet and plane do not intersect + // Plane intersects one vertex of tet TetrahedronType tet(PointType {0.0, 0.0, 0.0}, PointType {1.0, 0.0, 0.0}, PointType {0.0, 1.0, 0.0}, @@ -1313,13 +1313,13 @@ TEST(primal_clip, tet_plane_no_intersect_below) EXPECT_NEAR(0.0, poly.volume(), EPS); } -TEST(primal_clip, tet_plane_no_intersect_above) +TEST(primal_clip, tet_plane_intersect_none_above) { using namespace Primal3D; constexpr double EPS = 1e-10; constexpr bool CHECK_SIGN = true; - // Tet and plane do not intersect + // Plane intersects one vertex of tet TetrahedronType tet(PointType {0.0, 0.0, 0.0}, PointType {1.0, 0.0, 0.0}, PointType {0.0, 1.0, 0.0}, @@ -1332,7 +1332,83 @@ TEST(primal_clip, tet_plane_no_intersect_above) EXPECT_NEAR(tet.volume(), poly.volume(), EPS); } -TEST(primal_clip, tet_plane_borders_face_below) +TEST(primal_clip, tet_plane_border_vertex_below) +{ + using namespace Primal3D; + constexpr double EPS = 1e-10; + constexpr bool CHECK_SIGN = true; + + // Plane intersects one vertex of tet + TetrahedronType tet(PointType {0.0, 0.0, 0.0}, + PointType {1.0, 0.0, 0.0}, + PointType {0.0, 1.0, 0.0}, + PointType {0.0, 0.0, 1.0}); + + PlaneType plane(VectorType {0.0, 0.0, 1.0}, PointType {0.0, 0.0, 1.0}); + + PolyhedronType poly = axom::primal::clip(tet, plane, EPS, CHECK_SIGN); + + EXPECT_NEAR(0.0, poly.volume(), EPS); +} + +TEST(primal_clip, tet_plane_border_vertex_above) +{ + using namespace Primal3D; + constexpr double EPS = 1e-10; + constexpr bool CHECK_SIGN = true; + + // Plane intersects one vertex of tet + TetrahedronType tet(PointType {0.0, 0.0, 0.0}, + PointType {1.0, 0.0, 0.0}, + PointType {0.0, 1.0, 0.0}, + PointType {0.0, 0.0, 1.0}); + + PlaneType plane(VectorType {0.0, 0.0, -1.0}, PointType {0.0, 0.0, 1.0}); + + PolyhedronType poly = axom::primal::clip(tet, plane, EPS, CHECK_SIGN); + + EXPECT_NEAR(tet.volume(), poly.volume(), EPS); +} + +TEST(primal_clip, tet_plane_border_edge_below) +{ + using namespace Primal3D; + constexpr double EPS = 1e-10; + constexpr bool CHECK_SIGN = true; + + // Plane intersects one edge of tet + TetrahedronType tet(PointType {0.0, 0.0, 0.0}, + PointType {1.0, 0.0, 0.0}, + PointType {0.0, 1.0, 0.0}, + PointType {0.0, 0.0, 1.0}); + + PlaneType plane(VectorType {0.0, -1.0, -1.0}, 0.0); + + PolyhedronType poly = axom::primal::clip(tet, plane, EPS, CHECK_SIGN); + + EXPECT_NEAR(0.0, poly.volume(), EPS); +} + +TEST(primal_clip, tet_plane_border_edge_above) +{ + using namespace Primal3D; + constexpr double EPS = 1e-10; + constexpr bool CHECK_SIGN = true; + + // Plane intersects one edge of tet + TetrahedronType tet(PointType {0.0, 0.0, 0.0}, + PointType {1.0, 0.0, 0.0}, + PointType {0.0, 1.0, 0.0}, + PointType {0.0, 0.0, 1.0}); + + PlaneType plane(VectorType {0.0, 1.0, 1.0}, 0.0); + + PolyhedronType poly = axom::primal::clip(tet, plane, EPS, CHECK_SIGN); + + EXPECT_NEAR(tet.volume(), poly.volume(), EPS); +} + +TEST(primal_clip, tet_plane_border_face_below) { using namespace Primal3D; constexpr double EPS = 1e-10; @@ -1344,15 +1420,14 @@ TEST(primal_clip, tet_plane_borders_face_below) PointType {0.0, 1.0, 0.0}, PointType {0.0, 0.0, 1.0}); - constexpr double planeOffset = 0.0; - PlaneType plane(VectorType {0.0, 0.0, -1.0}, planeOffset); + PlaneType plane(VectorType {0.0, 0.0, -1.0}, 0.0); PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); EXPECT_NEAR(0.0, poly.volume(), EPS); } -TEST(primal_clip, tet_plane_borders_face_above) +TEST(primal_clip, tet_plane_border_face_above) { using namespace Primal3D; constexpr double EPS = 1e-10; @@ -1364,15 +1439,14 @@ TEST(primal_clip, tet_plane_borders_face_above) PointType {0.0, 1.0, 0.0}, PointType {0.0, 0.0, 1.0}); - constexpr double planeOffset = 0.0; - PlaneType plane(VectorType {0.0, 0.0, 1.0}, planeOffset); + PlaneType plane(VectorType {0.0, 0.0, 1.0}, 0.0); PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); EXPECT_NEAR(tet.volume(), poly.volume(), EPS); } -TEST(primal_clip, tet_plane_intersects_two_faces) +TEST(primal_clip, tet_plane_intersect_triangle) { using namespace Primal3D; constexpr double EPS = 1e-10; @@ -1384,15 +1458,14 @@ TEST(primal_clip, tet_plane_intersects_two_faces) PointType {0.0, 1.0, 0.0}, PointType {0.0, 0.0, 1.0}); - constexpr double planeOffset = 0.5; - PlaneType plane(VectorType {0.5, 0.5, -0.5}, planeOffset); + PlaneType plane(VectorType {-1.0, 0.0, 1.0}, 0.0); PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); EXPECT_NEAR(tet.volume()/2.0, poly.volume(), EPS); } -TEST(primal_clip, tet_plane_intersects_three_faces) +TEST(primal_clip, tet_plane_intersect_quadrilateral) { using namespace Primal3D; constexpr double EPS = 1e-10; From 70eb7dbbca7a439800b1fd1ec769dc6c2c51d7b4 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Wed, 8 Nov 2023 10:33:41 -0800 Subject: [PATCH 181/639] Fix up test further --- src/axom/primal/tests/primal_clip.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index 59a18346b6..b8b9053868 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -1452,7 +1452,7 @@ TEST(primal_clip, tet_plane_intersect_triangle) constexpr double EPS = 1e-10; constexpr bool CHECK_SIGN = true; - // Tet and plane do not intersect, but border each other + // Plane intersects three edges of tet, forming a triangle TetrahedronType tet(PointType {0.0, 0.0, 0.0}, PointType {1.0, 0.0, 0.0}, PointType {0.0, 1.0, 0.0}, @@ -1471,18 +1471,17 @@ TEST(primal_clip, tet_plane_intersect_quadrilateral) constexpr double EPS = 1e-10; constexpr bool CHECK_SIGN = true; - // Tet and plane do not intersect, but border each other + // Plane intersects four edges of tet, forming a quadrilateral TetrahedronType tet(PointType {0.0, 0.0, 0.0}, PointType {1.0, 0.0, 0.0}, PointType {0.0, 1.0, 0.0}, PointType {0.0, 0.0, 1.0}); - constexpr double planeOffset = 0.5; - PlaneType plane(VectorType {0.0, 0.0, -1.0}, planeOffset); + PlaneType plane(VectorType {0.25, 0.25, 0.0}, PointType {0.5, 0.0, 0.0}); PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); - EXPECT_NEAR(0.125, poly.volume(), EPS); + EXPECT_NEAR(0.5*sqrt(0.5), poly.volume(), EPS); } //------------------------------------------------------------------------------ From 858531b32fc7657586aae98315cfee9bcccf6c9d Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 8 Nov 2023 10:41:18 -0800 Subject: [PATCH 182/639] strip targets of non-existant interface includes --- src/axom/CMakeLists.txt | 9 +++ src/cmake/axom-config.cmake.in | 103 ++++++++++++++++++++++++++++++++- 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/src/axom/CMakeLists.txt b/src/axom/CMakeLists.txt index 67674b6e9a..4765918ddb 100644 --- a/src/axom/CMakeLists.txt +++ b/src/axom/CMakeLists.txt @@ -45,6 +45,15 @@ install(EXPORT axom-targets NAMESPACE axom:: DESTINATION lib/cmake) +# Create alias targets for projects that include us as a subdirectory +add_library(axom INTERFACE) +target_link_libraries(axom INTERFACE ${AXOM_COMPONENTS_ENABLED}) + +foreach(_comp ${AXOM_COMPONENTS_ENABLED}) + add_library(axom::${_comp} ALIAS ${_comp}) +endforeach() + + #------------------------------------------------------------------------------ # Generate export symbols #------------------------------------------------------------------------------ diff --git a/src/cmake/axom-config.cmake.in b/src/cmake/axom-config.cmake.in index 1d08e79267..88eeeea5a7 100644 --- a/src/cmake/axom-config.cmake.in +++ b/src/cmake/axom-config.cmake.in @@ -187,10 +187,109 @@ if(NOT AXOM_FOUND) set_target_properties(RAJA PROPERTIES INTERFACE_COMPILE_OPTIONS "") endif() + + #--------------------------------------------------------------------------- + # Remove non-existant INTERFACE_INCLUDE_DIRECTORIES from imported targets + # to work around CMake error + #--------------------------------------------------------------------------- + + # Support IN_LIST operator for if() + # Policy added in 3.3+ + if(POLICY CMP0057) + cmake_policy(SET CMP0057 NEW) + endif() + + ## axom_find_target_dependencies(TARGET TLIST ) + ## + ## Store all target's dependencies (link libraries and interface link libraries) + ## recursively in the variable name TLIST holds. + macro(axom_find_target_dependencies) + + set(options) + set(singleValuedArgs TARGET TLIST) + set(multiValuedArgs) + + # parse the arguments to the macro + cmake_parse_arguments(arg + "${options}" "${singleValuedArgs}" "${multiValuedArgs}" ${ARGN}) + + # check for required arguments + if(NOT DEFINED arg_TARGET) + message(FATAL_ERROR "TARGET is a required parameter for the axom_find_target_dependencies macro") + endif() + + if(NOT DEFINED arg_TLIST OR NOT DEFINED ${arg_TLIST}) + message(FATAL_ERROR "TLIST is a required parameter for the axom_find_target_dependencies macro") + endif() + + string(TOUPPER ${arg_TARGET} _target_upper) + if(_BLT_${_target_upper}_IS_REGISTERED_LIBRARY) + # recursive call + set (_depends_on "${_BLT_${_target_upper}_DEPENDS_ON}") + foreach(t ${_depends_on}) + if (NOT "${t}" IN_LIST ${arg_TLIST}) + list(APPEND ${arg_TLIST} ${t}) + axom_find_target_dependencies(TARGET ${t} TLIST ${arg_TLIST}) + endif() + endforeach() + unset(_depends_on) + endif() + + # check if this is a valid cmake target + if(TARGET ${arg_TARGET}) + # get link libaries if whitelisted + set(_property_list "") + get_property(_target_type TARGET ${arg_TARGET} PROPERTY TYPE) + if(NOT "${_target_type}" STREQUAL "INTERFACE_LIBRARY") + get_property(_propval TARGET ${arg_TARGET} PROPERTY LINK_LIBRARIES SET) + get_target_property(_propval ${arg_TARGET} LINK_LIBRARIES) + if (_propval AND NOT "${_propval}" IN_LIST ${arg_TLIST}) + list(APPEND _property_list ${_propval}) + endif() + endif() + + # get interface link libraries + get_property(_propval TARGET ${arg_TARGET} PROPERTY INTERFACE_LINK_LIBRARIES SET) + get_target_property(_propval ${arg_TARGET} INTERFACE_LINK_LIBRARIES) + if (_propval AND NOT "${_propval}" IN_LIST ${arg_TLIST}) + list(APPEND _property_list ${_propval}) + endif() + + # recursive call + foreach(t ${_property_list}) + list(APPEND ${arg_TLIST} ${t}) + axom_find_target_dependencies(TARGET ${t} TLIST ${arg_TLIST}) + endforeach() + + unset(_property_list) + unset(_propval) + endif() + endmacro(axom_find_target_dependencies) + + set(_deps "") + axom_find_target_dependencies(TARGET axom TLIST _deps) + list(REMOVE_DUPLICATES _deps) + message(STATUS "Removing non-existant include directories from Axom's dependencies...") + + foreach(_target ${_deps}) + if(TARGET ${_target}) + get_target_property(_dirs ${_target} INTERFACE_INCLUDE_DIRECTORIES) + set(_existing_dirs) + foreach(_dir ${_dirs}) + if (EXISTS "${_dir}") + list(APPEND _existing_dirs "${_dir}") + endif() + endforeach() + if (_existing_dirs) + set_target_properties(${_target} PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_existing_dirs}" ) + endif() + endif() + endforeach() + #---------------------------------------------------------------------------- - # Indicate that axom is correctly set up + # Indicate that Axom is correctly set up #---------------------------------------------------------------------------- set(AXOM_FOUND TRUE) endif() - From 2e443bf9bb161b30be0e2b6e95acaae69238f08f Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Wed, 8 Nov 2023 11:21:21 -0800 Subject: [PATCH 183/639] Remove four edge test case --- src/axom/primal/tests/primal_clip.cpp | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index b8b9053868..c90a773d9b 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -1446,13 +1446,13 @@ TEST(primal_clip, tet_plane_border_face_above) EXPECT_NEAR(tet.volume(), poly.volume(), EPS); } -TEST(primal_clip, tet_plane_intersect_triangle) +TEST(primal_clip, tet_plane_intersect_three_edges) { using namespace Primal3D; constexpr double EPS = 1e-10; constexpr bool CHECK_SIGN = true; - // Plane intersects three edges of tet, forming a triangle + // Plane intersects three edges of tet TetrahedronType tet(PointType {0.0, 0.0, 0.0}, PointType {1.0, 0.0, 0.0}, PointType {0.0, 1.0, 0.0}, @@ -1465,24 +1465,7 @@ TEST(primal_clip, tet_plane_intersect_triangle) EXPECT_NEAR(tet.volume()/2.0, poly.volume(), EPS); } -TEST(primal_clip, tet_plane_intersect_quadrilateral) -{ - using namespace Primal3D; - constexpr double EPS = 1e-10; - constexpr bool CHECK_SIGN = true; - - // Plane intersects four edges of tet, forming a quadrilateral - TetrahedronType tet(PointType {0.0, 0.0, 0.0}, - PointType {1.0, 0.0, 0.0}, - PointType {0.0, 1.0, 0.0}, - PointType {0.0, 0.0, 1.0}); - - PlaneType plane(VectorType {0.25, 0.25, 0.0}, PointType {0.5, 0.0, 0.0}); - - PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); - - EXPECT_NEAR(0.5*sqrt(0.5), poly.volume(), EPS); -} +// TODO: Add a test for a plane that intersects four edges of a tet //------------------------------------------------------------------------------ int main(int argc, char* argv[]) From c549eea8fed5fd9fe89e5b5265785fc0bae20647 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Wed, 8 Nov 2023 11:23:53 -0800 Subject: [PATCH 184/639] Reduce code duplication --- .../primal/operators/detail/clip_impl.hpp | 58 +------------------ 1 file changed, 3 insertions(+), 55 deletions(-) diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index 9d17363284..25d9fc2534 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -478,64 +478,12 @@ AXOM_HOST_DEVICE Polyhedron clipPolyhedron( axom::ArrayView> planes, double eps) { - using PointType = Point; - using BoxType = BoundingBox; using PlaneType = Plane; - //Bounding Box of Polyhedron - BoxType polyBox(&poly[0], poly.numVertices()); - - //Clip Polyhedron by each plane - for(PlaneType plane : planes) + // Clip Polyhedron by each plane + for (const PlaneType& plane : planes) { - // Check that plane intersects Polyhedron - if(intersect(plane, polyBox, true, eps)) - { - int numVerts = poly.numVertices(); - - // Each bit value indicates if that Polyhedron vertex is formed from - // Polyhedron clipping with a plane. - unsigned int clipped = 0; - - // Clip polyhedron against current plane, generating extra vertices - // where edges meet the plane. - poly_clip_vertices(poly, plane, eps, clipped); - - // Adjust connectivity to link up newly-generated vertices. - poly_clip_fix_nbrs(poly, plane, numVerts, eps, clipped); - - // Reindex polyhedron connectivity by removing vertices on the negative - // side of the plane. - poly_clip_reindex(poly, clipped); - - // Generate new bounding box for polyhedron - polyBox = BoxType(); - - for(int i = 0; i < poly.numVertices(); i++) - { - polyBox.addPoint(PointType(poly[i])); - } - } - - // If entire polyhedron is below a plane (points can be on the plane), it is completely removed. - else - { - bool completeClip = true; - for(int i = 0; i < poly.numVertices(); i++) - { - if(plane.getOrientation(poly[i], eps) == ON_POSITIVE_SIDE) - { - completeClip = false; - break; - } - } - - if(completeClip) - { - poly.clear(); - return poly; - } - } + clipPolyhedron(poly, plane, eps); } return poly; From c6b9a39c412b2be7c00e4951aaef21f49880af6a Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 8 Nov 2023 12:59:57 -0800 Subject: [PATCH 185/639] Update src/cmake/axom-config.cmake.in Co-authored-by: Rich Hornung --- src/cmake/axom-config.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmake/axom-config.cmake.in b/src/cmake/axom-config.cmake.in index 88eeeea5a7..5466393b16 100644 --- a/src/cmake/axom-config.cmake.in +++ b/src/cmake/axom-config.cmake.in @@ -201,7 +201,7 @@ if(NOT AXOM_FOUND) ## axom_find_target_dependencies(TARGET TLIST ) ## - ## Store all target's dependencies (link libraries and interface link libraries) + ## Store all targets' dependencies (link libraries and interface link libraries) ## recursively in the variable name TLIST holds. macro(axom_find_target_dependencies) From 395322ff8e0d4b0d2535d61a0ea6ab3404c6f658 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 8 Nov 2023 13:08:20 -0800 Subject: [PATCH 186/639] Slight refactor to help performance valuation. Minor variable name change. --- .../detail/MarchingCubesFullParallel.hpp | 58 +++++++++++++------ 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index 67298e79ae..71affa0335 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -100,6 +100,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase { markCrossings(); scanCrossings(); + computeContour(); } /*! @@ -265,21 +266,21 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase auto caseIdsView = m_caseIds.view(); // Compute number of surface facets added by each parent cell. - m_addFacets.resize(parentCellCount); - const axom::ArrayView addFacetsView = m_addFacets.view(); + m_facetIncrs.resize(parentCellCount); + const axom::ArrayView facetIncrsView = m_facetIncrs.view(); #if defined(AXOM_USE_RAJA) axom::for_all( 0, parentCellCount, AXOM_LAMBDA(axom::IndexType parentCellId) { - addFacetsView.flatIndex(parentCellId) = + facetIncrsView.flatIndex(parentCellId) = num_contour_cells(caseIdsView.flatIndex(parentCellId)); }); #else for(axom::IndexType pcId = 0; pcId < parentCellCount; ++pcId) { - addFacetsView.flatIndex(pcId) = + facetIncrsView.flatIndex(pcId) = num_contour_cells(caseIdsView.flatIndex(pcId)); } #endif @@ -291,43 +292,65 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_firstFacetIds.view(); #if defined(AXOM_USE_RAJA) RAJA::exclusive_scan( - RAJA::make_span(addFacetsView.data(), parentCellCount), + RAJA::make_span(facetIncrsView.data(), parentCellCount), RAJA::make_span(firstFacetIdsView.data(), parentCellCount), RAJA::operators::plus {}); - // m_addFacets and m_firstFacetIds, combined with m_caseIds, + // m_facetIncrs and m_firstFacetIds, combined with m_caseIds, // are all we need to compute the surface mesh. #else firstFacetIdsView[0] = 0; for(axom::IndexType pcId = 1; pcId < parentCellCount; ++pcId) { firstFacetIdsView[pcId] = - firstFacetIdsView[pcId - 1] + addFacetsView[pcId - 1]; + firstFacetIdsView[pcId - 1] + facetIncrsView[pcId - 1]; } #endif - // Compute number of facets in domain. + // Use last facet info to compute number of facets in domain. // In case data is on device, copy to host before computing. axom::IndexType firstFacetIds_back = 0; - axom::IndexType addFacets_back = 0; + axom::IndexType facetIncrs_back = 0; axom::copy(&firstFacetIds_back, m_firstFacetIds.data() + m_firstFacetIds.size() - 1, sizeof(firstFacetIds_back)); - axom::copy(&addFacets_back, - m_addFacets.data() + m_addFacets.size() - 1, - sizeof(addFacets_back)); - m_facetCount = firstFacetIds_back + addFacets_back; + axom::copy(&facetIncrs_back, + m_facetIncrs.data() + m_facetIncrs.size() - 1, + sizeof(facetIncrs_back)); + m_facetCount = firstFacetIds_back + facetIncrs_back; // Allocate space for surface mesh. const axom::IndexType cornersCount = DIM * m_facetCount; m_contourCellParents.resize(m_facetCount); m_contourCellCorners.resize(m_facetCount); m_contourNodeCoords.resize(cornersCount); + } + void computeContour() + { // // Fill in surface mesh data. // + const axom::IndexType parentCellCount = m_caseIds.size(); + const auto facetIncrsView = m_facetIncrs.view(); + const auto firstFacetIdsView = m_firstFacetIds.view(); + const auto caseIdsView = m_caseIds.view(); + + // sortedIndices are parent cell indices, sorted by number + // of facets in them. + axom::Array sortedFacetIncrs(m_facetIncrs); + axom::Array sortedIndices(parentCellCount); + auto sortedIndicesView = sortedIndices.view(); + auto sortedFacetIncrsView = sortedFacetIncrs.view(); + axom::for_all(0, parentCellCount, + AXOM_LAMBDA(axom::IndexType pcId) { + sortedIndicesView[pcId] = pcId; + }); + RAJA::stable_sort_pairs(RAJA::make_span(sortedFacetIncrs.data(), parentCellCount), + RAJA::make_span(sortedIndices.data(), parentCellCount), + RAJA::operators::greater{}); + auto contourCellParentsView = m_contourCellParents.view(); auto contourCellCornersView = m_contourCellCorners.view(); auto contourNodeCoordsView = m_contourNodeCoords.view(); @@ -336,13 +359,14 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_caseIds.strides(), m_fcnView, m_coordsViews); - auto gen_for_parent_cell = AXOM_LAMBDA(axom::IndexType parentCellId) + auto gen_for_parent_cell = AXOM_LAMBDA(axom::IndexType loopIndex) { + axom::IndexType parentCellId = sortedIndicesView[loopIndex]; Point cornerCoords[CELL_CORNER_COUNT]; double cornerValues[CELL_CORNER_COUNT]; ccu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); - auto additionalFacets = addFacetsView[parentCellId]; + auto additionalFacets = facetIncrsView[parentCellId]; auto firstFacetId = firstFacetIdsView[parentCellId]; auto caseId = caseIdsView.flatIndex(parentCellId); @@ -367,10 +391,10 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase } } }; + #if defined(AXOM_USE_RAJA) axom::for_all(0, parentCellCount, gen_for_parent_cell); #else - firstFacetIdsView[0] = 0; for(axom::IndexType pcId = 1; pcId < parentCellCount; ++pcId) { gen_for_parent_cell(pcId); @@ -778,7 +802,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase axom::IndexType m_crossingCount = 0; //!@brief Number of surface mesh facets added by computational mesh cells. - axom::Array m_addFacets; + axom::Array m_facetIncrs; //!@brief First index of facets in computational mesh cells. axom::Array m_firstFacetIds; From 4058c36929c8459ddf28210b00df8ad659522ce8 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Thu, 9 Nov 2023 09:12:29 -0800 Subject: [PATCH 187/639] Fix style --- src/axom/primal/operators/detail/clip_impl.hpp | 17 ++++++++--------- src/axom/primal/tests/primal_clip.cpp | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index 25d9fc2534..2f594e501f 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -409,15 +409,14 @@ AXOM_HOST_DEVICE void poly_clip_reindex(Polyhedron& poly, * \return The polyhedron formed from clipping the input polyhedron with a plane */ template -AXOM_HOST_DEVICE Polyhedron clipPolyhedron( - Polyhedron& poly, - const Plane& plane, - double eps) +AXOM_HOST_DEVICE Polyhedron clipPolyhedron(Polyhedron& poly, + const Plane& plane, + double eps) { using BoxType = BoundingBox; // Check that plane intersects Polyhedron - if (intersect(plane, BoxType(&poly[0], poly.numVertices()), true, eps)) + if(intersect(plane, BoxType(&poly[0], poly.numVertices()), true, eps)) { int numVerts = poly.numVertices(); @@ -443,16 +442,16 @@ AXOM_HOST_DEVICE Polyhedron clipPolyhedron( { bool completeClip = true; - for (int i = 0; i < poly.numVertices(); i++) + for(int i = 0; i < poly.numVertices(); i++) { - if (plane.getOrientation(poly[i], eps) == ON_POSITIVE_SIDE) + if(plane.getOrientation(poly[i], eps) == ON_POSITIVE_SIDE) { completeClip = false; break; } } - if (completeClip) + if(completeClip) { poly.clear(); } @@ -481,7 +480,7 @@ AXOM_HOST_DEVICE Polyhedron clipPolyhedron( using PlaneType = Plane; // Clip Polyhedron by each plane - for (const PlaneType& plane : planes) + for(const PlaneType& plane : planes) { clipPolyhedron(poly, plane, eps); } diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index c90a773d9b..95ce5bb52b 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -1462,7 +1462,7 @@ TEST(primal_clip, tet_plane_intersect_three_edges) PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); - EXPECT_NEAR(tet.volume()/2.0, poly.volume(), EPS); + EXPECT_NEAR(tet.volume() / 2.0, poly.volume(), EPS); } // TODO: Add a test for a plane that intersects four edges of a tet From 3278b211342c119a7a963ff2a83f1cf6253e98c6 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Thu, 9 Nov 2023 09:35:41 -0800 Subject: [PATCH 188/639] Avoid copying polyhedron around --- .../primal/operators/detail/clip_impl.hpp | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index 2f594e501f..9e3f8fa881 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -400,18 +400,16 @@ AXOM_HOST_DEVICE void poly_clip_reindex(Polyhedron& poly, } /*! - * \brief Finds the polyhedron formed from clipping a polyhedron with a plane + * \brief Clips a polyhedron against a half-space defined by a plane * - * \param [in] poly The polyhedron to clip - * \param [in] plane The plane used to clip the polyhedron + * \param [in/out] poly The polyhedron to clip + * \param [in] plane The plane defining the half-space used to clip the polyhedron * \param [in] eps The tolerance for plane point orientation - * - * \return The polyhedron formed from clipping the input polyhedron with a plane */ template -AXOM_HOST_DEVICE Polyhedron clipPolyhedron(Polyhedron& poly, - const Plane& plane, - double eps) +AXOM_HOST_DEVICE void clipPolyhedron(Polyhedron& poly, + const Plane& plane, + double eps) { using BoxType = BoundingBox; @@ -457,25 +455,20 @@ AXOM_HOST_DEVICE Polyhedron clipPolyhedron(Polyhedron& poly, } } - return poly; + return; } /*! - * \brief Finds the clipped intersection Polyhedron between Polyhedron - * poly and an array of Planes. + * \brief Clips a polyhedron against an array of planes * - * \param [in] poly The polyhedron + * \param [in/out] poly The polyhedron to clip * \param [in] planes The array of planes - * \param [in] eps The tolerance for plane point orientation. - * - * \return The Polyhedron formed from clipping the polyhedron with a set of planes. - * + * \param [in] eps The tolerance for plane point orientation */ template -AXOM_HOST_DEVICE Polyhedron clipPolyhedron( - Polyhedron& poly, - axom::ArrayView> planes, - double eps) +AXOM_HOST_DEVICE void clipPolyhedron(Polyhedron& poly, + axom::ArrayView> planes, + double eps) { using PlaneType = Plane; @@ -483,9 +476,14 @@ AXOM_HOST_DEVICE Polyhedron clipPolyhedron( for(const PlaneType& plane : planes) { clipPolyhedron(poly, plane, eps); + + if(poly.numVertices() == 0) + { + return; + } } - return poly; + return; } /*! @@ -532,7 +530,8 @@ AXOM_HOST_DEVICE Polyhedron clipHexahedron( axom::StackArray planeSize = {4}; axom::ArrayView planesView(planes, planeSize); - return clipPolyhedron(poly, planesView, eps); + clipPolyhedron(poly, planesView, eps); + return poly; } /*! @@ -579,7 +578,8 @@ AXOM_HOST_DEVICE Polyhedron clipOctahedron( axom::StackArray planeSize = {4}; axom::ArrayView planesView(planes, planeSize); - return clipPolyhedron(poly, planesView, eps); + clipPolyhedron(poly, planesView, eps); + return poly; } /*! @@ -626,7 +626,8 @@ AXOM_HOST_DEVICE Polyhedron clipTetrahedron( axom::StackArray planeSize = {4}; axom::ArrayView planesView(planes, planeSize); - return clipPolyhedron(poly, planesView, eps); + clipPolyhedron(poly, planesView, eps); + return poly; } /*! @@ -651,7 +652,8 @@ AXOM_HOST_DEVICE Polyhedron clipTetrahedron( // Initialize our polyhedron to return PolyhedronType poly = PolyhedronType::from_primitive(tet, checkSign); - return clipPolyhedron(poly, plane, eps); + clipPolyhedron(poly, plane, eps); + return poly; } } // namespace detail From b86d243cddb1e5ee33e6f46a92f946f012847b10 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Thu, 9 Nov 2023 09:37:29 -0800 Subject: [PATCH 189/639] Fix doxygen --- src/axom/primal/operators/detail/clip_impl.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index 9e3f8fa881..c3689a42fa 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -402,7 +402,7 @@ AXOM_HOST_DEVICE void poly_clip_reindex(Polyhedron& poly, /*! * \brief Clips a polyhedron against a half-space defined by a plane * - * \param [in/out] poly The polyhedron to clip + * \param [inout] poly The polyhedron to clip * \param [in] plane The plane defining the half-space used to clip the polyhedron * \param [in] eps The tolerance for plane point orientation */ @@ -461,7 +461,7 @@ AXOM_HOST_DEVICE void clipPolyhedron(Polyhedron& poly, /*! * \brief Clips a polyhedron against an array of planes * - * \param [in/out] poly The polyhedron to clip + * \param [inout] poly The polyhedron to clip * \param [in] planes The array of planes * \param [in] eps The tolerance for plane point orientation */ From 6746d09ddb48438f8d0e9afa755db3e0c4bf05b8 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Thu, 9 Nov 2023 10:05:19 -0800 Subject: [PATCH 190/639] Clean up documentation --- src/axom/primal/operators/clip.hpp | 96 ++++++++++--------- .../primal/operators/detail/clip_impl.hpp | 29 ++++-- 2 files changed, 72 insertions(+), 53 deletions(-) diff --git a/src/axom/primal/operators/clip.hpp b/src/axom/primal/operators/clip.hpp index 017cbbea61..40b07ebe31 100644 --- a/src/axom/primal/operators/clip.hpp +++ b/src/axom/primal/operators/clip.hpp @@ -305,79 +305,87 @@ AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet1, } /*! - * \brief Clips a 3D tetrahedron against a plane in 3D, returning - * the geometric intersection as a polyhedron - * - * This function clips the tetrahedron against the given plane. This - * involves finding new vertices at the intersection of the polyhedron - * edges and the plane, removing vertices from the polyhedron that are - * below the plane, and redefining the neighbors for each vertex (a - * vertex is a neighbor of another vertex if there is an edge between + * \brief Clips a 3D tetrahedron against the half-space defined by a plane + * and returns the resulting polyhedron + * + * This function clips a tetrahedron against the half-space defined by a + * plane. This involves finding new vertices at the intersection of the + * polyhedron edges and the plane, removing vertices from the polyhedron + * that are below the plane, and redefining the neighbors for each vertex + * (a vertex is a neighbor of another vertex if there is an edge between * them). * * \param [in] tet The tetrahedron to clip - * \param [in] plane The plane used to clip the tetrahedron - * \param [in] eps The tolerance used when computing on which side of the - * plane a point lies - * \param [in] checkSign If true (default is false), checks if the signed - * volume of the tetrahedron is positive. If the signed volume - * of the tetrahedron is negative, the order of some vertices - * will be swapped in order to obtain a positive signed volume. + * \param [in] plane The plane defining the half-space used to clip the tetrahedron + * \param [in] eps The tolerance for plane point orientation + * \param [in] tryFixOrientation If true and the tetrahedron has a negative + * signed volume, swaps the order of some vertices in the + * tetrathedron to try to obtain a nonnegative signed volume. + * Defaults to false. * - * \return The polyhedron obtained from clipping the tetrahedron against - * the plane. + * \return The polyhedron obtained from clipping a tetrahedron against + * the half-space defined by a plane. * * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. * - * \note checkSign flag does not guarantee the shapes' vertex orders - * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. + * \warning tryFixOrientation flag does not guarantee the tetrahedron's vertex + * order will be valid. It is the responsiblity of the caller to pass + * a tetrahedron with a valid vertex order. Otherwise, the returned + * polyhedron will have a non-positive and/or unexpected volume. + * + * \warning If the tryFixOrientation flag is false and the tetrahedron has + * a negative signed volume, the returned polyhedron will have a + * non-positive and/or unexpected volume. */ template AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, const Plane& plane, double eps = 1.e-10, - bool checkSign = false) + bool tryFixOrientation = false) { - return detail::clipTetrahedron(tet, plane, eps, checkSign); + return detail::clipTetrahedron(tet, plane, eps, tryFixOrientation); } /*! - * \brief Clips a 3D tetrahedron against a plane in 3D, returning - * the geometric intersection as a polyhedron - * - * This function clips the tetrahedron against the given plane. This - * involves finding new vertices at the intersection of the polyhedron - * edges and the plane, removing vertices from the polyhedron that are - * below the plane, and redefining the neighbors for each vertex (a - * vertex is a neighbor of another vertex if there is an edge between + * \brief Clips a 3D tetrahedron against the half-space defined by a plane + * and returns the resulting polyhedron + * + * This function clips a tetrahedron against the half-space defined by a + * plane. This involves finding new vertices at the intersection of the + * polyhedron edges and the plane, removing vertices from the polyhedron + * that are below the plane, and redefining the neighbors for each vertex + * (a vertex is a neighbor of another vertex if there is an edge between * them). * - * \param [in] plane The plane used to clip the tetrahedron + * \param [in] plane The plane defining the half-space used to clip the tetrahedron * \param [in] tet The tetrahedron to clip - * \param [in] eps The tolerance used when computing on which side of the - * plane a point lies - * \param [in] checkSign If true (default is false), checks if the signed - * volume of the tetrahedron is positive. If the signed volume - * of the tetrahedron is negative, the order of some vertices - * will be swapped in order to obtain a positive signed volume. + * \param [in] eps The tolerance for plane point orientation + * \param [in] tryFixOrientation If true and the tetrahedron has a negative + * signed volume, swaps the order of some vertices in the + * tetrathedron to try to obtain a nonnegative signed volume. + * Defaults to false. * - * \return The polyhedron obtained from clipping the tetrahedron against - * the plane. + * \return The polyhedron obtained from clipping a tetrahedron against + * the half-space defined by a plane. * * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. * - * \note checkSign flag does not guarantee the shapes' vertex orders - * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. + * \warning tryFixOrientation flag does not guarantee the tetrahedron's vertex + * order will be valid. It is the responsiblity of the caller to pass + * a tetrahedron with a valid vertex order. Otherwise, the returned + * polyhedron will have a non-positive and/or unexpected volume. + * + * \warning If the tryFixOrientation flag is false and the tetrahedron has + * a negative signed volume, the returned polyhedron will have a + * non-positive and/or unexpected volume. */ template AXOM_HOST_DEVICE Polyhedron clip(const Plane& plane, const Tetrahedron& tet, double eps = 1.e-10, - bool checkSign = false) + bool tryFixOrientation = false) { - return clip(tet, plane, eps, checkSign); + return clip(tet, plane, eps, tryFixOrientation); } } // namespace primal diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index c3689a42fa..72c91e40c8 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -631,27 +631,38 @@ AXOM_HOST_DEVICE Polyhedron clipTetrahedron( } /*! - * \brief Finds the polyhedron formed from clipping a tetrahedron by a plane. + * \brief Clips a tetrahedron against the half-space defined by a plane + * and returns the resulting polyhedron * * \param [in] tet The tetrahedron to clip - * \param [in] plane The plane used to clip the tetrahedron + * \param [in] plane The plane defining the half-space used to clip the tetrahedron * \param [in] eps The tolerance for plane point orientation - * \param [in] checkSign Check if the signed volume of each shape is positive + * \param [in] tryFixOrientation If true and the tetrahedron has a negative + * signed volume, swaps the order of some vertices in the + * tetrathedron to try to obtain a nonnegative signed volume. + * Defaults to false. * - * \return The polyhedron formed from clipping a tetrahedron by a plane + * \return The polyhedron obtained from clipping a tetrahedron against + * the half-space defined a plane + * + * \warning tryFixOrientation flag does not guarantee the tetrahedron's vertex + * order will be valid. It is the responsiblity of the caller to pass + * a tetrahedron with a valid vertex order. Otherwise, the returned + * polyhedron will have a non-positive and/or unexpected volume. + * + * \warning If the tryFixOrientation flag is false and the tetrahedron has + * a negative signed volume, the returned polyhedron will have a + * non-positive and/or unexpected volume. */ template AXOM_HOST_DEVICE Polyhedron clipTetrahedron( const Tetrahedron& tet, const Plane& plane, double eps, - bool checkSign) + bool tryFixOrientation) { using PolyhedronType = Polyhedron; - - // Initialize our polyhedron to return - PolyhedronType poly = PolyhedronType::from_primitive(tet, checkSign); - + PolyhedronType poly = PolyhedronType::from_primitive(tet, tryFixOrientation); clipPolyhedron(poly, plane, eps); return poly; } From 597aa10a187d8ed8f634473563863407eede7c86 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 9 Nov 2023 13:25:10 -0800 Subject: [PATCH 191/639] Fix surface mesh summary output in parallel mode. --- .../examples/quest_marching_cubes_example.cpp | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index b238e1709c..3235bb44e8 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -321,6 +321,19 @@ void moveConduitDataToNewMemorySpace(conduit::Node& node, } } +void getIntMinMax(int inVal, int& minVal, int& maxVal, int& sumVal) +{ + #ifdef AXOM_USE_MPI + MPI_Allreduce(&inVal, &minVal, 1, MPI_INT, MPI_MIN, MPI_COMM_WORLD); + MPI_Allreduce(&inVal, &maxVal, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD); + MPI_Allreduce(&inVal, &sumVal, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); + #else + minVal = inVal; + maxVal = inVal; + sumVal = inVal; + #endif +} + Input params; int myRank = -1, numRanks = -1; // MPI stuff, set in main(). @@ -339,7 +352,8 @@ struct BlueprintStructuredMesh for(int d = 0; d < _mdMesh.number_of_children(); ++d) { auto dl = domainLengths(d); - SLIC_INFO(axom::fmt::format("dom[{}] size={}", d, dl)); + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("dom[{}] size={}", d, dl)); } _maxSpacing = maxSpacing(); } @@ -797,6 +811,16 @@ struct ContourTestBase computeTimer.stop(); printTimingStats(computeTimer, name() + " contour"); + { + int mn, mx, sum; + getIntMinMax(mc.getContourCellCount(), mn, mx, sum); + SLIC_INFO(axom::fmt::format( + "Contour mesh has {{min:{}, max:{}, sum:{}, avg:{}}} cells", + mn, + mx, + sum, + (double)sum / numRanks)); + } SLIC_INFO(axom::fmt::format("Surface mesh has locally {} cells, {} nodes.", mc.getContourCellCount(), mc.getContourNodeCount())); @@ -1680,18 +1704,6 @@ int main(int argc, char** argv) computationalMesh.domainCount())); slic::flushStreams(); - auto getIntMinMax = [](int inVal, int& minVal, int& maxVal, int& sumVal) { - #ifdef AXOM_USE_MPI - MPI_Allreduce(&inVal, &minVal, 1, MPI_INT, MPI_MIN, MPI_COMM_WORLD); - MPI_Allreduce(&inVal, &maxVal, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD); - MPI_Allreduce(&inVal, &sumVal, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); - #else - minVal = inVal; - maxVal = inVal; - sumVal = inVal; - #endif - }; - // Output some global mesh size stats { int mn, mx, sum; From a646b4aa25895e96d4f4a48a115d3c13776a2fbb Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 9 Nov 2023 13:28:06 -0800 Subject: [PATCH 192/639] Doxygen comment changes from code review for MeshViewUtil. --- src/axom/quest/MeshViewUtil.hpp | 54 ++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 20b5be7297..d671ff7a35 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -67,7 +67,13 @@ inline axom::StackArray makeStackArray(const U* v) Views are single-domain-specific. They don't apply to multi-domain meshes. They are also topology specific, with the topology name - given to the constructor. + given to the constructor. They are valid only while their domain + exists with no change to its data layout. + + This class recognizes potential ghost (a.k.a. phony, image) data + layers around the domain. Some methods and paramenters names refer + to the data with ghosts, while others refer to the data without + hosts (a.k.a. real data). TODO: Figure out if there's a better place for this utility. It's only in axom/quest because the initial need was there. @@ -88,7 +94,7 @@ class MeshViewUtil @param [in] bpDomain Blueprint single domain. @param [in] topologyName Name of topology in the domain. - If \a topologyName is omitted, use the first topology, + If \a topologyName is omitted, use the first topology. The topology dimension must match DIM. */ @@ -158,26 +164,42 @@ class MeshViewUtil checkBlueprint is false), this method checks against its own requirements. */ - bool isValid(bool checkBlueprint = false) const + bool isValid(bool checkBlueprint = false, bool printFailureCause = false) const { - bool rval = true; + bool valA = true; if(checkBlueprint) { conduit::Node info; #ifdef AXOM_USE_MPI - rval = rval && + valA = conduit::blueprint::mpi::verify("mesh", *m_cdom, info, MPI_COMM_WORLD); #else - rval = rval && conduit::blueprint::verify("mesh", *m_cdom, info); + valA = conduit::blueprint::verify("mesh", *m_cdom, info); #endif + if(printFailureCause && !valA) + { + info.print(); + } + } + bool valB = m_ctopology->fetch_existing("type").as_string() == "structured"; + if(printFailureCause && !valB) + { + SLIC_INFO("MeshViewUtil domain is not structured"); + } + + bool valC = m_ccoordset->fetch_existing("type").as_string() == "explicit"; + if(printFailureCause && !valC) + { + SLIC_INFO("MeshViewUtil domain coords is not explicit"); + } + + bool valD = conduit::blueprint::mesh::coordset::dims(*m_ccoordset) == DIM; + if(printFailureCause && !valD) + { + SLIC_INFO("MeshViewUtil domain has wrong dimension"); } - rval = - rval && (m_ctopology->fetch_existing("type").as_string() == "structured"); - rval = - rval && (m_ccoordset->fetch_existing("type").as_string() == "explicit"); - rval = - rval && (conduit::blueprint::mesh::coordset::dims(*m_ccoordset) == DIM); - return true; + + return valA && valB && valC && valD; } //@} @@ -264,7 +286,8 @@ class MeshViewUtil } /*! - @brief Return the array strides for ghost-free nodal coordinates. + @brief Return the array strides for ghost-free nodal + coordinates. */ axom::StackArray getCoordsStrides() const { @@ -272,7 +295,8 @@ class MeshViewUtil } /*! - @brief Return the array index offsets for nodal coordinates. + @brief Return the array index offsets for ghost-free nodal + coordinates. */ axom::StackArray getCoordsOffsets() const { From 7fc302c397a8c4843c6721d17f0bffa1f3bf74f4 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 9 Nov 2023 15:28:51 -0800 Subject: [PATCH 193/639] swap to service user --- .gitlab/build_lassen.yml | 1 + .gitlab/build_quartz.yml | 2 ++ .gitlab/build_tioga.yml | 2 ++ 3 files changed, 5 insertions(+) diff --git a/.gitlab/build_lassen.yml b/.gitlab/build_lassen.yml index 7167611c20..6b15fb37a8 100644 --- a/.gitlab/build_lassen.yml +++ b/.gitlab/build_lassen.yml @@ -7,6 +7,7 @@ # This is the share configuration of jobs for lassen .on_lassen: variables: + LLNL_SERVICE_USER: atk tags: - shell - lassen diff --git a/.gitlab/build_quartz.yml b/.gitlab/build_quartz.yml index 84f0bb867f..7e64968a80 100644 --- a/.gitlab/build_quartz.yml +++ b/.gitlab/build_quartz.yml @@ -6,6 +6,8 @@ #### # This is the shared configuration of jobs for quartz .on_quartz: + variables: + LLNL_SERVICE_USER: atk tags: - shell - quartz diff --git a/.gitlab/build_tioga.yml b/.gitlab/build_tioga.yml index 8e6555c993..776678a735 100644 --- a/.gitlab/build_tioga.yml +++ b/.gitlab/build_tioga.yml @@ -6,6 +6,8 @@ #### # This is the shared configuration of jobs for tioga .on_tioga: + variables: + LLNL_SERVICE_USER: atk tags: - shell - tioga From 92c84481fde61c6d3cb132f6971471a0309e1605 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 9 Nov 2023 15:31:02 -0800 Subject: [PATCH 194/639] swap to new bank for lassen --- .gitlab/build_lassen.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/build_lassen.yml b/.gitlab/build_lassen.yml index 6b15fb37a8..80cefe9e50 100644 --- a/.gitlab/build_lassen.yml +++ b/.gitlab/build_lassen.yml @@ -24,14 +24,14 @@ .src_build_on_lassen: stage: build variables: - ALLOC_COMMAND: "lalloc 1 -W 25 -q pdebug -alloc_flags atsdisable" + ALLOC_COMMAND: "lalloc 1 -W 25 -q pwdev -G wdev -alloc_flags atsdisable" extends: [.src_build_script, .on_lassen, .src_workflow] needs: [] .full_build_on_lassen: stage: build variables: - ALLOC_COMMAND: "lalloc 1 -W 45 -q pdebug -alloc_flags atsdisable" + ALLOC_COMMAND: "lalloc 1 -W 45 -q pwdev -G wdev -alloc_flags atsdisable" extends: [.full_build_script, .on_lassen, .full_workflow] needs: [] From 21e66dd872b4e00405a680651e642d513feae493 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 9 Nov 2023 14:12:15 -0800 Subject: [PATCH 195/639] Macro name changes and small comment changes from PR. --- src/axom/quest/MarchingCubes.cpp | 7 +++---- src/axom/quest/MarchingCubes.hpp | 12 ++++++------ src/axom/quest/detail/MarchingCubesImpl.hpp | 2 +- .../quest/examples/quest_marching_cubes_example.cpp | 6 +++--- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 841b4ea06b..ab4b232288 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -129,7 +129,6 @@ void MarchingCubes::populateContourMesh( int userDomainId = single->getDomainId(dId); - // TODO: Verify that UnstructuredMesh only supports host memory. axom::detail::ArrayOps::fill( domainIdPtr, nPrev, @@ -239,7 +238,7 @@ void MarchingCubesSingleDomain::allocateImpl() : std::unique_ptr( new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); } - #ifdef _AXOM_MC_USE_OPENMP + #ifdef _AXOM_MARCHINGCUBES_USE_OPENMP else if(m_runtimePolicy == RuntimePolicy::omp) { m_impl = m_ndim == 2 @@ -249,7 +248,7 @@ void MarchingCubesSingleDomain::allocateImpl() new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>); } #endif - #ifdef _AXOM_MC_USE_CUDA + #ifdef _AXOM_MARCHINGCUBES_USE_CUDA else if(m_runtimePolicy == RuntimePolicy::cuda) { m_impl = m_ndim == 2 @@ -259,7 +258,7 @@ void MarchingCubesSingleDomain::allocateImpl() new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); } #endif - #ifdef _AXOM_MC_USE_HIP + #ifdef _AXOM_MARCHINGCUBES_USE_HIP else if(m_runtimePolicy == RuntimePolicy::hip) { m_impl = m_ndim == 2 diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 215a56b0bd..b56f416757 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -31,13 +31,13 @@ // within the marching cubes implementation. #if defined(AXOM_USE_RAJA) #ifdef AXOM_USE_OPENMP - #define _AXOM_MC_USE_OPENMP + #define _AXOM_MARCHINGCUBES_USE_OPENMP #endif #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) - #define _AXOM_MC_USE_CUDA + #define _AXOM_MARCHINGCUBES_USE_CUDA #endif #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) - #define _AXOM_MC_USE_HIP + #define _AXOM_MARCHINGCUBES_USE_HIP #endif #endif @@ -305,20 +305,20 @@ class MarchingCubesSingleDomain return true; case MarchingCubesRuntimePolicy::omp: - #ifdef _AXOM_MC_USE_OPENMP + #ifdef _AXOM_MARCHINGCUBES_USE_OPENMP return true; #else return false; #endif case MarchingCubesRuntimePolicy::cuda: - #ifdef _AXOM_MC_USE_CUDA + #ifdef _AXOM_MARCHINGCUBES_USE_CUDA return true; #else return false; #endif case MarchingCubesRuntimePolicy::hip: - #ifdef _AXOM_MC_USE_HIP + #ifdef _AXOM_MARCHINGCUBES_USE_HIP return true; #else return false; diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 241da7d87a..b729c490c7 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -62,7 +62,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase @param dom Blueprint structured mesh domain @param topologyName Name of mesh topology (see blueprint mesh documentation) - @param fcnFieldName Name of nodal function is in dom + @param fcnFieldName Name of nodal function in dom @param maskFieldName Name of integer cell mask function is in dom Set up views to domain data and allocate other data to work on the diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index bbf2afdb75..ad7024378b 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -233,20 +233,20 @@ static int allocatorIdForPolicy(quest::MarchingCubesRuntimePolicy policy) aid = axom::execution_space::allocatorID(); } #if defined(AXOM_USE_RAJA) -#ifdef _AXOM_MC_USE_OPENMP +#ifdef _AXOM_MARCHINGCUBES_USE_OPENMP else if(policy == axom::quest::MarchingCubesRuntimePolicy::omp) { aid = axom::execution_space::allocatorID(); } #endif -#ifdef _AXOM_MC_USE_CUDA +#ifdef _AXOM_MARCHINGCUBES_USE_CUDA else if(policy == axom::quest::MarchingCubesRuntimePolicy::cuda) { // aid = axom::execution_space>::allocatorID(); aid = axom::getUmpireResourceAllocatorID(umpire::resource::Device); } #endif -#ifdef _AXOM_MC_USE_HIP +#ifdef _AXOM_MARCHINGCUBES_USE_HIP else if(policy == axom::quest::MarchingCubesRuntimePolicy::hip) { // aid = axom::execution_space>::allocatorID(); From 0e897b328dd10dd2c8920dd099c1e97b502ddb22 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 9 Nov 2023 13:28:06 -0800 Subject: [PATCH 196/639] Doxygen comment changes from code review for MeshViewUtil. --- src/axom/quest/MeshViewUtil.hpp | 54 ++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 20b5be7297..d671ff7a35 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -67,7 +67,13 @@ inline axom::StackArray makeStackArray(const U* v) Views are single-domain-specific. They don't apply to multi-domain meshes. They are also topology specific, with the topology name - given to the constructor. + given to the constructor. They are valid only while their domain + exists with no change to its data layout. + + This class recognizes potential ghost (a.k.a. phony, image) data + layers around the domain. Some methods and paramenters names refer + to the data with ghosts, while others refer to the data without + hosts (a.k.a. real data). TODO: Figure out if there's a better place for this utility. It's only in axom/quest because the initial need was there. @@ -88,7 +94,7 @@ class MeshViewUtil @param [in] bpDomain Blueprint single domain. @param [in] topologyName Name of topology in the domain. - If \a topologyName is omitted, use the first topology, + If \a topologyName is omitted, use the first topology. The topology dimension must match DIM. */ @@ -158,26 +164,42 @@ class MeshViewUtil checkBlueprint is false), this method checks against its own requirements. */ - bool isValid(bool checkBlueprint = false) const + bool isValid(bool checkBlueprint = false, bool printFailureCause = false) const { - bool rval = true; + bool valA = true; if(checkBlueprint) { conduit::Node info; #ifdef AXOM_USE_MPI - rval = rval && + valA = conduit::blueprint::mpi::verify("mesh", *m_cdom, info, MPI_COMM_WORLD); #else - rval = rval && conduit::blueprint::verify("mesh", *m_cdom, info); + valA = conduit::blueprint::verify("mesh", *m_cdom, info); #endif + if(printFailureCause && !valA) + { + info.print(); + } + } + bool valB = m_ctopology->fetch_existing("type").as_string() == "structured"; + if(printFailureCause && !valB) + { + SLIC_INFO("MeshViewUtil domain is not structured"); + } + + bool valC = m_ccoordset->fetch_existing("type").as_string() == "explicit"; + if(printFailureCause && !valC) + { + SLIC_INFO("MeshViewUtil domain coords is not explicit"); + } + + bool valD = conduit::blueprint::mesh::coordset::dims(*m_ccoordset) == DIM; + if(printFailureCause && !valD) + { + SLIC_INFO("MeshViewUtil domain has wrong dimension"); } - rval = - rval && (m_ctopology->fetch_existing("type").as_string() == "structured"); - rval = - rval && (m_ccoordset->fetch_existing("type").as_string() == "explicit"); - rval = - rval && (conduit::blueprint::mesh::coordset::dims(*m_ccoordset) == DIM); - return true; + + return valA && valB && valC && valD; } //@} @@ -264,7 +286,8 @@ class MeshViewUtil } /*! - @brief Return the array strides for ghost-free nodal coordinates. + @brief Return the array strides for ghost-free nodal + coordinates. */ axom::StackArray getCoordsStrides() const { @@ -272,7 +295,8 @@ class MeshViewUtil } /*! - @brief Return the array index offsets for nodal coordinates. + @brief Return the array index offsets for ghost-free nodal + coordinates. */ axom::StackArray getCoordsOffsets() const { From be0cb8c8e14cff10c84ce9c02c05176d3e2ea1df Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 10 Nov 2023 11:48:37 -0800 Subject: [PATCH 197/639] Add test for ArrayIndexer. --- src/axom/quest/ArrayIndexer.hpp | 7 +- src/axom/quest/tests/CMakeLists.txt | 1 + src/axom/quest/tests/quest_array_indexer.cpp | 174 +++++++++++++++++++ 3 files changed, 179 insertions(+), 3 deletions(-) create mode 100644 src/axom/quest/tests/quest_array_indexer.cpp diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index 63acb93942..a43ec946d7 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -6,6 +6,7 @@ #ifndef QUEST_ARRAYINDEXER_HPP_ #define QUEST_ARRAYINDEXER_HPP_ +#include "axom/slic.hpp" #include "axom/core/StackArray.hpp" #include "axom/core/numerics/matvecops.hpp" @@ -15,7 +16,7 @@ namespace axom @brief Indexing into a multidimensional structured array. Supports row-major and column-major ordering and arbitrary - permutations of the indices. + permutations of the ordering. */ template class ArrayIndexer @@ -78,13 +79,13 @@ class ArrayIndexer } //!@brief Index directions, ordered from slowest to fastest. - inline AXOM_HOST_DEVICE axom::StackArray& slowestDirs() const + inline AXOM_HOST_DEVICE const axom::StackArray& slowestDirs() const { return m_slowestDirs; } //!@brief Strides. - inline AXOM_HOST_DEVICE axom::StackArray& strides() const + inline AXOM_HOST_DEVICE const axom::StackArray& strides() const { return m_strides; } diff --git a/src/axom/quest/tests/CMakeLists.txt b/src/axom/quest/tests/CMakeLists.txt index 55b1ac266e..a3c5a18377 100644 --- a/src/axom/quest/tests/CMakeLists.txt +++ b/src/axom/quest/tests/CMakeLists.txt @@ -15,6 +15,7 @@ set(quest_tests quest_pro_e_reader.cpp quest_stl_reader.cpp quest_vertex_weld.cpp + quest_array_indexer.cpp ) blt_list_append(TO quest_tests diff --git a/src/axom/quest/tests/quest_array_indexer.cpp b/src/axom/quest/tests/quest_array_indexer.cpp new file mode 100644 index 0000000000..f7cc51c201 --- /dev/null +++ b/src/axom/quest/tests/quest_array_indexer.cpp @@ -0,0 +1,174 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +// Axom includes +#include "axom/core/Array.hpp" +#include "axom/quest/ArrayIndexer.hpp" +#include "axom/fmt.hpp" + +// Google test include +#include "gtest/gtest.h" + +// Test strides and permutations. +TEST(quest_array_indexer, quest_strides_and_permutatations) +{ + axom::StackArray lengths{5,3,2}; + + axom::ArrayIndexer colIndexer(lengths, 'c'); + axom::StackArray colSlowestDirs{0,1,2}; + axom::StackArray colStrides{6,2,1}; + for(int d=0; d<3; ++d) + { + EXPECT_EQ( colIndexer.slowestDirs()[d], colSlowestDirs[d] ); + EXPECT_EQ( colIndexer.strides()[d], colStrides[d] ); + } + + axom::ArrayIndexer rowIndexer(lengths, 'r'); + axom::StackArray rowSlowestDirs{2,1,0}; + axom::StackArray rowStrides{1,5,15}; + for(int d=0; d<3; ++d) + { + EXPECT_EQ( rowIndexer.slowestDirs()[d], rowSlowestDirs[d] ); + EXPECT_EQ( rowIndexer.strides()[d], rowStrides[d] ); + } +} + +// Test column-major offsets. +TEST(quest_array_indexer, quest_col_major_offset) +{ + axom::StackArray lengths{5,3,2}; + axom::ArrayIndexer ai(lengths, 'c'); + axom::IndexType offset = 0; + for(int i=0; i indices{i,j,k}; + EXPECT_EQ( ai.toFlatIndex(indices), offset ); + EXPECT_EQ( ai.toMultiIndex(offset), indices ); + ++offset; + } + } + } +} + +// Test row-major offsets. +TEST(quest_array_indexer, quest_row_major_offset) +{ + axom::StackArray lengths{5,3,2}; + axom::ArrayIndexer ai(lengths, 'r'); + axom::IndexType offset = 0; + for(int k=0; k indices{i,j,k}; + EXPECT_EQ( ai.toFlatIndex(indices), offset ); + EXPECT_EQ( ai.toMultiIndex(offset), indices ); + ++offset; + } + } + } +} + +void check_arbitrary_strides( + const axom::StackArray& lengths, + const axom::StackArray& fastestDirs) +{ + // fastestDirs should be a permutation. + SLIC_INFO(axom::fmt::format("Testing lengths {} with fastestDirs {}", lengths, fastestDirs)); + + axom::StackArray strides; + axom::IndexType currentStride = 1; + for(int d=0; d<3; ++d) + { + axom::IndexType currentDir = fastestDirs[d]; + strides[currentDir] = currentStride; + currentStride *= lengths[currentDir]; + } + + axom::ArrayIndexer ai(strides); + + const auto slowestDirs = ai.slowestDirs(); + for(int d=0; d<3; ++d) + { + EXPECT_EQ( slowestDirs[d], fastestDirs[3-d-1] ); + } + + axom::IndexType offset = 0; + axom::StackArray ijk; // Natural indices. + auto& l = ijk[fastestDirs[2]]; // Slowest dir + auto& m = ijk[fastestDirs[1]]; + auto& n = ijk[fastestDirs[0]]; // Fastest dir + for(l=0; l lengths{5,3,2}; + + // Row-major ordering. + axom::StackArray rowFastestDirs{0,1,2}; + check_arbitrary_strides(lengths, rowFastestDirs); + + // Col-major ordering. + axom::StackArray colFastestDirs{2,1,0}; + check_arbitrary_strides(lengths, colFastestDirs); + + // A few random orderings. + axom::StackArray rand1FastestDirs{0,2,1}; + check_arbitrary_strides(lengths, rand1FastestDirs); + axom::StackArray rand2FastestDirs{2,0,1}; + check_arbitrary_strides(lengths, rand2FastestDirs); + axom::StackArray rand3FastestDirs{1,0,2}; + check_arbitrary_strides(lengths, rand3FastestDirs); + axom::StackArray rand4FastestDirs{1,2,0}; + check_arbitrary_strides(lengths, rand4FastestDirs); +} + +// Test column-major element offsets with Array's. +TEST(quest_array_indexer, quest_array_match) +{ + axom::StackArray lengths{5,3,2}; + axom::Array a(lengths); + axom::ArrayIndexer ai(lengths, 'c'); + for(axom::IndexType i=0; i indices{i,j,k}; + EXPECT_EQ( &a(i,j,k), &a.flatIndex(ai.toFlatIndex(indices)) ); + } + } + } +} + +int main(int argc, char** argv) +{ + ::testing::InitGoogleTest(&argc, argv); + + int result = RUN_ALL_TESTS(); + + return result; +} From 79b10408a51db0f32fd560350186750284bcc7dc Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 10 Nov 2023 15:13:44 -0800 Subject: [PATCH 198/639] Reformat. --- src/axom/quest/tests/quest_array_indexer.cpp | 107 ++++++++++--------- 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/src/axom/quest/tests/quest_array_indexer.cpp b/src/axom/quest/tests/quest_array_indexer.cpp index f7cc51c201..a56b0e0211 100644 --- a/src/axom/quest/tests/quest_array_indexer.cpp +++ b/src/axom/quest/tests/quest_array_indexer.cpp @@ -14,42 +14,42 @@ // Test strides and permutations. TEST(quest_array_indexer, quest_strides_and_permutatations) { - axom::StackArray lengths{5,3,2}; + axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer colIndexer(lengths, 'c'); - axom::StackArray colSlowestDirs{0,1,2}; - axom::StackArray colStrides{6,2,1}; - for(int d=0; d<3; ++d) + axom::StackArray colSlowestDirs {0, 1, 2}; + axom::StackArray colStrides {6, 2, 1}; + for(int d = 0; d < 3; ++d) { - EXPECT_EQ( colIndexer.slowestDirs()[d], colSlowestDirs[d] ); - EXPECT_EQ( colIndexer.strides()[d], colStrides[d] ); + EXPECT_EQ(colIndexer.slowestDirs()[d], colSlowestDirs[d]); + EXPECT_EQ(colIndexer.strides()[d], colStrides[d]); } axom::ArrayIndexer rowIndexer(lengths, 'r'); - axom::StackArray rowSlowestDirs{2,1,0}; - axom::StackArray rowStrides{1,5,15}; - for(int d=0; d<3; ++d) + axom::StackArray rowSlowestDirs {2, 1, 0}; + axom::StackArray rowStrides {1, 5, 15}; + for(int d = 0; d < 3; ++d) { - EXPECT_EQ( rowIndexer.slowestDirs()[d], rowSlowestDirs[d] ); - EXPECT_EQ( rowIndexer.strides()[d], rowStrides[d] ); + EXPECT_EQ(rowIndexer.slowestDirs()[d], rowSlowestDirs[d]); + EXPECT_EQ(rowIndexer.strides()[d], rowStrides[d]); } } // Test column-major offsets. TEST(quest_array_indexer, quest_col_major_offset) { - axom::StackArray lengths{5,3,2}; + axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer ai(lengths, 'c'); axom::IndexType offset = 0; - for(int i=0; i indices{i,j,k}; - EXPECT_EQ( ai.toFlatIndex(indices), offset ); - EXPECT_EQ( ai.toMultiIndex(offset), indices ); + axom::StackArray indices {i, j, k}; + EXPECT_EQ(ai.toFlatIndex(indices), offset); + EXPECT_EQ(ai.toMultiIndex(offset), indices); ++offset; } } @@ -59,34 +59,35 @@ TEST(quest_array_indexer, quest_col_major_offset) // Test row-major offsets. TEST(quest_array_indexer, quest_row_major_offset) { - axom::StackArray lengths{5,3,2}; + axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer ai(lengths, 'r'); axom::IndexType offset = 0; - for(int k=0; k indices{i,j,k}; - EXPECT_EQ( ai.toFlatIndex(indices), offset ); - EXPECT_EQ( ai.toMultiIndex(offset), indices ); + axom::StackArray indices {i, j, k}; + EXPECT_EQ(ai.toFlatIndex(indices), offset); + EXPECT_EQ(ai.toMultiIndex(offset), indices); ++offset; } } } } -void check_arbitrary_strides( - const axom::StackArray& lengths, - const axom::StackArray& fastestDirs) +void check_arbitrary_strides(const axom::StackArray& lengths, + const axom::StackArray& fastestDirs) { // fastestDirs should be a permutation. - SLIC_INFO(axom::fmt::format("Testing lengths {} with fastestDirs {}", lengths, fastestDirs)); + SLIC_INFO(axom::fmt::format("Testing lengths {} with fastestDirs {}", + lengths, + fastestDirs)); axom::StackArray strides; axom::IndexType currentStride = 1; - for(int d=0; d<3; ++d) + for(int d = 0; d < 3; ++d) { axom::IndexType currentDir = fastestDirs[d]; strides[currentDir] = currentStride; @@ -96,25 +97,25 @@ void check_arbitrary_strides( axom::ArrayIndexer ai(strides); const auto slowestDirs = ai.slowestDirs(); - for(int d=0; d<3; ++d) + for(int d = 0; d < 3; ++d) { - EXPECT_EQ( slowestDirs[d], fastestDirs[3-d-1] ); + EXPECT_EQ(slowestDirs[d], fastestDirs[3 - d - 1]); } axom::IndexType offset = 0; - axom::StackArray ijk; // Natural indices. - auto& l = ijk[fastestDirs[2]]; // Slowest dir + axom::StackArray ijk; // Natural indices. + auto& l = ijk[fastestDirs[2]]; // Slowest dir auto& m = ijk[fastestDirs[1]]; - auto& n = ijk[fastestDirs[0]]; // Fastest dir - for(l=0; l lengths{5,3,2}; + axom::StackArray lengths {5, 3, 2}; // Row-major ordering. - axom::StackArray rowFastestDirs{0,1,2}; + axom::StackArray rowFastestDirs {0, 1, 2}; check_arbitrary_strides(lengths, rowFastestDirs); // Col-major ordering. - axom::StackArray colFastestDirs{2,1,0}; + axom::StackArray colFastestDirs {2, 1, 0}; check_arbitrary_strides(lengths, colFastestDirs); // A few random orderings. - axom::StackArray rand1FastestDirs{0,2,1}; + axom::StackArray rand1FastestDirs {0, 2, 1}; check_arbitrary_strides(lengths, rand1FastestDirs); - axom::StackArray rand2FastestDirs{2,0,1}; + axom::StackArray rand2FastestDirs {2, 0, 1}; check_arbitrary_strides(lengths, rand2FastestDirs); - axom::StackArray rand3FastestDirs{1,0,2}; + axom::StackArray rand3FastestDirs {1, 0, 2}; check_arbitrary_strides(lengths, rand3FastestDirs); - axom::StackArray rand4FastestDirs{1,2,0}; + axom::StackArray rand4FastestDirs {1, 2, 0}; check_arbitrary_strides(lengths, rand4FastestDirs); } // Test column-major element offsets with Array's. TEST(quest_array_indexer, quest_array_match) { - axom::StackArray lengths{5,3,2}; + axom::StackArray lengths {5, 3, 2}; axom::Array a(lengths); axom::ArrayIndexer ai(lengths, 'c'); - for(axom::IndexType i=0; i indices{i,j,k}; - EXPECT_EQ( &a(i,j,k), &a.flatIndex(ai.toFlatIndex(indices)) ); + axom::StackArray indices {i, j, k}; + EXPECT_EQ(&a(i, j, k), &a.flatIndex(ai.toFlatIndex(indices))); } } } From b7106d5e4c9879dc9d0ba462843f0158c239ea26 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 10 Nov 2023 18:00:49 -0800 Subject: [PATCH 199/639] Extend ArrayIndexer test to cover 1D, 2D and 3D. --- src/axom/quest/tests/quest_array_indexer.cpp | 379 +++++++++++++++---- 1 file changed, 305 insertions(+), 74 deletions(-) diff --git a/src/axom/quest/tests/quest_array_indexer.cpp b/src/axom/quest/tests/quest_array_indexer.cpp index a56b0e0211..1fce846d35 100644 --- a/src/axom/quest/tests/quest_array_indexer.cpp +++ b/src/axom/quest/tests/quest_array_indexer.cpp @@ -14,99 +14,251 @@ // Test strides and permutations. TEST(quest_array_indexer, quest_strides_and_permutatations) { - axom::StackArray lengths {5, 3, 2}; - - axom::ArrayIndexer colIndexer(lengths, 'c'); - axom::StackArray colSlowestDirs {0, 1, 2}; - axom::StackArray colStrides {6, 2, 1}; - for(int d = 0; d < 3; ++d) { - EXPECT_EQ(colIndexer.slowestDirs()[d], colSlowestDirs[d]); - EXPECT_EQ(colIndexer.strides()[d], colStrides[d]); + // 1D + constexpr int DIM = 1; + axom::StackArray lengths {2}; + + axom::ArrayIndexer colIndexer(lengths, 'c'); + axom::StackArray colSlowestDirs {0}; + axom::StackArray colStrides {1}; + for(int d = 0; d < DIM; ++d) + { + EXPECT_EQ(colIndexer.slowestDirs()[d], colSlowestDirs[d]); + EXPECT_EQ(colIndexer.strides()[d], colStrides[d]); + } + + axom::ArrayIndexer rowIndexer(lengths, 'r'); + axom::StackArray rowSlowestDirs {0}; + axom::StackArray rowStrides {1}; + for(int d = 0; d < DIM; ++d) + { + EXPECT_EQ(rowIndexer.slowestDirs()[d], rowSlowestDirs[d]); + EXPECT_EQ(rowIndexer.strides()[d], rowStrides[d]); + } } + { + // 2D + constexpr int DIM = 2; + axom::StackArray lengths {3, 2}; + + axom::ArrayIndexer colIndexer(lengths, 'c'); + axom::StackArray colSlowestDirs {0, 1}; + axom::StackArray colStrides {2, 1}; + for(int d = 0; d < DIM; ++d) + { + EXPECT_EQ(colIndexer.slowestDirs()[d], colSlowestDirs[d]); + EXPECT_EQ(colIndexer.strides()[d], colStrides[d]); + } - axom::ArrayIndexer rowIndexer(lengths, 'r'); - axom::StackArray rowSlowestDirs {2, 1, 0}; - axom::StackArray rowStrides {1, 5, 15}; - for(int d = 0; d < 3; ++d) + axom::ArrayIndexer rowIndexer(lengths, 'r'); + axom::StackArray rowSlowestDirs {1, 0}; + axom::StackArray rowStrides {1, 3}; + for(int d = 0; d < DIM; ++d) + { + EXPECT_EQ(rowIndexer.slowestDirs()[d], rowSlowestDirs[d]); + EXPECT_EQ(rowIndexer.strides()[d], rowStrides[d]); + } + } { - EXPECT_EQ(rowIndexer.slowestDirs()[d], rowSlowestDirs[d]); - EXPECT_EQ(rowIndexer.strides()[d], rowStrides[d]); + // 3D + constexpr int DIM = 3; + axom::StackArray lengths {5, 3, 2}; + + axom::ArrayIndexer colIndexer(lengths, 'c'); + axom::StackArray colSlowestDirs {0, 1, 2}; + axom::StackArray colStrides {6, 2, 1}; + for(int d = 0; d < DIM; ++d) + { + EXPECT_EQ(colIndexer.slowestDirs()[d], colSlowestDirs[d]); + EXPECT_EQ(colIndexer.strides()[d], colStrides[d]); + } + + axom::ArrayIndexer rowIndexer(lengths, 'r'); + axom::StackArray rowSlowestDirs {2, 1, 0}; + axom::StackArray rowStrides {1, 5, 15}; + for(int d = 0; d < DIM; ++d) + { + EXPECT_EQ(rowIndexer.slowestDirs()[d], rowSlowestDirs[d]); + EXPECT_EQ(rowIndexer.strides()[d], rowStrides[d]); + } } } // Test column-major offsets. TEST(quest_array_indexer, quest_col_major_offset) { - axom::StackArray lengths {5, 3, 2}; - axom::ArrayIndexer ai(lengths, 'c'); - axom::IndexType offset = 0; - for(int i = 0; i < lengths[0]; ++i) { - for(int j = 0; j < lengths[1]; ++j) + // 1D + constexpr int DIM = 1; + axom::StackArray lengths {3}; + axom::ArrayIndexer ai(lengths, 'c'); + axom::IndexType offset = 0; + for(int i = 0; i < lengths[0]; ++i) + { + axom::StackArray indices {i}; + EXPECT_EQ(ai.toFlatIndex(indices), offset); + EXPECT_EQ(ai.toMultiIndex(offset), indices); + ++offset; + } + } + { + // 2D + constexpr int DIM = 2; + axom::StackArray lengths {3, 2}; + axom::ArrayIndexer ai(lengths, 'c'); + axom::IndexType offset = 0; + for(int i = 0; i < lengths[0]; ++i) { - for(int k = 0; k < lengths[2]; ++k) + for(int j = 0; j < lengths[1]; ++j) { - axom::StackArray indices {i, j, k}; + axom::StackArray indices {i, j}; EXPECT_EQ(ai.toFlatIndex(indices), offset); EXPECT_EQ(ai.toMultiIndex(offset), indices); ++offset; } } } + { + // 3D + axom::StackArray lengths {5, 3, 2}; + axom::ArrayIndexer ai(lengths, 'c'); + axom::IndexType offset = 0; + for(int i = 0; i < lengths[0]; ++i) + { + for(int j = 0; j < lengths[1]; ++j) + { + for(int k = 0; k < lengths[2]; ++k) + { + axom::StackArray indices {i, j, k}; + EXPECT_EQ(ai.toFlatIndex(indices), offset); + EXPECT_EQ(ai.toMultiIndex(offset), indices); + ++offset; + } + } + } + } } // Test row-major offsets. TEST(quest_array_indexer, quest_row_major_offset) { - axom::StackArray lengths {5, 3, 2}; - axom::ArrayIndexer ai(lengths, 'r'); - axom::IndexType offset = 0; - for(int k = 0; k < lengths[2]; ++k) { + // 1D + constexpr int DIM = 1; + axom::StackArray lengths {3}; + axom::ArrayIndexer ai(lengths, 'r'); + axom::IndexType offset = 0; + for(int i = 0; i < lengths[0]; ++i) + { + axom::StackArray indices {i}; + EXPECT_EQ(ai.toFlatIndex(indices), offset); + EXPECT_EQ(ai.toMultiIndex(offset), indices); + ++offset; + } + } + { + // 2D + constexpr int DIM = 2; + axom::StackArray lengths {3, 2}; + axom::ArrayIndexer ai(lengths, 'r'); + axom::IndexType offset = 0; for(int j = 0; j < lengths[1]; ++j) { for(int i = 0; i < lengths[0]; ++i) { - axom::StackArray indices {i, j, k}; + axom::StackArray indices {i, j}; EXPECT_EQ(ai.toFlatIndex(indices), offset); EXPECT_EQ(ai.toMultiIndex(offset), indices); ++offset; } } } + { + // 3D + constexpr int DIM = 3; + axom::StackArray lengths {5, 3, 2}; + axom::ArrayIndexer ai(lengths, 'r'); + axom::IndexType offset = 0; + for(int k = 0; k < lengths[2]; ++k) + { + for(int j = 0; j < lengths[1]; ++j) + { + for(int i = 0; i < lengths[0]; ++i) + { + axom::StackArray indices {i, j, k}; + EXPECT_EQ(ai.toFlatIndex(indices), offset); + EXPECT_EQ(ai.toMultiIndex(offset), indices); + ++offset; + } + } + } + } } -void check_arbitrary_strides(const axom::StackArray& lengths, - const axom::StackArray& fastestDirs) +template +typename std::enable_if::type check_arbitrary_strides_nested_loops( + const axom::StackArray& lengths, + const axom::StackArray& fastestDirs, + const axom::ArrayIndexer& ai) { - // fastestDirs should be a permutation. - SLIC_INFO(axom::fmt::format("Testing lengths {} with fastestDirs {}", - lengths, - fastestDirs)); - - axom::StackArray strides; - axom::IndexType currentStride = 1; - for(int d = 0; d < 3; ++d) + /* + We address the array with natural indices, but arange the + nested loops to increase the offset by 1 each time around. + */ + axom::StackArray i; + auto& n = i[fastestDirs[0]]; + axom::IndexType offset = 0; + for(n = 0; n < lengths[fastestDirs[0]]; ++n) { - axom::IndexType currentDir = fastestDirs[d]; - strides[currentDir] = currentStride; - currentStride *= lengths[currentDir]; + SLIC_INFO(axom::fmt::format("offset {} i {}", offset, i)); + EXPECT_EQ(ai.toMultiIndex(offset), i); + EXPECT_EQ(ai.toFlatIndex(i), offset); + ++offset; } +} - axom::ArrayIndexer ai(strides); - - const auto slowestDirs = ai.slowestDirs(); - for(int d = 0; d < 3; ++d) +template +typename std::enable_if::type check_arbitrary_strides_nested_loops( + const axom::StackArray& lengths, + const axom::StackArray& fastestDirs, + const axom::ArrayIndexer& ai) +{ + /* + We address the array with natural indices, but arange the + nested loops to increase the offset by 1 each time around. + */ + axom::StackArray ij; + auto& m = ij[fastestDirs[1]]; + auto& n = ij[fastestDirs[0]]; + axom::IndexType offset = 0; + for(m = 0; m < lengths[fastestDirs[1]]; ++m) { - EXPECT_EQ(slowestDirs[d], fastestDirs[3 - d - 1]); + for(n = 0; n < lengths[fastestDirs[0]]; ++n) + { + SLIC_INFO(axom::fmt::format("offset {} ij {}", offset, ij)); + EXPECT_EQ(ai.toMultiIndex(offset), ij); + EXPECT_EQ(ai.toFlatIndex(ij), offset); + ++offset; + } } +} - axom::IndexType offset = 0; - axom::StackArray ijk; // Natural indices. - auto& l = ijk[fastestDirs[2]]; // Slowest dir +template +typename std::enable_if::type check_arbitrary_strides_nested_loops( + const axom::StackArray& lengths, + const axom::StackArray& fastestDirs, + const axom::ArrayIndexer& ai) +{ + /* + We address the array with natural indices, but arange the + nested loops to increase the offset by 1 each time around. + */ + axom::StackArray ijk; + auto& l = ijk[fastestDirs[2]]; // Slowest dir auto& m = ijk[fastestDirs[1]]; auto& n = ijk[fastestDirs[0]]; // Fastest dir + axom::IndexType offset = 0; for(l = 0; l < lengths[fastestDirs[2]]; ++l) { for(m = 0; m < lengths[fastestDirs[1]]; ++m) @@ -122,44 +274,123 @@ void check_arbitrary_strides(const axom::StackArray& lengths } } +template +void check_arbitrary_strides( + const axom::StackArray& lengths, + const axom::StackArray& fastestDirs) +{ + // fastestDirs should be a permutation. + SLIC_INFO(axom::fmt::format("Testing lengths {} with fastestDirs {}", + lengths, + fastestDirs)); + + axom::StackArray strides; + axom::IndexType currentStride = 1; + for(int d = 0; d < DIM; ++d) + { + axom::IndexType currentDir = fastestDirs[d]; + strides[currentDir] = currentStride; + currentStride *= lengths[currentDir]; + } + + axom::ArrayIndexer ai(strides); + + const auto slowestDirs = ai.slowestDirs(); + for(int d = 0; d < DIM; ++d) + { + EXPECT_EQ(slowestDirs[d], fastestDirs[DIM - d - 1]); + } + + check_arbitrary_strides_nested_loops(lengths, fastestDirs, ai); +} + // Test arbitrary strides. TEST(quest_array_indexer, quest_arbitrary_strides) { - axom::StackArray lengths {5, 3, 2}; - - // Row-major ordering. - axom::StackArray rowFastestDirs {0, 1, 2}; - check_arbitrary_strides(lengths, rowFastestDirs); - - // Col-major ordering. - axom::StackArray colFastestDirs {2, 1, 0}; - check_arbitrary_strides(lengths, colFastestDirs); - - // A few random orderings. - axom::StackArray rand1FastestDirs {0, 2, 1}; - check_arbitrary_strides(lengths, rand1FastestDirs); - axom::StackArray rand2FastestDirs {2, 0, 1}; - check_arbitrary_strides(lengths, rand2FastestDirs); - axom::StackArray rand3FastestDirs {1, 0, 2}; - check_arbitrary_strides(lengths, rand3FastestDirs); - axom::StackArray rand4FastestDirs {1, 2, 0}; - check_arbitrary_strides(lengths, rand4FastestDirs); + { + constexpr int DIM = 1; + // ArrayIndexer is overkill for 1D, but think of it as a smoke test. + axom::StackArray lengths {3}; + + axom::StackArray fastestDirs {0}; + check_arbitrary_strides(lengths, fastestDirs); + } + { + constexpr int DIM = 2; + axom::StackArray lengths {3, 2}; + + // Row-major ordering. + axom::StackArray rowFastestDirs {0, 1}; + check_arbitrary_strides(lengths, rowFastestDirs); + + // Col-major ordering. + axom::StackArray colFastestDirs {1, 0}; + check_arbitrary_strides(lengths, colFastestDirs); + + // A few random orderings. + axom::StackArray rand1FastestDirs {0, 1}; + check_arbitrary_strides(lengths, rand1FastestDirs); + axom::StackArray rand2FastestDirs {1, 0}; + check_arbitrary_strides(lengths, rand2FastestDirs); + } + { + constexpr int DIM = 3; + axom::StackArray lengths {5, 3, 2}; + + // Row-major ordering. + axom::StackArray rowFastestDirs {0, 1, 2}; + check_arbitrary_strides(lengths, rowFastestDirs); + + // Col-major ordering. + axom::StackArray colFastestDirs {2, 1, 0}; + check_arbitrary_strides(lengths, colFastestDirs); + + // A few random orderings. + axom::StackArray rand1FastestDirs {0, 2, 1}; + check_arbitrary_strides(lengths, rand1FastestDirs); + axom::StackArray rand2FastestDirs {2, 0, 1}; + check_arbitrary_strides(lengths, rand2FastestDirs); + axom::StackArray rand3FastestDirs {1, 0, 2}; + check_arbitrary_strides(lengths, rand3FastestDirs); + axom::StackArray rand4FastestDirs {1, 2, 0}; + check_arbitrary_strides(lengths, rand4FastestDirs); + } } // Test column-major element offsets with Array's. TEST(quest_array_indexer, quest_array_match) { - axom::StackArray lengths {5, 3, 2}; - axom::Array a(lengths); - axom::ArrayIndexer ai(lengths, 'c'); - for(axom::IndexType i = 0; i < lengths[0]; ++i) { - for(axom::IndexType j = 0; j < lengths[1]; ++j) + // No test for 1D. Array doesn't provide non-trivial interface to test. + } + { + constexpr int DIM = 2; + axom::StackArray lengths {3, 2}; + axom::Array a(lengths); + axom::ArrayIndexer ai(lengths, 'c'); + for(axom::IndexType i = 0; i < lengths[0]; ++i) + { + for(axom::IndexType j = 0; j < lengths[1]; ++j) + { + axom::StackArray indices {i, j}; + EXPECT_EQ(&a(i, j), &a.flatIndex(ai.toFlatIndex(indices))); + } + } + } + { + constexpr int DIM = 3; + axom::StackArray lengths {5, 3, 2}; + axom::Array a(lengths); + axom::ArrayIndexer ai(lengths, 'c'); + for(axom::IndexType i = 0; i < lengths[0]; ++i) { - for(axom::IndexType k = 0; j < lengths[2]; ++j) + for(axom::IndexType j = 0; j < lengths[1]; ++j) { - axom::StackArray indices {i, j, k}; - EXPECT_EQ(&a(i, j, k), &a.flatIndex(ai.toFlatIndex(indices))); + for(axom::IndexType k = 0; j < lengths[2]; ++j) + { + axom::StackArray indices {i, j, k}; + EXPECT_EQ(&a(i, j, k), &a.flatIndex(ai.toFlatIndex(indices))); + } } } } From 8207b03dd65faffe08dff7e4f950a135196c752c Mon Sep 17 00:00:00 2001 From: Chris White Date: Mon, 13 Nov 2023 13:13:01 -0800 Subject: [PATCH 200/639] remove machine specific variable for service user since its in the overarching one --- .gitlab/build_lassen.yml | 2 -- .gitlab/build_quartz.yml | 2 -- .gitlab/build_tioga.yml | 2 -- 3 files changed, 6 deletions(-) diff --git a/.gitlab/build_lassen.yml b/.gitlab/build_lassen.yml index 80cefe9e50..238a8d5b4a 100644 --- a/.gitlab/build_lassen.yml +++ b/.gitlab/build_lassen.yml @@ -6,8 +6,6 @@ #### # This is the share configuration of jobs for lassen .on_lassen: - variables: - LLNL_SERVICE_USER: atk tags: - shell - lassen diff --git a/.gitlab/build_quartz.yml b/.gitlab/build_quartz.yml index 7e64968a80..84f0bb867f 100644 --- a/.gitlab/build_quartz.yml +++ b/.gitlab/build_quartz.yml @@ -6,8 +6,6 @@ #### # This is the shared configuration of jobs for quartz .on_quartz: - variables: - LLNL_SERVICE_USER: atk tags: - shell - quartz diff --git a/.gitlab/build_tioga.yml b/.gitlab/build_tioga.yml index 776678a735..8e6555c993 100644 --- a/.gitlab/build_tioga.yml +++ b/.gitlab/build_tioga.yml @@ -6,8 +6,6 @@ #### # This is the shared configuration of jobs for tioga .on_tioga: - variables: - LLNL_SERVICE_USER: atk tags: - shell - tioga From 3717a42f2ecb068b0f531cc6ed666e91bfc2031d Mon Sep 17 00:00:00 2001 From: Chris White Date: Mon, 13 Nov 2023 13:25:41 -0800 Subject: [PATCH 201/639] turning off allow to fail --- .gitlab/build_tioga.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab/build_tioga.yml b/.gitlab/build_tioga.yml index 8e6555c993..93e09e4ff0 100644 --- a/.gitlab/build_tioga.yml +++ b/.gitlab/build_tioga.yml @@ -39,14 +39,12 @@ tioga-clang_16_0_0_hip_5_6_0-src: COMPILER: "clang@16.0.0_hip" HOST_CONFIG: "tioga-toss_4_x86_64_ib_cray-${COMPILER}.cmake" extends: .src_build_on_tioga - allow_failure: true tioga-cce_15_0_1_hip_5_4_3-src: variables: COMPILER: "cce@15.0.1_hip" HOST_CONFIG: "tioga-toss_4_x86_64_ib_cray-${COMPILER}.cmake" extends: .src_build_on_tioga - allow_failure: true #### # Full Build jobs @@ -56,7 +54,6 @@ tioga-clang_16_0_0_hip_5_6_0-full: SPEC: "%${COMPILER}~openmp+rocm+mfem+c2c" EXTRASPEC: "amdgpu_target=gfx90a ^hip@5.6.0 ^hsa-rocr-dev@5.6.0 ^llvm-amdgpu@5.6.0 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion" extends: .full_build_on_tioga - allow_failure: true tioga-cce_15_0_1_hip_5_4_3-full: variables: @@ -64,4 +61,3 @@ tioga-cce_15_0_1_hip_5_4_3-full: SPEC: "%${COMPILER}~openmp+rocm+mfem+c2c" EXTRASPEC: "amdgpu_target=gfx90a ^hip@5.4.3 ^hsa-rocr-dev@5.4.3 ^llvm-amdgpu@5.4.3 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion" extends: .full_build_on_tioga - allow_failure: true From ce86858313fb75ecde250f3076f77080164e5bdb Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 14 Nov 2023 13:19:47 -0800 Subject: [PATCH 202/639] Use signed volume in tests --- src/axom/primal/tests/primal_clip.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index 95ce5bb52b..ea143feefa 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -1310,7 +1310,7 @@ TEST(primal_clip, tet_plane_intersect_none_below) PolyhedronType poly = axom::primal::clip(tet, plane, EPS, CHECK_SIGN); - EXPECT_NEAR(0.0, poly.volume(), EPS); + EXPECT_NEAR(0.0, poly.signedVolume(), EPS); } TEST(primal_clip, tet_plane_intersect_none_above) @@ -1329,7 +1329,7 @@ TEST(primal_clip, tet_plane_intersect_none_above) PolyhedronType poly = axom::primal::clip(tet, plane, EPS, CHECK_SIGN); - EXPECT_NEAR(tet.volume(), poly.volume(), EPS); + EXPECT_NEAR(tet.signedVolume(), poly.signedVolume(), EPS); } TEST(primal_clip, tet_plane_border_vertex_below) @@ -1348,7 +1348,7 @@ TEST(primal_clip, tet_plane_border_vertex_below) PolyhedronType poly = axom::primal::clip(tet, plane, EPS, CHECK_SIGN); - EXPECT_NEAR(0.0, poly.volume(), EPS); + EXPECT_NEAR(0.0, poly.signedVolume(), EPS); } TEST(primal_clip, tet_plane_border_vertex_above) @@ -1367,7 +1367,7 @@ TEST(primal_clip, tet_plane_border_vertex_above) PolyhedronType poly = axom::primal::clip(tet, plane, EPS, CHECK_SIGN); - EXPECT_NEAR(tet.volume(), poly.volume(), EPS); + EXPECT_NEAR(tet.signedVolume(), poly.signedVolume(), EPS); } TEST(primal_clip, tet_plane_border_edge_below) @@ -1386,7 +1386,7 @@ TEST(primal_clip, tet_plane_border_edge_below) PolyhedronType poly = axom::primal::clip(tet, plane, EPS, CHECK_SIGN); - EXPECT_NEAR(0.0, poly.volume(), EPS); + EXPECT_NEAR(0.0, poly.signedVolume(), EPS); } TEST(primal_clip, tet_plane_border_edge_above) @@ -1405,7 +1405,7 @@ TEST(primal_clip, tet_plane_border_edge_above) PolyhedronType poly = axom::primal::clip(tet, plane, EPS, CHECK_SIGN); - EXPECT_NEAR(tet.volume(), poly.volume(), EPS); + EXPECT_NEAR(tet.signedVolume(), poly.signedVolume(), EPS); } TEST(primal_clip, tet_plane_border_face_below) @@ -1424,7 +1424,7 @@ TEST(primal_clip, tet_plane_border_face_below) PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); - EXPECT_NEAR(0.0, poly.volume(), EPS); + EXPECT_NEAR(0.0, poly.signedVolume(), EPS); } TEST(primal_clip, tet_plane_border_face_above) @@ -1443,7 +1443,7 @@ TEST(primal_clip, tet_plane_border_face_above) PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); - EXPECT_NEAR(tet.volume(), poly.volume(), EPS); + EXPECT_NEAR(tet.signedVolume(), poly.signedVolume(), EPS); } TEST(primal_clip, tet_plane_intersect_three_edges) @@ -1462,7 +1462,7 @@ TEST(primal_clip, tet_plane_intersect_three_edges) PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); - EXPECT_NEAR(tet.volume() / 2.0, poly.volume(), EPS); + EXPECT_NEAR(tet.signedVolume() / 2.0, poly.signedVolume(), EPS); } // TODO: Add a test for a plane that intersects four edges of a tet From 9aa7cfa16f348716e400ebe3a6fae5544fdcd7c6 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 14 Nov 2023 13:36:19 -0800 Subject: [PATCH 203/639] Add test for clipping four edges of a tet --- src/axom/primal/tests/primal_clip.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index ea143feefa..3c9e7f1e5c 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -1465,7 +1465,24 @@ TEST(primal_clip, tet_plane_intersect_three_edges) EXPECT_NEAR(tet.signedVolume() / 2.0, poly.signedVolume(), EPS); } -// TODO: Add a test for a plane that intersects four edges of a tet +TEST(primal_clip, tet_plane_intersect_four_edges) +{ + using namespace Primal3D; + constexpr double EPS = 1e-10; + constexpr bool CHECK_SIGN = true; + + // Plane intersects four edges of tet + TetrahedronType tet(PointType {0.0, 0.0, 0.0}, + PointType {1.0, 1.0, 0.0}, + PointType {0.0, 1.0, 1.0}, + PointType {1.0, 0.0, 1.0}); + + PlaneType plane(VectorType {0.0, 0.0, 1.0}, 0.5); + + PolyhedronType poly = axom::primal::clip(plane, tet, EPS, CHECK_SIGN); + + EXPECT_NEAR(tet.signedVolume() / 2.0, poly.signedVolume(), EPS); +} //------------------------------------------------------------------------------ int main(int argc, char* argv[]) From 387d77a97fceb3681da6fd9f6e049c80f0010df2 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 14 Nov 2023 14:17:22 -0800 Subject: [PATCH 204/639] Update release notes --- RELEASE-NOTES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 0f24bbc80a..18bd09fe58 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -34,6 +34,8 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - Primal: Adds a `Quadrilateral` primitive - Primal: Adds a `compute_bounding_box()` operator for computing the bounding box of a `Quadrilateral` +- Primal: Adds a `clip()` operator for clipping a tetrahedron against the + half-space defined by a plane ### Fixed - quest's `SamplingShaper` now properly handles material names containing underscores From bf85519a041438d0822e916839cdf0f94b0939e1 Mon Sep 17 00:00:00 2001 From: Brian Han Date: Tue, 31 Oct 2023 15:58:43 -0700 Subject: [PATCH 205/639] Check signed tetrahedra volumes in Hexahedron's triangulate() unit test --- src/axom/primal/tests/primal_hexahedron.cpp | 22 ++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/axom/primal/tests/primal_hexahedron.cpp b/src/axom/primal/tests/primal_hexahedron.cpp index eed83835c4..62cefe69c0 100644 --- a/src/axom/primal/tests/primal_hexahedron.cpp +++ b/src/axom/primal/tests/primal_hexahedron.cpp @@ -17,7 +17,7 @@ namespace primal = axom::primal; namespace { -double volume_tet_decomp(primal::Hexahedron hex) +double signed_volume_tet_decomp(primal::Hexahedron hex) { double retVol = 0.0; axom::StackArray, 24> tets; @@ -26,7 +26,8 @@ double volume_tet_decomp(primal::Hexahedron hex) for(int i = 0; i < 24; i++) { - retVol += tets[i].volume(); + // Get the signed volumes + retVol += tets[i].signedVolume(); } return retVol; @@ -270,13 +271,16 @@ TEST_F(HexahedronTest, volume) EXPECT_DOUBLE_EQ(hex6.volume(), 1.5625); // Check hexahedron volume against 24-tetrahedron subvolumes - EXPECT_DOUBLE_EQ(hex0.volume(), volume_tet_decomp(hex0)); - EXPECT_DOUBLE_EQ(hex1.volume(), volume_tet_decomp(hex1)); - EXPECT_DOUBLE_EQ(hex2.volume(), volume_tet_decomp(hex2)); - EXPECT_DOUBLE_EQ(hex3.volume(), volume_tet_decomp(hex3)); - EXPECT_DOUBLE_EQ(hex4.volume(), volume_tet_decomp(hex4)); - EXPECT_DOUBLE_EQ(hex5.volume(), volume_tet_decomp(hex5)); - EXPECT_DOUBLE_EQ(hex6.volume(), volume_tet_decomp(hex6)); + EXPECT_DOUBLE_EQ(hex0.volume(), signed_volume_tet_decomp(hex0)); + EXPECT_DOUBLE_EQ(hex1.volume(), signed_volume_tet_decomp(hex1)); + EXPECT_DOUBLE_EQ(hex2.volume(), signed_volume_tet_decomp(hex2)); + + // Negative volume expected + EXPECT_DOUBLE_EQ(hex3.signedVolume(), signed_volume_tet_decomp(hex3)); + + EXPECT_DOUBLE_EQ(hex4.volume(), signed_volume_tet_decomp(hex4)); + EXPECT_DOUBLE_EQ(hex5.volume(), signed_volume_tet_decomp(hex5)); + EXPECT_DOUBLE_EQ(hex6.volume(), signed_volume_tet_decomp(hex6)); } TEST_F(HexahedronTest, equals) From 9c24b1eacc47712051dd7f6463bc2a064aa1a411 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 31 Oct 2023 16:13:46 -0700 Subject: [PATCH 206/639] Add checkAndFixOrientation to Tetrahedron with unit test and fix winding for a tet example --- src/axom/primal/geometry/Tetrahedron.hpp | 14 ++++++++++ src/axom/primal/tests/primal_tetrahedron.cpp | 29 ++++++++++++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/axom/primal/geometry/Tetrahedron.hpp b/src/axom/primal/geometry/Tetrahedron.hpp index d3f8453cd3..9ca7911a14 100644 --- a/src/axom/primal/geometry/Tetrahedron.hpp +++ b/src/axom/primal/geometry/Tetrahedron.hpp @@ -259,6 +259,20 @@ class Tetrahedron AXOM_HOST_DEVICE double volume() const { return axom::utilities::abs(signedVolume()); } + /*! + * \brief Swaps the order of vertices if the signed volume of the + * tetrahedron is negative. Signed volume will become positive. + * \sa signedVolume() + */ + AXOM_HOST_DEVICE + void checkAndFixOrientation() + { + if(signedVolume() < 0) + { + axom::utilities::swap(m_points[1], m_points[2]); + } + } + /** * \brief Returns the circumsphere (circumscribing sphere) of the tetrahedron * diff --git a/src/axom/primal/tests/primal_tetrahedron.cpp b/src/axom/primal/tests/primal_tetrahedron.cpp index 4b70c70bd6..fb1cc8a999 100644 --- a/src/axom/primal/tests/primal_tetrahedron.cpp +++ b/src/axom/primal/tests/primal_tetrahedron.cpp @@ -20,6 +20,7 @@ #include "axom/fmt.hpp" #include +#include // std::next_permutation namespace primal = axom::primal; @@ -49,8 +50,8 @@ class TetrahedronTest : public ::testing::Test // Define coordinates for second tetrahedron qData1[0] = QPoint {1, 0, 0}; qData1[1] = QPoint {0, 1, 0}; - qData1[2] = QPoint {0, 0, 1}; - qData1[3] = QPoint {0, 0, 0}; + qData1[2] = QPoint {0, 0, 0}; + qData1[3] = QPoint {0, 0, 1}; double angles[3]; for(int i = 0; i < 3; ++i) @@ -623,6 +624,30 @@ TEST_F(TetrahedronTest, regularTetrahedron) EXPECT_EQ(primal::ON_POSITIVE_SIDE, primal::orientation(pt, tri)); } } + +TEST_F(TetrahedronTest, checkSign) +{ + using QPoint = TetrahedronTest::QPoint; + using QTet = TetrahedronTest::QTet; + + int indices[] = {0, 1, 2, 3}; + + for(int i = 0; i < this->numTetrahedra(); ++i) + { + QTet tet = this->getTet(i); + double expVolume = tet.signedVolume(); + + // Run sign check through all vertex permutations for the tetrahedron + do + { + QTet tetPermuted = + QTet(tet[indices[0]], tet[indices[1]], tet[indices[2]], tet[indices[3]]); + tetPermuted.checkAndFixOrientation(); + EXPECT_NEAR(expVolume, tetPermuted.signedVolume(), this->EPS); + } while(std::next_permutation(indices, indices + QTet::NUM_VERTS)); + } +} + //---------------------------------------------------------------------- //---------------------------------------------------------------------- int main(int argc, char* argv[]) From 2f6e1b5839347fcbff699661ae1f6b23bf4f62ec Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 6 Nov 2023 13:13:47 -0800 Subject: [PATCH 207/639] Expand checkSign doc to a warning --- src/axom/primal/geometry/Polyhedron.hpp | 205 ++++++++++-------- src/axom/primal/operators/clip.hpp | 56 +++-- .../primal/operators/intersection_volume.hpp | 55 +++-- 3 files changed, 180 insertions(+), 136 deletions(-) diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp index 2cf3f0918f..d62e675b60 100644 --- a/src/axom/primal/geometry/Polyhedron.hpp +++ b/src/axom/primal/geometry/Polyhedron.hpp @@ -669,37 +669,41 @@ class Polyhedron } /*! - * \brief Creates a Polyhedron from a given Hexahedron's vertices. - * - * \param [in] hex The hexahedron - * \param [in] checkSign If true (default is false), checks if the - * signed volume of the Polyhedron is positive. If signed volume - * is negative, order of some vertices will be swapped. - * - * \return A Polyhedron with the Hexahedron's vertices and added - * vertex neighbors - * - * \note The Hexahedron is assumed to have a specific vertex order: - * \verbatim - * - * 4--------7 +z - * /| /| +y - * / | / | ^ > - * 5--------6 | | / - * | 0-----|--3 |/ - * | / | / -----> +x - * |/ |/ - * 1--------2 - * - * \endverbatim - * - * The Polyhedron's vertex neighbors are created assuming this vertex - * ordering. - * - * \note checkSign flag does not guarantee the Polyhedron's vertex order - * will be valid. It is the responsiblity of the caller to pass - * a Hexahedron with a valid vertex order. - */ + * \brief Creates a Polyhedron from a given Hexahedron's vertices. + * + * \param [in] hex The hexahedron + * \param [in] checkSign If true (default is false), checks if the + * signed volume of the Polyhedron is positive. If signed volume + * is negative, order of some vertices will be swapped to try to + * obtain a positive volume for the Polyhedron. Otherwise, the + * returned Polyhedron will have a non-positive volume. + * + * \return A Polyhedron with the Hexahedron's vertices and added + * vertex neighbors + * + * \note The Hexahedron is assumed to have a specific vertex order: + * \verbatim + * + * 4--------7 +z + * /| /| +y + * / | / | ^ > + * 5--------6 | | / + * | 0-----|--3 |/ + * | / | / -----> +x + * |/ |/ + * 1--------2 + * + * \endverbatim + * + * The Polyhedron's vertex neighbors are created assuming this vertex + * ordering. + * + * \warning checkSign flag does not guarantee the Polyhedron's vertex order + * will be valid. It is the responsiblity of the caller to pass + * a Hexahedron with a valid vertex order. Otherwise, the + * Polyhedron will have a non-positive volume with an + * invalid vertex order. + */ AXOM_HOST_DEVICE static Polyhedron from_primitive(const Hexahedron& hex, bool checkSign = false) @@ -739,39 +743,43 @@ class Polyhedron } /*! - * \brief Creates a Polyhedron from a given Octahedron's vertices. - * - * \param [in] oct The octahedron - * \param [in] checkSign If true (default is false), checks if the - * signed volume of the Polyhedron is positive. If signed volume - * is negative, order of some vertices will be swapped. - * - * \return A Polyhedron with the Octahedron's vertices and added - * vertex neighbors - * - * \note The Octahedron is assumed to have a specific vertex order: - * (view looking down from +z axis): - * - * \verbatim - * - * 4 +z - * /\ +y - * 0 --/ \-- 2 ^ > - * \/ \ / | / - * / \ |/ - * 5 -------- 3 -----> +x - * \/ - * 1 - * - * \endverbatim - * - * The Polyhedron's vertex neighbors are created assuming this vertex - * ordering. - * - * \note checkSign flag does not guarantee the Polyhedron's vertex order - * will be valid. It is the responsiblity of the caller to pass - * a Octahedron with a valid vertex order. - */ + * \brief Creates a Polyhedron from a given Octahedron's vertices. + * + * \param [in] oct The octahedron + * \param [in] checkSign If true (default is false), checks if the + * signed volume of the Polyhedron is positive. If signed volume + * is negative, order of some vertices will be swapped to try to + * obtain a positive volume for the Polyhedron. Otherwise, the + * returned Polyhedron will have a non-positive volume. + * + * \return A Polyhedron with the Octahedron's vertices and added + * vertex neighbors + * + * \note The Octahedron is assumed to have a specific vertex order: + * (view looking down from +z axis): + * + * \verbatim + * + * 4 +z + * /\ +y + * 0 --/ \-- 2 ^ > + * \/ \ / | / + * / \ |/ + * 5 -------- 3 -----> +x + * \/ + * 1 + * + * \endverbatim + * + * The Polyhedron's vertex neighbors are created assuming this vertex + * ordering. + * + * \warning checkSign flag does not guarantee the Polyhedron's vertex order + * will be valid. It is the responsiblity of the caller to pass + * an Octahedron with a valid vertex order. Otherwise, the + * Polyhedron will have a non-positive volume with an + * invalid vertex order. + */ AXOM_HOST_DEVICE static Polyhedron from_primitive(const Octahedron& oct, bool checkSign = false) @@ -807,38 +815,43 @@ class Polyhedron } /*! - * \brief Creates a Polyhedron from a given Tetrahedron's vertices. - * - * \param [in] tet The tetrahedron - * \param [in] checkSign If true (default is false), checks if the - * signed volume of the Polyhedron is positive. If signed volume - * is negative, order of some vertices will be swapped. - * - * \return A Polyhedron with the Tetrahedron's vertices and added - * vertex neighbors - * - * \note The Tetrahedron is assumed to have a specific vertex order: - * \verbatim - * - * 3 +z - * / \\ +y - * / \ \ ^ > - * / \ \ | / - * / \ \ |/ - * / \ 2 -----> +x - * / \ / - * /_____________\/ - * 0 1 - * - * \endverbatim - * - * The Polyhedron's vertex neighbors are created assuming this vertex - * ordering. - * - * \note checkSign flag does not guarantee the Polyhedron's vertex order - * will be valid. It is the responsiblity of the caller to pass - * a Tetrahedron with a valid vertex order. - */ + * \brief Creates a Polyhedron from a given Tetrahedron's vertices. + * + * \param [in] tet The tetrahedron + * \param [in] checkSign If true (default is false), checks if the + * signed volume of the Polyhedron is positive. If signed volume + * is negative, order of some vertices will be swapped to try to + * obtain a positive volume for the Polyhedron. Otherwise, the + * returned Polyhedron will have a non-positive volume. + * + * \return A Polyhedron with the Tetrahedron's vertices and added + * vertex neighbors + * + * \note The Tetrahedron is assumed to have a specific vertex order: + * \verbatim + * + * 3 +z + * / \\ +y + * / \ \ ^ > + * / \ \ | / + * / \ \ |/ + * / \ 2 -----> +x + * / \ / + * /_____________\/ + * 0 1 + * + * \endverbatim + * + * The Polyhedron's vertex neighbors are created assuming this vertex + * ordering. + * + * \warning checkSign flag does not guarantee the Polyhedron's vertex order + * will be valid. It is the responsiblity of the caller to pass + * a Tetrahedron with a valid vertex order. Otherwise, the + * Polyhedron will have a non-positive volume with an + * invalid vertex order. + * + */ AXOM_HOST_DEVICE static Polyhedron from_primitive(const Tetrahedron& tet, bool checkSign = false) diff --git a/src/axom/primal/operators/clip.hpp b/src/axom/primal/operators/clip.hpp index 40b07ebe31..d924a986f5 100644 --- a/src/axom/primal/operators/clip.hpp +++ b/src/axom/primal/operators/clip.hpp @@ -120,15 +120,18 @@ Polygon clip(const Triangle& tri, const BoundingBox& bbox) * \param [in] checkSign If true (default is false), checks if the * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be - * swapped for that shape. + * swapped to try to obtain a positive volume + * for that shape. Otherwise, the returned polyhedron + * will have a non-positive volume. * * \return A polyhedron of the hexahedron clipped against the tetrahedron. * * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. * - * \note checkSign flag does not guarantee the shapes' vertex orders - * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. + * \warning checkSign flag does not guarantee the shapes' vertex orders + * will be valid. It is the responsiblity of the caller to pass + * shapes with a valid vertex order. Otherwise, returned polyhedron + * will have a non-positive volume with invalid vertex orders. * */ template @@ -161,15 +164,18 @@ AXOM_HOST_DEVICE Polyhedron clip(const Hexahedron& hex, * \param [in] checkSign If true (default is false), checks if the * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be - * swapped for that shape. + * swapped to try to obtain a positive volume + * for that shape. Otherwise, the returned polyhedron + * will have a non-positive volume. * * \return A polyhedron of the hexahedron clipped against the tetrahedron. * * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. * - * \note checkSign flag does not guarantee the shapes' vertex orders - * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. + * \warning checkSign flag does not guarantee the shapes' vertex orders + * will be valid. It is the responsiblity of the caller to pass + * shapes with a valid vertex order. Otherwise, returned polyhedron + * will have a non-positive volume with invalid vertex orders. * */ template @@ -202,15 +208,18 @@ AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, * \param [in] checkSign If true (default is false), checks if the * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be - * swapped for that shape. + * swapped to try to obtain a positive volume + * for that shape. Otherwise, the returned polyhedron + * will have a non-positive volume. * * \return A polyhedron of the octahedron clipped against the tetrahedron. * * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. * - * \note checkSign flag does not guarantee the shapes' vertex orders - * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. + * \warning checkSign flag does not guarantee the shapes' vertex orders + * will be valid. It is the responsiblity of the caller to pass + * shapes with a valid vertex order. Otherwise, returned polyhedron + * will have a non-positive volume with invalid vertex orders. * */ template @@ -244,15 +253,18 @@ AXOM_HOST_DEVICE Polyhedron clip(const Octahedron& oct, * \param [in] checkSign If true (default is false), checks if the * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be - * swapped for that shape. + * swapped to try to obtain a positive volume + * for that shape. Otherwise, the returned polyhedron + * will have a non-positive volume. * * \return A polyhedron of the octahedron clipped against the tetrahedron. * * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. * - * \note checkSign flag does not guarantee the shapes' vertex orders - * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. + * \warning checkSign flag does not guarantee the shapes' vertex orders + * will be valid. It is the responsiblity of the caller to pass + * shapes with a valid vertex order. Otherwise, returned polyhedron + * will have a non-positive volume with invalid vertex orders. * */ template @@ -284,16 +296,20 @@ AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, * \param [in] checkSign If true (default is false), checks if the * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be - * swapped for that shape. + * swapped to try to obtain a positive volume + * for that shape. Otherwise, the returned polyhedron + * will have a non-positive volume. * * \return A polyhedron of the tetrahedron clipped against * the other tetrahedron. * * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. * - * \note checkSign flag does not guarantee the shapes' vertex orders - * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. + * \warning checkSign flag does not guarantee the shapes' vertex orders + * will be valid. It is the responsiblity of the caller to pass + * shapes with a valid vertex order. Otherwise, returned polyhedron + * will have a non-positive volume with invalid vertex orders. + * */ template AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet1, diff --git a/src/axom/primal/operators/intersection_volume.hpp b/src/axom/primal/operators/intersection_volume.hpp index 3b7a96fcb9..46db7a4ed8 100644 --- a/src/axom/primal/operators/intersection_volume.hpp +++ b/src/axom/primal/operators/intersection_volume.hpp @@ -35,13 +35,16 @@ namespace primal * \param [in] checkSign If true (default is false), checks if the * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be - * swapped for that shape. + * swapped to try to obtain a positive volume + * for that shape. Otherwise, the returned volume + * may be zero. * \return Intersection volume between the hexahedron and tetrahedron * - * \note checkSign flag does not guarantee the shapes' vertex orders - * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. + * \warning checkSign flag does not guarantee the shapes' vertex orders + * will be valid. It is the responsiblity of the caller to pass + * shapes with a valid vertex order. Otherwise, the returned + * volume may be zero. * */ template @@ -63,13 +66,16 @@ AXOM_HOST_DEVICE T intersection_volume(const Hexahedron& hex, * \param [in] checkSign If true (default is false), checks if the * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be - * swapped for that shape. + * swapped to try to obtain a positive volume + * for that shape. Otherwise, the returned volume + * may be zero. * * \return Intersection volume between the tetrahedron and hexahedron * - * \note checkSign flag does not guarantee the shapes' vertex orders - * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. + * \warning checkSign flag does not guarantee the shapes' vertex orders + * will be valid. It is the responsiblity of the caller to pass + * shapes with a valid vertex order. Otherwise, the returned + * volume may be zero. * */ template @@ -91,13 +97,16 @@ AXOM_HOST_DEVICE T intersection_volume(const Tetrahedron& tet, * \param [in] checkSign If true (default is false), checks if the * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be - * swapped for that shape. + * swapped to try to obtain a positive volume + * for that shape. Otherwise, the returned volume + * may be zero. * * \return Intersection volume between the octahedron and tetrahedron * - * \note checkSign flag does not guarantee the shapes' vertex orders - * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. + * \warning checkSign flag does not guarantee the shapes' vertex orders + * will be valid. It is the responsiblity of the caller to pass + * shapes with a valid vertex order. Otherwise, the returned + * volume may be zero. * */ template @@ -119,13 +128,16 @@ AXOM_HOST_DEVICE T intersection_volume(const Octahedron& oct, * \param [in] checkSign If true (default is false), checks if the * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be - * swapped for that shape. + * swapped to try to obtain a positive volume + * for that shape. Otherwise, the returned volume + * may be zero. * * \return Intersection volume between the tetrahedron and octahedron * - * \note checkSign flag does not guarantee the shapes' vertex orders - * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. + * \warning checkSign flag does not guarantee the shapes' vertex orders + * will be valid. It is the responsiblity of the caller to pass + * shapes with a valid vertex order. Otherwise, the returned + * volume may be zero. * */ template @@ -147,13 +159,16 @@ AXOM_HOST_DEVICE T intersection_volume(const Tetrahedron& tet, * \param [in] checkSign If true (default is false), checks if the * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be - * swapped for that shape. + * swapped to try to obtain a positive volume + * for that shape. Otherwise, the returned volume + * may be zero. * * \return Intersection volume between the tetrahedra * - * \note checkSign flag does not guarantee the shapes' vertex orders - * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. + * \warning checkSign flag does not guarantee the shapes' vertex orders + * will be valid. It is the responsiblity of the caller to pass + * shapes with a valid vertex order. Otherwise, the returned + * volume may be zero. * */ template From 24db5332c138a70829aed0e960dee095cabbebc9 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 7 Nov 2023 14:05:35 -0800 Subject: [PATCH 208/639] Check that absolute value of volumes are same after check --- src/axom/primal/tests/primal_tetrahedron.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/axom/primal/tests/primal_tetrahedron.cpp b/src/axom/primal/tests/primal_tetrahedron.cpp index fb1cc8a999..48601c1551 100644 --- a/src/axom/primal/tests/primal_tetrahedron.cpp +++ b/src/axom/primal/tests/primal_tetrahedron.cpp @@ -642,8 +642,17 @@ TEST_F(TetrahedronTest, checkSign) { QTet tetPermuted = QTet(tet[indices[0]], tet[indices[1]], tet[indices[2]], tet[indices[3]]); + + double preCheckVolume = tetPermuted.volume(); + tetPermuted.checkAndFixOrientation(); EXPECT_NEAR(expVolume, tetPermuted.signedVolume(), this->EPS); + + // Verify absolute value of volume is still the same + EXPECT_NEAR(axom::utilities::abs(preCheckVolume), + tetPermuted.signedVolume(), + this->EPS); + } while(std::next_permutation(indices, indices + QTet::NUM_VERTS)); } } From cdafd9d75a69ba741c2ec811511ce87437f6ca61 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 7 Nov 2023 15:24:29 -0800 Subject: [PATCH 209/639] Clarify comment --- src/axom/primal/geometry/Polyhedron.hpp | 34 ++++++------ src/axom/primal/operators/clip.hpp | 50 +++++++++++------- .../primal/operators/intersection_volume.hpp | 52 +++++++++++-------- 3 files changed, 80 insertions(+), 56 deletions(-) diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp index d62e675b60..1e67609649 100644 --- a/src/axom/primal/geometry/Polyhedron.hpp +++ b/src/axom/primal/geometry/Polyhedron.hpp @@ -675,8 +675,9 @@ class Polyhedron * \param [in] checkSign If true (default is false), checks if the * signed volume of the Polyhedron is positive. If signed volume * is negative, order of some vertices will be swapped to try to - * obtain a positive volume for the Polyhedron. Otherwise, the - * returned Polyhedron will have a non-positive volume. + * obtain a positive volume for the Polyhedron. Otherwise, if the + * signed volume is negative and the vertices are not swapped, + * the returned Polyhedron will have a non-positive volume. * * \return A Polyhedron with the Hexahedron's vertices and added * vertex neighbors @@ -700,9 +701,9 @@ class Polyhedron * * \warning checkSign flag does not guarantee the Polyhedron's vertex order * will be valid. It is the responsiblity of the caller to pass - * a Hexahedron with a valid vertex order. Otherwise, the - * Polyhedron will have a non-positive volume with an - * invalid vertex order. + * a Hexahedron with a valid vertex order. Otherwise, if the + * Hexahedron has an invalid vertex order, the returned Polyhedron + * will have a non-positive and/or unexpected volume. */ AXOM_HOST_DEVICE static Polyhedron from_primitive(const Hexahedron& hex, @@ -749,8 +750,9 @@ class Polyhedron * \param [in] checkSign If true (default is false), checks if the * signed volume of the Polyhedron is positive. If signed volume * is negative, order of some vertices will be swapped to try to - * obtain a positive volume for the Polyhedron. Otherwise, the - * returned Polyhedron will have a non-positive volume. + * obtain a positive volume for the Polyhedron. Otherwise, if the + * signed volume is negative and the vertices are not swapped, + * the returned Polyhedron will have a non-positive volume. * * \return A Polyhedron with the Octahedron's vertices and added * vertex neighbors @@ -776,9 +778,10 @@ class Polyhedron * * \warning checkSign flag does not guarantee the Polyhedron's vertex order * will be valid. It is the responsiblity of the caller to pass - * an Octahedron with a valid vertex order. Otherwise, the - * Polyhedron will have a non-positive volume with an - * invalid vertex order. + * an Octahedron with a valid vertex order. Otherwise, if the + * Octahedron has an invalid vertex order, the returned Polyhedron + * will have a non-positive and/or unexpected volume. + * */ AXOM_HOST_DEVICE static Polyhedron from_primitive(const Octahedron& oct, @@ -821,8 +824,9 @@ class Polyhedron * \param [in] checkSign If true (default is false), checks if the * signed volume of the Polyhedron is positive. If signed volume * is negative, order of some vertices will be swapped to try to - * obtain a positive volume for the Polyhedron. Otherwise, the - * returned Polyhedron will have a non-positive volume. + * obtain a positive volume for the Polyhedron. Otherwise, if the + * signed volume is negative and the vertices are not swapped, + * the returned Polyhedron will have a non-positive volume. * * \return A Polyhedron with the Tetrahedron's vertices and added * vertex neighbors @@ -847,9 +851,9 @@ class Polyhedron * * \warning checkSign flag does not guarantee the Polyhedron's vertex order * will be valid. It is the responsiblity of the caller to pass - * a Tetrahedron with a valid vertex order. Otherwise, the - * Polyhedron will have a non-positive volume with an - * invalid vertex order. + * a Tetrahedron with a valid vertex order. Otherwise, if the + * Tetrahedron has an invalid vertex order, the returned Polyhedron + * will have a non-positive and/or unexpected volume. * */ AXOM_HOST_DEVICE diff --git a/src/axom/primal/operators/clip.hpp b/src/axom/primal/operators/clip.hpp index d924a986f5..9d1fc30e91 100644 --- a/src/axom/primal/operators/clip.hpp +++ b/src/axom/primal/operators/clip.hpp @@ -121,8 +121,9 @@ Polygon clip(const Triangle& tri, const BoundingBox& bbox) * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be * swapped to try to obtain a positive volume - * for that shape. Otherwise, the returned polyhedron - * will have a non-positive volume. + * for that shape. Otherwise, if the + * signed volume is negative and the vertices are not swapped, the + * returned Polyhedron will have a non-positive volume. * * \return A polyhedron of the hexahedron clipped against the tetrahedron. * @@ -130,8 +131,9 @@ Polygon clip(const Triangle& tri, const BoundingBox& bbox) * * \warning checkSign flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. Otherwise, returned polyhedron - * will have a non-positive volume with invalid vertex orders. + * shapes with a valid vertex order. Otherwise, if the shapes have + * invalid vertex orders, the returned Polyhedron + * will have a non-positive and/or unexpected volume. * */ template @@ -165,8 +167,9 @@ AXOM_HOST_DEVICE Polyhedron clip(const Hexahedron& hex, * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be * swapped to try to obtain a positive volume - * for that shape. Otherwise, the returned polyhedron - * will have a non-positive volume. + * for that shape. Otherwise, if the + * signed volume is negative and the vertices are not swapped, the + * returned Polyhedron will have a non-positive volume. * * \return A polyhedron of the hexahedron clipped against the tetrahedron. * @@ -174,8 +177,9 @@ AXOM_HOST_DEVICE Polyhedron clip(const Hexahedron& hex, * * \warning checkSign flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. Otherwise, returned polyhedron - * will have a non-positive volume with invalid vertex orders. + * shapes with a valid vertex order. Otherwise, if the shapes have + * invalid vertex orders, the returned Polyhedron + * will have a non-positive and/or unexpected volume. * */ template @@ -209,8 +213,9 @@ AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be * swapped to try to obtain a positive volume - * for that shape. Otherwise, the returned polyhedron - * will have a non-positive volume. + * for that shape. Otherwise, if the + * signed volume is negative and the vertices are not swapped, the + * returned Polyhedron will have a non-positive volume. * * \return A polyhedron of the octahedron clipped against the tetrahedron. * @@ -218,8 +223,9 @@ AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, * * \warning checkSign flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. Otherwise, returned polyhedron - * will have a non-positive volume with invalid vertex orders. + * shapes with a valid vertex order. Otherwise, if the shapes have + * invalid vertex orders, the returned Polyhedron + * will have a non-positive and/or unexpected volume. * */ template @@ -254,8 +260,9 @@ AXOM_HOST_DEVICE Polyhedron clip(const Octahedron& oct, * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be * swapped to try to obtain a positive volume - * for that shape. Otherwise, the returned polyhedron - * will have a non-positive volume. + * for that shape. Otherwise, if the + * signed volume is negative and the vertices are not swapped, the + * returned Polyhedron will have a non-positive volume. * * \return A polyhedron of the octahedron clipped against the tetrahedron. * @@ -263,8 +270,9 @@ AXOM_HOST_DEVICE Polyhedron clip(const Octahedron& oct, * * \warning checkSign flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. Otherwise, returned polyhedron - * will have a non-positive volume with invalid vertex orders. + * shapes with a valid vertex order. Otherwise, if the shapes have + * invalid vertex orders, the returned Polyhedron + * will have a non-positive and/or unexpected volume. * */ template @@ -297,8 +305,9 @@ AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be * swapped to try to obtain a positive volume - * for that shape. Otherwise, the returned polyhedron - * will have a non-positive volume. + * for that shape. Otherwise, if the + * signed volume is negative and the vertices are not swapped, the + * returned Polyhedron will have a non-positive volume. * * \return A polyhedron of the tetrahedron clipped against * the other tetrahedron. @@ -307,8 +316,9 @@ AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, * * \warning checkSign flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. Otherwise, returned polyhedron - * will have a non-positive volume with invalid vertex orders. + * shapes with a valid vertex order. Otherwise, if the shapes have + * invalid vertex orders, the returned Polyhedron + * will have a non-positive and/or unexpected volume. * */ template diff --git a/src/axom/primal/operators/intersection_volume.hpp b/src/axom/primal/operators/intersection_volume.hpp index 46db7a4ed8..5d209f3f57 100644 --- a/src/axom/primal/operators/intersection_volume.hpp +++ b/src/axom/primal/operators/intersection_volume.hpp @@ -36,15 +36,17 @@ namespace primal * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be * swapped to try to obtain a positive volume - * for that shape. Otherwise, the returned volume - * may be zero. - + * for that shape. Otherwise, if the + * signed volume is negative and the vertices are not swapped, + * the returned volume may be zero and/or unexpected. + * * \return Intersection volume between the hexahedron and tetrahedron * * \warning checkSign flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. Otherwise, the returned - * volume may be zero. + * shapes with a valid vertex order. Otherwise, if the shapes have + * invalid vertex orders, the returned volume may be zero + * and/or unexpected. * */ template @@ -67,15 +69,17 @@ AXOM_HOST_DEVICE T intersection_volume(const Hexahedron& hex, * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be * swapped to try to obtain a positive volume - * for that shape. Otherwise, the returned volume - * may be zero. + * for that shape. Otherwise, if the + * signed volume is negative and the vertices are not swapped, + * the returned volume may be zero and/or unexpected. * * \return Intersection volume between the tetrahedron and hexahedron * * \warning checkSign flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. Otherwise, the returned - * volume may be zero. + * shapes with a valid vertex order. Otherwise, if the shapes have + * invalid vertex orders, the returned volume may be zero + * and/or unexpected. * */ template @@ -98,15 +102,17 @@ AXOM_HOST_DEVICE T intersection_volume(const Tetrahedron& tet, * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be * swapped to try to obtain a positive volume - * for that shape. Otherwise, the returned volume - * may be zero. + * for that shape. Otherwise, if the + * signed volume is negative and the vertices are not swapped, + * the returned volume may be zero and/or unexpected. * * \return Intersection volume between the octahedron and tetrahedron * * \warning checkSign flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. Otherwise, the returned - * volume may be zero. + * shapes with a valid vertex order. Otherwise, if the shapes have + * invalid vertex orders, the returned volume may be zero + * and/or unexpected. * */ template @@ -129,15 +135,17 @@ AXOM_HOST_DEVICE T intersection_volume(const Octahedron& oct, * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be * swapped to try to obtain a positive volume - * for that shape. Otherwise, the returned volume - * may be zero. + * for that shape. Otherwise, if the + * signed volume is negative and the vertices are not swapped, + * the returned volume may be zero and/or unexpected. * * \return Intersection volume between the tetrahedron and octahedron * * \warning checkSign flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. Otherwise, the returned - * volume may be zero. + * shapes with a valid vertex order. Otherwise, if the shapes have + * invalid vertex orders, the returned volume may be zero + * and/or unexpected. * */ template @@ -160,15 +168,17 @@ AXOM_HOST_DEVICE T intersection_volume(const Tetrahedron& tet, * signed volume of each shape is positive. If the signed volume * of that shape is negative, order of some vertices will be * swapped to try to obtain a positive volume - * for that shape. Otherwise, the returned volume - * may be zero. + * for that shape. Otherwise, if the + * signed volume is negative and the vertices are not swapped, + * the returned volume may be zero and/or unexpected. * * \return Intersection volume between the tetrahedra * * \warning checkSign flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. Otherwise, the returned - * volume may be zero. + * shapes with a valid vertex order. Otherwise, if the shapes have + * invalid vertex orders, the returned volume may be zero + * and/or unexpected. * */ template From cfba631eb232fcf5c9f08025520b4617314f95aa Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 7 Nov 2023 15:32:01 -0800 Subject: [PATCH 210/639] Add to notes --- RELEASE-NOTES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 18bd09fe58..80fb3b9063 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -19,6 +19,11 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ ## [Unreleased] - Release date yyyy-mm-dd +### Added +- Primal: Adds a `checkAndFixOrientation()` function to `primal::Tetrahedron` + that swaps the order of vertices if the signed volume of the Tetrahedron is + negative, resulting in the signed volume becoming positive. + ### Changed - `MarchingCubes` and `DistributedClosestPoint` classes changed from requiring the Blueprint coordset name to requiring the Blueprint topology name. The changed interface methods are: From 10e83bc76af40c5cf360b86cc13f0f4e074f0e91 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 8 Nov 2023 14:18:38 -0800 Subject: [PATCH 211/639] Apply documentation suggestions; checkSign --> tryFixOrientation --- src/axom/primal/examples/hex_tet_volume.cpp | 6 +- src/axom/primal/geometry/Polyhedron.hpp | 65 ++++++----- src/axom/primal/operators/clip.hpp | 105 +++++++++--------- .../primal/operators/detail/clip_impl.hpp | 33 +++--- .../primal/operators/intersection_volume.hpp | 105 +++++++++--------- src/axom/primal/tests/primal_clip.cpp | 80 +++++++------ src/axom/primal/tests/primal_tetrahedron.cpp | 13 ++- src/axom/quest/IntersectionShaper.hpp | 4 +- 8 files changed, 219 insertions(+), 192 deletions(-) diff --git a/src/axom/primal/examples/hex_tet_volume.cpp b/src/axom/primal/examples/hex_tet_volume.cpp index 6aa39291b0..f063aa1f7e 100644 --- a/src/axom/primal/examples/hex_tet_volume.cpp +++ b/src/axom/primal/examples/hex_tet_volume.cpp @@ -239,7 +239,7 @@ void check_intersection_volumes(const Input& params) // reduce the number of operations. RAJA::ReduceSum total_intersect_vol(0.0); constexpr double EPS = 1e-10; - constexpr bool checkSign = true; + constexpr bool tryFixOrientation = true; // The lower of the two sizes (NUM_HEXES, NUM_TETS) is used to factor out // every pair of hexahedron and tetrahedron indices. @@ -251,7 +251,7 @@ void check_intersection_volumes(const Input& params) total_intersect_vol += intersection_volume(hexes_view[i / NUM_TETS], tets_view[i % NUM_TETS], EPS, - checkSign); + tryFixOrientation); }); } else @@ -262,7 +262,7 @@ void check_intersection_volumes(const Input& params) total_intersect_vol += intersection_volume(hexes_view[i % NUM_HEXES], tets_view[i / NUM_HEXES], EPS, - checkSign); + tryFixOrientation); }); } diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp index 1e67609649..5f30ce24dc 100644 --- a/src/axom/primal/geometry/Polyhedron.hpp +++ b/src/axom/primal/geometry/Polyhedron.hpp @@ -672,12 +672,10 @@ class Polyhedron * \brief Creates a Polyhedron from a given Hexahedron's vertices. * * \param [in] hex The hexahedron - * \param [in] checkSign If true (default is false), checks if the - * signed volume of the Polyhedron is positive. If signed volume - * is negative, order of some vertices will be swapped to try to - * obtain a positive volume for the Polyhedron. Otherwise, if the - * signed volume is negative and the vertices are not swapped, - * the returned Polyhedron will have a non-positive volume. + * \param [in] tryFixOrientation If true, checks if the signed volume of the + * Polyhedron is positive and swaps the order of some vertices + * in that shape to try to obtain a nonnegative signed volume. + * Defaults to false. * * \return A Polyhedron with the Hexahedron's vertices and added * vertex neighbors @@ -699,15 +697,20 @@ class Polyhedron * The Polyhedron's vertex neighbors are created assuming this vertex * ordering. * - * \warning checkSign flag does not guarantee the Polyhedron's vertex order + * \warning tryFixOrientation flag does not guarantee the Polyhedron's vertex order * will be valid. It is the responsiblity of the caller to pass * a Hexahedron with a valid vertex order. Otherwise, if the * Hexahedron has an invalid vertex order, the returned Polyhedron * will have a non-positive and/or unexpected volume. + * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned Polyhedron + * will have a non-positive and/or unexpected volume. + * */ AXOM_HOST_DEVICE static Polyhedron from_primitive(const Hexahedron& hex, - bool checkSign = false) + bool tryFixOrientation = false) { // Initialize our polyhedron to return Polyhedron poly; @@ -731,7 +734,7 @@ class Polyhedron poly.addNeighbors(7, {3, 4, 6}); // Reverses order of vertices 1,3 and 5,7 if signed volume is negative - if(checkSign) + if(tryFixOrientation) { if(poly.signedVolume() < 0) { @@ -747,12 +750,10 @@ class Polyhedron * \brief Creates a Polyhedron from a given Octahedron's vertices. * * \param [in] oct The octahedron - * \param [in] checkSign If true (default is false), checks if the - * signed volume of the Polyhedron is positive. If signed volume - * is negative, order of some vertices will be swapped to try to - * obtain a positive volume for the Polyhedron. Otherwise, if the - * signed volume is negative and the vertices are not swapped, - * the returned Polyhedron will have a non-positive volume. + * \param [in] tryFixOrientation If true, checks if the signed volume of the + * Polyhedron is positive and swaps the order of some vertices + * in that shape to try to obtain a nonnegative signed volume. + * Defaults to false. * * \return A Polyhedron with the Octahedron's vertices and added * vertex neighbors @@ -776,16 +777,20 @@ class Polyhedron * The Polyhedron's vertex neighbors are created assuming this vertex * ordering. * - * \warning checkSign flag does not guarantee the Polyhedron's vertex order + * \warning tryFixOrientation flag does not guarantee the Polyhedron's vertex order * will be valid. It is the responsiblity of the caller to pass * an Octahedron with a valid vertex order. Otherwise, if the * Octahedron has an invalid vertex order, the returned Polyhedron * will have a non-positive and/or unexpected volume. * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned Polyhedron + * will have a non-positive and/or unexpected volume. + * */ AXOM_HOST_DEVICE static Polyhedron from_primitive(const Octahedron& oct, - bool checkSign = false) + bool tryFixOrientation = false) { // Initialize our polyhedron to return Polyhedron poly; @@ -805,7 +810,7 @@ class Polyhedron poly.addNeighbors(5, {0, 1, 3, 4}); // Reverses order of vertices 1,2 and 4,5 if volume is negative. - if(checkSign) + if(tryFixOrientation) { if(poly.signedVolume() < 0) { @@ -821,12 +826,10 @@ class Polyhedron * \brief Creates a Polyhedron from a given Tetrahedron's vertices. * * \param [in] tet The tetrahedron - * \param [in] checkSign If true (default is false), checks if the - * signed volume of the Polyhedron is positive. If signed volume - * is negative, order of some vertices will be swapped to try to - * obtain a positive volume for the Polyhedron. Otherwise, if the - * signed volume is negative and the vertices are not swapped, - * the returned Polyhedron will have a non-positive volume. + * \param [in] tryFixOrientation If true, checks if the signed volume of the + * Polyhedron is positive and swaps the order of some vertices + * in that shape to try to obtain a nonnegative signed volume. + * Defaults to false. * * \return A Polyhedron with the Tetrahedron's vertices and added * vertex neighbors @@ -849,16 +852,20 @@ class Polyhedron * The Polyhedron's vertex neighbors are created assuming this vertex * ordering. * - * \warning checkSign flag does not guarantee the Polyhedron's vertex order - * will be valid. It is the responsiblity of the caller to pass - * a Tetrahedron with a valid vertex order. Otherwise, if the + * \warning tryFixOrientation flag does not guarantee the Polyhedron's vertex + * order will be valid. It is the responsiblity of the caller to + * pass a Tetrahedron with a valid vertex order. Otherwise, if the * Tetrahedron has an invalid vertex order, the returned Polyhedron * will have a non-positive and/or unexpected volume. * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned Polyhedron + * will have a non-positive and/or unexpected volume. + * */ AXOM_HOST_DEVICE static Polyhedron from_primitive(const Tetrahedron& tet, - bool checkSign = false) + bool tryFixOrientation = false) { // Initialize our polyhedron to return Polyhedron poly; @@ -874,7 +881,7 @@ class Polyhedron poly.addNeighbors(3, {0, 1, 2}); // Reverses order of vertices 1 and 2 if signed volume is negative - if(checkSign) + if(tryFixOrientation) { if(tet.signedVolume() < 0) { diff --git a/src/axom/primal/operators/clip.hpp b/src/axom/primal/operators/clip.hpp index 9d1fc30e91..7e450630be 100644 --- a/src/axom/primal/operators/clip.hpp +++ b/src/axom/primal/operators/clip.hpp @@ -117,32 +117,33 @@ Polygon clip(const Triangle& tri, const BoundingBox& bbox) * \param [in] hex The hexahedron to clip * \param [in] tet The tetrahedron to clip against * \param [in] eps The epsilon value - * \param [in] checkSign If true (default is false), checks if the - * signed volume of each shape is positive. If the signed volume - * of that shape is negative, order of some vertices will be - * swapped to try to obtain a positive volume - * for that shape. Otherwise, if the - * signed volume is negative and the vertices are not swapped, the - * returned Polyhedron will have a non-positive volume. + * \param [in] tryFixOrientation If true, takes each shape with a negative + * signed volume and swaps the order of some vertices in that + * shape to try to obtain a nonnegative signed volume. + * Defaults to false. * * \return A polyhedron of the hexahedron clipped against the tetrahedron. * * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. * - * \warning checkSign flag does not guarantee the shapes' vertex orders + * \warning tryFixOrientation flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass * shapes with a valid vertex order. Otherwise, if the shapes have * invalid vertex orders, the returned Polyhedron * will have a non-positive and/or unexpected volume. * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned Polyhedron + * will have a non-positive and/or unexpected volume. + * */ template AXOM_HOST_DEVICE Polyhedron clip(const Hexahedron& hex, const Tetrahedron& tet, double eps = 1.e-10, - bool checkSign = false) + bool tryFixOrientation = false) { - return detail::clipHexahedron(hex, tet, eps, checkSign); + return detail::clipHexahedron(hex, tet, eps, tryFixOrientation); } /*! @@ -163,32 +164,33 @@ AXOM_HOST_DEVICE Polyhedron clip(const Hexahedron& hex, * \param [in] tet The tetrahedron to clip against * \param [in] hex The hexahedron to clip * \param [in] eps The epsilon value - * \param [in] checkSign If true (default is false), checks if the - * signed volume of each shape is positive. If the signed volume - * of that shape is negative, order of some vertices will be - * swapped to try to obtain a positive volume - * for that shape. Otherwise, if the - * signed volume is negative and the vertices are not swapped, the - * returned Polyhedron will have a non-positive volume. + * \param [in] tryFixOrientation If true, takes each shape with a negative + * signed volume and swaps the order of some vertices in that + * shape to try to obtain a nonnegative signed volume. + * Defaults to false. * * \return A polyhedron of the hexahedron clipped against the tetrahedron. * * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. * - * \warning checkSign flag does not guarantee the shapes' vertex orders + * \warning tryFixOrientation flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass * shapes with a valid vertex order. Otherwise, if the shapes have * invalid vertex orders, the returned Polyhedron * will have a non-positive and/or unexpected volume. * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned Polyhedron + * will have a non-positive and/or unexpected volume. + * */ template AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, const Hexahedron& hex, double eps = 1.e-10, - bool checkSign = false) + bool tryFixOrientation = false) { - return clip(hex, tet, eps, checkSign); + return clip(hex, tet, eps, tryFixOrientation); } /*! @@ -209,32 +211,33 @@ AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, * \param [in] oct The octahedron to clip * \param [in] tet The tetrahedron to clip against * \param [in] eps The epsilon value - * \param [in] checkSign If true (default is false), checks if the - * signed volume of each shape is positive. If the signed volume - * of that shape is negative, order of some vertices will be - * swapped to try to obtain a positive volume - * for that shape. Otherwise, if the - * signed volume is negative and the vertices are not swapped, the - * returned Polyhedron will have a non-positive volume. + * \param [in] tryFixOrientation If true, takes each shape with a negative + * signed volume and swaps the order of some vertices in that + * shape to try to obtain a nonnegative signed volume. + * Defaults to false. * * \return A polyhedron of the octahedron clipped against the tetrahedron. * * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. * - * \warning checkSign flag does not guarantee the shapes' vertex orders + * \warning tryFixOrientation flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass * shapes with a valid vertex order. Otherwise, if the shapes have * invalid vertex orders, the returned Polyhedron * will have a non-positive and/or unexpected volume. * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned Polyhedron + * will have a non-positive and/or unexpected volume. + * */ template AXOM_HOST_DEVICE Polyhedron clip(const Octahedron& oct, const Tetrahedron& tet, double eps = 1.e-10, - bool checkSign = false) + bool tryFixOrientation = false) { - return detail::clipOctahedron(oct, tet, eps, checkSign); + return detail::clipOctahedron(oct, tet, eps, tryFixOrientation); } /*! @@ -256,32 +259,33 @@ AXOM_HOST_DEVICE Polyhedron clip(const Octahedron& oct, * \param [in] oct The octahedron to clip * \param [in] tet The tetrahedron to clip against * \param [in] eps The epsilon value - * \param [in] checkSign If true (default is false), checks if the - * signed volume of each shape is positive. If the signed volume - * of that shape is negative, order of some vertices will be - * swapped to try to obtain a positive volume - * for that shape. Otherwise, if the - * signed volume is negative and the vertices are not swapped, the - * returned Polyhedron will have a non-positive volume. + * \param [in] tryFixOrientation If true, takes each shape with a negative + * signed volume and swaps the order of some vertices in that + * shape to try to obtain a nonnegative signed volume. + * Defaults to false. * * \return A polyhedron of the octahedron clipped against the tetrahedron. * * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. * - * \warning checkSign flag does not guarantee the shapes' vertex orders + * \warning tryFixOrientation flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass * shapes with a valid vertex order. Otherwise, if the shapes have * invalid vertex orders, the returned Polyhedron * will have a non-positive and/or unexpected volume. * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned Polyhedron + * will have a non-positive and/or unexpected volume. + * */ template AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, const Octahedron& oct, double eps = 1.e-10, - bool checkSign = false) + bool tryFixOrientation = false) { - return clip(oct, tet, eps, checkSign); + return clip(oct, tet, eps, tryFixOrientation); } /*! @@ -301,33 +305,34 @@ AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet, * \param [in] tet1 The tetrahedron to clip * \param [in] tet2 The tetrahedron to clip against * \param [in] eps The epsilon value - * \param [in] checkSign If true (default is false), checks if the - * signed volume of each shape is positive. If the signed volume - * of that shape is negative, order of some vertices will be - * swapped to try to obtain a positive volume - * for that shape. Otherwise, if the - * signed volume is negative and the vertices are not swapped, the - * returned Polyhedron will have a non-positive volume. + * \param [in] tryFixOrientation If true, takes each shape with a negative + * signed volume and swaps the order of some vertices in that + * shape to try to obtain a nonnegative signed volume. + * Defaults to false. * * \return A polyhedron of the tetrahedron clipped against * the other tetrahedron. * * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. * - * \warning checkSign flag does not guarantee the shapes' vertex orders + * \warning tryFixOrientation flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass * shapes with a valid vertex order. Otherwise, if the shapes have * invalid vertex orders, the returned Polyhedron * will have a non-positive and/or unexpected volume. * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned Polyhedron + * will have a non-positive and/or unexpected volume. + * */ template AXOM_HOST_DEVICE Polyhedron clip(const Tetrahedron& tet1, const Tetrahedron& tet2, double eps = 1.e-10, - bool checkSign = false) + bool tryFixOrientation = false) { - return detail::clipTetrahedron(tet1, tet2, eps, checkSign); + return detail::clipTetrahedron(tet1, tet2, eps, tryFixOrientation); } /*! diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index 72c91e40c8..764e385767 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -493,7 +493,7 @@ AXOM_HOST_DEVICE void clipPolyhedron(Polyhedron& poly, * \param [in] hex The hexahedron * \param [in] tet The tetrahedron * \param [in] eps The tolerance for plane point orientation. - * \param [in] checkSign Check if the signed volume of each shape is positive. + * \param [in] tryFixOrientation Check if the signed volume of each shape is positive. * \return The Polyhedron formed from clipping the hexahedron with a tetrahedron. * */ @@ -502,13 +502,13 @@ AXOM_HOST_DEVICE Polyhedron clipHexahedron( const Hexahedron& hex, const Tetrahedron& tet, double eps, - bool checkSign) + bool tryFixOrientation) { using PlaneType = Plane; using PolyhedronType = Polyhedron; // Initialize our polyhedron to return - PolyhedronType poly = PolyhedronType::from_primitive(hex, checkSign); + PolyhedronType poly = PolyhedronType::from_primitive(hex, tryFixOrientation); // Initialize planes from tetrahedron vertices // (Ordering here matters to get the correct winding) @@ -518,9 +518,10 @@ AXOM_HOST_DEVICE Polyhedron clipHexahedron( make_plane(tet[0], tet[1], tet[2])}; // Adjusts planes in case tetrahedron signed volume is negative - if(checkSign) + if(tryFixOrientation) { - PolyhedronType tet_poly = PolyhedronType::from_primitive(tet, checkSign); + PolyhedronType tet_poly = + PolyhedronType::from_primitive(tet, tryFixOrientation); planes[0] = make_plane(tet_poly[1], tet_poly[3], tet_poly[2]); planes[1] = make_plane(tet_poly[0], tet_poly[2], tet_poly[3]); planes[2] = make_plane(tet_poly[0], tet_poly[3], tet_poly[1]); @@ -541,7 +542,7 @@ AXOM_HOST_DEVICE Polyhedron clipHexahedron( * \param [in] oct The octahedron * \param [in] tet The tetrahedron * \param [in] eps The tolerance for plane point orientation. - * \param [in] checkSign Check if the signed volume of each shape is positive. + * \param [in] tryFixOrientation Check if the signed volume of each shape is positive. * \return The Polyhedron formed from clipping the octahedron with a tetrahedron. * */ @@ -550,13 +551,13 @@ AXOM_HOST_DEVICE Polyhedron clipOctahedron( const Octahedron& oct, const Tetrahedron& tet, double eps, - bool checkSign) + bool tryFixOrientation) { using PlaneType = Plane; using PolyhedronType = Polyhedron; // Initialize our polyhedron to return - PolyhedronType poly = PolyhedronType::from_primitive(oct, checkSign); + PolyhedronType poly = PolyhedronType::from_primitive(oct, tryFixOrientation); // Initialize planes from tetrahedron vertices // (Ordering here matters to get the correct winding) @@ -566,9 +567,10 @@ AXOM_HOST_DEVICE Polyhedron clipOctahedron( make_plane(tet[0], tet[1], tet[2])}; // Adjusts planes in case tetrahedron signed volume is negative - if(checkSign) + if(tryFixOrientation) { - PolyhedronType tet_poly = PolyhedronType::from_primitive(tet, checkSign); + PolyhedronType tet_poly = + PolyhedronType::from_primitive(tet, tryFixOrientation); planes[0] = make_plane(tet_poly[1], tet_poly[3], tet_poly[2]); planes[1] = make_plane(tet_poly[0], tet_poly[2], tet_poly[3]); planes[2] = make_plane(tet_poly[0], tet_poly[3], tet_poly[1]); @@ -589,7 +591,7 @@ AXOM_HOST_DEVICE Polyhedron clipOctahedron( * \param [in] tet1 The tetrahedron to clip * \param [in] tet2 The tetrahedron to clip against * \param [in] eps The tolerance for plane point orientation. - * \param [in] checkSign Check if the signed volume of each shape is positive. + * \param [in] tryFixOrientation Check if the signed volume of each shape is positive. * \return The Polyhedron formed from clipping the tetrahedron with a tetrahedron. * */ @@ -598,13 +600,13 @@ AXOM_HOST_DEVICE Polyhedron clipTetrahedron( const Tetrahedron& tet1, const Tetrahedron& tet2, double eps, - bool checkSign) + bool tryFixOrientation) { using PlaneType = Plane; using PolyhedronType = Polyhedron; // Initialize our polyhedron to return - PolyhedronType poly = PolyhedronType::from_primitive(tet1, checkSign); + PolyhedronType poly = PolyhedronType::from_primitive(tet1, tryFixOrientation); // Initialize planes from tetrahedron vertices // (Ordering here matters to get the correct winding) @@ -614,9 +616,10 @@ AXOM_HOST_DEVICE Polyhedron clipTetrahedron( make_plane(tet2[0], tet2[1], tet2[2])}; // Adjusts planes in case tetrahedron signed volume is negative - if(checkSign) + if(tryFixOrientation) { - PolyhedronType tet_poly = PolyhedronType::from_primitive(tet2, checkSign); + PolyhedronType tet_poly = + PolyhedronType::from_primitive(tet2, tryFixOrientation); planes[0] = make_plane(tet_poly[1], tet_poly[3], tet_poly[2]); planes[1] = make_plane(tet_poly[0], tet_poly[2], tet_poly[3]); planes[2] = make_plane(tet_poly[0], tet_poly[3], tet_poly[1]); diff --git a/src/axom/primal/operators/intersection_volume.hpp b/src/axom/primal/operators/intersection_volume.hpp index 5d209f3f57..8fd2194ffd 100644 --- a/src/axom/primal/operators/intersection_volume.hpp +++ b/src/axom/primal/operators/intersection_volume.hpp @@ -32,30 +32,31 @@ namespace primal * \param [in] hex The hexahedron * \param [in] tet The tetrahedron * \param [in] eps The tolerance for determining the intersection - * \param [in] checkSign If true (default is false), checks if the - * signed volume of each shape is positive. If the signed volume - * of that shape is negative, order of some vertices will be - * swapped to try to obtain a positive volume - * for that shape. Otherwise, if the - * signed volume is negative and the vertices are not swapped, - * the returned volume may be zero and/or unexpected. + * \param [in] tryFixOrientation If true, takes each shape with a negative + * signed volume and swaps the order of some vertices in that + * shape to try to obtain a nonnegative signed volume. + * Defaults to false. * * \return Intersection volume between the hexahedron and tetrahedron * - * \warning checkSign flag does not guarantee the shapes' vertex orders + * \warning tryFixOrientation flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass * shapes with a valid vertex order. Otherwise, if the shapes have * invalid vertex orders, the returned volume may be zero * and/or unexpected. * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned volume of intersection + * may be zero and/or unexpected. + * */ template AXOM_HOST_DEVICE T intersection_volume(const Hexahedron& hex, const Tetrahedron& tet, double eps = 1.e-10, - bool checkSign = false) + bool tryFixOrientation = false) { - return clip(hex, tet, eps, checkSign).volume(); + return clip(hex, tet, eps, tryFixOrientation).volume(); } /*! @@ -65,30 +66,31 @@ AXOM_HOST_DEVICE T intersection_volume(const Hexahedron& hex, * \param [in] hex The tetrahedron * \param [in] tet The hexahedron * \param [in] eps The tolerance for determining the intersection - * \param [in] checkSign If true (default is false), checks if the - * signed volume of each shape is positive. If the signed volume - * of that shape is negative, order of some vertices will be - * swapped to try to obtain a positive volume - * for that shape. Otherwise, if the - * signed volume is negative and the vertices are not swapped, - * the returned volume may be zero and/or unexpected. + * \param [in] tryFixOrientation If true, takes each shape with a negative + * signed volume and swaps the order of some vertices in that + * shape to try to obtain a nonnegative signed volume. + * Defaults to false. * * \return Intersection volume between the tetrahedron and hexahedron * - * \warning checkSign flag does not guarantee the shapes' vertex orders + * \warning tryFixOrientation flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass * shapes with a valid vertex order. Otherwise, if the shapes have * invalid vertex orders, the returned volume may be zero * and/or unexpected. * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned volume of intersection + * may be zero and/or unexpected. + * */ template AXOM_HOST_DEVICE T intersection_volume(const Tetrahedron& tet, const Hexahedron& hex, double eps = 1.e-10, - bool checkSign = false) + bool tryFixOrientation = false) { - return intersection_volume(hex, tet, eps, checkSign); + return intersection_volume(hex, tet, eps, tryFixOrientation); } /*! @@ -98,30 +100,31 @@ AXOM_HOST_DEVICE T intersection_volume(const Tetrahedron& tet, * \param [in] oct The octahedron * \param [in] tet The tetrahedron * \param [in] eps The tolerance for determining the intersection - * \param [in] checkSign If true (default is false), checks if the - * signed volume of each shape is positive. If the signed volume - * of that shape is negative, order of some vertices will be - * swapped to try to obtain a positive volume - * for that shape. Otherwise, if the - * signed volume is negative and the vertices are not swapped, - * the returned volume may be zero and/or unexpected. + * \param [in] tryFixOrientation If true, takes each shape with a negative + * signed volume and swaps the order of some vertices in that + * shape to try to obtain a nonnegative signed volume. + * Defaults to false. * * \return Intersection volume between the octahedron and tetrahedron * - * \warning checkSign flag does not guarantee the shapes' vertex orders + * \warning tryFixOrientation flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass * shapes with a valid vertex order. Otherwise, if the shapes have * invalid vertex orders, the returned volume may be zero * and/or unexpected. * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned volume of intersection + * may be zero and/or unexpected. + * */ template AXOM_HOST_DEVICE T intersection_volume(const Octahedron& oct, const Tetrahedron& tet, double eps = 1.e-10, - bool checkSign = false) + bool tryFixOrientation = false) { - return clip(oct, tet, eps, checkSign).volume(); + return clip(oct, tet, eps, tryFixOrientation).volume(); } /*! @@ -131,30 +134,31 @@ AXOM_HOST_DEVICE T intersection_volume(const Octahedron& oct, * \param [in] oct The tetrahedron * \param [in] tet The octahedron * \param [in] eps The tolerance for determining the intersection - * \param [in] checkSign If true (default is false), checks if the - * signed volume of each shape is positive. If the signed volume - * of that shape is negative, order of some vertices will be - * swapped to try to obtain a positive volume - * for that shape. Otherwise, if the - * signed volume is negative and the vertices are not swapped, - * the returned volume may be zero and/or unexpected. + * \param [in] tryFixOrientation If true, takes each shape with a negative + * signed volume and swaps the order of some vertices in that + * shape to try to obtain a nonnegative signed volume. + * Defaults to false. * * \return Intersection volume between the tetrahedron and octahedron * - * \warning checkSign flag does not guarantee the shapes' vertex orders + * \warning tryFixOrientation flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass * shapes with a valid vertex order. Otherwise, if the shapes have * invalid vertex orders, the returned volume may be zero * and/or unexpected. * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned volume of intersection + * may be zero and/or unexpected. + * */ template AXOM_HOST_DEVICE T intersection_volume(const Tetrahedron& tet, const Octahedron& oct, double eps = 1.e-10, - bool checkSign = false) + bool tryFixOrientation = false) { - return intersection_volume(oct, tet, eps, checkSign); + return intersection_volume(oct, tet, eps, tryFixOrientation); } /*! @@ -164,30 +168,31 @@ AXOM_HOST_DEVICE T intersection_volume(const Tetrahedron& tet, * \param [in] tet1 The tetrahedron * \param [in] tet2 The other tetrahedron * \param [in] eps The tolerance for determining the intersection - * \param [in] checkSign If true (default is false), checks if the - * signed volume of each shape is positive. If the signed volume - * of that shape is negative, order of some vertices will be - * swapped to try to obtain a positive volume - * for that shape. Otherwise, if the - * signed volume is negative and the vertices are not swapped, - * the returned volume may be zero and/or unexpected. + * \param [in] tryFixOrientation If true, takes each shape with a negative + * signed volume and swaps the order of some vertices in that + * shape to try to obtain a nonnegative signed volume. + * Defaults to false. * * \return Intersection volume between the tetrahedra * - * \warning checkSign flag does not guarantee the shapes' vertex orders + * \warning tryFixOrientation flag does not guarantee the shapes' vertex orders * will be valid. It is the responsiblity of the caller to pass * shapes with a valid vertex order. Otherwise, if the shapes have * invalid vertex orders, the returned volume may be zero * and/or unexpected. * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned volume of intersection + * may be zero and/or unexpected. + * */ template AXOM_HOST_DEVICE T intersection_volume(const Tetrahedron& tet1, const Tetrahedron& tet2, double eps = 1.e-10, - bool checkSign = false) + bool tryFixOrientation = false) { - return clip(tet1, tet2, eps, checkSign).volume(); + return clip(tet1, tet2, eps, tryFixOrientation).volume(); } } // namespace primal diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index 3c9e7f1e5c..5a77dd4ce0 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -366,7 +366,7 @@ void check_hex_tet_clip(double EPS) { using namespace Primal3D; - constexpr bool CHECK_SIGN = true; + constexpr bool CHECK_ORIENTATION = true; // Save current/default allocator const int current_allocator = axom::getDefaultAllocatorID(); @@ -401,7 +401,7 @@ void check_hex_tet_clip(double EPS) axom::primal::intersection_volume(hex[0], tet[0]), EPS); - // Test checkSign optional parameter using shapes with negative volumes + // Test tryFixOrientation optional parameter using shapes with negative volumes axom::utilities::swap(tet[0][1], tet[0][2]); axom::utilities::swap(hex[0][1], hex[0][3]); axom::utilities::swap(hex[0][5], hex[0][7]); @@ -412,14 +412,16 @@ void check_hex_tet_clip(double EPS) axom::for_all( 1, AXOM_LAMBDA(int i) { - res[i] = axom::primal::clip(hex[i], tet[i], EPS, CHECK_SIGN); + res[i] = axom::primal::clip(hex[i], tet[i], EPS, CHECK_ORIENTATION); }); EXPECT_NEAR(0.1666, res[0].volume(), EPS); - EXPECT_NEAR( - 0.1666, - axom::primal::intersection_volume(hex[0], tet[0], EPS, CHECK_SIGN), - EPS); + EXPECT_NEAR(0.1666, + axom::primal::intersection_volume(hex[0], + tet[0], + EPS, + CHECK_ORIENTATION), + EPS); axom::deallocate(tet); axom::deallocate(hex); @@ -433,7 +435,7 @@ void check_oct_tet_clip(double EPS) { using namespace Primal3D; - constexpr bool CHECK_SIGN = true; + constexpr bool CHECK_ORIENTATION = true; // Save current/default allocator const int current_allocator = axom::getDefaultAllocatorID(); @@ -467,7 +469,7 @@ void check_oct_tet_clip(double EPS) axom::primal::intersection_volume(oct[0], tet[0]), EPS); - // Test checkSign optional parameter using shapes with negative volumes + // Test tryFixOrientation optional parameter using shapes with negative volumes axom::utilities::swap(tet[0][1], tet[0][2]); axom::utilities::swap(oct[0][1], oct[0][2]); axom::utilities::swap(oct[0][4], oct[0][5]); @@ -477,14 +479,16 @@ void check_oct_tet_clip(double EPS) axom::for_all( 1, AXOM_LAMBDA(int i) { - res[i] = axom::primal::clip(oct[i], tet[i], EPS, CHECK_SIGN); + res[i] = axom::primal::clip(oct[i], tet[i], EPS, CHECK_ORIENTATION); }); EXPECT_NEAR(0.1666, res[0].volume(), EPS); - EXPECT_NEAR( - 0.1666, - axom::primal::intersection_volume(oct[0], tet[0], EPS, CHECK_SIGN), - EPS); + EXPECT_NEAR(0.1666, + axom::primal::intersection_volume(oct[0], + tet[0], + EPS, + CHECK_ORIENTATION), + EPS); axom::deallocate(tet); axom::deallocate(oct); @@ -498,7 +502,7 @@ void check_tet_tet_clip(double EPS) { using namespace Primal3D; - constexpr bool CHECK_SIGN = true; + constexpr bool CHECK_ORIENTATION = true; // Save current/default allocator const int current_allocator = axom::getDefaultAllocatorID(); @@ -530,7 +534,7 @@ void check_tet_tet_clip(double EPS) axom::primal::intersection_volume(tet1[0], tet2[0]), EPS); - // Test checkSign optional parameter using shapes with negative volumes + // Test tryFixOrientation optional parameter using shapes with negative volumes axom::utilities::swap(tet1[0][1], tet1[0][2]); axom::utilities::swap(tet2[0][1], tet2[0][2]); @@ -540,14 +544,16 @@ void check_tet_tet_clip(double EPS) axom::for_all( 1, AXOM_LAMBDA(int i) { - res[i] = axom::primal::clip(tet1[i], tet2[i], EPS, CHECK_SIGN); + res[i] = axom::primal::clip(tet1[i], tet2[i], EPS, CHECK_ORIENTATION); }); EXPECT_NEAR(0.0833, res[0].volume(), EPS); - EXPECT_NEAR( - 0.0833, - axom::primal::intersection_volume(tet1[0], tet2[0], EPS, CHECK_SIGN), - EPS); + EXPECT_NEAR(0.0833, + axom::primal::intersection_volume(tet1[0], + tet2[0], + EPS, + CHECK_ORIENTATION), + EPS); axom::deallocate(tet1); axom::deallocate(tet2); @@ -970,7 +976,7 @@ TEST(primal_clip, oct_tet_clip_special_case_1) { using namespace Primal3D; constexpr double EPS = 1e-4; - constexpr bool CHECK_SIGN = true; + constexpr bool CHECK_ORIENTATION = true; TetrahedronType tet(PointType {0.5, 0.5, 0.5}, PointType {1, 1, 0}, @@ -1003,18 +1009,18 @@ TEST(primal_clip, oct_tet_clip_special_case_1) EXPECT_NEAR(0.0251, octPoly.volume(), EPS); - PolyhedronType poly = axom::primal::clip(oct, tet, EPS, CHECK_SIGN); + PolyhedronType poly = axom::primal::clip(oct, tet, EPS, CHECK_ORIENTATION); EXPECT_NEAR(0.0041, poly.volume(), EPS); EXPECT_NEAR( 0.0041, - axom::primal::intersection_volume(oct, tet, EPS, CHECK_SIGN), + axom::primal::intersection_volume(oct, tet, EPS, CHECK_ORIENTATION), EPS); EXPECT_NEAR( 0.0041, - axom::primal::intersection_volume(tet, oct, EPS, CHECK_SIGN), + axom::primal::intersection_volume(tet, oct, EPS, CHECK_ORIENTATION), EPS); - EXPECT_NEAR(axom::primal::clip(tet, oct, EPS, CHECK_SIGN).volume(), + EXPECT_NEAR(axom::primal::clip(tet, oct, EPS, CHECK_ORIENTATION).volume(), poly.volume(), EPS); } @@ -1023,7 +1029,7 @@ TEST(primal_clip, oct_tet_clip_special_case_2) { using namespace Primal3D; constexpr double EPS = 1e-4; - constexpr bool CHECK_SIGN = true; + constexpr bool CHECK_ORIENTATION = true; TetrahedronType tet(PointType {0.5, 0.5, 0.5}, PointType {0, 1, 0}, @@ -1056,18 +1062,18 @@ TEST(primal_clip, oct_tet_clip_special_case_2) EXPECT_NEAR(0.0251, octPoly.volume(), EPS); - PolyhedronType poly = axom::primal::clip(oct, tet, EPS, CHECK_SIGN); + PolyhedronType poly = axom::primal::clip(oct, tet, EPS, CHECK_ORIENTATION); EXPECT_NEAR(0.0041, poly.volume(), EPS); EXPECT_NEAR( 0.0041, - axom::primal::intersection_volume(oct, tet, EPS, CHECK_SIGN), + axom::primal::intersection_volume(oct, tet, EPS, CHECK_ORIENTATION), EPS); EXPECT_NEAR( 0.0041, - axom::primal::intersection_volume(tet, oct, EPS, CHECK_SIGN), + axom::primal::intersection_volume(tet, oct, EPS, CHECK_ORIENTATION), EPS); - EXPECT_NEAR(axom::primal::clip(tet, oct, EPS, CHECK_SIGN).volume(), + EXPECT_NEAR(axom::primal::clip(tet, oct, EPS, CHECK_ORIENTATION).volume(), poly.volume(), EPS); } @@ -1227,7 +1233,7 @@ TEST(primal_clip, tet_tet_clip_split) { using namespace Primal3D; constexpr double EPS = 1e-4; - constexpr bool CHECK_SIGN = true; + constexpr bool CHECK_ORIENTATION = true; TetrahedronType tet(PointType {0.5, 0.5, 2}, PointType {2, -1, 0}, @@ -1257,7 +1263,7 @@ TEST(primal_clip, tet_tet_clip_split) for(int i = 0; i < split_tets.size(); i++) { tet_volumes += - (axom::primal::clip(split_tets[i], tet, EPS, CHECK_SIGN)).volume(); + (axom::primal::clip(split_tets[i], tet, EPS, CHECK_ORIENTATION)).volume(); } // Expected result should still be 0.3333 @@ -1268,7 +1274,7 @@ TEST(primal_clip, tet_tet_clip_special_case_1) { using namespace Primal3D; constexpr double EPS = 1e-10; - constexpr bool CHECK_SIGN = true; + constexpr bool CHECK_ORIENTATION = true; // Tets do not intersect, but share a face TetrahedronType tet1(PointType {0.5, 0.5, -0.125}, @@ -1281,16 +1287,16 @@ TEST(primal_clip, tet_tet_clip_special_case_1) PointType {0.125, 0, -0.25}, PointType {0.125, 0.0625, -0.234375}); - PolyhedronType poly = axom::primal::clip(tet1, tet2, EPS, CHECK_SIGN); + PolyhedronType poly = axom::primal::clip(tet1, tet2, EPS, CHECK_ORIENTATION); EXPECT_NEAR(0.00, poly.volume(), EPS); EXPECT_NEAR( 0.00, - axom::primal::intersection_volume(tet2, tet1, EPS, CHECK_SIGN), + axom::primal::intersection_volume(tet2, tet1, EPS, CHECK_ORIENTATION), EPS); EXPECT_NEAR( 0.00, - axom::primal::intersection_volume(tet1, tet2, EPS, CHECK_SIGN), + axom::primal::intersection_volume(tet1, tet2, EPS, CHECK_ORIENTATION), EPS); } diff --git a/src/axom/primal/tests/primal_tetrahedron.cpp b/src/axom/primal/tests/primal_tetrahedron.cpp index 48601c1551..470e1c87f6 100644 --- a/src/axom/primal/tests/primal_tetrahedron.cpp +++ b/src/axom/primal/tests/primal_tetrahedron.cpp @@ -625,7 +625,7 @@ TEST_F(TetrahedronTest, regularTetrahedron) } } -TEST_F(TetrahedronTest, checkSign) +TEST_F(TetrahedronTest, checkAndFixOrientation) { using QPoint = TetrahedronTest::QPoint; using QTet = TetrahedronTest::QTet; @@ -643,15 +643,16 @@ TEST_F(TetrahedronTest, checkSign) QTet tetPermuted = QTet(tet[indices[0]], tet[indices[1]], tet[indices[2]], tet[indices[3]]); - double preCheckVolume = tetPermuted.volume(); + double preCheckAbsoluteVolume = tetPermuted.volume(); tetPermuted.checkAndFixOrientation(); - EXPECT_NEAR(expVolume, tetPermuted.signedVolume(), this->EPS); + + double postCheckAbsoluteVolume = tetPermuted.volume(); + + EXPECT_NEAR(expVolume, postCheckAbsoluteVolume, this->EPS); // Verify absolute value of volume is still the same - EXPECT_NEAR(axom::utilities::abs(preCheckVolume), - tetPermuted.signedVolume(), - this->EPS); + EXPECT_NEAR(preCheckAbsoluteVolume, postCheckAbsoluteVolume, this->EPS); } while(std::next_permutation(indices, indices + QTet::NUM_VERTS)); } diff --git a/src/axom/quest/IntersectionShaper.hpp b/src/axom/quest/IntersectionShaper.hpp index 400f4d09ae..31a38074c0 100644 --- a/src/axom/quest/IntersectionShaper.hpp +++ b/src/axom/quest/IntersectionShaper.hpp @@ -912,7 +912,7 @@ class IntersectionShaper : public Shaper " Calculating element overlap volume from each tet-shape pair ")); constexpr double EPS = 1e-10; - constexpr bool checkSign = true; + constexpr bool tryFixOrientation = true; AXOM_PERF_MARK_SECTION( "tet_shape_volume", @@ -926,7 +926,7 @@ class IntersectionShaper : public Shaper PolyhedronType poly = primal::clip(shapes_view[shapeIndex], tets_from_hexes_view[tetIndex], EPS, - checkSign); + tryFixOrientation); // Poly is valid if(poly.numVertices() >= 4) From ed1274f3a4f93922b2703b8b55a5550cfa1eee39 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 13 Nov 2023 11:00:36 -0800 Subject: [PATCH 212/639] wording on sign --- src/axom/primal/geometry/Polyhedron.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp index 5f30ce24dc..52b18473cd 100644 --- a/src/axom/primal/geometry/Polyhedron.hpp +++ b/src/axom/primal/geometry/Polyhedron.hpp @@ -673,7 +673,7 @@ class Polyhedron * * \param [in] hex The hexahedron * \param [in] tryFixOrientation If true, checks if the signed volume of the - * Polyhedron is positive and swaps the order of some vertices + * Polyhedron is negative and swaps the order of some vertices * in that shape to try to obtain a nonnegative signed volume. * Defaults to false. * @@ -751,7 +751,7 @@ class Polyhedron * * \param [in] oct The octahedron * \param [in] tryFixOrientation If true, checks if the signed volume of the - * Polyhedron is positive and swaps the order of some vertices + * Polyhedron is negative and swaps the order of some vertices * in that shape to try to obtain a nonnegative signed volume. * Defaults to false. * @@ -827,7 +827,7 @@ class Polyhedron * * \param [in] tet The tetrahedron * \param [in] tryFixOrientation If true, checks if the signed volume of the - * Polyhedron is positive and swaps the order of some vertices + * Polyhedron is negative and swaps the order of some vertices * in that shape to try to obtain a nonnegative signed volume. * Defaults to false. * From 84fb6e9eb69925cd23c2ff7be2c86ff9a8046ad7 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 14 Nov 2023 15:04:59 -0800 Subject: [PATCH 213/639] Update release notes --- RELEASE-NOTES.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 80fb3b9063..44a040f7af 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -20,6 +20,11 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ ## [Unreleased] - Release date yyyy-mm-dd ### Added +- Primal: Adds a `Quadrilateral` primitive +- Primal: Adds a `compute_bounding_box()` operator for computing the bounding + box of a `Quadrilateral` +- Primal: Adds a `clip()` operator for clipping a tetrahedron against the + half-space defined by a plane - Primal: Adds a `checkAndFixOrientation()` function to `primal::Tetrahedron` that swaps the order of vertices if the signed volume of the Tetrahedron is negative, resulting in the signed volume becoming positive. @@ -36,11 +41,6 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ returns the signed volume. - Primal: `intersection_volume()` operators changed from returning a signed volume to an unsigned volume. -- Primal: Adds a `Quadrilateral` primitive -- Primal: Adds a `compute_bounding_box()` operator for computing the bounding - box of a `Quadrilateral` -- Primal: Adds a `clip()` operator for clipping a tetrahedron against the - half-space defined by a plane ### Fixed - quest's `SamplingShaper` now properly handles material names containing underscores From 6379307c9fc15fd7ced5b0993d30922215abd3d2 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 16 Nov 2023 14:00:27 -0800 Subject: [PATCH 214/639] Add a convenience method to convert an Array to a StackArray. --- src/axom/core/Array.hpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index dc79c623a6..a63ab9bec3 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -344,6 +344,23 @@ class Array : public ArrayBase> /// @} + /*! + @brief Convert 1D Array into a StackArray. + */ + template + AXOM_HOST_DEVICE inline + typename std::enable_if>::type + to_stack_array() const + { + axom::StackArray rval; + IndexType copyCount = LENGTH1D <= m_num_elements ? LENGTH1D : m_num_elements; + for(IndexType i = 0; i < copyCount; ++i) + { + rval[i] = m_data[i]; + } + return rval; + } + /// @} /// \name Array methods to modify the data. From e52523dadc52cd9e411790ba32cf2c65bcc58586 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 16 Nov 2023 14:03:01 -0800 Subject: [PATCH 215/639] Silence a Python warning and add verbose flag to script. --- src/tools/gen-multidom-structured-mesh.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/tools/gen-multidom-structured-mesh.py b/src/tools/gen-multidom-structured-mesh.py index 34c398ce4b..432f7c8cf0 100755 --- a/src/tools/gen-multidom-structured-mesh.py +++ b/src/tools/gen-multidom-structured-mesh.py @@ -34,8 +34,9 @@ def f_c(s): ps.add_argument('-dc', type=i_c, default=(1,1), help='Domain counts in each index direction') ps.add_argument('-o', '--output', type=str, default='mdmesh', help='Output file base name') ps.add_argument('--strided', action='store_true', help='Use strided_structured (has ghosts)') +ps.add_argument('-v', '--verbose', action='store_true', help='Print additional info') opts,unkn = ps.parse_known_args() -print(opts, unkn) +if(opts.verbose): print(opts, unkn) if(unkn): print("Unrecognized arguments:", *unkn) quit(1) @@ -62,9 +63,8 @@ def f_c(s): def scale_structured_domain(n, startCoord, endCoord): '''This function scales and shifts a blueprint structured domain after it has been created. There's no way to specify the physical extent - of a domain using conduit.blueprint.mesh.examples.basic, as far as I - can tell. - + of a domain using conduit.blueprint.mesh.examples methods, as far as + I can tell. ''' #print(f'Rescaling to {startCoord} -> {endCoord}') @@ -115,8 +115,8 @@ def scale_structured_domain(n, startCoord, endCoord): meshUpper = opts.mu # Convert to np.array to use element-wise arithmetic. -domCounts = np.array(domCounts, dtype=np.int) -meshSize = np.array(meshSize, dtype=np.int) +domCounts = np.array(domCounts, dtype=np.int32) +meshSize = np.array(meshSize, dtype=np.int64) meshLower = np.array(meshLower) meshUpper = np.array(meshUpper) @@ -125,7 +125,9 @@ def scale_structured_domain(n, startCoord, endCoord): domSize = meshSize//domCounts[:dim] domSizeRem = meshSize % domCounts[:dim] -print(f'meshSize={meshSize} cells, domCounts={domCounts} domSize={domSize} domSizeRem={domSizeRem}') +if opts.verbose: + print(f'meshSize={meshSize} cells, domCounts={domCounts[0:dim]}' + f' domSize={domSize} domSizeRem={domSizeRem}') def domain_index_begin(di, dj, dk=None): '''Compute first cell index of the domain with multi-dimensional index (di, dj, dk).''' @@ -174,9 +176,10 @@ def domain_index_begin(di, dj, dk=None): domLower = meshLower[:dim] + cellStart * cellPhysicalSize[:dim] domUpper = meshLower[:dim] + cellEnd * cellPhysicalSize[:dim] scale_structured_domain(dom, domLower, domUpper) - #print(dom) + # if opts.verbose: print(f'Domain [{di},{dj},{dk}]: {dom}') -#print('mdMesh:'); print(mdMesh) +if opts.verbose: + print('mdMesh:'); print(mdMesh) info = conduit.Node() if not conduit.blueprint.mesh.verify(mdMesh, info): From 14682c006eb6d3659f6797789ce749773846418c Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 16 Nov 2023 14:04:02 -0800 Subject: [PATCH 216/639] Add test for MeshViewUtil class. The class was refactored and had bug fixes in the process. --- src/axom/quest/MeshViewUtil.hpp | 598 +++++++------ src/axom/quest/detail/MarchingCubesImpl.hpp | 2 +- .../examples/quest_marching_cubes_example.cpp | 6 - src/axom/quest/tests/CMakeLists.txt | 26 + src/axom/quest/tests/quest_array_indexer.cpp | 5 +- src/axom/quest/tests/quest_mesh_view_util.cpp | 796 ++++++++++++++++++ 6 files changed, 1144 insertions(+), 289 deletions(-) create mode 100644 src/axom/quest/tests/quest_mesh_view_util.cpp diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index d671ff7a35..0def6ef538 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -32,8 +32,6 @@ namespace quest { namespace internal { -template -constexpr T BADINDEX = std::numeric_limits::max(); template inline axom::StackArray makeStackArray(T v = std::numeric_limits::max()) { @@ -54,12 +52,138 @@ inline axom::StackArray makeStackArray(const U* v) } return rval; } +template +static inline T product(const axom::StackArray& a) +{ + T prod = a[0]; + for(int d = 1; d < DIM; ++d) + { + prod *= a[d]; + } + return prod; +} + +//@{ +//!@name Conversions between shape specifications and strides-and-offsets. +/*! + @brief Convert shape specifications to blueprint-style + offsets and strides. + + @tparam IType Index type + @tparam DIM Spatial dimension + + @param realShape [i] + @param loPads [i] Ghost padding amount on low side. + @param hiPads [i] Ghost padding amount ont high side. + @param strideOrder [i] Fastest-to-slowest advancing + index directions. + @param minStride [i] Stride of fastest advancing + index direction. + @param offsets [o] Blueprint-style index offsets. + @param strides [o] Blueprint-style strides. + @param valuesCount [o] Number of values in + ghost-padded data. +*/ +template +static void shapesToStridesAndOffsets( + const axom::StackArray& realShape, + const axom::StackArray& loPads, + const axom::StackArray& hiPads, + const axom::StackArray& strideOrder, + IndexType minStride, + axom::StackArray& offsets, + axom::StackArray& strides, + IndexType& valuesCount) +{ + axom::StackArray paddedShape; + for(int d = 0; d < DIM; ++d) + { + offsets[d] = loPads[d]; + paddedShape[d] = realShape[d] + loPads[d] + hiPads[d]; + } + + strides[strideOrder[0]] = minStride; + for(int nd = 1; nd < DIM; ++nd) + { + const int& curDir = strideOrder[nd]; + const int& prevDir = strideOrder[nd - 1]; + strides[curDir] = strides[prevDir] * paddedShape[prevDir]; + } + auto slowestDir = strideOrder[DIM - 1]; + valuesCount = strides[slowestDir] * paddedShape[slowestDir]; +} + +/*! + @brief Convert blueprint-style offsets and strides to + shape specifications. + + @tparam IType Index type + @tparam DIM Spatial dimension + + @param realShape [i] + @param offsets [i] Blueprint-style index offsets. + @param strides [i] Blueprint-style strides. + @param valuesCount [i] Number of values in + ghost-padded data. + @param paddedShape [o] \a realShape + \a loPads + \a hiPads + @param loPads [o] Ghost padding amount on low side. + @param hiPads [o] Ghost padding amount ont high side. + @param minStride [i] Stride of fastest advancing + index direction. + @param strideOrder [i] Fastest-to-slowest advancing + index directions. +*/ +template +static void stridesAndOffsetsToShapes(const axom::StackArray& realShape, + const axom::StackArray& offsets, + const axom::StackArray& strides, + const IndexType& valuesCount, + axom::StackArray& paddedShape, + axom::StackArray& loPads, + axom::StackArray& hiPads, + axom::StackArray& strideOrder) +{ + // Sort directions from fastest to slowest. + for(int d = 0; d < DIM; ++d) + { + strideOrder[d] = d; + } + for(int s = 0; s < DIM; ++s) + { + for(int d = s; d < DIM; ++d) + { + if(strides[strideOrder[d]] < strides[strideOrder[s]]) + { + std::swap(strideOrder[s], strideOrder[d]); + } + } + } + + for(int nd = 0; nd < DIM - 1; ++nd) + { + const int& curDir = strideOrder[nd]; + const int& nextDir = strideOrder[nd + 1]; + paddedShape[curDir] = strides[nextDir] / strides[curDir]; + } + paddedShape[strideOrder[DIM - 1]] = valuesCount / strides[strideOrder[DIM - 1]]; + + for(int d = 0; d < DIM; ++d) + { + loPads[d] = offsets[d]; + hiPads[d] = paddedShape[d] - realShape[d] - loPads[d]; + } +} +//@} + } // namespace internal /** \brief Utility for high-level access into a blueprint mesh, for structured mesh with explicit coordinates. + Note: This class was written for a specific use and is not as + general as it may seem. + Blueprint mesh data is sufficient but sparse, leaving users to compute a number of intermediate data to get to high-level data of interest, such as views into array data. This class @@ -82,6 +206,7 @@ template class MeshViewUtil { public: + using MdIndices = axom::StackArray; using CoordsViewsType = axom::StackArray, DIM>; using ConstCoordsViewsType = @@ -90,12 +215,12 @@ class MeshViewUtil //@{ //@name Setting up /*! - @brief Constructor + @brief Construct view of a non-const domain. + @param [in] bpDomain Blueprint single domain. @param [in] topologyName Name of topology in the domain. If \a topologyName is omitted, use the first topology. - The topology dimension must match DIM. */ MeshViewUtil(conduit::Node& bpDomain, const std::string& topologyName = "") @@ -130,9 +255,13 @@ class MeshViewUtil } /*! - @brief Constructor + @brief Construct view of a const domain. + @param [in] bpDomain const Blueprint single domain. @param [in] topologyName Name op topology in the domain. + + If \a topologyName is omitted, use the first topology. + The topology dimension must match DIM. */ MeshViewUtil(const conduit::Node& bpDomain, const std::string& topologyName) : m_cdom(&bpDomain) @@ -213,208 +342,85 @@ class MeshViewUtil const conduit::Node& getTopology() { return *m_topology; } const conduit::Node& getTopology() const { return *m_ctopology; } - /*! - @brief Get the coordinates conduit::Node for the named topology. - */ + //! @brief Get the coordinates conduit::Node for the named topology. conduit::Node& getCoordSet() { return *m_coordset; } const conduit::Node& getCoordSet() const { return *m_ccoordset; } - /*! - @brief Get the spatial dimension of the named topology. - */ + //! @brief Get the spatial dimension of the named topology. conduit::index_t getTopologyDim() const { return DIM; } //@} //@{ - //!@name Sizes and shapes - /*! - @brief Get the number of cells in each direction of a blueprint single domain. + //!@name General sizes and shapes of domain - @param domId Index of domain - @lengths Space for dimension() numbers. - */ - axom::StackArray getDomainShape() const + //! @brief Get the number of cells in each direction of the domain. + MdIndices getCellShape() const { return m_cellShape; } + + //! @brief Get the number of nodes in each direction of the domain. + MdIndices getNodeShape() const { return m_nodeShape; } + + //! @brief Return number of (real) cells. + axom::IndexType getCellCount() const { - const conduit::Node& dimsNode = - m_ctopology->fetch_existing("elements/dims"); - axom::StackArray rval; - for(int i = 0; i < DIM; ++i) - { - rval[i] = dimsNode[i].as_int(); - } - return rval; + return axom::quest::internal::product(m_cellShape); + } + + //! @brief Return number of (real) nodes. + axom::IndexType getNodeCount() const + { + return axom::quest::internal::product(m_nodeShape); } //! @brief Return the real (ghost-free) extents of mesh data. - axom::StackArray getRealExtents(const std::string& association) + MdIndices getRealExtents(const std::string& association) { - axom::StackArray rval = getDomainShape(); if(association == "vertex") { - for(int d = 0; d < DIM; ++d) - { - ++rval[d]; - } + return m_nodeShape; } else if(association == "element") { - // Nothing to do. - } - else - { - SLIC_ERROR( - axom::fmt::format("MeshVieuUtil only supports element and vertex data " - "association for now, not '{}'.", - association)); + return m_cellShape; } - return rval; - } + SLIC_ERROR( + axom::fmt::format("MeshVieuUtil only supports element and vertex data " + "association for now, not '{}'.", + association)); - /*! - @brief Return number of points, excluding ghosts. - */ - axom::IndexType getCoordsCount() const - { - auto domainShape = getDomainShape(); - axom::IndexType rval = 0; - for(int d = 0; d < DIM; ++d) - { - rval += 1 + domainShape[d]; - } - return rval; + return MdIndices {}; } + //@} + + //@{ + //! @name Coordinates and field data sizes and shapes. /*! @brief Return the array strides for ghost-free nodal coordinates. */ - axom::StackArray getCoordsStrides() const - { - return m_coordsStrides; - } + MdIndices getCoordsStrides() const { return m_coordsStrides; } /*! @brief Return the array index offsets for ghost-free nodal coordinates. */ - axom::StackArray getCoordsOffsets() const - { - return m_coordsOffsets; - } + MdIndices getCoordsOffsets() const { return m_coordsOffsets; } - /*! - @brief Return number of points, including ghosts. - */ + //! @brief Return number of points, excluding ghosts. + axom::IndexType getCoordsCount() const { return getNodeCount(); } + + //! @brief Return number of points, including ghosts. axom::IndexType getCoordsCountWithGhosts() const { const conduit::Node& valuesNode = m_ccoordset->fetch_existing("values"); axom::IndexType rval = valuesNode[0].dtype().number_of_elements(); return rval; } - - /*! - @brief Return coordinates data allocated shape of coords data, - (includes ghosts). - */ - axom::StackArray getCoordsShapeWithGhosts() const - { - const conduit::Node& valuesNode = getCoordSet().fetch_existing("values"); - const axom::IndexType coordValuesCount = - valuesNode[0].dtype().number_of_elements(); - - // Shape of allocated memory, including ghosts. - axom::StackArray memShape; - - auto stridesPtr = getCoordsStridesPtr(); - if(stridesPtr) - { - axom::StackArray strides; - for(int d = 0; d < DIM; ++d) - { - strides[d] = stridesPtr[d]; - memShape[d] = - (d < DIM - 1 ? stridesPtr[d + 1] : coordValuesCount) / stridesPtr[d]; - } - } - else - { - // No strides implies no ghosts, so memory shape is domain shape. - memShape = getDomainShape(); - for(int d = 0; d < DIM; ++d) - { - memShape[d] += 1; - } - } - return memShape; - } - - /*! - @brief Get the strides of the coordindates data for the - named topology. If no strides, return null. - */ - const conduit::int32* getCoordsStridesPtr() const - { - const conduit::Node& topologyDims = - m_ctopology->fetch_existing("elements/dims"); - const conduit::int32* rval = nullptr; - if(topologyDims.has_child("strides")) - { - rval = topologyDims.fetch_existing("strides").as_int32_ptr(); - } - return rval; - } - - /*! - @brief Return number of points, including ghosts. - */ - axom::IndexType getFieldCountWithGhosts(const std::string& fieldName) const - { - const conduit::Node& valuesNode = - m_cdom->fetch_existing("field/" + fieldName + "values"); - axom::IndexType rval = valuesNode.dtype().number_of_elements(); - return rval; - } - - /*! - @brief Get the strides of a named Blueprint field. - If strides are not specified, assume direction 0 is - fastest (Conduit's default striding). - */ - axom::StackArray getFieldStrides( - const std::string& fieldName) const - { - const conduit::Node& fieldNode = m_dom->fetch_existing("fields/" + fieldName); - const bool atVertex = - fieldNode.fetch_existing("association").as_string() == "vertex"; - const conduit::int32* stridesPtr = fieldNode.has_child("strides") - ? fieldNode.fetch_existing("strides").as_int32_ptr() - : nullptr; - - axom::StackArray rval; - if(stridesPtr) - { - for(int d = 0; d < DIM; ++d) - { - rval[d] = stridesPtr[d]; - } - } - else - { - auto domainShape = getDomainShape(); - axom::IndexType tmpStride = 1; - for(int d = 0; d < DIM; ++d) - { - rval[d] = tmpStride; - tmpStride *= domainShape[d] + atVertex; - } - } - return rval; - } //@} //@{ - //!@name Data views + //!@name Coords and data views //!@brief Return the views of the DIM coordinates component data. CoordsViewsType getCoordsViews(bool withGhosts = false) @@ -425,22 +431,18 @@ class MeshViewUtil { auto* dataPtr = valuesNode[d].as_double_ptr(); rval[d] = axom::ArrayView(dataPtr, - m_coordsMemShape, + m_coordsPaddedShape, m_coordsStrides); } if(withGhosts == false) { - axom::StackArray offsets = - conduitIndicesToMultidimIndices( - m_ctopology->fetch_existing("elements/dims"), - "offsets", - 0); - axom::StackArray counts = m_domainShape; - for(int d = 0; d < DIM; ++d) - { - ++counts[d]; - } + // Compute a view without ghosts. + MdIndices offsets = + conduitIndicesToStackArray(m_ctopology->fetch_existing("elements/dims"), + "offsets", + 0); + MdIndices counts = m_nodeShape; for(int d = 0; d < DIM; ++d) { auto rval1 = rval[d]; @@ -460,18 +462,17 @@ class MeshViewUtil { auto* dataPtr = valuesNode[d].as_double_ptr(); rval[d] = axom::ArrayView(dataPtr, - m_coordsMemShape, + m_coordsPaddedShape, m_coordsStrides); } if(withGhosts == false) { - axom::StackArray offsets = - conduitIndicesToMultidimIndices( - m_ctopology->fetch_existing("elements/dims"), - "offsets", - 0); - axom::StackArray counts = m_domainShape; + MdIndices offsets = + conduitIndicesToStackArray(m_ctopology->fetch_existing("elements/dims"), + "offsets", + 0); + MdIndices counts = m_cellShape; for(int d = 0; d < DIM; ++d) { ++counts[d]; @@ -517,48 +518,46 @@ class MeshViewUtil "MeshViewUtil only supports vertex and element-based fields right now."); const bool onVertex = association == "vertex"; - axom::StackArray strides = - conduitIndicesToMultidimIndices(fieldNode, "strides"); - if(fieldNode.has_child("strides")) + const auto& realShape = onVertex ? m_nodeShape : m_cellShape; + + MdIndices strides = conduitIndicesToStackArray(fieldNode, "strides"); + if(!fieldNode.has_child("strides")) { - const conduit::int32* stridesPtr = - fieldNode.fetch_existing("strides").as_int32_ptr(); + axom::IndexType tmpStride = 1; for(int d = 0; d < DIM; ++d) { - strides[d] = stridesPtr[d]; + strides[d] = tmpStride; + tmpStride *= m_cellShape[d] + onVertex; } } - else + + MdIndices offsets = conduitIndicesToStackArray(fieldNode, "offsets"); + if(!fieldNode.has_child("offsets")) { - axom::IndexType tmpStride = 1; for(int d = 0; d < DIM; ++d) { - strides[d] = tmpStride; - tmpStride *= m_domainShape[d] + onVertex; + offsets[d] = 0; } } - axom::StackArray shape; - for(int d = 0; d < DIM - 1; ++d) - { - shape[d] = strides[d + 1] / strides[d]; - } - shape[DIM - 1] = valuesCount / strides[DIM - 1]; + MdIndices loPads, hiPads, paddedShape, strideOrder; + axom::quest::internal::stridesAndOffsetsToShapes(realShape, + offsets, + strides, + valuesCount, + paddedShape, + loPads, + hiPads, + strideOrder); T* dataPtr = static_cast(valuesNode.data_ptr()); - axom::ArrayView rval(dataPtr, shape, strides); + axom::ArrayView rval(dataPtr, paddedShape, strides); if(withGhosts == false) { - axom::StackArray offsets = - conduitIndicesToMultidimIndices(fieldNode, "offsets", 0); - axom::StackArray counts = m_domainShape; - for(int d = 0; d < DIM; ++d) - { - counts[d] += onVertex; - } + MdIndices offsets = conduitIndicesToStackArray(fieldNode, "offsets", 0); auto rval1 = rval; - rval = rval1.subspan(offsets, counts); + rval = rval1.subspan(offsets, realShape); } return rval; @@ -591,48 +590,46 @@ class MeshViewUtil "MeshViewUtil only supports vertex and element-based fields right now."); const bool onVertex = association == "vertex"; - axom::StackArray strides = - conduitIndicesToMultidimIndices(fieldNode, "strides"); - if(fieldNode.has_child("strides")) + const auto& realShape = onVertex ? m_nodeShape : m_cellShape; + + MdIndices strides = conduitIndicesToStackArray(fieldNode, "strides"); + if(!fieldNode.has_child("strides")) { - const conduit::int32* stridesPtr = - fieldNode.fetch_existing("strides").as_int32_ptr(); + axom::IndexType tmpStride = 1; for(int d = 0; d < DIM; ++d) { - strides[d] = stridesPtr[d]; + strides[d] = tmpStride; + tmpStride *= m_cellShape[d] + onVertex; } } - else + + MdIndices offsets = conduitIndicesToStackArray(fieldNode, "offsets"); + if(!fieldNode.has_child("offsets")) { - axom::IndexType tmpStride = 1; for(int d = 0; d < DIM; ++d) { - strides[d] = tmpStride; - tmpStride *= m_domainShape[d] + onVertex; + offsets[d] = 0; } } - axom::StackArray shape; - for(int d = 0; d < DIM - 1; ++d) - { - shape[d] = strides[d + 1] / strides[d]; - } - shape[DIM - 1] = valuesCount / strides[DIM - 1]; + MdIndices loPads, hiPads, paddedShape, strideOrder; + axom::quest::internal::stridesAndOffsetsToShapes(realShape, + offsets, + strides, + valuesCount, + paddedShape, + loPads, + hiPads, + strideOrder); const T* dataPtr = static_cast(valuesNode.data_ptr()); - axom::ArrayView rval(dataPtr, shape, strides); + axom::ArrayView rval(dataPtr, paddedShape, strides); if(withGhosts == false) { - axom::StackArray offsets = - conduitIndicesToMultidimIndices(fieldNode, "offsets", 0); - axom::StackArray counts = m_domainShape; - for(int d = 0; d < DIM; ++d) - { - counts[d] += onVertex; - } + MdIndices offsets = conduitIndicesToStackArray(fieldNode, "offsets", 0); auto rval1 = rval; - rval = rval1.subspan(offsets, counts); + rval = rval1.subspan(offsets, realShape); } return rval; @@ -644,33 +641,54 @@ class MeshViewUtil /*! @brief Create a new scalar nodal data field. + @param [in] fieldName @param [in] association "vertex" or "element" @param [in] dtype Conduit data type to put in the field. Must be at least - big enough for the strides specified. + big enough for the strides and offsets specified. @param [in] strides Data strides. Set to zero for no ghosts and default strides. - @param [in] offsets Data index offsets. + @param [in] offsets Data index offsets. Set to zero for no ghosts. Field data allocation is done by Conduit, so the data lives in host memory. Conduit currently doesn't provide a means to allocate the array in device memory. + + Creating a field with given strides and offsets may only be useful + for matching the strides and offsets of existing data. It's more + natural to create the field based on ghost layer thickness and + index advancement order (row-major, column-major or some other). + That is easy to do, but we don't have a use case yet. */ void createField(const std::string& fieldName, const std::string& association, const conduit::DataType& dtype, - const axom::StackArray& strides, - const axom::StackArray& offsets) + const MdIndices& strides, + const MdIndices& offsets) { - if(m_dom->has_path("fields/" + fieldName)) - { - SLIC_ERROR( - axom::fmt::format("Cannot create field {}. It already exists.", - fieldName)); - } - if(association != "vertex" && association != "element") + SLIC_ERROR_IF( + m_dom->has_path("fields/" + fieldName), + axom::fmt::format("Cannot create field {}. It already exists.", fieldName)); + + SLIC_ERROR_IF( + association != "vertex" && association != "element", + axom::fmt::format("Not yet supporting association '{}'.", association)); + + const auto& realShape = association == "element" ? m_cellShape : m_nodeShape; + MdIndices loPads, hiPads, paddedShape, strideOrder; + axom::quest::internal::stridesAndOffsetsToShapes(realShape, + offsets, + strides, + dtype.number_of_elements(), + paddedShape, + loPads, + hiPads, + strideOrder); + for(int d = 0; d < DIM; ++d) { - SLIC_ERROR( - axom::fmt::format("Not yet supporting association '{}'.", association)); + SLIC_ERROR_IF(offsets[d] < 0 || offsets[d] > paddedShape[d] - 1, + axom::fmt::format("Bad offsets {} for paddedShape {}", + offsets, + paddedShape)); } auto realExtents = getRealExtents(association); @@ -681,7 +699,7 @@ class MeshViewUtil { fieldNode["strides"].set(conduit::DataType::int32(DIM)); - std::int32_t* tmpPtr = fieldNode["strides"].as_int32_ptr(); + auto* tmpPtr = fieldNode["strides"].as_int32_ptr(); for(int d = 0; d < DIM; ++d) { tmpPtr[d] = strides[d]; @@ -690,21 +708,14 @@ class MeshViewUtil { fieldNode["offsets"].set(conduit::DataType::int32(DIM)); - std::int32_t* tmpPtr = fieldNode["offsets"].as_int32_ptr(); + auto* tmpPtr = fieldNode["offsets"].as_int32_ptr(); for(int d = 0; d < DIM; ++d) { tmpPtr[d] = offsets[d]; } } - axom::IndexType slowDir = 0; - for(int d = 0; d < DIM; ++d) - { - if(strides[slowDir] < strides[d]) - { - slowDir = d; - } - } + axom::IndexType slowDir = strideOrder[DIM - 1]; auto extras = dtype.number_of_elements() - strides[slowDir] * (offsets[slowDir] + realExtents[slowDir]); if(extras < 0) @@ -727,20 +738,35 @@ class MeshViewUtil const conduit::Node* m_ccoordset = nullptr; std::string m_topologyName; - axom::StackArray m_domainShape; - axom::StackArray m_coordsStrides; - axom::StackArray m_coordsOffsets; - axom::StackArray m_coordsMemShape; + MdIndices m_cellShape; + MdIndices m_nodeShape; - axom::StackArray conduitIndicesToMultidimIndices( + MdIndices m_coordsStrides; + MdIndices m_coordsOffsets; + MdIndices m_coordsPaddedShape; + + MdIndices conduitIndicesToStackArray( const conduit::Node& node, const std::string& path, axom::IndexType defaultVal = std::numeric_limits::max()) const { if(node.has_path(path)) { - const auto* ptr = node.fetch_existing(path).as_int32_ptr(); - return internal::makeStackArray(ptr); + const auto& child = node.fetch_existing(path); + if(child.dtype().is_int32()) + { + const auto* ptr = node.fetch_existing(path).as_int32_ptr(); + return internal::makeStackArray(ptr); + } + else if(child.dtype().is_int64()) + { + const auto* ptr = node.fetch_existing(path).as_int64_ptr(); + return internal::makeStackArray(ptr); + } + else + { + SLIC_ERROR("MeshViewUtil internal error: Unanticipated type."); + } } return internal::makeStackArray(defaultVal); } @@ -763,35 +789,49 @@ class MeshViewUtil for(int i = 0; i < DIM; ++i) { - m_domainShape[i] = topologyDims[i].as_int(); + m_cellShape[i] = topologyDims[i].value(); + m_nodeShape[i] = m_cellShape[i] + 1; } - m_coordsOffsets = conduitIndicesToMultidimIndices(topologyDims, "offsets", 0); + m_coordsOffsets = conduitIndicesToStackArray(topologyDims, "offsets", 0); + m_coordsStrides = conduitIndicesToStackArray(topologyDims, "strides", -1); - if(topologyDims.has_child("strides")) - { - const auto* stridesPtr = - topologyDims.fetch_existing("strides").as_int32_ptr(); - for(int d = 0; d < DIM; ++d) - { - m_coordsStrides[d] = stridesPtr[d]; - } - } - else + if(!topologyDims.has_child("strides")) { + // Compute strides manually, assuming (as Conduit does) that + // direction 0 is fastest. axom::IndexType tmpStride = coordsAreInterleaved ? DIM : 1; for(int d = 0; d < DIM; ++d) { m_coordsStrides[d] = tmpStride; - tmpStride *= 1 + m_domainShape[d]; + tmpStride *= 1 + m_cellShape[d]; } } - for(int d = 0; d < DIM - 1; ++d) + // Compute the padded shape of coords data. + MdIndices loPads; + MdIndices hiPads; + MdIndices strideOrder; + axom::quest::internal::stridesAndOffsetsToShapes(m_nodeShape, + m_coordsOffsets, + m_coordsStrides, + coordValuesCount, + m_coordsPaddedShape, + loPads, + hiPads, + strideOrder); + } + + bool isEqual(const MdIndices& a, const MdIndices& b) + { + for(int d = 0; d < DIM; ++d) { - m_coordsMemShape[d] = m_coordsStrides[d + 1] / m_coordsStrides[d]; + if(a[d] != b[d]) + { + return false; + } } - m_coordsMemShape[DIM - 1] = coordValuesCount / m_coordsStrides[DIM - 1]; + return true; } }; diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index b729c490c7..13282cb700 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -80,7 +80,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::quest::MeshViewUtil mvu(dom, topologyName); - m_bShape = mvu.getDomainShape(); + m_bShape = mvu.getCellShape(); m_coordsViews = mvu.getConstCoordsViews(false); m_fcnView = mvu.template getConstFieldView(fcnFieldName, false); if(!maskFieldName.empty()) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index ad7024378b..a0135a1e70 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -562,12 +562,6 @@ struct BlueprintStructuredMesh _coordsAreStrided = _mdMesh[0] .fetch_existing(_topologyPath + "/elements/dims") .has_child("strides"); - if(_coordsAreStrided) - { - SLIC_WARNING(axom::fmt::format( - "Mesh '{}' is strided. Stride support is under development.", - meshFilename)); - } const conduit::Node coordsetNode = _mdMesh[0].fetch_existing(_coordsetPath); _ndims = conduit::blueprint::mesh::coordset::dims(coordsetNode); } diff --git a/src/axom/quest/tests/CMakeLists.txt b/src/axom/quest/tests/CMakeLists.txt index a3c5a18377..7e4dd93a0e 100644 --- a/src/axom/quest/tests/CMakeLists.txt +++ b/src/axom/quest/tests/CMakeLists.txt @@ -56,6 +56,32 @@ if(TARGET quest_discretize_test) ) endif() +#------------------------------------------------------------------------------ +# Tests that use Conduit when available +#------------------------------------------------------------------------------ + +if(CONDUIT_FOUND AND AXOM_DATA_DIR) + axom_add_executable( + NAME quest_mesh_view_util_test + SOURCES quest_mesh_view_util.cpp + OUTPUT_DIR ${TEST_OUTPUT_DIRECTORY} + DEPENDS_ON ${quest_tests_depends} conduit + FOLDER axom/quest/tests + ) + set(quest_data_dir ${AXOM_DATA_DIR}/quest) + + # These examples currently segfault on windows without MPI when loading the test data into conduit + if(AXOM_ENABLE_TESTS AND AXOM_DATA_DIR AND NOT WIN32) + axom_add_test( + NAME quest_mesh_view_util + COMMAND quest_mesh_view_util_test + --verbose) + unset(_nranks) + unset(_test) + endif() + +endif() + #------------------------------------------------------------------------------ # Tests that use MFEM when available #------------------------------------------------------------------------------ diff --git a/src/axom/quest/tests/quest_array_indexer.cpp b/src/axom/quest/tests/quest_array_indexer.cpp index 1fce846d35..01bc68fc1d 100644 --- a/src/axom/quest/tests/quest_array_indexer.cpp +++ b/src/axom/quest/tests/quest_array_indexer.cpp @@ -360,9 +360,8 @@ TEST(quest_array_indexer, quest_arbitrary_strides) // Test column-major element offsets with Array's. TEST(quest_array_indexer, quest_array_match) { - { - // No test for 1D. Array doesn't provide non-trivial interface to test. - } + // No test for 1D. Array provides no non-trivial interface to test. + { constexpr int DIM = 2; axom::StackArray lengths {3, 2}; diff --git a/src/axom/quest/tests/quest_mesh_view_util.cpp b/src/axom/quest/tests/quest_mesh_view_util.cpp new file mode 100644 index 0000000000..a9c15835e5 --- /dev/null +++ b/src/axom/quest/tests/quest_mesh_view_util.cpp @@ -0,0 +1,796 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level COPYRIGHT file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +/*! + \file quest_mesh_view_util.cpp + \brief Test for MeshViewUtil class. +*/ + +#include "axom/config.hpp" + +// Implementation requires Conduit. +#ifdef AXOM_USE_CONDUIT + + // Axom includes + #include "axom/core.hpp" + #include "axom/slic.hpp" + #include "axom/primal.hpp" + #include "axom/quest/ArrayIndexer.hpp" + #include "axom/quest/MeshViewUtil.hpp" + #include "axom/core/Types.hpp" + + #include "conduit_blueprint.hpp" + #include "conduit_relay_io_blueprint.hpp" + + #include "axom/fmt.hpp" + #include "axom/CLI11.hpp" + + // C/C++ includes + #include + +namespace quest = axom::quest; +namespace slic = axom::slic; +namespace primal = axom::primal; +namespace numerics = axom::numerics; + +/////////////////////////////////////////////////////////////// +// converts the input string into an 80 character string +// padded on both sides with '=' symbols +std::string banner(const std::string& str) +{ + return axom::fmt::format("{:=^80}", str); +} + +/////////////////////////////////////////////////////////////// +/// Struct to parse and store the input parameters +struct Input +{ +private: + bool _verboseOutput {false}; + +public: + bool isVerbose() const { return _verboseOutput; } + + void parse(int argc, char** argv, axom::CLI::App& app) + { + app.add_flag("-v,--verbose,!--no-verbose", _verboseOutput) + ->description("Enable/disable verbose output") + ->capture_default_str(); + + app.get_formatter()->column_width(60); + + // could throw an exception + app.parse(argc, argv); + + slic::setLoggingMsgLevel(_verboseOutput ? slic::message::Debug + : slic::message::Info); + } +}; + +Input params; + +/// Utility function to initialize the logger +void initializeLogger() +{ + // Initialize Logger + slic::initialize(); + slic::setLoggingMsgLevel(slic::message::Info); + + slic::LogStream* logStream; + + std::string fmt = "[]: \n"; + logStream = new slic::GenericOutputStream(&std::cout, fmt); + + slic::addStreamToAllMsgLevels(logStream); + + conduit::utils::set_error_handler([](auto& msg, auto& file, int line) { + slic::logErrorMessage(msg, file, line); + }); + conduit::utils::set_warning_handler([](auto& msg, auto& file, int line) { + slic::logWarningMessage(msg, file, line); + }); + conduit::utils::set_info_handler([](auto& msg, auto& file, int line) { + slic::logMessage(slic::message::Info, msg, file, line); + }); +} + +/// Utility function to finalize the logger +void finalizeLogger() +{ + if(slic::isInitialized()) + { + slic::flushStreams(); + slic::finalize(); + } +} + +//! @brief Add a scalar to all elements of a StackArray. +template +axom::StackArray operator+(const axom::StackArray& rhs, U lhs) +{ + axom::StackArray ret = rhs; + for(int d = 0; d < DIM; ++d) + { + ret[d] += lhs; + } + return ret; +} + +//! @brief Add two StackArrays of the same dimension. +template +axom::StackArray operator+(const axom::StackArray& rhs, + const axom::StackArray& lhs) +{ + axom::StackArray ret = rhs; + for(int d = 0; d < DIM; ++d) + { + ret[d] += lhs[d]; + } + return ret; +} + +template +T product(const axom::StackArray& a) +{ + T ret = 1; + for(int d = 0; d < DIM; ++d) + { + ret *= a[d]; + } + return ret; +} + +template +bool isEqual(const axom::StackArray& a, const axom::StackArray& b) +{ + for(int d = 0; d < DIM; ++d) + { + if(a[d] != b[d]) + { + return false; + } + } + return true; +} + +using MVU2Type = axom::quest::MeshViewUtil<2, axom::MemorySpace::Dynamic>; +using MVU3Type = axom::quest::MeshViewUtil<3, axom::MemorySpace::Dynamic>; +using IndexCoords = axom::StackArray; + +//--------------------------------------------------------------------------- +// Create a mesh using a Conduit example. +// --------------------------------------------------------------------------- +void createConduitBlueprintDomain( + const axom::StackArray& domainShape, + const axom::StackArray& loPads, + const axom::StackArray& hiPads, + conduit::Node& domain) +{ + // Conduit's example requires int64_t inputs. + using Int64Coords = axom::StackArray; + Int64Coords elemOrigin = loPads; + Int64Coords elemPaddedShape = domainShape + loPads + hiPads; + Int64Coords vertOrigin = loPads; + Int64Coords vertPaddedShape = elemPaddedShape + 1; + Int64Coords vertShape = domainShape + 1; + conduit::Node desc; + desc["element_data/shape"].set(conduit::DataType::int64(3), elemPaddedShape); + desc["element_data/origin"].set(conduit::DataType::int64(3), elemOrigin); + desc["vertex_data/shape"].set(conduit::DataType::int64(3), vertPaddedShape); + desc["vertex_data/origin"].set(conduit::DataType::int64(3), vertOrigin); + + conduit::blueprint::mesh::examples::strided_structured(desc, + vertShape[0], + vertShape[1], + vertShape[2], + domain); + + return; +} + +template +struct ModifyNumber +{ + void operator()(T& t) const { t = 1000000 + 2 * t; } +}; + +// Check that all elements of an ArrayView can be accessed +// and found at the expected distance from the first element. +template +int testDataAccess(axom::ArrayView& da, + const std::string& daName, + const IndexCoords& strideOrder, + const FUNCTOR& functor) +{ + const auto& shape = da.shape(); + + const IndexCoords zero {0, 0, 0}; + IndexCoords ijk; + axom::IndexType& l = ijk[strideOrder[2]]; + axom::IndexType& m = ijk[strideOrder[1]]; + axom::IndexType& n = ijk[strideOrder[0]]; + + const axom::IndexType lMax = shape[strideOrder[2]]; + const axom::IndexType mMax = shape[strideOrder[1]]; + const axom::IndexType nMax = shape[strideOrder[0]]; + + int errCount = 0; + + // Check ArrayView access. + for(l = 0; l < lMax; ++l) + { + for(m = 0; m < mMax; ++m) + { + for(n = 0; n < nMax; ++n) + { + functor(da[ijk]); + } + } + } + + // Check expected monotonicy. + bool monotone = true; + axom::IndexType prevDist = -1; + for(l = 0; l < lMax; ++l) + { + for(m = 0; m < mMax; ++m) + { + for(n = 0; n < nMax; ++n) + { + auto dist = &da[ijk] - &da[zero]; + // We loop in striding order, so dist should always increase. + // Can't require strict sequential order because we skip ghosts. + monotone &= (prevDist < dist); + prevDist = dist; + } + } + } + if(!monotone) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Failed monotone ordering for ArrayView '{}'", daName)); + } + + return errCount; +} + +//--------------------------------------------------------------------------- +// Test methods that convert between shapes and strides-and-offsets. +//--------------------------------------------------------------------------- +int testConversionMethods(const MVU3Type::MdIndices& realShape, + const MVU3Type::MdIndices& loPads, + const MVU3Type::MdIndices& hiPads, + const MVU3Type::MdIndices& strideOrder, + axom::IndexType minStride = 1) +{ + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Conversion test for realShape={}, loPads={}, " + "hiPads={}, strideOrder={}, minStride={}", + realShape, + loPads, + hiPads, + strideOrder, + minStride)); + int errCount = 0; + + MVU3Type::MdIndices paddedShape = realShape + loPads + hiPads; + + MVU3Type::MdIndices offsets; + MVU3Type::MdIndices strides; + axom::IndexType valuesCount = 0; + axom::quest::internal::shapesToStridesAndOffsets(realShape, + loPads, + hiPads, + strideOrder, + minStride, + offsets, + strides, + valuesCount); + + MVU3Type::MdIndices loPads1; + MVU3Type::MdIndices hiPads1; + MVU3Type::MdIndices paddedShape1; + MVU3Type::MdIndices strideOrder1; + axom::quest::internal::stridesAndOffsetsToShapes(realShape, + offsets, + strides, + valuesCount, + paddedShape1, + loPads1, + hiPads1, + strideOrder1); + + // Conversions should return original values. + if(!isEqual(loPads, loPads1)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Mismatched loPads: {} vs {}.", loPads1, loPads)); + } + if(!isEqual(hiPads, hiPads1)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Mismatched hiPads: {} vs {}.", hiPads1, hiPads)); + } + if(paddedShape1 != paddedShape) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Mismatched valuesCount: {} vs {}.", + paddedShape1, + paddedShape)); + } + if(!isEqual(strideOrder, strideOrder1)) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Mismatched strideOrder: {} vs {}.", + strideOrder1, + strideOrder)); + } + + return errCount; +} + +//--------------------------------------------------------------------------- +// Create a mesh using a Conduit example, take its view and verify +// expectations. +// --------------------------------------------------------------------------- +int testByConduitExample(const IndexCoords& domainShape, + const IndexCoords& loPads, + const IndexCoords& hiPads, + const IndexCoords& strideOrder, + axom::IndexType minStride = 1) +{ + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Check conduit mesh with domainShape={}, loPads={}, " + "hiPads={}, strideOrder={}, minStride={}", + domainShape, + loPads, + hiPads, + strideOrder, + minStride)); + int errCount = 0; + + conduit::Node domain; + createConduitBlueprintDomain({domainShape[0], domainShape[1], domainShape[2]}, + {loPads[0], loPads[1], loPads[2]}, + {hiPads[0], hiPads[1], hiPads[2]}, + domain); + + axom::quest::MeshViewUtil<3, axom::MemorySpace::Dynamic> mview(domain); + + if(!mview.isValid(true, true)) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), "Test view is not valid."); + } + + // Data parameters not dependent on striding order. + + IndexCoords elemShape = mview.getCellShape(); + IndexCoords vertShape = mview.getNodeShape(); + + IndexCoords elemPaddedShape = domainShape + loPads + hiPads; + IndexCoords vertPaddedShape = elemPaddedShape + 1; + + IndexCoords vertOrigin = loPads; + + // Access calls shouldn't abort. + mview.getTopology(); + mview.getCoordSet(); + + { + // Verify data created by the Conduit example, + // by comparing to results from separate calls to converter. + // This data always uses column-major order, + // regardless of the specified strideOrder. + IndexCoords conduitStrideOrder = {0, 1, 2}; + + IndexCoords elemOffsets; + IndexCoords elemStrides; + axom::IndexType elemValuesCount; + axom::quest::internal::shapesToStridesAndOffsets(elemShape, + loPads, + hiPads, + conduitStrideOrder, + minStride, + elemOffsets, + elemStrides, + elemValuesCount); + + IndexCoords vertOffsets; + IndexCoords vertStrides; + axom::IndexType vertValuesCount; + axom::quest::internal::shapesToStridesAndOffsets(vertShape, + loPads, + hiPads, + conduitStrideOrder, + minStride, + vertOffsets, + vertStrides, + vertValuesCount); + + if(!isEqual(mview.getCellShape(), elemShape)) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Mismatched domain shape: {} vs {}", + mview.getCellShape(), + elemShape)); + } + + if(!isEqual(mview.getRealExtents("element"), elemShape)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Mismatched real element extents: {} vs {}", + mview.getRealExtents("element"), + elemShape)); + } + + if(!isEqual(mview.getRealExtents("vertex"), vertShape)) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Mismatched real vertex extents: {} vs {}", + mview.getRealExtents("vertex"), + vertShape)); + } + + if(!isEqual(mview.getCoordsOffsets(), vertOrigin)) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Mismatched coords offsets: {} vs {}", + mview.getCoordsOffsets(), + vertOrigin)); + } + + if(!isEqual(mview.getCoordsStrides(), vertStrides)) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Mismatched coords strides: {} vs {}", + mview.getCoordsStrides(), + vertStrides)); + } + + if(mview.getCoordsCountWithGhosts() != vertValuesCount) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Mismatched coords count with ghosts: {} vs {}", + mview.getCoordsCountWithGhosts(), + vertValuesCount)); + } + + // Check field views sizes and strides. + // These may change if Conduit example changes. + auto vertField = mview.getFieldView("vert_vals", false); + auto elemField = mview.getFieldView("ele_vals", false); + auto vertFieldWithGhosts = mview.getFieldView("vert_vals", true); + auto elemFieldWithGhosts = mview.getFieldView("ele_vals", true); + + if(!isEqual(elemField.shape(), elemShape)) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Mismatched elemField shape: {} vs {}", + elemField.shape(), + elemShape)); + } + + if(!isEqual(vertField.shape(), vertShape)) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Mismatched vertField shape: {} vs {}", + vertField.shape(), + vertShape)); + } + + if(!isEqual(elemFieldWithGhosts.shape(), elemPaddedShape)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Mismatched elemField padded shape: {} vs {}", + elemField.shape(), + elemPaddedShape)); + } + + if(!isEqual(elemFieldWithGhosts.strides(), elemStrides)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Mismatched elemField padded stride: {} vs {}", + elemFieldWithGhosts.strides(), + elemStrides)); + } + + if(!isEqual(vertFieldWithGhosts.shape(), vertPaddedShape)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Mismatched vertField padded shape: {} vs {}", + vertField.shape(), + vertPaddedShape)); + } + + if(!isEqual(vertFieldWithGhosts.strides(), vertStrides)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Mismatched vertField padded stride: {} vs {}", + vertField.strides(), + vertStrides)); + } + + errCount += testDataAccess(elemField, + "elemField", + conduitStrideOrder, + ModifyNumber()); + errCount += testDataAccess(vertField, + "vertField", + conduitStrideOrder, + ModifyNumber()); + errCount += testDataAccess(elemFieldWithGhosts, + "elemFieldWithGhosts", + conduitStrideOrder, + ModifyNumber()); + errCount += testDataAccess(vertFieldWithGhosts, + "vertFieldWithGhosts", + conduitStrideOrder, + ModifyNumber()); + + auto coordsViews = mview.getCoordsViews(); + for(int d = 0; d < 3; ++d) + { + errCount += testDataAccess(coordsViews[d], + axom::fmt::format("coordsViews[{}]", d), + conduitStrideOrder, + ModifyNumber()); + } + } + + { + // Verify data created by by us, + // by comparing to results from separate calls to converter. + // Unlike the data created by the conduit example, this + // data always uses the specified striding order strideOrder. + + IndexCoords elemOffsets; + IndexCoords elemStrides; + axom::IndexType elemValuesCount; + axom::quest::internal::shapesToStridesAndOffsets(elemShape, + loPads, + hiPads, + strideOrder, + minStride, + elemOffsets, + elemStrides, + elemValuesCount); + + IndexCoords vertOffsets; + IndexCoords vertStrides; + axom::IndexType vertValuesCount; + axom::quest::internal::shapesToStridesAndOffsets(vertShape, + loPads, + hiPads, + strideOrder, + minStride, + vertOffsets, + vertStrides, + vertValuesCount); + + //--------------------------------------------------------------------------- + // Create a cell-centered field and verify shape and strides. + //--------------------------------------------------------------------------- + mview.createField("inCells", + "element", + conduit::DataType::int32(elemValuesCount), + elemStrides, + elemOffsets); + auto inCellsView = mview.getFieldView("inCells", false); + auto inCellsPaddedView = mview.getFieldView("inCells", true); + + if(!isEqual(inCellsView.shape(), elemShape)) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Mismatched vertField shape: {} vs {}", + inCellsView.shape(), + elemShape)); + } + + if(!isEqual(inCellsView.strides(), elemStrides)) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Mismatched vertField strides: {} vs {}", + inCellsView.strides(), + elemStrides)); + } + + if(!isEqual(inCellsPaddedView.shape(), elemPaddedShape)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Mismatched vertField padded shape: {} vs {}", + inCellsPaddedView.shape(), + elemPaddedShape)); + } + + if(!isEqual(inCellsPaddedView.strides(), elemStrides)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Mismatched vertField padded strides: {} vs {}", + inCellsPaddedView.strides(), + elemStrides)); + } + + //--------------------------------------------------------------------------- + // Create a node-centered field and verify shape and strides. + //--------------------------------------------------------------------------- + mview.createField("onNodes", + "vertex", + conduit::DataType::int32(vertValuesCount), + vertStrides, + vertOffsets); + auto onNodesView = mview.getFieldView("onNodes", false); + auto onNodesPaddedView = mview.getFieldView("onNodes", true); + + if(!isEqual(onNodesView.shape(), vertShape)) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Mismatched vertField shape: {} vs {}", + onNodesView.shape(), + vertShape)); + } + + if(!isEqual(onNodesView.strides(), vertStrides)) + { + ++errCount; + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Mismatched vertField strides: {} vs {}", + onNodesView.strides(), + vertStrides)); + } + + if(!isEqual(onNodesPaddedView.shape(), vertPaddedShape)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Mismatched vertField padded shape: {} vs {}", + onNodesPaddedView.shape(), + vertPaddedShape)); + } + + if(!isEqual(onNodesPaddedView.strides(), vertStrides)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Mismatched vertField padded strides: {} vs {}", + onNodesPaddedView.strides(), + vertStrides)); + } + + errCount += testDataAccess(inCellsPaddedView, + "inCellsPaddedView", + strideOrder, + ModifyNumber()); + errCount += testDataAccess(inCellsView, + "inCellsView", + strideOrder, + ModifyNumber()); + errCount += testDataAccess(onNodesPaddedView, + "onNodesPaddedView", + strideOrder, + ModifyNumber()); + errCount += testDataAccess(onNodesView, + "onNodesView", + strideOrder, + ModifyNumber()); + } + + return errCount; +} + +//------------------------------------------------------------------------------ +int main(int argc, char** argv) +{ + // This test is serial, but conduit might use MPI. + #ifdef AXOM_USE_MPI + MPI_Init(&argc, &argv); + #endif + + initializeLogger(); + + //--------------------------------------------------------------------------- + // Set up and parse command line arguments + //--------------------------------------------------------------------------- + axom::CLI::App app {"Test code for MeshViewUtil class"}; + + try + { + params.parse(argc, argv, app); + } + catch(const axom::CLI::ParseError& e) + { + int retval = app.exit(e); + exit(retval); + } + + int errCount = 0; + + { + // Test conversion methods. + errCount += testConversionMethods({2, 3, 5}, {0, 0, 0}, {0, 0, 0}, {0, 1, 2}); + errCount += testConversionMethods({2, 3, 5}, {0, 0, 0}, {0, 0, 0}, {2, 1, 0}); + errCount += testConversionMethods({2, 3, 5}, {1, 1, 1}, {1, 1, 1}, {0, 1, 2}); + errCount += testConversionMethods({2, 3, 5}, {1, 1, 1}, {1, 1, 1}, {2, 1, 0}); + errCount += testConversionMethods({2, 3, 5}, {2, 2, 2}, {1, 1, 1}, {0, 1, 2}); + errCount += testConversionMethods({2, 3, 5}, {2, 2, 2}, {1, 1, 1}, {2, 1, 0}); + errCount += testConversionMethods({2, 3, 5}, {1, 1, 1}, {2, 2, 2}, {0, 1, 2}); + errCount += testConversionMethods({2, 3, 5}, {1, 1, 1}, {2, 2, 2}, {2, 1, 0}); + errCount += testConversionMethods({2, 3, 5}, {2, 2, 2}, {1, 1, 1}, {2, 0, 1}); + errCount += testConversionMethods({2, 3, 5}, {2, 2, 2}, {1, 1, 1}, {1, 0, 2}); + errCount += testConversionMethods({2, 3, 5}, {2, 2, 2}, {1, 1, 1}, {1, 2, 0}); + } + + { + IndexCoords domainShape {5, 3, 2}; + IndexCoords loPads {2, 2, 2}; + IndexCoords hiPads {1, 1, 1}; + IndexCoords strideOrder {0, 1, 2}; + errCount += testByConduitExample(domainShape, loPads, hiPads, strideOrder); + } + + { + IndexCoords domainShape {5, 3, 2}; + IndexCoords loPads {2, 2, 2}; + IndexCoords hiPads {1, 1, 1}; + IndexCoords strideOrder {2, 1, 0}; + errCount += testByConduitExample(domainShape, loPads, hiPads, strideOrder); + } + + { + IndexCoords domainShape {5, 3, 2}; + IndexCoords loPads {2, 1, 0}; + IndexCoords hiPads {1, 0, 2}; + IndexCoords strideOrder {2, 0, 1}; + errCount += testByConduitExample(domainShape, loPads, hiPads, strideOrder); + } + + SLIC_INFO(axom::fmt::format("Test found {} errors.", errCount)); + + finalizeLogger(); + + #ifdef AXOM_USE_MPI + MPI_Finalize(); + #endif + + return (errCount != 0); +} + +#endif // AXOM_USE_CONDUIT From a184ac2101feddb40f6cf21ca5af83bb031a5b3a Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 17 Nov 2023 07:12:22 -0800 Subject: [PATCH 217/639] Fix bugs occuring with 64-bit IndexType. --- src/axom/quest/MeshViewUtil.hpp | 26 ++++++------------- src/axom/quest/tests/quest_mesh_view_util.cpp | 5 ++++ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 0def6ef538..4ea994650e 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -697,23 +697,13 @@ class MeshViewUtil fieldNode["association"] = association; fieldNode["topology"] = m_topologyName; - { - fieldNode["strides"].set(conduit::DataType::int32(DIM)); - auto* tmpPtr = fieldNode["strides"].as_int32_ptr(); - for(int d = 0; d < DIM; ++d) - { - tmpPtr[d] = strides[d]; - } - } - - { - fieldNode["offsets"].set(conduit::DataType::int32(DIM)); - auto* tmpPtr = fieldNode["offsets"].as_int32_ptr(); - for(int d = 0; d < DIM; ++d) - { - tmpPtr[d] = offsets[d]; - } - } + constexpr bool isInt32 = std::is_same::value; + const conduit::DataType conduitDtype = + isInt32 ? conduit::DataType::int32(DIM) : conduit::DataType::int64(DIM); + // Make temporary non-const copies for the "set" methods. + auto tmpStrides = strides, tmpOffsets = offsets; + fieldNode["strides"].set(conduitDtype, &tmpStrides[0]); + fieldNode["offsets"].set(conduitDtype, &tmpOffsets[0]); axom::IndexType slowDir = strideOrder[DIM - 1]; auto extras = dtype.number_of_elements() - @@ -789,7 +779,7 @@ class MeshViewUtil for(int i = 0; i < DIM; ++i) { - m_cellShape[i] = topologyDims[i].value(); + m_cellShape[i] = topologyDims[i].to_value(); m_nodeShape[i] = m_cellShape[i] + 1; } diff --git a/src/axom/quest/tests/quest_mesh_view_util.cpp b/src/axom/quest/tests/quest_mesh_view_util.cpp index a9c15835e5..e870f4fb78 100644 --- a/src/axom/quest/tests/quest_mesh_view_util.cpp +++ b/src/axom/quest/tests/quest_mesh_view_util.cpp @@ -365,6 +365,11 @@ int testByConduitExample(const IndexCoords& domainShape, {loPads[0], loPads[1], loPads[2]}, {hiPads[0], hiPads[1], hiPads[2]}, domain); + if(params.isVerbose()) + { + SLIC_INFO("Testing with this domain:"); + domain.print(); + } axom::quest::MeshViewUtil<3, axom::MemorySpace::Dynamic> mview(domain); From 12efcf520de298198497dd6fa13852e40c8a61b2 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 17 Nov 2023 10:08:36 -0800 Subject: [PATCH 218/639] Empty commit to force CI test. From f511a2593369043c2571f0646fb0ce421acbc572 Mon Sep 17 00:00:00 2001 From: Arlie Capps <48997041+agcapps@users.noreply.github.com> Date: Fri, 17 Nov 2023 13:18:55 -0800 Subject: [PATCH 219/639] Clarify release process (#1202) --- src/docs/sphinx/dev_guide/release.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/docs/sphinx/dev_guide/release.rst b/src/docs/sphinx/dev_guide/release.rst index 729a2e835a..d803898f1d 100644 --- a/src/docs/sphinx/dev_guide/release.rst +++ b/src/docs/sphinx/dev_guide/release.rst @@ -88,7 +88,9 @@ release changes can be reviewed. Such changes include: ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Merge the release candidate branch into the main branch once it is ready and -approved. At this point, the release candidate branch can be deleted. +approved. Do not "squash merge:" that will make the histories of main and +release branches disagree, and we want to preserve the history. After +merging, the release candidate branch can be deleted. 4: Draft a Github Release @@ -120,8 +122,9 @@ approved. At this point, the release candidate branch can be deleted. ^^^^^^^^^^^^^^^^^^^^^^^^^^ * Checkout the main branch locally and run ``axom/scripts/make_release_tarball.sh --with-data`` - This will generate a two tarballs of the form ``Axom-v0.3.1.tar.gz`` and ``AxomData-v0.3.1.tar.gz`` - each consistsing of the axom source and data respectively. + Run this script from the top level ``axom`` subdirectory. This will + generate a two tarballs of the form ``Axom-v0.3.1.tar.gz`` and ``AxomData-v0.3.1.tar.gz`` + consisting of the axom source and data respectively. * Upload the tarballs for the corresponding release, by going to the `Github Releases section `_ and ``Edit`` From e49133bfd10f9c64d32e4525ad2ccd3ff2e0354f Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 17 Nov 2023 13:11:04 -0800 Subject: [PATCH 220/639] Use domain_id for identification if provided in DistributedClosestPoint. If not provided, use local domain's iteration index. Fix error setting domain. --- RELEASE-NOTES.md | 2 + src/axom/quest/DistributedClosestPoint.hpp | 11 ++- ...est_distributed_distance_query_example.cpp | 71 ++++--------------- 3 files changed, 24 insertions(+), 60 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 44a040f7af..d8bb78a17f 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -30,6 +30,8 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ negative, resulting in the signed volume becoming positive. ### Changed +- `MarchingCubes` and `DistributedClosestPoint` classes identify domains by their + `state/domain_id` parameters if provided, or the local iteration index if not. - `MarchingCubes` and `DistributedClosestPoint` classes changed from requiring the Blueprint coordset name to requiring the Blueprint topology name. The changed interface methods are: - `DistributedClosestPoint::setObjectMesh` diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index 41c373b5ba..3719a1fe99 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -455,9 +455,16 @@ class DistributedClosestPointImpl axom::Array domIds(ptCount, ptCount); std::size_t copiedCount = 0; conduit::Node tmpValues; - for(conduit::index_t d = 0; d < mdMeshNode.number_of_children(); ++d) + for(axom::IndexType d = 0; d < mdMeshNode.number_of_children(); ++d) { const conduit::Node& domain = mdMeshNode.child(d); + + axom::IndexType domainId = d; + if(domain.has_path("state/domain_id")) + { + domainId = domain.fetch_existing("state/domain_id").to_int32(); + } + const std::string coordsetName = domain .fetch_existing( @@ -483,7 +490,7 @@ class DistributedClosestPointImpl nBytes); tmpValues.reset(); - domIds.fill(d, copiedCount, N); + domIds.fill(domainId, N, copiedCount); copiedCount += N; } diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index e443810bf5..5db9cd8d9c 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -412,10 +412,13 @@ struct BlueprintParticleMesh the mesh is read in. */ template - void setPoints(const axom::Array>& pts) + void setPoints(axom::IndexType domainId, + const axom::Array>& pts) { - axom::IndexType domainIdx = createBlueprintStubs(); - SLIC_ASSERT(m_domainGroups[domainIdx] != nullptr); + axom::IndexType localIdx = createBlueprintStubs(); + SLIC_ASSERT(m_domainGroups[localIdx] != nullptr); + m_domainGroups[localIdx]->createViewScalar("state/domain_id", + domainId); const int SZ = pts.size(); @@ -447,19 +450,19 @@ struct BlueprintParticleMesh // create views into a shared buffer for the coordinates, with stride NDIMS { - auto* buf = m_domainGroups[domainIdx] + auto* buf = m_domainGroups[localIdx] ->getDataStore() ->createBuffer(sidre::DOUBLE_ID, NDIMS * SZ) ->allocate(); - createAndApplyView(m_coordsGroups[domainIdx], "values/x", buf, 0, SZ); + createAndApplyView(m_coordsGroups[localIdx], "values/x", buf, 0, SZ); if(NDIMS > 1) { - createAndApplyView(m_coordsGroups[domainIdx], "values/y", buf, 1, SZ); + createAndApplyView(m_coordsGroups[localIdx], "values/y", buf, 1, SZ); } if(NDIMS > 2) { - createAndApplyView(m_coordsGroups[domainIdx], "values/z", buf, 2, SZ); + createAndApplyView(m_coordsGroups[localIdx], "values/z", buf, 2, SZ); } // copy coordinate data into the buffer @@ -470,7 +473,7 @@ struct BlueprintParticleMesh // set the default connectivity // May be required by an old version of visit. May not be needed by newer versions of visit. sidre::Array arr( - m_topoGroups[domainIdx]->createView("elements/connectivity"), + m_topoGroups[localIdx]->createView("elements/connectivity"), SZ, SZ); for(int i = 0; i < SZ; ++i) @@ -686,7 +689,7 @@ struct BlueprintParticleMesh auto* fieldsGroup = domainGroup->createGroup("fields"); - domainGroup->createViewScalar("state/domain_id", m_rank); + // domainGroup->createViewScalar("state/domain_id", m_rank); m_domainGroups.push_back(domainGroup); m_coordsGroups.push_back(coordsGroup); @@ -823,60 +826,13 @@ class ObjectMeshWrapper const double rcosT = center[0] + radius * std::cos(ang); pts.push_back(PointType {rcosT, rsinT}); } - m_objectMesh.setPoints(pts); + m_objectMesh.setPoints(di, pts); } axom::slic::flushStreams(); SLIC_ASSERT(m_objectMesh.isValid()); } - /** - * Change cp_domain data from a local index to a global domain index - * by adding rank offsets. - * This is an optional step to transform domain ids verification. - */ - void add_rank_offset_to_cp_domain_ids(conduit::Node& queryMesh) - { - int nranks = m_objectMesh.getNumRanks(); - - int localDomainCount = m_objectMesh.domain_count(); - - // perform scan on ranks to compute totalNumPoints, thetaStart and thetaEnd - axom::Array starts(nranks, nranks); - { - axom::Array indivDomainCounts(nranks, nranks); - indivDomainCounts.fill(-1); - MPI_Allgather(&localDomainCount, - 1, - MPI_INT, - indivDomainCounts.data(), - 1, - MPI_INT, - MPI_COMM_WORLD); - starts[0] = 0; - for(int i = 1; i < nranks; ++i) - { - starts[i] = starts[i - 1] + indivDomainCounts[i]; - } - } - - for(conduit::Node& dom : queryMesh.children()) - { - auto& fields = dom.fetch_existing("fields"); - auto cpDomainIdxs = - fields.fetch_existing("cp_domain_index/values").as_int_array(); - auto cpRanks = fields.fetch_existing("cp_rank/values").as_int_array(); - for(int i = 0; i < cpDomainIdxs.number_of_elements(); ++i) - { - const auto& r = cpRanks[i]; - if(r >= 0) - { - cpDomainIdxs[i] += starts[cpRanks[i]]; - } - } - } - } - /// Outputs the object mesh to disk void saveMesh(const std::string& filename = "object_mesh") { @@ -1525,7 +1481,6 @@ int main(int argc, char** argv) } slic::flushStreams(); - objectMeshWrapper.add_rank_offset_to_cp_domain_ids(queryMeshNode); queryMeshWrapper.update_closest_points(queryMeshNode); int errCount = 0; From 5b7806f6601b3ee12f6a4018201eefc5e7258337 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 22 Nov 2023 08:12:53 -0800 Subject: [PATCH 221/639] Autoformat. --- .../quest/detail/MarchingCubesFullParallel.hpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index 2247e0f1e7..6170bff439 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -267,7 +267,8 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase // Compute number of surface facets added by each parent cell. m_facetIncrs.resize(parentCellCount); - const axom::ArrayView facetIncrsView = m_facetIncrs.view(); + const axom::ArrayView facetIncrsView = + m_facetIncrs.view(); #if defined(AXOM_USE_RAJA) axom::for_all( @@ -342,13 +343,14 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase axom::Array sortedFacetIncrs(m_facetIncrs); axom::Array sortedIndices(parentCellCount); auto sortedIndicesView = sortedIndices.view(); - axom::for_all(0, parentCellCount, - AXOM_LAMBDA(axom::IndexType pcId) { - sortedIndicesView[pcId] = pcId; - }); - RAJA::stable_sort_pairs(RAJA::make_span(sortedFacetIncrs.data(), parentCellCount), - RAJA::make_span(sortedIndices.data(), parentCellCount), - RAJA::operators::greater{}); + axom::for_all( + 0, + parentCellCount, + AXOM_LAMBDA(axom::IndexType pcId) { sortedIndicesView[pcId] = pcId; }); + RAJA::stable_sort_pairs( + RAJA::make_span(sortedFacetIncrs.data(), parentCellCount), + RAJA::make_span(sortedIndices.data(), parentCellCount), + RAJA::operators::greater {}); auto contourCellParentsView = m_contourCellParents.view(); auto contourCellCornersView = m_contourCellCorners.view(); From 10baff5faeaed2f49565be04b84fa838a104bfee Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 22 Nov 2023 11:14:44 -0800 Subject: [PATCH 222/639] Fix another error using 64-bit IndexType. --- src/axom/quest/detail/MarchingCubesFullParallel.hpp | 10 +++++----- src/axom/quest/detail/MarchingCubesPartParallel.hpp | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index 6170bff439..d7b85bfc62 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -44,6 +44,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase public: using Point = axom::primal::Point; using MIdx = axom::StackArray; + using FacetIdType = int; using LoopPolicy = typename execution_space::loop_policy; using ReducePolicy = typename execution_space::reduce_policy; static constexpr auto MemorySpace = execution_space::memory_space; @@ -267,8 +268,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase // Compute number of surface facets added by each parent cell. m_facetIncrs.resize(parentCellCount); - const axom::ArrayView facetIncrsView = - m_facetIncrs.view(); + const auto facetIncrsView = m_facetIncrs.view(); #if defined(AXOM_USE_RAJA) axom::for_all( @@ -311,7 +311,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase // Use last facet info to compute number of facets in domain. // In case data is on device, copy to host before computing. axom::IndexType firstFacetIds_back = 0; - axom::IndexType facetIncrs_back = 0; + FacetIdType facetIncrs_back = 0; axom::copy(&firstFacetIds_back, m_firstFacetIds.data() + m_firstFacetIds.size() - 1, sizeof(firstFacetIds_back)); @@ -340,7 +340,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase // sortedIndices are parent cell indices, sorted by number // of facets in them. - axom::Array sortedFacetIncrs(m_facetIncrs); + auto sortedFacetIncrs(m_facetIncrs); axom::Array sortedIndices(parentCellCount); auto sortedIndicesView = sortedIndices.view(); axom::for_all( @@ -803,7 +803,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase axom::IndexType m_crossingCount = 0; //!@brief Number of surface mesh facets added by computational mesh cells. - axom::Array m_facetIncrs; + axom::Array m_facetIncrs; //!@brief First index of facets in computational mesh cells. axom::Array m_firstFacetIds; diff --git a/src/axom/quest/detail/MarchingCubesPartParallel.hpp b/src/axom/quest/detail/MarchingCubesPartParallel.hpp index 894895f0fa..a7bc07f68c 100644 --- a/src/axom/quest/detail/MarchingCubesPartParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesPartParallel.hpp @@ -338,8 +338,7 @@ class MarchingCubesPartParallel : public MarchingCubesSingleDomain::ImplBase axom::Array prefixSum(m_crossingCount, m_crossingCount); - const axom::ArrayView prefixSumView = - prefixSum.view(); + const auto prefixSumView = prefixSum.view(); auto copyFirstSurfaceCellId = AXOM_LAMBDA(axom::IndexType n) { From 7ad69048d2891112e17d9b77489dfbadfb918ad3 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 22 Nov 2023 11:32:53 -0800 Subject: [PATCH 223/639] Guard some code from non-RAJA builds. --- src/axom/quest/detail/MarchingCubesFullParallel.hpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index d7b85bfc62..37234573b7 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -338,6 +338,10 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase const auto firstFacetIdsView = m_firstFacetIds.view(); const auto caseIdsView = m_caseIds.view(); + #if defined(AXOM_USE_RAJA) + // To minimize diverence and improve GPU performance, + // sort parent indices by number of facets they add. + // // sortedIndices are parent cell indices, sorted by number // of facets in them. auto sortedFacetIncrs(m_facetIncrs); @@ -351,6 +355,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase RAJA::make_span(sortedFacetIncrs.data(), parentCellCount), RAJA::make_span(sortedIndices.data(), parentCellCount), RAJA::operators::greater {}); + #endif auto contourCellParentsView = m_contourCellParents.view(); auto contourCellCornersView = m_contourCellCorners.view(); @@ -362,7 +367,11 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_coordsViews); auto gen_for_parent_cell = AXOM_LAMBDA(axom::IndexType loopIndex) { + #if defined(AXOM_USE_RAJA) axom::IndexType parentCellId = sortedIndicesView[loopIndex]; + #else + axom::IndexType parentCellId = loopIndex; + #endif Point cornerCoords[CELL_CORNER_COUNT]; double cornerValues[CELL_CORNER_COUNT]; ccu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); From d85b7b51fb65d706917945838ae304a5fa204e9a Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 22 Nov 2023 13:49:15 -0800 Subject: [PATCH 224/639] Factor out runtime policy code. --- src/axom/core/CMakeLists.txt | 1 + src/axom/core/execution/runtime_policy.hpp | 83 +++++++++++++ src/axom/quest/DistributedClosestPoint.hpp | 111 ++++-------------- src/axom/quest/MarchingCubes.cpp | 4 - src/axom/quest/MarchingCubes.hpp | 67 ++--------- ...est_distributed_distance_query_example.cpp | 22 +--- .../examples/quest_marching_cubes_example.cpp | 46 +++----- 7 files changed, 130 insertions(+), 204 deletions(-) create mode 100644 src/axom/core/execution/runtime_policy.hpp diff --git a/src/axom/core/CMakeLists.txt b/src/axom/core/CMakeLists.txt index 31ee8570a0..e3e433580b 100644 --- a/src/axom/core/CMakeLists.txt +++ b/src/axom/core/CMakeLists.txt @@ -64,6 +64,7 @@ set(core_headers ## execution execution/execution_space.hpp execution/for_all.hpp + execution/runtime_policy.hpp execution/synchronize.hpp execution/internal/seq_exec.hpp diff --git a/src/axom/core/execution/runtime_policy.hpp b/src/axom/core/execution/runtime_policy.hpp new file mode 100644 index 0000000000..d922b400d9 --- /dev/null +++ b/src/axom/core/execution/runtime_policy.hpp @@ -0,0 +1,83 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +#ifndef AXOM_CORE_EXECUTION_RUNTIME_POLICY_HPP_ +#define AXOM_CORE_EXECUTION_RUNTIME_POLICY_HPP_ + +#include "axom/config.hpp" /* for compile time defs. */ +#include "axom/fmt/format.h" /* for axom::fmt */ +#include "axom/core/Macros.hpp" /* for AXOM_STATIC_ASSERT */ +#include "axom/core/execution/execution_space.hpp" /* execution_space traits */ + +namespace axom +{ +namespace core +{ +namespace runtime_policy +{ + /// Execution policies supported by configuration. + enum class Policy + { + seq = 0 +#if defined(AXOM_USE_RAJA) +#ifdef AXOM_USE_OPENMP + , omp = 1 +#endif +#if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) + , cuda = 2 +#endif +#if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + , hip = 3 +#endif +#endif + }; + + //! @brief Mapping from policy name to policy enum. + // clang-format off + static const std::map s_nameToPolicy + { + {"seq", Policy::seq} +#if defined(AXOM_USE_RAJA) +#ifdef AXOM_USE_OPENMP + , {"omp", Policy::omp} +#endif +#if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) + , {"cuda", Policy::cuda} +#endif +#if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + , {"hip", Policy::hip} +#endif +#endif + }; + + //! @brief Mapping from policy enum to policy name. + static const std::map s_policyToName + { + {Policy::seq, "seq"} +#if defined(AXOM_USE_RAJA) +#ifdef AXOM_USE_OPENMP + , {Policy::omp, "omp"} +#endif +#if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) + , {Policy::cuda, "cuda"} +#endif +#if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + , {Policy::hip, "hip"} +#endif +#endif + }; + // clang-format on + + /// Utility function to allow formating a Policy + static inline auto format_as(Policy pol) + { + return axom::fmt::underlying(pol); + } + +} // end namespace runtime_policy +} // end namespace core +} // end namespace axom + +#endif /* AXOM_CORE_EXECUTION_RUNTIME_POLICY_HPP_ */ diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index 41c373b5ba..72e3f936de 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -13,6 +13,7 @@ #include "axom/sidre.hpp" #include "axom/primal.hpp" #include "axom/spin.hpp" +#include "axom/core/execution/runtime_policy.hpp" #include "axom/fmt.hpp" @@ -51,21 +52,6 @@ namespace axom { namespace quest { -/// Enum for runtime execution policy -enum class DistributedClosestPointRuntimePolicy -{ - seq = 0, - omp = 1, - cuda = 2, - hip = 3 -}; - -/// Utility function to allow formating a DistributedClosestPointRuntimePolicy -inline auto format_as(DistributedClosestPointRuntimePolicy pol) -{ - return fmt::underlying(pol); -} - namespace internal { // Utility function to dump a conduit node on each rank, e.g. for debugging @@ -338,7 +324,7 @@ class DistributedClosestPointImpl { public: static constexpr int DIM = NDIMS; - using RuntimePolicy = DistributedClosestPointRuntimePolicy; + using RuntimePolicy = axom::core::runtime_policy::Policy; using PointType = primal::Point; using BoxType = primal::BoundingBox; using PointArray = axom::Array; @@ -500,24 +486,19 @@ class DistributedClosestPointImpl case RuntimePolicy::seq: return m_bvh_seq.get() != nullptr; - case RuntimePolicy::omp: #ifdef _AXOM_DCP_USE_OPENMP + case RuntimePolicy::omp: return m_bvh_omp.get() != nullptr; -#else - break; #endif - case RuntimePolicy::cuda: #ifdef _AXOM_DCP_USE_CUDA + case RuntimePolicy::cuda: return m_bvh_cuda.get() != nullptr; -#else - break; #endif - case RuntimePolicy::hip: + #ifdef _AXOM_DCP_USE_HIP + case RuntimePolicy::hip: return m_bvh_hip.get() != nullptr; -#else - break; #endif } @@ -546,28 +527,22 @@ class DistributedClosestPointImpl m_bvh_seq = std::make_unique(); return generateBVHTreeImpl(m_bvh_seq.get()); - case RuntimePolicy::omp: #ifdef _AXOM_DCP_USE_OPENMP + case RuntimePolicy::omp: m_bvh_omp = std::make_unique(); return generateBVHTreeImpl(m_bvh_omp.get()); -#else - break; #endif - case RuntimePolicy::cuda: #ifdef _AXOM_DCP_USE_CUDA + case RuntimePolicy::cuda: m_bvh_cuda = std::make_unique(); return generateBVHTreeImpl(m_bvh_cuda.get()); -#else - break; #endif - case RuntimePolicy::hip: #ifdef _AXOM_DCP_USE_HIP + case RuntimePolicy::hip: m_bvh_hip = std::make_unique(); return generateBVHTreeImpl(m_bvh_hip.get()); -#else - break; #endif } @@ -591,28 +566,22 @@ class DistributedClosestPointImpl local_bb = m_bvh_seq->getBounds(); break; - case RuntimePolicy::omp: #ifdef _AXOM_DCP_USE_OPENMP + case RuntimePolicy::omp: local_bb = m_bvh_omp->getBounds(); break; -#else - break; #endif - case RuntimePolicy::cuda: #ifdef _AXOM_DCP_USE_CUDA + case RuntimePolicy::cuda: local_bb = m_bvh_cuda->getBounds(); break; -#else - break; #endif - case RuntimePolicy::hip: #ifdef _AXOM_DCP_USE_HIP + case RuntimePolicy::hip: local_bb = m_bvh_hip->getBounds(); break; -#else - break; #endif } @@ -1016,20 +985,20 @@ class DistributedClosestPointImpl computeLocalClosestPoints(m_bvh_seq.get(), xferNode); break; - case RuntimePolicy::omp: #ifdef _AXOM_DCP_USE_OPENMP + case RuntimePolicy::omp: computeLocalClosestPoints(m_bvh_omp.get(), xferNode); #endif break; - case RuntimePolicy::cuda: #ifdef _AXOM_DCP_USE_CUDA + case RuntimePolicy::cuda: computeLocalClosestPoints(m_bvh_cuda.get(), xferNode); #endif break; - case RuntimePolicy::hip: #ifdef _AXOM_DCP_USE_HIP + case RuntimePolicy::hip: computeLocalClosestPoints(m_bvh_hip.get(), xferNode); #endif break; @@ -1435,7 +1404,7 @@ class DistributedClosestPointImpl class DistributedClosestPoint { public: - using RuntimePolicy = DistributedClosestPointRuntimePolicy; + using RuntimePolicy = axom::core::runtime_policy::Policy; public: DistributedClosestPoint() @@ -1462,44 +1431,9 @@ class DistributedClosestPoint /// Set the runtime execution policy for the query void setRuntimePolicy(RuntimePolicy policy) { - SLIC_ASSERT_MSG( - isValidRuntimePolicy(policy), - fmt::format("Policy '{}' is not a valid runtime policy", policy)); m_runtimePolicy = policy; } - /// Predicate to determine if a given \a RuntimePolicy is valid for this configuration - bool isValidRuntimePolicy(RuntimePolicy policy) const - { - switch(policy) - { - case RuntimePolicy::seq: - return true; - - case RuntimePolicy::omp: -#ifdef _AXOM_DCP_USE_OPENMP - return true; -#else - return false; -#endif - - case RuntimePolicy::cuda: -#ifdef _AXOM_DCP_USE_CUDA - return true; -#else - return false; -#endif - case RuntimePolicy::hip: -#ifdef _AXOM_DCP_USE_HIP - return true; -#else - return false; -#endif - } - - return false; - } - /*! @brief Sets the allocator ID to the default associated with the execution policy */ @@ -1511,25 +1445,26 @@ class DistributedClosestPoint case RuntimePolicy::seq: defaultAllocatorID = axom::execution_space::allocatorID(); break; - case RuntimePolicy::omp: + #ifdef _AXOM_DCP_USE_OPENMP + case RuntimePolicy::omp: defaultAllocatorID = axom::execution_space::allocatorID(); -#endif break; +#endif - case RuntimePolicy::cuda: #ifdef _AXOM_DCP_USE_CUDA + case RuntimePolicy::cuda: defaultAllocatorID = axom::execution_space>::allocatorID(); -#endif break; +#endif - case RuntimePolicy::hip: #ifdef _AXOM_DCP_USE_HIP + case RuntimePolicy::hip: defaultAllocatorID = axom::execution_space>::allocatorID(); -#endif break; +#endif } if(defaultAllocatorID == axom::INVALID_ALLOCATOR_ID) { diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index ab4b232288..98a6415ce5 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -154,10 +154,6 @@ MarchingCubesSingleDomain::MarchingCubesSingleDomain(RuntimePolicy runtimePolicy , m_maskFieldName(maskField) , m_maskPath(maskField.empty() ? std::string() : "fields/" + maskField) { - SLIC_ASSERT_MSG( - isValidRuntimePolicy(runtimePolicy), - fmt::format("Policy '{}' is not a valid runtime policy", runtimePolicy)); - setDomain(dom); return; } diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index b56f416757..73898c5f13 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -19,6 +19,7 @@ #ifdef AXOM_USE_CONDUIT // Axom includes + #include "axom/core/execution/runtime_policy.hpp" #include "axom/mint/mesh/UnstructuredMesh.hpp" // Conduit includes @@ -45,25 +46,6 @@ namespace axom { namespace quest { -/*! - @brief Enum for runtime execution policy - - The policy implicitly selects the execution space and allocator id. -*/ -enum class MarchingCubesRuntimePolicy -{ - seq = 0, - omp = 1, - cuda = 2, - hip = 3 -}; - -/// Utility function to allow formating a MarchingCubesRuntimePolicy -inline auto format_as(MarchingCubesRuntimePolicy pol) -{ - return fmt::underlying(pol); -} - namespace detail { namespace marching_cubes @@ -114,12 +96,12 @@ class MarchingCubesSingleDomain; class MarchingCubes { public: - using RuntimePolicy = MarchingCubesRuntimePolicy; + using RuntimePolicy = axom::core::runtime_policy::Policy; /*! * \brief Constructor sets up computational mesh and data for running the * marching cubes algorithm. * - * \param [in] runtimePolicy A value from MarchingCubesRuntimePolicy. + * \param [in] runtimePolicy A value from RuntimePolicy. * The simplest policy is RuntimePolicy::seq, which specifies * running sequentially on the CPU. * \param [in] bpMesh Blueprint multi-domain mesh containing scalar field. @@ -183,7 +165,7 @@ class MarchingCubes const std::string &domainIdField = {}); private: - MarchingCubesRuntimePolicy m_runtimePolicy; + RuntimePolicy m_runtimePolicy; //! @brief Single-domain implementations. axom::Array> m_singles; @@ -208,12 +190,12 @@ class MarchingCubesSingleDomain friend class detail::marching_cubes::MarchingCubesImpl; public: - using RuntimePolicy = MarchingCubesRuntimePolicy; + using RuntimePolicy = axom::core::runtime_policy::Policy; /*! * \brief Constructor for applying algorithm in a single domain. * See MarchingCubes for the multi-domain implementation. * - * \param [in] runtimePolicy A value from MarchingCubesRuntimePolicy. + * \param [in] runtimePolicy A value from RuntimePolicy. * The simplest policy is RuntimePolicy::seq, which specifies * running sequentially on the CPU. * \param [in] dom Blueprint single-domain mesh containing scalar field. @@ -293,43 +275,8 @@ class MarchingCubesSingleDomain m_impl->populateContourMesh(mesh, cellIdField); } - /*! - @brief Determine whether a given \a MarchingCubesRuntimePolicy is - valid for the Axom build configuration. - */ - inline bool isValidRuntimePolicy(MarchingCubesRuntimePolicy policy) const - { - switch(policy) - { - case MarchingCubesRuntimePolicy::seq: - return true; - - case MarchingCubesRuntimePolicy::omp: - #ifdef _AXOM_MARCHINGCUBES_USE_OPENMP - return true; - #else - return false; - #endif - - case MarchingCubesRuntimePolicy::cuda: - #ifdef _AXOM_MARCHINGCUBES_USE_CUDA - return true; - #else - return false; - #endif - case MarchingCubesRuntimePolicy::hip: - #ifdef _AXOM_MARCHINGCUBES_USE_HIP - return true; - #else - return false; - #endif - } - - return false; - } - private: - MarchingCubesRuntimePolicy m_runtimePolicy; + RuntimePolicy m_runtimePolicy; /*! \brief Computational mesh as a conduit::Node. */ diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index e443810bf5..a4f47ba6a2 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -49,7 +49,7 @@ namespace primal = axom::primal; namespace mint = axom::mint; namespace numerics = axom::numerics; -using RuntimePolicy = axom::quest::DistributedClosestPoint::RuntimePolicy; +using RuntimePolicy = axom::core::runtime_policy::Policy; // converts the input string into an 80 character string // padded on both sides with '=' symbols @@ -84,24 +84,6 @@ struct Input bool m_verboseOutput {false}; double m_emptyRankProbability {0.}; - // clang-format off - const std::map s_validPolicies - { - {"seq", RuntimePolicy::seq} -#if defined(AXOM_USE_RAJA) - #ifdef AXOM_USE_OPENMP - , {"omp", RuntimePolicy::omp} - #endif - #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) - , {"cuda", RuntimePolicy::cuda} - #endif - #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) - , {"hip", RuntimePolicy::hip} - #endif -#endif - }; - // clang-format on - public: bool isVerbose() const { return m_verboseOutput; } double percentEmptyRanks() const { return m_emptyRankProbability; } @@ -186,7 +168,7 @@ struct Input app.add_option("-p, --policy", policy) ->description("Set runtime policy for point query method") ->capture_default_str() - ->transform(axom::CLI::CheckedTransformer(s_validPolicies)); + ->transform(axom::CLI::CheckedTransformer(axom::core::runtime_policy::s_nameToPolicy)); app.add_flag("-c,--check-results,!--no-check-results", checkResults) ->description( diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index a0135a1e70..3618a5c168 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -90,30 +90,12 @@ struct Input bool checkResults {false}; - quest::MarchingCubesRuntimePolicy policy { - quest::MarchingCubesRuntimePolicy::seq}; + axom::core::runtime_policy::Policy policy { + axom::core::runtime_policy::Policy::seq}; private: bool _verboseOutput {false}; - // clang-format off - const std::map s_validPolicies - { - {"seq", quest::MarchingCubesRuntimePolicy::seq} -#if defined(AXOM_USE_RAJA) - #ifdef AXOM_USE_OPENMP - , {"omp", quest::MarchingCubesRuntimePolicy::omp} - #endif - #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) - , {"cuda", quest::MarchingCubesRuntimePolicy::cuda} - #endif - #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) - , {"hip", quest::MarchingCubesRuntimePolicy::hip} - #endif -#endif - }; - // clang-format on - public: bool isVerbose() const { return _verboseOutput; } @@ -122,7 +104,7 @@ struct Input app.add_option("-p, --policy", policy) ->description("Set runtime policy for point query method") ->capture_default_str() - ->transform(axom::CLI::CheckedTransformer(s_validPolicies)); + ->transform(axom::CLI::CheckedTransformer(axom::core::runtime_policy::s_nameToPolicy)); app.add_option("-m,--mesh-file", meshFile) ->description( @@ -220,7 +202,7 @@ struct Input //!@brief Our allocator id, based on execution policy. static int s_allocatorId = axom::INVALID_ALLOCATOR_ID; // Set in main. -static int allocatorIdForPolicy(quest::MarchingCubesRuntimePolicy policy) +static int allocatorIdForPolicy(axom::core::runtime_policy::Policy policy) { //--------------------------------------------------------------------------- // Set default allocator for possibly testing on devices @@ -228,26 +210,26 @@ static int allocatorIdForPolicy(quest::MarchingCubesRuntimePolicy policy) int aid = axom::INVALID_ALLOCATOR_ID; // clang-format off - if(policy == axom::quest::MarchingCubesRuntimePolicy::seq) + if(policy == axom::core::runtime_policy::Policy::seq) { aid = axom::execution_space::allocatorID(); } #if defined(AXOM_USE_RAJA) #ifdef _AXOM_MARCHINGCUBES_USE_OPENMP - else if(policy == axom::quest::MarchingCubesRuntimePolicy::omp) + else if(policy == axom::core::runtime_policy::Policy::omp) { aid = axom::execution_space::allocatorID(); } #endif #ifdef _AXOM_MARCHINGCUBES_USE_CUDA - else if(policy == axom::quest::MarchingCubesRuntimePolicy::cuda) + else if(policy == axom::core::runtime_policy::Policy::cuda) { // aid = axom::execution_space>::allocatorID(); aid = axom::getUmpireResourceAllocatorID(umpire::resource::Device); } #endif #ifdef _AXOM_MARCHINGCUBES_USE_HIP - else if(policy == axom::quest::MarchingCubesRuntimePolicy::hip) + else if(policy == axom::core::runtime_policy::Policy::hip) { // aid = axom::execution_space>::allocatorID(); aid = axom::getUmpireResourceAllocatorID(umpire::resource::Device); @@ -730,8 +712,8 @@ struct ContourTestBase axom::fmt::format("Testing with policy {} and function data on {}", params.policy, resourceName)); - if(params.policy == quest::MarchingCubesRuntimePolicy::seq || - params.policy == quest::MarchingCubesRuntimePolicy::omp) + if(params.policy == axom::core::runtime_policy::Policy::seq || + params.policy == axom::core::runtime_policy::Policy::omp) { SLIC_ASSERT(resourceName == "HOST"); } @@ -1583,7 +1565,7 @@ int main(int argc, char** argv) // Run test in the execution space set by command line. //--------------------------------------------------------------------------- int errCount = 0; - if(params.policy == quest::MarchingCubesRuntimePolicy::seq) + if(params.policy == axom::core::runtime_policy::Policy::seq) { if(params.ndim == 2) { @@ -1596,7 +1578,7 @@ int main(int argc, char** argv) } #if defined(AXOM_USE_RAJA) #ifdef AXOM_USE_OPENMP - else if(params.policy == quest::MarchingCubesRuntimePolicy::omp) + else if(params.policy == axom::core::runtime_policy::Policy::omp) { if(params.ndim == 2) { @@ -1609,7 +1591,7 @@ int main(int argc, char** argv) } #endif #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) - else if(params.policy == quest::MarchingCubesRuntimePolicy::cuda) + else if(params.policy == axom::core::runtime_policy::Policy::cuda) { if(params.ndim == 2) { @@ -1622,7 +1604,7 @@ int main(int argc, char** argv) } #endif #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) - else if(params.policy == quest::MarchingCubesRuntimePolicy::hip) + else if(params.policy == axom::core::runtime_policy::Policy::hip) { if(params.ndim == 2) { From db8d33d8753394ac788918c03c5f3160afa5938d Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 27 Nov 2023 09:10:05 -0800 Subject: [PATCH 225/639] Remove disabled code. --- .../quest/examples/quest_distributed_distance_query_example.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index 5db9cd8d9c..9551fc7cf0 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -689,8 +689,6 @@ struct BlueprintParticleMesh auto* fieldsGroup = domainGroup->createGroup("fields"); - // domainGroup->createViewScalar("state/domain_id", m_rank); - m_domainGroups.push_back(domainGroup); m_coordsGroups.push_back(coordsGroup); m_topoGroups.push_back(topoGroup); From f6d0e037890e0d98dbdac7e8ee59bc7ffb9a92c1 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 27 Nov 2023 10:34:11 -0800 Subject: [PATCH 226/639] Guard OpenMP-related code from non-OpenMP builds. --- .../quest_distributed_distance_query_example.cpp | 7 ++++--- src/axom/quest/examples/quest_marching_cubes_example.cpp | 9 +++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index a4f47ba6a2..1c1ebd5688 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -1288,9 +1288,10 @@ int main(int argc, char** argv) // Memory resource. For testing, choose device memory if appropriate. //--------------------------------------------------------------------------- const std::string umpireResourceName = - params.policy == RuntimePolicy::seq || params.policy == RuntimePolicy::omp - ? "HOST" - : + params.policy == RuntimePolicy::seq ? "HOST" : + #ifdef AXOM_USE_OPENMP + params.policy == RuntimePolicy::omp ? "HOST" : + #endif #if defined(UMPIRE_ENABLE_DEVICE) "DEVICE" #elif defined(UMPIRE_ENABLE_UM) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 3618a5c168..0cd0ed79ad 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -712,11 +712,16 @@ struct ContourTestBase axom::fmt::format("Testing with policy {} and function data on {}", params.policy, resourceName)); - if(params.policy == axom::core::runtime_policy::Policy::seq || - params.policy == axom::core::runtime_policy::Policy::omp) + if(params.policy == axom::core::runtime_policy::Policy::seq) { SLIC_ASSERT(resourceName == "HOST"); } +#ifdef AXOM_USE_OPENMP + else if(params.policy == axom::core::runtime_policy::Policy::omp) + { + SLIC_ASSERT(resourceName == "HOST"); + } +#endif else { SLIC_ASSERT(resourceName == "DEVICE"); From f5c023fe16b50b66716e0fd1a12139ac9196ac4f Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 27 Nov 2023 10:38:32 -0800 Subject: [PATCH 227/639] Reformat. --- src/axom/core/execution/runtime_policy.hpp | 44 +++++++++---------- src/axom/quest/DistributedClosestPoint.hpp | 5 +-- ...est_distributed_distance_query_example.cpp | 10 +++-- .../examples/quest_marching_cubes_example.cpp | 7 +-- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/axom/core/execution/runtime_policy.hpp b/src/axom/core/execution/runtime_policy.hpp index d922b400d9..621d73b34c 100644 --- a/src/axom/core/execution/runtime_policy.hpp +++ b/src/axom/core/execution/runtime_policy.hpp @@ -17,25 +17,28 @@ namespace core { namespace runtime_policy { - /// Execution policies supported by configuration. - enum class Policy - { - seq = 0 +/// Execution policies supported by configuration. +enum class Policy +{ + seq = 0 #if defined(AXOM_USE_RAJA) -#ifdef AXOM_USE_OPENMP - , omp = 1 -#endif -#if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) - , cuda = 2 + #ifdef AXOM_USE_OPENMP + , + omp = 1 + #endif + #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) + , + cuda = 2 + #endif + #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + , + hip = 3 + #endif #endif -#if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) - , hip = 3 -#endif -#endif - }; +}; - //! @brief Mapping from policy name to policy enum. - // clang-format off +//! @brief Mapping from policy name to policy enum. +// clang-format off static const std::map s_nameToPolicy { {"seq", Policy::seq} @@ -68,13 +71,10 @@ namespace runtime_policy #endif #endif }; - // clang-format on +// clang-format on - /// Utility function to allow formating a Policy - static inline auto format_as(Policy pol) - { - return axom::fmt::underlying(pol); - } +/// Utility function to allow formating a Policy +static inline auto format_as(Policy pol) { return axom::fmt::underlying(pol); } } // end namespace runtime_policy } // end namespace core diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index 72e3f936de..270f12a943 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -1429,10 +1429,7 @@ class DistributedClosestPoint } /// Set the runtime execution policy for the query - void setRuntimePolicy(RuntimePolicy policy) - { - m_runtimePolicy = policy; - } + void setRuntimePolicy(RuntimePolicy policy) { m_runtimePolicy = policy; } /*! @brief Sets the allocator ID to the default associated with the execution policy diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index 1c1ebd5688..15a0ac202b 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -168,7 +168,8 @@ struct Input app.add_option("-p, --policy", policy) ->description("Set runtime policy for point query method") ->capture_default_str() - ->transform(axom::CLI::CheckedTransformer(axom::core::runtime_policy::s_nameToPolicy)); + ->transform(axom::CLI::CheckedTransformer( + axom::core::runtime_policy::s_nameToPolicy)); app.add_flag("-c,--check-results,!--no-check-results", checkResults) ->description( @@ -1287,13 +1288,14 @@ int main(int argc, char** argv) //--------------------------------------------------------------------------- // Memory resource. For testing, choose device memory if appropriate. //--------------------------------------------------------------------------- - const std::string umpireResourceName = - params.policy == RuntimePolicy::seq ? "HOST" : + const std::string umpireResourceName = params.policy == RuntimePolicy::seq + ? "HOST" + : #ifdef AXOM_USE_OPENMP params.policy == RuntimePolicy::omp ? "HOST" : #endif #if defined(UMPIRE_ENABLE_DEVICE) - "DEVICE" + "DEVICE" #elif defined(UMPIRE_ENABLE_UM) "UM" #elif defined(UMPIRE_ENABLE_PINNED) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 0cd0ed79ad..d68505d21f 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -104,7 +104,8 @@ struct Input app.add_option("-p, --policy", policy) ->description("Set runtime policy for point query method") ->capture_default_str() - ->transform(axom::CLI::CheckedTransformer(axom::core::runtime_policy::s_nameToPolicy)); + ->transform(axom::CLI::CheckedTransformer( + axom::core::runtime_policy::s_nameToPolicy)); app.add_option("-m,--mesh-file", meshFile) ->description( @@ -716,12 +717,12 @@ struct ContourTestBase { SLIC_ASSERT(resourceName == "HOST"); } -#ifdef AXOM_USE_OPENMP + #ifdef AXOM_USE_OPENMP else if(params.policy == axom::core::runtime_policy::Policy::omp) { SLIC_ASSERT(resourceName == "HOST"); } -#endif + #endif else { SLIC_ASSERT(resourceName == "DEVICE"); From c75d9883c9fdb596b9bfba8d62933f8f84ba56a3 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 27 Nov 2023 13:33:52 -0800 Subject: [PATCH 228/639] Provide macro guards for policies not supported in the configuration. --- src/axom/core/execution/runtime_policy.hpp | 53 +++++++++------- src/axom/quest/DistributedClosestPoint.hpp | 61 +++++++------------ src/axom/quest/MarchingCubes.cpp | 6 +- src/axom/quest/MarchingCubes.hpp | 14 ----- ...est_distributed_distance_query_example.cpp | 2 +- .../examples/quest_marching_cubes_example.cpp | 8 +-- 6 files changed, 60 insertions(+), 84 deletions(-) diff --git a/src/axom/core/execution/runtime_policy.hpp b/src/axom/core/execution/runtime_policy.hpp index 621d73b34c..ffeba001d3 100644 --- a/src/axom/core/execution/runtime_policy.hpp +++ b/src/axom/core/execution/runtime_policy.hpp @@ -6,10 +6,25 @@ #ifndef AXOM_CORE_EXECUTION_RUNTIME_POLICY_HPP_ #define AXOM_CORE_EXECUTION_RUNTIME_POLICY_HPP_ -#include "axom/config.hpp" /* for compile time defs. */ -#include "axom/fmt/format.h" /* for axom::fmt */ -#include "axom/core/Macros.hpp" /* for AXOM_STATIC_ASSERT */ -#include "axom/core/execution/execution_space.hpp" /* execution_space traits */ +#include "axom/config.hpp" /* for compile time defs. */ +#include "axom/fmt/format.h" /* for axom::fmt */ + +#include + +// Helper preprocessor defines for using OPENMP, CUDA, and HIP policies. +// RAJA is required for using OpenMP, CUDA and HIP. +// UMPIRE is required for using CUDA and HIP. +#if defined(AXOM_USE_RAJA) + #ifdef AXOM_USE_OPENMP + #define AXOM_RUNTIME_POLICY_USE_OPENMP + #endif + #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) + #define AXOM_RUNTIME_POLICY_USE_CUDA + #endif + #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + #define AXOM_RUNTIME_POLICY_USE_HIP + #endif +#endif namespace axom { @@ -17,23 +32,21 @@ namespace core { namespace runtime_policy { -/// Execution policies supported by configuration. +/// Execution policies supported by Axom's configuration. enum class Policy { seq = 0 -#if defined(AXOM_USE_RAJA) - #ifdef AXOM_USE_OPENMP +#if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) , omp = 1 - #endif - #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) +#endif +#if defined(AXOM_RUNTIME_POLICY_USE_CUDA) , cuda = 2 - #endif - #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) +#endif +#if defined(AXOM_RUNTIME_POLICY_USE_HIP) , hip = 3 - #endif #endif }; @@ -42,16 +55,14 @@ enum class Policy static const std::map s_nameToPolicy { {"seq", Policy::seq} -#if defined(AXOM_USE_RAJA) -#ifdef AXOM_USE_OPENMP +#if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) , {"omp", Policy::omp} #endif -#if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) +#if defined(AXOM_RUNTIME_POLICY_USE_CUDA) , {"cuda", Policy::cuda} #endif -#if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) +#if defined(AXOM_RUNTIME_POLICY_USE_HIP) , {"hip", Policy::hip} -#endif #endif }; @@ -59,16 +70,14 @@ enum class Policy static const std::map s_policyToName { {Policy::seq, "seq"} -#if defined(AXOM_USE_RAJA) -#ifdef AXOM_USE_OPENMP +#if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) , {Policy::omp, "omp"} #endif -#if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) +#if defined(AXOM_RUNTIME_POLICY_USE_CUDA) , {Policy::cuda, "cuda"} #endif -#if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) +#if defined(AXOM_RUNTIME_POLICY_USE_HIP) , {Policy::hip, "hip"} -#endif #endif }; // clang-format on diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index 270f12a943..a40f92e685 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -34,20 +34,6 @@ #endif #include "mpi.h" -// Add some helper preprocessor defines for using OPENMP, CUDA, and HIP policies -// within the distributed closest point query. -#if defined(AXOM_USE_RAJA) - #ifdef AXOM_USE_OPENMP - #define _AXOM_DCP_USE_OPENMP - #endif - #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) - #define _AXOM_DCP_USE_CUDA - #endif - #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) - #define _AXOM_DCP_USE_HIP - #endif -#endif - namespace axom { namespace quest @@ -331,13 +317,13 @@ class DistributedClosestPointImpl using BoxArray = axom::Array; using SeqBVHTree = spin::BVH; -#ifdef _AXOM_DCP_USE_OPENMP +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP using OmpBVHTree = spin::BVH; #endif -#ifdef _AXOM_DCP_USE_CUDA +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA using CudaBVHTree = spin::BVH>; #endif -#ifdef _AXOM_DCP_USE_HIP +#ifdef AXOM_RUNTIME_POLICY_USE_HIP using HipBVHTree = spin::BVH>; #endif @@ -486,17 +472,17 @@ class DistributedClosestPointImpl case RuntimePolicy::seq: return m_bvh_seq.get() != nullptr; -#ifdef _AXOM_DCP_USE_OPENMP +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP case RuntimePolicy::omp: return m_bvh_omp.get() != nullptr; #endif -#ifdef _AXOM_DCP_USE_CUDA +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA case RuntimePolicy::cuda: return m_bvh_cuda.get() != nullptr; #endif -#ifdef _AXOM_DCP_USE_HIP +#ifdef AXOM_RUNTIME_POLICY_USE_HIP case RuntimePolicy::hip: return m_bvh_hip.get() != nullptr; #endif @@ -527,19 +513,19 @@ class DistributedClosestPointImpl m_bvh_seq = std::make_unique(); return generateBVHTreeImpl(m_bvh_seq.get()); -#ifdef _AXOM_DCP_USE_OPENMP +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP case RuntimePolicy::omp: m_bvh_omp = std::make_unique(); return generateBVHTreeImpl(m_bvh_omp.get()); #endif -#ifdef _AXOM_DCP_USE_CUDA +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA case RuntimePolicy::cuda: m_bvh_cuda = std::make_unique(); return generateBVHTreeImpl(m_bvh_cuda.get()); #endif -#ifdef _AXOM_DCP_USE_HIP +#ifdef AXOM_RUNTIME_POLICY_USE_HIP case RuntimePolicy::hip: m_bvh_hip = std::make_unique(); return generateBVHTreeImpl(m_bvh_hip.get()); @@ -566,19 +552,19 @@ class DistributedClosestPointImpl local_bb = m_bvh_seq->getBounds(); break; -#ifdef _AXOM_DCP_USE_OPENMP +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP case RuntimePolicy::omp: local_bb = m_bvh_omp->getBounds(); break; #endif -#ifdef _AXOM_DCP_USE_CUDA +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA case RuntimePolicy::cuda: local_bb = m_bvh_cuda->getBounds(); break; #endif -#ifdef _AXOM_DCP_USE_HIP +#ifdef AXOM_RUNTIME_POLICY_USE_HIP case RuntimePolicy::hip: local_bb = m_bvh_hip->getBounds(); break; @@ -985,19 +971,19 @@ class DistributedClosestPointImpl computeLocalClosestPoints(m_bvh_seq.get(), xferNode); break; -#ifdef _AXOM_DCP_USE_OPENMP +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP case RuntimePolicy::omp: computeLocalClosestPoints(m_bvh_omp.get(), xferNode); #endif break; -#ifdef _AXOM_DCP_USE_CUDA +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA case RuntimePolicy::cuda: computeLocalClosestPoints(m_bvh_cuda.get(), xferNode); #endif break; -#ifdef _AXOM_DCP_USE_HIP +#ifdef AXOM_RUNTIME_POLICY_USE_HIP case RuntimePolicy::hip: computeLocalClosestPoints(m_bvh_hip.get(), xferNode); #endif @@ -1360,15 +1346,15 @@ class DistributedClosestPointImpl std::unique_ptr m_bvh_seq; -#ifdef _AXOM_DCP_USE_OPENMP +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP std::unique_ptr m_bvh_omp; #endif -#ifdef _AXOM_DCP_USE_CUDA +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA std::unique_ptr m_bvh_cuda; #endif -#ifdef _AXOM_DCP_USE_HIP +#ifdef AXOM_RUNTIME_POLICY_USE_HIP std::unique_ptr m_bvh_hip; #endif }; // DistributedClosestPointImpl @@ -1443,20 +1429,20 @@ class DistributedClosestPoint defaultAllocatorID = axom::execution_space::allocatorID(); break; -#ifdef _AXOM_DCP_USE_OPENMP +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP case RuntimePolicy::omp: defaultAllocatorID = axom::execution_space::allocatorID(); break; #endif -#ifdef _AXOM_DCP_USE_CUDA +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA case RuntimePolicy::cuda: defaultAllocatorID = axom::execution_space>::allocatorID(); break; #endif -#ifdef _AXOM_DCP_USE_HIP +#ifdef AXOM_RUNTIME_POLICY_USE_HIP case RuntimePolicy::hip: defaultAllocatorID = axom::execution_space>::allocatorID(); @@ -1754,9 +1740,4 @@ class DistributedClosestPoint } // end namespace quest } // end namespace axom -// Cleanup local #defines -#undef _AXOM_DCP_USE_OPENMP -#undef _AXOM_DCP_USE_CUDA -#undef _AXOM_DCP_USE_HIP - #endif // QUEST_DISTRIBUTED_CLOSEST_POINT_H_ diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 98a6415ce5..d20f4c4644 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -234,7 +234,7 @@ void MarchingCubesSingleDomain::allocateImpl() : std::unique_ptr( new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); } - #ifdef _AXOM_MARCHINGCUBES_USE_OPENMP + #ifdef AXOM_RUNTIME_POLICY_USE_OPENMP else if(m_runtimePolicy == RuntimePolicy::omp) { m_impl = m_ndim == 2 @@ -244,7 +244,7 @@ void MarchingCubesSingleDomain::allocateImpl() new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>); } #endif - #ifdef _AXOM_MARCHINGCUBES_USE_CUDA + #ifdef AXOM_RUNTIME_POLICY_USE_CUDA else if(m_runtimePolicy == RuntimePolicy::cuda) { m_impl = m_ndim == 2 @@ -254,7 +254,7 @@ void MarchingCubesSingleDomain::allocateImpl() new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); } #endif - #ifdef _AXOM_MARCHINGCUBES_USE_HIP + #ifdef AXOM_RUNTIME_POLICY_USE_HIP else if(m_runtimePolicy == RuntimePolicy::hip) { m_impl = m_ndim == 2 diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 73898c5f13..92a4bfa74e 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -28,20 +28,6 @@ // C++ includes #include - // Add some helper preprocessor defines for using OPENMP, CUDA, and HIP policies - // within the marching cubes implementation. - #if defined(AXOM_USE_RAJA) - #ifdef AXOM_USE_OPENMP - #define _AXOM_MARCHINGCUBES_USE_OPENMP - #endif - #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) - #define _AXOM_MARCHINGCUBES_USE_CUDA - #endif - #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) - #define _AXOM_MARCHINGCUBES_USE_HIP - #endif - #endif - namespace axom { namespace quest diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index 15a0ac202b..75af0f43bd 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -1291,7 +1291,7 @@ int main(int argc, char** argv) const std::string umpireResourceName = params.policy == RuntimePolicy::seq ? "HOST" : - #ifdef AXOM_USE_OPENMP + #if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) params.policy == RuntimePolicy::omp ? "HOST" : #endif #if defined(UMPIRE_ENABLE_DEVICE) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index d68505d21f..3010d3fbb7 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -216,20 +216,20 @@ static int allocatorIdForPolicy(axom::core::runtime_policy::Policy policy) aid = axom::execution_space::allocatorID(); } #if defined(AXOM_USE_RAJA) -#ifdef _AXOM_MARCHINGCUBES_USE_OPENMP +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP else if(policy == axom::core::runtime_policy::Policy::omp) { aid = axom::execution_space::allocatorID(); } #endif -#ifdef _AXOM_MARCHINGCUBES_USE_CUDA +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA else if(policy == axom::core::runtime_policy::Policy::cuda) { // aid = axom::execution_space>::allocatorID(); aid = axom::getUmpireResourceAllocatorID(umpire::resource::Device); } #endif -#ifdef _AXOM_MARCHINGCUBES_USE_HIP +#ifdef AXOM_RUNTIME_POLICY_USE_HIP else if(policy == axom::core::runtime_policy::Policy::hip) { // aid = axom::execution_space>::allocatorID(); @@ -717,7 +717,7 @@ struct ContourTestBase { SLIC_ASSERT(resourceName == "HOST"); } - #ifdef AXOM_USE_OPENMP + #if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) else if(params.policy == axom::core::runtime_policy::Policy::omp) { SLIC_ASSERT(resourceName == "HOST"); From 7206fe9a2af7f8d8684c7069b7fa2a9ba692b1cb Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 27 Nov 2023 15:29:45 -0800 Subject: [PATCH 229/639] Remove an obsolete #ifdef guard. --- src/axom/quest/examples/quest_marching_cubes_example.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 3010d3fbb7..ba5be0a3e5 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -215,7 +215,6 @@ static int allocatorIdForPolicy(axom::core::runtime_policy::Policy policy) { aid = axom::execution_space::allocatorID(); } -#if defined(AXOM_USE_RAJA) #ifdef AXOM_RUNTIME_POLICY_USE_OPENMP else if(policy == axom::core::runtime_policy::Policy::omp) { @@ -235,7 +234,6 @@ static int allocatorIdForPolicy(axom::core::runtime_policy::Policy policy) // aid = axom::execution_space>::allocatorID(); aid = axom::getUmpireResourceAllocatorID(umpire::resource::Device); } -#endif #endif // clang-format on From 56da008f0084e0eac407e7870642c80e82e2be7e Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 28 Nov 2023 08:57:29 -0800 Subject: [PATCH 230/639] Remove core namespace and put runtime policy directly in axom. --- src/axom/core/execution/runtime_policy.hpp | 3 -- src/axom/quest/DistributedClosestPoint.hpp | 4 +-- src/axom/quest/MarchingCubes.hpp | 4 +-- ...est_distributed_distance_query_example.cpp | 4 +-- .../examples/quest_marching_cubes_example.cpp | 28 +++++++++---------- 5 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/axom/core/execution/runtime_policy.hpp b/src/axom/core/execution/runtime_policy.hpp index ffeba001d3..25d4a832f7 100644 --- a/src/axom/core/execution/runtime_policy.hpp +++ b/src/axom/core/execution/runtime_policy.hpp @@ -28,8 +28,6 @@ namespace axom { -namespace core -{ namespace runtime_policy { /// Execution policies supported by Axom's configuration. @@ -86,7 +84,6 @@ enum class Policy static inline auto format_as(Policy pol) { return axom::fmt::underlying(pol); } } // end namespace runtime_policy -} // end namespace core } // end namespace axom #endif /* AXOM_CORE_EXECUTION_RUNTIME_POLICY_HPP_ */ diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index a40f92e685..2cdc22ca78 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -310,7 +310,7 @@ class DistributedClosestPointImpl { public: static constexpr int DIM = NDIMS; - using RuntimePolicy = axom::core::runtime_policy::Policy; + using RuntimePolicy = axom::runtime_policy::Policy; using PointType = primal::Point; using BoxType = primal::BoundingBox; using PointArray = axom::Array; @@ -1390,7 +1390,7 @@ class DistributedClosestPointImpl class DistributedClosestPoint { public: - using RuntimePolicy = axom::core::runtime_policy::Policy; + using RuntimePolicy = axom::runtime_policy::Policy; public: DistributedClosestPoint() diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 92a4bfa74e..a4e8281470 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -82,7 +82,7 @@ class MarchingCubesSingleDomain; class MarchingCubes { public: - using RuntimePolicy = axom::core::runtime_policy::Policy; + using RuntimePolicy = axom::runtime_policy::Policy; /*! * \brief Constructor sets up computational mesh and data for running the * marching cubes algorithm. @@ -176,7 +176,7 @@ class MarchingCubesSingleDomain friend class detail::marching_cubes::MarchingCubesImpl; public: - using RuntimePolicy = axom::core::runtime_policy::Policy; + using RuntimePolicy = axom::runtime_policy::Policy; /*! * \brief Constructor for applying algorithm in a single domain. * See MarchingCubes for the multi-domain implementation. diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index 75af0f43bd..17f86c5d37 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -49,7 +49,7 @@ namespace primal = axom::primal; namespace mint = axom::mint; namespace numerics = axom::numerics; -using RuntimePolicy = axom::core::runtime_policy::Policy; +using RuntimePolicy = axom::runtime_policy::Policy; // converts the input string into an 80 character string // padded on both sides with '=' symbols @@ -169,7 +169,7 @@ struct Input ->description("Set runtime policy for point query method") ->capture_default_str() ->transform(axom::CLI::CheckedTransformer( - axom::core::runtime_policy::s_nameToPolicy)); + axom::runtime_policy::s_nameToPolicy)); app.add_flag("-c,--check-results,!--no-check-results", checkResults) ->description( diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index ba5be0a3e5..52d9f0984d 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -90,8 +90,8 @@ struct Input bool checkResults {false}; - axom::core::runtime_policy::Policy policy { - axom::core::runtime_policy::Policy::seq}; + axom::runtime_policy::Policy policy { + axom::runtime_policy::Policy::seq}; private: bool _verboseOutput {false}; @@ -105,7 +105,7 @@ struct Input ->description("Set runtime policy for point query method") ->capture_default_str() ->transform(axom::CLI::CheckedTransformer( - axom::core::runtime_policy::s_nameToPolicy)); + axom::runtime_policy::s_nameToPolicy)); app.add_option("-m,--mesh-file", meshFile) ->description( @@ -203,7 +203,7 @@ struct Input //!@brief Our allocator id, based on execution policy. static int s_allocatorId = axom::INVALID_ALLOCATOR_ID; // Set in main. -static int allocatorIdForPolicy(axom::core::runtime_policy::Policy policy) +static int allocatorIdForPolicy(axom::runtime_policy::Policy policy) { //--------------------------------------------------------------------------- // Set default allocator for possibly testing on devices @@ -211,25 +211,25 @@ static int allocatorIdForPolicy(axom::core::runtime_policy::Policy policy) int aid = axom::INVALID_ALLOCATOR_ID; // clang-format off - if(policy == axom::core::runtime_policy::Policy::seq) + if(policy == axom::runtime_policy::Policy::seq) { aid = axom::execution_space::allocatorID(); } #ifdef AXOM_RUNTIME_POLICY_USE_OPENMP - else if(policy == axom::core::runtime_policy::Policy::omp) + else if(policy == axom::runtime_policy::Policy::omp) { aid = axom::execution_space::allocatorID(); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_CUDA - else if(policy == axom::core::runtime_policy::Policy::cuda) + else if(policy == axom::runtime_policy::Policy::cuda) { // aid = axom::execution_space>::allocatorID(); aid = axom::getUmpireResourceAllocatorID(umpire::resource::Device); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_HIP - else if(policy == axom::core::runtime_policy::Policy::hip) + else if(policy == axom::runtime_policy::Policy::hip) { // aid = axom::execution_space>::allocatorID(); aid = axom::getUmpireResourceAllocatorID(umpire::resource::Device); @@ -711,12 +711,12 @@ struct ContourTestBase axom::fmt::format("Testing with policy {} and function data on {}", params.policy, resourceName)); - if(params.policy == axom::core::runtime_policy::Policy::seq) + if(params.policy == axom::runtime_policy::Policy::seq) { SLIC_ASSERT(resourceName == "HOST"); } #if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) - else if(params.policy == axom::core::runtime_policy::Policy::omp) + else if(params.policy == axom::runtime_policy::Policy::omp) { SLIC_ASSERT(resourceName == "HOST"); } @@ -1569,7 +1569,7 @@ int main(int argc, char** argv) // Run test in the execution space set by command line. //--------------------------------------------------------------------------- int errCount = 0; - if(params.policy == axom::core::runtime_policy::Policy::seq) + if(params.policy == axom::runtime_policy::Policy::seq) { if(params.ndim == 2) { @@ -1582,7 +1582,7 @@ int main(int argc, char** argv) } #if defined(AXOM_USE_RAJA) #ifdef AXOM_USE_OPENMP - else if(params.policy == axom::core::runtime_policy::Policy::omp) + else if(params.policy == axom::runtime_policy::Policy::omp) { if(params.ndim == 2) { @@ -1595,7 +1595,7 @@ int main(int argc, char** argv) } #endif #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) - else if(params.policy == axom::core::runtime_policy::Policy::cuda) + else if(params.policy == axom::runtime_policy::Policy::cuda) { if(params.ndim == 2) { @@ -1608,7 +1608,7 @@ int main(int argc, char** argv) } #endif #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) - else if(params.policy == axom::core::runtime_policy::Policy::hip) + else if(params.policy == axom::runtime_policy::Policy::hip) { if(params.ndim == 2) { From 5e9634a02a05a71c896fac4a283395fa2aca1515 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 28 Nov 2023 10:02:48 -0800 Subject: [PATCH 231/639] Add doxigen documentation for runtime_policy.hpp. --- src/axom/core/execution/execution_space.hpp | 2 ++ src/axom/core/execution/runtime_policy.hpp | 34 +++++++++++++++++-- ...est_distributed_distance_query_example.cpp | 4 +-- .../examples/quest_marching_cubes_example.cpp | 7 ++-- src/docs/doxygen/Doxyfile.in | 5 ++- 5 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/axom/core/execution/execution_space.hpp b/src/axom/core/execution/execution_space.hpp index 7fab6976aa..888cc9e856 100644 --- a/src/axom/core/execution/execution_space.hpp +++ b/src/axom/core/execution/execution_space.hpp @@ -56,6 +56,8 @@ * * The execution spaces bind the corresponding RAJA execution policies and * default memory space. + * + * @see runtime_policy.hpp */ namespace axom diff --git a/src/axom/core/execution/runtime_policy.hpp b/src/axom/core/execution/runtime_policy.hpp index 25d4a832f7..8033a66a99 100644 --- a/src/axom/core/execution/runtime_policy.hpp +++ b/src/axom/core/execution/runtime_policy.hpp @@ -11,9 +11,37 @@ #include +/*! + @file runtime_policy.hpp + + @brief Define runtime policies symbols for selecting. + + The policies are enums corresponding to + \a axom::execution_space template parameters. + The difference is that runtime policies are selected at + run time while \a axom::execution_space is specialized + at build time. + @see execution_space.hpp. + + The possible runtime parameters are + - @c seq: sequential execution on the host + - @c omp: OpenMP execution + - @c cuda: GPU execution via CUDA + - @c hip: GPU execution via HIP + + The available policies depend on how Axom is configured. + RAJA is required for using OpenMP, CUDA and HIP. + UMPIRE is required for using CUDA and HIP. + Sequential execution on host is always available. + + These macros are defined to indicate available non-sequential + policies. + - @c AXOM_RUNTIME_POLICY_USE_OPENMP + - @c AXOM_RUNTIME_POLICY_USE_CUDA + - @c AXOM_RUNTIME_POLICY_USE_HIP +*/ + // Helper preprocessor defines for using OPENMP, CUDA, and HIP policies. -// RAJA is required for using OpenMP, CUDA and HIP. -// UMPIRE is required for using CUDA and HIP. #if defined(AXOM_USE_RAJA) #ifdef AXOM_USE_OPENMP #define AXOM_RUNTIME_POLICY_USE_OPENMP @@ -30,7 +58,7 @@ namespace axom { namespace runtime_policy { -/// Execution policies supported by Axom's configuration. +/// Execution policies. The supported set depends on Axom's configuration. enum class Policy { seq = 0 diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index 17f86c5d37..9527a67f6b 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -168,8 +168,8 @@ struct Input app.add_option("-p, --policy", policy) ->description("Set runtime policy for point query method") ->capture_default_str() - ->transform(axom::CLI::CheckedTransformer( - axom::runtime_policy::s_nameToPolicy)); + ->transform( + axom::CLI::CheckedTransformer(axom::runtime_policy::s_nameToPolicy)); app.add_flag("-c,--check-results,!--no-check-results", checkResults) ->description( diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 52d9f0984d..d38041257f 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -90,8 +90,7 @@ struct Input bool checkResults {false}; - axom::runtime_policy::Policy policy { - axom::runtime_policy::Policy::seq}; + axom::runtime_policy::Policy policy {axom::runtime_policy::Policy::seq}; private: bool _verboseOutput {false}; @@ -104,8 +103,8 @@ struct Input app.add_option("-p, --policy", policy) ->description("Set runtime policy for point query method") ->capture_default_str() - ->transform(axom::CLI::CheckedTransformer( - axom::runtime_policy::s_nameToPolicy)); + ->transform( + axom::CLI::CheckedTransformer(axom::runtime_policy::s_nameToPolicy)); app.add_option("-m,--mesh-file", meshFile) ->description( diff --git a/src/docs/doxygen/Doxyfile.in b/src/docs/doxygen/Doxyfile.in index 82f8c1d8f2..548d1bfad6 100644 --- a/src/docs/doxygen/Doxyfile.in +++ b/src/docs/doxygen/Doxyfile.in @@ -2067,7 +2067,10 @@ INCLUDE_FILE_PATTERNS = # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. PREDEFINED = MINT_USE_SIDRE \ - AXOM_DEBUG + AXOM_DEBUG \ + AXOM_RUNTIME_POLICY_USE_OPENMP \ + AXOM_RUNTIME_POLICY_USE_CUDA \ + AXOM_RUNTIME_POLICY_USE_HIP # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this # tag can be used to specify a list of macro names that should be expanded. The From f26876175f5c2873a388eb9ada669892367c7d18 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 28 Nov 2023 10:14:22 -0800 Subject: [PATCH 232/639] Shorten awkwardly long type name. --- src/axom/quest/examples/quest_marching_cubes_example.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index d38041257f..96db8e492f 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -59,6 +59,8 @@ namespace primal = axom::primal; namespace mint = axom::mint; namespace numerics = axom::numerics; +using RuntimePolicy = axom::runtime_policy::Policy; + /////////////////////////////////////////////////////////////// // converts the input string into an 80 character string // padded on both sides with '=' symbols @@ -90,7 +92,7 @@ struct Input bool checkResults {false}; - axom::runtime_policy::Policy policy {axom::runtime_policy::Policy::seq}; + RuntimePolicy policy {RuntimePolicy::seq}; private: bool _verboseOutput {false}; From c99ef61b825adb537a08ba782a4bc89054f65de0 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 28 Nov 2023 10:57:18 -0800 Subject: [PATCH 233/639] Use new axom::RuntimePolicy in the intersection shaper. --- src/axom/quest/IntersectionShaper.hpp | 65 +++------ src/axom/quest/examples/shaping_driver.cpp | 31 +--- .../quest/tests/quest_intersection_shaper.cpp | 134 +++++++++--------- 3 files changed, 94 insertions(+), 136 deletions(-) diff --git a/src/axom/quest/IntersectionShaper.hpp b/src/axom/quest/IntersectionShaper.hpp index 31a38074c0..a6d79d7838 100644 --- a/src/axom/quest/IntersectionShaper.hpp +++ b/src/axom/quest/IntersectionShaper.hpp @@ -294,14 +294,7 @@ class IntersectionShaper : public Shaper using TetrahedronType = primal::Tetrahedron; using SegmentMesh = mint::UnstructuredMesh; - /// Choose runtime policy for RAJA - enum ExecPolicy - { - seq = 0, - omp = 1, - cuda = 2, - hip = 3 - }; + using RuntimePolicy = axom::runtime_policy::Policy; static constexpr int DEFAULT_CIRCLE_REFINEMENT_LEVEL {7}; static constexpr double DEFAULT_REVOLVED_VOLUME {0.}; @@ -319,7 +312,7 @@ class IntersectionShaper : public Shaper void setLevel(int level) { m_level = level; } - void setExecPolicy(int policy) { m_execPolicy = (ExecPolicy)policy; } + void setExecPolicy(RuntimePolicy policy) { m_execPolicy = policy; } /*! * \brief Set the name of the material used to account for free volume fractions. @@ -1368,30 +1361,27 @@ class IntersectionShaper : public Shaper switch(m_execPolicy) { #if defined(AXOM_USE_RAJA) && defined(AXOM_USE_UMPIRE) - case seq: + case RuntimePolicy::seq: applyReplacementRulesImpl(shape); break; #if defined(AXOM_USE_OPENMP) - case omp: + case RuntimePolicy::omp: applyReplacementRulesImpl(shape); break; #endif // AXOM_USE_OPENMP #if defined(AXOM_USE_CUDA) - case cuda: + case RuntimePolicy::cuda: applyReplacementRulesImpl(shape); break; #endif // AXOM_USE_CUDA #if defined(AXOM_USE_HIP) - case hip: + case RuntimePolicy::hip: applyReplacementRulesImpl(shape); break; #endif // AXOM_USE_HIP #endif // AXOM_USE_RAJA && AXOM_USE_UMPIRE - default: - AXOM_UNUSED_VAR(shape); - SLIC_ERROR("Unhandled runtime policy case " << m_execPolicy); - break; } + AXOM_UNUSED_VAR(shape); } void finalizeShapeQuery() override @@ -1426,31 +1416,28 @@ class IntersectionShaper : public Shaper switch(m_execPolicy) { #if defined(AXOM_USE_RAJA) && defined(AXOM_USE_UMPIRE) - case seq: + case RuntimePolicy::seq: prepareShapeQueryImpl(shapeDimension, shape); break; #if defined(AXOM_USE_OPENMP) - case omp: + case RuntimePolicy::omp: prepareShapeQueryImpl(shapeDimension, shape); break; #endif // AXOM_USE_OPENMP #if defined(AXOM_USE_CUDA) - case cuda: + case RuntimePolicy::cuda: prepareShapeQueryImpl(shapeDimension, shape); break; #endif // AXOM_USE_CUDA #if defined(AXOM_USE_HIP) - case hip: + case RuntimePolicy::hip: prepareShapeQueryImpl(shapeDimension, shape); break; #endif // AXOM_USE_HIP #endif // AXOM_USE_RAJA && AXOM_USE_UMPIRE - default: - AXOM_UNUSED_VAR(shapeDimension); - AXOM_UNUSED_VAR(shape); - SLIC_ERROR("Unhandled runtime policy case " << m_execPolicy); - break; } + AXOM_UNUSED_VAR(shapeDimension); + AXOM_UNUSED_VAR(shape); // Restore m_percentError, m_level in case refineShape changed them. m_percentError = saved_percentError; @@ -1469,29 +1456,25 @@ class IntersectionShaper : public Shaper switch(m_execPolicy) { #if defined(AXOM_USE_RAJA) && defined(AXOM_USE_UMPIRE) - case seq: + case RuntimePolicy::seq: runShapeQueryImpl(shape, m_tets, m_tetcount); break; #if defined(AXOM_USE_OPENMP) - case omp: + case RuntimePolicy::omp: runShapeQueryImpl(shape, m_tets, m_tetcount); break; #endif // AXOM_USE_OPENMP #if defined(AXOM_USE_CUDA) - case cuda: + case RuntimePolicy::cuda: runShapeQueryImpl(shape, m_tets, m_tetcount); break; #endif // AXOM_USE_CUDA #if defined(AXOM_USE_HIP) - case hip: + case RuntimePolicy::hip: runShapeQueryImpl(shape, m_tets, m_tetcount); break; #endif // AXOM_USE_HIP #endif // AXOM_USE_RAJA && AXOM_USE_UMPIRE - default: - AXOM_UNUSED_VAR(shape); - SLIC_ERROR("Unhandled runtime policy case " << m_execPolicy); - break; } } else if(shapeFormat == "c2c") @@ -1499,29 +1482,25 @@ class IntersectionShaper : public Shaper switch(m_execPolicy) { #if defined(AXOM_USE_RAJA) && defined(AXOM_USE_UMPIRE) - case seq: + case RuntimePolicy::seq: runShapeQueryImpl(shape, m_octs, m_octcount); break; #if defined(AXOM_USE_OPENMP) - case omp: + case RuntimePolicy::omp: runShapeQueryImpl(shape, m_octs, m_octcount); break; #endif // AXOM_USE_OPENMP #if defined(AXOM_USE_CUDA) - case cuda: + case RuntimePolicy::cuda: runShapeQueryImpl(shape, m_octs, m_octcount); break; #endif // AXOM_USE_CUDA #if defined(AXOM_USE_HIP) - case hip: + case RuntimePolicy::hip: runShapeQueryImpl(shape, m_octs, m_octcount); break; #endif // AXOM_USE_HIP #endif // AXOM_USE_RAJA && AXOM_USE_UMPIRE - default: - AXOM_UNUSED_VAR(shape); - SLIC_ERROR("Unhandled runtime policy case " << m_execPolicy); - break; } } else @@ -2009,7 +1988,7 @@ class IntersectionShaper : public Shaper } private: - ExecPolicy m_execPolicy {seq}; + RuntimePolicy m_execPolicy {RuntimePolicy::seq}; int m_level {DEFAULT_CIRCLE_REFINEMENT_LEVEL}; double m_revolvedVolume {DEFAULT_REVOLVED_VOLUME}; int m_num_elements {0}; diff --git a/src/axom/quest/examples/shaping_driver.cpp b/src/axom/quest/examples/shaping_driver.cpp index 874cabd859..0ccbf4a35d 100644 --- a/src/axom/quest/examples/shaping_driver.cpp +++ b/src/axom/quest/examples/shaping_driver.cpp @@ -59,14 +59,7 @@ enum class ShapingMethod : int Intersection }; -/// Choose runtime policy for RAJA -enum RuntimePolicy -{ - seq = 0, - omp = 1, - cuda = 2, - hip = 3 -}; +using RuntimePolicy = axom::runtime_policy::Policy; /// Struct to parse and store the input parameters struct Input @@ -84,7 +77,7 @@ struct Input klee::ShapeSet shapeSet; ShapingMethod shapingMethod {ShapingMethod::Sampling}; - RuntimePolicy policy {seq}; + RuntimePolicy policy {RuntimePolicy::seq}; int quadratureOrder {5}; int outputOrder {2}; int samplesPerKnotSpan {25}; @@ -99,23 +92,6 @@ struct Input private: bool m_verboseOutput {false}; - // clang-format off - const std::map s_validPolicies{ - #if defined(AXOM_USE_RAJA) && defined(AXOM_USE_UMPIRE) - {"seq", seq} - #ifdef AXOM_USE_OPENMP - , {"omp", omp} - #endif - #ifdef AXOM_USE_CUDA - , {"cuda", cuda} - #endif - #ifdef AXOM_USE_HIP - , {"hip", hip} - #endif - #endif - }; - // clang-format on - public: bool isVerbose() const { return m_verboseOutput; } @@ -348,7 +324,8 @@ struct Input intersection_options->add_option("-p, --policy", policy, pol_sstr.str()) ->capture_default_str() - ->transform(axom::CLI::CheckedTransformer(s_validPolicies)); + ->transform( + axom::CLI::CheckedTransformer(axom::runtime_policy::s_nameToPolicy)); } app.get_formatter()->column_width(50); diff --git a/src/axom/quest/tests/quest_intersection_shaper.cpp b/src/axom/quest/tests/quest_intersection_shaper.cpp index 9ba44ce092..05c4efe733 100644 --- a/src/axom/quest/tests/quest_intersection_shaper.cpp +++ b/src/axom/quest/tests/quest_intersection_shaper.cpp @@ -73,6 +73,8 @@ namespace quest = axom::quest; namespace sidre = axom::sidre; namespace slic = axom::slic; +using RuntimePolicy = axom::runtime_policy::Policy; + std::string pjoin(const std::string &path, const std::string &filename) { return axom::utilities::filesystem::joinPath(path, filename); @@ -283,7 +285,7 @@ bool loadBaseline(const std::string &filename, conduit::Node &n) void replacementRuleTest(const std::string &shapeFile, const std::string &policyName, - int policy, + RuntimePolicy policy, double tolerance, bool initialMats = false) { @@ -401,7 +403,7 @@ void replacementRuleTest(const std::string &shapeFile, void replacementRuleTestSet(const std::vector &cases, const std::string &policyName, - int policy, + RuntimePolicy policy, double tolerance, bool initialMats = false) { @@ -418,7 +420,7 @@ void IntersectionWithErrorTolerances(const std::string &filebase, int refinementLevel, double targetPercentError, const std::string &policyName, - int policy, + RuntimePolicy policy, double revolvedVolumeEPS = 1.e-4) { SLIC_INFO(axom::fmt::format("Testing {} with {}", filebase, policyName)); @@ -504,7 +506,8 @@ void IntersectionWithErrorTolerances(const std::string &filebase, } //--------------------------------------------------------------------------- -void dynamicRefinementTest_Line(const std::string &policyName, int policy) +void dynamicRefinementTest_Line(const std::string &policyName, + RuntimePolicy policy) { const std::string contour = R"(piece = line(start=(2cm,0cm), end=(2cm,2cm)) )"; @@ -538,7 +541,8 @@ dimensions: 3 } //--------------------------------------------------------------------------- -void dynamicRefinementTest_Cone(const std::string &policyName, int policy) +void dynamicRefinementTest_Cone(const std::string &policyName, + RuntimePolicy policy) { const std::string contour = R"(piece = line(start=(2cm,0cm), end=(3cm,2cm)) )"; @@ -572,7 +576,8 @@ dimensions: 3 } //--------------------------------------------------------------------------- -void dynamicRefinementTest_Spline(const std::string &policyName, int policy) +void dynamicRefinementTest_Spline(const std::string &policyName, + RuntimePolicy policy) { const std::string contour = R"(piece = rz(units=cm, rz=2 0 @@ -611,7 +616,8 @@ dimensions: 3 } //--------------------------------------------------------------------------- -void dynamicRefinementTest_Circle(const std::string &policyName, int policy) +void dynamicRefinementTest_Circle(const std::string &policyName, + RuntimePolicy policy) { const std::string contour = R"(piece = circle(origin=(0cm,0cm), radius=8cm, start=0deg, end=180deg) @@ -647,7 +653,8 @@ dimensions: 3 } //--------------------------------------------------------------------------- -void dynamicRefinementTest_LineTranslate(const std::string &policyName, int policy) +void dynamicRefinementTest_LineTranslate(const std::string &policyName, + RuntimePolicy policy) { const std::string contour = R"(piece = line(start=(2cm,0cm), end=(2cm,2cm)) )"; @@ -685,7 +692,8 @@ dimensions: 3 } //--------------------------------------------------------------------------- -void dynamicRefinementTest_LineScale(const std::string &policyName, int policy) +void dynamicRefinementTest_LineScale(const std::string &policyName, + RuntimePolicy policy) { const std::string contour = R"(piece = line(start=(2cm,0cm), end=(2cm,2cm)) )"; @@ -723,7 +731,8 @@ dimensions: 3 } //--------------------------------------------------------------------------- -void dynamicRefinementTest_LineRotate(const std::string &policyName, int policy) +void dynamicRefinementTest_LineRotate(const std::string &policyName, + RuntimePolicy policy) { const std::string contour = R"(piece = line(start=(2cm,0cm), end=(2cm,2cm)) )"; @@ -769,35 +778,31 @@ dimensions: 3 TEST(IntersectionShaperTest, case1_seq) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case1, "seq", quest::IntersectionShaper::seq, tolerance); + replacementRuleTestSet(case1, "seq", RuntimePolicy::seq, tolerance); } #endif #if defined(AXOM_USE_OPENMP) TEST(IntersectionShaperTest, case1_omp) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case1, "omp", quest::IntersectionShaper::omp, tolerance); + replacementRuleTestSet(case1, "omp", RuntimePolicy::omp, tolerance); // Include a version that has some initial materials. - replacementRuleTestSet(case1, - "omp", - quest::IntersectionShaper::omp, - tolerance, - true); + replacementRuleTestSet(case1, "omp", RuntimePolicy::omp, tolerance, true); } #endif #if defined(AXOM_USE_CUDA) TEST(IntersectionShaperTest, case1_cuda) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case1, "cuda", quest::IntersectionShaper::cuda, tolerance); + replacementRuleTestSet(case1, "cuda", RuntimePolicy::cuda, tolerance); } #endif #if defined(AXOM_USE_HIP) TEST(IntersectionShaperTest, case1_hip) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case1, "hip", quest::IntersectionShaper::hip, tolerance); + replacementRuleTestSet(case1, "hip", RuntimePolicy::hip, tolerance); } #endif #endif @@ -808,28 +813,28 @@ TEST(IntersectionShaperTest, case1_hip) TEST(IntersectionShaperTest, case2_seq) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case2, "seq", quest::IntersectionShaper::seq, tolerance); + replacementRuleTestSet(case2, "seq", RuntimePolicy::seq, tolerance); } #endif #if defined(AXOM_USE_OPENMP) TEST(IntersectionShaperTest, case2_omp) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case2, "omp", quest::IntersectionShaper::omp, tolerance); + replacementRuleTestSet(case2, "omp", RuntimePolicy::omp, tolerance); } #endif #if defined(AXOM_USE_CUDA) TEST(IntersectionShaperTest, case2_cuda) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case2, "cuda", quest::IntersectionShaper::cuda, tolerance); + replacementRuleTestSet(case2, "cuda", RuntimePolicy::cuda, tolerance); } #endif #if defined(AXOM_USE_HIP) TEST(IntersectionShaperTest, case2_hip) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case2, "hip", quest::IntersectionShaper::hip, tolerance); + replacementRuleTestSet(case2, "hip", RuntimePolicy::hip, tolerance); } #endif #endif @@ -840,28 +845,28 @@ TEST(IntersectionShaperTest, case2_hip) TEST(IntersectionShaperTest, case3_seq) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case3, "seq", quest::IntersectionShaper::seq, tolerance); + replacementRuleTestSet(case3, "seq", RuntimePolicy::seq, tolerance); } #endif #if defined(AXOM_USE_OPENMP) TEST(IntersectionShaperTest, case3_omp) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case3, "omp", quest::IntersectionShaper::omp, tolerance); + replacementRuleTestSet(case3, "omp", RuntimePolicy::omp, tolerance); } #endif #if defined(AXOM_USE_CUDA) TEST(IntersectionShaperTest, case3_cuda) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case3, "cuda", quest::IntersectionShaper::cuda, tolerance); + replacementRuleTestSet(case3, "cuda", RuntimePolicy::cuda, tolerance); } #endif #if defined(AXOM_USE_HIP) TEST(IntersectionShaperTest, case3_hip) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case3, "hip", quest::IntersectionShaper::hip, tolerance); + replacementRuleTestSet(case3, "hip", RuntimePolicy::hip, tolerance); } #endif #endif @@ -872,28 +877,28 @@ TEST(IntersectionShaperTest, case3_hip) TEST(IntersectionShaperTest, case4_seq) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case4, "seq", quest::IntersectionShaper::seq, tolerance); + replacementRuleTestSet(case4, "seq", RuntimePolicy::seq, tolerance); } #endif #if defined(AXOM_USE_OPENMP) TEST(IntersectionShaperTest, case4_omp) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case4, "omp", quest::IntersectionShaper::omp, tolerance); + replacementRuleTestSet(case4, "omp", RuntimePolicy::omp, tolerance); } #endif #if defined(AXOM_USE_CUDA) TEST(IntersectionShaperTest, case4_cuda) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case4, "cuda", quest::IntersectionShaper::cuda, tolerance); + replacementRuleTestSet(case4, "cuda", RuntimePolicy::cuda, tolerance); } #endif #if defined(AXOM_USE_HIP) TEST(IntersectionShaperTest, case4_hip) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(case4, "hip", quest::IntersectionShaper::hip, tolerance); + replacementRuleTestSet(case4, "hip", RuntimePolicy::hip, tolerance); } #endif #endif @@ -904,31 +909,28 @@ TEST(IntersectionShaperTest, case4_hip) TEST(IntersectionShaperTest, proeCase_seq) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(proeCase, "seq", quest::IntersectionShaper::seq, tolerance); + replacementRuleTestSet(proeCase, "seq", RuntimePolicy::seq, tolerance); } #endif #if defined(AXOM_USE_OPENMP) TEST(IntersectionShaperTest, proeCase_omp) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(proeCase, "omp", quest::IntersectionShaper::omp, tolerance); + replacementRuleTestSet(proeCase, "omp", RuntimePolicy::omp, tolerance); } #endif #if defined(AXOM_USE_CUDA) TEST(IntersectionShaperTest, proeCase_cuda) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(proeCase, - "cuda", - quest::IntersectionShaper::cuda, - tolerance); + replacementRuleTestSet(proeCase, "cuda", RuntimePolicy::cuda, tolerance); } #endif #if defined(AXOM_USE_HIP) TEST(IntersectionShaperTest, proeCase_hip) { constexpr double tolerance = 1.e-10; - replacementRuleTestSet(proeCase, "hip", quest::IntersectionShaper::hip, tolerance); + replacementRuleTestSet(proeCase, "hip", RuntimePolicy::hip, tolerance); } #endif #endif @@ -939,25 +941,25 @@ TEST(IntersectionShaperTest, proeCase_hip) #if defined(RUN_AXOM_SEQ_TESTS) TEST(IntersectionShaperTest, line_seq) { - dynamicRefinementTest_Line("seq", quest::IntersectionShaper::seq); + dynamicRefinementTest_Line("seq", RuntimePolicy::seq); } #endif #if defined(AXOM_USE_OPENMP) TEST(IntersectionShaperTest, line_omp) { - dynamicRefinementTest_Line("omp", quest::IntersectionShaper::omp); + dynamicRefinementTest_Line("omp", RuntimePolicy::omp); } #endif #if defined(AXOM_USE_CUDA) TEST(IntersectionShaperTest, line_cuda) { - dynamicRefinementTest_Line("cuda", quest::IntersectionShaper::cuda); + dynamicRefinementTest_Line("cuda", RuntimePolicy::cuda); } #endif #if defined(AXOM_USE_HIP) TEST(IntersectionShaperTest, line_hip) { - dynamicRefinementTest_Line("hip", quest::IntersectionShaper::hip); + dynamicRefinementTest_Line("hip", RuntimePolicy::hip); } #endif #endif @@ -968,25 +970,25 @@ TEST(IntersectionShaperTest, line_hip) #if defined(RUN_AXOM_SEQ_TESTS) TEST(IntersectionShaperTest, cone_seq) { - dynamicRefinementTest_Cone("seq", quest::IntersectionShaper::seq); + dynamicRefinementTest_Cone("seq", RuntimePolicy::seq); } #endif #if defined(AXOM_USE_OPENMP) TEST(IntersectionShaperTest, cone_omp) { - dynamicRefinementTest_Cone("omp", quest::IntersectionShaper::omp); + dynamicRefinementTest_Cone("omp", RuntimePolicy::omp); } #endif #if defined(AXOM_USE_CUDA) TEST(IntersectionShaperTest, cone_cuda) { - dynamicRefinementTest_Cone("cuda", quest::IntersectionShaper::cuda); + dynamicRefinementTest_Cone("cuda", RuntimePolicy::cuda); } #endif #if defined(AXOM_USE_HIP) TEST(IntersectionShaperTest, cone_hip) { - dynamicRefinementTest_Cone("hip", quest::IntersectionShaper::hip); + dynamicRefinementTest_Cone("hip", RuntimePolicy::hip); } #endif #endif @@ -997,25 +999,25 @@ TEST(IntersectionShaperTest, cone_hip) #if defined(RUN_AXOM_SEQ_TESTS) TEST(IntersectionShaperTest, spline_seq) { - dynamicRefinementTest_Spline("seq", quest::IntersectionShaper::seq); + dynamicRefinementTest_Spline("seq", RuntimePolicy::seq); } #endif #if defined(AXOM_USE_OPENMP) TEST(IntersectionShaperTest, spline_omp) { - dynamicRefinementTest_Spline("omp", quest::IntersectionShaper::omp); + dynamicRefinementTest_Spline("omp", RuntimePolicy::omp); } #endif #if defined(AXOM_USE_CUDA) TEST(IntersectionShaperTest, spline_cuda) { - dynamicRefinementTest_Spline("cuda", quest::IntersectionShaper::cuda); + dynamicRefinementTest_Spline("cuda", RuntimePolicy::cuda); } #endif #if defined(AXOM_USE_HIP) TEST(IntersectionShaperTest, spline_hip) { - dynamicRefinementTest_Spline("hip", quest::IntersectionShaper::hip); + dynamicRefinementTest_Spline("hip", RuntimePolicy::hip); } #endif #endif @@ -1026,25 +1028,25 @@ TEST(IntersectionShaperTest, spline_hip) #if defined(RUN_AXOM_SEQ_TESTS) TEST(IntersectionShaperTest, circle_seq) { - dynamicRefinementTest_Circle("seq", quest::IntersectionShaper::seq); + dynamicRefinementTest_Circle("seq", RuntimePolicy::seq); } #endif #if defined(AXOM_USE_OPENMP) TEST(IntersectionShaperTest, circle_omp) { - dynamicRefinementTest_Circle("omp", quest::IntersectionShaper::omp); + dynamicRefinementTest_Circle("omp", RuntimePolicy::omp); } #endif #if defined(AXOM_USE_CUDA) TEST(IntersectionShaperTest, circle_cuda) { - dynamicRefinementTest_Circle("cuda", quest::IntersectionShaper::cuda); + dynamicRefinementTest_Circle("cuda", RuntimePolicy::cuda); } #endif #if defined(AXOM_USE_HIP) TEST(IntersectionShaperTest, circle_hip) { - dynamicRefinementTest_Circle("hip", quest::IntersectionShaper::hip); + dynamicRefinementTest_Circle("hip", RuntimePolicy::hip); } #endif #endif @@ -1055,25 +1057,25 @@ TEST(IntersectionShaperTest, circle_hip) #if defined(RUN_AXOM_SEQ_TESTS) TEST(IntersectionShaperTest, line_translate_seq) { - dynamicRefinementTest_LineTranslate("seq", quest::IntersectionShaper::seq); + dynamicRefinementTest_LineTranslate("seq", RuntimePolicy::seq); } #endif #if defined(AXOM_USE_OPENMP) TEST(IntersectionShaperTest, line_translate_omp) { - dynamicRefinementTest_LineTranslate("omp", quest::IntersectionShaper::omp); + dynamicRefinementTest_LineTranslate("omp", RuntimePolicy::omp); } #endif #if defined(AXOM_USE_CUDA) TEST(IntersectionShaperTest, line_translate_cuda) { - dynamicRefinementTest_LineTranslate("cuda", quest::IntersectionShaper::cuda); + dynamicRefinementTest_LineTranslate("cuda", RuntimePolicy::cuda); } #endif #if defined(AXOM_USE_HIP) TEST(IntersectionShaperTest, line_translate_hip) { - dynamicRefinementTest_LineTranslate("hip", quest::IntersectionShaper::hip); + dynamicRefinementTest_LineTranslate("hip", RuntimePolicy::hip); } #endif #endif @@ -1084,25 +1086,25 @@ TEST(IntersectionShaperTest, line_translate_hip) #if defined(RUN_AXOM_SEQ_TESTS) TEST(IntersectionShaperTest, line_scale_seq) { - dynamicRefinementTest_LineScale("seq", quest::IntersectionShaper::seq); + dynamicRefinementTest_LineScale("seq", RuntimePolicy::seq); } #endif #if defined(AXOM_USE_OPENMP) TEST(IntersectionShaperTest, line_scale_omp) { - dynamicRefinementTest_LineScale("omp", quest::IntersectionShaper::omp); + dynamicRefinementTest_LineScale("omp", RuntimePolicy::omp); } #endif #if defined(AXOM_USE_CUDA) TEST(IntersectionShaperTest, line_scale_cuda) { - dynamicRefinementTest_LineScale("cuda", quest::IntersectionShaper::cuda); + dynamicRefinementTest_LineScale("cuda", RuntimePolicy::cuda); } #endif #if defined(AXOM_USE_HIP) TEST(IntersectionShaperTest, line_scale_hip) { - dynamicRefinementTest_LineScale("hip", quest::IntersectionShaper::hip); + dynamicRefinementTest_LineScale("hip", RuntimePolicy::hip); } #endif #endif @@ -1113,25 +1115,25 @@ TEST(IntersectionShaperTest, line_scale_hip) #if defined(RUN_AXOM_SEQ_TESTS) TEST(IntersectionShaperTest, line_rotate_seq) { - dynamicRefinementTest_LineRotate("seq", quest::IntersectionShaper::seq); + dynamicRefinementTest_LineRotate("seq", RuntimePolicy::seq); } #endif #if defined(AXOM_USE_OPENMP) TEST(IntersectionShaperTest, line_rotate_omp) { - dynamicRefinementTest_LineRotate("omp", quest::IntersectionShaper::omp); + dynamicRefinementTest_LineRotate("omp", RuntimePolicy::omp); } #endif #if defined(AXOM_USE_CUDA) TEST(IntersectionShaperTest, line_rotate_cuda) { - dynamicRefinementTest_LineRotate("cuda", quest::IntersectionShaper::cuda); + dynamicRefinementTest_LineRotate("cuda", RuntimePolicy::cuda); } #endif #if defined(AXOM_USE_HIP) TEST(IntersectionShaperTest, line_rotate_hip) { - dynamicRefinementTest_LineRotate("hip", quest::IntersectionShaper::hip); + dynamicRefinementTest_LineRotate("hip", RuntimePolicy::hip); } #endif #endif From 4ced5038de912aecf364a9debb258b9c149e3bbc Mon Sep 17 00:00:00 2001 From: Chris White Date: Mon, 4 Dec 2023 14:46:37 -0800 Subject: [PATCH 234/639] fix conflicts --- scripts/spack/packages/axom/package.py | 1 + scripts/spack/packages/axomdevtools/package.py | 1 + src/axom/config.hpp.in | 4 ++++ src/axom/inlet/tests/CMakeLists.txt | 6 ++++-- src/axom/inlet/tests/inlet_jsonschema_writer.cpp | 3 +-- src/cmake/thirdparty/SetupAxomThirdParty.cmake | 6 ++++++ 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py index 6a59377d50..38a240d920 100644 --- a/scripts/spack/packages/axom/package.py +++ b/scripts/spack/packages/axom/package.py @@ -159,6 +159,7 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("python", when="+devtools") depends_on("py-sphinx", when="+devtools") depends_on("py-shroud", when="+devtools") + depends_on("py-jsonschema", when="+devtools") depends_on("llvm+clang@10.0.0", when="+devtools", type="build") # Hard requirement after Axom 0.6.1 diff --git a/scripts/spack/packages/axomdevtools/package.py b/scripts/spack/packages/axomdevtools/package.py index e1e1042156..f6c6e3118c 100644 --- a/scripts/spack/packages/axomdevtools/package.py +++ b/scripts/spack/packages/axomdevtools/package.py @@ -19,4 +19,5 @@ class Axomdevtools(BundlePackage): depends_on("py-sphinx") depends_on("py-shroud") depends_on("py-sphinxcontrib-jquery") + depends_on("py-jsonschema") depends_on("llvm+clang@10.0.0") diff --git a/src/axom/config.hpp.in b/src/axom/config.hpp.in index 2f111f14a4..c762e1be32 100644 --- a/src/axom/config.hpp.in +++ b/src/axom/config.hpp.in @@ -80,6 +80,10 @@ #cmakedefine AXOM_USE_SPARSEHASH #cmakedefine AXOM_USE_UMPIRE +/* + * Compiler defines for third-party executables + */ +#cmakedefine JSONSCHEMA_EXECUTABLE "@JSONSCHEMA_EXECUTABLE@" /* * We need to explicitly add some definitions on Windows diff --git a/src/axom/inlet/tests/CMakeLists.txt b/src/axom/inlet/tests/CMakeLists.txt index d2e0037738..19e8f73443 100644 --- a/src/axom/inlet/tests/CMakeLists.txt +++ b/src/axom/inlet/tests/CMakeLists.txt @@ -19,11 +19,13 @@ axom_add_library(NAME inlet_test_utils # Add Serial GTests based tests set(gtest_inlet_tests inlet_Reader.cpp - inlet_jsonschema_writer.cpp inlet_restart.cpp - inlet_errors.cpp ) + inlet_errors.cpp + inlet_Inlet.cpp + inlet_object.cpp ) blt_list_append(TO gtest_inlet_tests ELEMENTS inlet_function.cpp IF SOL_FOUND) +blt_list_append(TO gtest_inlet_tests ELEMENTS inlet_jsonschema_writer.cpp IF JSONSCHEMA_FOUND) foreach(test ${gtest_inlet_tests}) get_filename_component( test_name ${test} NAME_WE ) diff --git a/src/axom/inlet/tests/inlet_jsonschema_writer.cpp b/src/axom/inlet/tests/inlet_jsonschema_writer.cpp index 932e3ce7e3..aae23219e8 100644 --- a/src/axom/inlet/tests/inlet_jsonschema_writer.cpp +++ b/src/axom/inlet/tests/inlet_jsonschema_writer.cpp @@ -5,6 +5,7 @@ #include "axom/slic.hpp" +#include "axom/config.hpp" #include "axom/inlet/Inlet.hpp" #include "axom/inlet/JSONSchemaWriter.hpp" #include "axom/inlet/tests/inlet_test_utils.hpp" @@ -21,8 +22,6 @@ using axom::inlet::Inlet; using axom::inlet::JSONSchemaWriter; -#define JSONSCHEMA_EXECUTABLE "jsonschema" - bool hasSchemaUtility() { const static bool hasUtility = diff --git a/src/cmake/thirdparty/SetupAxomThirdParty.cmake b/src/cmake/thirdparty/SetupAxomThirdParty.cmake index 077c486fc8..2aba11e611 100644 --- a/src/cmake/thirdparty/SetupAxomThirdParty.cmake +++ b/src/cmake/thirdparty/SetupAxomThirdParty.cmake @@ -320,6 +320,12 @@ if (TARGET blt::openmp) set_target_properties(blt::openmp PROPERTIES INTERFACE_LINK_OPTIONS "") endif() +#------------------------------------------------------------------------------ +# jsonschema - for Inlet testing purposes +#------------------------------------------------------------------------------ +set(ENABLE_JSONSCHEMA ON) # required by blt_find_executable +blt_find_executable(NAME jsonschema) + #------------------------------------------------------------------------------ # Targets that need to be exported but don't have a CMake config file #------------------------------------------------------------------------------ From 64e7ce176bebd5e5e914b835208fd20eed646f35 Mon Sep 17 00:00:00 2001 From: Chris White Date: Mon, 4 Dec 2023 14:47:44 -0800 Subject: [PATCH 235/639] fix conflicts --- scripts/spack/packages/axom/package.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py index 38a240d920..a476979e8c 100644 --- a/scripts/spack/packages/axom/package.py +++ b/scripts/spack/packages/axom/package.py @@ -507,6 +507,32 @@ def initconfig_package_entries(self): python_path = python_path.replace(key, path_replacements[key]) entries.append(cmake_cache_path("PYTHON_EXECUTABLE", python_path)) + if "+py-jsonschema" in spec: + jsonschema_dir = get_spec_path(spec, "py-jsonschema", path_replacements, use_bin=True) + jsonschema_path = os.path.join(jsonschema_dir, 'jsonschema') + cfg.write(cmake_cache_path("JSONSCHEMA_EXECUTABLE", jsonschema_path)) + + if "doxygen" in spec or "py-sphinx" in spec: + cfg.write(cmake_cache_option("ENABLE_DOCS", True)) + + if "doxygen" in spec: + doxygen_bin_dir = get_spec_path(spec, "doxygen", + path_replacements, + use_bin=True) + cfg.write(cmake_cache_path("DOXYGEN_EXECUTABLE", + pjoin(doxygen_bin_dir, "doxygen"))) + + if "py-sphinx" in spec: + python_bin_dir = get_spec_path(spec, "python", + path_replacements, + use_bin=True) + cfg.write(cmake_cache_path("SPHINX_EXECUTABLE", + pjoin(python_bin_dir, + "sphinx-build"))) + else: + cfg.write(cmake_cache_option("ENABLE_DOCS", False)) +>>>>>>> 3b869eaa3 (tpls: add jsonschema to hostconfig) + enable_docs = spec.satisfies("^doxygen") or spec.satisfies("^py-sphinx") entries.append(cmake_cache_option("ENABLE_DOCS", enable_docs)) From 54799e9f7dd61a36fad58e368c62fe3353ee77db Mon Sep 17 00:00:00 2001 From: Chris White Date: Mon, 4 Dec 2023 14:50:08 -0800 Subject: [PATCH 236/639] fix bad merge --- scripts/spack/packages/axom/package.py | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py index a476979e8c..ac7b9c6a53 100644 --- a/scripts/spack/packages/axom/package.py +++ b/scripts/spack/packages/axom/package.py @@ -507,31 +507,10 @@ def initconfig_package_entries(self): python_path = python_path.replace(key, path_replacements[key]) entries.append(cmake_cache_path("PYTHON_EXECUTABLE", python_path)) - if "+py-jsonschema" in spec: + if spec.satisfies("^py-jsonschema"): jsonschema_dir = get_spec_path(spec, "py-jsonschema", path_replacements, use_bin=True) jsonschema_path = os.path.join(jsonschema_dir, 'jsonschema') - cfg.write(cmake_cache_path("JSONSCHEMA_EXECUTABLE", jsonschema_path)) - - if "doxygen" in spec or "py-sphinx" in spec: - cfg.write(cmake_cache_option("ENABLE_DOCS", True)) - - if "doxygen" in spec: - doxygen_bin_dir = get_spec_path(spec, "doxygen", - path_replacements, - use_bin=True) - cfg.write(cmake_cache_path("DOXYGEN_EXECUTABLE", - pjoin(doxygen_bin_dir, "doxygen"))) - - if "py-sphinx" in spec: - python_bin_dir = get_spec_path(spec, "python", - path_replacements, - use_bin=True) - cfg.write(cmake_cache_path("SPHINX_EXECUTABLE", - pjoin(python_bin_dir, - "sphinx-build"))) - else: - cfg.write(cmake_cache_option("ENABLE_DOCS", False)) ->>>>>>> 3b869eaa3 (tpls: add jsonschema to hostconfig) + entries.append(cmake_cache_path("JSONSCHEMA_EXECUTABLE", jsonschema_path)) enable_docs = spec.satisfies("^doxygen") or spec.satisfies("^py-sphinx") entries.append(cmake_cache_option("ENABLE_DOCS", enable_docs)) From b9a208a7ad6942b899080dacc4d9dec7e10fbf23 Mon Sep 17 00:00:00 2001 From: Chris White Date: Mon, 4 Dec 2023 14:52:39 -0800 Subject: [PATCH 237/639] fix another bad merge --- src/axom/inlet/tests/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/axom/inlet/tests/CMakeLists.txt b/src/axom/inlet/tests/CMakeLists.txt index 19e8f73443..c3df689b74 100644 --- a/src/axom/inlet/tests/CMakeLists.txt +++ b/src/axom/inlet/tests/CMakeLists.txt @@ -20,9 +20,7 @@ axom_add_library(NAME inlet_test_utils set(gtest_inlet_tests inlet_Reader.cpp inlet_restart.cpp - inlet_errors.cpp - inlet_Inlet.cpp - inlet_object.cpp ) + inlet_errors.cpp ) blt_list_append(TO gtest_inlet_tests ELEMENTS inlet_function.cpp IF SOL_FOUND) blt_list_append(TO gtest_inlet_tests ELEMENTS inlet_jsonschema_writer.cpp IF JSONSCHEMA_FOUND) From f6e525848ba4c1a93e85a6674acb51dcf9aa5b95 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 5 Dec 2023 17:35:28 -0800 Subject: [PATCH 238/639] Fix MeshViewUtil test failure on quartz CI. Test crashed in MPIinit. Don't know why. Disabled the conduit validity test, which required MPI. --- src/axom/quest/tests/quest_mesh_view_util.cpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/axom/quest/tests/quest_mesh_view_util.cpp b/src/axom/quest/tests/quest_mesh_view_util.cpp index e870f4fb78..4d45311ee5 100644 --- a/src/axom/quest/tests/quest_mesh_view_util.cpp +++ b/src/axom/quest/tests/quest_mesh_view_util.cpp @@ -373,12 +373,6 @@ int testByConduitExample(const IndexCoords& domainShape, axom::quest::MeshViewUtil<3, axom::MemorySpace::Dynamic> mview(domain); - if(!mview.isValid(true, true)) - { - ++errCount; - SLIC_INFO_IF(params.isVerbose(), "Test view is not valid."); - } - // Data parameters not dependent on striding order. IndexCoords elemShape = mview.getCellShape(); @@ -724,10 +718,7 @@ int testByConduitExample(const IndexCoords& domainShape, //------------------------------------------------------------------------------ int main(int argc, char** argv) { - // This test is serial, but conduit might use MPI. - #ifdef AXOM_USE_MPI - MPI_Init(&argc, &argv); - #endif + int errCount = 0; initializeLogger(); @@ -746,8 +737,6 @@ int main(int argc, char** argv) exit(retval); } - int errCount = 0; - { // Test conversion methods. errCount += testConversionMethods({2, 3, 5}, {0, 0, 0}, {0, 0, 0}, {0, 1, 2}); @@ -791,10 +780,6 @@ int main(int argc, char** argv) finalizeLogger(); - #ifdef AXOM_USE_MPI - MPI_Finalize(); - #endif - return (errCount != 0); } From 8473d52783822f66e5595237f1b31cb72e525475 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Wed, 23 Aug 2023 16:34:07 -0700 Subject: [PATCH 239/639] Bugfix for `axom::utilities::locale` Some systems through an error on `std::locale("")` if there is no user-defined locale. Use `std::locale("C")` instead. We encountered this inside a docker image. --- src/axom/core/utilities/System.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/core/utilities/System.cpp b/src/axom/core/utilities/System.cpp index e34de4a432..cc9d4c2da4 100644 --- a/src/axom/core/utilities/System.cpp +++ b/src/axom/core/utilities/System.cpp @@ -97,7 +97,7 @@ std::locale locale(const std::string& name) } catch(std::runtime_error&) { - loc = std::locale(loc, "", std::locale::ctype); + loc = std::locale(loc, "C", std::locale::ctype); } return loc; From b50c46ad418d19d601e0143b755fcb12a6d278ab Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 4 Dec 2023 12:42:33 -0800 Subject: [PATCH 240/639] Array: add a test for non-trivially relocatable types --- src/axom/core/tests/core_array.hpp | 51 ++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/src/axom/core/tests/core_array.hpp b/src/axom/core/tests/core_array.hpp index 6f7dd21603..a888ba9609 100644 --- a/src/axom/core/tests/core_array.hpp +++ b/src/axom/core/tests/core_array.hpp @@ -2257,3 +2257,54 @@ TEST(core_array, resize_stackarray) test_resize_with_stackarray(false); test_resize_with_stackarray(-1); } + +//------------------------------------------------------------------------------ +constexpr static int NONTRIVIAL_RELOC_MAGIC = 123; +struct NonTriviallyRelocatable +{ + NonTriviallyRelocatable() + : m_member(NONTRIVIAL_RELOC_MAGIC) + , m_localMemberPointer(&m_member) + { } + + NonTriviallyRelocatable(const NonTriviallyRelocatable& other) + : m_member(other.m_member) + , m_localMemberPointer(&m_member) + { } + + NonTriviallyRelocatable& operator=(const NonTriviallyRelocatable& other) + { + if(this != &other) + { + m_member = other.m_member; + } + return *this; + } + + ~NonTriviallyRelocatable() = default; + + int m_member; + int* m_localMemberPointer; +}; + +TEST(core_array, reserve_nontrivial_reloc) +{ + const int NUM_ELEMS = 1024; + axom::Array array(NUM_ELEMS, NUM_ELEMS); + + for(int i = 0; i < NUM_ELEMS; i++) + { + // Check initial values. + EXPECT_EQ(array[i].m_member, NONTRIVIAL_RELOC_MAGIC); + EXPECT_EQ(&(array[i].m_member), array[i].m_localMemberPointer); + } + + // Reallocation should work for non-trivially relocatable types. + array.reserve(NUM_ELEMS * 4); + + for(int i = 0; i < NUM_ELEMS; i++) + { + EXPECT_EQ(array[i].m_member, NONTRIVIAL_RELOC_MAGIC); + EXPECT_EQ(&(array[i].m_member), array[i].m_localMemberPointer); + } +} From c4653ec082ddf16dac8102f0b0b0406ef71defcb Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 4 Dec 2023 13:05:42 -0800 Subject: [PATCH 241/639] Array: add an alternative test for non-trivially relocatable types --- src/axom/core/tests/core_array.hpp | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/axom/core/tests/core_array.hpp b/src/axom/core/tests/core_array.hpp index a888ba9609..d72443a350 100644 --- a/src/axom/core/tests/core_array.hpp +++ b/src/axom/core/tests/core_array.hpp @@ -2308,3 +2308,28 @@ TEST(core_array, reserve_nontrivial_reloc) EXPECT_EQ(&(array[i].m_member), array[i].m_localMemberPointer); } } + +TEST(core_array, reserve_nontrivial_reloc_2) +{ + const int NUM_ELEMS = 1024; + axom::Array array(NUM_ELEMS, NUM_ELEMS); + + for(int i = 0; i < NUM_ELEMS; i++) + { + // Check initial values. + EXPECT_EQ(array[i].m_member, NONTRIVIAL_RELOC_MAGIC); + EXPECT_EQ(&(array[i].m_member), array[i].m_localMemberPointer); + } + + EXPECT_EQ(array.capacity(), NUM_ELEMS); + + // Emplace to trigger a resize. + array.emplace_back(NonTriviallyRelocatable {}); + EXPECT_GE(array.capacity(), NUM_ELEMS); + + for(int i = 0; i < NUM_ELEMS + 1; i++) + { + EXPECT_EQ(array[i].m_member, NONTRIVIAL_RELOC_MAGIC); + EXPECT_EQ(&(array[i].m_member), array[i].m_localMemberPointer); + } +} From af66600d6e6f4b881b3c17d703545a9d0bb120c7 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 4 Dec 2023 14:39:35 -0800 Subject: [PATCH 242/639] Array: fix reallocation for non-trivially relocatable types Adds a new helper method ArrayOps::realloc_move, which calls std::uninitialized_move if the memory is located on the CPU. This ensures that objects are properly constructed on reallocation. In the case of device-side memory, we can just continue to do a bit-copy, since we don't support non-trivially relocatable types on the device. --- src/axom/core/Array.hpp | 14 +++++++--- src/axom/core/ArrayBase.hpp | 51 +++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index a63ab9bec3..939a345fb8 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -1495,7 +1495,16 @@ inline void Array::setCapacity(IndexType new_capacity) updateNumElements(new_capacity); } - m_data = axom::reallocate(m_data, new_capacity, m_allocator_id); + // Create a new block of memory, and move the elements over. + T* new_data = axom::allocate(new_capacity, m_allocator_id); + OpHelper::realloc_move(new_data, m_num_elements, m_data, m_allocator_id); + + // Destroy the original array. + OpHelper::destroy(m_data, 0, m_num_elements, m_allocator_id); + axom::deallocate(m_data); + + // Set the pointer and capacity to the new memory. + m_data = new_data; m_capacity = new_capacity; assert(m_data != nullptr || m_capacity <= 0); @@ -1523,8 +1532,7 @@ inline void Array::dynamicRealloc(IndexType new_num_elements) utilities::processAbort(); } - m_data = axom::reallocate(m_data, new_capacity, m_allocator_id); - m_capacity = new_capacity; + setCapacity(new_capacity); assert(m_data != nullptr || m_capacity <= 0); } diff --git a/src/axom/core/ArrayBase.hpp b/src/axom/core/ArrayBase.hpp index 610822f893..47d42a2983 100644 --- a/src/axom/core/ArrayBase.hpp +++ b/src/axom/core/ArrayBase.hpp @@ -1007,6 +1007,20 @@ struct ArrayOpsBase array + dst); } } + + /*! + * \brief Moves a range of elements to a new allocation. + * + * \param [inout] array the array to move the elements to. + * \param [in] nelems the number of elements to move. + * \param [in] values the destination index of the range of elements + */ + static void realloc_move(T* array, IndexType nelems, T* values) + { + std::uninitialized_copy(std::make_move_iterator(values), + std::make_move_iterator(values + nelems), + array); + } }; #if defined(AXOM_USE_GPU) && defined(AXOM_GPUCC) && defined(AXOM_USE_UMPIRE) @@ -1255,6 +1269,21 @@ struct ArrayOpsBase axom::copy(array + dst, tmp_buf, nelems * sizeof(T)); axom::deallocate(tmp_buf); } + + /*! + * \brief Moves a range of elements to a new allocation. + * + * \param [inout] array the array to move the elements to. + * \param [in] nelems the number of elements to move. + * \param [in] values the destination index of the range of elements + */ + static void realloc_move(T* array, IndexType nelems, T* values) + { + // NOTE: technically this is incorrect for non-trivially relocatable types, + // but since we only support trivially-relocatable types on the GPU, a + // bitcopy will suffice. + axom::copy(array, values, nelems * sizeof(T)); + } }; #endif @@ -1322,6 +1351,12 @@ struct ArrayOps Base::move(array, src_begin, src_end, dst); } + static void realloc_move(T* array, IndexType nelems, T* values, int allocId) + { + AXOM_UNUSED_VAR(allocId); + Base::realloc_move(array, nelems, values); + } + template static void emplace(T* array, IndexType dst, IndexType allocId, Args&&... args) { @@ -1442,6 +1477,22 @@ struct ArrayOps Base::move(array, src_begin, src_end, dst); } + static void realloc_move(T* array, IndexType nelems, T* values, int allocId) + { +#if defined(AXOM_USE_GPU) && defined(AXOM_GPUCC) && defined(AXOM_USE_UMPIRE) + MemorySpace space = getAllocatorSpace(allocId); + + if(space == MemorySpace::Device) + { + BaseDevice::realloc_move(array, nelems, values); + return; + } +#else + AXOM_UNUSED_VAR(allocId); +#endif + Base::realloc_move(array, nelems, values); + } + template static void emplace(T* array, IndexType dst, IndexType allocId, Args&&... args) { From b90c903581d74e446f5662e832a75ea2073a18cc Mon Sep 17 00:00:00 2001 From: Max Yang Date: Wed, 6 Dec 2023 16:00:37 -0800 Subject: [PATCH 243/639] Array: add a test for non-trivially relocatable types with unified memory --- src/axom/core/tests/core_array.hpp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/axom/core/tests/core_array.hpp b/src/axom/core/tests/core_array.hpp index d72443a350..fd0f51d7c3 100644 --- a/src/axom/core/tests/core_array.hpp +++ b/src/axom/core/tests/core_array.hpp @@ -2333,3 +2333,29 @@ TEST(core_array, reserve_nontrivial_reloc_2) EXPECT_EQ(&(array[i].m_member), array[i].m_localMemberPointer); } } + +#if defined(AXOM_USE_GPU) && defined(AXOM_USE_UMPIRE) +TEST(core_array, reserve_nontrivial_reloc_um) +{ + const int NUM_ELEMS = 1024; + axom::Array array( + NUM_ELEMS, + NUM_ELEMS); + + for(int i = 0; i < NUM_ELEMS; i++) + { + // Check initial values. + EXPECT_EQ(array[i].m_member, NONTRIVIAL_RELOC_MAGIC); + EXPECT_EQ(&(array[i].m_member), array[i].m_localMemberPointer); + } + + // Reallocation should work for non-trivially relocatable types. + array.reserve(NUM_ELEMS * 4); + + for(int i = 0; i < NUM_ELEMS; i++) + { + EXPECT_EQ(array[i].m_member, NONTRIVIAL_RELOC_MAGIC); + EXPECT_EQ(&(array[i].m_member), array[i].m_localMemberPointer); + } +} +#endif From 3b94a5750519eb8de9b5de9fed269b4ae1fac106 Mon Sep 17 00:00:00 2001 From: Simon Radler Date: Thu, 7 Dec 2023 09:39:39 +0100 Subject: [PATCH 244/639] Enable area computation for planar polygons with arbitrary orientation --- src/axom/primal/geometry/Polygon.hpp | 17 ++++++++--------- src/axom/primal/tests/primal_polygon.cpp | 9 +++++++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/axom/primal/geometry/Polygon.hpp b/src/axom/primal/geometry/Polygon.hpp index 91f36116dd..b3273c6e27 100644 --- a/src/axom/primal/geometry/Polygon.hpp +++ b/src/axom/primal/geometry/Polygon.hpp @@ -14,6 +14,7 @@ #include "axom/core/Array.hpp" #include "axom/primal/geometry/Point.hpp" +#include "axom/primal/geometry/Vector.hpp" #include @@ -142,27 +143,25 @@ class Polygon typename std::enable_if::type area() const { const int nVerts = numVertices(); - double sum = 0.; // check for early return if(nVerts < 3) { - return sum; + return 0.0; } // Add up areas of triangles connecting polygon edges the vertex average + VectorType sum; const auto O = vertexMean(); // 'O' for (local) origin for(int curr = 0, prev = nVerts - 1; curr < nVerts; prev = curr++) { - const auto& P = m_vertices[prev]; - const auto& C = m_vertices[curr]; - // clang-format off - sum += axom::numerics::determinant(P[0] - O[0], C[0] - O[0], - P[1] - O[1], C[1] - O[1]); - // clang-format on + const VectorType v0(O, m_vertices[prev]); + const VectorType v1(O, m_vertices[curr]); + + sum += VectorType::cross_product(v0, v1); } - return axom::utilities::abs(0.5 * sum); + return axom::utilities::abs(0.5 * sum.norm()); } /** diff --git a/src/axom/primal/tests/primal_polygon.cpp b/src/axom/primal/tests/primal_polygon.cpp index 8ffe31002d..ead2f5ee7e 100644 --- a/src/axom/primal/tests/primal_polygon.cpp +++ b/src/axom/primal/tests/primal_polygon.cpp @@ -362,16 +362,21 @@ TEST(primal_polygon, area_2d_3d) using Point3D = axom::primal::Point; // test a simple right triangle - // use same xy-data in 2D and 3D { Polygon2D poly2D({Point2D {0, 0}, Point2D {1, 0}, Point2D {1, 1}}); EXPECT_DOUBLE_EQ(.5, poly2D.area()); + // in xy-plane Polygon3D poly3Da({Point3D {0, 0, 0}, Point3D {1, 0, 0}, Point3D {1, 1, 0}}); EXPECT_DOUBLE_EQ(.5, poly3Da.area()); - Polygon3D poly3Db({Point3D {0, 0, 1}, Point3D {1, 0, 1}, Point3D {1, 1, 1}}); + // in xz-plane + Polygon3D poly3Db({Point3D {0, 0, 0}, Point3D {1, 0, 0}, Point3D {1, 0, 1}}); EXPECT_DOUBLE_EQ(.5, poly3Db.area()); + + // in yz-plane + Polygon3D poly3Dc({Point3D {0, 0, 0}, Point3D {0, 1, 0}, Point3D {0, 1, 1}}); + EXPECT_DOUBLE_EQ(.5, poly3Dc.area()); } // test regular polygons From 1aa18784b112ae9d9041d3c6422da8ca5154dbf1 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 7 Dec 2023 14:54:05 -0800 Subject: [PATCH 245/639] Fix issues with sharing data between various container wrappers. Bad data appeared as result of sharing data pointers between single-domain representations, multi-domain representations, and xfer container. Conduit's multi-domain wrapper are removed, as the xfer container can act as a multi-domain container. --- src/axom/quest/DistributedClosestPoint.hpp | 231 ++++++++++++------ src/axom/quest/MeshViewUtil.hpp | 81 +++++- ...est_distributed_distance_query_example.cpp | 206 +++++++--------- 3 files changed, 318 insertions(+), 200 deletions(-) diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index 84dda3b745..2b16b9829c 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -341,6 +341,16 @@ class DistributedClosestPointImpl }; public: + /*! + @brief Constructor + + @param [i] runtimePolicy Indicates where local computations + are done. See axom::runtime_policy. + @param [i] Allocator ID, which must be compatible with + @c runtimePolicy. See axom::allocate and axom::reallocate. + Also see setAllocatorID(). + @param [i[ isVerbose + */ DistributedClosestPointImpl(RuntimePolicy runtimePolicy, int allocatorID, bool isVerbose) @@ -391,6 +401,19 @@ class DistributedClosestPointImpl m_allocatorID = allocatorID; } + void setOutputSwitches(bool outputRank, + bool outputIndex, + bool outputDistance, + bool outputCoords, + bool outputDomainIndex) + { + m_outputRank = outputRank; + m_outputIndex = outputIndex; + m_outputDistance = outputDistance; + m_outputCoords = outputCoords; + m_outputDomainIndex = outputDomainIndex; + } + public: /** * Import object mesh points from the object blueprint mesh into internal memory. @@ -644,9 +667,15 @@ class DistributedClosestPointImpl xferNode["homeRank"] = m_rank; xferNode["is_first"] = 1; + const bool isMultidomain = + conduit::blueprint::mesh::is_multi_domain(queryNode); + const auto domainCount = + conduit::blueprint::mesh::number_of_domains(queryNode); conduit::Node& xferDoms = xferNode["xferDoms"]; - for(auto& queryDom : queryNode.children()) + for(conduit::index_t domainNum = 0; domainNum < domainCount; ++domainNum) { + auto& queryDom = isMultidomain ? queryNode.child(domainNum) : queryNode; + const std::string coordsetName = queryDom .fetch_existing( @@ -654,84 +683,89 @@ class DistributedClosestPointImpl .as_string(); const std::string& domName = queryDom.name(); conduit::Node& xferDom = xferDoms[domName]; - conduit::Node& fields = queryDom.fetch_existing("fields"); conduit::Node& queryCoords = queryDom.fetch_existing(fmt::format("coordsets/{}", coordsetName)); conduit::Node& queryCoordsValues = queryCoords.fetch_existing("values"); - // clang-format off - copy_components_to_interleaved(queryCoordsValues, xferDom["coords"]); - - xferDom["cp_index"].set_external(fields.fetch_existing("cp_index/values")); - xferDom["cp_rank"].set_external(fields.fetch_existing("cp_rank/values")); - copy_components_to_interleaved(fields.fetch_existing("cp_coords/values"), - xferDom["cp_coords"]); - xferDom["cp_domain_index"].set_external(fields.fetch_existing("cp_domain_index/values")); - - if(fields.has_path("cp_distance")) - { - xferDom["debug/cp_distance"].set_external(fields.fetch_existing("cp_distance/values")); - } - // clang-format on - const int dim = internal::extractDimension(queryCoordsValues); const int qPtCount = internal::extractSize(queryCoordsValues); xferDom["qPtCount"] = qPtCount; xferDom["dim"] = dim; + + copy_components_to_interleaved(queryCoordsValues, xferDom["coords"]); + + constexpr bool isInt32 = std::is_same::value; + auto dtype = + isInt32 ? conduit::DataType::int32() : conduit::DataType::int64(); + dtype.set_number_of_elements(qPtCount); + xferDom["cp_index"].set_dtype(dtype); + xferDom["cp_rank"].set_dtype(dtype); + xferDom["cp_domain_index"].set_dtype(dtype); + xferDom["debug/cp_distance"].set_dtype(conduit::DataType::float64(qPtCount)); + xferDom["cp_coords"].set_dtype(conduit::DataType::float64(dim * qPtCount)); } } /// Copy xferNode back to query mesh partition. - void node_copy_xfer_to_query(const conduit::Node& xferNode, - conduit::Node& queryNode) const + void node_copy_xfer_to_query(conduit::Node& xferNode, + conduit::Node& queryNode, + const std::string& topologyName) const { - const conduit::Node& xferDoms = xferNode.fetch_existing("xferDoms"); - conduit::index_t childCount = queryNode.number_of_children(); - SLIC_ASSERT(xferDoms.number_of_children() == childCount); - for(conduit::index_t ci = 0; ci < childCount; ++ci) + const bool isMultidomain = + conduit::blueprint::mesh::is_multi_domain(queryNode); + const auto domainCount = + conduit::blueprint::mesh::number_of_domains(queryNode); + conduit::Node& xferDoms = xferNode.fetch_existing("xferDoms"); + SLIC_ASSERT(xferDoms.number_of_children() == domainCount); + for(conduit::index_t domainNum = 0; domainNum < domainCount; ++domainNum) { - const conduit::Node& xferDom = xferDoms.child(ci); - conduit::Node& queryDom = queryNode.child(ci); + auto& queryDom = isMultidomain ? queryNode.child(domainNum) : queryNode; + conduit::Node& xferDom = xferDoms.child(domainNum); conduit::Node& fields = queryDom.fetch_existing("fields"); + conduit::Node genericHeaders; + genericHeaders["association"] = "vertex"; + genericHeaders["topology"] = topologyName; + + if(m_outputRank) { auto& src = xferDom.fetch_existing("cp_rank"); - auto& dst = fields.fetch_existing("cp_rank/values"); - if(dst.data_ptr() != src.data_ptr()) - { - dst.update_compatible(src); - } + auto& dst = fields["cp_rank"]; + dst.set_node(genericHeaders); + dst["values"].move(src); } + if(m_outputIndex) { auto& src = xferDom.fetch_existing("cp_index"); - auto& dst = fields.fetch_existing("cp_index/values"); - if(dst.data_ptr() != src.data_ptr()) - { - dst.update_compatible(src); - } + auto& dst = fields["cp_index"]; + dst.set_node(genericHeaders); + dst["values"].move(src); } + if(m_outputDomainIndex) { auto& src = xferDom.fetch_existing("cp_domain_index"); - auto& dst = fields.fetch_existing("cp_domain_index/values"); - if(dst.data_ptr() != src.data_ptr()) - { - dst.update_compatible(src); - } + auto& dst = fields["cp_domain_index"]; + dst.set_node(genericHeaders); + dst["values"].move(src); } - copy_interleaved_to_components(xferDom.fetch_existing("cp_coords"), - fields.fetch_existing("cp_coords/values")); - - if(xferDom.has_path("debug/cp_distance")) + if(m_outputDistance) { auto& src = xferDom.fetch_existing("debug/cp_distance"); - auto& dst = fields.fetch_existing("cp_distance/values"); - if(dst.data_ptr() != src.data_ptr()) - { - dst.update_compatible(src); - } + auto& dst = fields["cp_distance"]; + dst.set_node(genericHeaders); + dst["values"].move(src); + } + + if(m_outputCoords) + { + auto& dst = fields["cp_coords"]; + dst.set_node(genericHeaders); + auto& dstValues = dst["values"]; + copy_interleaved_to_components(xferDom.fetch_existing("cp_coords"), + dstValues); } } } @@ -777,19 +811,18 @@ class DistributedClosestPointImpl void copy_interleaved_to_components(const conduit::Node& interleaved, conduit::Node& components) const { - if(interleaved.data_ptr() != components.child(0).data_ptr()) + const int qPtCount = interleaved.dtype().number_of_elements() / NDIMS; + components.reset(); + // Copy from 1D-interleaved src to component-wise dst. + for(int d = 0; d < NDIMS; ++d) { - const int dim = internal::extractDimension(components); - const int qPtCount = internal::extractSize(components); - // Copy from 1D-interleaved src to component-wise dst. - for(int d = 0; d < dim; ++d) + const double* src = interleaved.as_float64_ptr() + d; + auto& dstNode = components.append(); + dstNode.set_dtype(conduit::DataType(interleaved.dtype().id(), qPtCount)); + double* dst = dstNode.as_float64_ptr(); + for(int i = 0; i < qPtCount; ++i) { - const double* src = interleaved.as_float64_ptr() + d; - auto dst = components.child(d).as_float64_array(); - for(int i = 0; i < qPtCount; ++i) - { - dst[i] = src[i * dim]; - } + dst[i] = src[i * NDIMS]; } } } @@ -802,6 +835,9 @@ class DistributedClosestPointImpl * Can be empty if there are no query points for the calling rank * \param topologyName The topology name identifying the query points * + * @c queryMesh should have data on the host, regardless of the runtime + * policy setting. Data will be copied to device as needed. + * * The named topology is used to identify the points in the query mesh. * On completion, the query mesh contains the following fields: * - cp_rank: Will hold the rank of the object point containing the closest point @@ -824,24 +860,13 @@ class DistributedClosestPointImpl * buffer usage, we occasionally check the sends for completion, * using check_send_requests(). */ - void computeClosestPoints(conduit::Node& queryMesh_, + void computeClosestPoints(conduit::Node& queryMesh, const std::string& topologyName) const { SLIC_ASSERT_MSG( isBVHTreeInitialized(), "BVH tree must be initialized before calling 'computeClosestPoints"); - // If query mesh isn't multidomain, create a temporary multidomain representation. - const bool qmIsMultidomain = - conduit::blueprint::mesh::is_multi_domain(queryMesh_); - std::shared_ptr tmpNode; - if(!qmIsMultidomain) - { - tmpNode = std::make_shared(); - conduit::blueprint::mesh::to_multi_domain(queryMesh_, *tmpNode); - } - conduit::Node& queryMesh = qmIsMultidomain ? queryMesh_ : *tmpNode; - std::map> xferNodes; // create conduit Node containing data that has to xfer between ranks. @@ -899,7 +924,7 @@ class DistributedClosestPointImpl if(firstRecipForMyQuery == -1) { // No need to send anywhere. Put computed data back into queryMesh. - node_copy_xfer_to_query(*xferNodes[m_rank], queryMesh); + node_copy_xfer_to_query(*xferNodes[m_rank], queryMesh, topologyName); xferNodes.erase(m_rank); } else @@ -936,7 +961,7 @@ class DistributedClosestPointImpl if(homeRank == m_rank) { - node_copy_xfer_to_query(xferNode, queryMesh); + node_copy_xfer_to_query(xferNode, queryMesh, topologyName); } else { @@ -1141,7 +1166,6 @@ class DistributedClosestPointImpl { return; } - conduit::Node& xferDoms = xferNode["xferDoms"]; for(conduit::Node& xferDom : xferDoms.children()) { @@ -1337,6 +1361,12 @@ class DistributedClosestPointImpl int m_rank; int m_nranks; + bool m_outputRank = true; + bool m_outputIndex = true; + bool m_outputDistance = true; + bool m_outputCoords = true; + bool m_outputDomainIndex = true; + /*! @brief Object point coordindates array. @@ -1421,7 +1451,11 @@ class DistributedClosestPoint } } - /// Set the runtime execution policy for the query + /*! + @brief Set runtime execution policy for local queries + + See axom::runtime_policy. + */ void setRuntimePolicy(RuntimePolicy policy) { m_runtimePolicy = policy; } /*! @brief Sets the allocator ID to the default associated with the @@ -1535,6 +1569,35 @@ class DistributedClosestPoint m_sqDistanceThreshold = threshold * threshold; } + /*! + @brief Set what fields to output. + + @param [i] field Must be one of these: + "cp_rank", "cp_index", "cp_distance", "cp_coords", "cp_domain_index". + @param [i] on Whether to enable outputing @c field. + + By default, all are on. + */ + void setOutput(const std::string& field, bool on) + { + // clang-format off + bool* f + = field == "cp_rank" ? &m_outputRank + : field == "cp_index" ? &m_outputIndex + : field == "cp_distance" ? &m_outputDistance + : field == "cp_coords" ? &m_outputCoords + : field == "cp_domain_index" ? &m_outputDomainIndex + : nullptr; + // clang-format on + SLIC_ERROR_IF( + f == nullptr, + axom::fmt::format( + "Invald field '{}' should be one of these: " + "cp_rank, cp_index, cp_distance, cp_coords, cp_domain_index", + field)); + *f = on; + } + /// Sets the logging verbosity of the query. By default the query is not verbose void setVerbosity(bool isVerbose) { m_isVerbose = isVerbose; } @@ -1652,11 +1715,21 @@ class DistributedClosestPoint case 2: m_dcp_2->setSquaredDistanceThreshold(m_sqDistanceThreshold); m_dcp_2->setMpiCommunicator(m_mpiComm); + m_dcp_2->setOutputSwitches(m_outputRank, + m_outputIndex, + m_outputDistance, + m_outputCoords, + m_outputDomainIndex); m_dcp_2->computeClosestPoints(query_node, coordset); break; case 3: m_dcp_3->setSquaredDistanceThreshold(m_sqDistanceThreshold); m_dcp_3->setMpiCommunicator(m_mpiComm); + m_dcp_2->setOutputSwitches(m_outputRank, + m_outputIndex, + m_outputDistance, + m_outputCoords, + m_outputDomainIndex); m_dcp_3->computeClosestPoints(query_node, coordset); break; } @@ -1739,6 +1812,12 @@ class DistributedClosestPoint bool m_objectMeshCreated {false}; + bool m_outputRank = true; + bool m_outputIndex = true; + bool m_outputDistance = true; + bool m_outputCoords = true; + bool m_outputDomainIndex = true; + // One instance per dimension std::unique_ptr> m_dcp_2; std::unique_ptr> m_dcp_3; diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 4ea994650e..b1ed8121e5 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -372,7 +372,7 @@ class MeshViewUtil } //! @brief Return the real (ghost-free) extents of mesh data. - MdIndices getRealExtents(const std::string& association) + const MdIndices& getRealExtents(const std::string& association) { if(association == "vertex") { @@ -388,7 +388,7 @@ class MeshViewUtil "association for now, not '{}'.", association)); - return MdIndices {}; + return m_cellShape; } //@} @@ -640,7 +640,8 @@ class MeshViewUtil //!@name Creating data /*! - @brief Create a new scalar nodal data field. + @brief Create a new scalar nodal data field with specified + strides and offsets. @param [in] fieldName @param [in] association "vertex" or "element" @@ -657,7 +658,7 @@ class MeshViewUtil for matching the strides and offsets of existing data. It's more natural to create the field based on ghost layer thickness and index advancement order (row-major, column-major or some other). - That is easy to do, but we don't have a use case yet. + Use createFieldPadded() for this. */ void createField(const std::string& fieldName, const std::string& association, @@ -673,7 +674,7 @@ class MeshViewUtil association != "vertex" && association != "element", axom::fmt::format("Not yet supporting association '{}'.", association)); - const auto& realShape = association == "element" ? m_cellShape : m_nodeShape; + const auto& realShape = getRealExtents(association); MdIndices loPads, hiPads, paddedShape, strideOrder; axom::quest::internal::stridesAndOffsetsToShapes(realShape, offsets, @@ -691,8 +692,6 @@ class MeshViewUtil paddedShape)); } - auto realExtents = getRealExtents(association); - conduit::Node& fieldNode = m_dom->fetch("fields/" + fieldName); fieldNode["association"] = association; fieldNode["topology"] = m_topologyName; @@ -707,7 +706,7 @@ class MeshViewUtil axom::IndexType slowDir = strideOrder[DIM - 1]; auto extras = dtype.number_of_elements() - - strides[slowDir] * (offsets[slowDir] + realExtents[slowDir]); + strides[slowDir] * (offsets[slowDir] + realShape[slowDir]); if(extras < 0) { SLIC_ERROR( @@ -717,6 +716,72 @@ class MeshViewUtil fieldNode["values"].set(dtype); } + + /*! + @brief Create a new scalar nodal data field with specified + ghost paddings. + + @param [in] fieldName + @param [in] association "vertex" or "element" + @param [in] dtype Conduit data type to put in the field. + If dtype has too few elements, the minimum sufficient + size will be allocated. + @param loPads [i] Ghost padding amount on low side. + @param hiPads [i] Ghost padding amount ont high side. + @param strideOrder [i] Fastest-to-slowest advancing + index directions. + + Field data allocation is done by Conduit, so the data lives in + host memory. Conduit currently doesn't provide a means to allocate + the array in device memory. + */ + void createField(const std::string& fieldName, + const std::string& association, + const conduit::DataType& dtype, + const MdIndices& loPads, + const MdIndices& hiPads, + const MdIndices& strideOrder) + { + SLIC_ERROR_IF( + m_dom->has_path("fields/" + fieldName), + axom::fmt::format("Cannot create field {}. It already exists.", fieldName)); + + SLIC_ERROR_IF( + association != "vertex" && association != "element", + axom::fmt::format("Not yet supporting association '{}'.", association)); + + axom::StackArray offsets; + axom::StackArray strides; + axom::IndexType valuesCount; + const auto& realShape = getRealExtents(association); + axom::quest::internal::shapesToStridesAndOffsets(realShape, + loPads, + hiPads, + strideOrder, + 1, + offsets, + strides, + valuesCount); + + conduit::Node& fieldNode = m_dom->fetch("fields/" + fieldName); + fieldNode["association"] = association; + fieldNode["topology"] = m_topologyName; + + constexpr bool isInt32 = std::is_same::value; + const conduit::DataType conduitDtype = + isInt32 ? conduit::DataType::int32(DIM) : conduit::DataType::int64(DIM); + // Make temporary non-const copies for the "set" methods. + auto tmpStrides = strides, tmpOffsets = offsets; + fieldNode["strides"].set(conduitDtype, &tmpStrides[0]); + fieldNode["offsets"].set(conduitDtype, &tmpOffsets[0]); + + conduit::DataType bumpedDtype = dtype; + if(bumpedDtype.number_of_elements() < valuesCount) + { + bumpedDtype.set_number_of_elements(valuesCount); + } + fieldNode["values"].set(bumpedDtype); + } //@} private: diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index e8001fce34..fd21a33907 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -205,7 +205,6 @@ struct BlueprintParticleMesh : m_topologyName(topology) , m_coordsetName(coordset) , m_group(group) - , m_domainGroups() { MPI_Comm_rank(MPI_COMM_WORLD, &m_rank); MPI_Comm_size(MPI_COMM_WORLD, &m_nranks); @@ -215,7 +214,6 @@ struct BlueprintParticleMesh : m_topologyName() , m_coordsetName() , m_group(group) - , m_domainGroups() { MPI_Comm_rank(MPI_COMM_WORLD, &m_rank); MPI_Comm_size(MPI_COMM_WORLD, &m_nranks); @@ -230,23 +228,23 @@ struct BlueprintParticleMesh /// Gets a domain group. sidre::Group* domain_group(axom::IndexType groupIdx) const { - SLIC_ASSERT(size_t(groupIdx) < m_domainGroups.size()); - return m_domainGroups[groupIdx]; + SLIC_ASSERT(groupIdx < m_group->getNumGroups()); + return m_group->getGroup(groupIdx); } /// Gets the parent group for the blueprint coordinate set sidre::Group* coords_group(axom::IndexType groupIdx) const { - return m_coordsGroups[groupIdx]; + return domain_group(groupIdx)->getGroup("coordsets")->getGroup(m_coordsetName); } /// Gets the parent group for the blueprint mesh topology sidre::Group* topo_group(axom::IndexType groupIdx) const { - return m_topoGroups[groupIdx]; + return domain_group(groupIdx)->getGroup("topologies")->getGroup(m_topologyName); } /// Gets the parent group for the blueprint fields sidre::Group* fields_group(axom::IndexType groupIdx) const { - return m_fieldsGroups[groupIdx]; + return domain_group(groupIdx)->getGroup("fields"); } const std::string& getTopologyName() const { return m_topologyName; } @@ -257,20 +255,6 @@ struct BlueprintParticleMesh /// Gets the number of ranks in the problem int getNumRanks() const { return m_nranks; } - /// Returns true if points have been added to the particle mesh - bool hasPoints() const - { - // return m_coordsGroup != nullptr && m_coordsGroup->hasView("values/x"); - for(auto* cg : m_coordsGroups) - { - if(cg != nullptr && cg->hasView("values/x")) - { - return true; - } - } - return false; - } - /*! @brief Returns the number of points in a particle mesh domain including ghost points. @@ -278,7 +262,7 @@ struct BlueprintParticleMesh int numPoints(axom::IndexType dIdx) const { int rval = 0; - auto* cg = m_coordsGroups[dIdx]; + auto* cg = coords_group(dIdx); SLIC_ASSERT(cg != nullptr && cg->hasView("values/x")); rval = cg->getView("values/x")->getNumElements(); return rval; @@ -308,11 +292,6 @@ struct BlueprintParticleMesh { SLIC_ASSERT(!meshFilename.empty()); - m_domainGroups.clear(); - m_coordsGroups.clear(); - m_topoGroups.clear(); - m_fieldsGroups.clear(); - conduit::Node mdMesh; conduit::relay::mpi::io::blueprint::load_mesh(meshFilename, mdMesh, @@ -365,26 +344,6 @@ struct BlueprintParticleMesh bool valid = isValid(); SLIC_ASSERT(valid); AXOM_UNUSED_VAR(valid); - - reset_group_pointers(); - } - - void reset_group_pointers() - { - axom::IndexType domCount = m_group->getNumGroups(); - m_domainGroups.resize(domCount, nullptr); - m_coordsGroups.resize(domCount, nullptr); - m_topoGroups.resize(domCount, nullptr); - m_fieldsGroups.resize(domCount, nullptr); - for(conduit::index_t di = 0; di < domCount; ++di) - { - m_domainGroups[di] = m_group->getGroup(di); - m_coordsGroups[di] = - m_domainGroups[di]->getGroup("coordsets")->getGroup(m_coordsetName); - m_topoGroups[di] = - m_domainGroups[di]->getGroup("topologies")->getGroup(m_topologyName); - m_fieldsGroups[di] = m_domainGroups[di]->getGroup("fields"); - } } /*! @brief Set the coordinate data from an array of primal Points @@ -399,9 +358,9 @@ struct BlueprintParticleMesh const axom::Array>& pts) { axom::IndexType localIdx = createBlueprintStubs(); - SLIC_ASSERT(m_domainGroups[localIdx] != nullptr); - m_domainGroups[localIdx]->createViewScalar("state/domain_id", - domainId); + SLIC_ASSERT(domain_group(localIdx) != nullptr); + domain_group(localIdx)->createViewScalar("state/domain_id", + domainId); const int SZ = pts.size(); @@ -433,19 +392,19 @@ struct BlueprintParticleMesh // create views into a shared buffer for the coordinates, with stride NDIMS { - auto* buf = m_domainGroups[localIdx] + auto* buf = domain_group(localIdx) ->getDataStore() ->createBuffer(sidre::DOUBLE_ID, NDIMS * SZ) ->allocate(); - createAndApplyView(m_coordsGroups[localIdx], "values/x", buf, 0, SZ); + createAndApplyView(coords_group(localIdx), "values/x", buf, 0, SZ); if(NDIMS > 1) { - createAndApplyView(m_coordsGroups[localIdx], "values/y", buf, 1, SZ); + createAndApplyView(coords_group(localIdx), "values/y", buf, 1, SZ); } if(NDIMS > 2) { - createAndApplyView(m_coordsGroups[localIdx], "values/z", buf, 2, SZ); + createAndApplyView(coords_group(localIdx), "values/z", buf, 2, SZ); } // copy coordinate data into the buffer @@ -456,7 +415,7 @@ struct BlueprintParticleMesh // set the default connectivity // May be required by an old version of visit. May not be needed by newer versions of visit. sidre::Array arr( - m_topoGroups[localIdx]->createView("elements/connectivity"), + topo_group(localIdx)->createView("elements/connectivity"), SZ, SZ); for(int i = 0; i < SZ; ++i) @@ -468,7 +427,7 @@ struct BlueprintParticleMesh template axom::Array> getPoints(int domainIdx) { - auto* cGroup = m_coordsGroups[domainIdx]; + auto* cGroup = coords_group(domainIdx); auto* xView = cGroup->getView("values/x"); auto* yView = cGroup->getView("values/y"); auto* zView = NDIMS >= 3 ? cGroup->getView("values/z") : nullptr; @@ -506,13 +465,13 @@ struct BlueprintParticleMesh { for(axom::IndexType dIdx = 0; dIdx < domain_count(); ++dIdx) { - auto* fld = m_fieldsGroups[dIdx]->createGroup(fieldName); + auto* fld = fields_group(dIdx)->createGroup(fieldName); fld->createViewString("association", "vertex"); - fld->createViewString("topology", m_topoGroups[dIdx]->getName()); + fld->createViewString("topology", topo_group(dIdx)->getName()); if(m_coordsAreStrided) { - auto* offsets = m_topoGroups[dIdx]->getView("elements/dims/offsets"); - auto* strides = m_topoGroups[dIdx]->getView("elements/dims/strides"); + auto* offsets = topo_group(dIdx)->getView("elements/dims/offsets"); + auto* strides = topo_group(dIdx)->getView("elements/dims/strides"); fld->copyView(offsets); fld->copyView(strides); } @@ -530,19 +489,19 @@ struct BlueprintParticleMesh { const int SZ = numPoints(dIdx); - auto* fld = m_fieldsGroups[dIdx]->createGroup(fieldName); + auto* fld = fields_group(dIdx)->createGroup(fieldName); fld->createViewString("association", "vertex"); - fld->createViewString("topology", m_topoGroups[dIdx]->getName()); + fld->createViewString("topology", topo_group(dIdx)->getName()); if(m_coordsAreStrided) { - auto* offsets = m_topoGroups[dIdx]->getView("elements/dims/offsets"); - auto* strides = m_topoGroups[dIdx]->getView("elements/dims/strides"); + auto* offsets = topo_group(dIdx)->getView("elements/dims/offsets"); + auto* strides = topo_group(dIdx)->getView("elements/dims/strides"); fld->copyView(offsets); fld->copyView(strides); } // create views into a shared buffer for the coordinates, with stride DIM - auto* buf = m_domainGroups[dIdx] + auto* buf = domain_group(dIdx) ->getDataStore() ->createBuffer(sidre::detail::SidreTT::id, DIM * SZ) ->allocate(); @@ -564,9 +523,17 @@ struct BlueprintParticleMesh } } - bool hasField(const std::string& fieldName, int domainIdx = 0) const + bool hasScalarField(const std::string& fieldName, int domainIdx = 0) const + { + auto* domain = m_group->getGroup(domainIdx); + auto* fields = domain->getGroup("fields"); + auto has = fields->hasGroup(fieldName); + return has; + } + + bool hasVectorField(const std::string& fieldName, int domainIdx = 0) const { - return m_fieldsGroups[domainIdx]->hasGroup(fieldName); + return m_group->getGroup(domainIdx)->getGroup("fields")->hasGroup(fieldName); } template @@ -574,19 +541,20 @@ struct BlueprintParticleMesh int domainIdx) { SLIC_ASSERT_MSG( - domainIdx >= 0 && size_t(domainIdx) < m_domainGroups.size(), + domainIdx >= 0 && axom::IndexType(domainIdx) < domain_count(), axom::fmt::format("Rank {} has no domain {}, only {} domains", m_rank, domainIdx, - m_domainGroups.size())); + domain_count())); - T* data = hasField(fieldName) - ? static_cast(m_fieldsGroups[domainIdx] - ->getView(axom::fmt::format("{}/values", fieldName)) - ->getVoidPtr()) - : nullptr; + auto* domain = m_group->getGroup(domainIdx); + auto* fields = domain->getGroup("fields"); + auto* field = fields->getGroup(fieldName); + T* data = + field ? static_cast(field->getView("values")->getVoidPtr()) : nullptr; - return axom::ArrayView(data, numPoints(domainIdx)); + return field ? axom::ArrayView(data, numPoints(domainIdx)) + : axom::ArrayView(); } template @@ -594,23 +562,39 @@ struct BlueprintParticleMesh int domainIdx) { SLIC_ASSERT_MSG( - domainIdx >= 0 && size_t(domainIdx) < m_domainGroups.size(), + domainIdx >= 0 && axom::IndexType(domainIdx) < domain_count(), axom::fmt::format("Rank {} has only {} domains, no domain index {}", m_rank, - m_domainGroups.size(), + domain_count(), domainIdx)); // Note: the implementation currently assumes that the field data is // interleaved, so it is safe to get a pointer to the beginning of the // x-coordinate's data. This will be relaxed in the future, and we will // need to modify this implementation accordingly. - T* data = hasField(fieldName) - ? static_cast(m_fieldsGroups[domainIdx] - ->getView(axom::fmt::format("{}/values/x", fieldName)) - ->getVoidPtr()) - : nullptr; + T* data = nullptr; + axom::IndexType npts = 0; + bool has = + m_group->getGroup(domainIdx)->getGroup("fields")->hasGroup(fieldName); + if(has) + { + auto xView = + m_group->getGroup(domainIdx)->getGroup("fields")->getGroup(fieldName)->getView( + "values/x"); + data = static_cast(xView->getVoidPtr()); + npts = xView->getNumElements(); + } + return axom::ArrayView(data, npts); + } - return axom::ArrayView(data, numPoints(domainIdx)); + sidre::Group* getDomain(axom::IndexType domain) + { + return m_group->getGroup(domain); + } + sidre::Group* getFields(axom::IndexType domainIdx) + { + auto* fields = m_group->getGroup(domainIdx)->getGroup("fields"); + return fields; } /// Checks whether the blueprint is valid and prints diagnostics @@ -670,14 +654,10 @@ struct BlueprintParticleMesh topoGroup->createViewString("type", "unstructured"); topoGroup->createViewString("elements/shape", "point"); - auto* fieldsGroup = domainGroup->createGroup("fields"); + domainGroup->createGroup("fields"); + domainGroup->createGroup("state"); - m_domainGroups.push_back(domainGroup); - m_coordsGroups.push_back(coordsGroup); - m_topoGroups.push_back(topoGroup); - m_fieldsGroups.push_back(fieldsGroup); - - return axom::IndexType(m_domainGroups.size() - 1); + return m_group->getNumGroups() - 1; } private: @@ -687,12 +667,6 @@ struct BlueprintParticleMesh std::string m_coordsetName; /// Parent group for the entire mesh sidre::Group* m_group; - /// Group for each domain in multidomain mesh - std::vector m_domainGroups; - - std::vector m_coordsGroups; - std::vector m_topoGroups; - std::vector m_fieldsGroups; int m_rank; int m_nranks; @@ -839,7 +813,7 @@ class QueryMeshWrapper { // Test reading in multidomain mesh. m_queryMesh.read_blueprint_mesh(meshFilename); - setupParticleMesh(); + // setupParticleMesh(); } BlueprintParticleMesh& getParticleMesh() { return m_queryMesh; } @@ -925,6 +899,10 @@ class QueryMeshWrapper sidre::Group& dstFieldsGroup = *domGroup.getGroup("fields"); const conduit::Node& srcFieldsNode = domNode.fetch_existing("fields"); { + if(!m_queryMesh.hasScalarField("cp_rank")) + { + m_queryMesh.registerNodalScalarField("cp_rank"); + } auto dst = dstFieldsGroup.getGroup("cp_rank"); auto src = srcFieldsNode.fetch_existing("cp_rank"); bool goodImport = dst->importConduitTree(src); @@ -932,13 +910,23 @@ class QueryMeshWrapper AXOM_UNUSED_VAR(goodImport); } { + if(!m_queryMesh.hasScalarField("cp_index")) + { + m_queryMesh.registerNodalScalarField("cp_index"); + } auto dst = dstFieldsGroup.getGroup("cp_index"); auto src = srcFieldsNode.fetch_existing("cp_index"); bool goodImport = dst->importConduitTree(src); SLIC_ASSERT(goodImport); AXOM_UNUSED_VAR(goodImport); } + if(srcFieldsNode.has_child("cp_domain_index")) { + if(!m_queryMesh.hasScalarField("cp_domain_index")) + { + m_queryMesh.registerNodalScalarField( + "cp_domain_index"); + } auto src = srcFieldsNode.fetch_existing("cp_domain_index"); auto dst = dstFieldsGroup.getGroup("cp_domain_index"); bool goodImport = dst->importConduitTree(src); @@ -946,6 +934,10 @@ class QueryMeshWrapper AXOM_UNUSED_VAR(goodImport); } { + if(!m_queryMesh.hasVectorField("cp_coords")) + { + m_queryMesh.registerNodalVectorField("cp_coords"); + } auto dstGroup = dstFieldsGroup.getGroup("cp_coords"); auto srcNode = srcFieldsNode.fetch_existing("cp_coords"); int dim = srcNode.fetch_existing("values").number_of_children(); @@ -964,23 +956,6 @@ class QueryMeshWrapper } } } - - m_queryMesh.reset_group_pointers(); - for(axom::IndexType di = 0; di < m_queryMesh.domain_count(); ++di) - { - assert(m_queryMesh.domain_group(di) == - m_queryMesh.root_group()->getGroup(di)); - assert(m_queryMesh.coords_group(di) == - m_queryMesh.domain_group(di) - ->getGroup("coordsets") - ->getGroup(m_queryMesh.getCoordsetName())); - assert(m_queryMesh.topo_group(di) == - m_queryMesh.domain_group(di) - ->getGroup("topologies") - ->getGroup(m_queryMesh.getTopologyName())); - assert(m_queryMesh.fields_group(di) == - m_queryMesh.domain_group(di)->getGroup("fields")); - } } /** @@ -1014,10 +989,10 @@ class QueryMeshWrapper axom::ArrayView cpCoords = m_queryMesh.getNodalVectorField("cp_coords", dIdx); + SLIC_INFO(axom::fmt::format("Closest points ({}):", cpCoords.size())); axom::ArrayView cpIndices = m_queryMesh.getNodalScalarField("cp_index", dIdx); - SLIC_INFO(axom::fmt::format("Closest points ({}):", cpCoords.size())); axom::ArrayView errorFlag = m_queryMesh.getNodalScalarField("error_flag", dIdx); @@ -1460,7 +1435,6 @@ int main(int argc, char** argv) maxQuery)); } slic::flushStreams(); - queryMeshWrapper.update_closest_points(queryMeshNode); int errCount = 0; From c4f58ab2d2199945c5d083f0815c8688b111536f Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 7 Dec 2023 15:57:12 -0800 Subject: [PATCH 246/639] Remove unneeded includes. --- src/axom/quest/DistributedClosestPoint.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index 2b16b9829c..e9ad398364 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -9,8 +9,6 @@ #include "axom/config.hpp" #include "axom/core.hpp" #include "axom/slic.hpp" -#include "axom/slam.hpp" -#include "axom/sidre.hpp" #include "axom/primal.hpp" #include "axom/spin.hpp" #include "axom/core/execution/runtime_policy.hpp" From d78b81a85bc7e925effe5dbed1402da963564324 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Thu, 7 Dec 2023 16:10:23 -0800 Subject: [PATCH 247/639] Array: destroy moved-from objects in ArrayOps::realloc_move This avoids accidentally destroying "copy-moved" objects in the device allocator case. --- src/axom/core/Array.hpp | 1 - src/axom/core/ArrayBase.hpp | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index 939a345fb8..292a9a65cf 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -1500,7 +1500,6 @@ inline void Array::setCapacity(IndexType new_capacity) OpHelper::realloc_move(new_data, m_num_elements, m_data, m_allocator_id); // Destroy the original array. - OpHelper::destroy(m_data, 0, m_num_elements, m_allocator_id); axom::deallocate(m_data); // Set the pointer and capacity to the new memory. diff --git a/src/axom/core/ArrayBase.hpp b/src/axom/core/ArrayBase.hpp index 47d42a2983..fc1b6b4eba 100644 --- a/src/axom/core/ArrayBase.hpp +++ b/src/axom/core/ArrayBase.hpp @@ -1020,6 +1020,7 @@ struct ArrayOpsBase std::uninitialized_copy(std::make_move_iterator(values), std::make_move_iterator(values + nelems), array); + destroy(values, 0, nelems); } }; From b79d85948b978ec5e787df02372ccb8aab43be39 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 8 Dec 2023 10:03:23 -0800 Subject: [PATCH 248/639] Fix outdated comments and documentation, and split up a file. I moved DistributedClosestPointImpl into its own file to avoid confusing its code with DistributedClosestPoint, which has some similar methods. --- RELEASE-NOTES.md | 1 + src/axom/quest/DistributedClosestPoint.hpp | 1416 +---------------- .../detail/DistributedClosestPointImpl.hpp | 1350 ++++++++++++++++ 3 files changed, 1384 insertions(+), 1383 deletions(-) create mode 100644 src/axom/quest/detail/DistributedClosestPointImpl.hpp diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index d8bb78a17f..a8103d84c1 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -30,6 +30,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ negative, resulting in the signed volume becoming positive. ### Changed +- `DistributedClosestPoint` outputs are now controlled by the `setOutput` method. - `MarchingCubes` and `DistributedClosestPoint` classes identify domains by their `state/domain_id` parameters if provided, or the local iteration index if not. - `MarchingCubes` and `DistributedClosestPoint` classes changed from requiring the Blueprint diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index e9ad398364..25e3649242 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -9,23 +9,18 @@ #include "axom/config.hpp" #include "axom/core.hpp" #include "axom/slic.hpp" -#include "axom/primal.hpp" -#include "axom/spin.hpp" #include "axom/core/execution/runtime_policy.hpp" +#include "axom/quest/detail/DistributedClosestPointImpl.hpp" #include "axom/fmt.hpp" #include "conduit_blueprint.hpp" -#include "conduit_blueprint_mcarray.hpp" #include "conduit_blueprint_mpi.hpp" #include "conduit_relay_mpi.hpp" -#include "conduit_relay_io.hpp" #include #include #include -#include -#include #ifndef AXOM_USE_MPI #error This file requires Axom to be configured with MPI @@ -36,1366 +31,6 @@ namespace axom { namespace quest { -namespace internal -{ -// Utility function to dump a conduit node on each rank, e.g. for debugging -inline void dump_node(const conduit::Node& n, - const std::string&& fname, - const std::string& protocol = "json") -{ - conduit::relay::io::save(n, fname, protocol); -} - -/** - * \brief Utility function to get a typed pointer to the beginning of an array - * stored by a conduit::Node - */ -template -T* getPointer(conduit::Node& node) -{ - T* ptr = node.value(); - return ptr; -} - -/** - * \brief Utility function to create an axom::ArrayView over the array - * of native types stored by a conduit::Node - */ -template -axom::ArrayView ArrayView_from_Node(conduit::Node& node, int sz) -{ - T* ptr = node.value(); - return axom::ArrayView(ptr, sz); -} - -/** - * \brief Template specialization of ArrayView_from_Node for Point - * - * \warning Assumes the underlying data is an MCArray with stride 2 access - */ -template <> -inline axom::ArrayView> ArrayView_from_Node( - conduit::Node& node, - int sz) -{ - using PointType = primal::Point; - - PointType* ptr = static_cast(node.data_ptr()); - return axom::ArrayView(ptr, sz); -} - -/** - * \brief Template specialization of ArrayView_from_Node for Point - * - * \warning Assumes the underlying data is an MCArray with stride 3 access - */ -template <> -inline axom::ArrayView> ArrayView_from_Node( - conduit::Node& node, - int sz) -{ - using PointType = primal::Point; - - PointType* ptr = static_cast(node.data_ptr()); - return axom::ArrayView(ptr, sz); -} - -/** - * \brief Put BoundingBox into a Conduit Node. - */ -template -void put_bounding_box_to_conduit_node(const primal::BoundingBox& bb, - conduit::Node& node) -{ - node["dim"].set(bb.dimension()); - if(bb.isValid()) - { - node["lo"].set(bb.getMin().data(), bb.dimension()); - node["hi"].set(bb.getMax().data(), bb.dimension()); - } -} - -/** - * \brief Get BoundingBox from a Conduit Node. - */ -template -void get_bounding_box_from_conduit_node(primal::BoundingBox& bb, - const conduit::Node& node) -{ - using PointType = primal::Point; - - SLIC_ASSERT(NDIMS == node.fetch_existing("dim").as_int()); - - bb.clear(); - - if(node.has_child("lo")) - { - bb.addPoint(PointType(node.fetch_existing("lo").as_double_ptr(), NDIMS)); - bb.addPoint(PointType(node.fetch_existing("hi").as_double_ptr(), NDIMS)); - } -} - -/// Helper function to extract the dimension from the coordinate values group -/// of a mesh blueprint coordset -inline int extractDimension(const conduit::Node& values_node) -{ - SLIC_ASSERT(values_node.has_child("x")); - return values_node.has_child("z") ? 3 : (values_node.has_child("y") ? 2 : 1); -} - -/// Helper function to extract the number of points from the coordinate values group -/// of a mesh blueprint coordset -inline int extractSize(const conduit::Node& values_node) -{ - SLIC_ASSERT(values_node.has_child("x")); - return values_node["x"].dtype().number_of_elements(); -} - -namespace relay -{ -namespace mpi -{ -/** - * \brief Sends a conduit node along with its schema using MPI_Isend - * - * \param [in] node node to send - * \param [in] dest ID of MPI rank to send to - * \param [in] tag tag for MPI message - * \param [in] comm MPI communicator to use - * \param [in] request object holding state for the sent data - * \note Adapted from conduit's relay::mpi's \a send_using_schema and \a isend - * to use non-blocking \a MPI_Isend instead of blocking \a MPI_Send - */ -inline int isend_using_schema(conduit::Node& node, - int dest, - int tag, - MPI_Comm comm, - conduit::relay::mpi::Request* request) -{ - conduit::Schema s_data_compact; - - // schema will only be valid if compact and contig - if(node.is_compact() && node.is_contiguous()) - { - s_data_compact = node.schema(); - } - else - { - node.schema().compact_to(s_data_compact); - } - const std::string snd_schema_json = s_data_compact.to_json(); - - conduit::Schema s_msg; - s_msg["schema_len"].set(conduit::DataType::int64()); - s_msg["schema"].set(conduit::DataType::char8_str(snd_schema_json.size() + 1)); - s_msg["data"].set(s_data_compact); - - // create a compact schema to use - conduit::Schema s_msg_compact; - s_msg.compact_to(s_msg_compact); - request->m_buffer.reset(); - request->m_buffer.set_schema(s_msg_compact); - - // set up the message's node using this schema - request->m_buffer["schema_len"].set((std::int64_t)snd_schema_json.length()); - request->m_buffer["schema"].set(snd_schema_json); - request->m_buffer["data"].update(node); - - // for wait_all, this must always be NULL except for - // the irecv cases where copy out is necessary - // isend case must always be NULL - request->m_rcv_ptr = nullptr; - - auto msg_data_size = request->m_buffer.total_bytes_compact(); - int mpi_error = MPI_Isend(const_cast(request->m_buffer.data_ptr()), - static_cast(msg_data_size), - MPI_BYTE, - dest, - tag, - comm, - &(request->m_request)); - - // Error checking -- Note: expansion of CONDUIT_CHECK_MPI_ERROR - if(static_cast(mpi_error) != MPI_SUCCESS) - { - char check_mpi_err_str_buff[MPI_MAX_ERROR_STRING]; - int check_mpi_err_str_len = 0; - MPI_Error_string(mpi_error, check_mpi_err_str_buff, &check_mpi_err_str_len); - - SLIC_ERROR( - fmt::format("MPI call failed: error code = {} error message = {}", - mpi_error, - check_mpi_err_str_buff)); - } - - return mpi_error; -} - -/// A modified version of the conduit method. -// This version works correctly when src is MPI_ANY_SOURCE -// and tag is MPI_ANY_TAG. When conduit supports this, -// this version can be removed. -inline int recv_using_schema(conduit::Node& node, int src, int tag, MPI_Comm comm) -{ - MPI_Status status; - - int mpi_error = MPI_Probe(src, tag, comm, &status); - - // CONDUIT_CHECK_MPI_ERROR(mpi_error); - // Expand the conduit macro: - if(static_cast(mpi_error) != MPI_SUCCESS) - { - char check_mpi_err_str_buff[MPI_MAX_ERROR_STRING]; - int check_mpi_err_str_len = 0; - MPI_Error_string(mpi_error, check_mpi_err_str_buff, &check_mpi_err_str_len); - - SLIC_ERROR( - fmt::format("MPI call failed: error code = {} error message = {}", - mpi_error, - check_mpi_err_str_buff)); - } - - int buffer_size = 0; - MPI_Get_count(&status, MPI_BYTE, &buffer_size); - - conduit::Node n_buffer(conduit::DataType::uint8(buffer_size)); - - mpi_error = MPI_Recv(n_buffer.data_ptr(), - buffer_size, - MPI_BYTE, - status.MPI_SOURCE, - status.MPI_TAG, - comm, - &status); - - std::uint8_t* n_buff_ptr = (std::uint8_t*)n_buffer.data_ptr(); - - conduit::Node n_msg; - // length of the schema is sent as a 64-bit signed int - // NOTE: we aren't using this value ... - n_msg["schema_len"].set_external((std::int64_t*)n_buff_ptr); - n_buff_ptr += 8; - // wrap the schema string - n_msg["schema"].set_external_char8_str((char*)(n_buff_ptr)); - // create the schema - conduit::Schema rcv_schema; - conduit::Generator gen(n_msg["schema"].as_char8_str()); - gen.walk(rcv_schema); - - // advance by the schema length - n_buff_ptr += n_msg["schema"].total_bytes_compact(); - - // apply the schema to the data - n_msg["data"].set_external(rcv_schema, n_buff_ptr); - - // copy out to our result node - node.update(n_msg["data"]); - - return mpi_error; -} - -} // namespace mpi -} // namespace relay - -/** - * \brief Implements the DistributedClosestPoint query for a specified dimension - * using a provided execution policy (e.g. sequential, openmp, cuda, hip) - * - * \tparam NDIMS The dimension of the object mesh and query points - */ -template -class DistributedClosestPointImpl -{ -public: - static constexpr int DIM = NDIMS; - using RuntimePolicy = axom::runtime_policy::Policy; - using PointType = primal::Point; - using BoxType = primal::BoundingBox; - using PointArray = axom::Array; - using BoxArray = axom::Array; - - using SeqBVHTree = spin::BVH; -#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP - using OmpBVHTree = spin::BVH; -#endif -#ifdef AXOM_RUNTIME_POLICY_USE_CUDA - using CudaBVHTree = spin::BVH>; -#endif -#ifdef AXOM_RUNTIME_POLICY_USE_HIP - using HipBVHTree = spin::BVH>; -#endif - -private: - struct MinCandidate - { - /// Squared distance to query point - double sqDist {numerics::floating_point_limits::max()}; - /// Index of domain of closest element - int domainIdx {-1}; - /// Index within domain of closest element - int pointIdx {-1}; - /// MPI rank of closest element - int rank {-1}; - }; - -public: - /*! - @brief Constructor - - @param [i] runtimePolicy Indicates where local computations - are done. See axom::runtime_policy. - @param [i] Allocator ID, which must be compatible with - @c runtimePolicy. See axom::allocate and axom::reallocate. - Also see setAllocatorID(). - @param [i[ isVerbose - */ - DistributedClosestPointImpl(RuntimePolicy runtimePolicy, - int allocatorID, - bool isVerbose) - : m_runtimePolicy(runtimePolicy) - , m_isVerbose(isVerbose) - , m_sqDistanceThreshold(std::numeric_limits::max()) - , m_allocatorID(allocatorID) - , m_mpiComm(MPI_COMM_NULL) - , m_rank(-1) - , m_nranks(-1) - , m_objectPtCoords(0, 0, allocatorID) - , m_objectPtDomainIds(0, 0, allocatorID) - { - SLIC_ASSERT(allocatorID != axom::INVALID_ALLOCATOR_ID); - - setMpiCommunicator(MPI_COMM_WORLD); - } - - /** - * \brief Set the MPI communicator. - */ - void setMpiCommunicator(MPI_Comm mpiComm) - { - m_mpiComm = mpiComm; - MPI_Comm_rank(m_mpiComm, &m_rank); - MPI_Comm_size(m_mpiComm, &m_nranks); - } - - /** - * \brief Sets the threshold for the query - * - * \param [in] threshold Ignore distances greater than this value. - */ - void setSquaredDistanceThreshold(double sqThreshold) - { - SLIC_ERROR_IF(sqThreshold < 0.0, - "Squared distance-threshold must be non-negative."); - m_sqDistanceThreshold = sqThreshold; - } - - /*! @brief Sets the allocator ID to the default associated with the - execution policy - */ - void setAllocatorID(int allocatorID) - { - SLIC_ASSERT(allocatorID != axom::INVALID_ALLOCATOR_ID); - // TODO: If appropriate, how to check for compatibility with runtime policy? - m_allocatorID = allocatorID; - } - - void setOutputSwitches(bool outputRank, - bool outputIndex, - bool outputDistance, - bool outputCoords, - bool outputDomainIndex) - { - m_outputRank = outputRank; - m_outputIndex = outputIndex; - m_outputDistance = outputDistance; - m_outputCoords = outputCoords; - m_outputDomainIndex = outputDomainIndex; - } - -public: - /** - * Import object mesh points from the object blueprint mesh into internal memory. - * - * \param [in] mdMeshNode The blueprint mesh containing the object points. - * \param [in] topologyName Name of the blueprint topology in \a mdMeshNode. - * \note This function currently supports mesh blueprints with the "point" topology - */ - void importObjectPoints(const conduit::Node& mdMeshNode, - const std::string& topologyName) - { - // TODO: See if some of the copies in this method can be optimized out. - - SLIC_ASSERT(sizeof(double) * DIM == sizeof(PointType)); - - // Count points in the mesh. - int ptCount = 0; - for(const conduit::Node& domain : mdMeshNode.children()) - { - const std::string coordsetName = - domain - .fetch_existing( - axom::fmt::format("topologies/{}/coordset", topologyName)) - .as_string(); - const std::string valuesPath = - axom::fmt::format("coordsets/{}/values", coordsetName); - auto& values = domain.fetch_existing(valuesPath); - const int N = internal::extractSize(values); - ptCount += N; - } - - // Copy points to internal memory - PointArray coords(ptCount, ptCount); - axom::Array domIds(ptCount, ptCount); - std::size_t copiedCount = 0; - conduit::Node tmpValues; - for(axom::IndexType d = 0; d < mdMeshNode.number_of_children(); ++d) - { - const conduit::Node& domain = mdMeshNode.child(d); - - axom::IndexType domainId = d; - if(domain.has_path("state/domain_id")) - { - domainId = domain.fetch_existing("state/domain_id").to_int32(); - } - - const std::string coordsetName = - domain - .fetch_existing( - axom::fmt::format("topologies/{}/coordset", topologyName)) - .as_string(); - const std::string valuesPath = - axom::fmt::format("coordsets/{}/values", coordsetName); - - auto& values = domain.fetch_existing(valuesPath); - - bool isInterleaved = conduit::blueprint::mcarray::is_interleaved(values); - if(!isInterleaved) - { - conduit::blueprint::mcarray::to_interleaved(values, tmpValues); - } - const conduit::Node& copySrc = isInterleaved ? values : tmpValues; - - const int N = internal::extractSize(copySrc); - const std::size_t nBytes = sizeof(double) * DIM * N; - - axom::copy(coords.data() + copiedCount, - copySrc.fetch_existing("x").data_ptr(), - nBytes); - tmpValues.reset(); - - domIds.fill(domainId, N, copiedCount); - - copiedCount += N; - } - // copy computed data to ExecSpace - m_objectPtCoords = PointArray(coords, m_allocatorID); - m_objectPtDomainIds = axom::Array(domIds, m_allocatorID); - } - - /// Predicate to check if the BVH tree has been initialized - bool isBVHTreeInitialized() const - { - switch(m_runtimePolicy) - { - case RuntimePolicy::seq: - return m_bvh_seq.get() != nullptr; - -#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP - case RuntimePolicy::omp: - return m_bvh_omp.get() != nullptr; -#endif - -#ifdef AXOM_RUNTIME_POLICY_USE_CUDA - case RuntimePolicy::cuda: - return m_bvh_cuda.get() != nullptr; -#endif - -#ifdef AXOM_RUNTIME_POLICY_USE_HIP - case RuntimePolicy::hip: - return m_bvh_hip.get() != nullptr; -#endif - } - - return false; - } - - /// Generates the BVH tree for the classes execution space - bool generateBVHTree() - { - // Delegates to generateBVHTreeImpl<> which uses - // the execution space templated bvh tree - - SLIC_ASSERT_MSG(!isBVHTreeInitialized(), "BVH tree already initialized"); - - // In case user changed the allocator after setObjectMesh, - // move the object point data to avoid repetitive page faults. - if(m_objectPtCoords.getAllocatorID() != m_allocatorID) - { - PointArray tmpPoints(m_objectPtCoords, m_allocatorID); - m_objectPtCoords.swap(tmpPoints); - } - - switch(m_runtimePolicy) - { - case RuntimePolicy::seq: - m_bvh_seq = std::make_unique(); - return generateBVHTreeImpl(m_bvh_seq.get()); - -#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP - case RuntimePolicy::omp: - m_bvh_omp = std::make_unique(); - return generateBVHTreeImpl(m_bvh_omp.get()); -#endif - -#ifdef AXOM_RUNTIME_POLICY_USE_CUDA - case RuntimePolicy::cuda: - m_bvh_cuda = std::make_unique(); - return generateBVHTreeImpl(m_bvh_cuda.get()); -#endif - -#ifdef AXOM_RUNTIME_POLICY_USE_HIP - case RuntimePolicy::hip: - m_bvh_hip = std::make_unique(); - return generateBVHTreeImpl(m_bvh_hip.get()); -#endif - } - - // Fail safe -- we should never reach this line! - SLIC_ERROR("Failed to initialize the BVH tree"); - - return false; - } - - /// Get local copy of all ranks BVH root bounding boxes. - void gatherBVHRoots() - { - SLIC_ASSERT_MSG( - isBVHTreeInitialized(), - "BVH tree must be initialized before calling 'gatherBVHRoots"); - - BoxType local_bb; - switch(m_runtimePolicy) - { - case RuntimePolicy::seq: - local_bb = m_bvh_seq->getBounds(); - break; - -#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP - case RuntimePolicy::omp: - local_bb = m_bvh_omp->getBounds(); - break; -#endif - -#ifdef AXOM_RUNTIME_POLICY_USE_CUDA - case RuntimePolicy::cuda: - local_bb = m_bvh_cuda->getBounds(); - break; -#endif - -#ifdef AXOM_RUNTIME_POLICY_USE_HIP - case RuntimePolicy::hip: - local_bb = m_bvh_hip->getBounds(); - break; -#endif - } - - gatherBoundingBoxes(local_bb, m_objectPartitionBbs); - } - - /// Allgather one bounding box from each rank. - void gatherBoundingBoxes(const BoxType& aabb, BoxArray& all_aabbs) const - { - axom::Array sendbuf(2 * DIM); - aabb.getMin().to_array(&sendbuf[0]); - aabb.getMax().to_array(&sendbuf[DIM]); - axom::Array recvbuf(m_nranks * sendbuf.size()); - // Note: Using axom::Array may reduce clutter a tad. - int errf = MPI_Allgather(sendbuf.data(), - 2 * DIM, - mpi_traits::type, - recvbuf.data(), - 2 * DIM, - mpi_traits::type, - m_mpiComm); - SLIC_ASSERT(errf == MPI_SUCCESS); - AXOM_UNUSED_VAR(errf); - - all_aabbs.clear(); - all_aabbs.reserve(m_nranks); - for(int i = 0; i < m_nranks; ++i) - { - PointType lower(&recvbuf[i * 2 * DIM]); - PointType upper(&recvbuf[i * 2 * DIM + DIM]); - all_aabbs.emplace_back(BoxType(lower, upper, false)); - } - } - - /// Compute bounding box for local part of a mesh. - BoxType computeMeshBoundingBox(conduit::Node& xferNode) const - { - BoxType rval; - - conduit::Node& xferDoms = xferNode.fetch_existing("xferDoms"); - for(conduit::Node& xferDom : xferDoms.children()) - { - const int qPtCount = xferDom.fetch_existing("qPtCount").value(); - - /// Extract fields from the input node as ArrayViews - auto queryPts = - ArrayView_from_Node(xferDom.fetch_existing("coords"), - qPtCount); - for(const auto& p : queryPts) - { - rval.addPoint(p); - } - } - - return rval; - } - - /*! - * Copy parts of query mesh partition to a conduit::Node for - * computation and communication. - * queryNode must be a blueprint multidomain mesh. - */ - void node_copy_query_to_xfer(conduit::Node& queryNode, - conduit::Node& xferNode, - const std::string& topologyName) const - { - xferNode["homeRank"] = m_rank; - xferNode["is_first"] = 1; - - const bool isMultidomain = - conduit::blueprint::mesh::is_multi_domain(queryNode); - const auto domainCount = - conduit::blueprint::mesh::number_of_domains(queryNode); - conduit::Node& xferDoms = xferNode["xferDoms"]; - for(conduit::index_t domainNum = 0; domainNum < domainCount; ++domainNum) - { - auto& queryDom = isMultidomain ? queryNode.child(domainNum) : queryNode; - - const std::string coordsetName = - queryDom - .fetch_existing( - axom::fmt::format("topologies/{}/coordset", topologyName)) - .as_string(); - const std::string& domName = queryDom.name(); - conduit::Node& xferDom = xferDoms[domName]; - conduit::Node& queryCoords = - queryDom.fetch_existing(fmt::format("coordsets/{}", coordsetName)); - conduit::Node& queryCoordsValues = queryCoords.fetch_existing("values"); - - const int dim = internal::extractDimension(queryCoordsValues); - const int qPtCount = internal::extractSize(queryCoordsValues); - xferDom["qPtCount"] = qPtCount; - xferDom["dim"] = dim; - - copy_components_to_interleaved(queryCoordsValues, xferDom["coords"]); - - constexpr bool isInt32 = std::is_same::value; - auto dtype = - isInt32 ? conduit::DataType::int32() : conduit::DataType::int64(); - dtype.set_number_of_elements(qPtCount); - xferDom["cp_index"].set_dtype(dtype); - xferDom["cp_rank"].set_dtype(dtype); - xferDom["cp_domain_index"].set_dtype(dtype); - xferDom["debug/cp_distance"].set_dtype(conduit::DataType::float64(qPtCount)); - xferDom["cp_coords"].set_dtype(conduit::DataType::float64(dim * qPtCount)); - } - } - - /// Copy xferNode back to query mesh partition. - void node_copy_xfer_to_query(conduit::Node& xferNode, - conduit::Node& queryNode, - const std::string& topologyName) const - { - const bool isMultidomain = - conduit::blueprint::mesh::is_multi_domain(queryNode); - const auto domainCount = - conduit::blueprint::mesh::number_of_domains(queryNode); - conduit::Node& xferDoms = xferNode.fetch_existing("xferDoms"); - SLIC_ASSERT(xferDoms.number_of_children() == domainCount); - for(conduit::index_t domainNum = 0; domainNum < domainCount; ++domainNum) - { - auto& queryDom = isMultidomain ? queryNode.child(domainNum) : queryNode; - conduit::Node& xferDom = xferDoms.child(domainNum); - conduit::Node& fields = queryDom.fetch_existing("fields"); - - conduit::Node genericHeaders; - genericHeaders["association"] = "vertex"; - genericHeaders["topology"] = topologyName; - - if(m_outputRank) - { - auto& src = xferDom.fetch_existing("cp_rank"); - auto& dst = fields["cp_rank"]; - dst.set_node(genericHeaders); - dst["values"].move(src); - } - - if(m_outputIndex) - { - auto& src = xferDom.fetch_existing("cp_index"); - auto& dst = fields["cp_index"]; - dst.set_node(genericHeaders); - dst["values"].move(src); - } - - if(m_outputDomainIndex) - { - auto& src = xferDom.fetch_existing("cp_domain_index"); - auto& dst = fields["cp_domain_index"]; - dst.set_node(genericHeaders); - dst["values"].move(src); - } - - if(m_outputDistance) - { - auto& src = xferDom.fetch_existing("debug/cp_distance"); - auto& dst = fields["cp_distance"]; - dst.set_node(genericHeaders); - dst["values"].move(src); - } - - if(m_outputCoords) - { - auto& dst = fields["cp_coords"]; - dst.set_node(genericHeaders); - auto& dstValues = dst["values"]; - copy_interleaved_to_components(xferDom.fetch_existing("cp_coords"), - dstValues); - } - } - } - - /* - Special copy from coordinates (in a format that's not - necessarily interleaved) to a 1D array of interleaved values). - If coordinates are already interleaved, copy pointer. - */ - void copy_components_to_interleaved(conduit::Node& components, - conduit::Node& interleaved) const - { - const int dim = internal::extractDimension(components); - const int qPtCount = internal::extractSize(components); - bool interleavedSrc = conduit::blueprint::mcarray::is_interleaved(components); - if(interleavedSrc) - { - interleaved.set_external(internal::getPointer(components.child(0)), - dim * qPtCount); - } - else - { - // Copy from component-wise src to 1D-interleaved dst. - interleaved.reset(); - interleaved.set_dtype(conduit::DataType::float64(dim * qPtCount)); - for(int d = 0; d < dim; ++d) - { - auto src = components.child(d).as_float64_array(); - double* dst = interleaved.as_float64_ptr() + d; - for(int i = 0; i < qPtCount; ++i) - { - dst[i * dim] = src[i]; - } - } - } - } - - /* - Special copy from 1D interleaved coordinate values back to - component-wise storage. - This is a nop if they point to the same data. - */ - void copy_interleaved_to_components(const conduit::Node& interleaved, - conduit::Node& components) const - { - const int qPtCount = interleaved.dtype().number_of_elements() / NDIMS; - components.reset(); - // Copy from 1D-interleaved src to component-wise dst. - for(int d = 0; d < NDIMS; ++d) - { - const double* src = interleaved.as_float64_ptr() + d; - auto& dstNode = components.append(); - dstNode.set_dtype(conduit::DataType(interleaved.dtype().id(), qPtCount)); - double* dst = dstNode.as_float64_ptr(); - for(int i = 0; i < qPtCount; ++i) - { - dst[i] = src[i * NDIMS]; - } - } - } - - /** - * \brief Computes the closest point within the objects for each query point - * in the mesh \a queryMesh. - * - * \param queryMesh The root node of a mesh blueprint for the query points - * Can be empty if there are no query points for the calling rank - * \param topologyName The topology name identifying the query points - * - * @c queryMesh should have data on the host, regardless of the runtime - * policy setting. Data will be copied to device as needed. - * - * The named topology is used to identify the points in the query mesh. - * On completion, the query mesh contains the following fields: - * - cp_rank: Will hold the rank of the object point containing the closest point - * - cp_domain_index: will hold the index of the object domain containing - * the closest points. - * - cp_index: Will hold the index of the closest object points. - * For multiple object mesh domains on a rank, cp_index is relative to - * each domain. - * - cp_coords: Will hold the coordinates of the closest points - * interleaved in a 1D array. - * - * \note The current implementation assumes that the coordinates and - * cp_coords are interleaved or contiguous. - * - * \note We're temporarily also using a cp_distance field while debugging this class. - * The code will use this field if it is present in \a queryMesh. - * - * We use non-blocking sends for performance and deadlock avoidance. - * The worst case could incur nranks^2 sends. To avoid excessive - * buffer usage, we occasionally check the sends for completion, - * using check_send_requests(). - */ - void computeClosestPoints(conduit::Node& queryMesh, - const std::string& topologyName) const - { - SLIC_ASSERT_MSG( - isBVHTreeInitialized(), - "BVH tree must be initialized before calling 'computeClosestPoints"); - - std::map> xferNodes; - - // create conduit Node containing data that has to xfer between ranks. - // The node will be mostly empty if there are no domains on this rank - { - xferNodes[m_rank] = std::make_shared(); - conduit::Node& xferNode = *xferNodes[m_rank]; - node_copy_query_to_xfer(queryMesh, xferNode, topologyName); - xferNode["homeRank"] = m_rank; - } - - BoxType myQueryBb = computeMeshBoundingBox(*xferNodes[m_rank]); - put_bounding_box_to_conduit_node(myQueryBb, xferNodes[m_rank]->fetch("aabb")); - BoxArray allQueryBbs; - gatherBoundingBoxes(myQueryBb, allQueryBbs); - - { - conduit::Node& xferNode = *xferNodes[m_rank]; - computeLocalClosestPointsByPolicy(xferNode); - } - - const auto& myObjectBb = m_objectPartitionBbs[m_rank]; - int remainingRecvs = 0; - for(int r = 0; r < m_nranks; ++r) - { - if(r != m_rank) - { - const auto& otherQueryBb = allQueryBbs[r]; - double sqDistance = - axom::primal::squared_distance(otherQueryBb, myObjectBb); - if(sqDistance <= m_sqDistanceThreshold) - { - ++remainingRecvs; - } - } - } - - // arbitrary tags for send/recv xferNode. - const int tag = 987342; - - std::list isendRequests; - - { - /* - Send local query mesh to next rank with close-enough object - partition, if any. Increase remainingRecvs, because this data - will come back. - */ - int firstRecipForMyQuery = next_recipient(*xferNodes[m_rank]); - if(m_nranks == 1) - { - SLIC_ASSERT(firstRecipForMyQuery == -1); - } - - if(firstRecipForMyQuery == -1) - { - // No need to send anywhere. Put computed data back into queryMesh. - node_copy_xfer_to_query(*xferNodes[m_rank], queryMesh, topologyName); - xferNodes.erase(m_rank); - } - else - { - isendRequests.emplace_back(conduit::relay::mpi::Request()); - auto& req = isendRequests.back(); - relay::mpi::isend_using_schema(*xferNodes[m_rank], - firstRecipForMyQuery, - tag, - m_mpiComm, - &req); - ++remainingRecvs; - } - } - - while(remainingRecvs > 0) - { - SLIC_INFO_IF( - m_isVerbose, - fmt::format("======= {} receives remaining =======", remainingRecvs)); - - // Receive the next xferNode - std::shared_ptr recvXferNodePtr = - std::make_shared(); - relay::mpi::recv_using_schema(*recvXferNodePtr, - MPI_ANY_SOURCE, - tag, - m_mpiComm); - - const int homeRank = recvXferNodePtr->fetch_existing("homeRank").as_int(); - --remainingRecvs; - xferNodes[homeRank] = recvXferNodePtr; - conduit::Node& xferNode = *xferNodes[homeRank]; - - if(homeRank == m_rank) - { - node_copy_xfer_to_query(xferNode, queryMesh, topologyName); - } - else - { - computeLocalClosestPointsByPolicy(xferNode); - - isendRequests.emplace_back(conduit::relay::mpi::Request()); - auto& isendRequest = isendRequests.back(); - int nextRecipient = next_recipient(xferNode); - SLIC_ASSERT(nextRecipient != -1); - relay::mpi::isend_using_schema(xferNode, - nextRecipient, - tag, - m_mpiComm, - &isendRequest); - - // Check non-blocking sends to free memory. - check_send_requests(isendRequests, false); - } - - } // remainingRecvs loop - - // Complete remaining non-blocking sends. - while(!isendRequests.empty()) - { - check_send_requests(isendRequests, true); - } - - MPI_Barrier(m_mpiComm); - slic::flushStreams(); - } - -private: - /// Distance search using local object partition and xferNode. - void computeLocalClosestPointsByPolicy(conduit::Node& xferNode) const - { - switch(m_runtimePolicy) - { - case RuntimePolicy::seq: - computeLocalClosestPoints(m_bvh_seq.get(), xferNode); - break; - -#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP - case RuntimePolicy::omp: - computeLocalClosestPoints(m_bvh_omp.get(), xferNode); -#endif - break; - -#ifdef AXOM_RUNTIME_POLICY_USE_CUDA - case RuntimePolicy::cuda: - computeLocalClosestPoints(m_bvh_cuda.get(), xferNode); -#endif - break; - -#ifdef AXOM_RUNTIME_POLICY_USE_HIP - case RuntimePolicy::hip: - computeLocalClosestPoints(m_bvh_hip.get(), xferNode); -#endif - break; - } - } - - /** - Determine the next rank (in ring order) with an object partition - close to the query points in xferNode. The intent is to send - xferNode there next. - */ - int next_recipient(const conduit::Node& xferNode) const - { - int homeRank = xferNode.fetch_existing("homeRank").value(); - BoxType bb; - get_bounding_box_from_conduit_node(bb, xferNode.fetch_existing("aabb")); - for(int i = 1; i < m_nranks; ++i) - { - int maybeNextRecip = (m_rank + i) % m_nranks; - if(maybeNextRecip == homeRank) - { - return maybeNextRecip; - } - double sqDistance = - primal::squared_distance(bb, m_objectPartitionBbs[maybeNextRecip]); - if(sqDistance <= m_sqDistanceThreshold) - { - return maybeNextRecip; - } - } - return -1; - } - - /// Wait for some non-blocking sends (if any) to finish. - void check_send_requests(std::list& isendRequests, - bool atLeastOne) const - { - std::vector reqs; - for(auto& isr : isendRequests) - { - reqs.push_back(isr.m_request); - } - - int inCount = static_cast(reqs.size()); - int outCount = 0; - std::vector indices(reqs.size(), -1); - if(atLeastOne) - { - MPI_Waitsome(inCount, - reqs.data(), - &outCount, - indices.data(), - MPI_STATUSES_IGNORE); - } - else - { - MPI_Testsome(inCount, - reqs.data(), - &outCount, - indices.data(), - MPI_STATUSES_IGNORE); - } - indices.resize(outCount); - - auto reqIter = isendRequests.begin(); - int prevIdx = 0; - for(const int idx : indices) - { - for(; prevIdx < idx; ++prevIdx) - { - ++reqIter; - } - reqIter = isendRequests.erase(reqIter); - ++prevIdx; - } - } - - /** - * \brief Extracts a field \a fieldName from the mesh blueprint - * - * \tparam T The type for the underlying array - * \param mesh_node The conduit node at the root of the mesh blueprint - * \param field_name The name of the field - * \param field_template Template string for the path to the field - * \param num_objectPts The size of the field - * \return An arrayview over the field data - */ - template - axom::ArrayView extractField(conduit::Node& mesh_node, - std::string&& field_name, - std::string&& path_template, - int num_objectPts) const - { - const std::string path = axom::fmt::format(path_template, field_name); - SLIC_ASSERT_MSG( - mesh_node.has_path(path), - fmt::format( - "Input to `computeClosestPoint()` must have a field named `{}`", - field_name)); - - return internal::ArrayView_from_Node(mesh_node[path], num_objectPts); - } - - // Note: following should be private, but nvcc complains about lambdas in private scope -public: - /// Templated implementation of generateBVHTree function - template - bool generateBVHTreeImpl(BVHTreeType* bvh) - { - using ExecSpace = typename BVHTreeType::ExecSpaceType; - - SLIC_ASSERT(bvh != nullptr); - - const int npts = m_objectPtCoords.size(); - axom::Array boxesArray(npts, npts, m_allocatorID); - auto boxesView = boxesArray.view(); - auto pointsView = m_objectPtCoords.view(); - - axom::for_all( - npts, - AXOM_LAMBDA(axom::IndexType i) { boxesView[i] = BoxType {pointsView[i]}; }); - - // Build bounding volume hierarchy - bvh->setAllocatorID(m_allocatorID); - int result = bvh->initialize(boxesView, npts); - - gatherBVHRoots(); - - return (result == spin::BVH_BUILD_OK); - } - - /** - * This method assumes xferNode is a blueprint single-domain mesh. - */ - template - void computeLocalClosestPoints(const BVHTreeType* bvh, - conduit::Node& xferNode) const - { - using ExecSpace = typename BVHTreeType::ExecSpaceType; - using axom::primal::squared_distance; - - // Note: There is some additional computation the first time this function - // is called for a query node, even if the local object mesh is empty - const bool hasObjectPoints = m_objectPtCoords.size() > 0; - const bool is_first = xferNode.has_path("is_first"); - if(!hasObjectPoints && !is_first) - { - return; - } - conduit::Node& xferDoms = xferNode["xferDoms"]; - for(conduit::Node& xferDom : xferDoms.children()) - { - // --- Set up arrays and views in the execution space - // Arrays are initialized in that execution space the first time they are processed - // and are copied in during subsequent processing - - // Check dimension and extract the number of points - SLIC_ASSERT(xferDom.fetch_existing("dim").as_int() == NDIMS); - const int qPtCount = xferDom.fetch_existing("qPtCount").value(); - - /// Extract fields from the input node as ArrayViews - auto queryPts = - ArrayView_from_Node(xferDom.fetch_existing("coords"), - qPtCount); - auto cpIndexes = - ArrayView_from_Node(xferDom.fetch_existing("cp_index"), - qPtCount); - auto cpDomainIndexes = ArrayView_from_Node( - xferDom.fetch_existing("cp_domain_index"), - qPtCount); - auto cpRanks = - ArrayView_from_Node(xferDom.fetch_existing("cp_rank"), - qPtCount); - auto cpCoords = - ArrayView_from_Node(xferDom.fetch_existing("cp_coords"), - qPtCount); - - /// Create ArrayViews in ExecSpace that are compatible with fields - // This deep-copies host memory in xferDom to device memory. - // TODO: Avoid copying arrays (here and at the end) if both are on the host - auto cp_idx = is_first - ? axom::Array(qPtCount, qPtCount, m_allocatorID) - : axom::Array(cpIndexes, m_allocatorID); - auto cp_domidx = is_first - ? axom::Array(qPtCount, qPtCount, m_allocatorID) - : axom::Array(cpDomainIndexes, m_allocatorID); - auto cp_rank = is_first - ? axom::Array(qPtCount, qPtCount, m_allocatorID) - : axom::Array(cpRanks, m_allocatorID); - - /// PROBLEM: The striding does not appear to be retained by conduit relay - /// We might need to transform it? or to use a single array w/ pointers into it? - auto cp_pos = is_first - ? axom::Array(qPtCount, qPtCount, m_allocatorID) - : axom::Array(cpCoords, m_allocatorID); - - // DEBUG - const bool has_cp_distance = xferDom.has_path("debug/cp_distance"); - auto minDist = has_cp_distance - ? ArrayView_from_Node( - xferDom.fetch_existing("debug/cp_distance"), - qPtCount) - : ArrayView(); - - auto cp_dist = has_cp_distance - ? (is_first ? axom::Array(qPtCount, qPtCount, m_allocatorID) - : axom::Array(minDist, m_allocatorID)) - : axom::Array(0, 0, m_allocatorID); - // END DEBUG - - if(is_first) - { - cp_rank.fill(-1); - cp_idx.fill(-1); - cp_domidx.fill(-1); - const PointType nowhere(std::numeric_limits::signaling_NaN()); - cp_pos.fill(nowhere); - cp_dist.fill(std::numeric_limits::signaling_NaN()); - } - auto query_inds = cp_idx.view(); - auto query_doms = cp_domidx.view(); - auto query_ranks = cp_rank.view(); - auto query_pos = cp_pos.view(); - auto query_min_dist = cp_dist.view(); - - /// Create an ArrayView in ExecSpace that is compatible with queryPts - PointArray execPoints(queryPts, m_allocatorID); - auto query_pts = execPoints.view(); - - if(hasObjectPoints) - { - // Get a device-useable iterator - auto it = bvh->getTraverser(); - const int rank = m_rank; - - double* sqDistThresh = axom::allocate( - 1, - axom::execution_space::allocatorID()); - *sqDistThresh = m_sqDistanceThreshold; - - auto ptCoordsView = m_objectPtCoords.view(); - auto ptDomainIdsView = m_objectPtDomainIds.view(); - - AXOM_PERF_MARK_SECTION( - "ComputeClosestPoints", - axom::for_all( - qPtCount, - AXOM_LAMBDA(std::int32_t idx) mutable { - PointType qpt = query_pts[idx]; - - MinCandidate curr_min {}; - // Preset cur_min to the closest point found so far. - if(query_ranks[idx] >= 0) - { - curr_min.sqDist = squared_distance(qpt, query_pos[idx]); - curr_min.pointIdx = query_inds[idx]; - curr_min.domainIdx = query_doms[idx]; - curr_min.rank = query_ranks[idx]; - } - - auto checkMinDist = [&](std::int32_t current_node, - const std::int32_t* leaf_nodes) { - const int candidate_point_idx = leaf_nodes[current_node]; - const int candidate_domain_idx = - ptDomainIdsView[candidate_point_idx]; - const PointType candidate_pt = ptCoordsView[candidate_point_idx]; - const double sq_dist = squared_distance(qpt, candidate_pt); - - if(sq_dist < curr_min.sqDist) - { - curr_min.sqDist = sq_dist; - curr_min.pointIdx = candidate_point_idx; - curr_min.domainIdx = candidate_domain_idx; - curr_min.rank = rank; - } - }; - - auto traversePredicate = [&](const PointType& p, - const BoxType& bb) -> bool { - auto sqDist = squared_distance(p, bb); - return sqDist <= curr_min.sqDist && sqDist <= sqDistThresh[0]; - }; - - // Traverse the tree, searching for the point with minimum distance. - it.traverse_tree(qpt, checkMinDist, traversePredicate); - - // If modified, update the fields that changed - if(curr_min.rank == rank) - { - query_inds[idx] = curr_min.pointIdx; - query_doms[idx] = curr_min.domainIdx; - query_ranks[idx] = curr_min.rank; - query_pos[idx] = ptCoordsView[curr_min.pointIdx]; - - //DEBUG - if(has_cp_distance) - { - query_min_dist[idx] = sqrt(curr_min.sqDist); - } - } - });); - - axom::deallocate(sqDistThresh); - } - - axom::copy(cpIndexes.data(), - query_inds.data(), - cpIndexes.size() * sizeof(axom::IndexType)); - axom::copy(cpDomainIndexes.data(), - query_doms.data(), - cpDomainIndexes.size() * sizeof(axom::IndexType)); - axom::copy(cpRanks.data(), - query_ranks.data(), - cpRanks.size() * sizeof(axom::IndexType)); - axom::copy(cpCoords.data(), - query_pos.data(), - cpCoords.size() * sizeof(PointType)); - - // DEBUG - if(has_cp_distance) - { - axom::copy(minDist.data(), - query_min_dist.data(), - minDist.size() * sizeof(double)); - } - } - - // Data has now been initialized - if(is_first) - { - xferNode.remove_child("is_first"); - } - } - -private: - RuntimePolicy m_runtimePolicy; - bool m_isVerbose {false}; - double m_sqDistanceThreshold; - int m_allocatorID; - MPI_Comm m_mpiComm; - bool m_mpiCommIsPrivate; - int m_rank; - int m_nranks; - - bool m_outputRank = true; - bool m_outputIndex = true; - bool m_outputDistance = true; - bool m_outputCoords = true; - bool m_outputDomainIndex = true; - - /*! - @brief Object point coordindates array. - - Points from all local object mesh domains are flattened here. - */ - PointArray m_objectPtCoords; - - axom::Array m_objectPtDomainIds; - - /*! @brief Object partition bounding boxes, one per rank. - All are in physical space, not index space. - */ - BoxArray m_objectPartitionBbs; - - std::unique_ptr m_bvh_seq; - -#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP - std::unique_ptr m_bvh_omp; -#endif - -#ifdef AXOM_RUNTIME_POLICY_USE_CUDA - std::unique_ptr m_bvh_cuda; -#endif - -#ifdef AXOM_RUNTIME_POLICY_USE_HIP - std::unique_ptr m_bvh_hip; -#endif -}; // DistributedClosestPointImpl - -} // namespace internal - /** * \brief Encapsulated the Distributed closest point query for a collection of query points * over an "object mesh" @@ -1407,17 +42,15 @@ class DistributedClosestPointImpl * query points to all ranks whose object meshes might contain a * closest point. * - * \note The class currently supports object meshes that are comprised of a collection of points. - * In the future, we'd like to consider more general object meshes, e.g. triangle meshes. - * - * To use this class, first set some parameters, such as the runtime execution policy, - * then pass in the object mesh and build a spatial index over this mesh. - * Finally, compute the closest points in the object mesh to each point in a query mesh - * using the \a computeClosestPoints() function. + * \note The class currently supports object meshes that are comprised + * of a collection of points. In the future, we'd like to consider + * more general object meshes, e.g. triangle meshes. * - * \note The implementation currently assumes that the coordinates for the positions and vector field - * data are interleaved (i.e. xyzxyzxyz....). We will relax this assumption in the future to support both - * interleaved and strided data. + * To use this class, first set some parameters, such as the runtime + * execution policy, then pass in the object mesh and build a spatial + * index over this mesh. Finally, compute the closest points in the + * object mesh to each point in a query mesh using the \a + * computeClosestPoints() function. * * \note To prevent mixing unrelated MPI communications, you can set a * custom MPI Communicator using setMpiCommunicator(). @@ -1590,7 +223,7 @@ class DistributedClosestPoint SLIC_ERROR_IF( f == nullptr, axom::fmt::format( - "Invald field '{}' should be one of these: " + "Invalid field '{}' should be one of these: " "cp_rank, cp_index, cp_distance, cp_coords, cp_domain_index", field)); *f = on; @@ -1695,12 +328,29 @@ class DistributedClosestPoint * \brief Computes the closest point on the object mesh for each point * on the provided query mesh * - * \param [in] query_node conduit node containing the query points - * \param [in] coordset The name of the coordinates within query_node + * \param [in] query_node The root node of a mesh blueprint for the query points + * Can be empty if there are no query points for the calling rank + * \param [in] topology The name of the topology within query_node + * + * @c queryMesh should have data on the host, regardless of the runtime + * policy setting. Data will be copied to device as needed. + * + * On completion, the query mesh contains the following fields: + * - cp_rank: Will hold the rank of the object point containing the closest point + * - cp_domain_index: will hold the index of the object domain containing + * the closest points. + * - cp_index: Will hold the index of the closest object points. + * For multiple object mesh domains on a rank, cp_index is relative to + * each domain. + * - cp_coords: Will hold the coordinates of the closest points + * interleaved in a 1D array. + * - cp_distance: Will hold the distances to the closest points. + * See setOutput() to toggle these outputs. * - * \pre query_node must follow the conduit mesh blueprint convention + * \note The current implementation assumes that the mesh coordinates + * interleaved or contiguous. The output cp_coords will be contiguous. */ - void computeClosestPoints(conduit::Node& query_node, const std::string& coordset) + void computeClosestPoints(conduit::Node& query_node, const std::string& topology) { SLIC_ASSERT_MSG(m_objectMeshCreated, "Must call 'setObjectMesh' before calling generateBVHTree"); @@ -1718,7 +368,7 @@ class DistributedClosestPoint m_outputDistance, m_outputCoords, m_outputDomainIndex); - m_dcp_2->computeClosestPoints(query_node, coordset); + m_dcp_2->computeClosestPoints(query_node, topology); break; case 3: m_dcp_3->setSquaredDistanceThreshold(m_sqDistanceThreshold); @@ -1728,7 +378,7 @@ class DistributedClosestPoint m_outputDistance, m_outputCoords, m_outputDomainIndex); - m_dcp_3->computeClosestPoints(query_node, coordset); + m_dcp_3->computeClosestPoints(query_node, topology); break; } } diff --git a/src/axom/quest/detail/DistributedClosestPointImpl.hpp b/src/axom/quest/detail/DistributedClosestPointImpl.hpp new file mode 100644 index 0000000000..3aa6bca1f7 --- /dev/null +++ b/src/axom/quest/detail/DistributedClosestPointImpl.hpp @@ -0,0 +1,1350 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +#ifndef QUEST_DISTRIBUTED_CLOSEST_POINT_IMPL_H_ +#define QUEST_DISTRIBUTED_CLOSEST_POINT_IMPL_H_ + +#include "axom/config.hpp" +#include "axom/core.hpp" +#include "axom/slic.hpp" +#include "axom/primal.hpp" +#include "axom/spin.hpp" +#include "axom/core/execution/runtime_policy.hpp" + +#include "axom/fmt.hpp" + +#include "conduit_blueprint.hpp" +#include "conduit_blueprint_mcarray.hpp" +#include "conduit_blueprint_mpi.hpp" +#include "conduit_relay_mpi.hpp" +#include "conduit_relay_io.hpp" + +#include +#include +#include +#include +#include + +#ifndef AXOM_USE_MPI + #error This file requires Axom to be configured with MPI +#endif +#include "mpi.h" + +namespace axom +{ +namespace quest +{ +namespace internal +{ +// Utility function to dump a conduit node on each rank, e.g. for debugging +inline void dump_node(const conduit::Node& n, + const std::string&& fname, + const std::string& protocol = "json") +{ + conduit::relay::io::save(n, fname, protocol); +} + +/** + * \brief Utility function to get a typed pointer to the beginning of an array + * stored by a conduit::Node + */ +template +T* getPointer(conduit::Node& node) +{ + T* ptr = node.value(); + return ptr; +} + +/** + * \brief Utility function to create an axom::ArrayView over the array + * of native types stored by a conduit::Node + */ +template +axom::ArrayView ArrayView_from_Node(conduit::Node& node, int sz) +{ + T* ptr = node.value(); + return axom::ArrayView(ptr, sz); +} + +/** + * \brief Template specialization of ArrayView_from_Node for Point + * + * \warning Assumes the underlying data is an MCArray with stride 2 access + */ +template <> +inline axom::ArrayView> ArrayView_from_Node( + conduit::Node& node, + int sz) +{ + using PointType = primal::Point; + + PointType* ptr = static_cast(node.data_ptr()); + return axom::ArrayView(ptr, sz); +} + +/** + * \brief Template specialization of ArrayView_from_Node for Point + * + * \warning Assumes the underlying data is an MCArray with stride 3 access + */ +template <> +inline axom::ArrayView> ArrayView_from_Node( + conduit::Node& node, + int sz) +{ + using PointType = primal::Point; + + PointType* ptr = static_cast(node.data_ptr()); + return axom::ArrayView(ptr, sz); +} + +/** + * \brief Put BoundingBox into a Conduit Node. + */ +template +void put_bounding_box_to_conduit_node(const primal::BoundingBox& bb, + conduit::Node& node) +{ + node["dim"].set(bb.dimension()); + if(bb.isValid()) + { + node["lo"].set(bb.getMin().data(), bb.dimension()); + node["hi"].set(bb.getMax().data(), bb.dimension()); + } +} + +/** + * \brief Get BoundingBox from a Conduit Node. + */ +template +void get_bounding_box_from_conduit_node(primal::BoundingBox& bb, + const conduit::Node& node) +{ + using PointType = primal::Point; + + SLIC_ASSERT(NDIMS == node.fetch_existing("dim").as_int()); + + bb.clear(); + + if(node.has_child("lo")) + { + bb.addPoint(PointType(node.fetch_existing("lo").as_double_ptr(), NDIMS)); + bb.addPoint(PointType(node.fetch_existing("hi").as_double_ptr(), NDIMS)); + } +} + +/// Helper function to extract the dimension from the coordinate values group +/// of a mesh blueprint coordset +inline int extractDimension(const conduit::Node& values_node) +{ + SLIC_ASSERT(values_node.has_child("x")); + return values_node.has_child("z") ? 3 : (values_node.has_child("y") ? 2 : 1); +} + +/// Helper function to extract the number of points from the coordinate values group +/// of a mesh blueprint coordset +inline int extractSize(const conduit::Node& values_node) +{ + SLIC_ASSERT(values_node.has_child("x")); + return values_node["x"].dtype().number_of_elements(); +} + +namespace relay +{ +namespace mpi +{ +/** + * \brief Sends a conduit node along with its schema using MPI_Isend + * + * \param [in] node node to send + * \param [in] dest ID of MPI rank to send to + * \param [in] tag tag for MPI message + * \param [in] comm MPI communicator to use + * \param [in] request object holding state for the sent data + * \note Adapted from conduit's relay::mpi's \a send_using_schema and \a isend + * to use non-blocking \a MPI_Isend instead of blocking \a MPI_Send + */ +inline int isend_using_schema(conduit::Node& node, + int dest, + int tag, + MPI_Comm comm, + conduit::relay::mpi::Request* request) +{ + conduit::Schema s_data_compact; + + // schema will only be valid if compact and contig + if(node.is_compact() && node.is_contiguous()) + { + s_data_compact = node.schema(); + } + else + { + node.schema().compact_to(s_data_compact); + } + const std::string snd_schema_json = s_data_compact.to_json(); + + conduit::Schema s_msg; + s_msg["schema_len"].set(conduit::DataType::int64()); + s_msg["schema"].set(conduit::DataType::char8_str(snd_schema_json.size() + 1)); + s_msg["data"].set(s_data_compact); + + // create a compact schema to use + conduit::Schema s_msg_compact; + s_msg.compact_to(s_msg_compact); + request->m_buffer.reset(); + request->m_buffer.set_schema(s_msg_compact); + + // set up the message's node using this schema + request->m_buffer["schema_len"].set((std::int64_t)snd_schema_json.length()); + request->m_buffer["schema"].set(snd_schema_json); + request->m_buffer["data"].update(node); + + // for wait_all, this must always be NULL except for + // the irecv cases where copy out is necessary + // isend case must always be NULL + request->m_rcv_ptr = nullptr; + + auto msg_data_size = request->m_buffer.total_bytes_compact(); + int mpi_error = MPI_Isend(const_cast(request->m_buffer.data_ptr()), + static_cast(msg_data_size), + MPI_BYTE, + dest, + tag, + comm, + &(request->m_request)); + + // Error checking -- Note: expansion of CONDUIT_CHECK_MPI_ERROR + if(static_cast(mpi_error) != MPI_SUCCESS) + { + char check_mpi_err_str_buff[MPI_MAX_ERROR_STRING]; + int check_mpi_err_str_len = 0; + MPI_Error_string(mpi_error, check_mpi_err_str_buff, &check_mpi_err_str_len); + + SLIC_ERROR( + fmt::format("MPI call failed: error code = {} error message = {}", + mpi_error, + check_mpi_err_str_buff)); + } + + return mpi_error; +} + +/// A modified version of the conduit method. +// This version works correctly when src is MPI_ANY_SOURCE +// and tag is MPI_ANY_TAG. When conduit supports this, +// this version can be removed. +inline int recv_using_schema(conduit::Node& node, int src, int tag, MPI_Comm comm) +{ + MPI_Status status; + + int mpi_error = MPI_Probe(src, tag, comm, &status); + + // CONDUIT_CHECK_MPI_ERROR(mpi_error); + // Expand the conduit macro: + if(static_cast(mpi_error) != MPI_SUCCESS) + { + char check_mpi_err_str_buff[MPI_MAX_ERROR_STRING]; + int check_mpi_err_str_len = 0; + MPI_Error_string(mpi_error, check_mpi_err_str_buff, &check_mpi_err_str_len); + + SLIC_ERROR( + fmt::format("MPI call failed: error code = {} error message = {}", + mpi_error, + check_mpi_err_str_buff)); + } + + int buffer_size = 0; + MPI_Get_count(&status, MPI_BYTE, &buffer_size); + + conduit::Node n_buffer(conduit::DataType::uint8(buffer_size)); + + mpi_error = MPI_Recv(n_buffer.data_ptr(), + buffer_size, + MPI_BYTE, + status.MPI_SOURCE, + status.MPI_TAG, + comm, + &status); + + std::uint8_t* n_buff_ptr = (std::uint8_t*)n_buffer.data_ptr(); + + conduit::Node n_msg; + // length of the schema is sent as a 64-bit signed int + // NOTE: we aren't using this value ... + n_msg["schema_len"].set_external((std::int64_t*)n_buff_ptr); + n_buff_ptr += 8; + // wrap the schema string + n_msg["schema"].set_external_char8_str((char*)(n_buff_ptr)); + // create the schema + conduit::Schema rcv_schema; + conduit::Generator gen(n_msg["schema"].as_char8_str()); + gen.walk(rcv_schema); + + // advance by the schema length + n_buff_ptr += n_msg["schema"].total_bytes_compact(); + + // apply the schema to the data + n_msg["data"].set_external(rcv_schema, n_buff_ptr); + + // copy out to our result node + node.update(n_msg["data"]); + + return mpi_error; +} + +} // namespace mpi +} // namespace relay + +/** + * \brief Implements the DistributedClosestPoint query for a specified dimension + * using a provided execution policy (e.g. sequential, openmp, cuda, hip) + * + * \tparam NDIMS The dimension of the object mesh and query points + */ +template +class DistributedClosestPointImpl +{ +public: + static constexpr int DIM = NDIMS; + using RuntimePolicy = axom::runtime_policy::Policy; + using PointType = primal::Point; + using BoxType = primal::BoundingBox; + using PointArray = axom::Array; + using BoxArray = axom::Array; + + using SeqBVHTree = spin::BVH; +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP + using OmpBVHTree = spin::BVH; +#endif +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + using CudaBVHTree = spin::BVH>; +#endif +#ifdef AXOM_RUNTIME_POLICY_USE_HIP + using HipBVHTree = spin::BVH>; +#endif + +private: + struct MinCandidate + { + /// Squared distance to query point + double sqDist {numerics::floating_point_limits::max()}; + /// Index of domain of closest element + int domainIdx {-1}; + /// Index within domain of closest element + int pointIdx {-1}; + /// MPI rank of closest element + int rank {-1}; + }; + +public: + /*! + @brief Constructor + + @param [i] runtimePolicy Indicates where local computations + are done. See axom::runtime_policy. + @param [i] allocatorID Allocator ID, which must be compatible with + @c runtimePolicy. See axom::allocate and axom::reallocate. + Also see setAllocatorID(). + @param [i[ isVerbose + */ + DistributedClosestPointImpl(RuntimePolicy runtimePolicy, + int allocatorID, + bool isVerbose) + : m_runtimePolicy(runtimePolicy) + , m_isVerbose(isVerbose) + , m_sqDistanceThreshold(std::numeric_limits::max()) + , m_allocatorID(allocatorID) + , m_mpiComm(MPI_COMM_NULL) + , m_rank(-1) + , m_nranks(-1) + , m_objectPtCoords(0, 0, allocatorID) + , m_objectPtDomainIds(0, 0, allocatorID) + { + SLIC_ASSERT(allocatorID != axom::INVALID_ALLOCATOR_ID); + + setMpiCommunicator(MPI_COMM_WORLD); + } + + /** + * \brief Set the MPI communicator. + */ + void setMpiCommunicator(MPI_Comm mpiComm) + { + m_mpiComm = mpiComm; + MPI_Comm_rank(m_mpiComm, &m_rank); + MPI_Comm_size(m_mpiComm, &m_nranks); + } + + /** + * \brief Sets the threshold for the query + * + * \param [in] threshold Ignore distances greater than this value. + */ + void setSquaredDistanceThreshold(double sqThreshold) + { + SLIC_ERROR_IF(sqThreshold < 0.0, + "Squared distance-threshold must be non-negative."); + m_sqDistanceThreshold = sqThreshold; + } + + /*! @brief Sets the allocator ID to the default associated with the + execution policy + */ + void setAllocatorID(int allocatorID) + { + SLIC_ASSERT(allocatorID != axom::INVALID_ALLOCATOR_ID); + // TODO: If appropriate, how to check for compatibility with runtime policy? + m_allocatorID = allocatorID; + } + + void setOutputSwitches(bool outputRank, + bool outputIndex, + bool outputDistance, + bool outputCoords, + bool outputDomainIndex) + { + m_outputRank = outputRank; + m_outputIndex = outputIndex; + m_outputDistance = outputDistance; + m_outputCoords = outputCoords; + m_outputDomainIndex = outputDomainIndex; + } + +public: + /** + * Import object mesh points from the object blueprint mesh into internal memory. + * + * \param [in] mdMeshNode The blueprint mesh containing the object points. + * \param [in] topologyName Name of the blueprint topology in \a mdMeshNode. + * \note This function currently supports mesh blueprints with the "point" topology + */ + void importObjectPoints(const conduit::Node& mdMeshNode, + const std::string& topologyName) + { + // TODO: See if some of the copies in this method can be optimized out. + + SLIC_ASSERT(sizeof(double) * DIM == sizeof(PointType)); + + // Count points in the mesh. + int ptCount = 0; + for(const conduit::Node& domain : mdMeshNode.children()) + { + const std::string coordsetName = + domain + .fetch_existing( + axom::fmt::format("topologies/{}/coordset", topologyName)) + .as_string(); + const std::string valuesPath = + axom::fmt::format("coordsets/{}/values", coordsetName); + auto& values = domain.fetch_existing(valuesPath); + const int N = internal::extractSize(values); + ptCount += N; + } + + // Copy points to internal memory + PointArray coords(ptCount, ptCount); + axom::Array domIds(ptCount, ptCount); + std::size_t copiedCount = 0; + conduit::Node tmpValues; + for(axom::IndexType d = 0; d < mdMeshNode.number_of_children(); ++d) + { + const conduit::Node& domain = mdMeshNode.child(d); + + axom::IndexType domainId = d; + if(domain.has_path("state/domain_id")) + { + domainId = domain.fetch_existing("state/domain_id").to_int32(); + } + + const std::string coordsetName = + domain + .fetch_existing( + axom::fmt::format("topologies/{}/coordset", topologyName)) + .as_string(); + const std::string valuesPath = + axom::fmt::format("coordsets/{}/values", coordsetName); + + auto& values = domain.fetch_existing(valuesPath); + + bool isInterleaved = conduit::blueprint::mcarray::is_interleaved(values); + if(!isInterleaved) + { + conduit::blueprint::mcarray::to_interleaved(values, tmpValues); + } + const conduit::Node& copySrc = isInterleaved ? values : tmpValues; + + const int N = internal::extractSize(copySrc); + const std::size_t nBytes = sizeof(double) * DIM * N; + + axom::copy(coords.data() + copiedCount, + copySrc.fetch_existing("x").data_ptr(), + nBytes); + tmpValues.reset(); + + domIds.fill(domainId, N, copiedCount); + + copiedCount += N; + } + // copy computed data to ExecSpace + m_objectPtCoords = PointArray(coords, m_allocatorID); + m_objectPtDomainIds = axom::Array(domIds, m_allocatorID); + } + + /// Predicate to check if the BVH tree has been initialized + bool isBVHTreeInitialized() const + { + switch(m_runtimePolicy) + { + case RuntimePolicy::seq: + return m_bvh_seq.get() != nullptr; + +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP + case RuntimePolicy::omp: + return m_bvh_omp.get() != nullptr; +#endif + +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + case RuntimePolicy::cuda: + return m_bvh_cuda.get() != nullptr; +#endif + +#ifdef AXOM_RUNTIME_POLICY_USE_HIP + case RuntimePolicy::hip: + return m_bvh_hip.get() != nullptr; +#endif + } + + return false; + } + + /// Generates the BVH tree for the classes execution space + bool generateBVHTree() + { + // Delegates to generateBVHTreeImpl<> which uses + // the execution space templated bvh tree + + SLIC_ASSERT_MSG(!isBVHTreeInitialized(), "BVH tree already initialized"); + + // In case user changed the allocator after setObjectMesh, + // move the object point data to avoid repetitive page faults. + if(m_objectPtCoords.getAllocatorID() != m_allocatorID) + { + PointArray tmpPoints(m_objectPtCoords, m_allocatorID); + m_objectPtCoords.swap(tmpPoints); + } + + switch(m_runtimePolicy) + { + case RuntimePolicy::seq: + m_bvh_seq = std::make_unique(); + return generateBVHTreeImpl(m_bvh_seq.get()); + +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP + case RuntimePolicy::omp: + m_bvh_omp = std::make_unique(); + return generateBVHTreeImpl(m_bvh_omp.get()); +#endif + +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + case RuntimePolicy::cuda: + m_bvh_cuda = std::make_unique(); + return generateBVHTreeImpl(m_bvh_cuda.get()); +#endif + +#ifdef AXOM_RUNTIME_POLICY_USE_HIP + case RuntimePolicy::hip: + m_bvh_hip = std::make_unique(); + return generateBVHTreeImpl(m_bvh_hip.get()); +#endif + } + + // Fail safe -- we should never reach this line! + SLIC_ERROR("Failed to initialize the BVH tree"); + + return false; + } + + /// Get local copy of all ranks BVH root bounding boxes. + void gatherBVHRoots() + { + SLIC_ASSERT_MSG( + isBVHTreeInitialized(), + "BVH tree must be initialized before calling 'gatherBVHRoots"); + + BoxType local_bb; + switch(m_runtimePolicy) + { + case RuntimePolicy::seq: + local_bb = m_bvh_seq->getBounds(); + break; + +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP + case RuntimePolicy::omp: + local_bb = m_bvh_omp->getBounds(); + break; +#endif + +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + case RuntimePolicy::cuda: + local_bb = m_bvh_cuda->getBounds(); + break; +#endif + +#ifdef AXOM_RUNTIME_POLICY_USE_HIP + case RuntimePolicy::hip: + local_bb = m_bvh_hip->getBounds(); + break; +#endif + } + + gatherBoundingBoxes(local_bb, m_objectPartitionBbs); + } + + /// Allgather one bounding box from each rank. + void gatherBoundingBoxes(const BoxType& aabb, BoxArray& all_aabbs) const + { + axom::Array sendbuf(2 * DIM); + aabb.getMin().to_array(&sendbuf[0]); + aabb.getMax().to_array(&sendbuf[DIM]); + axom::Array recvbuf(m_nranks * sendbuf.size()); + // Note: Using axom::Array may reduce clutter a tad. + int errf = MPI_Allgather(sendbuf.data(), + 2 * DIM, + mpi_traits::type, + recvbuf.data(), + 2 * DIM, + mpi_traits::type, + m_mpiComm); + SLIC_ASSERT(errf == MPI_SUCCESS); + AXOM_UNUSED_VAR(errf); + + all_aabbs.clear(); + all_aabbs.reserve(m_nranks); + for(int i = 0; i < m_nranks; ++i) + { + PointType lower(&recvbuf[i * 2 * DIM]); + PointType upper(&recvbuf[i * 2 * DIM + DIM]); + all_aabbs.emplace_back(BoxType(lower, upper, false)); + } + } + + /// Compute bounding box for local part of a mesh. + BoxType computeMeshBoundingBox(conduit::Node& xferNode) const + { + BoxType rval; + + conduit::Node& xferDoms = xferNode.fetch_existing("xferDoms"); + for(conduit::Node& xferDom : xferDoms.children()) + { + const int qPtCount = xferDom.fetch_existing("qPtCount").value(); + + /// Extract fields from the input node as ArrayViews + auto queryPts = + ArrayView_from_Node(xferDom.fetch_existing("coords"), + qPtCount); + for(const auto& p : queryPts) + { + rval.addPoint(p); + } + } + + return rval; + } + + /*! + * Copy parts of query mesh partition to a conduit::Node for + * computation and communication. + * queryNode must be a blueprint multidomain mesh. + */ + void node_copy_query_to_xfer(conduit::Node& queryNode, + conduit::Node& xferNode, + const std::string& topologyName) const + { + xferNode["homeRank"] = m_rank; + xferNode["is_first"] = 1; + + const bool isMultidomain = + conduit::blueprint::mesh::is_multi_domain(queryNode); + const auto domainCount = + conduit::blueprint::mesh::number_of_domains(queryNode); + conduit::Node& xferDoms = xferNode["xferDoms"]; + for(conduit::index_t domainNum = 0; domainNum < domainCount; ++domainNum) + { + auto& queryDom = isMultidomain ? queryNode.child(domainNum) : queryNode; + + const std::string coordsetName = + queryDom + .fetch_existing( + axom::fmt::format("topologies/{}/coordset", topologyName)) + .as_string(); + const std::string& domName = queryDom.name(); + conduit::Node& xferDom = xferDoms[domName]; + conduit::Node& queryCoords = + queryDom.fetch_existing(fmt::format("coordsets/{}", coordsetName)); + conduit::Node& queryCoordsValues = queryCoords.fetch_existing("values"); + + const int dim = internal::extractDimension(queryCoordsValues); + const int qPtCount = internal::extractSize(queryCoordsValues); + xferDom["qPtCount"] = qPtCount; + xferDom["dim"] = dim; + + copy_components_to_interleaved(queryCoordsValues, xferDom["coords"]); + + constexpr bool isInt32 = std::is_same::value; + auto dtype = + isInt32 ? conduit::DataType::int32() : conduit::DataType::int64(); + dtype.set_number_of_elements(qPtCount); + xferDom["cp_index"].set_dtype(dtype); + xferDom["cp_rank"].set_dtype(dtype); + xferDom["cp_domain_index"].set_dtype(dtype); + xferDom["debug/cp_distance"].set_dtype(conduit::DataType::float64(qPtCount)); + xferDom["cp_coords"].set_dtype(conduit::DataType::float64(dim * qPtCount)); + } + } + + /// Copy xferNode back to query mesh partition. + void node_copy_xfer_to_query(conduit::Node& xferNode, + conduit::Node& queryNode, + const std::string& topologyName) const + { + const bool isMultidomain = + conduit::blueprint::mesh::is_multi_domain(queryNode); + const auto domainCount = + conduit::blueprint::mesh::number_of_domains(queryNode); + conduit::Node& xferDoms = xferNode.fetch_existing("xferDoms"); + SLIC_ASSERT(xferDoms.number_of_children() == domainCount); + for(conduit::index_t domainNum = 0; domainNum < domainCount; ++domainNum) + { + auto& queryDom = isMultidomain ? queryNode.child(domainNum) : queryNode; + conduit::Node& xferDom = xferDoms.child(domainNum); + conduit::Node& fields = queryDom.fetch_existing("fields"); + + conduit::Node genericHeaders; + genericHeaders["association"] = "vertex"; + genericHeaders["topology"] = topologyName; + + if(m_outputRank) + { + auto& src = xferDom.fetch_existing("cp_rank"); + auto& dst = fields["cp_rank"]; + dst.set_node(genericHeaders); + dst["values"].move(src); + } + + if(m_outputIndex) + { + auto& src = xferDom.fetch_existing("cp_index"); + auto& dst = fields["cp_index"]; + dst.set_node(genericHeaders); + dst["values"].move(src); + } + + if(m_outputDomainIndex) + { + auto& src = xferDom.fetch_existing("cp_domain_index"); + auto& dst = fields["cp_domain_index"]; + dst.set_node(genericHeaders); + dst["values"].move(src); + } + + if(m_outputDistance) + { + auto& src = xferDom.fetch_existing("debug/cp_distance"); + auto& dst = fields["cp_distance"]; + dst.set_node(genericHeaders); + dst["values"].move(src); + } + + if(m_outputCoords) + { + auto& dst = fields["cp_coords"]; + dst.set_node(genericHeaders); + auto& dstValues = dst["values"]; + copy_interleaved_to_components(xferDom.fetch_existing("cp_coords"), + dstValues); + } + } + } + + /* + Special copy from coordinates (in a format that's not + necessarily interleaved) to a 1D array of interleaved values). + If coordinates are already interleaved, copy pointer. + */ + void copy_components_to_interleaved(conduit::Node& components, + conduit::Node& interleaved) const + { + const int dim = internal::extractDimension(components); + const int qPtCount = internal::extractSize(components); + bool interleavedSrc = conduit::blueprint::mcarray::is_interleaved(components); + if(interleavedSrc) + { + interleaved.set_external(internal::getPointer(components.child(0)), + dim * qPtCount); + } + else + { + // Copy from component-wise src to 1D-interleaved dst. + interleaved.reset(); + interleaved.set_dtype(conduit::DataType::float64(dim * qPtCount)); + for(int d = 0; d < dim; ++d) + { + auto src = components.child(d).as_float64_array(); + double* dst = interleaved.as_float64_ptr() + d; + for(int i = 0; i < qPtCount; ++i) + { + dst[i * dim] = src[i]; + } + } + } + } + + /* + Special copy from 1D interleaved coordinate values back to + component-wise storage. + This is a nop if they point to the same data. + */ + void copy_interleaved_to_components(const conduit::Node& interleaved, + conduit::Node& components) const + { + const int qPtCount = interleaved.dtype().number_of_elements() / DIM; + components.reset(); + // Copy from 1D-interleaved src to component-wise dst. + for(int d = 0; d < DIM; ++d) + { + const double* src = interleaved.as_float64_ptr() + d; + auto& dstNode = components.append(); + dstNode.set_dtype(conduit::DataType(interleaved.dtype().id(), qPtCount)); + double* dst = dstNode.as_float64_ptr(); + for(int i = 0; i < qPtCount; ++i) + { + dst[i] = src[i * DIM]; + } + } + } + + /** + * \brief Implementation of the user-facing + * DistributedClosestPoint::computeClosestPoints() method. + * + * We use non-blocking sends for performance and deadlock avoidance. + * The worst case could incur nranks^2 sends. To avoid excessive + * buffer usage, we occasionally check the sends for completion, + * using check_send_requests(). + */ + void computeClosestPoints(conduit::Node& queryMesh, + const std::string& topologyName) const + { + SLIC_ASSERT_MSG( + isBVHTreeInitialized(), + "BVH tree must be initialized before calling 'computeClosestPoints"); + + std::map> xferNodes; + + // create conduit Node containing data that has to xfer between ranks. + // The node will be mostly empty if there are no domains on this rank + { + xferNodes[m_rank] = std::make_shared(); + conduit::Node& xferNode = *xferNodes[m_rank]; + node_copy_query_to_xfer(queryMesh, xferNode, topologyName); + xferNode["homeRank"] = m_rank; + } + + BoxType myQueryBb = computeMeshBoundingBox(*xferNodes[m_rank]); + put_bounding_box_to_conduit_node(myQueryBb, xferNodes[m_rank]->fetch("aabb")); + BoxArray allQueryBbs; + gatherBoundingBoxes(myQueryBb, allQueryBbs); + + { + conduit::Node& xferNode = *xferNodes[m_rank]; + computeLocalClosestPointsByPolicy(xferNode); + } + + const auto& myObjectBb = m_objectPartitionBbs[m_rank]; + int remainingRecvs = 0; + for(int r = 0; r < m_nranks; ++r) + { + if(r != m_rank) + { + const auto& otherQueryBb = allQueryBbs[r]; + double sqDistance = + axom::primal::squared_distance(otherQueryBb, myObjectBb); + if(sqDistance <= m_sqDistanceThreshold) + { + ++remainingRecvs; + } + } + } + + // arbitrary tags for send/recv xferNode. + const int tag = 987342; + + std::list isendRequests; + + { + /* + Send local query mesh to next rank with close-enough object + partition, if any. Increase remainingRecvs, because this data + will come back. + */ + int firstRecipForMyQuery = next_recipient(*xferNodes[m_rank]); + if(m_nranks == 1) + { + SLIC_ASSERT(firstRecipForMyQuery == -1); + } + + if(firstRecipForMyQuery == -1) + { + // No need to send anywhere. Put computed data back into queryMesh. + node_copy_xfer_to_query(*xferNodes[m_rank], queryMesh, topologyName); + xferNodes.erase(m_rank); + } + else + { + isendRequests.emplace_back(conduit::relay::mpi::Request()); + auto& req = isendRequests.back(); + relay::mpi::isend_using_schema(*xferNodes[m_rank], + firstRecipForMyQuery, + tag, + m_mpiComm, + &req); + ++remainingRecvs; + } + } + + while(remainingRecvs > 0) + { + SLIC_INFO_IF( + m_isVerbose, + fmt::format("======= {} receives remaining =======", remainingRecvs)); + + // Receive the next xferNode + std::shared_ptr recvXferNodePtr = + std::make_shared(); + relay::mpi::recv_using_schema(*recvXferNodePtr, + MPI_ANY_SOURCE, + tag, + m_mpiComm); + + const int homeRank = recvXferNodePtr->fetch_existing("homeRank").as_int(); + --remainingRecvs; + xferNodes[homeRank] = recvXferNodePtr; + conduit::Node& xferNode = *xferNodes[homeRank]; + + if(homeRank == m_rank) + { + node_copy_xfer_to_query(xferNode, queryMesh, topologyName); + } + else + { + computeLocalClosestPointsByPolicy(xferNode); + + isendRequests.emplace_back(conduit::relay::mpi::Request()); + auto& isendRequest = isendRequests.back(); + int nextRecipient = next_recipient(xferNode); + SLIC_ASSERT(nextRecipient != -1); + relay::mpi::isend_using_schema(xferNode, + nextRecipient, + tag, + m_mpiComm, + &isendRequest); + + // Check non-blocking sends to free memory. + check_send_requests(isendRequests, false); + } + + } // remainingRecvs loop + + // Complete remaining non-blocking sends. + while(!isendRequests.empty()) + { + check_send_requests(isendRequests, true); + } + + MPI_Barrier(m_mpiComm); + slic::flushStreams(); + } + +private: + /// Distance search using local object partition and xferNode. + void computeLocalClosestPointsByPolicy(conduit::Node& xferNode) const + { + switch(m_runtimePolicy) + { + case RuntimePolicy::seq: + computeLocalClosestPoints(m_bvh_seq.get(), xferNode); + break; + +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP + case RuntimePolicy::omp: + computeLocalClosestPoints(m_bvh_omp.get(), xferNode); +#endif + break; + +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + case RuntimePolicy::cuda: + computeLocalClosestPoints(m_bvh_cuda.get(), xferNode); +#endif + break; + +#ifdef AXOM_RUNTIME_POLICY_USE_HIP + case RuntimePolicy::hip: + computeLocalClosestPoints(m_bvh_hip.get(), xferNode); +#endif + break; + } + } + + /** + Determine the next rank (in ring order) with an object partition + close to the query points in xferNode. The intent is to send + xferNode there next. + */ + int next_recipient(const conduit::Node& xferNode) const + { + int homeRank = xferNode.fetch_existing("homeRank").value(); + BoxType bb; + get_bounding_box_from_conduit_node(bb, xferNode.fetch_existing("aabb")); + for(int i = 1; i < m_nranks; ++i) + { + int maybeNextRecip = (m_rank + i) % m_nranks; + if(maybeNextRecip == homeRank) + { + return maybeNextRecip; + } + double sqDistance = + primal::squared_distance(bb, m_objectPartitionBbs[maybeNextRecip]); + if(sqDistance <= m_sqDistanceThreshold) + { + return maybeNextRecip; + } + } + return -1; + } + + /// Wait for some non-blocking sends (if any) to finish. + void check_send_requests(std::list& isendRequests, + bool atLeastOne) const + { + std::vector reqs; + for(auto& isr : isendRequests) + { + reqs.push_back(isr.m_request); + } + + int inCount = static_cast(reqs.size()); + int outCount = 0; + std::vector indices(reqs.size(), -1); + if(atLeastOne) + { + MPI_Waitsome(inCount, + reqs.data(), + &outCount, + indices.data(), + MPI_STATUSES_IGNORE); + } + else + { + MPI_Testsome(inCount, + reqs.data(), + &outCount, + indices.data(), + MPI_STATUSES_IGNORE); + } + indices.resize(outCount); + + auto reqIter = isendRequests.begin(); + int prevIdx = 0; + for(const int idx : indices) + { + for(; prevIdx < idx; ++prevIdx) + { + ++reqIter; + } + reqIter = isendRequests.erase(reqIter); + ++prevIdx; + } + } + + // Note: following should be private, but nvcc complains about lambdas in private scope +public: + /// Templated implementation of generateBVHTree function + template + bool generateBVHTreeImpl(BVHTreeType* bvh) + { + using ExecSpace = typename BVHTreeType::ExecSpaceType; + + SLIC_ASSERT(bvh != nullptr); + + const int npts = m_objectPtCoords.size(); + axom::Array boxesArray(npts, npts, m_allocatorID); + auto boxesView = boxesArray.view(); + auto pointsView = m_objectPtCoords.view(); + + axom::for_all( + npts, + AXOM_LAMBDA(axom::IndexType i) { boxesView[i] = BoxType {pointsView[i]}; }); + + // Build bounding volume hierarchy + bvh->setAllocatorID(m_allocatorID); + int result = bvh->initialize(boxesView, npts); + + gatherBVHRoots(); + + return (result == spin::BVH_BUILD_OK); + } + + template + void computeLocalClosestPoints(const BVHTreeType* bvh, + conduit::Node& xferNode) const + { + using ExecSpace = typename BVHTreeType::ExecSpaceType; + using axom::primal::squared_distance; + + // Note: There is some additional computation the first time this function + // is called for a query node, even if the local object mesh is empty + const bool hasObjectPoints = m_objectPtCoords.size() > 0; + const bool is_first = xferNode.has_path("is_first"); + if(!hasObjectPoints && !is_first) + { + return; + } + conduit::Node& xferDoms = xferNode["xferDoms"]; + for(conduit::Node& xferDom : xferDoms.children()) + { + // --- Set up arrays and views in the execution space + // Arrays are initialized in that execution space the first time + // they are processed and are copied in during subsequent + // processing + + // Check dimension and extract the number of points + SLIC_ASSERT(xferDom.fetch_existing("dim").as_int() == DIM); + const int qPtCount = xferDom.fetch_existing("qPtCount").value(); + + /// Extract fields from the input node as ArrayViews + auto queryPts = + ArrayView_from_Node(xferDom.fetch_existing("coords"), + qPtCount); + auto cpIndexes = + ArrayView_from_Node(xferDom.fetch_existing("cp_index"), + qPtCount); + auto cpDomainIndexes = ArrayView_from_Node( + xferDom.fetch_existing("cp_domain_index"), + qPtCount); + auto cpRanks = + ArrayView_from_Node(xferDom.fetch_existing("cp_rank"), + qPtCount); + auto cpCoords = + ArrayView_from_Node(xferDom.fetch_existing("cp_coords"), + qPtCount); + + /// Create ArrayViews in ExecSpace that are compatible with fields + // This deep-copies host memory in xferDom to device memory. + // TODO: Avoid copying arrays (here and at the end) if both are on the host + auto cp_idx = is_first + ? axom::Array(qPtCount, qPtCount, m_allocatorID) + : axom::Array(cpIndexes, m_allocatorID); + auto cp_domidx = is_first + ? axom::Array(qPtCount, qPtCount, m_allocatorID) + : axom::Array(cpDomainIndexes, m_allocatorID); + auto cp_rank = is_first + ? axom::Array(qPtCount, qPtCount, m_allocatorID) + : axom::Array(cpRanks, m_allocatorID); + + /// PROBLEM: The striding does not appear to be retained by conduit relay + /// We might need to transform it? or to use a single array w/ pointers into it? + auto cp_pos = is_first + ? axom::Array(qPtCount, qPtCount, m_allocatorID) + : axom::Array(cpCoords, m_allocatorID); + + // DEBUG + const bool has_cp_distance = xferDom.has_path("debug/cp_distance"); + auto minDist = has_cp_distance + ? ArrayView_from_Node( + xferDom.fetch_existing("debug/cp_distance"), + qPtCount) + : ArrayView(); + + auto cp_dist = has_cp_distance + ? (is_first ? axom::Array(qPtCount, qPtCount, m_allocatorID) + : axom::Array(minDist, m_allocatorID)) + : axom::Array(0, 0, m_allocatorID); + // END DEBUG + + if(is_first) + { + cp_rank.fill(-1); + cp_idx.fill(-1); + cp_domidx.fill(-1); + const PointType nowhere(std::numeric_limits::signaling_NaN()); + cp_pos.fill(nowhere); + cp_dist.fill(std::numeric_limits::signaling_NaN()); + } + auto query_inds = cp_idx.view(); + auto query_doms = cp_domidx.view(); + auto query_ranks = cp_rank.view(); + auto query_pos = cp_pos.view(); + auto query_min_dist = cp_dist.view(); + + /// Create an ArrayView in ExecSpace that is compatible with queryPts + PointArray execPoints(queryPts, m_allocatorID); + auto query_pts = execPoints.view(); + + if(hasObjectPoints) + { + // Get a device-useable iterator + auto it = bvh->getTraverser(); + const int rank = m_rank; + + double* sqDistThresh = axom::allocate( + 1, + axom::execution_space::allocatorID()); + *sqDistThresh = m_sqDistanceThreshold; + + auto ptCoordsView = m_objectPtCoords.view(); + auto ptDomainIdsView = m_objectPtDomainIds.view(); + + AXOM_PERF_MARK_SECTION( + "ComputeClosestPoints", + axom::for_all( + qPtCount, + AXOM_LAMBDA(std::int32_t idx) mutable { + PointType qpt = query_pts[idx]; + + MinCandidate curr_min {}; + // Preset cur_min to the closest point found so far. + if(query_ranks[idx] >= 0) + { + curr_min.sqDist = squared_distance(qpt, query_pos[idx]); + curr_min.pointIdx = query_inds[idx]; + curr_min.domainIdx = query_doms[idx]; + curr_min.rank = query_ranks[idx]; + } + + auto checkMinDist = [&](std::int32_t current_node, + const std::int32_t* leaf_nodes) { + const int candidate_point_idx = leaf_nodes[current_node]; + const int candidate_domain_idx = + ptDomainIdsView[candidate_point_idx]; + const PointType candidate_pt = ptCoordsView[candidate_point_idx]; + const double sq_dist = squared_distance(qpt, candidate_pt); + + if(sq_dist < curr_min.sqDist) + { + curr_min.sqDist = sq_dist; + curr_min.pointIdx = candidate_point_idx; + curr_min.domainIdx = candidate_domain_idx; + curr_min.rank = rank; + } + }; + + auto traversePredicate = [&](const PointType& p, + const BoxType& bb) -> bool { + auto sqDist = squared_distance(p, bb); + return sqDist <= curr_min.sqDist && sqDist <= sqDistThresh[0]; + }; + + // Traverse the tree, searching for the point with minimum distance. + it.traverse_tree(qpt, checkMinDist, traversePredicate); + + // If modified, update the fields that changed + if(curr_min.rank == rank) + { + query_inds[idx] = curr_min.pointIdx; + query_doms[idx] = curr_min.domainIdx; + query_ranks[idx] = curr_min.rank; + query_pos[idx] = ptCoordsView[curr_min.pointIdx]; + + //DEBUG + if(has_cp_distance) + { + query_min_dist[idx] = sqrt(curr_min.sqDist); + } + } + });); + + axom::deallocate(sqDistThresh); + } + + axom::copy(cpIndexes.data(), + query_inds.data(), + cpIndexes.size() * sizeof(axom::IndexType)); + axom::copy(cpDomainIndexes.data(), + query_doms.data(), + cpDomainIndexes.size() * sizeof(axom::IndexType)); + axom::copy(cpRanks.data(), + query_ranks.data(), + cpRanks.size() * sizeof(axom::IndexType)); + axom::copy(cpCoords.data(), + query_pos.data(), + cpCoords.size() * sizeof(PointType)); + + // DEBUG + if(has_cp_distance) + { + axom::copy(minDist.data(), + query_min_dist.data(), + minDist.size() * sizeof(double)); + } + } + + // Data has now been initialized + if(is_first) + { + xferNode.remove_child("is_first"); + } + } + +private: + RuntimePolicy m_runtimePolicy; + bool m_isVerbose {false}; + double m_sqDistanceThreshold; + int m_allocatorID; + MPI_Comm m_mpiComm; + bool m_mpiCommIsPrivate; + int m_rank; + int m_nranks; + + bool m_outputRank = true; + bool m_outputIndex = true; + bool m_outputDistance = true; + bool m_outputCoords = true; + bool m_outputDomainIndex = true; + + /*! + @brief Object point coordindates array. + + Points from all local object mesh domains are flattened here. + */ + PointArray m_objectPtCoords; + + axom::Array m_objectPtDomainIds; + + /*! @brief Object partition bounding boxes, one per rank. + All are in physical space, not index space. + */ + BoxArray m_objectPartitionBbs; + + std::unique_ptr m_bvh_seq; + +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP + std::unique_ptr m_bvh_omp; +#endif + +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + std::unique_ptr m_bvh_cuda; +#endif + +#ifdef AXOM_RUNTIME_POLICY_USE_HIP + std::unique_ptr m_bvh_hip; +#endif +}; // DistributedClosestPointImpl + +} // namespace internal + +} // end namespace quest +} // end namespace axom + +#endif // QUEST_DISTRIBUTED_CLOSEST_POINT_IMPL_H_ From 39381a84ddd9de2f4538b4d248917810ebb30ace Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 8 Dec 2023 13:35:49 -0800 Subject: [PATCH 249/639] Disable sorting, since it didn't help much. Will eventually return to GPU performance issue. --- .../detail/MarchingCubesFullParallel.hpp | 42 +++++++++++-------- .../examples/quest_marching_cubes_example.cpp | 8 ++-- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index 37234573b7..1b2d75035e 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -338,23 +338,31 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase const auto firstFacetIdsView = m_firstFacetIds.view(); const auto caseIdsView = m_caseIds.view(); + /* + To minimize diverence, sort parent indices by number of facets + they add. This is a disabled experimental option. Enable by + setting sortFacetsIncrs. Requires RAJA. + */ + const bool sortFacetsIncrs = false; #if defined(AXOM_USE_RAJA) - // To minimize diverence and improve GPU performance, - // sort parent indices by number of facets they add. - // // sortedIndices are parent cell indices, sorted by number // of facets in them. - auto sortedFacetIncrs(m_facetIncrs); - axom::Array sortedIndices(parentCellCount); + axom::Array sortedIndices( + sortFacetsIncrs ? parentCellCount : 0); auto sortedIndicesView = sortedIndices.view(); - axom::for_all( - 0, - parentCellCount, - AXOM_LAMBDA(axom::IndexType pcId) { sortedIndicesView[pcId] = pcId; }); - RAJA::stable_sort_pairs( - RAJA::make_span(sortedFacetIncrs.data(), parentCellCount), - RAJA::make_span(sortedIndices.data(), parentCellCount), - RAJA::operators::greater {}); + + if(sortFacetsIncrs) + { + auto sortedFacetIncrs = m_facetIncrs; + axom::for_all( + 0, + parentCellCount, + AXOM_LAMBDA(axom::IndexType pcId) { sortedIndicesView[pcId] = pcId; }); + RAJA::stable_sort_pairs( + RAJA::make_span(sortedFacetIncrs.data(), parentCellCount), + RAJA::make_span(sortedIndices.data(), parentCellCount), + RAJA::operators::greater {}); + } #endif auto contourCellParentsView = m_contourCellParents.view(); @@ -367,11 +375,9 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_coordsViews); auto gen_for_parent_cell = AXOM_LAMBDA(axom::IndexType loopIndex) { - #if defined(AXOM_USE_RAJA) - axom::IndexType parentCellId = sortedIndicesView[loopIndex]; - #else - axom::IndexType parentCellId = loopIndex; - #endif + axom::IndexType parentCellId = + sortFacetsIncrs ? sortedIndicesView[loopIndex] : loopIndex; + Point cornerCoords[CELL_CORNER_COUNT]; double cornerValues[CELL_CORNER_COUNT]; ccu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 96f06a5fff..d7a95158b6 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -815,9 +815,11 @@ struct ContourTestBase sum, (double)sum / numRanks)); } - SLIC_INFO(axom::fmt::format("Surface mesh has locally {} cells, {} nodes.", - mc.getContourCellCount(), - mc.getContourNodeCount())); + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Surface mesh has locally {} cells, {} nodes.", + mc.getContourCellCount(), + mc.getContourNodeCount())); // Return conduit data to host memory. if(s_allocatorId != axom::execution_space::allocatorID()) From e01d8a4864dc680be7b69faf26f0eef7719449ec Mon Sep 17 00:00:00 2001 From: Max Yang Date: Sun, 6 Aug 2023 02:02:44 -0700 Subject: [PATCH 250/639] Initial commit of Boost-based FlatTable --- src/axom/core/CMakeLists.txt | 3 + src/axom/core/detail/FlatTable.hpp | 241 +++++++++++++++++++++++++++++ 2 files changed, 244 insertions(+) create mode 100644 src/axom/core/detail/FlatTable.hpp diff --git a/src/axom/core/CMakeLists.txt b/src/axom/core/CMakeLists.txt index e3e433580b..bbcad72bf1 100644 --- a/src/axom/core/CMakeLists.txt +++ b/src/axom/core/CMakeLists.txt @@ -48,6 +48,9 @@ set(core_headers numerics/matvecops.hpp numerics/polynomial_solvers.hpp + ## detail + detail/FlatTable.hpp + ## core Array.hpp ArrayBase.hpp diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp new file mode 100644 index 0000000000..8860fe1233 --- /dev/null +++ b/src/axom/core/detail/FlatTable.hpp @@ -0,0 +1,241 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level COPYRIGHT file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +#ifndef Axom_Core_Detail_FlatTable_Hpp +#define Axom_Core_Detail_FlatTable_Hpp + +#include "axom/core/Array.hpp" +#include "axom/core/ArrayView.hpp" +#include "axom/core/utilities/BitUtilities.hpp" + +namespace axom +{ +namespace detail +{ +namespace flat_map +{ +struct QuadraticProbing +{ + /*! + * \brief Returns the next offset to jump given an iteration count. + * + * Suppose we start with some probe point H + i^2, then the next probe + * point is H + (i*1)^2 = H + i^2 + 2*i + 1. + * + * We return the offset from H(i) to H(i+1), which is 2*i+1. + */ + int getNext(int iter) const { return 2 * iter + 1; } +}; + +// Boost::unordered_flat_map uses a 128-bit chunk of metadata for each +// group of 15 buckets. +// This is split up into an "overflow bit", and 15 bytes representing the +// state of each bucket. +// +// Each bucket byte has the value: +// - 0 if the bucket is "deleted" +// - 1 to signal the end of the bucket array. +// - if the bucket has an element, a reduced hash in the range [2, 255]. +// +// The overflow bit acts as a Bloom filter to determine if probing should +// terminate. +struct GroupBucket +{ + constexpr static std::uint8_t Empty = 0; + constexpr static std::uint8_t Sentinel = 1; + constexpr static int InvalidSlot = -1; + + GroupBucket() : data {0ULL, 0ULL} { } + + int getEmptyBucket() const + { + for(int i = 0; i < 15; i++) + { + if(metadata.buckets[i] == GroupBucket::Empty) + { + return i; + } + } + // Bucket not found. + return InvalidSlot; + } + + int getHashBucket(std::uint8_t hash) const + { + std::uint8_t reducedHash = reduceHash(hash); + for(int i = 0; i < 15; i++) + { + if(metadata.buckets[i] == reducedHash) + { + return i; + } + } + return InvalidSlot; + } + + void setBucket(int index, std::uint8_t hash) + { + metadata.buckets[index] = reduceHash(hash); + } + + void setOverflow(std::uint8_t hash) + { + std::uint8_t hashOfwBit = 1 << (hash % 8); + metadata.ofw |= hashOfwBit; + } + + bool getMaybeOverflowed(std::uint8_t hash) const + { + std::uint8_t hashOfwBit = 1 << (hash % 8); + return (metadata.ofw & hashOfwBit); + } + + bool hasSentinel() const { return metadata.buckets[14] == Sentinel; } + + void setSentinel() { metadata.buckets[14] = Sentinel; } + + // We need to map hashes in the range [0, 255] to [2, 255], since 0 and 1 + // are taken by the "empty" and "sentinel" values respectively. + static std::uint8_t reduceHash(std::uint8_t hash) + { + return (hash < 2) ? (hash + 8) : hash; + } + + union alignas(16) + { + struct + { + std::uint8_t ofw; + std::uint8_t buckets[15]; + } metadata; + std::uint64_t data[2]; + static_assert( + sizeof(metadata) == sizeof(data), + "FlatMap::SwissTable::Bucket: sizeof(data_bytes) != sizeof(data)"); + }; +}; + +static_assert(sizeof(GroupBucket) == 16, + "FlatMap::SwissTable::Bucket: size != 16 bytes"); +static_assert(std::alignment_of::value == 16, + "FlatMap::SwissTable::Bucket: alignment != 16 bytes"); +static_assert(std::is_standard_layout::value, + "FlatMap::SwissTable::Bucket: not standard layout"); + +struct FlatMapIndex +{ + int group_index; + int bucket_index; +}; + +template +struct SequentialLookupPolicy +{ + constexpr static int NO_MATCH = -1; + + /*! + * \brief Inserts a hash into the first empty bucket in an array of groups + * for an open-addressing hash map. + * + * \param [in] ngroups_pow_2 the number of groups, expressed as a power of 2 + * \param [in] groups the array of metadata for the groups in the hash map + * \param [in] hash the hash to insert + * + * \return a FlatMapIndex with group and bucket ID, or NO_MATCH if no empty + * buckets were found. + */ + FlatMapIndex insert(int ngroups_pow_2, + ArrayView groups, + HashType hash) const + { + // We use the k MSBs of the hash as the initial group probe point, + // where ngroups = 2^k. + int group_divisor = 1 << ((CHAR_BIT * sizeof(HashType)) - ngroups_pow_2); + int curr_group = hash / group_divisor; + + std::uint8_t hash_8 {hash}; + int iteration = 0; + while(curr_group != NO_MATCH) + { + int empty_bucket = groups[curr_group].getEmptyBucket(); + if(empty_bucket != GroupBucket::InvalidSlot) + { + groups[curr_group].setBucket(empty_bucket, hash_8); + return FlatMapIndex {curr_group, empty_bucket}; + } + else if(!groups[curr_group].hasSentinel()) + { + // Set the overflow bit and continue probing. + groups[curr_group].setOverflow(hash_8); + curr_group = + (curr_group + ProbePolicy {}.getNext(iteration)) % groups.size(); + iteration++; + } + else + { + // Stop probing. + curr_group = NO_MATCH; + } + } + return FlatMapIndex {NO_MATCH, NO_MATCH}; + } + + /*! + * \brief Finds the next potential bucket index for a given hash in a group + * array for an open-addressing hash map. + * + * \param [in] ngroups_pow_2 the number of groups, expressed as a power of 2 + * \param [in] groups the array of metadata for the groups in the hash map + * \param [in] hash the hash to insert + * + * \return a FlatMapIndex with group and bucket ID, or NO_MATCH if no empty + * buckets were found. + */ + FlatMapIndex find(int ngroups_pow_2, + ArrayView groups, + HashType hash, + int last = NO_MATCH) const + { + int curr_group = last; + int iteration = 0; + if(curr_group == NO_MATCH) + { + // We use the k MSBs of the hash as the initial group probe point, + // where ngroups = 2^k. + int group_divisor = 1 << ((CHAR_BIT * sizeof(HashType)) - ngroups_pow_2); + curr_group = hash / group_divisor; + } + std::uint8_t hash_8 {hash}; + while(curr_group != NO_MATCH) + { + int bucket = groups[curr_group].getHashBucket(hash_8); + if(bucket != GroupBucket::InvalidSlot) + { + return FlatMapIndex {curr_group, bucket}; + } + if(!groups[curr_group].getMaybeOverflowed(hash_8) || + groups[curr_group].hasSentinel()) + { + // Stop probing if the "overflow" bit is not set or if the sentinel + // is set for a bucket. + curr_group = NO_MATCH; + } + else + { + curr_group = + (curr_group + ProbePolicy {}.getNext(iteration)) % groups.size(); + iteration++; + } + } + // Unable to find a matching entry for a hash. + return FlatMapIndex {NO_MATCH, NO_MATCH}; + } +}; + +} // namespace flat_map +} // namespace detail +} // namespace axom + +#endif // Axom_Core_Detail_FlatTable_Hpp From 0950334e16d31a401c1a9eaf169a60026cb58597 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Sun, 6 Aug 2023 02:03:19 -0700 Subject: [PATCH 251/639] Initial commit of new FlatMap class --- src/axom/core/CMakeLists.txt | 1 + src/axom/core/FlatMap.hpp | 82 ++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 src/axom/core/FlatMap.hpp diff --git a/src/axom/core/CMakeLists.txt b/src/axom/core/CMakeLists.txt index bbcad72bf1..2090d7e2fc 100644 --- a/src/axom/core/CMakeLists.txt +++ b/src/axom/core/CMakeLists.txt @@ -59,6 +59,7 @@ set(core_headers IteratorBase.hpp Macros.hpp Map.hpp + FlatMap.hpp Path.hpp StackArray.hpp Types.hpp diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp new file mode 100644 index 0000000000..7b7b87a860 --- /dev/null +++ b/src/axom/core/FlatMap.hpp @@ -0,0 +1,82 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level COPYRIGHT file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +#ifndef Axom_Core_FlatMap_HPP +#define Axom_Core_FlatMap_HPP + +#include "axom/config.hpp" +#include "axom/core/Macros.hpp" +#include "axom/core/detail/FlatTable.hpp" + +namespace axom +{ +template > +class FlatMap + : detail::flat_map::SequentialLookupPolicy +{ + using size_type = IndexType; + using value_type = std::pair; + using iterator = void; + using const_iterator = void; + + // Constructors + FlatMap(); + + explicit FlatMap(IndexType bucket_count); + + template + FlatMap(InputIt first, InputIt last, IndexType bucket_count = -1); + + explicit FlatMap(std::initializer_list init, + IndexType bucket_count = -1); + + // Iterators + iterator begin(); + const_iterator begin() const; + const_iterator cbegin() const; + + iterator end(); + const_iterator end() const; + const_iterator cend() const; + + // Capacity + bool empty() const; + IndexType size() const; + + // Lookup + iterator find(const KeyType& key); + const_iterator find(const KeyType& key) const; + + ValueType& at(const KeyType& key); + const ValueType& at(const KeyType& key) const; + + ValueType& operator[](const KeyType& key); + const ValueType& operator[](const KeyType& key) const; + + IndexType count(const KeyType& key) const; + bool contains(const KeyType& key) const; + + // Modifiers + void clear(); + std::pair insert(const value_type& value); + std::pair insert(value_type&& value); + template + std::pair insert(InputPair&& pair); + template + std::pair emplace(InputPair&& pair); + template + void insert(InputIt first, InputIt last); + + // Hashing + IndexType bucket_count() const; + double load_factor() const; + double max_load_factor() const; + void rehash(IndexType count); + void reserve(IndexType count); +}; + +} // namespace axom + +#endif // Axom_Core_FlatMap_HPP From 418ef84a5b2ae10e098ca1471245d11bcea0efbd Mon Sep 17 00:00:00 2001 From: Max Yang Date: Sun, 6 Aug 2023 15:56:54 -0700 Subject: [PATCH 252/639] FlatTable: change probing functions to accept visitors --- src/axom/core/detail/FlatTable.hpp | 105 ++++++++++++++--------------- 1 file changed, 51 insertions(+), 54 deletions(-) diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 8860fe1233..820bead6da 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -62,14 +62,15 @@ struct GroupBucket return InvalidSlot; } - int getHashBucket(std::uint8_t hash) const + template + int visitHashBucket(std::uint8_t hash, Func&& visitor) const { std::uint8_t reducedHash = reduceHash(hash); for(int i = 0; i < 15; i++) { if(metadata.buckets[i] == reducedHash) { - return i; + visitor(i); } } return InvalidSlot; @@ -124,31 +125,26 @@ static_assert(std::alignment_of::value == 16, static_assert(std::is_standard_layout::value, "FlatMap::SwissTable::Bucket: not standard layout"); -struct FlatMapIndex -{ - int group_index; - int bucket_index; -}; - template struct SequentialLookupPolicy { constexpr static int NO_MATCH = -1; /*! - * \brief Inserts a hash into the first empty bucket in an array of groups - * for an open-addressing hash map. - * - * \param [in] ngroups_pow_2 the number of groups, expressed as a power of 2 - * \param [in] groups the array of metadata for the groups in the hash map - * \param [in] hash the hash to insert - * - * \return a FlatMapIndex with group and bucket ID, or NO_MATCH if no empty - * buckets were found. - */ - FlatMapIndex insert(int ngroups_pow_2, + * \brief Inserts a hash into the first empty bucket in an array of groups + * for an open-addressing hash map. + * + * \param [in] ngroups_pow_2 the number of groups, expressed as a power of 2 + * \param [in] groups the array of metadata for the groups in the hash map + * \param [in] hash the hash to insert + * + * \return a integer with bucket ID for an empty insertion point. + */ + template + int probeEmptyIndex(int ngroups_pow_2, ArrayView groups, - HashType hash) const + HashType hash, + FoundIndex&& on_hash_found) const { // We use the k MSBs of the hash as the initial group probe point, // where ngroups = 2^k. @@ -157,13 +153,17 @@ struct SequentialLookupPolicy std::uint8_t hash_8 {hash}; int iteration = 0; - while(curr_group != NO_MATCH) + bool keep_going = true; + while(keep_going) { + groups[curr_group].visitHashBucket(hash_8, [&](IndexType bucket_index) { + keep_going = on_hash_found(curr_group * GroupBucket::Size + bucket_index); + }); int empty_bucket = groups[curr_group].getEmptyBucket(); if(empty_bucket != GroupBucket::InvalidSlot) { groups[curr_group].setBucket(empty_bucket, hash_8); - return FlatMapIndex {curr_group, empty_bucket}; + return curr_group; } else if(!groups[curr_group].hasSentinel()) { @@ -179,58 +179,55 @@ struct SequentialLookupPolicy curr_group = NO_MATCH; } } - return FlatMapIndex {NO_MATCH, NO_MATCH}; + return curr_group; } /*! - * \brief Finds the next potential bucket index for a given hash in a group - * array for an open-addressing hash map. - * - * \param [in] ngroups_pow_2 the number of groups, expressed as a power of 2 - * \param [in] groups the array of metadata for the groups in the hash map - * \param [in] hash the hash to insert - * - * \return a FlatMapIndex with group and bucket ID, or NO_MATCH if no empty - * buckets were found. - */ - FlatMapIndex find(int ngroups_pow_2, - ArrayView groups, - HashType hash, - int last = NO_MATCH) const + * \brief Finds the next potential bucket index for a given hash in a group + * array for an open-addressing hash map. + * + * \param [in] ngroups_pow_2 the number of groups, expressed as a power of 2 + * \param [in] groups the array of metadata for the groups in the hash map + * \param [in] hash the hash to insert + * + * \return the first bucket with an empty space, if probing for insertion. + */ + template + void probeIndex(int ngroups_pow_2, + ArrayView groups, + HashType hash, + FoundIndex&& on_hash_found) const { - int curr_group = last; - int iteration = 0; - if(curr_group == NO_MATCH) - { - // We use the k MSBs of the hash as the initial group probe point, - // where ngroups = 2^k. - int group_divisor = 1 << ((CHAR_BIT * sizeof(HashType)) - ngroups_pow_2); - curr_group = hash / group_divisor; - } + // We use the k MSBs of the hash as the initial group probe point, + // where ngroups = 2^k. + int group_divisor = 1 << ((CHAR_BIT * sizeof(HashType)) - ngroups_pow_2); + int curr_group = hash / group_divisor; + std::uint8_t hash_8 {hash}; - while(curr_group != NO_MATCH) + int iteration = 0; + bool keep_going = true; + while(keep_going) { - int bucket = groups[curr_group].getHashBucket(hash_8); - if(bucket != GroupBucket::InvalidSlot) - { - return FlatMapIndex {curr_group, bucket}; - } + groups[curr_group].visitHashBucket(hash_8, [&](IndexType bucket_index) { + keep_going = on_hash_found(curr_group * GroupBucket::Size + bucket_index); + }); + if(!groups[curr_group].getMaybeOverflowed(hash_8) || groups[curr_group].hasSentinel()) { // Stop probing if the "overflow" bit is not set or if the sentinel // is set for a bucket. + keep_going = false; curr_group = NO_MATCH; } else { + // Probe the next bucket. curr_group = (curr_group + ProbePolicy {}.getNext(iteration)) % groups.size(); iteration++; } } - // Unable to find a matching entry for a hash. - return FlatMapIndex {NO_MATCH, NO_MATCH}; } }; From 41f1a313b5722146eb08642d4169b664a22b069e Mon Sep 17 00:00:00 2001 From: Max Yang Date: Sun, 6 Aug 2023 15:57:28 -0700 Subject: [PATCH 253/639] FlatMap: initial implementation of iterators/lookup --- src/axom/core/FlatMap.hpp | 154 ++++++++++++++++++++++++++--- src/axom/core/detail/FlatTable.hpp | 2 + 2 files changed, 145 insertions(+), 11 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 7b7b87a860..f329ce3ace 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -16,10 +16,30 @@ template { +private: + using LookupPolicy = + detail::flat_map::SequentialLookupPolicy; + using LookupPolicy::NO_MATCH; + + constexpr static int BucketsPerGroup = detail::flat_map::GroupBucket::Size; + + template + class IteratorImpl; + + struct KeyValuePair + { + const KeyType first; + ValueType second; + }; + + template + friend class IteratorImpl; + +public: using size_type = IndexType; - using value_type = std::pair; - using iterator = void; - using const_iterator = void; + using value_type = KeyValuePair; + using iterator = IteratorImpl; + using const_iterator = IteratorImpl; // Constructors FlatMap(); @@ -42,21 +62,24 @@ class FlatMap const_iterator cend() const; // Capacity - bool empty() const; - IndexType size() const; + bool empty() const { return m_size == 0; } + IndexType size() const { return m_size; } // Lookup iterator find(const KeyType& key); const_iterator find(const KeyType& key) const; - ValueType& at(const KeyType& key); - const ValueType& at(const KeyType& key) const; + ValueType& at(const KeyType& key) { return this->find(key)->second; } + const ValueType& at(const KeyType& key) const + { + return this->find(key)->second; + } - ValueType& operator[](const KeyType& key); - const ValueType& operator[](const KeyType& key) const; + ValueType& operator[](const KeyType& key) { return at(key); } + const ValueType& operator[](const KeyType& key) const { return at(key); } - IndexType count(const KeyType& key) const; - bool contains(const KeyType& key) const; + IndexType count(const KeyType& key) const { return (find(key) != end()); } + bool contains(const KeyType& key) const { return (find(key) != end()); } // Modifiers void clear(); @@ -69,14 +92,123 @@ class FlatMap template void insert(InputIt first, InputIt last); + template + std::pair insert_or_assign(const KeyType& key, Args&&... args); + template + std::pair insert_or_assign(KeyType&& key, Args&&... args); + + template + std::pair try_emplace(const KeyType& key, Args&&... args); + template + std::pair try_emplace(KeyType&& key, Args&&... args); + // Hashing IndexType bucket_count() const; double load_factor() const; double max_load_factor() const; void rehash(IndexType count); void reserve(IndexType count); + +private: + IndexType m_numGroups2; // Number of groups of 15 buckets, expressed as a power of 2 + IndexType m_size; + axom::Array m_metadata; + axom::Array m_buckets; +}; + +template +template +class FlatMap::IteratorImpl +{ +private: + using MapType = FlatMap; + +public: + using iterator_category = std::forward_iterator_tag; + using value_type = MapType::value_type; + using difference_type = IndexType; + + using DataType = std::conditional_t; + using MapConstType = std::conditional_t; + using pointer = DataType*; + using reference = DataType&; + +public: + IteratorImpl(MapConstType* map, IndexType internalIdx) + : m_map(map) + , m_internalIdx(internalIdx) + { } + + friend bool operator==(const IteratorImpl& lhs, const IteratorImpl& rhs) + { + return lhs.m_internalIdx == rhs.m_internalIdx; + } + + friend bool operator!=(const IteratorImpl& lhs, const IteratorImpl& rhs) + { + return lhs.m_internalIdx != rhs.m_internalIdx; + } + + IteratorImpl& operator++() + { + // TODO + } + + IteratorImpl operator++(int) + { + // TODO + } + + reference operator*() const { return m_map->m_buckets[m_internalIdx]; } + + pointer operator->() const { return &(m_map->m_buckets[m_internalIdx]); } + +private: + MapConstType* m_map; + IndexType m_internalIdx; }; +template +auto FlatMap::find(const KeyType& key) -> iterator +{ + auto hash = Hash {}(key); + iterator found_iter = end(); + this->probeIndex(m_numGroups2, + m_metadata, + hash, + [&](IndexType bucket_index) -> bool { + if(this->m_buckets[bucket_index].first == key) + { + found_iter = iterator(this, bucket_index); + // Stop tracking. + return false; + } + return true; + }); + return found_iter; +} + +template +auto FlatMap::find(const KeyType& key) const + -> const_iterator +{ + auto hash = Hash {}(key); + iterator found_iter = end(); + this->probeIndex(m_numGroups2, + m_metadata, + hash, + [&](IndexType bucket_index) -> bool { + if(this->m_buckets[bucket_index].first == key) + { + found_iter = iterator(this, bucket_index); + // Stop tracking. + return false; + } + return true; + }); + return found_iter; +} + } // namespace axom #endif // Axom_Core_FlatMap_HPP diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 820bead6da..de7a1e7870 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -47,6 +47,8 @@ struct GroupBucket constexpr static std::uint8_t Sentinel = 1; constexpr static int InvalidSlot = -1; + constexpr static int Size = 15; + GroupBucket() : data {0ULL, 0ULL} { } int getEmptyBucket() const From d9de50c26d92b27b82c22023ad848ea7e931a5f0 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Sun, 6 Aug 2023 16:34:32 -0700 Subject: [PATCH 254/639] FlatMap: implement insert(), emplace() --- src/axom/core/FlatMap.hpp | 59 +++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index f329ce3ace..5209f5dd04 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -83,12 +83,22 @@ class FlatMap // Modifiers void clear(); - std::pair insert(const value_type& value); - std::pair insert(value_type&& value); - template - std::pair insert(InputPair&& pair); + std::pair insert(const value_type& value) + { + return emplace(value); + } + std::pair insert(value_type&& value) + { + return emplace(std::move(value)); + } template - std::pair emplace(InputPair&& pair); + std::pair insert(InputPair&& pair) + { + return emplace(std::forward(pair)); + } + template + std::pair emplace(InputArgs&&... pair); + template void insert(InputIt first, InputIt last); @@ -209,6 +219,45 @@ auto FlatMap::find(const KeyType& key) const return found_iter; } +template +template +auto FlatMap::emplace(InputArgs&&... args) + -> std::pair +{ + KeyValuePair pair {std::forward(args)...}; + auto hash = Hash {}(pair.first); + // TODO: ensure that we have enough space to insert with given load factor + + bool keyExistsAlready = false; + iterator keyIterator = end(); + auto FindExistingElem = [&, this](IndexType bucket_index) -> bool { + if(this->m_buckets[bucket_index].first == pair.first) + { + keyExistsAlready = true; + keyIterator = iterator(this, bucket_index); + // Exit out of probing, we can't insert if the key already exists. + return false; + } + return true; + }; + + auto InsertEmptyBucket = [&, this](IndexType bucket_index) { + if(!keyExistsAlready) + { + keyIterator = iterator(this, bucket_index); + this->m_size++; + new(&(this->m_buckets[bucket_index])) KeyValuePair(std::move(pair)); + } + }; + + this->probeEmptyIndex(m_numGroups2, + m_metadata, + hash, + FindExistingElem, + InsertEmptyBucket); + return {keyIterator, !keyExistsAlready}; +} + } // namespace axom #endif // Axom_Core_FlatMap_HPP From 3fc8907fb72b3917c0a76c07cdf98353cbb6edbb Mon Sep 17 00:00:00 2001 From: Max Yang Date: Sun, 6 Aug 2023 16:34:57 -0700 Subject: [PATCH 255/639] FlatTable: changes to probeEmptyIndex --- src/axom/core/detail/FlatTable.hpp | 47 ++++++++++++++++++------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index de7a1e7870..68b9395d2f 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -139,19 +139,20 @@ struct SequentialLookupPolicy * \param [in] ngroups_pow_2 the number of groups, expressed as a power of 2 * \param [in] groups the array of metadata for the groups in the hash map * \param [in] hash the hash to insert - * - * \return a integer with bucket ID for an empty insertion point. */ - template - int probeEmptyIndex(int ngroups_pow_2, - ArrayView groups, - HashType hash, - FoundIndex&& on_hash_found) const + template + bool probeEmptyIndex(int ngroups_pow_2, + ArrayView groups, + HashType hash, + FoundIndex&& on_hash_found, + InsertIndex&& on_empty_insert) const { // We use the k MSBs of the hash as the initial group probe point, // where ngroups = 2^k. int group_divisor = 1 << ((CHAR_BIT * sizeof(HashType)) - ngroups_pow_2); int curr_group = hash / group_divisor; + int empty_group = NO_MATCH; + int empty_bucket = NO_MATCH; std::uint8_t hash_8 {hash}; int iteration = 0; @@ -161,13 +162,23 @@ struct SequentialLookupPolicy groups[curr_group].visitHashBucket(hash_8, [&](IndexType bucket_index) { keep_going = on_hash_found(curr_group * GroupBucket::Size + bucket_index); }); - int empty_bucket = groups[curr_group].getEmptyBucket(); - if(empty_bucket != GroupBucket::InvalidSlot) + int tentative_empty_bucket = groups[curr_group].getEmptyBucket(); + if(tentative_empty_bucket != GroupBucket::InvalidSlot && + empty_group == NO_MATCH) { - groups[curr_group].setBucket(empty_bucket, hash_8); - return curr_group; + empty_group = curr_group; + empty_bucket = tentative_empty_bucket; } - else if(!groups[curr_group].hasSentinel()) + + if(groups[curr_group].hasSentinel() || + (!groups[curr_group].getMaybeOverflowed(hash_8) && + empty_group != NO_MATCH)) + { + // We've reached a sentinel group, or the last group that might + // contain the hash. Stop probing. + keep_going = false; + } + else { // Set the overflow bit and continue probing. groups[curr_group].setOverflow(hash_8); @@ -175,13 +186,13 @@ struct SequentialLookupPolicy (curr_group + ProbePolicy {}.getNext(iteration)) % groups.size(); iteration++; } - else - { - // Stop probing. - curr_group = NO_MATCH; - } } - return curr_group; + // Call the function for the empty bucket index. + if(empty_group != NO_MATCH) + { + on_empty_insert(empty_group * GroupBucket::Size + empty_bucket); + } + return empty_group != NO_MATCH; } /*! From 34dea3e745e90b8fedf15da20125332c65ac7025 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Sun, 6 Aug 2023 16:57:51 -0700 Subject: [PATCH 256/639] FlatMap: implement insert_or_assign, try_emplace --- src/axom/core/FlatMap.hpp | 59 +++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 14 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 5209f5dd04..984ede7cd3 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -97,20 +97,36 @@ class FlatMap return emplace(std::forward(pair)); } template - std::pair emplace(InputArgs&&... pair); + std::pair emplace(InputArgs&&... pair) + { + KeyValuePair kv {pair...}; + emplaceImpl(std::move(kv.first), std::move(kv.second)); + } template void insert(InputIt first, InputIt last); template - std::pair insert_or_assign(const KeyType& key, Args&&... args); + std::pair insert_or_assign(const KeyType& key, Args&&... args) + { + return emplaceImpl(true, KeyType {key}, std::forward(args)...); + } template - std::pair insert_or_assign(KeyType&& key, Args&&... args); + std::pair insert_or_assign(KeyType&& key, Args&&... args) + { + return emplaceImpl(true, std::move(key), std::forward(args)...); + } template - std::pair try_emplace(const KeyType& key, Args&&... args); + std::pair try_emplace(const KeyType& key, Args&&... args) + { + return emplaceImpl(false, KeyType {key}, std::forward(args)...); + } template - std::pair try_emplace(KeyType&& key, Args&&... args); + std::pair try_emplace(KeyType&& key, Args&&... args) + { + return emplaceImpl(false, std::move(key), std::forward(args)...); + } // Hashing IndexType bucket_count() const; @@ -120,6 +136,11 @@ class FlatMap void reserve(IndexType count); private: + template + std::pair emplaceImpl(bool assign_on_existence, + KeyType&& key, + Args&&... args); + IndexType m_numGroups2; // Number of groups of 15 buckets, expressed as a power of 2 IndexType m_size; axom::Array m_metadata; @@ -221,20 +242,21 @@ auto FlatMap::find(const KeyType& key) const template template -auto FlatMap::emplace(InputArgs&&... args) +auto FlatMap::emplaceImpl(bool assign_on_existence, + KeyType&& key, + InputArgs&&... args) -> std::pair { - KeyValuePair pair {std::forward(args)...}; - auto hash = Hash {}(pair.first); + auto hash = Hash {}(key); // TODO: ensure that we have enough space to insert with given load factor bool keyExistsAlready = false; - iterator keyIterator = end(); + IndexType foundBucketIndex = NO_MATCH; auto FindExistingElem = [&, this](IndexType bucket_index) -> bool { - if(this->m_buckets[bucket_index].first == pair.first) + if(this->m_buckets[bucket_index].first == key) { keyExistsAlready = true; - keyIterator = iterator(this, bucket_index); + foundBucketIndex = bucket_index; // Exit out of probing, we can't insert if the key already exists. return false; } @@ -244,9 +266,7 @@ auto FlatMap::emplace(InputArgs&&... args) auto InsertEmptyBucket = [&, this](IndexType bucket_index) { if(!keyExistsAlready) { - keyIterator = iterator(this, bucket_index); - this->m_size++; - new(&(this->m_buckets[bucket_index])) KeyValuePair(std::move(pair)); + foundBucketIndex = bucket_index; } }; @@ -255,6 +275,17 @@ auto FlatMap::emplace(InputArgs&&... args) hash, FindExistingElem, InsertEmptyBucket); + iterator keyIterator = iterator(this, foundBucketIndex); + if(!keyExistsAlready) + { + new(&m_buckets[foundBucketIndex]) + KeyValuePair(std::move(key), std::forward(args)...); + } + else if(keyExistsAlready && assign_on_existence) + { + m_buckets[foundBucketIndex] = + KeyValuePair(std::move(key), std::forward(args)...); + } return {keyIterator, !keyExistsAlready}; } From 9b591e9ddfeccc4ed1d9ff076a86fc1212c8c5aa Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 7 Aug 2023 09:10:40 -0700 Subject: [PATCH 257/639] FlatTable: more changes to probeEmptyIndex() --- src/axom/core/FlatMap.hpp | 20 ++++++++------------ src/axom/core/detail/FlatTable.hpp | 24 +++++++++++++++--------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 984ede7cd3..301b5766a4 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -263,18 +263,14 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, return true; }; - auto InsertEmptyBucket = [&, this](IndexType bucket_index) { - if(!keyExistsAlready) - { - foundBucketIndex = bucket_index; - } - }; - - this->probeEmptyIndex(m_numGroups2, - m_metadata, - hash, - FindExistingElem, - InsertEmptyBucket); + IndexType newBucket = + this->probeEmptyIndex(m_numGroups2, m_metadata, hash, FindExistingElem); + if(!keyExistsAlready) + { + foundBucketIndex = newBucket; + // Add a hash to the corresponding bucket slot. + this->setBucketHash(m_metadata, newBucket, hash); + } iterator keyIterator = iterator(this, foundBucketIndex); if(!keyExistsAlready) { diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 68b9395d2f..9407a3ef6c 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -140,12 +140,11 @@ struct SequentialLookupPolicy * \param [in] groups the array of metadata for the groups in the hash map * \param [in] hash the hash to insert */ - template - bool probeEmptyIndex(int ngroups_pow_2, - ArrayView groups, - HashType hash, - FoundIndex&& on_hash_found, - InsertIndex&& on_empty_insert) const + template + IndexType probeEmptyIndex(int ngroups_pow_2, + ArrayView groups, + HashType hash, + FoundIndex&& on_hash_found) const { // We use the k MSBs of the hash as the initial group probe point, // where ngroups = 2^k. @@ -187,12 +186,11 @@ struct SequentialLookupPolicy iteration++; } } - // Call the function for the empty bucket index. if(empty_group != NO_MATCH) { - on_empty_insert(empty_group * GroupBucket::Size + empty_bucket); + return empty_group * GroupBucket::Size + empty_bucket; } - return empty_group != NO_MATCH; + return NO_MATCH; } /*! @@ -242,6 +240,14 @@ struct SequentialLookupPolicy } } } + + void setBucketHash(ArrayView groups, IndexType bucket, HashType hash) + { + int group_index = bucket / GroupBucket::Size; + int slot_index = bucket % GroupBucket::Size; + + groups[group_index].setBucket(slot_index, hash); + } }; } // namespace flat_map From fb4155f2bdb83388f8f6a035f0a3b330e3283171 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 7 Aug 2023 09:34:27 -0700 Subject: [PATCH 258/639] Implement FlatMap::begin, end, iterators --- src/axom/core/FlatMap.hpp | 31 ++++++++++++++++++------- src/axom/core/detail/FlatTable.hpp | 36 ++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 8 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 301b5766a4..cfb02ff42f 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -53,13 +53,25 @@ class FlatMap IndexType bucket_count = -1); // Iterators - iterator begin(); - const_iterator begin() const; - const_iterator cbegin() const; + iterator begin() + { + IndexType firstBucketIndex = this->nextValidIndex(m_metadata, 0); + return iterator(this, firstBucketIndex); + } + const_iterator begin() const + { + IndexType firstBucketIndex = this->nextValidIndex(m_metadata, 0); + return const_iterator(this, firstBucketIndex); + } + const_iterator cbegin() const + { + IndexType firstBucketIndex = this->nextValidIndex(m_metadata, 0); + return const_iterator(this, firstBucketIndex); + } - iterator end(); - const_iterator end() const; - const_iterator cend() const; + iterator end() { return iterator(this, m_buckets.size()); } + const_iterator end() const { return const_iterator(this, m_buckets.size()); } + const_iterator cend() const { return const_iterator(this, m_buckets.size()); } // Capacity bool empty() const { return m_size == 0; } @@ -182,12 +194,15 @@ class FlatMap::IteratorImpl IteratorImpl& operator++() { - // TODO + m_internalIdx = m_map->nextValidIndex(m_map->m_buckets, m_internalIdx); + return *this; } IteratorImpl operator++(int) { - // TODO + IteratorImpl next = *this; + next++; + return next; } reference operator*() const { return m_map->m_buckets[m_internalIdx]; } diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 9407a3ef6c..484d771af6 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -64,6 +64,21 @@ struct GroupBucket return InvalidSlot; } + int nextFilledBucket(int start_index) const + { + for(int i = start_index; i < 15; i++) + { + // We intentionally don't check for the sentinel here. This gives us the + // index of the sentinel bucket at the end, which is needed as a "stop" + // for forward iteration. + if(metadata.buckets[i] != GroupBucket::Empty) + { + return i; + } + } + return InvalidSlot; + } + template int visitHashBucket(std::uint8_t hash, Func&& visitor) const { @@ -248,6 +263,27 @@ struct SequentialLookupPolicy groups[group_index].setBucket(slot_index, hash); } + + IndexType nextValidIndex(ArrayView groups, int last_bucket) + { + if(last_bucket >= groups.size() * GroupBucket::Size - 1) + { + return last_bucket; + } + int group_index = last_bucket / GroupBucket::Size; + int slot_index = last_bucket % GroupBucket::Size; + + while(slot_index != GroupBucket::InvalidSlot && group_index < groups.size()) + { + slot_index = groups[group_index].nextFilledBucket(slot_index + 1); + if(slot_index == GroupBucket::InvalidSlot) + { + group_index++; + slot_index = 0; + } + } + return group_index * GroupBucket::Size + slot_index; + } }; } // namespace flat_map From e81226e7e9e0fffa4738d7b8bf15a5c25735908f Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 7 Aug 2023 09:46:59 -0700 Subject: [PATCH 259/639] Add FlatMap::swap --- src/axom/core/FlatMap.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index cfb02ff42f..e60aa9c929 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -52,6 +52,14 @@ class FlatMap explicit FlatMap(std::initializer_list init, IndexType bucket_count = -1); + void swap(FlatMap& other) + { + axom::utilities::swap(m_numGroups2, other.m_numGroups2); + axom::utilities::swap(m_size, other.m_size); + axom::utilities::swap(m_metadata, other.m_metadata); + axom::utilities::swap(m_buckets, other.m_buckets); + } + // Iterators iterator begin() { From 87dfd0379f08644514bf37f90f184770bfc8e4f4 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 7 Aug 2023 12:27:23 -0700 Subject: [PATCH 260/639] Add load factor control, constructors --- src/axom/core/FlatMap.hpp | 71 ++++++++++++++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 8 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index e60aa9c929..5e744c8b1f 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -47,10 +47,14 @@ class FlatMap explicit FlatMap(IndexType bucket_count); template - FlatMap(InputIt first, InputIt last, IndexType bucket_count = -1); + FlatMap(InputIt first, InputIt last, IndexType bucket_count = -1) + : FlatMap(std::distance(first, last), first, last, bucket_count) + { } explicit FlatMap(std::initializer_list init, - IndexType bucket_count = -1); + IndexType bucket_count = -1) + : FlatMap(init.begin(), init.end(), bucket_count) + { } void swap(FlatMap& other) { @@ -149,13 +153,22 @@ class FlatMap } // Hashing - IndexType bucket_count() const; - double load_factor() const; - double max_load_factor() const; - void rehash(IndexType count); - void reserve(IndexType count); + double load_factor() const + { + return ((double)m_loadCount) / m_buckets.size(); + } + double max_load_factor() const { return MAX_LOAD_FACTOR; } + void rehash(IndexType count) + { + FlatMap rehashed(m_size, begin(), end(), count); + swap(*this, rehashed); + } + void reserve(IndexType count) { rehash(std::ceil(count / MAX_LOAD_FACTOR)); } private: + template + FlatMap(IndexType num_elems, InputIt first, InputIt last, IndexType bucket_count); + template std::pair emplaceImpl(bool assign_on_existence, KeyType&& key, @@ -165,6 +178,10 @@ class FlatMap IndexType m_size; axom::Array m_metadata; axom::Array m_buckets; + + // Boost flat_unordered_map uses a fixed load factor. + constexpr static double MAX_LOAD_FACTOR = 0.875; + std::uint64_t m_loadCount; }; template @@ -222,6 +239,37 @@ class FlatMap::IteratorImpl IndexType m_internalIdx; }; +template +FlatMap::FlatMap(IndexType bucket_count) + : m_size(0) + , m_loadCount(0) +{ + // Get the smallest power-of-two number of groups satisfying: + // N * GroupSize - 1 >= minBuckets + // TODO: we should add a leadingZeros overload for 64-bit integers + { + std::int32_t numGroups = + std::ceil((bucket_count + 1) / (double)BucketsPerGroup); + m_numGroups2 = 32 - axom::utilities::leadingZeros(numGroups); + } + + IndexType numGroupsRounded = 1 << m_numGroups2; + IndexType numBuckets = numGroupsRounded * BucketsPerGroup - 1; + m_metadata.resize(numGroupsRounded); + m_buckets.resize(numBuckets); +} + +template +template +FlatMap::FlatMap(IndexType num_elems, + InputIt first, + InputIt last, + IndexType bucket_count) + : FlatMap(std::max(num_elems, bucket_count)) +{ + insert(first, last); +} + template auto FlatMap::find(const KeyType& key) -> iterator { @@ -271,7 +319,13 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, -> std::pair { auto hash = Hash {}(key); - // TODO: ensure that we have enough space to insert with given load factor + // Resize to double the number of bucket groups if insertion would put us + // above the maximum load factor. + if(((m_loadCount + 1) / (double)m_buckets.size()) >= MAX_LOAD_FACTOR) + { + IndexType newNumGroups = m_metadata.size() * 2; + rehash(newNumGroups * BucketsPerGroup - 1); + } bool keyExistsAlready = false; IndexType foundBucketIndex = NO_MATCH; @@ -293,6 +347,7 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, foundBucketIndex = newBucket; // Add a hash to the corresponding bucket slot. this->setBucketHash(m_metadata, newBucket, hash); + m_loadCount++; } iterator keyIterator = iterator(this, foundBucketIndex); if(!keyExistsAlready) From 40e69f2e25e314789e6e2042e47906c957b0538b Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 7 Aug 2023 12:30:41 -0700 Subject: [PATCH 261/639] Add range FlatMap::insert method --- src/axom/core/FlatMap.hpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 5e744c8b1f..7534c8704d 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -311,6 +311,17 @@ auto FlatMap::find(const KeyType& key) const return found_iter; } +template +template +void FlatMap::insert(InputIt first, InputIt last) +{ + while(first != last) + { + insert(*first); + first++; + } +} + template template auto FlatMap::emplaceImpl(bool assign_on_existence, From 05e1796cd62066bfe86333182b5032456592b3f3 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 7 Aug 2023 12:31:13 -0700 Subject: [PATCH 262/639] Fix for probing --- src/axom/core/detail/FlatTable.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 484d771af6..052723403b 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -192,7 +192,7 @@ struct SequentialLookupPolicy // contain the hash. Stop probing. keep_going = false; } - else + else if(empty_group == NO_MATCH) { // Set the overflow bit and continue probing. groups[curr_group].setOverflow(hash_8); From e7cafd65f80f4d751e2d08b82df688b35361f8f4 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 7 Aug 2023 12:39:07 -0700 Subject: [PATCH 263/639] Set lower floor on number of buckets in a FlatMap --- src/axom/core/FlatMap.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 7534c8704d..814a29b2a4 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -42,7 +42,7 @@ class FlatMap using const_iterator = IteratorImpl; // Constructors - FlatMap(); + FlatMap() : FlatMap(MIN_NUM_BUCKETS) { } explicit FlatMap(IndexType bucket_count); @@ -174,6 +174,8 @@ class FlatMap KeyType&& key, Args&&... args); + constexpr static IndexType MIN_NUM_BUCKETS = 16; + IndexType m_numGroups2; // Number of groups of 15 buckets, expressed as a power of 2 IndexType m_size; axom::Array m_metadata; @@ -244,6 +246,7 @@ FlatMap::FlatMap(IndexType bucket_count) : m_size(0) , m_loadCount(0) { + bucket_count = std::min(MIN_NUM_BUCKETS, bucket_count); // Get the smallest power-of-two number of groups satisfying: // N * GroupSize - 1 >= minBuckets // TODO: we should add a leadingZeros overload for 64-bit integers From c16d07fd267949585f31de2bbb48b8757dcf09a3 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 7 Aug 2023 14:16:05 -0700 Subject: [PATCH 264/639] Add code for FlatMap::erase --- src/axom/core/FlatMap.hpp | 28 ++++++++++++++++++++++++++++ src/axom/core/detail/FlatTable.hpp | 12 ++++++++++++ 2 files changed, 40 insertions(+) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 814a29b2a4..9311e7e762 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -152,6 +152,19 @@ class FlatMap return emplaceImpl(false, std::move(key), std::forward(args)...); } + iterator erase(iterator pos) { erase(const_iterator {pos}); } + iterator erase(const_iterator pos); + IndexType erase(const KeyType& key) + { + const_iterator it = find(key); + if(it != end()) + { + erase(it); + return 1; + } + return 0; + } + // Hashing double load_factor() const { @@ -377,6 +390,21 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, return {keyIterator, !keyExistsAlready}; } +template +auto FlatMap::erase(const_iterator pos) -> iterator +{ + assert(pos < end()); + auto hash = Hash {}(pos->first); + + bool midSequence = this->clearBucket(m_metadata, pos.m_internalIdx, hash); + pos->~KeyValuePair(); + if(!midSequence) + { + m_loadCount--; + } + return ++pos; +} + } // namespace axom #endif // Axom_Core_FlatMap_HPP diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 052723403b..e242fe8b51 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -264,6 +264,18 @@ struct SequentialLookupPolicy groups[group_index].setBucket(slot_index, hash); } + bool clearBucket(ArrayView groups, IndexType bucket, HashType hash) + { + int group_index = bucket / GroupBucket::Size; + int slot_index = bucket % GroupBucket::Size; + + groups[group_index].setBucket(slot_index, GroupBucket::Empty); + + // Return if the overflow bit is set on the bucket. That indicates whether + // we are deleting an element in the middle of a probing sequence. + return groups[group_index].getMaybeOverflowed(hash); + } + IndexType nextValidIndex(ArrayView groups, int last_bucket) { if(last_bucket >= groups.size() * GroupBucket::Size - 1) From 9afe7cb8b2e984e01630eea56f00e08b2af37c26 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 7 Aug 2023 14:16:27 -0700 Subject: [PATCH 265/639] Fixes for emplace --- src/axom/core/FlatMap.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 9311e7e762..4c89cf8652 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -220,7 +220,9 @@ class FlatMap::IteratorImpl IteratorImpl(MapConstType* map, IndexType internalIdx) : m_map(map) , m_internalIdx(internalIdx) - { } + { + assert(m_internalIdx >= 0 && m_internalIdx < m_map->size()); + } friend bool operator==(const IteratorImpl& lhs, const IteratorImpl& rhs) { @@ -374,6 +376,7 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, foundBucketIndex = newBucket; // Add a hash to the corresponding bucket slot. this->setBucketHash(m_metadata, newBucket, hash); + m_size++; m_loadCount++; } iterator keyIterator = iterator(this, foundBucketIndex); From 302db5a9db4661ad86e1ef7354111c0e85880ae2 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 7 Aug 2023 16:56:41 -0700 Subject: [PATCH 266/639] Miscellaneous fixes --- src/axom/core/FlatMap.hpp | 42 ++++++++++++++---------------- src/axom/core/detail/FlatTable.hpp | 7 ++--- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 4c89cf8652..bca5cfe8c4 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -26,11 +26,7 @@ class FlatMap template class IteratorImpl; - struct KeyValuePair - { - const KeyType first; - ValueType second; - }; + using KeyValuePair = std::pair; template friend class IteratorImpl; @@ -109,11 +105,11 @@ class FlatMap void clear(); std::pair insert(const value_type& value) { - return emplace(value); + return emplaceImpl(false, value.first, value.second); } std::pair insert(value_type&& value) { - return emplace(std::move(value)); + return emplaceImpl(false, std::move(value.first), std::move(value.second)); } template std::pair insert(InputPair&& pair) @@ -123,8 +119,7 @@ class FlatMap template std::pair emplace(InputArgs&&... pair) { - KeyValuePair kv {pair...}; - emplaceImpl(std::move(kv.first), std::move(kv.second)); + return emplaceImpl(false, std::forward(pair)...); } template @@ -173,8 +168,8 @@ class FlatMap double max_load_factor() const { return MAX_LOAD_FACTOR; } void rehash(IndexType count) { - FlatMap rehashed(m_size, begin(), end(), count); - swap(*this, rehashed); + FlatMap rehashed(m_size, cbegin(), cend(), count); + this->swap(rehashed); } void reserve(IndexType count) { rehash(std::ceil(count / MAX_LOAD_FACTOR)); } @@ -182,12 +177,12 @@ class FlatMap template FlatMap(IndexType num_elems, InputIt first, InputIt last, IndexType bucket_count); - template + template std::pair emplaceImpl(bool assign_on_existence, - KeyType&& key, + UKeyType&& key, Args&&... args); - constexpr static IndexType MIN_NUM_BUCKETS = 16; + constexpr static IndexType MIN_NUM_BUCKETS {16}; IndexType m_numGroups2; // Number of groups of 15 buckets, expressed as a power of 2 IndexType m_size; @@ -221,7 +216,7 @@ class FlatMap::IteratorImpl : m_map(map) , m_internalIdx(internalIdx) { - assert(m_internalIdx >= 0 && m_internalIdx < m_map->size()); + assert(m_internalIdx >= 0 && m_internalIdx <= m_map->m_buckets.size()); } friend bool operator==(const IteratorImpl& lhs, const IteratorImpl& rhs) @@ -236,14 +231,14 @@ class FlatMap::IteratorImpl IteratorImpl& operator++() { - m_internalIdx = m_map->nextValidIndex(m_map->m_buckets, m_internalIdx); + m_internalIdx = m_map->nextValidIndex(m_map->m_metadata, m_internalIdx); return *this; } IteratorImpl operator++(int) { IteratorImpl next = *this; - next++; + ++next; return next; } @@ -261,7 +256,8 @@ FlatMap::FlatMap(IndexType bucket_count) : m_size(0) , m_loadCount(0) { - bucket_count = std::min(MIN_NUM_BUCKETS, bucket_count); + int minBuckets = MIN_NUM_BUCKETS; + bucket_count = std::min(minBuckets, bucket_count); // Get the smallest power-of-two number of groups satisfying: // N * GroupSize - 1 >= minBuckets // TODO: we should add a leadingZeros overload for 64-bit integers @@ -341,12 +337,14 @@ void FlatMap::insert(InputIt first, InputIt last) } template -template +template auto FlatMap::emplaceImpl(bool assign_on_existence, - KeyType&& key, + UKeyType&& key, InputArgs&&... args) -> std::pair { + static_assert(std::is_convertible::value, + "UKeyType -> KeyType not convertible"); auto hash = Hash {}(key); // Resize to double the number of bucket groups if insertion would put us // above the maximum load factor. @@ -387,8 +385,8 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, } else if(keyExistsAlready && assign_on_existence) { - m_buckets[foundBucketIndex] = - KeyValuePair(std::move(key), std::forward(args)...); + m_buckets[foundBucketIndex].second = + ValueType(std::forward(args)...); } return {keyIterator, !keyExistsAlready}; } diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index e242fe8b51..89c8709583 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -168,7 +168,7 @@ struct SequentialLookupPolicy int empty_group = NO_MATCH; int empty_bucket = NO_MATCH; - std::uint8_t hash_8 {hash}; + std::uint8_t hash_8 = static_cast(hash); int iteration = 0; bool keep_going = true; while(keep_going) @@ -229,7 +229,7 @@ struct SequentialLookupPolicy int group_divisor = 1 << ((CHAR_BIT * sizeof(HashType)) - ngroups_pow_2); int curr_group = hash / group_divisor; - std::uint8_t hash_8 {hash}; + std::uint8_t hash_8 = static_cast(hash); int iteration = 0; bool keep_going = true; while(keep_going) @@ -276,7 +276,8 @@ struct SequentialLookupPolicy return groups[group_index].getMaybeOverflowed(hash); } - IndexType nextValidIndex(ArrayView groups, int last_bucket) + IndexType nextValidIndex(ArrayView groups, + int last_bucket) const { if(last_bucket >= groups.size() * GroupBucket::Size - 1) { From 62ca113db48ad1933acab288f974b8f6c2a24376 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 7 Aug 2023 16:57:06 -0700 Subject: [PATCH 267/639] Add tests --- src/axom/core/tests/CMakeLists.txt | 1 + src/axom/core/tests/core_flatmap.hpp | 49 ++++++++++++++++++++++++ src/axom/core/tests/core_serial_main.cpp | 1 + 3 files changed, 51 insertions(+) create mode 100644 src/axom/core/tests/core_flatmap.hpp diff --git a/src/axom/core/tests/CMakeLists.txt b/src/axom/core/tests/CMakeLists.txt index 38a92bd901..4e2f0f4c6e 100644 --- a/src/axom/core/tests/CMakeLists.txt +++ b/src/axom/core/tests/CMakeLists.txt @@ -23,6 +23,7 @@ set(core_serial_tests core_execution_for_all.hpp core_execution_space.hpp core_map.hpp + core_flatmap.hpp core_memory_management.hpp core_Path.hpp core_stack_array.hpp diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp new file mode 100644 index 0000000000..15ee5dcc5c --- /dev/null +++ b/src/axom/core/tests/core_flatmap.hpp @@ -0,0 +1,49 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +// Axom includes +#include "axom/config.hpp" +#include "axom/core/Macros.hpp" +#include "axom/core/FlatMap.hpp" + +// gtest includes +#include "gtest/gtest.h" + +TEST(core_flatmap, default_init) +{ + axom::FlatMap int_to_dbl; + EXPECT_EQ(0, int_to_dbl.size()); + EXPECT_EQ(true, int_to_dbl.empty()); +} + +TEST(core_flatmap, insert_only) +{ + axom::FlatMap int_to_dbl; + + int_to_dbl.insert({0, 10.0}); + EXPECT_EQ(1, int_to_dbl.size()); + + int_to_dbl.insert({1, 20.0}); + EXPECT_EQ(2, int_to_dbl.size()); + + int_to_dbl.insert({2, 30.0}); + EXPECT_EQ(3, int_to_dbl.size()); + + // Check consistency of added values. + const double expected_str[3] {10.0, 20.0, 30.0}; + for(int i = 0; i < 3; i++) + { + auto iterator = int_to_dbl.find(i); + EXPECT_NE(iterator, int_to_dbl.end()); + EXPECT_EQ(iterator->first, i); + EXPECT_EQ(iterator->second, expected_str[i]); + + // Using operator[] with an already-existing key should return the + // existing value and not add a value. + double value = int_to_dbl[i]; + EXPECT_EQ(value, expected_str[i]); + EXPECT_EQ(int_to_dbl.size(), 3); + } +} diff --git a/src/axom/core/tests/core_serial_main.cpp b/src/axom/core/tests/core_serial_main.cpp index 88e40e3c4f..97da472582 100644 --- a/src/axom/core/tests/core_serial_main.cpp +++ b/src/axom/core/tests/core_serial_main.cpp @@ -15,6 +15,7 @@ #include "core_execution_for_all.hpp" #include "core_execution_space.hpp" #include "core_map.hpp" +#include "core_flatmap.hpp" #include "core_memory_management.hpp" #include "core_Path.hpp" #include "core_stack_array.hpp" From 51c3ceff244f603a03bb6cf6e807073e9fe88c4c Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 14 Aug 2023 12:48:34 -0700 Subject: [PATCH 268/639] FlatMap: Fixes for iterators --- src/axom/core/FlatMap.hpp | 8 ++++---- src/axom/core/detail/FlatTable.hpp | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index bca5cfe8c4..5a46260ce5 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -63,17 +63,17 @@ class FlatMap // Iterators iterator begin() { - IndexType firstBucketIndex = this->nextValidIndex(m_metadata, 0); + IndexType firstBucketIndex = this->nextValidIndex(m_metadata, NO_MATCH); return iterator(this, firstBucketIndex); } const_iterator begin() const { - IndexType firstBucketIndex = this->nextValidIndex(m_metadata, 0); + IndexType firstBucketIndex = this->nextValidIndex(m_metadata, NO_MATCH); return const_iterator(this, firstBucketIndex); } const_iterator cbegin() const { - IndexType firstBucketIndex = this->nextValidIndex(m_metadata, 0); + IndexType firstBucketIndex = this->nextValidIndex(m_metadata, NO_MATCH); return const_iterator(this, firstBucketIndex); } @@ -238,7 +238,7 @@ class FlatMap::IteratorImpl IteratorImpl operator++(int) { IteratorImpl next = *this; - ++next; + ++(*this); return next; } diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 89c8709583..33ec561e94 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -66,7 +66,7 @@ struct GroupBucket int nextFilledBucket(int start_index) const { - for(int i = start_index; i < 15; i++) + for(int i = start_index + 1; i < 15; i++) { // We intentionally don't check for the sentinel here. This gives us the // index of the sentinel bucket at the end, which is needed as a "stop" @@ -286,15 +286,16 @@ struct SequentialLookupPolicy int group_index = last_bucket / GroupBucket::Size; int slot_index = last_bucket % GroupBucket::Size; - while(slot_index != GroupBucket::InvalidSlot && group_index < groups.size()) + do { - slot_index = groups[group_index].nextFilledBucket(slot_index + 1); + slot_index = groups[group_index].nextFilledBucket(slot_index); if(slot_index == GroupBucket::InvalidSlot) { group_index++; - slot_index = 0; + slot_index = -1; } - } + } while(slot_index == GroupBucket::InvalidSlot && group_index < groups.size()); + return group_index * GroupBucket::Size + slot_index; } }; From fbb656731cacb99a8fd5213a362893b28e53bf78 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 14 Aug 2023 12:50:25 -0700 Subject: [PATCH 269/639] FlatMap: Fix initial size calculations --- src/axom/core/FlatMap.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 5a46260ce5..337c7e82e0 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -58,6 +58,7 @@ class FlatMap axom::utilities::swap(m_size, other.m_size); axom::utilities::swap(m_metadata, other.m_metadata); axom::utilities::swap(m_buckets, other.m_buckets); + axom::utilities::swap(m_loadCount, other.m_loadCount); } // Iterators @@ -161,6 +162,7 @@ class FlatMap } // Hashing + IndexType bucket_count() const { return m_buckets.size(); } double load_factor() const { return ((double)m_loadCount) / m_buckets.size(); @@ -182,7 +184,7 @@ class FlatMap UKeyType&& key, Args&&... args); - constexpr static IndexType MIN_NUM_BUCKETS {16}; + constexpr static IndexType MIN_NUM_BUCKETS {29}; IndexType m_numGroups2; // Number of groups of 15 buckets, expressed as a power of 2 IndexType m_size; @@ -257,14 +259,14 @@ FlatMap::FlatMap(IndexType bucket_count) , m_loadCount(0) { int minBuckets = MIN_NUM_BUCKETS; - bucket_count = std::min(minBuckets, bucket_count); + bucket_count = std::max(minBuckets, bucket_count); // Get the smallest power-of-two number of groups satisfying: // N * GroupSize - 1 >= minBuckets // TODO: we should add a leadingZeros overload for 64-bit integers { std::int32_t numGroups = std::ceil((bucket_count + 1) / (double)BucketsPerGroup); - m_numGroups2 = 32 - axom::utilities::leadingZeros(numGroups); + m_numGroups2 = 31 - (axom::utilities::leadingZeros(numGroups)); } IndexType numGroupsRounded = 1 << m_numGroups2; From 84142eebf92c6f9b5c1cf4cfad84470f665ec0d4 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 14 Aug 2023 12:50:53 -0700 Subject: [PATCH 270/639] FlatMap: add an insert/rehash test --- src/axom/core/tests/core_flatmap.hpp | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index 15ee5dcc5c..fe8342bd12 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -47,3 +47,33 @@ TEST(core_flatmap, insert_only) EXPECT_EQ(int_to_dbl.size(), 3); } } + +TEST(core_flatmap, insert_until_rehash) +{ + axom::FlatMap int_to_dbl; + + const int INIT_CAPACITY = int_to_dbl.bucket_count(); + const double LOAD_FACTOR = int_to_dbl.max_load_factor(); + const int SIZE_NO_REHASH = LOAD_FACTOR * INIT_CAPACITY; + + for(int i = 0; i < SIZE_NO_REHASH; i++) + { + int_to_dbl.insert({i, 2. * i + 1}); + } + EXPECT_EQ(int_to_dbl.bucket_count(), INIT_CAPACITY); + EXPECT_EQ(int_to_dbl.size(), SIZE_NO_REHASH); + + // Next insert should trigger a rehash. + int_to_dbl.insert({SIZE_NO_REHASH, 2. * SIZE_NO_REHASH + 1}); + EXPECT_GT(int_to_dbl.bucket_count(), INIT_CAPACITY); + EXPECT_EQ(int_to_dbl.size(), SIZE_NO_REHASH + 1); + + // Check consistency of values. + for(int i = 0; i < SIZE_NO_REHASH + 1; i++) + { + auto iterator = int_to_dbl.find(i); + EXPECT_NE(iterator, int_to_dbl.end()); + EXPECT_EQ(iterator->first, i); + EXPECT_EQ(iterator->second, 2. * i + 1); + } +} From 7a86d2813ed28dbedf2da551af98ddf6bb9ceab0 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 14 Aug 2023 16:19:00 -0700 Subject: [PATCH 271/639] More iterator fixes --- src/axom/core/FlatMap.hpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 337c7e82e0..5f736686ce 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -203,6 +203,11 @@ class FlatMap::IteratorImpl private: using MapType = FlatMap; + template + friend class IteratorImpl; + + friend class FlatMap; + public: using iterator_category = std::forward_iterator_tag; using value_type = MapType::value_type; @@ -221,6 +226,12 @@ class FlatMap::IteratorImpl assert(m_internalIdx >= 0 && m_internalIdx <= m_map->m_buckets.size()); } + template > + IteratorImpl(IteratorImpl non_const_iter) + : m_map(non_const_iter.m_map) + , m_internalIdx(non_const_iter.m_internalIdx) + { } + friend bool operator==(const IteratorImpl& lhs, const IteratorImpl& rhs) { return lhs.m_internalIdx == rhs.m_internalIdx; @@ -311,14 +322,14 @@ auto FlatMap::find(const KeyType& key) const -> const_iterator { auto hash = Hash {}(key); - iterator found_iter = end(); + const_iterator found_iter = end(); this->probeIndex(m_numGroups2, m_metadata, hash, [&](IndexType bucket_index) -> bool { if(this->m_buckets[bucket_index].first == key) { - found_iter = iterator(this, bucket_index); + found_iter = const_iterator(this, bucket_index); // Stop tracking. return false; } @@ -396,7 +407,7 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, template auto FlatMap::erase(const_iterator pos) -> iterator { - assert(pos < end()); + assert(pos != end()); auto hash = Hash {}(pos->first); bool midSequence = this->clearBucket(m_metadata, pos.m_internalIdx, hash); @@ -405,7 +416,7 @@ auto FlatMap::erase(const_iterator pos) -> iterator { m_loadCount--; } - return ++pos; + return ++iterator(this, pos.m_internalIdx); } } // namespace axom From b82cd335d8b259b4adea2e319b955bd316a535ff Mon Sep 17 00:00:00 2001 From: Max Yang Date: Thu, 17 Aug 2023 13:33:23 -0700 Subject: [PATCH 272/639] FlatMap: fixes for probing algorithms --- src/axom/core/FlatMap.hpp | 4 +-- src/axom/core/detail/FlatTable.hpp | 58 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 5f736686ce..59478e0fc2 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -375,9 +375,9 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, keyExistsAlready = true; foundBucketIndex = bucket_index; // Exit out of probing, we can't insert if the key already exists. - return false; + return true; } - return true; + return false; }; IndexType newBucket = diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 33ec561e94..ef4a1762d9 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -19,14 +19,15 @@ namespace flat_map struct QuadraticProbing { /*! - * \brief Returns the next offset to jump given an iteration count. - * - * Suppose we start with some probe point H + i^2, then the next probe - * point is H + (i*1)^2 = H + i^2 + 2*i + 1. - * - * We return the offset from H(i) to H(i+1), which is 2*i+1. - */ - int getNext(int iter) const { return 2 * iter + 1; } + * \brief Returns the next offset to jump given an iteration count. + * + * Each probe point for a given iteration is given by the formula + * H(i) = H_0 + i/2 + i^2/2 mod m. For m = 2^n, the sequence H(i) for + * i in [0, m-1) is a permutation on [0, m-1). + * + * We return the offset from H(i) to H(i+1), which is i+1. + */ + int getNext(int iter) const { return iter + 1; } }; // Boost::unordered_flat_map uses a 128-bit chunk of metadata for each @@ -169,12 +170,12 @@ struct SequentialLookupPolicy int empty_bucket = NO_MATCH; std::uint8_t hash_8 = static_cast(hash); - int iteration = 0; - bool keep_going = true; - while(keep_going) + bool key_already_exists = false; + for(int iteration = 0; iteration < groups.size(); iteration++) { groups[curr_group].visitHashBucket(hash_8, [&](IndexType bucket_index) { - keep_going = on_hash_found(curr_group * GroupBucket::Size + bucket_index); + key_already_exists = + on_hash_found(curr_group * GroupBucket::Size + bucket_index); }); int tentative_empty_bucket = groups[curr_group].getEmptyBucket(); if(tentative_empty_bucket != GroupBucket::InvalidSlot && @@ -184,22 +185,21 @@ struct SequentialLookupPolicy empty_bucket = tentative_empty_bucket; } - if(groups[curr_group].hasSentinel() || + if(key_already_exists || (!groups[curr_group].getMaybeOverflowed(hash_8) && empty_group != NO_MATCH)) { - // We've reached a sentinel group, or the last group that might - // contain the hash. Stop probing. - keep_going = false; + // We've reached the last group that might contain the hash. + // Stop probing. + break; } else if(empty_group == NO_MATCH) { // Set the overflow bit and continue probing. groups[curr_group].setOverflow(hash_8); - curr_group = - (curr_group + ProbePolicy {}.getNext(iteration)) % groups.size(); - iteration++; } + curr_group = + (curr_group + ProbePolicy {}.getNext(iteration)) % groups.size(); } if(empty_group != NO_MATCH) { @@ -230,29 +230,27 @@ struct SequentialLookupPolicy int curr_group = hash / group_divisor; std::uint8_t hash_8 = static_cast(hash); - int iteration = 0; bool keep_going = true; - while(keep_going) + for(int iteration = 0; iteration < groups.size(); iteration++) { groups[curr_group].visitHashBucket(hash_8, [&](IndexType bucket_index) { keep_going = on_hash_found(curr_group * GroupBucket::Size + bucket_index); }); - if(!groups[curr_group].getMaybeOverflowed(hash_8) || - groups[curr_group].hasSentinel()) + if(!groups[curr_group].getMaybeOverflowed(hash_8)) { - // Stop probing if the "overflow" bit is not set or if the sentinel - // is set for a bucket. + // Stop probing if the "overflow" bit is not set. keep_going = false; curr_group = NO_MATCH; } - else + + if(!keep_going) { - // Probe the next bucket. - curr_group = - (curr_group + ProbePolicy {}.getNext(iteration)) % groups.size(); - iteration++; + break; } + // Probe the next bucket. + curr_group = + (curr_group + ProbePolicy {}.getNext(iteration)) % groups.size(); } } From 8c2706d8a8373ae65ede87f1c3f1e98ff48ee542 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Thu, 17 Aug 2023 13:38:30 -0700 Subject: [PATCH 273/639] FlatMap: set sentinel on construction, fix erase() --- src/axom/core/FlatMap.hpp | 1 + src/axom/core/detail/FlatTable.hpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 59478e0fc2..374ade9754 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -283,6 +283,7 @@ FlatMap::FlatMap(IndexType bucket_count) IndexType numGroupsRounded = 1 << m_numGroups2; IndexType numBuckets = numGroupsRounded * BucketsPerGroup - 1; m_metadata.resize(numGroupsRounded); + m_metadata[numGroupsRounded - 1].setSentinel(); m_buckets.resize(numBuckets); } diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index ef4a1762d9..f0279e0d19 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -99,6 +99,8 @@ struct GroupBucket metadata.buckets[index] = reduceHash(hash); } + void clearBucket(int index) { metadata.buckets[index] = Empty; } + void setOverflow(std::uint8_t hash) { std::uint8_t hashOfwBit = 1 << (hash % 8); @@ -267,7 +269,7 @@ struct SequentialLookupPolicy int group_index = bucket / GroupBucket::Size; int slot_index = bucket % GroupBucket::Size; - groups[group_index].setBucket(slot_index, GroupBucket::Empty); + groups[group_index].clearBucket(slot_index); // Return if the overflow bit is set on the bucket. That indicates whether // we are deleting an element in the middle of a probing sequence. From cc356b61d93dabe3313fbfd727323a94141f1b75 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Thu, 17 Aug 2023 13:39:12 -0700 Subject: [PATCH 274/639] FlatMap: add insert_then_delete test --- src/axom/core/tests/core_flatmap.hpp | 43 ++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index fe8342bd12..0dea360e35 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -77,3 +77,46 @@ TEST(core_flatmap, insert_until_rehash) EXPECT_EQ(iterator->second, 2. * i + 1); } } + +TEST(core_flatmap, insert_then_delete) +{ + axom::FlatMap int_to_dbl; + + const int INIT_CAPACITY = int_to_dbl.bucket_count(); + const double LOAD_FACTOR = int_to_dbl.max_load_factor(); + const int NUM_INSERTS = LOAD_FACTOR * INIT_CAPACITY * 4; + + for(int i = 0; i < NUM_INSERTS; i++) + { + int_to_dbl.insert({i, 2. * i + 1}); + } + EXPECT_EQ(int_to_dbl.size(), NUM_INSERTS); + EXPECT_GE(int_to_dbl.bucket_count(), NUM_INSERTS); + + for(int i = 0; i < NUM_INSERTS; i += 3) + { + // Delete every third entry starting from 0, inclusive. + // (i.e. keys 0, 3, 6, ...) + int_to_dbl.erase(i); + } + + // Check consistency of values. + for(int i = 0; i < NUM_INSERTS; i++) + { + auto iterator = int_to_dbl.find(i); + if(i % 3 == 0) + { + EXPECT_EQ(iterator, int_to_dbl.end()); + EXPECT_EQ(0, int_to_dbl.count(i)); + EXPECT_EQ(false, int_to_dbl.contains(i)); + } + else + { + EXPECT_NE(iterator, int_to_dbl.end()); + EXPECT_EQ(iterator->first, i); + EXPECT_EQ(iterator->second, 2. * i + 1); + EXPECT_EQ(1, int_to_dbl.count(i)); + EXPECT_EQ(true, int_to_dbl.contains(i)); + } + } +} From c2772f2ff74cf0e9ce0546eb068cd09242102053 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Thu, 17 Aug 2023 17:10:48 -0700 Subject: [PATCH 275/639] FlatMap: use hash mixing to guard against "close" inputs --- src/axom/core/FlatMap.hpp | 10 ++++++---- src/axom/core/detail/FlatTable.hpp | 31 ++++++++++++++++++++++++++---- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 374ade9754..e0943346d7 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -31,6 +31,8 @@ class FlatMap template friend class IteratorImpl; + using MixedHash = detail::flat_map::HashMixer64; + public: using size_type = IndexType; using value_type = KeyValuePair; @@ -301,7 +303,7 @@ FlatMap::FlatMap(IndexType num_elems, template auto FlatMap::find(const KeyType& key) -> iterator { - auto hash = Hash {}(key); + auto hash = MixedHash {}(key); iterator found_iter = end(); this->probeIndex(m_numGroups2, m_metadata, @@ -322,7 +324,7 @@ template auto FlatMap::find(const KeyType& key) const -> const_iterator { - auto hash = Hash {}(key); + auto hash = MixedHash {}(key); const_iterator found_iter = end(); this->probeIndex(m_numGroups2, m_metadata, @@ -359,7 +361,7 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, { static_assert(std::is_convertible::value, "UKeyType -> KeyType not convertible"); - auto hash = Hash {}(key); + auto hash = MixedHash {}(key); // Resize to double the number of bucket groups if insertion would put us // above the maximum load factor. if(((m_loadCount + 1) / (double)m_buckets.size()) >= MAX_LOAD_FACTOR) @@ -409,7 +411,7 @@ template auto FlatMap::erase(const_iterator pos) -> iterator { assert(pos != end()); - auto hash = Hash {}(pos->first); + auto hash = MixedHash {}(pos->first); bool midSequence = this->clearBucket(m_metadata, pos.m_internalIdx, hash); pos->~KeyValuePair(); diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index f0279e0d19..93529f42e9 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -30,6 +30,27 @@ struct QuadraticProbing int getNext(int iter) const { return iter + 1; } }; +/*! + * \brief A bit mixer used to ensure avalanching of a hash function. + * + * Uses the "mxmxm" function described here: + * https://jonkagstrom.com/bit-mixer-construction/index.html + */ +template +struct HashMixer64 +{ + uint64_t operator()(const KeyType& key) const + { + uint64_t hash = HashFunc {}(key); + hash *= 0xbf58476d1ce4e5b9ULL; + hash ^= hash >> 32; + hash *= 0x94d049bb133111ebULL; + hash ^= hash >> 32; + hash *= 0x94d049bb133111ebULL; + return hash; + } +}; + // Boost::unordered_flat_map uses a 128-bit chunk of metadata for each // group of 15 buckets. // This is split up into an "overflow bit", and 15 bytes representing the @@ -166,8 +187,9 @@ struct SequentialLookupPolicy { // We use the k MSBs of the hash as the initial group probe point, // where ngroups = 2^k. - int group_divisor = 1 << ((CHAR_BIT * sizeof(HashType)) - ngroups_pow_2); - int curr_group = hash / group_divisor; + int bitshift_right = ((CHAR_BIT * sizeof(HashType)) - ngroups_pow_2); + HashType curr_group = hash >> bitshift_right; + curr_group &= ((1 << ngroups_pow_2) - 1); int empty_group = NO_MATCH; int empty_bucket = NO_MATCH; @@ -228,8 +250,9 @@ struct SequentialLookupPolicy { // We use the k MSBs of the hash as the initial group probe point, // where ngroups = 2^k. - int group_divisor = 1 << ((CHAR_BIT * sizeof(HashType)) - ngroups_pow_2); - int curr_group = hash / group_divisor; + int bitshift_right = ((CHAR_BIT * sizeof(HashType)) - ngroups_pow_2); + HashType curr_group = hash >> bitshift_right; + curr_group &= ((1 << ngroups_pow_2) - 1); std::uint8_t hash_8 = static_cast(hash); bool keep_going = true; From 10ecfe6946606dea5fc603fa163c9bc1cc5a3f94 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Thu, 16 Nov 2023 14:03:22 -0800 Subject: [PATCH 276/639] Avoid direct references to m_buckets --- src/axom/core/FlatMap.hpp | 15 ++++++--------- src/axom/core/detail/FlatTable.hpp | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index e0943346d7..07538271dd 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -80,9 +80,9 @@ class FlatMap return const_iterator(this, firstBucketIndex); } - iterator end() { return iterator(this, m_buckets.size()); } - const_iterator end() const { return const_iterator(this, m_buckets.size()); } - const_iterator cend() const { return const_iterator(this, m_buckets.size()); } + iterator end() { return iterator(this, bucket_count()); } + const_iterator end() const { return const_iterator(this, bucket_count()); } + const_iterator cend() const { return const_iterator(this, bucket_count()); } // Capacity bool empty() const { return m_size == 0; } @@ -165,10 +165,7 @@ class FlatMap // Hashing IndexType bucket_count() const { return m_buckets.size(); } - double load_factor() const - { - return ((double)m_loadCount) / m_buckets.size(); - } + double load_factor() const { return ((double)m_loadCount) / bucket_count(); } double max_load_factor() const { return MAX_LOAD_FACTOR; } void rehash(IndexType count) { @@ -225,7 +222,7 @@ class FlatMap::IteratorImpl : m_map(map) , m_internalIdx(internalIdx) { - assert(m_internalIdx >= 0 && m_internalIdx <= m_map->m_buckets.size()); + assert(m_internalIdx >= 0 && m_internalIdx <= m_map->bucket_count()); } template > @@ -364,7 +361,7 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, auto hash = MixedHash {}(key); // Resize to double the number of bucket groups if insertion would put us // above the maximum load factor. - if(((m_loadCount + 1) / (double)m_buckets.size()) >= MAX_LOAD_FACTOR) + if(((m_loadCount + 1) / (double)bucket_count()) >= MAX_LOAD_FACTOR) { IndexType newNumGroups = m_metadata.size() * 2; rehash(newNumGroups * BucketsPerGroup - 1); diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 93529f42e9..2cb5287699 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -42,7 +42,7 @@ struct HashMixer64 uint64_t operator()(const KeyType& key) const { uint64_t hash = HashFunc {}(key); - hash *= 0xbf58476d1ce4e5b9ULL; + hash *= 0xbf58476d1ce4e5b9ULL; hash ^= hash >> 32; hash *= 0x94d049bb133111ebULL; hash ^= hash >> 32; From 3d5345d548f5e5233aed7de9197b355de6ed3955 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Thu, 16 Nov 2023 14:04:32 -0800 Subject: [PATCH 277/639] FlatMap: improve storage of non-trivially-copyable types --- src/axom/core/FlatMap.hpp | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 07538271dd..838e3ccce2 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -188,7 +188,21 @@ class FlatMap IndexType m_numGroups2; // Number of groups of 15 buckets, expressed as a power of 2 IndexType m_size; axom::Array m_metadata; - axom::Array m_buckets; + + // Storage details: + struct alignas(KeyValuePair) PairStorage + { + unsigned char data[sizeof(KeyValuePair)]; + + const KeyValuePair& get() const + { + return *(reinterpret_cast(&data)); + } + + KeyValuePair& get() { return *(reinterpret_cast(&data)); } + }; + + axom::Array m_buckets; // Boost flat_unordered_map uses a fixed load factor. constexpr static double MAX_LOAD_FACTOR = 0.875; @@ -254,9 +268,12 @@ class FlatMap::IteratorImpl return next; } - reference operator*() const { return m_map->m_buckets[m_internalIdx]; } + reference operator*() const { return m_map->m_buckets[m_internalIdx].get(); } - pointer operator->() const { return &(m_map->m_buckets[m_internalIdx]); } + pointer operator->() const + { + return &(m_map->m_buckets[m_internalIdx].get()); + } private: MapConstType* m_map; @@ -306,7 +323,7 @@ auto FlatMap::find(const KeyType& key) -> iterator m_metadata, hash, [&](IndexType bucket_index) -> bool { - if(this->m_buckets[bucket_index].first == key) + if(this->m_buckets[bucket_index].get().first == key) { found_iter = iterator(this, bucket_index); // Stop tracking. @@ -327,7 +344,7 @@ auto FlatMap::find(const KeyType& key) const m_metadata, hash, [&](IndexType bucket_index) -> bool { - if(this->m_buckets[bucket_index].first == key) + if(this->m_buckets[bucket_index].get().first == key) { found_iter = const_iterator(this, bucket_index); // Stop tracking. @@ -370,7 +387,7 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, bool keyExistsAlready = false; IndexType foundBucketIndex = NO_MATCH; auto FindExistingElem = [&, this](IndexType bucket_index) -> bool { - if(this->m_buckets[bucket_index].first == key) + if(this->m_buckets[bucket_index].get().first == key) { keyExistsAlready = true; foundBucketIndex = bucket_index; @@ -393,12 +410,12 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, iterator keyIterator = iterator(this, foundBucketIndex); if(!keyExistsAlready) { - new(&m_buckets[foundBucketIndex]) + new(&m_buckets[foundBucketIndex].data) KeyValuePair(std::move(key), std::forward(args)...); } else if(keyExistsAlready && assign_on_existence) { - m_buckets[foundBucketIndex].second = + m_buckets[foundBucketIndex].get().second = ValueType(std::forward(args)...); } return {keyIterator, !keyExistsAlready}; From 1a98c2b6f7cb399fc8f0a0d8567545d25c320f8a Mon Sep 17 00:00:00 2001 From: Max Yang Date: Thu, 16 Nov 2023 14:23:53 -0800 Subject: [PATCH 278/639] FlatMap: add a test for non-trivially-copyable type --- src/axom/core/tests/core_flatmap.hpp | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index 0dea360e35..d0dd009c23 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -48,6 +48,38 @@ TEST(core_flatmap, insert_only) } } +TEST(core_flatmap_str, insert_only) +{ + axom::FlatMap int_to_dbl; + + int_to_dbl.insert({std::to_string(0), std::to_string(10.0)}); + EXPECT_EQ(1, int_to_dbl.size()); + + int_to_dbl.insert({std::to_string(1), std::to_string(20.0)}); + EXPECT_EQ(2, int_to_dbl.size()); + + int_to_dbl.insert({std::to_string(2), std::to_string(30.0)}); + EXPECT_EQ(3, int_to_dbl.size()); + + // Check consistency of added values. + const double expected_str[3] {10.0, 20.0, 30.0}; + for(int i = 0; i < 3; i++) + { + std::string key = std::to_string(i); + std::string expected_value = std::to_string(expected_str[i]); + auto iterator = int_to_dbl.find(key); + EXPECT_NE(iterator, int_to_dbl.end()); + EXPECT_EQ(iterator->first, key); + EXPECT_EQ(iterator->second, expected_value); + + // Using operator[] with an already-existing key should return the + // existing value and not add a value. + std::string value = int_to_dbl[key]; + EXPECT_EQ(value, expected_value); + EXPECT_EQ(int_to_dbl.size(), 3); + } +} + TEST(core_flatmap, insert_until_rehash) { axom::FlatMap int_to_dbl; From 392f8c9ec3cef22ccb23a1121d4fa8db4e542cd6 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 17 Nov 2023 16:41:43 -0800 Subject: [PATCH 279/639] FlatMap: add a test for initializer list construction --- src/axom/core/tests/core_flatmap.hpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index d0dd009c23..09e853d17e 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -80,6 +80,29 @@ TEST(core_flatmap_str, insert_only) } } +TEST(core_flatmap, initializer_list) +{ + axom::FlatMap int_to_dbl {{0, 10.0}, {1, 20.0}, {2, 30.0}}; + + EXPECT_EQ(3, int_to_dbl.size()); + + // Check consistency of added values. + const double expected_str[3] {10.0, 20.0, 30.0}; + for(int i = 0; i < 3; i++) + { + auto iterator = int_to_dbl.find(i); + EXPECT_NE(iterator, int_to_dbl.end()); + EXPECT_EQ(iterator->first, i); + EXPECT_EQ(iterator->second, expected_str[i]); + + // Using operator[] with an already-existing key should return the + // existing value and not add a value. + double value = int_to_dbl[i]; + EXPECT_EQ(value, expected_str[i]); + EXPECT_EQ(int_to_dbl.size(), 3); + } +} + TEST(core_flatmap, insert_until_rehash) { axom::FlatMap int_to_dbl; From b04db77b643efed964b3de7528f33a048d59b1f6 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 17 Nov 2023 16:42:11 -0800 Subject: [PATCH 280/639] FlatMap: implement clear() --- src/axom/core/FlatMap.hpp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 838e3ccce2..2fb534702b 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -105,7 +105,26 @@ class FlatMap bool contains(const KeyType& key) const { return (find(key) != end()); } // Modifiers - void clear(); + void clear() + { + // Destroy all elements. + IndexType index = this->nextValidIndex(m_metadata, NO_MATCH); + while(index < bucket_count()) + { + m_buckets[index].get().~KeyValuePair(); + index = this->nextValidIndex(m_metadata, index); + } + + // Also reset metadata. + for(int group_index = 0; group_index < m_metadata.size(); group_index++) + { + m_metadata[group_index] = detail::flat_map::GroupBucket {}; + } + m_metadata[m_metadata.size() - 1].setSentinel(); + m_size = 0; + m_loadCount = 0; + } + std::pair insert(const value_type& value) { return emplaceImpl(false, value.first, value.second); From 79d11ad2da7803f54afa0ef6c87ae64415a8c14a Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 17 Nov 2023 16:42:28 -0800 Subject: [PATCH 281/639] FlatMap: add test for clear() --- src/axom/core/tests/core_flatmap.hpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index 09e853d17e..c377038a51 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -103,6 +103,23 @@ TEST(core_flatmap, initializer_list) } } +TEST(core_flatmap, init_and_clear) +{ + axom::FlatMap int_to_dbl {{0, 10.0}, {1, 20.0}, {2, 30.0}}; + + EXPECT_EQ(3, int_to_dbl.size()); + + int_to_dbl.clear(); + + EXPECT_EQ(int_to_dbl.size(), 0); + EXPECT_EQ(int_to_dbl.load_factor(), 0.0); + for(int i = 0; i < 3; i++) + { + auto iterator = int_to_dbl.find(i); + EXPECT_EQ(iterator, int_to_dbl.end()); + } +} + TEST(core_flatmap, insert_until_rehash) { axom::FlatMap int_to_dbl; From f498e8a731b75694ffc5e096b9d9e6a42876c5ff Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 20 Nov 2023 11:43:50 -0800 Subject: [PATCH 282/639] FlatMap: fix default-construction on index operator --- src/axom/core/FlatMap.hpp | 16 +++++++++++++--- src/axom/core/tests/core_flatmap.hpp | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 2fb534702b..e5269f63d0 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -6,6 +6,8 @@ #ifndef Axom_Core_FlatMap_HPP #define Axom_Core_FlatMap_HPP +#include +#include #include "axom/config.hpp" #include "axom/core/Macros.hpp" #include "axom/core/detail/FlatTable.hpp" @@ -98,8 +100,14 @@ class FlatMap return this->find(key)->second; } - ValueType& operator[](const KeyType& key) { return at(key); } - const ValueType& operator[](const KeyType& key) const { return at(key); } + ValueType& operator[](const KeyType& key) + { + return this->try_emplace(key).first->second; + } + const ValueType& operator[](const KeyType& key) const + { + return this->try_emplace(key).first->second; + } IndexType count(const KeyType& key) const { return (find(key) != end()); } bool contains(const KeyType& key) const { return (find(key) != end()); } @@ -430,7 +438,9 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, if(!keyExistsAlready) { new(&m_buckets[foundBucketIndex].data) - KeyValuePair(std::move(key), std::forward(args)...); + KeyValuePair(std::piecewise_construct, + std::forward_as_tuple(key), + std::forward_as_tuple(args...)); } else if(keyExistsAlready && assign_on_existence) { diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index c377038a51..6217f92302 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -103,6 +103,28 @@ TEST(core_flatmap, initializer_list) } } +TEST(core_flatmap, index_operator_default) +{ + axom::FlatMap int_to_dbl; + + int NUM_ELEMS = 10; + + for(int i = 0; i < NUM_ELEMS; i++) + { + double default_value = int_to_dbl[i]; + EXPECT_EQ(default_value, 0); + int_to_dbl[i] = i + 10.0; + } + + EXPECT_EQ(NUM_ELEMS, int_to_dbl.size()); + + for(int i = 0; i < NUM_ELEMS; i++) + { + auto iterator = int_to_dbl.find(i); + EXPECT_EQ(iterator->second, i + 10.0); + } +} + TEST(core_flatmap, init_and_clear) { axom::FlatMap int_to_dbl {{0, 10.0}, {1, 20.0}, {2, 30.0}}; From 107dc01e92ca44df008da4d48882fe4251eb3191 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 20 Nov 2023 11:44:20 -0800 Subject: [PATCH 283/639] FlatMap: trigger a bucket resize in init_and_clear test --- src/axom/core/tests/core_flatmap.hpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index 6217f92302..f78615fe80 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -127,14 +127,27 @@ TEST(core_flatmap, index_operator_default) TEST(core_flatmap, init_and_clear) { - axom::FlatMap int_to_dbl {{0, 10.0}, {1, 20.0}, {2, 30.0}}; + axom::FlatMap int_to_dbl; - EXPECT_EQ(3, int_to_dbl.size()); + // Insert enough elements to trigger a resize of the buckets. + // This allows us to test that a clear() doesn't reset the allocated buckets. + int NUM_ELEMS_RESIZE = 40; + EXPECT_GT(NUM_ELEMS_RESIZE, int_to_dbl.bucket_count()); + + for(int i = 0; i < NUM_ELEMS_RESIZE; i++) + { + int_to_dbl[i] = i + 10.0; + } + + EXPECT_EQ(NUM_ELEMS_RESIZE, int_to_dbl.size()); + + int buckets_before_clear = int_to_dbl.bucket_count(); int_to_dbl.clear(); EXPECT_EQ(int_to_dbl.size(), 0); EXPECT_EQ(int_to_dbl.load_factor(), 0.0); + EXPECT_EQ(int_to_dbl.bucket_count(), buckets_before_clear); for(int i = 0; i < 3; i++) { auto iterator = int_to_dbl.find(i); From 71d448d3aba88849602beef33767c8916ec3919a Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 20 Nov 2023 14:04:13 -0800 Subject: [PATCH 284/639] FlatMap: add move+copy constructors, destructor --- src/axom/core/FlatMap.hpp | 40 +++++++++++++++++++++++ src/axom/core/tests/core_flatmap.hpp | 49 ++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index e5269f63d0..081d287d35 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -56,6 +56,46 @@ class FlatMap : FlatMap(init.begin(), init.end(), bucket_count) { } + FlatMap(FlatMap&& other) : FlatMap() { swap(other); } + FlatMap& operator=(FlatMap&& other) { swap(other); } + + FlatMap(const FlatMap& other) + : m_numGroups2(other.m_numGroups2) + , m_size(other.m_size) + , m_metadata(other.m_metadata) + , m_buckets(other.m_buckets.size()) + , m_loadCount(other.m_loadCount) + { + // Copy all elements. + IndexType index = this->nextValidIndex(m_metadata, NO_MATCH); + while(index < bucket_count()) + { + new(&m_buckets[index].data) KeyValuePair(other.m_buckets[index].get()); + index = this->nextValidIndex(m_metadata, index); + } + } + FlatMap& operator=(const FlatMap& other) + { + if(*this != other) + { + FlatMap new_map(other); + swap(new_map); + } + } + + ~FlatMap() + { + // Destroy all elements. + IndexType index = this->nextValidIndex(m_metadata, NO_MATCH); + while(index < bucket_count()) + { + m_buckets[index].get().~KeyValuePair(); + index = this->nextValidIndex(m_metadata, index); + } + + // Unlike in clear() we don't need to reset metadata here. + } + void swap(FlatMap& other) { axom::utilities::swap(m_numGroups2, other.m_numGroups2); diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index f78615fe80..49094f4baa 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -155,6 +155,55 @@ TEST(core_flatmap, init_and_clear) } } +TEST(core_flatmap, init_and_move) +{ + axom::FlatMap int_to_dbl; + int NUM_ELEMS = 40; + + for(int i = 0; i < NUM_ELEMS; i++) + { + int_to_dbl[i] = i + 10.0; + } + + axom::FlatMap moved_to_map = std::move(int_to_dbl); + + EXPECT_EQ(int_to_dbl.size(), 0); + EXPECT_EQ(int_to_dbl.load_factor(), 0); + EXPECT_EQ(moved_to_map.size(), NUM_ELEMS); + for(int i = 0; i < NUM_ELEMS; i++) + { + EXPECT_EQ(moved_to_map[i], i + 10.0); + + auto old_it = int_to_dbl.find(i); + EXPECT_EQ(old_it, int_to_dbl.end()); + } +} + +TEST(core_flatmap, init_and_copy) +{ + axom::FlatMap int_to_dbl; + int NUM_ELEMS = 40; + + for(int i = 0; i < NUM_ELEMS; i++) + { + int_to_dbl[i] = i + 10.0; + } + + int expected_buckets = int_to_dbl.bucket_count(); + + axom::FlatMap int_to_dbl_copy = int_to_dbl; + + EXPECT_EQ(int_to_dbl.size(), NUM_ELEMS); + EXPECT_EQ(int_to_dbl.bucket_count(), expected_buckets); + EXPECT_EQ(int_to_dbl_copy.size(), NUM_ELEMS); + EXPECT_EQ(int_to_dbl_copy.bucket_count(), expected_buckets); + for(int i = 0; i < NUM_ELEMS; i++) + { + EXPECT_EQ(int_to_dbl[i], i + 10.0); + EXPECT_EQ(int_to_dbl_copy[i], i + 10.0); + } +} + TEST(core_flatmap, insert_until_rehash) { axom::FlatMap int_to_dbl; From 669f558a3e02ed4df00a2dd91ee8545129545e6f Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 20 Nov 2023 15:30:44 -0800 Subject: [PATCH 285/639] FlatMap: add support for move-only types as value --- src/axom/core/FlatMap.hpp | 90 ++++++++++++++++++++-------- src/axom/core/tests/core_flatmap.hpp | 25 ++++++++ 2 files changed, 90 insertions(+), 25 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 081d287d35..7bb4f09198 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -175,11 +175,15 @@ class FlatMap std::pair insert(const value_type& value) { - return emplaceImpl(false, value.first, value.second); + auto emplace_pos = getEmplacePos(value.first); + emplaceImpl(emplace_pos, false, value); + return emplace_pos; } std::pair insert(value_type&& value) { - return emplaceImpl(false, std::move(value.first), std::move(value.second)); + auto emplace_pos = getEmplacePos(value.first); + emplaceImpl(emplace_pos, false, std::move(value)); + return emplace_pos; } template std::pair insert(InputPair&& pair) @@ -189,7 +193,10 @@ class FlatMap template std::pair emplace(InputArgs&&... pair) { - return emplaceImpl(false, std::forward(pair)...); + KeyValuePair kv {std::forward(pair)...}; + auto emplace_pos = getEmplacePos(kv.first); + emplaceImpl(emplace_pos, false, std::move(kv)); + return emplace_pos; } template @@ -198,23 +205,47 @@ class FlatMap template std::pair insert_or_assign(const KeyType& key, Args&&... args) { - return emplaceImpl(true, KeyType {key}, std::forward(args)...); + auto emplace_pos = getEmplacePos(key); + emplaceImpl(emplace_pos, + true, + std::piecewise_construct, + std::forward_as_tuple(key), + std::forward_as_tuple(std::forward(args)...)); + return emplace_pos; } template std::pair insert_or_assign(KeyType&& key, Args&&... args) { - return emplaceImpl(true, std::move(key), std::forward(args)...); + auto emplace_pos = getEmplacePos(key); + emplaceImpl(emplace_pos, + true, + std::piecewise_construct, + std::forward_as_tuple(key), + std::forward_as_tuple(std::forward(args)...)); + return emplace_pos; } template std::pair try_emplace(const KeyType& key, Args&&... args) { - return emplaceImpl(false, KeyType {key}, std::forward(args)...); + auto emplace_pos = getEmplacePos(key); + emplaceImpl(emplace_pos, + false, + std::piecewise_construct, + std::forward_as_tuple(key), + std::forward_as_tuple(std::forward(args)...)); + return emplace_pos; } template std::pair try_emplace(KeyType&& key, Args&&... args) { - return emplaceImpl(false, std::move(key), std::forward(args)...); + auto emplace_pos = getEmplacePos(key); + emplaceImpl(emplace_pos, + false, + std::piecewise_construct, + std::forward_as_tuple(key), + std::forward_as_tuple(std::forward(args)...)); + return emplace_pos; } iterator erase(iterator pos) { erase(const_iterator {pos}); } @@ -236,7 +267,10 @@ class FlatMap double max_load_factor() const { return MAX_LOAD_FACTOR; } void rehash(IndexType count) { - FlatMap rehashed(m_size, cbegin(), cend(), count); + FlatMap rehashed(m_size, + std::make_move_iterator(begin()), + std::make_move_iterator(end()), + count); this->swap(rehashed); } void reserve(IndexType count) { rehash(std::ceil(count / MAX_LOAD_FACTOR)); } @@ -245,10 +279,12 @@ class FlatMap template FlatMap(IndexType num_elems, InputIt first, InputIt last, IndexType bucket_count); - template - std::pair emplaceImpl(bool assign_on_existence, - UKeyType&& key, - Args&&... args); + std::pair getEmplacePos(const KeyType& key); + + template + void emplaceImpl(const std::pair& pos, + bool assign_on_existence, + Args&&... args); constexpr static IndexType MIN_NUM_BUCKETS {29}; @@ -434,14 +470,9 @@ void FlatMap::insert(InputIt first, InputIt last) } template -template -auto FlatMap::emplaceImpl(bool assign_on_existence, - UKeyType&& key, - InputArgs&&... args) +auto FlatMap::getEmplacePos(const KeyType& key) -> std::pair { - static_assert(std::is_convertible::value, - "UKeyType -> KeyType not convertible"); auto hash = MixedHash {}(key); // Resize to double the number of bucket groups if insertion would put us // above the maximum load factor. @@ -475,19 +506,28 @@ auto FlatMap::emplaceImpl(bool assign_on_existence, m_loadCount++; } iterator keyIterator = iterator(this, foundBucketIndex); + return {keyIterator, !keyExistsAlready}; +} + +template +template +void FlatMap::emplaceImpl( + const std::pair& pos, + bool assign_on_existence, + Args&&... args) +{ + IndexType bucketIndex = pos.first.m_internalIdx; + bool keyExistsAlready = !pos.second; + if(!keyExistsAlready) { - new(&m_buckets[foundBucketIndex].data) - KeyValuePair(std::piecewise_construct, - std::forward_as_tuple(key), - std::forward_as_tuple(args...)); + new(&m_buckets[bucketIndex].data) KeyValuePair(std::forward(args)...); } else if(keyExistsAlready && assign_on_existence) { - m_buckets[foundBucketIndex].get().second = - ValueType(std::forward(args)...); + KeyValuePair kv(std::forward(args)...); + m_buckets[bucketIndex].get().second = std::move(kv.second); } - return {keyIterator, !keyExistsAlready}; } template diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index 49094f4baa..881edfd8ee 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -179,6 +179,31 @@ TEST(core_flatmap, init_and_move) } } +TEST(core_flatmap, init_and_move_moveonly) +{ + axom::FlatMap> int_to_dbl; + int NUM_ELEMS = 40; + + for(int i = 0; i < NUM_ELEMS; i++) + { + int_to_dbl.emplace(i, new double {i + 10.0}); + } + + axom::FlatMap> int_to_dbl_move = + std::move(int_to_dbl); + + EXPECT_EQ(int_to_dbl.size(), 0); + EXPECT_EQ(int_to_dbl.load_factor(), 0); + EXPECT_EQ(int_to_dbl_move.size(), NUM_ELEMS); + for(int i = 0; i < NUM_ELEMS; i++) + { + EXPECT_EQ(*(int_to_dbl_move[i]), i + 10.0); + + auto old_it = int_to_dbl.find(i); + EXPECT_EQ(old_it, int_to_dbl.end()); + } +} + TEST(core_flatmap, init_and_copy) { axom::FlatMap int_to_dbl; From 87c0f509b29c38fc34eaab145f0c36cf4bd4cc37 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 20 Nov 2023 16:21:25 -0800 Subject: [PATCH 286/639] FlatMap: add documentation for constructors, destructor --- src/axom/core/FlatMap.hpp | 45 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 7bb4f09198..11ed1fc121 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -41,24 +41,60 @@ class FlatMap using iterator = IteratorImpl; using const_iterator = IteratorImpl; - // Constructors + /*! + * \brief Constructs a FlatMap with no elements. + */ FlatMap() : FlatMap(MIN_NUM_BUCKETS) { } + /*! + * \brief Constructs a FlatMap with at least a given number of buckets. + * + * \param [in] bucket_count the minimum number of buckets to allocate + */ explicit FlatMap(IndexType bucket_count); + /*! + * \brief Constructs a FlatMap with a range of elements. + * + * \param [in] first iterator pointing to the beginning of the range + * \param [in] last iterator pointing to the end of the range + * \param [in] bucket_count minimum number of buckets to allocate (optional) + */ template FlatMap(InputIt first, InputIt last, IndexType bucket_count = -1) : FlatMap(std::distance(first, last), first, last, bucket_count) { } + /*! + * \brief Constructs a FlatMap with a range of elements. + * + * \param [in] init a list of pairs to initialize the map with + * \param [in] bucket_count minimum number of buckets to allocate (optional) + */ explicit FlatMap(std::initializer_list init, IndexType bucket_count = -1) : FlatMap(init.begin(), init.end(), bucket_count) { } + /*! + * \brief Move constructor for a FlatMap instance. + * + * \param other the FlatMap to move data from + */ FlatMap(FlatMap&& other) : FlatMap() { swap(other); } + + /*! + * \brief Move assignment operator for a FlatMap instance. + * + * \param other the FlatMap to move data from + */ FlatMap& operator=(FlatMap&& other) { swap(other); } + /*! + * \brief Copy constructor for a FlatMap instance. + * + * \param other the FlatMap to copy data from + */ FlatMap(const FlatMap& other) : m_numGroups2(other.m_numGroups2) , m_size(other.m_size) @@ -74,6 +110,12 @@ class FlatMap index = this->nextValidIndex(m_metadata, index); } } + + /*! + * \brief Copy assignment operator for a FlatMap instance. + * + * \param other the FlatMap to copy data from + */ FlatMap& operator=(const FlatMap& other) { if(*this != other) @@ -83,6 +125,7 @@ class FlatMap } } + /// \brief Destructor for a FlatMap instance. ~FlatMap() { // Destroy all elements. From 75499a7264be9c1562ce39043b231aaad8fe267f Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 20 Nov 2023 16:49:42 -0800 Subject: [PATCH 287/639] FlatMap: throw exception in FlatMap::at() --- src/axom/core/FlatMap.hpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 11ed1fc121..c28384bafa 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -177,10 +177,23 @@ class FlatMap iterator find(const KeyType& key); const_iterator find(const KeyType& key) const; - ValueType& at(const KeyType& key) { return this->find(key)->second; } + ValueType& at(const KeyType& key) + { + auto it = this->find(key); + if(it == end()) + { + throw std::out_of_range {"axom::FlatMap::find(): key not found"}; + } + return it->second; + } const ValueType& at(const KeyType& key) const { - return this->find(key)->second; + auto it = this->find(key); + if(it == end()) + { + throw std::out_of_range {"axom::FlatMap::find(): key not found"}; + } + return it->second; } ValueType& operator[](const KeyType& key) From e798bacff9c10aa9790a5a81b6b9f38713a70d58 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 20 Nov 2023 18:25:15 -0800 Subject: [PATCH 288/639] FlatMap: add more documentation --- src/axom/core/FlatMap.hpp | 114 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 110 insertions(+), 4 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index c28384bafa..e565797973 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -139,6 +139,9 @@ class FlatMap // Unlike in clear() we don't need to reset metadata here. } + /*! + * \brief Swaps the contents of one FlatMap with another. + */ void swap(FlatMap& other) { axom::utilities::swap(m_numGroups2, other.m_numGroups2); @@ -148,7 +151,10 @@ class FlatMap axom::utilities::swap(m_loadCount, other.m_loadCount); } - // Iterators + /*! + * \brief Returns an iterator to the first valid object in the bucket array. + */ + /// @{ iterator begin() { IndexType firstBucketIndex = this->nextValidIndex(m_metadata, NO_MATCH); @@ -164,19 +170,51 @@ class FlatMap IndexType firstBucketIndex = this->nextValidIndex(m_metadata, NO_MATCH); return const_iterator(this, firstBucketIndex); } + /// @} + /*! + * \brief Returns an iterator to "one past" the last valid object in the + * bucket array. + */ + /// @{ iterator end() { return iterator(this, bucket_count()); } const_iterator end() const { return const_iterator(this, bucket_count()); } const_iterator cend() const { return const_iterator(this, bucket_count()); } + /// @} - // Capacity + /*! + * \brief Returns true if there are no entries in the FlatMap, false + * otherwise. + */ bool empty() const { return m_size == 0; } + + /*! + * \brief Returns the number of entries stored in the FlatMap. + */ IndexType size() const { return m_size; } - // Lookup + /*! + * \brief Try to find an entry with a given key. + * + * \param [in] key the key to search for + * + * \return An iterator pointing to the corresponding key-value pair, or end() + * if the key wasn't found. + */ + /// @{ iterator find(const KeyType& key); const_iterator find(const KeyType& key) const; + /// @} + /*! + * \brief Try to find an entry with a given key. + * + * \param [in] key the key to search for + * + * \return A reference to the corresponding value. + * \throw std::out_of_range if the key is not found. + */ + /// @{ ValueType& at(const KeyType& key) { auto it = this->find(key); @@ -195,7 +233,19 @@ class FlatMap } return it->second; } + /// @} + /*! + * \brief Find an entry with a given key. + * + * If a corresponding value does not exist, a default value for the value + * type will be inserted for the given key. + * + * \param [in] key the key to search for + * + * \return A reference to the corresponding value. + */ + /// @{ ValueType& operator[](const KeyType& key) { return this->try_emplace(key).first->second; @@ -204,11 +254,27 @@ class FlatMap { return this->try_emplace(key).first->second; } + /// @} + /*! + * \brief Return the number of entries matching a given key. + * + * This method will always return 0 or 1. + * + * \param [in] key the key to search for + */ IndexType count(const KeyType& key) const { return (find(key) != end()); } + + /*! + * \brief Return true if the FlatMap contains a key, false otherwise. + * + * \param [in] key the key to search for + */ bool contains(const KeyType& key) const { return (find(key) != end()); } - // Modifiers + /*! + * \brief Erases all elements from the FlatMap. + */ void clear() { // Destroy all elements. @@ -229,6 +295,20 @@ class FlatMap m_loadCount = 0; } + /*! + * \brief Inserts a key-value pair into the FlatMap. + * + * If the key already exists in the FlatMap, insertion is skipped. + * Otherwise, the key-value mapping is inserted into the FlatMap. + * + * \param [in] value the key-value pair to insert + * + * \return A pair consisting of: + * - an iterator pointing to either the existing key-value pair, or the + * newly-inserted pair + * - true if a new pair was inserted, false otherwise + */ + /// @{ std::pair insert(const value_type& value) { auto emplace_pos = getEmplacePos(value.first); @@ -254,10 +334,35 @@ class FlatMap emplaceImpl(emplace_pos, false, std::move(kv)); return emplace_pos; } + /// @} + /*! + * \brief Inserts a range of key-value pairs into the FlatMap. + * + * If the key already exists in the FlatMap, insertion is skipped. + * Otherwise, the key-value mapping is inserted into the FlatMap. + * + * \param [in] first the beginning of the range of pairs + * \param [in] last the end of the range of pairs + */ template void insert(InputIt first, InputIt last); + /*! + * \brief Inserts a key-value pair into the FlatMap. + * + * If the key already exists, assigns the value to the existing key in the + * FlatMap. + * + * \param [in] key the key to insert or assign + * \param [in] args arguments to construct the value with + * + * \return A pair consisting of: + * - an iterator pointing to either the existing key-value pair, or the + * newly-inserted pair + * - true if a new pair was inserted, false otherwise + */ + /// {@ template std::pair insert_or_assign(const KeyType& key, Args&&... args) { @@ -280,6 +385,7 @@ class FlatMap std::forward_as_tuple(std::forward(args)...)); return emplace_pos; } + /// @} template std::pair try_emplace(const KeyType& key, Args&&... args) From 855e224b3e5e067931258960471d997f85e23ca3 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 20 Nov 2023 18:30:02 -0800 Subject: [PATCH 289/639] FlatMap: use axom::utilities::max instead of std::max --- src/axom/core/FlatMap.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index e565797973..e05b2f8971 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -551,7 +551,7 @@ FlatMap::FlatMap(IndexType bucket_count) , m_loadCount(0) { int minBuckets = MIN_NUM_BUCKETS; - bucket_count = std::max(minBuckets, bucket_count); + bucket_count = axom::utilities::max(minBuckets, bucket_count); // Get the smallest power-of-two number of groups satisfying: // N * GroupSize - 1 >= minBuckets // TODO: we should add a leadingZeros overload for 64-bit integers From 6d87486adc62c317d675b5d7cb5bf0d3c760a46b Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 21 Nov 2023 12:29:22 -0800 Subject: [PATCH 290/639] FlatMap: test output of insert() method --- src/axom/core/tests/core_flatmap.hpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index 881edfd8ee..f055854c02 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -31,6 +31,13 @@ TEST(core_flatmap, insert_only) int_to_dbl.insert({2, 30.0}); EXPECT_EQ(3, int_to_dbl.size()); + // Inserting a duplicate key should not change the value. + auto duplicate_key = int_to_dbl.insert({2, 40.0}); + EXPECT_EQ(3, int_to_dbl.size()); + EXPECT_FALSE(duplicate_key.second); + EXPECT_EQ(duplicate_key.first, int_to_dbl.find(2)); + EXPECT_EQ(duplicate_key.first->second, 30.0); + // Check consistency of added values. const double expected_str[3] {10.0, 20.0, 30.0}; for(int i = 0; i < 3; i++) From 4662c10359badef4a33187d167d83831ac24b623 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 21 Nov 2023 12:40:31 -0800 Subject: [PATCH 291/639] FlatMap: add test for insert_or_assign --- src/axom/core/tests/core_flatmap.hpp | 47 ++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index f055854c02..4daf083c78 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -87,6 +87,53 @@ TEST(core_flatmap_str, insert_only) } } +TEST(core_flatmap, insert_or_assign) +{ + axom::FlatMap int_to_dbl; + + // Test insert behavior of FlatMap::insert_or_assign. + { + auto res_0 = int_to_dbl.insert_or_assign(0, 10.0); + EXPECT_EQ(1, int_to_dbl.size()); + EXPECT_EQ(10.0, int_to_dbl.at(0)); + EXPECT_EQ(res_0.first, int_to_dbl.find(0)); + EXPECT_TRUE(res_0.second); + + auto res_1 = int_to_dbl.insert_or_assign(1, 20.0); + EXPECT_EQ(2, int_to_dbl.size()); + EXPECT_EQ(20.0, int_to_dbl.at(1)); + EXPECT_EQ(res_1.first, int_to_dbl.find(1)); + EXPECT_TRUE(res_1.second); + + auto res_2 = int_to_dbl.insert_or_assign(2, 30.0); + EXPECT_EQ(3, int_to_dbl.size()); + EXPECT_EQ(30.0, int_to_dbl.at(2)); + EXPECT_EQ(res_2.first, int_to_dbl.find(2)); + EXPECT_TRUE(res_2.second); + } + + // Test assign behavior of FlatMap::insert_or_assign. + { + auto res_0 = int_to_dbl.insert_or_assign(0, 20.0); + EXPECT_EQ(20.0, int_to_dbl.at(0)); + EXPECT_EQ(res_0.first, int_to_dbl.find(0)); + EXPECT_FALSE(res_0.second); + + auto res_1 = int_to_dbl.insert_or_assign(1, 40.0); + EXPECT_EQ(40.0, int_to_dbl.at(1)); + EXPECT_EQ(res_1.first, int_to_dbl.find(1)); + EXPECT_FALSE(res_1.second); + + auto res_2 = int_to_dbl.insert_or_assign(2, 60.0); + EXPECT_EQ(60.0, int_to_dbl.at(2)); + EXPECT_EQ(res_2.first, int_to_dbl.find(2)); + EXPECT_FALSE(res_2.second); + + // Assignments should not change size of FlatMap. + EXPECT_EQ(3, int_to_dbl.size()); + } +} + TEST(core_flatmap, initializer_list) { axom::FlatMap int_to_dbl {{0, 10.0}, {1, 20.0}, {2, 30.0}}; From 428f528ea3de93163d4075f52e5f986f5ec8e862 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 21 Nov 2023 14:28:29 -0800 Subject: [PATCH 292/639] FlatMap: more robust testing of insert() --- src/axom/core/tests/core_flatmap.hpp | 47 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index 4daf083c78..73f02b3031 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -22,36 +22,35 @@ TEST(core_flatmap, insert_only) { axom::FlatMap int_to_dbl; - int_to_dbl.insert({0, 10.0}); - EXPECT_EQ(1, int_to_dbl.size()); - - int_to_dbl.insert({1, 20.0}); - EXPECT_EQ(2, int_to_dbl.size()); - - int_to_dbl.insert({2, 30.0}); - EXPECT_EQ(3, int_to_dbl.size()); + const int NUM_ELEMS = 100; - // Inserting a duplicate key should not change the value. - auto duplicate_key = int_to_dbl.insert({2, 40.0}); - EXPECT_EQ(3, int_to_dbl.size()); - EXPECT_FALSE(duplicate_key.second); - EXPECT_EQ(duplicate_key.first, int_to_dbl.find(2)); - EXPECT_EQ(duplicate_key.first->second, 30.0); - - // Check consistency of added values. - const double expected_str[3] {10.0, 20.0, 30.0}; - for(int i = 0; i < 3; i++) + for(int i = 0; i < NUM_ELEMS; i++) { - auto iterator = int_to_dbl.find(i); - EXPECT_NE(iterator, int_to_dbl.end()); - EXPECT_EQ(iterator->first, i); - EXPECT_EQ(iterator->second, expected_str[i]); + // Initial insertion of a given key should succeed. + auto initial_insert = int_to_dbl.insert({i, i * 10.0 + 5.0}); + EXPECT_EQ(int_to_dbl.size(), i + 1); + EXPECT_EQ(initial_insert.first, int_to_dbl.find(i)); + EXPECT_EQ(i * 10.0 + 5.0, int_to_dbl.at(i)); + EXPECT_TRUE(initial_insert.second); + + int current_bucket_capacity = int_to_dbl.bucket_count(); + + // Inserting a duplicate key should not change the value. + auto duplicate_insert = int_to_dbl.insert({i, i * 10.0 + 7.0}); + EXPECT_EQ(int_to_dbl.size(), i + 1); + EXPECT_EQ(duplicate_insert.first, int_to_dbl.find(i)); + EXPECT_EQ(i * 10.0 + 5.0, int_to_dbl.at(i)); + EXPECT_FALSE(duplicate_insert.second); // Using operator[] with an already-existing key should return the // existing value and not add a value. double value = int_to_dbl[i]; - EXPECT_EQ(value, expected_str[i]); - EXPECT_EQ(int_to_dbl.size(), 3); + EXPECT_EQ(i * 10.0 + 5.0, value); + EXPECT_EQ(int_to_dbl.size(), i + 1); + + // Check that a rehash didn't occur on the second insertion. + EXPECT_EQ(duplicate_insert.first, initial_insert.first); + EXPECT_EQ(current_bucket_capacity, int_to_dbl.bucket_count()); } } From dc875bfe35408a596d5ddec53354070d69aac7dc Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 21 Nov 2023 14:20:10 -0800 Subject: [PATCH 293/639] FlatMap: don't rehash on no-op insertions/emplaces --- src/axom/core/FlatMap.hpp | 41 +++++++++++++----------------- src/axom/core/detail/FlatTable.hpp | 12 ++------- 2 files changed, 19 insertions(+), 34 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index e05b2f8971..b37045e97e 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -636,6 +636,13 @@ auto FlatMap::getEmplacePos(const KeyType& key) -> std::pair { auto hash = MixedHash {}(key); + + // If the key already exists, return the existing iterator. + iterator existing_elem = this->find(key); + if(existing_elem != this->end()) + { + return {existing_elem, false}; + } // Resize to double the number of bucket groups if insertion would put us // above the maximum load factor. if(((m_loadCount + 1) / (double)bucket_count()) >= MAX_LOAD_FACTOR) @@ -644,31 +651,17 @@ auto FlatMap::getEmplacePos(const KeyType& key) rehash(newNumGroups * BucketsPerGroup - 1); } - bool keyExistsAlready = false; - IndexType foundBucketIndex = NO_MATCH; - auto FindExistingElem = [&, this](IndexType bucket_index) -> bool { - if(this->m_buckets[bucket_index].get().first == key) - { - keyExistsAlready = true; - foundBucketIndex = bucket_index; - // Exit out of probing, we can't insert if the key already exists. - return true; - } - return false; - }; + // Get an empty index to place the element into. + IndexType newBucket = this->probeEmptyIndex(m_numGroups2, m_metadata, hash); - IndexType newBucket = - this->probeEmptyIndex(m_numGroups2, m_metadata, hash, FindExistingElem); - if(!keyExistsAlready) - { - foundBucketIndex = newBucket; - // Add a hash to the corresponding bucket slot. - this->setBucketHash(m_metadata, newBucket, hash); - m_size++; - m_loadCount++; - } - iterator keyIterator = iterator(this, foundBucketIndex); - return {keyIterator, !keyExistsAlready}; + // Add a hash to the corresponding bucket slot. + this->setBucketHash(m_metadata, newBucket, hash); + m_size++; + m_loadCount++; + + // Return an iterator pointing to the just-found empty bucket. + iterator keyIterator = iterator(this, newBucket); + return {keyIterator, true}; } template diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 2cb5287699..6692e8dbd5 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -179,11 +179,9 @@ struct SequentialLookupPolicy * \param [in] groups the array of metadata for the groups in the hash map * \param [in] hash the hash to insert */ - template IndexType probeEmptyIndex(int ngroups_pow_2, ArrayView groups, - HashType hash, - FoundIndex&& on_hash_found) const + HashType hash) const { // We use the k MSBs of the hash as the initial group probe point, // where ngroups = 2^k. @@ -194,13 +192,8 @@ struct SequentialLookupPolicy int empty_bucket = NO_MATCH; std::uint8_t hash_8 = static_cast(hash); - bool key_already_exists = false; for(int iteration = 0; iteration < groups.size(); iteration++) { - groups[curr_group].visitHashBucket(hash_8, [&](IndexType bucket_index) { - key_already_exists = - on_hash_found(curr_group * GroupBucket::Size + bucket_index); - }); int tentative_empty_bucket = groups[curr_group].getEmptyBucket(); if(tentative_empty_bucket != GroupBucket::InvalidSlot && empty_group == NO_MATCH) @@ -209,8 +202,7 @@ struct SequentialLookupPolicy empty_bucket = tentative_empty_bucket; } - if(key_already_exists || - (!groups[curr_group].getMaybeOverflowed(hash_8) && + if((!groups[curr_group].getMaybeOverflowed(hash_8) && empty_group != NO_MATCH)) { // We've reached the last group that might contain the hash. From 984ea11c7bd391e984b186f9738adfeb27d6f78c Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 21 Nov 2023 14:33:39 -0800 Subject: [PATCH 294/639] FlatMap: test try_emplace() --- src/axom/core/tests/core_flatmap.hpp | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index 73f02b3031..ab9afb29f4 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -133,6 +133,38 @@ TEST(core_flatmap, insert_or_assign) } } +TEST(core_flatmap_moveonly, try_emplace) +{ + axom::FlatMap> int_to_dbl; + + const int NUM_ELEMS = 40; + + // Test behavior when key does not exist. + for(int i = 0; i < NUM_ELEMS; i++) + { + std::unique_ptr value {new double {i + 10.0}}; + auto result = int_to_dbl.try_emplace(i, std::move(value)); + EXPECT_EQ(*(int_to_dbl[i]), i + 10.0); + EXPECT_EQ(result.first, int_to_dbl.find(i)); + EXPECT_TRUE(result.second); + // Value should have been moved. + EXPECT_EQ(value.get(), nullptr); + } + + // Test behavior when key already exists. + for(int i = 0; i < NUM_ELEMS; i++) + { + std::unique_ptr value {new double {i + 20.0}}; + auto result = int_to_dbl.try_emplace(i, std::move(value)); + EXPECT_EQ(*(int_to_dbl[i]), i + 10.0); + EXPECT_EQ(result.first, int_to_dbl.find(i)); + EXPECT_FALSE(result.second); + // Since key already exists, value should NOT be moved. + EXPECT_NE(value.get(), nullptr); + EXPECT_EQ(*value, i + 20.0); + } +} + TEST(core_flatmap, initializer_list) { axom::FlatMap int_to_dbl {{0, 10.0}, {1, 20.0}, {2, 30.0}}; From 8b8524bea2d22d9ba1f7de30841f7b2439a9b98a Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 21 Nov 2023 14:47:09 -0800 Subject: [PATCH 295/639] FlatMap: document try_emplace() --- src/axom/core/FlatMap.hpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index b37045e97e..b2216510d3 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -387,6 +387,24 @@ class FlatMap } /// @} + /*! + * \brief Inserts a key-value pair into the FlatMap. + * + * If the key already exists in the FlatMap, insertion is skipped. + * Otherwise, the key-value mapping is inserted into the FlatMap. + * + * Compared to emplace(), this method only moves-from the value arguments + * if the key does not exist; otherwise, the input arguments are left as-is. + * + * \param [in] key the key to insert or assign + * \param [in] args arguments to construct the value with. + * + * \return A pair consisting of: + * - an iterator pointing to either the existing key-value pair, or the + * newly-inserted pair + * - true if a new pair was inserted, false otherwise + */ + /// {@ template std::pair try_emplace(const KeyType& key, Args&&... args) { @@ -409,6 +427,7 @@ class FlatMap std::forward_as_tuple(std::forward(args)...)); return emplace_pos; } + /// @} iterator erase(iterator pos) { erase(const_iterator {pos}); } iterator erase(const_iterator pos); From 0235ea4af10370bc008b010b107481d8f6c26510 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 21 Nov 2023 15:03:13 -0800 Subject: [PATCH 296/639] FlatMap: more robust testing for erase() --- src/axom/core/FlatMap.hpp | 2 +- src/axom/core/tests/core_flatmap.hpp | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index b2216510d3..397eddf2cd 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -429,7 +429,7 @@ class FlatMap } /// @} - iterator erase(iterator pos) { erase(const_iterator {pos}); } + iterator erase(iterator pos) { return erase(const_iterator {pos}); } iterator erase(const_iterator pos); IndexType erase(const KeyType& key) { diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index ab9afb29f4..9279f8d23b 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -361,9 +361,14 @@ TEST(core_flatmap, insert_then_delete) for(int i = 0; i < NUM_INSERTS; i += 3) { + auto iterator_to_remove = int_to_dbl.find(i); + auto one_after_elem = iterator_to_remove; + one_after_elem++; // Delete every third entry starting from 0, inclusive. // (i.e. keys 0, 3, 6, ...) - int_to_dbl.erase(i); + auto deleted_iterator = int_to_dbl.erase(iterator_to_remove); + + EXPECT_EQ(deleted_iterator, one_after_elem); } // Check consistency of values. From 06fa0c352748b706a0f67e97333d71928772fb2d Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 21 Nov 2023 15:15:10 -0800 Subject: [PATCH 297/639] FlatMap: document erase(), rehash and capacity functions --- src/axom/core/FlatMap.hpp | 47 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 397eddf2cd..34a679a11f 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -429,8 +429,27 @@ class FlatMap } /// @} + /*! + * \brief Remove a key-value pair from the FlatMap, specified by iterator. + * + * \param pos the iterator pointing to the key-value pair to remove + * + * \return an iterator to the next valid entry after the removed entry + */ + /// {@ iterator erase(iterator pos) { return erase(const_iterator {pos}); } iterator erase(const_iterator pos); + /// @} + + /*! + * \brief Remove a key-value pair from the FlatMap, specified by key. + * + * If the key doesn't exist in the FlatMap, does nothing. + * + * \param key the key to remove + * + * \return 1 if an entry was removed, 0 otherwise + */ IndexType erase(const KeyType& key) { const_iterator it = find(key); @@ -442,10 +461,29 @@ class FlatMap return 0; } - // Hashing + /*! + * \brief Returns the number of buckets allocated in the FlatMap. + * + * The maximum number of elements that can be stored in the FlatMap without + * resizing and rehashing is bucket_count() * max_load_factor(). + */ IndexType bucket_count() const { return m_buckets.size(); } + + /*! + * \brief Returns the current load factor of the FlatMap. + */ double load_factor() const { return ((double)m_loadCount) / bucket_count(); } + + /*! + * \brief Returns the maximum load factor of the FlatMap. + */ double max_load_factor() const { return MAX_LOAD_FACTOR; } + + /*! + * \brief Explicitly rehash the FlatMap with a given number of buckets. + * + * \param count the minimum number of buckets to allocate for the rehash + */ void rehash(IndexType count) { FlatMap rehashed(m_size, @@ -454,6 +492,13 @@ class FlatMap count); this->swap(rehashed); } + + /*! + * \brief Reallocate and rehash the FlatMap, such that up to the specified + * number of elements may be inserted without a rehash. + * + * \param count the number of elements to fit without a rehash + */ void reserve(IndexType count) { rehash(std::ceil(count / MAX_LOAD_FACTOR)); } private: From 0765fd82a9565c1e783c87bf217fbd68626cb9f0 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 21 Nov 2023 15:55:07 -0800 Subject: [PATCH 298/639] FlatMap: add typed tests for a variety of key-value scenarios --- src/axom/core/FlatMap.hpp | 2 + src/axom/core/tests/core_flatmap.hpp | 328 ++++++++++++++++----------- 2 files changed, 199 insertions(+), 131 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 34a679a11f..a87a0bbfb5 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -36,6 +36,8 @@ class FlatMap using MixedHash = detail::flat_map::HashMixer64; public: + using key_type = KeyType; + using mapped_type = ValueType; using size_type = IndexType; using value_type = KeyValuePair; using iterator = IteratorImpl; diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index 9279f8d23b..3d19c538f1 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -11,41 +11,96 @@ // gtest includes #include "gtest/gtest.h" -TEST(core_flatmap, default_init) +inline void flatmap_get_value(double key, std::string& out) { - axom::FlatMap int_to_dbl; + out = std::to_string(key); +} + +inline void flatmap_get_value(int key, std::string& out) +{ + out = std::to_string(key); +} + +template +inline void flatmap_get_value(T key, U& out) +{ + out = key; +} + +template +class core_flatmap : public ::testing::Test +{ +public: + using MapType = FlatMapType; + using KeyType = typename FlatMapType::key_type; + using ValueType = typename FlatMapType::mapped_type; + + template + KeyType getKey(T input) + { + KeyType key; + flatmap_get_value(input, key); + return key; + } + + template + ValueType getValue(T input) + { + ValueType val; + flatmap_get_value(input, val); + return val; + } + + ValueType getDefaultValue() { return ValueType(); } +}; + +using MyTypes = ::testing::Types, + axom::FlatMap, + axom::FlatMap, + axom::FlatMap>; + +TYPED_TEST_SUITE(core_flatmap, MyTypes); + +AXOM_TYPED_TEST(core_flatmap, default_init) +{ + using MapType = typename TestFixture::MapType; + MapType int_to_dbl; EXPECT_EQ(0, int_to_dbl.size()); EXPECT_EQ(true, int_to_dbl.empty()); } -TEST(core_flatmap, insert_only) +AXOM_TYPED_TEST(core_flatmap, insert_only) { - axom::FlatMap int_to_dbl; + using MapType = typename TestFixture::MapType; + MapType int_to_dbl; const int NUM_ELEMS = 100; for(int i = 0; i < NUM_ELEMS; i++) { + auto key = this->getKey(i); + auto value = this->getValue(i * 10.0 + 5.0); // Initial insertion of a given key should succeed. - auto initial_insert = int_to_dbl.insert({i, i * 10.0 + 5.0}); + auto initial_insert = int_to_dbl.insert({key, value}); EXPECT_EQ(int_to_dbl.size(), i + 1); - EXPECT_EQ(initial_insert.first, int_to_dbl.find(i)); - EXPECT_EQ(i * 10.0 + 5.0, int_to_dbl.at(i)); + EXPECT_EQ(initial_insert.first, int_to_dbl.find(key)); + EXPECT_EQ(value, int_to_dbl.at(key)); EXPECT_TRUE(initial_insert.second); int current_bucket_capacity = int_to_dbl.bucket_count(); // Inserting a duplicate key should not change the value. - auto duplicate_insert = int_to_dbl.insert({i, i * 10.0 + 7.0}); + auto value_dup = this->getValue(i * 10.0 + 5.0); + auto duplicate_insert = int_to_dbl.insert({key, value_dup}); EXPECT_EQ(int_to_dbl.size(), i + 1); - EXPECT_EQ(duplicate_insert.first, int_to_dbl.find(i)); - EXPECT_EQ(i * 10.0 + 5.0, int_to_dbl.at(i)); + EXPECT_EQ(duplicate_insert.first, int_to_dbl.find(key)); + EXPECT_EQ(value, int_to_dbl.at(key)); EXPECT_FALSE(duplicate_insert.second); // Using operator[] with an already-existing key should return the // existing value and not add a value. - double value = int_to_dbl[i]; - EXPECT_EQ(i * 10.0 + 5.0, value); + auto value_indexed = int_to_dbl[key]; + EXPECT_EQ(value_indexed, value); EXPECT_EQ(int_to_dbl.size(), i + 1); // Check that a rehash didn't occur on the second insertion. @@ -54,83 +109,40 @@ TEST(core_flatmap, insert_only) } } -TEST(core_flatmap_str, insert_only) +AXOM_TYPED_TEST(core_flatmap, insert_or_assign) { - axom::FlatMap int_to_dbl; - - int_to_dbl.insert({std::to_string(0), std::to_string(10.0)}); - EXPECT_EQ(1, int_to_dbl.size()); - - int_to_dbl.insert({std::to_string(1), std::to_string(20.0)}); - EXPECT_EQ(2, int_to_dbl.size()); - - int_to_dbl.insert({std::to_string(2), std::to_string(30.0)}); - EXPECT_EQ(3, int_to_dbl.size()); - - // Check consistency of added values. - const double expected_str[3] {10.0, 20.0, 30.0}; - for(int i = 0; i < 3; i++) - { - std::string key = std::to_string(i); - std::string expected_value = std::to_string(expected_str[i]); - auto iterator = int_to_dbl.find(key); - EXPECT_NE(iterator, int_to_dbl.end()); - EXPECT_EQ(iterator->first, key); - EXPECT_EQ(iterator->second, expected_value); - - // Using operator[] with an already-existing key should return the - // existing value and not add a value. - std::string value = int_to_dbl[key]; - EXPECT_EQ(value, expected_value); - EXPECT_EQ(int_to_dbl.size(), 3); - } -} + using MapType = typename TestFixture::MapType; + MapType int_to_dbl; -TEST(core_flatmap, insert_or_assign) -{ - axom::FlatMap int_to_dbl; + const int NUM_ELEMS = 100; // Test insert behavior of FlatMap::insert_or_assign. + for(int i = 0; i < NUM_ELEMS; i++) { - auto res_0 = int_to_dbl.insert_or_assign(0, 10.0); - EXPECT_EQ(1, int_to_dbl.size()); - EXPECT_EQ(10.0, int_to_dbl.at(0)); - EXPECT_EQ(res_0.first, int_to_dbl.find(0)); - EXPECT_TRUE(res_0.second); - - auto res_1 = int_to_dbl.insert_or_assign(1, 20.0); - EXPECT_EQ(2, int_to_dbl.size()); - EXPECT_EQ(20.0, int_to_dbl.at(1)); - EXPECT_EQ(res_1.first, int_to_dbl.find(1)); - EXPECT_TRUE(res_1.second); - - auto res_2 = int_to_dbl.insert_or_assign(2, 30.0); - EXPECT_EQ(3, int_to_dbl.size()); - EXPECT_EQ(30.0, int_to_dbl.at(2)); - EXPECT_EQ(res_2.first, int_to_dbl.find(2)); - EXPECT_TRUE(res_2.second); + auto key = this->getKey(i); + auto value = this->getValue(i * 10.0 + 5.0); + + auto result = int_to_dbl.insert_or_assign(key, value); + EXPECT_EQ(i + 1, int_to_dbl.size()); + EXPECT_EQ(value, int_to_dbl.at(key)); + EXPECT_EQ(result.first, int_to_dbl.find(key)); + EXPECT_TRUE(result.second); } // Test assign behavior of FlatMap::insert_or_assign. + for(int i = 0; i < NUM_ELEMS; i++) { - auto res_0 = int_to_dbl.insert_or_assign(0, 20.0); - EXPECT_EQ(20.0, int_to_dbl.at(0)); - EXPECT_EQ(res_0.first, int_to_dbl.find(0)); - EXPECT_FALSE(res_0.second); - - auto res_1 = int_to_dbl.insert_or_assign(1, 40.0); - EXPECT_EQ(40.0, int_to_dbl.at(1)); - EXPECT_EQ(res_1.first, int_to_dbl.find(1)); - EXPECT_FALSE(res_1.second); - - auto res_2 = int_to_dbl.insert_or_assign(2, 60.0); - EXPECT_EQ(60.0, int_to_dbl.at(2)); - EXPECT_EQ(res_2.first, int_to_dbl.find(2)); - EXPECT_FALSE(res_2.second); - - // Assignments should not change size of FlatMap. - EXPECT_EQ(3, int_to_dbl.size()); + auto key = this->getKey(i); + auto value = this->getValue(i * 10.0 + 7.0); + + auto result = int_to_dbl.insert_or_assign(key, value); + EXPECT_EQ(value, int_to_dbl.at(key)); + EXPECT_EQ(result.first, int_to_dbl.find(key)); + EXPECT_FALSE(result.second); } + + // Assignments should not change size of FlatMap. + EXPECT_EQ(NUM_ELEMS, int_to_dbl.size()); } TEST(core_flatmap_moveonly, try_emplace) @@ -165,9 +177,12 @@ TEST(core_flatmap_moveonly, try_emplace) } } -TEST(core_flatmap, initializer_list) +AXOM_TYPED_TEST(core_flatmap, initializer_list) { - axom::FlatMap int_to_dbl {{0, 10.0}, {1, 20.0}, {2, 30.0}}; + using MapType = typename TestFixture::MapType; + MapType int_to_dbl {{this->getKey(0), this->getValue(10.0)}, + {this->getKey(1), this->getValue(20.0)}, + {this->getKey(2), this->getValue(30.0)}}; EXPECT_EQ(3, int_to_dbl.size()); @@ -175,53 +190,69 @@ TEST(core_flatmap, initializer_list) const double expected_str[3] {10.0, 20.0, 30.0}; for(int i = 0; i < 3; i++) { - auto iterator = int_to_dbl.find(i); + auto key = this->getKey(i); + auto value = this->getValue(expected_str[i]); + + auto iterator = int_to_dbl.find(key); EXPECT_NE(iterator, int_to_dbl.end()); - EXPECT_EQ(iterator->first, i); - EXPECT_EQ(iterator->second, expected_str[i]); + EXPECT_EQ(iterator->first, key); + EXPECT_EQ(iterator->second, value); // Using operator[] with an already-existing key should return the // existing value and not add a value. - double value = int_to_dbl[i]; - EXPECT_EQ(value, expected_str[i]); + auto indexed_value = int_to_dbl[key]; + EXPECT_EQ(indexed_value, value); EXPECT_EQ(int_to_dbl.size(), 3); } } -TEST(core_flatmap, index_operator_default) +AXOM_TYPED_TEST(core_flatmap, index_operator_default) { - axom::FlatMap int_to_dbl; + using MapType = typename TestFixture::MapType; + MapType int_to_dbl; - int NUM_ELEMS = 10; + const int NUM_ELEMS = 100; + auto expected_default_value = this->getDefaultValue(); for(int i = 0; i < NUM_ELEMS; i++) { - double default_value = int_to_dbl[i]; - EXPECT_EQ(default_value, 0); - int_to_dbl[i] = i + 10.0; + auto key = this->getKey(i); + auto default_value = int_to_dbl[key]; + + EXPECT_EQ(default_value, expected_default_value); + + auto new_value = this->getValue(i * 10.0 + 5.0); + int_to_dbl[key] = new_value; } EXPECT_EQ(NUM_ELEMS, int_to_dbl.size()); for(int i = 0; i < NUM_ELEMS; i++) { - auto iterator = int_to_dbl.find(i); - EXPECT_EQ(iterator->second, i + 10.0); + auto key = this->getKey(i); + auto value = this->getValue(i * 10.0 + 5.0); + + auto iterator = int_to_dbl.find(key); + EXPECT_EQ(iterator->second, value); } } -TEST(core_flatmap, init_and_clear) +AXOM_TYPED_TEST(core_flatmap, init_and_clear) { - axom::FlatMap int_to_dbl; + using MapType = typename TestFixture::MapType; + MapType int_to_dbl; // Insert enough elements to trigger a resize of the buckets. // This allows us to test that a clear() doesn't reset the allocated buckets. - int NUM_ELEMS_RESIZE = 40; + int NUM_ELEMS_RESIZE = 100; EXPECT_GT(NUM_ELEMS_RESIZE, int_to_dbl.bucket_count()); for(int i = 0; i < NUM_ELEMS_RESIZE; i++) { - int_to_dbl[i] = i + 10.0; + auto key = this->getKey(i); + auto value = this->getValue(i + 10.0); + + int_to_dbl[key] = value; } EXPECT_EQ(NUM_ELEMS_RESIZE, int_to_dbl.size()); @@ -233,38 +264,45 @@ TEST(core_flatmap, init_and_clear) EXPECT_EQ(int_to_dbl.size(), 0); EXPECT_EQ(int_to_dbl.load_factor(), 0.0); EXPECT_EQ(int_to_dbl.bucket_count(), buckets_before_clear); - for(int i = 0; i < 3; i++) + for(int i = 0; i < NUM_ELEMS_RESIZE; i++) { - auto iterator = int_to_dbl.find(i); + auto key = this->getKey(i); + auto iterator = int_to_dbl.find(key); EXPECT_EQ(iterator, int_to_dbl.end()); } } -TEST(core_flatmap, init_and_move) +AXOM_TYPED_TEST(core_flatmap, init_and_move) { - axom::FlatMap int_to_dbl; + using MapType = typename TestFixture::MapType; + MapType int_to_dbl; int NUM_ELEMS = 40; for(int i = 0; i < NUM_ELEMS; i++) { - int_to_dbl[i] = i + 10.0; + auto key = this->getKey(i); + auto value = this->getValue(i + 10.0); + + int_to_dbl[key] = value; } - axom::FlatMap moved_to_map = std::move(int_to_dbl); + MapType moved_to_map = std::move(int_to_dbl); EXPECT_EQ(int_to_dbl.size(), 0); EXPECT_EQ(int_to_dbl.load_factor(), 0); EXPECT_EQ(moved_to_map.size(), NUM_ELEMS); for(int i = 0; i < NUM_ELEMS; i++) { - EXPECT_EQ(moved_to_map[i], i + 10.0); + auto key = this->getKey(i); + auto value = this->getValue(i + 10.0); + EXPECT_EQ(moved_to_map[key], value); - auto old_it = int_to_dbl.find(i); + auto old_it = int_to_dbl.find(key); EXPECT_EQ(old_it, int_to_dbl.end()); } } -TEST(core_flatmap, init_and_move_moveonly) +TEST(core_flatmap_moveonly, init_and_move_moveonly) { axom::FlatMap> int_to_dbl; int NUM_ELEMS = 40; @@ -289,19 +327,23 @@ TEST(core_flatmap, init_and_move_moveonly) } } -TEST(core_flatmap, init_and_copy) +AXOM_TYPED_TEST(core_flatmap, init_and_copy) { - axom::FlatMap int_to_dbl; + using MapType = typename TestFixture::MapType; + MapType int_to_dbl; int NUM_ELEMS = 40; for(int i = 0; i < NUM_ELEMS; i++) { - int_to_dbl[i] = i + 10.0; + auto key = this->getKey(i); + auto value = this->getValue(i + 10.0); + + int_to_dbl[key] = value; } int expected_buckets = int_to_dbl.bucket_count(); - axom::FlatMap int_to_dbl_copy = int_to_dbl; + MapType int_to_dbl_copy = int_to_dbl; EXPECT_EQ(int_to_dbl.size(), NUM_ELEMS); EXPECT_EQ(int_to_dbl.bucket_count(), expected_buckets); @@ -309,14 +351,18 @@ TEST(core_flatmap, init_and_copy) EXPECT_EQ(int_to_dbl_copy.bucket_count(), expected_buckets); for(int i = 0; i < NUM_ELEMS; i++) { - EXPECT_EQ(int_to_dbl[i], i + 10.0); - EXPECT_EQ(int_to_dbl_copy[i], i + 10.0); + auto key = this->getKey(i); + auto value = this->getValue(i + 10.0); + + EXPECT_EQ(int_to_dbl[key], value); + EXPECT_EQ(int_to_dbl_copy[key], value); } } -TEST(core_flatmap, insert_until_rehash) +AXOM_TYPED_TEST(core_flatmap, insert_until_rehash) { - axom::FlatMap int_to_dbl; + using MapType = typename TestFixture::MapType; + MapType int_to_dbl; const int INIT_CAPACITY = int_to_dbl.bucket_count(); const double LOAD_FACTOR = int_to_dbl.max_load_factor(); @@ -324,29 +370,41 @@ TEST(core_flatmap, insert_until_rehash) for(int i = 0; i < SIZE_NO_REHASH; i++) { - int_to_dbl.insert({i, 2. * i + 1}); + auto key = this->getKey(i); + auto value = this->getValue(2. * i + 1); + + int_to_dbl.insert({key, value}); } EXPECT_EQ(int_to_dbl.bucket_count(), INIT_CAPACITY); EXPECT_EQ(int_to_dbl.size(), SIZE_NO_REHASH); // Next insert should trigger a rehash. - int_to_dbl.insert({SIZE_NO_REHASH, 2. * SIZE_NO_REHASH + 1}); + { + auto key_rehash = this->getKey(SIZE_NO_REHASH); + auto value_rehash = this->getValue(2. * SIZE_NO_REHASH + 1); + + int_to_dbl.insert({key_rehash, value_rehash}); + } EXPECT_GT(int_to_dbl.bucket_count(), INIT_CAPACITY); EXPECT_EQ(int_to_dbl.size(), SIZE_NO_REHASH + 1); // Check consistency of values. for(int i = 0; i < SIZE_NO_REHASH + 1; i++) { - auto iterator = int_to_dbl.find(i); + auto key = this->getKey(i); + auto value = this->getValue(2. * i + 1); + + auto iterator = int_to_dbl.find(key); EXPECT_NE(iterator, int_to_dbl.end()); - EXPECT_EQ(iterator->first, i); - EXPECT_EQ(iterator->second, 2. * i + 1); + EXPECT_EQ(iterator->first, key); + EXPECT_EQ(iterator->second, value); } } -TEST(core_flatmap, insert_then_delete) +AXOM_TYPED_TEST(core_flatmap, insert_then_delete) { - axom::FlatMap int_to_dbl; + using MapType = typename TestFixture::MapType; + MapType int_to_dbl; const int INIT_CAPACITY = int_to_dbl.bucket_count(); const double LOAD_FACTOR = int_to_dbl.max_load_factor(); @@ -354,14 +412,19 @@ TEST(core_flatmap, insert_then_delete) for(int i = 0; i < NUM_INSERTS; i++) { - int_to_dbl.insert({i, 2. * i + 1}); + auto key = this->getKey(i); + auto value = this->getValue(2. * i + 1); + + int_to_dbl.insert({key, value}); } EXPECT_EQ(int_to_dbl.size(), NUM_INSERTS); EXPECT_GE(int_to_dbl.bucket_count(), NUM_INSERTS); for(int i = 0; i < NUM_INSERTS; i += 3) { - auto iterator_to_remove = int_to_dbl.find(i); + auto key = this->getKey(i); + + auto iterator_to_remove = int_to_dbl.find(key); auto one_after_elem = iterator_to_remove; one_after_elem++; // Delete every third entry starting from 0, inclusive. @@ -374,20 +437,23 @@ TEST(core_flatmap, insert_then_delete) // Check consistency of values. for(int i = 0; i < NUM_INSERTS; i++) { - auto iterator = int_to_dbl.find(i); + auto key = this->getKey(i); + auto value = this->getValue(2. * i + 1); + + auto iterator = int_to_dbl.find(key); if(i % 3 == 0) { EXPECT_EQ(iterator, int_to_dbl.end()); - EXPECT_EQ(0, int_to_dbl.count(i)); - EXPECT_EQ(false, int_to_dbl.contains(i)); + EXPECT_EQ(0, int_to_dbl.count(key)); + EXPECT_EQ(false, int_to_dbl.contains(key)); } else { EXPECT_NE(iterator, int_to_dbl.end()); - EXPECT_EQ(iterator->first, i); - EXPECT_EQ(iterator->second, 2. * i + 1); - EXPECT_EQ(1, int_to_dbl.count(i)); - EXPECT_EQ(true, int_to_dbl.contains(i)); + EXPECT_EQ(iterator->first, key); + EXPECT_EQ(iterator->second, value); + EXPECT_EQ(1, int_to_dbl.count(key)); + EXPECT_EQ(true, int_to_dbl.contains(key)); } } } From 204e1279612a687d560a65b9932516194996e244 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 21 Nov 2023 15:55:57 -0800 Subject: [PATCH 299/639] Include climits header for CHAR_BIT --- src/axom/core/detail/FlatTable.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 6692e8dbd5..cfa915e809 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -6,6 +6,8 @@ #ifndef Axom_Core_Detail_FlatTable_Hpp #define Axom_Core_Detail_FlatTable_Hpp +#include + #include "axom/core/Array.hpp" #include "axom/core/ArrayView.hpp" #include "axom/core/utilities/BitUtilities.hpp" From 1220486095855b9c8711fac7eb9c10ed18f8861e Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 21 Nov 2023 21:52:56 -0800 Subject: [PATCH 300/639] FlatMap: avoid copies of bucket/metadata arrays during swap() This fixes an issue with crashing rehash() operations for a map of std::string values. std::string is not trivially-relocatable in libstdc++ debug mode, so a bitcopy of the underlying object will not be valid. --- src/axom/core/FlatMap.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index a87a0bbfb5..51c328ac7f 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -148,8 +148,8 @@ class FlatMap { axom::utilities::swap(m_numGroups2, other.m_numGroups2); axom::utilities::swap(m_size, other.m_size); - axom::utilities::swap(m_metadata, other.m_metadata); - axom::utilities::swap(m_buckets, other.m_buckets); + m_metadata.swap(other.m_metadata); + m_buckets.swap(other.m_buckets); axom::utilities::swap(m_loadCount, other.m_loadCount); } From 2d3811317a95885533bb0fae1bb5b0fca7ebe808 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 1 Dec 2023 14:45:14 -0800 Subject: [PATCH 301/639] FlatMap: clarify requirements on key/value types --- src/axom/core/FlatMap.hpp | 55 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 51c328ac7f..5ad58ac6ff 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -7,6 +7,7 @@ #define Axom_Core_FlatMap_HPP #include +#include #include #include "axom/config.hpp" #include "axom/core/Macros.hpp" @@ -14,6 +15,34 @@ namespace axom { +/*! + * \class FlatMap + * + * \brief Provides a generic associative key-value container. + * + * The FlatMap class is a container which maps unique keys to a single value. + * It supports insertion, removal, and lookup of key-value pairs in amortized + * constant time. + * + * \note FlatMap is designed to be a largely drop-in replacement for + * std::unordered_map. However, FlatMap is internally represented as an open- + * addressing, quadratic probing hash map; thus, the API differs from + * unordered_map in certain regards: + * + * - Operations which insert a new element may invalidate references and + * iterators to existing elements in the container, if a resize of the + * underlying array is triggered. + * - Methods which only make sense for a closed-addressing hash map, such as + * begin/end(bucket_index), or bucket(key), are not implemented. + * + * \tparam KeyType the type of the keys to hold + * \tparam ValueType the type of the values to hold + * \tparam Hash the hash to use with the key type + * + * \pre KeyType must be EqualityComparable + * \pre Hash is invocable with an instance of KeyType, and returns an integer + * value (32- or 64-bit) + */ template > class FlatMap : detail::flat_map::SequentialLookupPolicy @@ -96,6 +125,9 @@ class FlatMap * \brief Copy constructor for a FlatMap instance. * * \param other the FlatMap to copy data from + * + * \pre KeyType must be copy-constructible + * \pre ValueType must be copy-constructible */ FlatMap(const FlatMap& other) : m_numGroups2(other.m_numGroups2) @@ -104,6 +136,12 @@ class FlatMap , m_buckets(other.m_buckets.size()) , m_loadCount(other.m_loadCount) { + static_assert(std::is_copy_constructible::value, + "Cannot copy an axom::FlatMap when key type is not " + "copy-constructible."); + static_assert(std::is_copy_constructible::value, + "Cannot copy an axom::FlatMap when value type is not " + "copy-constructible."); // Copy all elements. IndexType index = this->nextValidIndex(m_metadata, NO_MATCH); while(index < bucket_count()) @@ -117,9 +155,18 @@ class FlatMap * \brief Copy assignment operator for a FlatMap instance. * * \param other the FlatMap to copy data from + * + * \pre KeyType must be copy-constructible + * \pre ValueType must be copy-constructible */ FlatMap& operator=(const FlatMap& other) { + static_assert(std::is_copy_constructible::value, + "Cannot copy an axom::FlatMap when key type is not " + "copy-constructible."); + static_assert(std::is_copy_constructible::value, + "Cannot copy an axom::FlatMap when value type is not " + "copy-constructible."); if(*this != other) { FlatMap new_map(other); @@ -246,14 +293,22 @@ class FlatMap * \param [in] key the key to search for * * \return A reference to the corresponding value. + * + * \pre ValueType is default-constructible */ /// @{ ValueType& operator[](const KeyType& key) { + static_assert(std::is_default_constructible::value, + "Cannot use axom::FlatMap::operator[] when value type is not " + "default-constructible."); return this->try_emplace(key).first->second; } const ValueType& operator[](const KeyType& key) const { + static_assert(std::is_default_constructible::value, + "Cannot use axom::FlatMap::operator[] when value type is not " + "default-constructible."); return this->try_emplace(key).first->second; } /// @} From ebee36bc5cb6d355676a8795797b9f8fe05b5159 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 1 Dec 2023 14:47:04 -0800 Subject: [PATCH 302/639] FlatMap: rename int_to_dbl to test_map --- src/axom/core/tests/core_flatmap.hpp | 206 +++++++++++++-------------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index 3d19c538f1..53895c0ac5 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -64,15 +64,15 @@ TYPED_TEST_SUITE(core_flatmap, MyTypes); AXOM_TYPED_TEST(core_flatmap, default_init) { using MapType = typename TestFixture::MapType; - MapType int_to_dbl; - EXPECT_EQ(0, int_to_dbl.size()); - EXPECT_EQ(true, int_to_dbl.empty()); + MapType test_map; + EXPECT_EQ(0, test_map.size()); + EXPECT_EQ(true, test_map.empty()); } AXOM_TYPED_TEST(core_flatmap, insert_only) { using MapType = typename TestFixture::MapType; - MapType int_to_dbl; + MapType test_map; const int NUM_ELEMS = 100; @@ -81,38 +81,38 @@ AXOM_TYPED_TEST(core_flatmap, insert_only) auto key = this->getKey(i); auto value = this->getValue(i * 10.0 + 5.0); // Initial insertion of a given key should succeed. - auto initial_insert = int_to_dbl.insert({key, value}); - EXPECT_EQ(int_to_dbl.size(), i + 1); - EXPECT_EQ(initial_insert.first, int_to_dbl.find(key)); - EXPECT_EQ(value, int_to_dbl.at(key)); + auto initial_insert = test_map.insert({key, value}); + EXPECT_EQ(test_map.size(), i + 1); + EXPECT_EQ(initial_insert.first, test_map.find(key)); + EXPECT_EQ(value, test_map.at(key)); EXPECT_TRUE(initial_insert.second); - int current_bucket_capacity = int_to_dbl.bucket_count(); + int current_bucket_capacity = test_map.bucket_count(); // Inserting a duplicate key should not change the value. auto value_dup = this->getValue(i * 10.0 + 5.0); - auto duplicate_insert = int_to_dbl.insert({key, value_dup}); - EXPECT_EQ(int_to_dbl.size(), i + 1); - EXPECT_EQ(duplicate_insert.first, int_to_dbl.find(key)); - EXPECT_EQ(value, int_to_dbl.at(key)); + auto duplicate_insert = test_map.insert({key, value_dup}); + EXPECT_EQ(test_map.size(), i + 1); + EXPECT_EQ(duplicate_insert.first, test_map.find(key)); + EXPECT_EQ(value, test_map.at(key)); EXPECT_FALSE(duplicate_insert.second); // Using operator[] with an already-existing key should return the // existing value and not add a value. - auto value_indexed = int_to_dbl[key]; + auto value_indexed = test_map[key]; EXPECT_EQ(value_indexed, value); - EXPECT_EQ(int_to_dbl.size(), i + 1); + EXPECT_EQ(test_map.size(), i + 1); // Check that a rehash didn't occur on the second insertion. EXPECT_EQ(duplicate_insert.first, initial_insert.first); - EXPECT_EQ(current_bucket_capacity, int_to_dbl.bucket_count()); + EXPECT_EQ(current_bucket_capacity, test_map.bucket_count()); } } AXOM_TYPED_TEST(core_flatmap, insert_or_assign) { using MapType = typename TestFixture::MapType; - MapType int_to_dbl; + MapType test_map; const int NUM_ELEMS = 100; @@ -122,10 +122,10 @@ AXOM_TYPED_TEST(core_flatmap, insert_or_assign) auto key = this->getKey(i); auto value = this->getValue(i * 10.0 + 5.0); - auto result = int_to_dbl.insert_or_assign(key, value); - EXPECT_EQ(i + 1, int_to_dbl.size()); - EXPECT_EQ(value, int_to_dbl.at(key)); - EXPECT_EQ(result.first, int_to_dbl.find(key)); + auto result = test_map.insert_or_assign(key, value); + EXPECT_EQ(i + 1, test_map.size()); + EXPECT_EQ(value, test_map.at(key)); + EXPECT_EQ(result.first, test_map.find(key)); EXPECT_TRUE(result.second); } @@ -135,19 +135,19 @@ AXOM_TYPED_TEST(core_flatmap, insert_or_assign) auto key = this->getKey(i); auto value = this->getValue(i * 10.0 + 7.0); - auto result = int_to_dbl.insert_or_assign(key, value); - EXPECT_EQ(value, int_to_dbl.at(key)); - EXPECT_EQ(result.first, int_to_dbl.find(key)); + auto result = test_map.insert_or_assign(key, value); + EXPECT_EQ(value, test_map.at(key)); + EXPECT_EQ(result.first, test_map.find(key)); EXPECT_FALSE(result.second); } // Assignments should not change size of FlatMap. - EXPECT_EQ(NUM_ELEMS, int_to_dbl.size()); + EXPECT_EQ(NUM_ELEMS, test_map.size()); } TEST(core_flatmap_moveonly, try_emplace) { - axom::FlatMap> int_to_dbl; + axom::FlatMap> test_map; const int NUM_ELEMS = 40; @@ -155,9 +155,9 @@ TEST(core_flatmap_moveonly, try_emplace) for(int i = 0; i < NUM_ELEMS; i++) { std::unique_ptr value {new double {i + 10.0}}; - auto result = int_to_dbl.try_emplace(i, std::move(value)); - EXPECT_EQ(*(int_to_dbl[i]), i + 10.0); - EXPECT_EQ(result.first, int_to_dbl.find(i)); + auto result = test_map.try_emplace(i, std::move(value)); + EXPECT_EQ(*(test_map[i]), i + 10.0); + EXPECT_EQ(result.first, test_map.find(i)); EXPECT_TRUE(result.second); // Value should have been moved. EXPECT_EQ(value.get(), nullptr); @@ -167,9 +167,9 @@ TEST(core_flatmap_moveonly, try_emplace) for(int i = 0; i < NUM_ELEMS; i++) { std::unique_ptr value {new double {i + 20.0}}; - auto result = int_to_dbl.try_emplace(i, std::move(value)); - EXPECT_EQ(*(int_to_dbl[i]), i + 10.0); - EXPECT_EQ(result.first, int_to_dbl.find(i)); + auto result = test_map.try_emplace(i, std::move(value)); + EXPECT_EQ(*(test_map[i]), i + 10.0); + EXPECT_EQ(result.first, test_map.find(i)); EXPECT_FALSE(result.second); // Since key already exists, value should NOT be moved. EXPECT_NE(value.get(), nullptr); @@ -180,11 +180,11 @@ TEST(core_flatmap_moveonly, try_emplace) AXOM_TYPED_TEST(core_flatmap, initializer_list) { using MapType = typename TestFixture::MapType; - MapType int_to_dbl {{this->getKey(0), this->getValue(10.0)}, - {this->getKey(1), this->getValue(20.0)}, - {this->getKey(2), this->getValue(30.0)}}; + MapType test_map {{this->getKey(0), this->getValue(10.0)}, + {this->getKey(1), this->getValue(20.0)}, + {this->getKey(2), this->getValue(30.0)}}; - EXPECT_EQ(3, int_to_dbl.size()); + EXPECT_EQ(3, test_map.size()); // Check consistency of added values. const double expected_str[3] {10.0, 20.0, 30.0}; @@ -193,23 +193,23 @@ AXOM_TYPED_TEST(core_flatmap, initializer_list) auto key = this->getKey(i); auto value = this->getValue(expected_str[i]); - auto iterator = int_to_dbl.find(key); - EXPECT_NE(iterator, int_to_dbl.end()); + auto iterator = test_map.find(key); + EXPECT_NE(iterator, test_map.end()); EXPECT_EQ(iterator->first, key); EXPECT_EQ(iterator->second, value); // Using operator[] with an already-existing key should return the // existing value and not add a value. - auto indexed_value = int_to_dbl[key]; + auto indexed_value = test_map[key]; EXPECT_EQ(indexed_value, value); - EXPECT_EQ(int_to_dbl.size(), 3); + EXPECT_EQ(test_map.size(), 3); } } AXOM_TYPED_TEST(core_flatmap, index_operator_default) { using MapType = typename TestFixture::MapType; - MapType int_to_dbl; + MapType test_map; const int NUM_ELEMS = 100; @@ -217,22 +217,22 @@ AXOM_TYPED_TEST(core_flatmap, index_operator_default) for(int i = 0; i < NUM_ELEMS; i++) { auto key = this->getKey(i); - auto default_value = int_to_dbl[key]; + auto default_value = test_map[key]; EXPECT_EQ(default_value, expected_default_value); auto new_value = this->getValue(i * 10.0 + 5.0); - int_to_dbl[key] = new_value; + test_map[key] = new_value; } - EXPECT_EQ(NUM_ELEMS, int_to_dbl.size()); + EXPECT_EQ(NUM_ELEMS, test_map.size()); for(int i = 0; i < NUM_ELEMS; i++) { auto key = this->getKey(i); auto value = this->getValue(i * 10.0 + 5.0); - auto iterator = int_to_dbl.find(key); + auto iterator = test_map.find(key); EXPECT_EQ(iterator->second, value); } } @@ -240,42 +240,42 @@ AXOM_TYPED_TEST(core_flatmap, index_operator_default) AXOM_TYPED_TEST(core_flatmap, init_and_clear) { using MapType = typename TestFixture::MapType; - MapType int_to_dbl; + MapType test_map; // Insert enough elements to trigger a resize of the buckets. // This allows us to test that a clear() doesn't reset the allocated buckets. int NUM_ELEMS_RESIZE = 100; - EXPECT_GT(NUM_ELEMS_RESIZE, int_to_dbl.bucket_count()); + EXPECT_GT(NUM_ELEMS_RESIZE, test_map.bucket_count()); for(int i = 0; i < NUM_ELEMS_RESIZE; i++) { auto key = this->getKey(i); auto value = this->getValue(i + 10.0); - int_to_dbl[key] = value; + test_map[key] = value; } - EXPECT_EQ(NUM_ELEMS_RESIZE, int_to_dbl.size()); + EXPECT_EQ(NUM_ELEMS_RESIZE, test_map.size()); - int buckets_before_clear = int_to_dbl.bucket_count(); + int buckets_before_clear = test_map.bucket_count(); - int_to_dbl.clear(); + test_map.clear(); - EXPECT_EQ(int_to_dbl.size(), 0); - EXPECT_EQ(int_to_dbl.load_factor(), 0.0); - EXPECT_EQ(int_to_dbl.bucket_count(), buckets_before_clear); + EXPECT_EQ(test_map.size(), 0); + EXPECT_EQ(test_map.load_factor(), 0.0); + EXPECT_EQ(test_map.bucket_count(), buckets_before_clear); for(int i = 0; i < NUM_ELEMS_RESIZE; i++) { auto key = this->getKey(i); - auto iterator = int_to_dbl.find(key); - EXPECT_EQ(iterator, int_to_dbl.end()); + auto iterator = test_map.find(key); + EXPECT_EQ(iterator, test_map.end()); } } AXOM_TYPED_TEST(core_flatmap, init_and_move) { using MapType = typename TestFixture::MapType; - MapType int_to_dbl; + MapType test_map; int NUM_ELEMS = 40; for(int i = 0; i < NUM_ELEMS; i++) @@ -283,13 +283,13 @@ AXOM_TYPED_TEST(core_flatmap, init_and_move) auto key = this->getKey(i); auto value = this->getValue(i + 10.0); - int_to_dbl[key] = value; + test_map[key] = value; } - MapType moved_to_map = std::move(int_to_dbl); + MapType moved_to_map = std::move(test_map); - EXPECT_EQ(int_to_dbl.size(), 0); - EXPECT_EQ(int_to_dbl.load_factor(), 0); + EXPECT_EQ(test_map.size(), 0); + EXPECT_EQ(test_map.load_factor(), 0); EXPECT_EQ(moved_to_map.size(), NUM_ELEMS); for(int i = 0; i < NUM_ELEMS; i++) { @@ -297,40 +297,40 @@ AXOM_TYPED_TEST(core_flatmap, init_and_move) auto value = this->getValue(i + 10.0); EXPECT_EQ(moved_to_map[key], value); - auto old_it = int_to_dbl.find(key); - EXPECT_EQ(old_it, int_to_dbl.end()); + auto old_it = test_map.find(key); + EXPECT_EQ(old_it, test_map.end()); } } TEST(core_flatmap_moveonly, init_and_move_moveonly) { - axom::FlatMap> int_to_dbl; + axom::FlatMap> test_map; int NUM_ELEMS = 40; for(int i = 0; i < NUM_ELEMS; i++) { - int_to_dbl.emplace(i, new double {i + 10.0}); + test_map.emplace(i, new double {i + 10.0}); } axom::FlatMap> int_to_dbl_move = - std::move(int_to_dbl); + std::move(test_map); - EXPECT_EQ(int_to_dbl.size(), 0); - EXPECT_EQ(int_to_dbl.load_factor(), 0); + EXPECT_EQ(test_map.size(), 0); + EXPECT_EQ(test_map.load_factor(), 0); EXPECT_EQ(int_to_dbl_move.size(), NUM_ELEMS); for(int i = 0; i < NUM_ELEMS; i++) { EXPECT_EQ(*(int_to_dbl_move[i]), i + 10.0); - auto old_it = int_to_dbl.find(i); - EXPECT_EQ(old_it, int_to_dbl.end()); + auto old_it = test_map.find(i); + EXPECT_EQ(old_it, test_map.end()); } } AXOM_TYPED_TEST(core_flatmap, init_and_copy) { using MapType = typename TestFixture::MapType; - MapType int_to_dbl; + MapType test_map; int NUM_ELEMS = 40; for(int i = 0; i < NUM_ELEMS; i++) @@ -338,15 +338,15 @@ AXOM_TYPED_TEST(core_flatmap, init_and_copy) auto key = this->getKey(i); auto value = this->getValue(i + 10.0); - int_to_dbl[key] = value; + test_map[key] = value; } - int expected_buckets = int_to_dbl.bucket_count(); + int expected_buckets = test_map.bucket_count(); - MapType int_to_dbl_copy = int_to_dbl; + MapType int_to_dbl_copy = test_map; - EXPECT_EQ(int_to_dbl.size(), NUM_ELEMS); - EXPECT_EQ(int_to_dbl.bucket_count(), expected_buckets); + EXPECT_EQ(test_map.size(), NUM_ELEMS); + EXPECT_EQ(test_map.bucket_count(), expected_buckets); EXPECT_EQ(int_to_dbl_copy.size(), NUM_ELEMS); EXPECT_EQ(int_to_dbl_copy.bucket_count(), expected_buckets); for(int i = 0; i < NUM_ELEMS; i++) @@ -354,7 +354,7 @@ AXOM_TYPED_TEST(core_flatmap, init_and_copy) auto key = this->getKey(i); auto value = this->getValue(i + 10.0); - EXPECT_EQ(int_to_dbl[key], value); + EXPECT_EQ(test_map[key], value); EXPECT_EQ(int_to_dbl_copy[key], value); } } @@ -362,10 +362,10 @@ AXOM_TYPED_TEST(core_flatmap, init_and_copy) AXOM_TYPED_TEST(core_flatmap, insert_until_rehash) { using MapType = typename TestFixture::MapType; - MapType int_to_dbl; + MapType test_map; - const int INIT_CAPACITY = int_to_dbl.bucket_count(); - const double LOAD_FACTOR = int_to_dbl.max_load_factor(); + const int INIT_CAPACITY = test_map.bucket_count(); + const double LOAD_FACTOR = test_map.max_load_factor(); const int SIZE_NO_REHASH = LOAD_FACTOR * INIT_CAPACITY; for(int i = 0; i < SIZE_NO_REHASH; i++) @@ -373,20 +373,20 @@ AXOM_TYPED_TEST(core_flatmap, insert_until_rehash) auto key = this->getKey(i); auto value = this->getValue(2. * i + 1); - int_to_dbl.insert({key, value}); + test_map.insert({key, value}); } - EXPECT_EQ(int_to_dbl.bucket_count(), INIT_CAPACITY); - EXPECT_EQ(int_to_dbl.size(), SIZE_NO_REHASH); + EXPECT_EQ(test_map.bucket_count(), INIT_CAPACITY); + EXPECT_EQ(test_map.size(), SIZE_NO_REHASH); // Next insert should trigger a rehash. { auto key_rehash = this->getKey(SIZE_NO_REHASH); auto value_rehash = this->getValue(2. * SIZE_NO_REHASH + 1); - int_to_dbl.insert({key_rehash, value_rehash}); + test_map.insert({key_rehash, value_rehash}); } - EXPECT_GT(int_to_dbl.bucket_count(), INIT_CAPACITY); - EXPECT_EQ(int_to_dbl.size(), SIZE_NO_REHASH + 1); + EXPECT_GT(test_map.bucket_count(), INIT_CAPACITY); + EXPECT_EQ(test_map.size(), SIZE_NO_REHASH + 1); // Check consistency of values. for(int i = 0; i < SIZE_NO_REHASH + 1; i++) @@ -394,8 +394,8 @@ AXOM_TYPED_TEST(core_flatmap, insert_until_rehash) auto key = this->getKey(i); auto value = this->getValue(2. * i + 1); - auto iterator = int_to_dbl.find(key); - EXPECT_NE(iterator, int_to_dbl.end()); + auto iterator = test_map.find(key); + EXPECT_NE(iterator, test_map.end()); EXPECT_EQ(iterator->first, key); EXPECT_EQ(iterator->second, value); } @@ -404,10 +404,10 @@ AXOM_TYPED_TEST(core_flatmap, insert_until_rehash) AXOM_TYPED_TEST(core_flatmap, insert_then_delete) { using MapType = typename TestFixture::MapType; - MapType int_to_dbl; + MapType test_map; - const int INIT_CAPACITY = int_to_dbl.bucket_count(); - const double LOAD_FACTOR = int_to_dbl.max_load_factor(); + const int INIT_CAPACITY = test_map.bucket_count(); + const double LOAD_FACTOR = test_map.max_load_factor(); const int NUM_INSERTS = LOAD_FACTOR * INIT_CAPACITY * 4; for(int i = 0; i < NUM_INSERTS; i++) @@ -415,21 +415,21 @@ AXOM_TYPED_TEST(core_flatmap, insert_then_delete) auto key = this->getKey(i); auto value = this->getValue(2. * i + 1); - int_to_dbl.insert({key, value}); + test_map.insert({key, value}); } - EXPECT_EQ(int_to_dbl.size(), NUM_INSERTS); - EXPECT_GE(int_to_dbl.bucket_count(), NUM_INSERTS); + EXPECT_EQ(test_map.size(), NUM_INSERTS); + EXPECT_GE(test_map.bucket_count(), NUM_INSERTS); for(int i = 0; i < NUM_INSERTS; i += 3) { auto key = this->getKey(i); - auto iterator_to_remove = int_to_dbl.find(key); + auto iterator_to_remove = test_map.find(key); auto one_after_elem = iterator_to_remove; one_after_elem++; // Delete every third entry starting from 0, inclusive. // (i.e. keys 0, 3, 6, ...) - auto deleted_iterator = int_to_dbl.erase(iterator_to_remove); + auto deleted_iterator = test_map.erase(iterator_to_remove); EXPECT_EQ(deleted_iterator, one_after_elem); } @@ -440,20 +440,20 @@ AXOM_TYPED_TEST(core_flatmap, insert_then_delete) auto key = this->getKey(i); auto value = this->getValue(2. * i + 1); - auto iterator = int_to_dbl.find(key); + auto iterator = test_map.find(key); if(i % 3 == 0) { - EXPECT_EQ(iterator, int_to_dbl.end()); - EXPECT_EQ(0, int_to_dbl.count(key)); - EXPECT_EQ(false, int_to_dbl.contains(key)); + EXPECT_EQ(iterator, test_map.end()); + EXPECT_EQ(0, test_map.count(key)); + EXPECT_EQ(false, test_map.contains(key)); } else { - EXPECT_NE(iterator, int_to_dbl.end()); + EXPECT_NE(iterator, test_map.end()); EXPECT_EQ(iterator->first, key); EXPECT_EQ(iterator->second, value); - EXPECT_EQ(1, int_to_dbl.count(key)); - EXPECT_EQ(true, int_to_dbl.contains(key)); + EXPECT_EQ(1, test_map.count(key)); + EXPECT_EQ(true, test_map.contains(key)); } } } From cdffe27558a907df659ea6547482a5a2b7c8004f Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 1 Dec 2023 14:49:04 -0800 Subject: [PATCH 303/639] FlatMap: use a constant for testing size --- src/axom/core/tests/core_flatmap.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index 53895c0ac5..4fa020450e 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -80,9 +80,10 @@ AXOM_TYPED_TEST(core_flatmap, insert_only) { auto key = this->getKey(i); auto value = this->getValue(i * 10.0 + 5.0); + const auto expected_size = i + 1; // Initial insertion of a given key should succeed. auto initial_insert = test_map.insert({key, value}); - EXPECT_EQ(test_map.size(), i + 1); + EXPECT_EQ(test_map.size(), expected_size); EXPECT_EQ(initial_insert.first, test_map.find(key)); EXPECT_EQ(value, test_map.at(key)); EXPECT_TRUE(initial_insert.second); @@ -92,7 +93,7 @@ AXOM_TYPED_TEST(core_flatmap, insert_only) // Inserting a duplicate key should not change the value. auto value_dup = this->getValue(i * 10.0 + 5.0); auto duplicate_insert = test_map.insert({key, value_dup}); - EXPECT_EQ(test_map.size(), i + 1); + EXPECT_EQ(test_map.size(), expected_size); EXPECT_EQ(duplicate_insert.first, test_map.find(key)); EXPECT_EQ(value, test_map.at(key)); EXPECT_FALSE(duplicate_insert.second); @@ -101,7 +102,7 @@ AXOM_TYPED_TEST(core_flatmap, insert_only) // existing value and not add a value. auto value_indexed = test_map[key]; EXPECT_EQ(value_indexed, value); - EXPECT_EQ(test_map.size(), i + 1); + EXPECT_EQ(test_map.size(), expected_size); // Check that a rehash didn't occur on the second insertion. EXPECT_EQ(duplicate_insert.first, initial_insert.first); From 0e918e5244a36b71209005c34bcedb754853b5f3 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 1 Dec 2023 14:53:00 -0800 Subject: [PATCH 304/639] FlatMap: more suggested changes, remove magic constants --- src/axom/core/FlatMap.hpp | 5 ++++- src/axom/core/detail/FlatTable.hpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 5ad58ac6ff..bf45bf7013 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -320,7 +320,10 @@ class FlatMap * * \param [in] key the key to search for */ - IndexType count(const KeyType& key) const { return (find(key) != end()); } + IndexType count(const KeyType& key) const + { + return contains(key) ? IndexType {1} : IndexType {0}; + } /*! * \brief Return true if the FlatMap contains a key, false otherwise. diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index cfa915e809..8b8bf8128f 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -53,8 +53,8 @@ struct HashMixer64 } }; -// Boost::unordered_flat_map uses a 128-bit chunk of metadata for each -// group of 15 buckets. +// We follow the design of boost::unordered_flat_map, which uses a 128-bit chunk +// of metadata for each group of 15 buckets. // This is split up into an "overflow bit", and 15 bytes representing the // state of each bucket. // @@ -77,7 +77,7 @@ struct GroupBucket int getEmptyBucket() const { - for(int i = 0; i < 15; i++) + for(int i = 0; i < Size; i++) { if(metadata.buckets[i] == GroupBucket::Empty) { @@ -90,7 +90,7 @@ struct GroupBucket int nextFilledBucket(int start_index) const { - for(int i = start_index + 1; i < 15; i++) + for(int i = start_index + 1; i < Size; i++) { // We intentionally don't check for the sentinel here. This gives us the // index of the sentinel bucket at the end, which is needed as a "stop" @@ -107,7 +107,7 @@ struct GroupBucket int visitHashBucket(std::uint8_t hash, Func&& visitor) const { std::uint8_t reducedHash = reduceHash(hash); - for(int i = 0; i < 15; i++) + for(int i = 0; i < Size; i++) { if(metadata.buckets[i] == reducedHash) { @@ -136,9 +136,9 @@ struct GroupBucket return (metadata.ofw & hashOfwBit); } - bool hasSentinel() const { return metadata.buckets[14] == Sentinel; } + bool hasSentinel() const { return metadata.buckets[Size - 1] == Sentinel; } - void setSentinel() { metadata.buckets[14] = Sentinel; } + void setSentinel() { metadata.buckets[Size - 1] = Sentinel; } // We need to map hashes in the range [0, 255] to [2, 255], since 0 and 1 // are taken by the "empty" and "sentinel" values respectively. @@ -152,7 +152,7 @@ struct GroupBucket struct { std::uint8_t ofw; - std::uint8_t buckets[15]; + std::uint8_t buckets[Size]; } metadata; std::uint64_t data[2]; static_assert( From 0cca4cab4fa4e2177add2d3e182920bd3e008ac3 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 1 Dec 2023 16:17:29 -0800 Subject: [PATCH 305/639] FlatMap: fix CUDA build --- src/axom/core/FlatMap.hpp | 13 +------------ src/axom/core/detail/FlatTable.hpp | 10 ++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index bf45bf7013..fdc43f1456 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -579,18 +579,7 @@ class FlatMap axom::Array m_metadata; // Storage details: - struct alignas(KeyValuePair) PairStorage - { - unsigned char data[sizeof(KeyValuePair)]; - - const KeyValuePair& get() const - { - return *(reinterpret_cast(&data)); - } - - KeyValuePair& get() { return *(reinterpret_cast(&data)); } - }; - + using PairStorage = detail::flat_map::TypeErasedStorage; axom::Array m_buckets; // Boost flat_unordered_map uses a fixed load factor. diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 8b8bf8128f..266bd9a665 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -317,6 +317,16 @@ struct SequentialLookupPolicy } }; +template +struct alignas(T) TypeErasedStorage +{ + unsigned char data[sizeof(T)]; + + const T& get() const { return *(reinterpret_cast(&data)); } + + T& get() { return *(reinterpret_cast(&data)); } +}; + } // namespace flat_map } // namespace detail } // namespace axom From 6027267205ed05391c27d9e3216779b98e1d1b62 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 1 Dec 2023 16:26:08 -0800 Subject: [PATCH 306/639] FlatMap: fix for 64-bit builds --- src/axom/core/FlatMap.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index fdc43f1456..5ec17fce62 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -663,7 +663,7 @@ FlatMap::FlatMap(IndexType bucket_count) : m_size(0) , m_loadCount(0) { - int minBuckets = MIN_NUM_BUCKETS; + IndexType minBuckets = MIN_NUM_BUCKETS; bucket_count = axom::utilities::max(minBuckets, bucket_count); // Get the smallest power-of-two number of groups satisfying: // N * GroupSize - 1 >= minBuckets From 9660db74acbc09b12f9a5fbd83171854b6ea597f Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 1 Dec 2023 17:24:35 -0800 Subject: [PATCH 307/639] FlatMap: add test for const_iterator loop --- src/axom/core/tests/core_flatmap.hpp | 64 ++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index 4fa020450e..e06f9a14fd 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -21,6 +21,16 @@ inline void flatmap_get_value(int key, std::string& out) out = std::to_string(key); } +inline void flatmap_get_value(const std::string& key, double& out) +{ + out = std::stod(key); +} + +inline void flatmap_get_value(const std::string& key, int& out) +{ + out = std::stoi(key); +} + template inline void flatmap_get_value(T key, U& out) { @@ -458,3 +468,57 @@ AXOM_TYPED_TEST(core_flatmap, insert_then_delete) } } } + +AXOM_TYPED_TEST(core_flatmap, iterator_loop) +{ + using MapType = typename TestFixture::MapType; + MapType test_map; + + const int NUM_ELEMS = 100; + + for(int i = 0; i < NUM_ELEMS; i++) + { + auto key = this->getKey(i); + auto value = this->getValue(i * 10.0 + 5.0); + + test_map.insert({key, value}); + } + + std::vector have_iterator(NUM_ELEMS, 0); + + int iter_count = 0; + // Test constant iteration + for(typename MapType::const_iterator it = test_map.begin(); + it != test_map.end(); + ++it) + { + auto pair = *it; + auto iter_key = pair.first; + auto iter_value = pair.second; + + // Get the original integer value of the key. + int iter_key_int; + flatmap_get_value(iter_key, iter_key_int); + + // Check that the key value is in range. + EXPECT_GE(iter_key_int, 0); + EXPECT_LT(iter_key_int, NUM_ELEMS); + + // Count the key that we got. + have_iterator[iter_key_int]++; + + // Check that the value is what we expect for the given key.. + auto expected_value = this->getValue(iter_key_int * 10.0 + 5.0); + EXPECT_EQ(iter_value, expected_value); + + // Count the number of iterations. + iter_count++; + } + EXPECT_EQ(iter_count, NUM_ELEMS); + + for(int i = 0; i < NUM_ELEMS; i++) + { + // We should have iterated through every index exactly once. + EXPECT_EQ(have_iterator[i], 1); + } +} From f45c7143bee544643aaedb992379480492f435c5 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 1 Dec 2023 17:32:06 -0800 Subject: [PATCH 308/639] FlatMap: add test for iterator mutability --- src/axom/core/tests/core_flatmap.hpp | 38 ++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index e06f9a14fd..07b329c9eb 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -522,3 +522,41 @@ AXOM_TYPED_TEST(core_flatmap, iterator_loop) EXPECT_EQ(have_iterator[i], 1); } } + +AXOM_TYPED_TEST(core_flatmap, iterator_loop_write) +{ + using MapType = typename TestFixture::MapType; + MapType test_map; + + const int NUM_ELEMS = 100; + + for(int i = 0; i < NUM_ELEMS; i++) + { + auto key = this->getKey(i); + auto value = this->getValue(i * 10.0 + 5.0); + + test_map.insert({key, value}); + } + + // Test mutable iteration + for(typename MapType::iterator it = test_map.begin(); it != test_map.end(); ++it) + { + auto pair = *it; + auto iter_key = pair.first; + + // Get the original integer value of the key. + int iter_key_int; + flatmap_get_value(iter_key, iter_key_int); + + // Modify the stored value. + it->second = this->getValue(iter_key_int * 10.0 + 7.0); + } + + for(int i = 0; i < NUM_ELEMS; i++) + { + // All values should be set to the new value. + const auto key = this->getKey(i); + const auto expected_value = this->getValue(i * 10.0 + 7.0); + EXPECT_EQ(test_map[key], expected_value); + } +} From 8cdb9ffee2e42d81178bfc4694fd0ad984753b77 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 1 Dec 2023 17:37:44 -0800 Subject: [PATCH 309/639] FlatMap: add tests for range-based for loops --- src/axom/core/tests/core_flatmap.hpp | 88 ++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index 07b329c9eb..e1f1bce6ea 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -560,3 +560,91 @@ AXOM_TYPED_TEST(core_flatmap, iterator_loop_write) EXPECT_EQ(test_map[key], expected_value); } } + +AXOM_TYPED_TEST(core_flatmap, range_for_loop) +{ + using MapType = typename TestFixture::MapType; + MapType test_map; + + const int NUM_ELEMS = 100; + + for(int i = 0; i < NUM_ELEMS; i++) + { + auto key = this->getKey(i); + auto value = this->getValue(i * 10.0 + 5.0); + + test_map.insert({key, value}); + } + + std::vector have_key(NUM_ELEMS, 0); + + int iter_count = 0; + // Test constant iteration + for(const auto& pair : test_map) + { + auto iter_key = pair.first; + auto iter_value = pair.second; + + // Get the original integer value of the key. + int iter_key_int; + flatmap_get_value(iter_key, iter_key_int); + + // Check that the key value is in range. + EXPECT_GE(iter_key_int, 0); + EXPECT_LT(iter_key_int, NUM_ELEMS); + + // Count the key that we got. + have_key[iter_key_int]++; + + // Check that the value is what we expect for the given key.. + auto expected_value = this->getValue(iter_key_int * 10.0 + 5.0); + EXPECT_EQ(iter_value, expected_value); + + // Count the number of iterations. + iter_count++; + } + EXPECT_EQ(iter_count, NUM_ELEMS); + + for(int i = 0; i < NUM_ELEMS; i++) + { + // We should have iterated through every index exactly once. + EXPECT_EQ(have_key[i], 1); + } +} + +AXOM_TYPED_TEST(core_flatmap, range_for_loop_write) +{ + using MapType = typename TestFixture::MapType; + MapType test_map; + + const int NUM_ELEMS = 100; + + for(int i = 0; i < NUM_ELEMS; i++) + { + auto key = this->getKey(i); + auto value = this->getValue(i * 10.0 + 5.0); + + test_map.insert({key, value}); + } + + // Test mutable iteration + for(auto& pair : test_map) + { + auto iter_key = pair.first; + + // Get the original integer value of the key. + int iter_key_int; + flatmap_get_value(iter_key, iter_key_int); + + // Modify the stored value. + pair.second = this->getValue(iter_key_int * 10.0 + 7.0); + } + + for(int i = 0; i < NUM_ELEMS; i++) + { + // All values should be set to the new value. + const auto key = this->getKey(i); + const auto expected_value = this->getValue(i * 10.0 + 7.0); + EXPECT_EQ(test_map[key], expected_value); + } +} From 590c13f26c62eb03d564d2d7792db4f0d4dc3630 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 1 Dec 2023 18:02:29 -0800 Subject: [PATCH 310/639] Add a unit test for quadratic probing --- src/axom/core/tests/core_flatmap.hpp | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index e1f1bce6ea..b3aebf1987 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -11,6 +11,43 @@ // gtest includes #include "gtest/gtest.h" +// Unit test for QuadraticProbing +TEST(core_flatmap_unit, quadratic_probing) +{ + axom::detail::flat_map::QuadraticProbing instance {}; + for(int array_size = 4; array_size <= 8192; array_size *= 2) + { + // Generate probe indices. + std::vector probe_index(array_size); + std::vector probe_index_mod(array_size); + int curr_offset = 0; + // Compute probe indices for an array of size N. + for(int i = 0; i < array_size; i++) + { + probe_index[i] = curr_offset; + probe_index_mod[i] = curr_offset % array_size; + curr_offset += instance.getNext(i); + } + + for(int i = 0; i < array_size; i++) + { + // Each probe index should match the formula: + // H(i) = H_0 + i/2 + i^2/2 mod m. + int expected_probe_index = i * (i + 1) / 2; + EXPECT_EQ(probe_index[i], expected_probe_index); + EXPECT_EQ(probe_index_mod[i], expected_probe_index % array_size); + } + + // Probe indices should be a permutation of the range [0, array_size - 1). + std::vector expected_permutation(array_size); + std::iota(expected_permutation.begin(), expected_permutation.end(), 0); + + // Sort the modular probe indexes and compare. + std::sort(probe_index_mod.begin(), probe_index_mod.end()); + EXPECT_EQ(probe_index_mod, expected_permutation); + } +} + inline void flatmap_get_value(double key, std::string& out) { out = std::to_string(key); From 2165663870871b56e5438b901cd4ef5675d1fd43 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Wed, 6 Dec 2023 15:07:56 -0800 Subject: [PATCH 311/639] FlatMap: update static_asserts, documentation --- src/axom/core/detail/FlatTable.hpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 266bd9a665..2df70fbd8f 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -155,18 +155,17 @@ struct GroupBucket std::uint8_t buckets[Size]; } metadata; std::uint64_t data[2]; - static_assert( - sizeof(metadata) == sizeof(data), - "FlatMap::SwissTable::Bucket: sizeof(data_bytes) != sizeof(data)"); + static_assert(sizeof(metadata) == sizeof(data), + "flat_map::GroupBucket: sizeof(data_bytes) != sizeof(data)"); }; }; static_assert(sizeof(GroupBucket) == 16, - "FlatMap::SwissTable::Bucket: size != 16 bytes"); + "flat_map::GroupBucket: size != 16 bytes"); static_assert(std::alignment_of::value == 16, - "FlatMap::SwissTable::Bucket: alignment != 16 bytes"); + "flat_map::GroupBucket: alignment != 16 bytes"); static_assert(std::is_standard_layout::value, - "FlatMap::SwissTable::Bucket: not standard layout"); + "flat_map::GroupBucket: not standard layout"); template struct SequentialLookupPolicy @@ -233,8 +232,8 @@ struct SequentialLookupPolicy * \param [in] ngroups_pow_2 the number of groups, expressed as a power of 2 * \param [in] groups the array of metadata for the groups in the hash map * \param [in] hash the hash to insert - * - * \return the first bucket with an empty space, if probing for insertion. + * \param [in] on_hash_found functor to call for a bucket index with a + * matching hash */ template void probeIndex(int ngroups_pow_2, From 3ca9f57996f773d8c8876cf6c8223f2956d1405b Mon Sep 17 00:00:00 2001 From: Max Yang Date: Wed, 6 Dec 2023 15:11:08 -0800 Subject: [PATCH 312/639] FlatMap: create a single metadata view outside of the loop --- src/axom/core/FlatMap.hpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 5ec17fce62..0d7d97640c 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -143,11 +143,12 @@ class FlatMap "Cannot copy an axom::FlatMap when value type is not " "copy-constructible."); // Copy all elements. - IndexType index = this->nextValidIndex(m_metadata, NO_MATCH); + const auto metadata = m_metadata.view(); + IndexType index = this->nextValidIndex(metadata, NO_MATCH); while(index < bucket_count()) { new(&m_buckets[index].data) KeyValuePair(other.m_buckets[index].get()); - index = this->nextValidIndex(m_metadata, index); + index = this->nextValidIndex(metadata, index); } } @@ -178,11 +179,12 @@ class FlatMap ~FlatMap() { // Destroy all elements. - IndexType index = this->nextValidIndex(m_metadata, NO_MATCH); + const auto metadata = m_metadata.view(); + IndexType index = this->nextValidIndex(metadata, NO_MATCH); while(index < bucket_count()) { m_buckets[index].get().~KeyValuePair(); - index = this->nextValidIndex(m_metadata, index); + index = this->nextValidIndex(metadata, index); } // Unlike in clear() we don't need to reset metadata here. From 5d6d32788c30270a78d6f1d79e52f87f87140140 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Thu, 7 Dec 2023 17:44:16 -0800 Subject: [PATCH 313/639] Rename groups to metadata for consistency --- src/axom/core/detail/FlatTable.hpp | 47 ++++++++++++++++-------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 2df70fbd8f..3cd3195942 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -177,11 +177,11 @@ struct SequentialLookupPolicy * for an open-addressing hash map. * * \param [in] ngroups_pow_2 the number of groups, expressed as a power of 2 - * \param [in] groups the array of metadata for the groups in the hash map + * \param [in] metadata the array of metadata for the groups in the hash map * \param [in] hash the hash to insert */ IndexType probeEmptyIndex(int ngroups_pow_2, - ArrayView groups, + ArrayView metadata, HashType hash) const { // We use the k MSBs of the hash as the initial group probe point, @@ -193,9 +193,9 @@ struct SequentialLookupPolicy int empty_bucket = NO_MATCH; std::uint8_t hash_8 = static_cast(hash); - for(int iteration = 0; iteration < groups.size(); iteration++) + for(int iteration = 0; iteration < metadata.size(); iteration++) { - int tentative_empty_bucket = groups[curr_group].getEmptyBucket(); + int tentative_empty_bucket = metadata[curr_group].getEmptyBucket(); if(tentative_empty_bucket != GroupBucket::InvalidSlot && empty_group == NO_MATCH) { @@ -203,7 +203,7 @@ struct SequentialLookupPolicy empty_bucket = tentative_empty_bucket; } - if((!groups[curr_group].getMaybeOverflowed(hash_8) && + if((!metadata[curr_group].getMaybeOverflowed(hash_8) && empty_group != NO_MATCH)) { // We've reached the last group that might contain the hash. @@ -213,10 +213,10 @@ struct SequentialLookupPolicy else if(empty_group == NO_MATCH) { // Set the overflow bit and continue probing. - groups[curr_group].setOverflow(hash_8); + metadata[curr_group].setOverflow(hash_8); } curr_group = - (curr_group + ProbePolicy {}.getNext(iteration)) % groups.size(); + (curr_group + ProbePolicy {}.getNext(iteration)) % metadata.size(); } if(empty_group != NO_MATCH) { @@ -230,14 +230,14 @@ struct SequentialLookupPolicy * array for an open-addressing hash map. * * \param [in] ngroups_pow_2 the number of groups, expressed as a power of 2 - * \param [in] groups the array of metadata for the groups in the hash map + * \param [in] metadata the array of metadata for the groups in the hash map * \param [in] hash the hash to insert * \param [in] on_hash_found functor to call for a bucket index with a * matching hash */ template void probeIndex(int ngroups_pow_2, - ArrayView groups, + ArrayView metadata, HashType hash, FoundIndex&& on_hash_found) const { @@ -249,13 +249,13 @@ struct SequentialLookupPolicy std::uint8_t hash_8 = static_cast(hash); bool keep_going = true; - for(int iteration = 0; iteration < groups.size(); iteration++) + for(int iteration = 0; iteration < metadata.size(); iteration++) { - groups[curr_group].visitHashBucket(hash_8, [&](IndexType bucket_index) { + metadata[curr_group].visitHashBucket(hash_8, [&](IndexType bucket_index) { keep_going = on_hash_found(curr_group * GroupBucket::Size + bucket_index); }); - if(!groups[curr_group].getMaybeOverflowed(hash_8)) + if(!metadata[curr_group].getMaybeOverflowed(hash_8)) { // Stop probing if the "overflow" bit is not set. keep_going = false; @@ -268,34 +268,36 @@ struct SequentialLookupPolicy } // Probe the next bucket. curr_group = - (curr_group + ProbePolicy {}.getNext(iteration)) % groups.size(); + (curr_group + ProbePolicy {}.getNext(iteration)) % metadata.size(); } } - void setBucketHash(ArrayView groups, IndexType bucket, HashType hash) + void setBucketHash(ArrayView metadata, + IndexType bucket, + HashType hash) { int group_index = bucket / GroupBucket::Size; int slot_index = bucket % GroupBucket::Size; - groups[group_index].setBucket(slot_index, hash); + metadata[group_index].setBucket(slot_index, hash); } - bool clearBucket(ArrayView groups, IndexType bucket, HashType hash) + bool clearBucket(ArrayView metadata, IndexType bucket, HashType hash) { int group_index = bucket / GroupBucket::Size; int slot_index = bucket % GroupBucket::Size; - groups[group_index].clearBucket(slot_index); + metadata[group_index].clearBucket(slot_index); // Return if the overflow bit is set on the bucket. That indicates whether // we are deleting an element in the middle of a probing sequence. - return groups[group_index].getMaybeOverflowed(hash); + return metadata[group_index].getMaybeOverflowed(hash); } - IndexType nextValidIndex(ArrayView groups, + IndexType nextValidIndex(ArrayView metadata, int last_bucket) const { - if(last_bucket >= groups.size() * GroupBucket::Size - 1) + if(last_bucket >= metadata.size() * GroupBucket::Size - 1) { return last_bucket; } @@ -304,13 +306,14 @@ struct SequentialLookupPolicy do { - slot_index = groups[group_index].nextFilledBucket(slot_index); + slot_index = metadata[group_index].nextFilledBucket(slot_index); if(slot_index == GroupBucket::InvalidSlot) { group_index++; slot_index = -1; } - } while(slot_index == GroupBucket::InvalidSlot && group_index < groups.size()); + } while(slot_index == GroupBucket::InvalidSlot && + group_index < metadata.size()); return group_index * GroupBucket::Size + slot_index; } From 8a353ca3f66b22bca63f35d1fc62b5e23598f904 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 8 Dec 2023 13:44:04 -0800 Subject: [PATCH 314/639] FlatMap: Make SequentialLookupPolicy inherit QuadraticProbing as a policy class --- src/axom/core/detail/FlatTable.hpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index 3cd3195942..a4c0851362 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -168,7 +168,7 @@ static_assert(std::is_standard_layout::value, "flat_map::GroupBucket: not standard layout"); template -struct SequentialLookupPolicy +struct SequentialLookupPolicy : ProbePolicy { constexpr static int NO_MATCH = -1; @@ -215,8 +215,7 @@ struct SequentialLookupPolicy // Set the overflow bit and continue probing. metadata[curr_group].setOverflow(hash_8); } - curr_group = - (curr_group + ProbePolicy {}.getNext(iteration)) % metadata.size(); + curr_group = (curr_group + this->getNext(iteration)) % metadata.size(); } if(empty_group != NO_MATCH) { @@ -267,8 +266,7 @@ struct SequentialLookupPolicy break; } // Probe the next bucket. - curr_group = - (curr_group + ProbePolicy {}.getNext(iteration)) % metadata.size(); + curr_group = (curr_group + this->getNext(iteration)) % metadata.size(); } } From 56aeda017190c9a41e49f785a5ad2823357f9cb6 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Fri, 8 Dec 2023 13:50:55 -0800 Subject: [PATCH 315/639] Update RELEASE-NOTES --- RELEASE-NOTES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index d8bb78a17f..abf0bc86c8 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -28,6 +28,8 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - Primal: Adds a `checkAndFixOrientation()` function to `primal::Tetrahedron` that swaps the order of vertices if the signed volume of the Tetrahedron is negative, resulting in the signed volume becoming positive. +- Adds `FlatMap`, a generic key-value store which aims for drop-in compatibility + with `std::unordered_map`, but utilizes an open-addressing design. ### Changed - `MarchingCubes` and `DistributedClosestPoint` classes identify domains by their From bccfef850e5815d4ea4ec3b937488c9ff2827f31 Mon Sep 17 00:00:00 2001 From: Alan Dayton <6393677+adayton1@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:12:58 -0800 Subject: [PATCH 316/639] Fix ODR violations in BitUtilities.hpp (#1180) * Fix ODR violations and use Hip intrinsics --------- Co-authored-by: Arlie Capps <48997041+agcapps@users.noreply.github.com> --- src/axom/core/utilities/BitUtilities.hpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/axom/core/utilities/BitUtilities.hpp b/src/axom/core/utilities/BitUtilities.hpp index e57088362f..e36a97da93 100644 --- a/src/axom/core/utilities/BitUtilities.hpp +++ b/src/axom/core/utilities/BitUtilities.hpp @@ -18,9 +18,12 @@ #include "axom/core/Macros.hpp" #include "axom/core/Types.hpp" +// CUDA intrinsics: https://docs.nvidia.com/cuda/cuda-math-api/group__CUDA__MATH__INTRINSIC__INT.html +// TODO: Support HIP intrinsics (https://rocm.docs.amd.com/projects/HIP/en/latest/reference/kernel_language.html) + // Check for and setup defines for platform-specific intrinsics // Note: `__GNUC__` is defined for the gnu, clang and intel compilers -#if defined(__CUDACC__) +#if defined(AXOM_USE_CUDA) // Intrinsics included implicitly #elif defined(_WIN64) && (_MSC_VER >= 1600) #define _AXOM_CORE_USE_INTRINSICS_MSVC @@ -84,7 +87,7 @@ struct BitTraits AXOM_HOST_DEVICE inline int trailingZeros(std::uint64_t word) { /* clang-format off */ -#if defined(AXOM_DEVICE_CODE) && defined(AXOM_USE_CUDA) +#if defined(__CUDA_ARCH__) && defined(AXOM_USE_CUDA) return word != std::uint64_t(0) ? __ffsll(word) - 1 : 64; #elif defined(_AXOM_CORE_USE_INTRINSICS_MSVC) unsigned long cnt; @@ -121,7 +124,7 @@ AXOM_HOST_DEVICE inline int trailingZeros(std::uint64_t word) AXOM_HOST_DEVICE inline int popCount(std::uint64_t word) { /* clang-format off */ -#if defined(AXOM_DEVICE_CODE) && defined(AXOM_USE_CUDA) +#if defined(__CUDA_ARCH__) && defined(AXOM_USE_CUDA) // Use CUDA intrinsic for popcount return __popcll(word); #elif defined(_AXOM_CORE_USE_INTRINSICS_MSVC) @@ -160,7 +163,7 @@ AXOM_HOST_DEVICE inline int popCount(std::uint64_t word) AXOM_HOST_DEVICE inline std::int32_t leadingZeros(std::int32_t word) { /* clang-format off */ -#if defined(AXOM_DEVICE_CODE) && defined(AXOM_USE_CUDA) +#if defined(__CUDA_ARCH__) && defined(AXOM_USE_CUDA) // Use CUDA intrinsic for count leading zeros return __clz(word); #elif defined(_AXOM_CORE_USE_INTRINSICS_MSVC) From 0216053fedf50d2df850517bf4fb791998ac422a Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 11 Dec 2023 10:49:51 -0800 Subject: [PATCH 317/639] Minor comment typo corrections. --- src/axom/quest/DistributedClosestPoint.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index 25e3649242..cbdc51db5c 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -328,15 +328,15 @@ class DistributedClosestPoint * \brief Computes the closest point on the object mesh for each point * on the provided query mesh * - * \param [in] query_node The root node of a mesh blueprint for the query points - * Can be empty if there are no query points for the calling rank + * \param [in] query_node The root node of a mesh blueprint for the query points, + * which can be empty if there are no query points for the calling rank * \param [in] topology The name of the topology within query_node * * @c queryMesh should have data on the host, regardless of the runtime * policy setting. Data will be copied to device as needed. * * On completion, the query mesh contains the following fields: - * - cp_rank: Will hold the rank of the object point containing the closest point + * - cp_rank: will hold the rank of the object point containing the closest point * - cp_domain_index: will hold the index of the object domain containing * the closest points. * - cp_index: Will hold the index of the closest object points. @@ -348,7 +348,7 @@ class DistributedClosestPoint * See setOutput() to toggle these outputs. * * \note The current implementation assumes that the mesh coordinates - * interleaved or contiguous. The output cp_coords will be contiguous. + * are interleaved or contiguous. The output cp_coords will be contiguous. */ void computeClosestPoints(conduit::Node& query_node, const std::string& topology) { From 928ce3e08bae4e341b184c61f4e1d4fb6b2b2c18 Mon Sep 17 00:00:00 2001 From: Kae S <31679808+ksuarez1423@users.noreply.github.com> Date: Mon, 11 Dec 2023 12:07:25 -0700 Subject: [PATCH 318/639] Switch Map from int to IndexType for size (#628) * Upgrading to 64-bit integers for metadata --- src/axom/core/Map.hpp | 70 +++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/axom/core/Map.hpp b/src/axom/core/Map.hpp index 915924775a..69a7e06bb0 100644 --- a/src/axom/core/Map.hpp +++ b/src/axom/core/Map.hpp @@ -97,7 +97,7 @@ class Bucket * * \pre len > 0 */ - Bucket(int len) { init(len); } + Bucket(IndexType len) { init(len); } /*! * \brief If a Bucket instance is created with the default contructor, this @@ -107,7 +107,7 @@ class Bucket * * \pre len > 0 */ - void init(int len) + void init(IndexType len) { m_list = axom::allocate>(len); for(int i = 0; i < len - 1; i++) @@ -331,7 +331,7 @@ class Bucket axom_map::Node m_end; IndexType m_head; IndexType m_free; - int m_capacity, m_size; + IndexType m_capacity, m_size; }; /// @} @@ -371,7 +371,7 @@ class Map * \pre num_buckets > 0 * \pre bucket_len > 0 */ - Map(int num_buckets, int bucket_len = 10) + Map(IndexType num_buckets, IndexType bucket_len = 10) { init(num_buckets, bucket_len); m_end.key = Key {0}; @@ -392,7 +392,7 @@ class Map , m_load_factor(0) , m_bucket_fill(false) #if defined(AXOM_USE_OPENMP) && defined(AXOM_USE_RAJA) - , locks(nullptr) + , m_locks(nullptr) #endif { *this = std::move(other); @@ -419,7 +419,7 @@ class Map m_end = other.m_end; pol = other.pol; #if defined(AXOM_USE_OPENMP) && defined(AXOM_USE_RAJA) - locks = other.locks; + m_locks = other.m_locks; #endif other.m_buckets = nullptr; @@ -428,7 +428,7 @@ class Map other.m_size = 0; other.m_load_factor = 0; #if defined(AXOM_USE_OPENMP) && defined(AXOM_USE_RAJA) - other.locks = nullptr; + other.m_locks = nullptr; #endif } return *this; @@ -459,12 +459,12 @@ class Map * if used properly. However, since this highly manual process has room for error this implementation does * perform a check for if any bucket is now full. */ - bool rehash(int buckets = -1, int factor = -1) + bool rehash(IndexType buckets = -1, int factor = -1) { - int newlen = 0; + IndexType newlen = 0; IndexType ind; std::size_t hashed; - if(buckets != -1 && buckets > static_cast(m_bucket_count)) + if(buckets != -1 && buckets > m_bucket_count) { newlen = buckets; } @@ -481,7 +481,7 @@ class Map m_bucket_fill = false; axom_map::Bucket* new_list = alloc_map(newlen, m_bucket_len); - for(std::size_t i = 0; i < m_bucket_count; i++) + for(IndexType i = 0; i < m_bucket_count; i++) { ind = m_buckets[i].m_head; while(ind != -1) @@ -497,7 +497,7 @@ class Map destroy_locks(pol); m_buckets = new_list; m_bucket_count = newlen; - for(std::size_t i = 0; i < m_bucket_count; i++) + for(IndexType i = 0; i < m_bucket_count; i++) { if(m_buckets[i].get_size() == m_buckets[i].get_capacity()) { @@ -515,7 +515,7 @@ class Map */ void clear() { - for(std::size_t i = 0; i < m_bucket_count; i++) + for(IndexType i = 0; i < m_bucket_count; i++) { axom::deallocate(m_buckets[i].m_list); } @@ -532,7 +532,7 @@ class Map * Required if use is to continue after a clear(). * */ - void init(int num_buckets, int bucket_len = 10) + void init(IndexType num_buckets, IndexType bucket_len = 10) { m_bucket_count = num_buckets; m_bucket_len = bucket_len; @@ -575,7 +575,7 @@ class Map if(ret.second == true) { #ifdef AXOM_USE_RAJA - RAJA::atomicAdd(&m_size, 1); + RAJA::atomicAdd(&m_size, IndexType {1}); #else m_size++; #endif @@ -623,7 +623,7 @@ class Map if(ret.second == true) { #ifdef AXOM_USE_RAJA - RAJA::atomicAdd(&m_size, 1); + RAJA::atomicAdd(&m_size, IndexType {1}); #else m_size++; #endif @@ -678,7 +678,7 @@ class Map if(ret == true) { #ifdef AXOM_USE_RAJA - RAJA::atomicSub(&m_size, 1); + RAJA::atomicSub(&m_size, IndexType {1}); #else m_size--; #endif @@ -720,22 +720,22 @@ class Map * \brief Returns the maximum number of items per bucket. * \return bucket_len the maximum number of items per bucket. */ - int bucket_size() const { return m_bucket_len; } + IndexType bucket_size() const { return m_bucket_len; } /*! * \brief Returns the number of buckets in the Map. * \return bucket_count */ - int bucket_count() const { return m_bucket_count; } + IndexType bucket_count() const { return m_bucket_count; } /*! * \brief Returns the amount of items in the Map instance. * \return size the amount of items in the Map instance. */ - int size() const { return m_size; } + IndexType size() const { return m_size; } /*! * \brief Returns the overall capacity of the Map instance. * \return capacity the overall capacity of the Map instance. */ - int max_size() { return m_bucket_len * m_bucket_count; } + IndexType max_size() { return m_bucket_len * m_bucket_count; } /*! * \brief Checks if the container has no elements. * \return true if the container is empty, false otherwise @@ -804,11 +804,11 @@ class Map * * \return A pointer to the now-allocated array of linked lists. */ - axom_map::Bucket* alloc_map(int bucount, int bucklen) + axom_map::Bucket* alloc_map(IndexType bucount, IndexType bucklen) { axom_map::Bucket* tmp = axom::allocate>(bucount); - for(int i = 0; i < bucount; i++) + for(IndexType i = 0; i < bucount; i++) { tmp[i].init(bucklen); } @@ -883,7 +883,7 @@ class Map void bucket_lock(std::size_t index, axom::OMP_EXEC overload) const { AXOM_UNUSED_VAR(overload); - omp_set_lock(locks + index); + omp_set_lock(m_locks + index); } /*! @@ -894,7 +894,7 @@ class Map void bucket_unlock(std::size_t index, axom::OMP_EXEC overload) const { AXOM_UNUSED_VAR(overload); - omp_unset_lock(locks + index); + omp_unset_lock(m_locks + index); } /*! @@ -903,10 +903,10 @@ class Map void init_locks(axom::OMP_EXEC overload) const { AXOM_UNUSED_VAR(overload); - locks = axom::allocate(m_bucket_count); - for(std::size_t i = 0; i < m_bucket_count; i++) + m_locks = axom::allocate(m_bucket_count); + for(IndexType i = 0; i < m_bucket_count; i++) { - omp_init_lock(locks + i); + omp_init_lock(m_locks + i); } } @@ -916,11 +916,11 @@ class Map void destroy_locks(axom::OMP_EXEC overload) const { AXOM_UNUSED_VAR(overload); - for(std::size_t i = 0; i < m_bucket_count; i++) + for(IndexType i = 0; i < m_bucket_count; i++) { - omp_destroy_lock(locks + i); + omp_destroy_lock(m_locks + i); } - axom::deallocate(locks); + axom::deallocate(m_locks); } #endif /// @} @@ -929,14 +929,14 @@ class Map /// @{ axom_map::Bucket* m_buckets; /*!< array of pointers to linked lists containing data */ - std::size_t m_bucket_count; /*!< the number of buckets in the Map instance */ - int m_bucket_len; /*!< the number of items that can be contained in a bucket in this Map instance */ - int m_size; /*!< the number of items currently stored in this Map instance */ + IndexType m_bucket_count; /*!< the number of buckets in the Map instance */ + IndexType m_bucket_len; /*!< the number of items that can be contained in a bucket in this Map instance */ + IndexType m_size; /*!< the number of items currently stored in this Map instance */ float m_load_factor; /*!< currently unused value, used in STL unordered_map to determine when to resize, which we don't do internally at the moment */ axom_map::Node m_end; /*!< the sentinel node enabling verification of operation success or failure */ bool m_bucket_fill; /*!< status of buckets in general -- if at least one is full, this is set to true, false otherwise*/ #if defined(AXOM_USE_OPENMP) && defined(AXOM_USE_RAJA) - mutable omp_lock_t* locks; + mutable omp_lock_t* m_locks; #endif Policy pol; /// @} From 9a93c36ecb0ca2784b38cd727d9b24c56332fbda Mon Sep 17 00:00:00 2001 From: Arlie Capps <48997041+agcapps@users.noreply.github.com> Date: Mon, 11 Dec 2023 12:56:33 -0800 Subject: [PATCH 319/639] Fixes from Alan Dayton (Many thanks!) (#1204) * Fixes from Alan Dayton (Many thanks!) --- src/axom/primal/geometry/Hexahedron.hpp | 11 +++++++++-- src/axom/primal/geometry/Polyhedron.hpp | 17 ++++++++++++----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/axom/primal/geometry/Hexahedron.hpp b/src/axom/primal/geometry/Hexahedron.hpp index fcb0cbcf52..8067576766 100644 --- a/src/axom/primal/geometry/Hexahedron.hpp +++ b/src/axom/primal/geometry/Hexahedron.hpp @@ -71,7 +71,7 @@ class Hexahedron /*! * \brief Default constructor. Creates a degenerate hexahedron. */ - AXOM_HOST_DEVICE Hexahedron() { } + Hexahedron() = default; /*! * \brief Creates an hexahedron from the 8 points p,q,r,s,t,u,v,w. @@ -359,7 +359,14 @@ class Hexahedron } private: - PointType m_points[NUM_HEX_VERTS]; + PointType m_points[NUM_HEX_VERTS] {PointType {}, + PointType {}, + PointType {}, + PointType {}, + PointType {}, + PointType {}, + PointType {}, + PointType {}}; }; //------------------------------------------------------------------------------ diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp index 52b18473cd..bb9eb2cd4b 100644 --- a/src/axom/primal/geometry/Polyhedron.hpp +++ b/src/axom/primal/geometry/Polyhedron.hpp @@ -52,7 +52,7 @@ class NeighborCollection /*! * \brief Constructs an empty NeighborCollection. */ - AXOM_HOST_DEVICE NeighborCollection() : num_nbrs {0} { } + NeighborCollection() = default; /*! * \brief Clears the set of neighbors. @@ -263,7 +263,7 @@ class Polyhedron public: /*! Default constructor for an empty polyhedron */ - AXOM_HOST_DEVICE Polyhedron() : m_num_vertices(0) { } + Polyhedron() = default; /*! Return the number of vertices in the polyhedron */ AXOM_HOST_DEVICE int numVertices() const { return m_num_vertices; } @@ -893,9 +893,16 @@ class Polyhedron } private: - int m_num_vertices; - Coords m_vertices; - Neighbors m_neighbors; + int m_num_vertices {0}; + Coords m_vertices {PointType {}, PointType {}, PointType {}, PointType {}, + PointType {}, PointType {}, PointType {}, PointType {}, + PointType {}, PointType {}, PointType {}, PointType {}, + PointType {}, PointType {}, PointType {}, PointType {}, + PointType {}, PointType {}, PointType {}, PointType {}, + PointType {}, PointType {}, PointType {}, PointType {}, + PointType {}, PointType {}, PointType {}, PointType {}, + PointType {}, PointType {}, PointType {}, PointType {}}; + Neighbors m_neighbors {}; }; //------------------------------------------------------------------------------ From fd338841014a10922aaa972320455fd38cc63983 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 12 Dec 2023 16:31:54 -0800 Subject: [PATCH 320/639] Define runtime_policy macros corresponding to execution_spaces. This adds __CUDACC__ and __HIPCC__ to the runtime_policy macros and avoids compile failures in some cases. --- src/axom/core/execution/runtime_policy.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/core/execution/runtime_policy.hpp b/src/axom/core/execution/runtime_policy.hpp index 8033a66a99..263db3a1f4 100644 --- a/src/axom/core/execution/runtime_policy.hpp +++ b/src/axom/core/execution/runtime_policy.hpp @@ -46,10 +46,10 @@ #ifdef AXOM_USE_OPENMP #define AXOM_RUNTIME_POLICY_USE_OPENMP #endif - #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) + #if defined(__CUDACC__) && defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) #define AXOM_RUNTIME_POLICY_USE_CUDA #endif - #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + #if defined(__HIPCC__) && defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) #define AXOM_RUNTIME_POLICY_USE_HIP #endif #endif From 9725bbe82069785a4b2f9bbea4a8f8b895ae3cf1 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 12 Dec 2023 16:42:37 -0800 Subject: [PATCH 321/639] use special ci partitions --- .gitlab/build_lassen.yml | 4 ++-- .gitlab/build_quartz.yml | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab/build_lassen.yml b/.gitlab/build_lassen.yml index 238a8d5b4a..1a334a6307 100644 --- a/.gitlab/build_lassen.yml +++ b/.gitlab/build_lassen.yml @@ -22,14 +22,14 @@ .src_build_on_lassen: stage: build variables: - ALLOC_COMMAND: "lalloc 1 -W 25 -q pwdev -G wdev -alloc_flags atsdisable" + ALLOC_COMMAND: "lalloc 1 -W 25 -q pci -alloc_flags atsdisable" extends: [.src_build_script, .on_lassen, .src_workflow] needs: [] .full_build_on_lassen: stage: build variables: - ALLOC_COMMAND: "lalloc 1 -W 45 -q pwdev -G wdev -alloc_flags atsdisable" + ALLOC_COMMAND: "lalloc 1 -W 45 -q pci -alloc_flags atsdisable" extends: [.full_build_script, .on_lassen, .full_workflow] needs: [] diff --git a/.gitlab/build_quartz.yml b/.gitlab/build_quartz.yml index 84f0bb867f..8cd1644a1d 100644 --- a/.gitlab/build_quartz.yml +++ b/.gitlab/build_quartz.yml @@ -10,7 +10,7 @@ - shell - quartz rules: - - if: '$CI_COMMIT_BRANCH =~ /_qnone/ || $ON_RUBY == "OFF"' #run except if ... + - if: '$CI_COMMIT_BRANCH =~ /_qnone/ || $ON_QUARTZ == "OFF"' #run except if ... when: never - if: '$CI_JOB_NAME =~ /quartz_release/' when: always @@ -26,9 +26,7 @@ quartz_allocate: extends: [.on_quartz, .src_workflow] stage: allocate script: - # Use when ellastic ci is on quartz or we go back to ruby - #- salloc --reservation=ci --qos=ci_ruby -N 1 -c 36 -t 60 --no-shell --job-name=${PROJECT_ALLOC_NAME} - - salloc -N 1 -c 36 -t 60 -p pdebug --no-shell --job-name=${PROJECT_ALLOC_NAME} + - salloc -N 1 -c 36 -t 60 -p pdebug --res=ci --no-shell --job-name=${PROJECT_ALLOC_NAME} needs: [] #### From e8e988b4d9163235b912ff1f7ba734a1cd67fc5a Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 12 Dec 2023 16:43:00 -0800 Subject: [PATCH 322/639] move away from deprecated command --- .gitlab/build_tioga.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/build_tioga.yml b/.gitlab/build_tioga.yml index 93e09e4ff0..8197f62089 100644 --- a/.gitlab/build_tioga.yml +++ b/.gitlab/build_tioga.yml @@ -21,14 +21,14 @@ .src_build_on_tioga: stage: build variables: - ALLOC_COMMAND: "flux mini run --exclusive --time-limit=30m --nodes=1" + ALLOC_COMMAND: "flux run --exclusive --time-limit=30m --nodes=1" extends: [.src_build_script, .on_tioga, .src_workflow] needs: [] .full_build_on_tioga: stage: build variables: - ALLOC_COMMAND: "flux mini run --exclusive --time-limit=60m --nodes=1" + ALLOC_COMMAND: "flux run --exclusive --time-limit=60m --nodes=1" extends: [.full_build_script, .on_tioga, .full_workflow] needs: [] From 99a4ce77ec88edd1a518094c36d88d9d9fb29cbf Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 12 Dec 2023 16:59:47 -0800 Subject: [PATCH 323/639] Move DistributedClosestPoint definitions into a .cpp file. This is to avoid unneeded parsing of the code. --- src/axom/quest/CMakeLists.txt | 10 +- src/axom/quest/DistributedClosestPoint.cpp | 342 ++++++++++++++++++ src/axom/quest/DistributedClosestPoint.hpp | 339 ++--------------- ...est_distributed_distance_query_example.cpp | 1 - .../quest/tests/quest_intersection_shaper.cpp | 1 + 5 files changed, 383 insertions(+), 310 deletions(-) create mode 100644 src/axom/quest/DistributedClosestPoint.cpp diff --git a/src/axom/quest/CMakeLists.txt b/src/axom/quest/CMakeLists.txt index 9e4df4520c..9f3597326f 100644 --- a/src/axom/quest/CMakeLists.txt +++ b/src/axom/quest/CMakeLists.txt @@ -104,7 +104,15 @@ if(AXOM_ENABLE_SIDRE) endif() if(CONDUIT_FOUND AND AXOM_ENABLE_MPI) - list(APPEND quest_headers DistributedClosestPoint.hpp ) + blt_list_append( + TO quest_headers + ELEMENTS DistributedClosestPoint.hpp + detail/DistributedClosestPointImpl.hpp + ) + blt_list_append( + TO quest_sources + ELEMENTS DistributedClosestPoint.cpp + ) list(APPEND quest_depends_on conduit::conduit conduit::conduit_mpi) endif() diff --git a/src/axom/quest/DistributedClosestPoint.cpp b/src/axom/quest/DistributedClosestPoint.cpp new file mode 100644 index 0000000000..c1af2e0adf --- /dev/null +++ b/src/axom/quest/DistributedClosestPoint.cpp @@ -0,0 +1,342 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +#include "axom/config.hpp" +#include "axom/slic.hpp" +#include "axom/core/memory_management.hpp" +#include "axom/core/execution/execution_space.hpp" +#include "axom/core/execution/runtime_policy.hpp" +#include "axom/quest/DistributedClosestPoint.hpp" +#include "axom/quest/detail/DistributedClosestPointImpl.hpp" + +#include "axom/fmt.hpp" + +#include "conduit_blueprint.hpp" +#include "conduit_blueprint_mpi.hpp" +#include "conduit_relay_mpi.hpp" + +#include +#include + +#ifndef AXOM_USE_MPI + #error This file requires Axom to be configured with MPI +#endif +#include "mpi.h" + +namespace axom +{ +namespace quest +{ + +DistributedClosestPoint::DistributedClosestPoint() + : m_mpiComm(MPI_COMM_WORLD) + , m_mpiCommIsPrivate(false) + , m_allocatorID(axom::INVALID_ALLOCATOR_ID) + , m_sqDistanceThreshold(std::numeric_limits::max()) +{ + setDefaultAllocatorID(); + setMpiCommunicator(MPI_COMM_WORLD); +} + +DistributedClosestPoint::~DistributedClosestPoint() +{ + if(m_mpiCommIsPrivate) + { + int mpiIsFinalized = 0; + MPI_Finalized(&mpiIsFinalized); + if(!mpiIsFinalized) + { + MPI_Comm_free(&m_mpiComm); + } + } +} + +void DistributedClosestPoint::setDefaultAllocatorID() +{ + int defaultAllocatorID = axom::INVALID_ALLOCATOR_ID; + switch(m_runtimePolicy) + { + case RuntimePolicy::seq: + defaultAllocatorID = axom::execution_space::allocatorID(); + break; + +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP + case RuntimePolicy::omp: + defaultAllocatorID = axom::execution_space::allocatorID(); + break; +#endif + +#ifdef __CUDACC__ +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + case RuntimePolicy::cuda: + defaultAllocatorID = + axom::execution_space>::allocatorID(); + break; +#endif +#endif + +#ifdef AXOM_RUNTIME_POLICY_USE_HIP + case RuntimePolicy::hip: + defaultAllocatorID = + axom::execution_space>::allocatorID(); + break; +#endif + } + if(defaultAllocatorID == axom::INVALID_ALLOCATOR_ID) + { + SLIC_ERROR( + axom::fmt::format("There is no default allocator for runtime policy {}", + m_runtimePolicy)); + } + setAllocatorID(defaultAllocatorID); +} + +void DistributedClosestPoint::setAllocatorID(int allocatorID) +{ + SLIC_ASSERT_MSG(allocatorID != axom::INVALID_ALLOCATOR_ID, + "Invalid allocator id."); + m_allocatorID = allocatorID; + + if(m_dcp_2 != nullptr) + { + m_dcp_2->setAllocatorID(m_allocatorID); + } + if(m_dcp_3 != nullptr) + { + m_dcp_3->setAllocatorID(m_allocatorID); + } +} + +void DistributedClosestPoint::setMpiCommunicator(MPI_Comm mpiComm, bool duplicate) +{ + if(m_mpiCommIsPrivate) + { + MPI_Comm_free(&m_mpiComm); + } + + if(duplicate) + { + MPI_Comm_dup(mpiComm, &m_mpiComm); + } + else + { + m_mpiComm = mpiComm; + } + m_mpiCommIsPrivate = duplicate; +} + +void DistributedClosestPoint::setDimension(int dim) +{ + SLIC_ERROR_IF( + dim < 2 || dim > 3, + "DistributedClosestPoint query only supports 2D or 3D queries"); + m_dimension = dim; +} + +void DistributedClosestPoint::setDistanceThreshold(double threshold) +{ + SLIC_ERROR_IF(threshold < 0.0, "Distance threshold must be non-negative."); + m_sqDistanceThreshold = threshold * threshold; +} + +void DistributedClosestPoint::setOutput(const std::string& field, bool on) +{ + // clang-format off + bool* f + = field == "cp_rank" ? &m_outputRank + : field == "cp_index" ? &m_outputIndex + : field == "cp_distance" ? &m_outputDistance + : field == "cp_coords" ? &m_outputCoords + : field == "cp_domain_index" ? &m_outputDomainIndex + : nullptr; + // clang-format on + SLIC_ERROR_IF( + f == nullptr, + axom::fmt::format( + "Invalid field '{}' should be one of these: " + "cp_rank, cp_index, cp_distance, cp_coords, cp_domain_index", + field)); + *f = on; +} + +void DistributedClosestPoint::setObjectMesh(const conduit::Node& meshNode, + const std::string& topologyName) +{ + SLIC_ASSERT(this->isValidBlueprint(meshNode)); + + const bool isMultidomain = + conduit::blueprint::mesh::is_multi_domain(meshNode); + + // If meshNode isn't multidomain, create a temporary multidomain representation. + std::shared_ptr tmpNode; + if(!isMultidomain) + { + tmpNode = std::make_shared(); + conduit::blueprint::mesh::to_multi_domain(meshNode, *tmpNode); + } + const conduit::Node& mdMeshNode(isMultidomain ? meshNode : *tmpNode); + verifyTopologyName(mdMeshNode, topologyName); + + auto domainCount = conduit::blueprint::mesh::number_of_domains(mdMeshNode); + + // Extract the dimension from the coordinate values group + // use allreduce since some ranks might be empty + { + int localDim = -1; + if(domainCount > 0) + { + const conduit::Node& domain0 = mdMeshNode.child(0); + const conduit::Node& topology = + domain0.fetch_existing("topologies/" + topologyName); + const std::string coordsetName = + topology.fetch_existing("coordset").as_string(); + const conduit::Node& coordset = + domain0.fetch_existing("coordsets/" + coordsetName); + const conduit::Node& coordsetValues = coordset.fetch_existing("values"); + localDim = internal::extractDimension(coordsetValues); + } + int dim = -1; + MPI_Allreduce(&localDim, &dim, 1, MPI_INT, MPI_MAX, m_mpiComm); + setDimension(dim); + } + + allocateQueryInstance(); + + switch(m_dimension) + { + case 2: + m_dcp_2->importObjectPoints(mdMeshNode, topologyName); + break; + case 3: + m_dcp_3->importObjectPoints(mdMeshNode, topologyName); + break; + } + + return; +} + +bool DistributedClosestPoint::generateBVHTree() +{ + SLIC_ASSERT_MSG(m_objectMeshCreated, + "Must call 'setObjectMesh' before calling generateBVHTree"); + + bool success = false; + + // dispatch to implementation class over dimension + switch(m_dimension) + { + case 2: + success = m_dcp_2->generateBVHTree(); + break; + case 3: + success = m_dcp_3->generateBVHTree(); + break; + } + + return success; +} + +void DistributedClosestPoint::computeClosestPoints( + conduit::Node& query_node, + const std::string& topology) +{ + SLIC_ASSERT_MSG(m_objectMeshCreated, + "Must call 'setObjectMesh' before calling generateBVHTree"); + + SLIC_ASSERT(this->isValidBlueprint(query_node)); + + // dispatch to implementation class over dimension + switch(m_dimension) + { + case 2: + m_dcp_2->setSquaredDistanceThreshold(m_sqDistanceThreshold); + m_dcp_2->setMpiCommunicator(m_mpiComm); + m_dcp_2->setOutputSwitches(m_outputRank, + m_outputIndex, + m_outputDistance, + m_outputCoords, + m_outputDomainIndex); + m_dcp_2->computeClosestPoints(query_node, topology); + break; + case 3: + m_dcp_3->setSquaredDistanceThreshold(m_sqDistanceThreshold); + m_dcp_3->setMpiCommunicator(m_mpiComm); + m_dcp_2->setOutputSwitches(m_outputRank, + m_outputIndex, + m_outputDistance, + m_outputCoords, + m_outputDomainIndex); + m_dcp_3->computeClosestPoints(query_node, topology); + break; + } +} + +void DistributedClosestPoint::allocateQueryInstance() +{ + SLIC_ASSERT_MSG(m_objectMeshCreated == false, "Object mesh already created"); + + switch(m_dimension) + { + case 2: + m_dcp_2 = std::make_unique>( + m_runtimePolicy, + m_allocatorID, + m_isVerbose); + m_objectMeshCreated = true; + break; + case 3: + m_dcp_3 = std::make_unique>( + m_runtimePolicy, + m_allocatorID, + m_isVerbose); + m_objectMeshCreated = true; + break; + } + + SLIC_ASSERT_MSG( + m_objectMeshCreated, + "Called allocateQueryInstance, but did not create an instance"); +} + +bool DistributedClosestPoint::isValidBlueprint(const conduit::Node& mesh_node) const +{ + bool success = true; + conduit::Node info; + if(!conduit::blueprint::mpi::verify("mesh", mesh_node, info, m_mpiComm)) + { + SLIC_INFO("Invalid blueprint for particle mesh: \n" << info.to_yaml()); + success = false; + } + + return success; +} + +void DistributedClosestPoint::verifyTopologyName( + const conduit::Node& meshNode, + const std::string& topologyName) +{ + std::string coordsetPath; + const std::string topologyPath = + axom::fmt::format("topologies/{}", topologyName); + for(axom::IndexType d = 0; d < meshNode.number_of_children(); ++d) + { + const auto& domain = meshNode.child(d); + if(!domain.has_path(topologyPath)) + { + auto errMsg = fmt::format("No such topology '{}' found.", topologyName); + if(domain.has_path("coordsets/" + topologyName)) + { + errMsg += fmt::format( + " You may have mistakenly specified a coordset name." + " The interface has changed to use topology name" + " instead of coordset."); + } + SLIC_ERROR(errMsg); + } + } +} + +} // end namespace quest +} // end namespace axom diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index cbdc51db5c..ef022ea502 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -7,19 +7,11 @@ #define QUEST_DISTRIBUTED_CLOSEST_POINT_H_ #include "axom/config.hpp" -#include "axom/core.hpp" -#include "axom/slic.hpp" #include "axom/core/execution/runtime_policy.hpp" -#include "axom/quest/detail/DistributedClosestPointImpl.hpp" -#include "axom/fmt.hpp" - -#include "conduit_blueprint.hpp" -#include "conduit_blueprint_mpi.hpp" -#include "conduit_relay_mpi.hpp" +#include "conduit_node.hpp" #include -#include #include #ifndef AXOM_USE_MPI @@ -31,6 +23,12 @@ namespace axom { namespace quest { + +namespace internal +{ +template class DistributedClosestPointImpl; +} + /** * \brief Encapsulated the Distributed closest point query for a collection of query points * over an "object mesh" @@ -61,26 +59,9 @@ class DistributedClosestPoint using RuntimePolicy = axom::runtime_policy::Policy; public: - DistributedClosestPoint() - : m_mpiComm(MPI_COMM_WORLD) - , m_mpiCommIsPrivate(false) - { - setDefaultAllocatorID(); - setMpiCommunicator(MPI_COMM_WORLD); - } - - ~DistributedClosestPoint() - { - if(m_mpiCommIsPrivate) - { - int mpiIsFinalized = 0; - MPI_Finalized(&mpiIsFinalized); - if(!mpiIsFinalized) - { - MPI_Comm_free(&m_mpiComm); - } - } - } + DistributedClosestPoint(); + + ~DistributedClosestPoint(); /*! @brief Set runtime execution policy for local queries @@ -92,113 +73,31 @@ class DistributedClosestPoint /*! @brief Sets the allocator ID to the default associated with the execution policy */ - void setDefaultAllocatorID() - { - int defaultAllocatorID = axom::INVALID_ALLOCATOR_ID; - switch(m_runtimePolicy) - { - case RuntimePolicy::seq: - defaultAllocatorID = axom::execution_space::allocatorID(); - break; - -#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP - case RuntimePolicy::omp: - defaultAllocatorID = axom::execution_space::allocatorID(); - break; -#endif - -#ifdef AXOM_RUNTIME_POLICY_USE_CUDA - case RuntimePolicy::cuda: - defaultAllocatorID = - axom::execution_space>::allocatorID(); - break; -#endif + void setDefaultAllocatorID(); -#ifdef AXOM_RUNTIME_POLICY_USE_HIP - case RuntimePolicy::hip: - defaultAllocatorID = - axom::execution_space>::allocatorID(); - break; -#endif - } - if(defaultAllocatorID == axom::INVALID_ALLOCATOR_ID) - { - SLIC_ERROR( - axom::fmt::format("There is no default allocator for runtime policy {}", - m_runtimePolicy)); - } - setAllocatorID(defaultAllocatorID); - } + /*! @brief Sets the allocator ID. - /*! @brief Sets the allocator ID to the default associated with the - execution policy + If not explitly set, the allocator ID is the default is the id + associated with the runtimer policy. */ - void setAllocatorID(int allocatorID) - { - SLIC_ASSERT_MSG(allocatorID != axom::INVALID_ALLOCATOR_ID, - "Invalid allocator id."); - m_allocatorID = allocatorID; - - if(m_dcp_2 != nullptr) - { - m_dcp_2->setAllocatorID(m_allocatorID); - } - if(m_dcp_3 != nullptr) - { - m_dcp_3->setAllocatorID(m_allocatorID); - } - } + void setAllocatorID(int allocatorID); /** * \brief Set the MPI communicator. * * By default, the communicator is MPI_COMM_WORLD. * - * \param mpiComm The MPI communicator to use. - * \param duplicate Whether to duplicate mpiComm for exclusive use - */ - void setMpiCommunicator(MPI_Comm mpiComm, bool duplicate = false) - { - if(m_mpiCommIsPrivate) - { - MPI_Comm_free(&m_mpiComm); - } - - if(duplicate) - { - MPI_Comm_dup(mpiComm, &m_mpiComm); - } - else - { - m_mpiComm = mpiComm; - } - m_mpiCommIsPrivate = duplicate; - } - - /** - * \brief Sets the dimension for the query - * - * \note Users do not need to call this function explicitly. The dimension - * is set by the \a setObjectMesh function + * \param [i] mpiComm The MPI communicator to use. + * \param [i] duplicate Whether to duplicate mpiComm for exclusive use */ - void setDimension(int dim) - { - SLIC_ERROR_IF( - dim < 2 || dim > 3, - "DistributedClosestPoint query only supports 2D or 3D queries"); - m_dimension = dim; - } + void setMpiCommunicator(MPI_Comm mpiComm, bool duplicate = false); /** * \brief Sets the threshold for the query * * \param [in] threshold Ignore distances greater than this value. */ - void setDistanceThreshold(double threshold) - { - SLIC_ERROR_IF(threshold < 0.0, "Distance threshold must be non-negative."); - m_sqDistanceThreshold = threshold * threshold; - } + void setDistanceThreshold(double threshold); /*! @brief Set what fields to output. @@ -209,25 +108,7 @@ class DistributedClosestPoint By default, all are on. */ - void setOutput(const std::string& field, bool on) - { - // clang-format off - bool* f - = field == "cp_rank" ? &m_outputRank - : field == "cp_index" ? &m_outputIndex - : field == "cp_distance" ? &m_outputDistance - : field == "cp_coords" ? &m_outputCoords - : field == "cp_domain_index" ? &m_outputDomainIndex - : nullptr; - // clang-format on - SLIC_ERROR_IF( - f == nullptr, - axom::fmt::format( - "Invalid field '{}' should be one of these: " - "cp_rank, cp_index, cp_distance, cp_coords, cp_domain_index", - field)); - *f = on; - } + void setOutput(const std::string& field, bool on); /// Sets the logging verbosity of the query. By default the query is not verbose void setVerbosity(bool isVerbose) { m_isVerbose = isVerbose; } @@ -242,60 +123,7 @@ class DistributedClosestPoint * \pre Dimension of the mesh must be 2D or 3D */ void setObjectMesh(const conduit::Node& meshNode, - const std::string& topologyName) - { - SLIC_ASSERT(this->isValidBlueprint(meshNode)); - - const bool isMultidomain = - conduit::blueprint::mesh::is_multi_domain(meshNode); - - // If meshNode isn't multidomain, create a temporary multidomain representation. - std::shared_ptr tmpNode; - if(!isMultidomain) - { - tmpNode = std::make_shared(); - conduit::blueprint::mesh::to_multi_domain(meshNode, *tmpNode); - } - const conduit::Node& mdMeshNode(isMultidomain ? meshNode : *tmpNode); - verifyTopologyName(mdMeshNode, topologyName); - - auto domainCount = conduit::blueprint::mesh::number_of_domains(mdMeshNode); - - // Extract the dimension from the coordinate values group - // use allreduce since some ranks might be empty - { - int localDim = -1; - if(domainCount > 0) - { - const conduit::Node& domain0 = mdMeshNode.child(0); - const conduit::Node& topology = - domain0.fetch_existing("topologies/" + topologyName); - const std::string coordsetName = - topology.fetch_existing("coordset").as_string(); - const conduit::Node& coordset = - domain0.fetch_existing("coordsets/" + coordsetName); - const conduit::Node& coordsetValues = coordset.fetch_existing("values"); - localDim = internal::extractDimension(coordsetValues); - } - int dim = -1; - MPI_Allreduce(&localDim, &dim, 1, MPI_INT, MPI_MAX, m_mpiComm); - setDimension(dim); - } - - allocateQueryInstance(); - - switch(m_dimension) - { - case 2: - m_dcp_2->importObjectPoints(mdMeshNode, topologyName); - break; - case 3: - m_dcp_3->importObjectPoints(mdMeshNode, topologyName); - break; - } - - return; - } + const std::string& topologyName); /** * \brief Generates a BVH tree over the object mesh using the runtime execution policy @@ -303,26 +131,7 @@ class DistributedClosestPoint * \pre Users must set the object mesh before generating the BVH tree * \sa setObjectMesh() */ - bool generateBVHTree() - { - SLIC_ASSERT_MSG(m_objectMeshCreated, - "Must call 'setObjectMesh' before calling generateBVHTree"); - - bool success = false; - - // dispatch to implementation class over dimension - switch(m_dimension) - { - case 2: - success = m_dcp_2->generateBVHTree(); - break; - case 3: - success = m_dcp_3->generateBVHTree(); - break; - } - - return success; - } + bool generateBVHTree(); /** * \brief Computes the closest point on the object mesh for each point @@ -350,113 +159,27 @@ class DistributedClosestPoint * \note The current implementation assumes that the mesh coordinates * are interleaved or contiguous. The output cp_coords will be contiguous. */ - void computeClosestPoints(conduit::Node& query_node, const std::string& topology) - { - SLIC_ASSERT_MSG(m_objectMeshCreated, - "Must call 'setObjectMesh' before calling generateBVHTree"); - - SLIC_ASSERT(this->isValidBlueprint(query_node)); - - // dispatch to implementation class over dimension - switch(m_dimension) - { - case 2: - m_dcp_2->setSquaredDistanceThreshold(m_sqDistanceThreshold); - m_dcp_2->setMpiCommunicator(m_mpiComm); - m_dcp_2->setOutputSwitches(m_outputRank, - m_outputIndex, - m_outputDistance, - m_outputCoords, - m_outputDomainIndex); - m_dcp_2->computeClosestPoints(query_node, topology); - break; - case 3: - m_dcp_3->setSquaredDistanceThreshold(m_sqDistanceThreshold); - m_dcp_3->setMpiCommunicator(m_mpiComm); - m_dcp_2->setOutputSwitches(m_outputRank, - m_outputIndex, - m_outputDistance, - m_outputCoords, - m_outputDomainIndex); - m_dcp_3->computeClosestPoints(query_node, topology); - break; - } - } + void computeClosestPoints(conduit::Node& query_node, const std::string& topology); private: - void allocateQueryInstance() - { - SLIC_ASSERT_MSG(m_objectMeshCreated == false, "Object mesh already created"); - - switch(m_dimension) - { - case 2: - m_dcp_2 = std::make_unique>( - m_runtimePolicy, - m_allocatorID, - m_isVerbose); - m_objectMeshCreated = true; - break; - case 3: - m_dcp_3 = std::make_unique>( - m_runtimePolicy, - m_allocatorID, - m_isVerbose); - m_objectMeshCreated = true; - break; - } - - SLIC_ASSERT_MSG( - m_objectMeshCreated, - "Called allocateQueryInstance, but did not create an instance"); - } + //!@brief Create the implementation objects, either m_dcp_2 or m_dcp_3. + void allocateQueryInstance(); /// Check validity of blueprint group - bool isValidBlueprint(const conduit::Node& mesh_node) const - { - bool success = true; - conduit::Node info; - if(!conduit::blueprint::mpi::verify("mesh", mesh_node, info, m_mpiComm)) - { - SLIC_INFO("Invalid blueprint for particle mesh: \n" << info.to_yaml()); - success = false; - } - - return success; - } + bool isValidBlueprint(const conduit::Node& mesh_node) const; void verifyTopologyName(const conduit::Node& meshNode, - const std::string& topologyName) - { - std::string coordsetPath; - const std::string topologyPath = - axom::fmt::format("topologies/{}", topologyName); - for(axom::IndexType d = 0; d < meshNode.number_of_children(); ++d) - { - const auto& domain = meshNode.child(d); - if(!domain.has_path(topologyPath)) - { - auto errMsg = fmt::format("No such topology '{}' found.", topologyName); - if(domain.has_path("coordsets/" + topologyName)) - { - errMsg += fmt::format( - " You may have mistakenly specified a coordset name." - " The interface has changed to use topology name" - " instead of coordset."); - } - SLIC_ERROR(errMsg); - } - } - } + const std::string& topologyName); + + void setDimension(int dim); -private: RuntimePolicy m_runtimePolicy {RuntimePolicy::seq}; MPI_Comm m_mpiComm; bool m_mpiCommIsPrivate; - int m_allocatorID {axom::INVALID_ALLOCATOR_ID}; + int m_allocatorID; int m_dimension {-1}; bool m_isVerbose {false}; - double m_sqDistanceThreshold {std::numeric_limits::max()}; + double m_sqDistanceThreshold; bool m_objectMeshCreated {false}; diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index fd21a33907..43f6d232fd 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -1382,7 +1382,6 @@ int main(int argc, char** argv) query.setAllocatorID(umpireAllocator.getId()); #endif query.setMpiCommunicator(MPI_COMM_WORLD, true); - query.setDimension(DIM); query.setVerbosity(params.isVerbose()); query.setDistanceThreshold(params.distThreshold); // To test support for single-domain format, use single-domain when possible. diff --git a/src/axom/quest/tests/quest_intersection_shaper.cpp b/src/axom/quest/tests/quest_intersection_shaper.cpp index 05c4efe733..cb49686824 100644 --- a/src/axom/quest/tests/quest_intersection_shaper.cpp +++ b/src/axom/quest/tests/quest_intersection_shaper.cpp @@ -20,6 +20,7 @@ #include "axom/slic.hpp" #include "axom/quest/IntersectionShaper.hpp" #include "axom/quest/util/mesh_helpers.hpp" +#include "conduit_relay_io.hpp" #ifndef AXOM_USE_MFEM #error "Quest's IntersectionShaper tests on mfem meshes require mfem library." From 35a9f03e6703755c9ce22d2457f96fbb0a524033 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 13 Dec 2023 10:09:54 -0800 Subject: [PATCH 324/639] noop change to retrigger pipelines --- .gitlab/build_quartz.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab/build_quartz.yml b/.gitlab/build_quartz.yml index 8cd1644a1d..34f6fc1c31 100644 --- a/.gitlab/build_quartz.yml +++ b/.gitlab/build_quartz.yml @@ -46,8 +46,6 @@ quartz_release: .src_build_on_quartz: stage: build variables: - # Use when ellastic ci is on quartz or we go back to ruby - # ALLOC_COMMAND: "srun --reservation=ci --qos=ci_ruby -t 60 -N 1 " ALLOC_COMMAND: "srun -t 60 -N 1 -p pdebug" extends: [.src_build_script, .on_quartz, .src_workflow] needs: [quartz_allocate] @@ -55,8 +53,6 @@ quartz_release: .full_build_on_quartz: stage: build variables: - # Use when ellastic ci is on quartz or we go back to ruby - # ALLOC_COMMAND: "srun --reservation=ci --qos=ci_ruby -t 60 -N 1 " ALLOC_COMMAND: "srun -t 60 -N 1 -p pdebug" extends: [.full_build_script, .on_quartz, .full_workflow] needs: [] From 25a631b38f2d7112936d7b5d7288e66c8aa4746d Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 13 Dec 2023 10:37:38 -0800 Subject: [PATCH 325/639] Auto-format. --- src/axom/quest/DistributedClosestPoint.cpp | 50 ++++++++++------------ src/axom/quest/DistributedClosestPoint.hpp | 7 +-- 2 files changed, 26 insertions(+), 31 deletions(-) diff --git a/src/axom/quest/DistributedClosestPoint.cpp b/src/axom/quest/DistributedClosestPoint.cpp index c1af2e0adf..7429aa286d 100644 --- a/src/axom/quest/DistributedClosestPoint.cpp +++ b/src/axom/quest/DistributedClosestPoint.cpp @@ -29,7 +29,6 @@ namespace axom { namespace quest { - DistributedClosestPoint::DistributedClosestPoint() : m_mpiComm(MPI_COMM_WORLD) , m_mpiCommIsPrivate(false) @@ -69,12 +68,12 @@ void DistributedClosestPoint::setDefaultAllocatorID() #endif #ifdef __CUDACC__ -#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + #ifdef AXOM_RUNTIME_POLICY_USE_CUDA case RuntimePolicy::cuda: defaultAllocatorID = axom::execution_space>::allocatorID(); break; -#endif + #endif #endif #ifdef AXOM_RUNTIME_POLICY_USE_HIP @@ -129,9 +128,8 @@ void DistributedClosestPoint::setMpiCommunicator(MPI_Comm mpiComm, bool duplicat void DistributedClosestPoint::setDimension(int dim) { - SLIC_ERROR_IF( - dim < 2 || dim > 3, - "DistributedClosestPoint query only supports 2D or 3D queries"); + SLIC_ERROR_IF(dim < 2 || dim > 3, + "DistributedClosestPoint query only supports 2D or 3D queries"); m_dimension = dim; } @@ -152,12 +150,11 @@ void DistributedClosestPoint::setOutput(const std::string& field, bool on) : field == "cp_domain_index" ? &m_outputDomainIndex : nullptr; // clang-format on - SLIC_ERROR_IF( - f == nullptr, - axom::fmt::format( - "Invalid field '{}' should be one of these: " - "cp_rank, cp_index, cp_distance, cp_coords, cp_domain_index", - field)); + SLIC_ERROR_IF(f == nullptr, + axom::fmt::format( + "Invalid field '{}' should be one of these: " + "cp_rank, cp_index, cp_distance, cp_coords, cp_domain_index", + field)); *f = on; } @@ -166,8 +163,7 @@ void DistributedClosestPoint::setObjectMesh(const conduit::Node& meshNode, { SLIC_ASSERT(this->isValidBlueprint(meshNode)); - const bool isMultidomain = - conduit::blueprint::mesh::is_multi_domain(meshNode); + const bool isMultidomain = conduit::blueprint::mesh::is_multi_domain(meshNode); // If meshNode isn't multidomain, create a temporary multidomain representation. std::shared_ptr tmpNode; @@ -238,9 +234,8 @@ bool DistributedClosestPoint::generateBVHTree() return success; } -void DistributedClosestPoint::computeClosestPoints( - conduit::Node& query_node, - const std::string& topology) +void DistributedClosestPoint::computeClosestPoints(conduit::Node& query_node, + const std::string& topology) { SLIC_ASSERT_MSG(m_objectMeshCreated, "Must call 'setObjectMesh' before calling generateBVHTree"); @@ -280,17 +275,17 @@ void DistributedClosestPoint::allocateQueryInstance() switch(m_dimension) { case 2: - m_dcp_2 = std::make_unique>( - m_runtimePolicy, - m_allocatorID, - m_isVerbose); + m_dcp_2 = + std::make_unique>(m_runtimePolicy, + m_allocatorID, + m_isVerbose); m_objectMeshCreated = true; break; case 3: - m_dcp_3 = std::make_unique>( - m_runtimePolicy, - m_allocatorID, - m_isVerbose); + m_dcp_3 = + std::make_unique>(m_runtimePolicy, + m_allocatorID, + m_isVerbose); m_objectMeshCreated = true; break; } @@ -313,9 +308,8 @@ bool DistributedClosestPoint::isValidBlueprint(const conduit::Node& mesh_node) c return success; } -void DistributedClosestPoint::verifyTopologyName( - const conduit::Node& meshNode, - const std::string& topologyName) +void DistributedClosestPoint::verifyTopologyName(const conduit::Node& meshNode, + const std::string& topologyName) { std::string coordsetPath; const std::string topologyPath = diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index ef022ea502..35b4009a01 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -23,10 +23,10 @@ namespace axom { namespace quest { - namespace internal { -template class DistributedClosestPointImpl; +template +class DistributedClosestPointImpl; } /** @@ -159,7 +159,8 @@ class DistributedClosestPoint * \note The current implementation assumes that the mesh coordinates * are interleaved or contiguous. The output cp_coords will be contiguous. */ - void computeClosestPoints(conduit::Node& query_node, const std::string& topology); + void computeClosestPoints(conduit::Node& query_node, + const std::string& topology); private: //!@brief Create the implementation objects, either m_dcp_2 or m_dcp_3. From cfb19283fd6f29f3e3a59a0952f4e0dde9d7c808 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 13 Dec 2023 10:37:53 -0800 Subject: [PATCH 326/639] Add missing include. --- src/axom/quest/detail/DistributedClosestPointImpl.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/axom/quest/detail/DistributedClosestPointImpl.hpp b/src/axom/quest/detail/DistributedClosestPointImpl.hpp index 3aa6bca1f7..554c86c2e2 100644 --- a/src/axom/quest/detail/DistributedClosestPointImpl.hpp +++ b/src/axom/quest/detail/DistributedClosestPointImpl.hpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #ifndef AXOM_USE_MPI From a0494254b60e44003e9f646032842ad001ea4f17 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 13 Dec 2023 11:16:55 -0800 Subject: [PATCH 327/639] remove pdebug --- .gitlab/build_quartz.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/build_quartz.yml b/.gitlab/build_quartz.yml index 34f6fc1c31..3c0e851846 100644 --- a/.gitlab/build_quartz.yml +++ b/.gitlab/build_quartz.yml @@ -26,7 +26,7 @@ quartz_allocate: extends: [.on_quartz, .src_workflow] stage: allocate script: - - salloc -N 1 -c 36 -t 60 -p pdebug --res=ci --no-shell --job-name=${PROJECT_ALLOC_NAME} + - salloc -N 1 -c 36 -t 60 --res=ci --no-shell --job-name=${PROJECT_ALLOC_NAME} needs: [] #### From 10499586c3f6c17896330aef2bad994dc88d99ac Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 15 Dec 2023 10:48:19 -0800 Subject: [PATCH 328/639] Fix typos and other small changes from code review comments. --- RELEASE-NOTES.md | 2 +- .../examples/quest_marching_cubes_example.cpp | 51 +++++++++---------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 3674408bd5..2a985a2cbe 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -34,7 +34,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - `fullParallel` works best on GPUs. - `partialParallel` reduces the amount of data processed and works best with `MarchingCubesRuntimePolicy::seq`. - - `byPolicy` (the default) selects the implementation based the runtime policy. + - `byPolicy` (the default) selects the implementation based on the runtime policy. - `MarchingCubes` and `DistributedClosestPoint` classes changed from requiring the Blueprint coordset name to requiring the Blueprint topology name. The changed interface methods are: - `DistributedClosestPoint::setObjectMesh` diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index d7a95158b6..294a2cc872 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -76,15 +76,12 @@ struct Input std::string fieldsFile {"fields"}; // Center of round contour function - bool usingRound {false}; std::vector fcnCenter; // Scaling factor for gyroid function - bool usingGyroid {false}; std::vector gyroidScale; // Parameters for planar contour function - bool usingPlanar {false}; std::vector inPlane; std::vector perpDir; @@ -159,7 +156,11 @@ struct Input ->description("Enable/disable verbose output") ->capture_default_str(); - auto* distFromPtOption = app.add_option_group( + auto* distanceFunctionOption = app.add_option_group( + "distanceFunctionOption", + "Options for specifying a distance function."); + + auto* distFromPtOption = distanceFunctionOption->add_option_group( "distFromPtOption", "Options for setting up distance-from-point function"); distFromPtOption->add_option("--center", fcnCenter) @@ -167,22 +168,26 @@ struct Input ->expected(2, 3); auto* gyroidOption = - app.add_option_group("gyroidOption", - "Options for setting up gyroid function"); + distanceFunctionOption->add_option_group("gyroidOption", + "Options for setting up gyroid function"); gyroidOption->add_option("--scale", gyroidScale) ->description("Scaling factor for gyroid function (x,y[,z])") ->expected(2, 3); - auto* distFromPlaneOption = app.add_option_group( + auto* distFromPlaneOption = distanceFunctionOption->add_option_group( "distFromPlaneOption", "Options for setting up distance-from-plane function"); - distFromPlaneOption->add_option("--inPlane", inPlane) - ->description("In-plane point for distance-from-plane function (x,y[,z])") - ->expected(2, 3); - distFromPlaneOption->add_option("--dir", perpDir) + auto* perpDirOption = distFromPlaneOption->add_option("--dir", perpDir) ->description( "Positive direction for distance-from-plane function (x,y[,z])") ->expected(2, 3); + distFromPlaneOption->add_option("--inPlane", inPlane) + ->description("In-plane point for distance-from-plane function (x,y[,z])") + ->expected(2, 3) + ->needs(perpDirOption); + + // Require at least one distance function, and allow all three. + distanceFunctionOption->require_option(1, 3); app.add_option("--contourVal", contourVal) ->description("Contour value") @@ -201,10 +206,7 @@ struct Input slic::setLoggingMsgLevel(_verboseOutput ? slic::message::Debug : slic::message::Info); - ndim = std::max(ndim, fcnCenter.size()); - ndim = std::max(ndim, inPlane.size()); - ndim = std::max(ndim, perpDir.size()); - ndim = std::max(ndim, gyroidScale.size()); + ndim = std::max({ndim, fcnCenter.size(), inPlane.size(), perpDir.size(), gyroidScale.size() }); SLIC_ASSERT_MSG((fcnCenter.empty() || fcnCenter.size() == ndim) && (inPlane.empty() || inPlane.size() == ndim) && (perpDir.empty() || perpDir.size() == ndim) && @@ -212,20 +214,17 @@ struct Input "fcnCenter, inPlane and perpDir must have consistent sizes " "if specified."); - usingPlanar = !perpDir.empty(); - usingRound = !fcnCenter.empty(); - usingGyroid = !gyroidScale.empty(); - SLIC_ASSERT_MSG(usingPlanar || usingRound || usingGyroid, - "No functions specified. Please specify a comibnation of " - "round, gyroid or planar functions."); - // inPlane defaults to origin if omitted. - if(usingPlanar && inPlane.empty()) + if(usingPlanar() && inPlane.empty()) { inPlane.insert(inPlane.begin(), ndim, 0.0); } } + bool usingPlanar() { return !perpDir.empty(); } + bool usingRound() { return !fcnCenter.empty(); } + bool usingGyroid() { return !gyroidScale.empty(); } + template axom::primal::Point roundContourCenter() const { @@ -1568,14 +1567,14 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) std::shared_ptr> gyroidTest; std::shared_ptr> planarTest; - if(params.usingRound) + if(params.usingRound()) { roundTest = std::make_shared>( params.roundContourCenter()); roundTest->setToleranceByLongestEdge(computationalMesh); roundTest->computeNodalDistance(computationalMesh); } - if(params.usingGyroid) + if(params.usingGyroid()) { gyroidTest = std::make_shared>( params.gyroidScaleFactor(), @@ -1583,7 +1582,7 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) gyroidTest->setToleranceByLongestEdge(computationalMesh); gyroidTest->computeNodalDistance(computationalMesh); } - if(params.usingPlanar) + if(params.usingPlanar()) { planarTest = std::make_shared>( params.inplanePoint(), From 327e88cf744c6fabdcf8c7e345e69860e6354120 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 15 Dec 2023 10:53:32 -0800 Subject: [PATCH 329/639] Remove redundant code where for_all supports non-RAJA builds. --- .../quest/detail/MarchingCubesFullParallel.hpp | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index 1b2d75035e..e4e858a58a 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -270,7 +270,6 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_facetIncrs.resize(parentCellCount); const auto facetIncrsView = m_facetIncrs.view(); - #if defined(AXOM_USE_RAJA) axom::for_all( 0, parentCellCount, @@ -278,13 +277,6 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase facetIncrsView.flatIndex(parentCellId) = num_contour_cells(caseIdsView.flatIndex(parentCellId)); }); - #else - for(axom::IndexType pcId = 0; pcId < parentCellCount; ++pcId) - { - facetIncrsView.flatIndex(pcId) = - num_contour_cells(caseIdsView.flatIndex(pcId)); - } - #endif // Compute index of first facet added by each parent cell // (whether the cell generates any facet!). @@ -408,14 +400,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase } }; - #if defined(AXOM_USE_RAJA) axom::for_all(0, parentCellCount, gen_for_parent_cell); - #else - for(axom::IndexType pcId = 1; pcId < parentCellCount; ++pcId) - { - gen_for_parent_cell(pcId); - } - #endif } /*! From e260351f57d69064b88e9fd108f5cbeabf8657ea Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 11 Aug 2023 09:05:08 -0700 Subject: [PATCH 330/639] First pass dockerfile --- scripts/docker/dockerfile_gcc-9_cuda-11 | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 scripts/docker/dockerfile_gcc-9_cuda-11 diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 new file mode 100644 index 0000000000..5d6f57b1ef --- /dev/null +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -0,0 +1,9 @@ +# This script can be run with the following command: +# docker build --build-arg branch= -t "axom/tpls:gcc-11" - < dockerfile_gcc-9_cuda-11 + +FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.1.1 +ARG branch=develop + +SHELL ["/bin/bash", "-c"] +RUN sudo apt-get update -y +RUN sudo apt-get install doxygen gfortran graphviz libopenblas-dev libomp-dev mpich python3-sphinx ssh texlive-full -fy From 004558cb26ce0d4674747875c43aa890987019a8 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 11 Aug 2023 09:57:37 -0700 Subject: [PATCH 331/639] Adjust recommended command, try uberenv... --- scripts/docker/dockerfile_gcc-9_cuda-11 | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 5d6f57b1ef..ecd783c8bd 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -1,9 +1,27 @@ -# This script can be run with the following command: -# docker build --build-arg branch= -t "axom/tpls:gcc-11" - < dockerfile_gcc-9_cuda-11 +# This script can be run with the following command from the root axom directory: +# docker build --build-arg branch= -t "axom/tpls:gcc-9-cuda-11" -f ./scripts/docker/dockerfile_gcc-9_cuda-11 . FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.1.1 -ARG branch=develop +ARG branch=feature/han12/docker_tutorial SHELL ["/bin/bash", "-c"] RUN sudo apt-get update -y RUN sudo apt-get install doxygen gfortran graphviz libopenblas-dev libomp-dev mpich python3-sphinx ssh texlive-full -fy + +WORKDIR "/home/axom" +USER axom + +RUN git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo + +# Build/install TPLs via spack and then remove the temporary build directory on success +RUN cd axom_repo && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20/spack.yaml \ + --project-json=.uberenv_config.json \ + --spec=%gcc@9.3.0+mfem+raja+umpire --prefix=/home/axom/axom_tpls -k \ + && rm -rf /home/axom/axom_tpls/builds + +RUN mkdir -p /home/axom/export_hostconfig +RUN cp ./axom_repo/*.cmake /home/axom/export_hostconfig + +# Make sure the new hostconfig worked +# Note: having high job slots causes build log to disappear and job to fail +RUN cd axom_repo && python3 config-build.py -hc *.cmake -bp build && cd build && make -j4 && make -j4 test && cd /home/axom && rm -rf axom_repo \ No newline at end of file From 127be2b5e43af59accf7a7261b763dcb3b36bb13 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 11 Aug 2023 10:32:00 -0700 Subject: [PATCH 332/639] Try fix user issue --- scripts/docker/dockerfile_gcc-9_cuda-11 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index ecd783c8bd..9bd4e96323 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -3,13 +3,17 @@ FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.1.1 ARG branch=feature/han12/docker_tutorial +ARG USER=axomdev +ENV HOME /home/${USER} SHELL ["/bin/bash", "-c"] RUN sudo apt-get update -y +RUN sudo apt-get install -y supervisor +RUN sudo useradd --create-home --shell /bin/bash ${USER} RUN sudo apt-get install doxygen gfortran graphviz libopenblas-dev libomp-dev mpich python3-sphinx ssh texlive-full -fy WORKDIR "/home/axom" -USER axom +USER ${USER} RUN git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo From b493ffc1f35e4e6c6c469d70c2653ce0cf634213 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 11 Aug 2023 11:23:40 -0700 Subject: [PATCH 333/639] Try permissions again --- scripts/docker/dockerfile_gcc-9_cuda-11 | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 9bd4e96323..75ad96000c 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -15,6 +15,7 @@ RUN sudo apt-get install doxygen gfortran graphviz libopenblas-dev libomp-dev mp WORKDIR "/home/axom" USER ${USER} +RUN sudo chown -R $USER . RUN git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo # Build/install TPLs via spack and then remove the temporary build directory on success From aac595e533d2ab394221a62dd30605553af317eb Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 11 Aug 2023 11:25:52 -0700 Subject: [PATCH 334/639] ordering --- scripts/docker/dockerfile_gcc-9_cuda-11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 75ad96000c..b27c8dda45 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -11,11 +11,11 @@ RUN sudo apt-get update -y RUN sudo apt-get install -y supervisor RUN sudo useradd --create-home --shell /bin/bash ${USER} RUN sudo apt-get install doxygen gfortran graphviz libopenblas-dev libomp-dev mpich python3-sphinx ssh texlive-full -fy +RUN sudo chown -R $USER /home/axom WORKDIR "/home/axom" USER ${USER} -RUN sudo chown -R $USER . RUN git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo # Build/install TPLs via spack and then remove the temporary build directory on success From 5dc24ff34cc7a57387ecf278b181a2c91479cab4 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 11 Aug 2023 11:32:12 -0700 Subject: [PATCH 335/639] Add vscode stuff partly, use COPY to change permissions --- scripts/docker/dockerfile_gcc-9_cuda-11 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index b27c8dda45..ebec4fd977 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -11,11 +11,16 @@ RUN sudo apt-get update -y RUN sudo apt-get install -y supervisor RUN sudo useradd --create-home --shell /bin/bash ${USER} RUN sudo apt-get install doxygen gfortran graphviz libopenblas-dev libomp-dev mpich python3-sphinx ssh texlive-full -fy -RUN sudo chown -R $USER /home/axom -WORKDIR "/home/axom" +WORKDIR /opt/archives +RUN curl -L https://github.com/gitpod-io/openvscode-server/releases/download/openvscode-server-v1.69.1/openvscode-server-v1.69.1-linux-x64.tar.gz > \ + /opt/archives/openvscode-server-v1.69.1-linux-x64.tar.gz +RUN tar xzf openvscode-server-v1.69.1-linux-x64.tar.gz && chown -R ${USER}:${USER} openvscode-server-v1.69.1-linux-x64 + +#WORKDIR "/home/axom" USER ${USER} +COPY --chown=axomdev:axomdev . $HOME RUN git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo # Build/install TPLs via spack and then remove the temporary build directory on success From 85dc08bd6d84e5f7aced47fc877dd2c7be11e3d2 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 11 Aug 2023 11:36:43 -0700 Subject: [PATCH 336/639] Go to home dir --- scripts/docker/dockerfile_gcc-9_cuda-11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index ebec4fd977..71e926597d 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -21,7 +21,7 @@ RUN tar xzf openvscode-server-v1.69.1-linux-x64.tar.gz && chown -R ${USER}:${USE USER ${USER} COPY --chown=axomdev:axomdev . $HOME -RUN git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo +RUN cd ${HOME} && git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo # Build/install TPLs via spack and then remove the temporary build directory on success RUN cd axom_repo && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20/spack.yaml \ From feec0e975a6300185bad2a5621860eadfc857ef4 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 11 Aug 2023 13:06:52 -0700 Subject: [PATCH 337/639] Add HOME prefix to everything; do not delete cmake build directory at completion --- scripts/docker/dockerfile_gcc-9_cuda-11 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 71e926597d..8853e69df8 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -24,14 +24,14 @@ COPY --chown=axomdev:axomdev . $HOME RUN cd ${HOME} && git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo # Build/install TPLs via spack and then remove the temporary build directory on success -RUN cd axom_repo && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20/spack.yaml \ +RUN cd ${HOME}/axom_repo && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20/spack.yaml \ --project-json=.uberenv_config.json \ - --spec=%gcc@9.3.0+mfem+raja+umpire --prefix=/home/axom/axom_tpls -k \ - && rm -rf /home/axom/axom_tpls/builds + --spec=%gcc@9.3.0+mfem+raja+umpire --prefix=${HOME}/axom_tpls -k \ + && rm -rf ${HOME}/axom_tpls/builds -RUN mkdir -p /home/axom/export_hostconfig -RUN cp ./axom_repo/*.cmake /home/axom/export_hostconfig +RUN mkdir -p ${HOME}/export_hostconfig +RUN cp ${HOME}/axom_repo/*.cmake ${HOME}/export_hostconfig # Make sure the new hostconfig worked # Note: having high job slots causes build log to disappear and job to fail -RUN cd axom_repo && python3 config-build.py -hc *.cmake -bp build && cd build && make -j4 && make -j4 test && cd /home/axom && rm -rf axom_repo \ No newline at end of file +RUN cd ${HOME}/axom_repo && python3 config-build.py -hc *.cmake -bp build && cd build && make -j4 && make -j4 test From f2280d98b3015d533da6bba2f3c9b34534d1b40e Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 11 Aug 2023 13:23:15 -0700 Subject: [PATCH 338/639] Add gcc compiler; add cuda path --- .../spack/configs/docker/ubuntu20/spack.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/scripts/spack/configs/docker/ubuntu20/spack.yaml b/scripts/spack/configs/docker/ubuntu20/spack.yaml index 8f0ea2529d..a8e9b3340c 100644 --- a/scripts/spack/configs/docker/ubuntu20/spack.yaml +++ b/scripts/spack/configs/docker/ubuntu20/spack.yaml @@ -48,6 +48,21 @@ spack: fc: /usr/bin/gfortran spec: gcc@11.1.0 target: x86_64 + - compiler: + environment: {} + extra_rpaths: [] + flags: + cflags: -pthread + cxxflags: -pthread + modules: [] + operating_system: ubuntu20.04 + paths: + cc: /usr/bin/gcc + cxx: /usr/bin/g++ + f77: /usr/bin/gfortran + fc: /usr/bin/gfortran + spec: gcc@9.3.0 + target: x86_64 packages: all: @@ -94,6 +109,11 @@ spack: externals: - spec: bzip2@1.0.6 prefix: /usr + cuda: + buildable: false + externals: + - spec: cuda@11.1.1 + prefix: /usr/local/cuda gettext: buildable: false externals: From 0cbc698353c14139bdaa97e5d6da99cfdf1b503c Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 11 Aug 2023 13:50:46 -0700 Subject: [PATCH 339/639] Add separate spack.yaml --- scripts/docker/dockerfile_gcc-9_cuda-11 | 2 +- .../configs/docker/ubuntu20_cuda/spack.yaml | 201 ++++++++++++++++++ 2 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 8853e69df8..f9a22a1435 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -24,7 +24,7 @@ COPY --chown=axomdev:axomdev . $HOME RUN cd ${HOME} && git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo # Build/install TPLs via spack and then remove the temporary build directory on success -RUN cd ${HOME}/axom_repo && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20/spack.yaml \ +RUN cd ${HOME}/axom_repo && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml \ --project-json=.uberenv_config.json \ --spec=%gcc@9.3.0+mfem+raja+umpire --prefix=${HOME}/axom_tpls -k \ && rm -rf ${HOME}/axom_tpls/builds diff --git a/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml b/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml new file mode 100644 index 0000000000..7ba09772b2 --- /dev/null +++ b/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml @@ -0,0 +1,201 @@ +# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Axom Project Developers. See the top-level LICENSE file for details. +# +# SPDX-License-Identifier: (BSD-3-Clause) + +spack: + config: + install_tree: + root: $spack/.. + projections: + all: '{compiler.name}-{compiler.version}/{name}-{version}-{hash}' + misc_cache: $spack/../misc_cache + test_stage: $spack/../test_stage + build_stage:: + - $spack/../build_stage + + # Regular TPLs do not need views + view: false + + compilers:: + - compiler: + environment: {} + extra_rpaths: [] + flags: + cflags: -pthread + cxxflags: -pthread + modules: [] + operating_system: ubuntu20.04 + paths: + cc: /usr/bin/clang + cxx: /usr/bin/clang++ + f77: /usr/bin/gfortran + fc: /usr/bin/gfortran + spec: clang@10.0.0 + target: x86_64 + - compiler: + environment: {} + extra_rpaths: [] + flags: + cflags: -pthread + cxxflags: -pthread + modules: [] + operating_system: ubuntu20.04 + paths: + cc: /usr/bin/gcc + cxx: /usr/bin/g++ + f77: /usr/bin/gfortran + fc: /usr/bin/gfortran + spec: gcc@11.1.0 + target: x86_64 + - compiler: + environment: {} + extra_rpaths: [] + flags: + cflags: -pthread + cxxflags: -pthread + modules: [] + operating_system: ubuntu20.04 + paths: + cc: /usr/bin/gcc + cxx: /usr/bin/g++ + f77: /usr/bin/gfortran + fc: /usr/bin/gfortran + spec: gcc@9.3.0 + target: x86_64 + + packages: + all: + # This defaults us to machine specific flags of ivybridge which allows + # us to run on broadwell as well + target: [x86_64] + compiler: [gcc, intel, pgi, clang, xl, nag] + providers: + awk: [gawk] + blas: [openblas] + lapack: [openblas] + daal: [intel-daal] + elf: [elfutils] + golang: [gcc] + ipp: [intel-ipp] + java: [jdk] + mkl: [intel-mkl] + mpe: [mpe2] + mpi: [mpich] + opencl: [pocl] + openfoam: [openfoam-com, openfoam-org, foam-extend] + pil: [py-pillow] + scalapack: [netlib-scalapack] + szip: [libszip, libaec] + tbb: [intel-tbb] + jpeg: [libjpeg-turbo, libjpeg] + + # Spack may grab for mpi & we don't want to use them + mpi: + buildable: false + mpich: + externals: + - spec: mpich@3.3 + prefix: /usr + + # System level packages to not build + autotools: + buildable: false + externals: + - spec: autotools@2.69 + prefix: /usr + bzip2: + buildable: false + externals: + - spec: bzip2@1.0.6 + prefix: /usr + cuda: + buildable: false + externals: + - spec: cuda@11.1.1 + prefix: /usr/local/cuda + gettext: + buildable: false + externals: + - spec: gettext@0.19.8.1 + prefix: /usr + m4: + buildable: false + externals: + - spec: m4@1.4.18 + prefix: /usr + perl: + buildable: false + externals: + - spec: perl@5.26.1 + prefix: /usr + pkg-config: + buildable: false + externals: + - spec: pkg-config@0.29.1 + prefix: /usr + tar: + buildable: false + externals: + - spec: tar@1.29 + prefix: /usr + graphviz: + buildable: false + externals: + - spec: graphviz@2.40.1 + prefix: /usr + openblas: + buildable: false + externals: + - spec: openblas@0.2.20 + prefix: /usr + ncurses: + buildable: false + externals: + - spec: ncurses@6.2 + prefix: /opt/spack/opt/spack/linux-ubuntu20.04-x86_64/gcc-9.3.0/ + + # Globally lock version of third party libraries + camp: + require: "@2023.06.0" + conduit: + require: "@0.8.8~shared~test~examples~utilities" + hdf5: + variants: ~shared~mpi + hypre: + version: [2.24.0] + # do shared mfem to allow PIC flag in mfem + mfem: + require: "@4.5.2+shared~static" + raja: + require: "@2023.06.0~shared~examples~exercises" + scr: + require: "@develop~shared" + umpire: + require: "@2023.06.0~shared~examples" + + # Globally lock in version of devtools + cmake: + version: [3.20.4] + buildable: false + externals: + - spec: cmake@3.20.4 + prefix: /opt/view/bin + doxygen: + version: [1.8.17] + buildable: false + externals: + - spec: doxygen@1.8.17 + prefix: /usr + llvm: + version: [10.0.0] + buildable: false + externals: + - spec: llvm@10.0.0+clang + prefix: /usr + py-sphinx: + version: [1.8.5] + buildable: false + externals: + - spec: py-sphinx@1.8.5 + prefix: /usr From 4a19f73b03890bf2089e355cf7dd89b31212caf6 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 11 Aug 2023 14:08:55 -0700 Subject: [PATCH 340/639] cmake pathing --- scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml b/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml index 7ba09772b2..706a94fe88 100644 --- a/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml +++ b/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml @@ -180,7 +180,7 @@ spack: buildable: false externals: - spec: cmake@3.20.4 - prefix: /opt/view/bin + prefix: /opt/view doxygen: version: [1.8.17] buildable: false From 552b73fc2ab0f40b603a97194bce291f9d441e83 Mon Sep 17 00:00:00 2001 From: Brian Han Date: Sat, 12 Aug 2023 14:04:04 -0700 Subject: [PATCH 341/639] Try to add openvscode launch command on container start; disable hanging make test" --- scripts/docker/dockerfile_gcc-9_cuda-11 | 17 ++++++++++++++++- scripts/docker/supervisord.conf | 10 ++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 scripts/docker/supervisord.conf diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index f9a22a1435..9e3509fcbb 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -1,6 +1,9 @@ # This script can be run with the following command from the root axom directory: # docker build --build-arg branch= -t "axom/tpls:gcc-9-cuda-11" -f ./scripts/docker/dockerfile_gcc-9_cuda-11 . +# Command to launch openvscode server with the resulting docker image: +# docker run -it --init -p 3000:3000 -v "$(pwd):/home/workspace:cached" + FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.1.1 ARG branch=feature/han12/docker_tutorial ARG USER=axomdev @@ -34,4 +37,16 @@ RUN cp ${HOME}/axom_repo/*.cmake ${HOME}/export_hostconfig # Make sure the new hostconfig worked # Note: having high job slots causes build log to disappear and job to fail -RUN cd ${HOME}/axom_repo && python3 config-build.py -hc *.cmake -bp build && cd build && make -j4 && make -j4 test +#RUN cd ${HOME}/axom_repo && python3 config-build.py -hc *.cmake -bp build && cd build && make -j4 && make -j4 test + +# Omit testing step, hangs at slam_lulesh unit test (same behavior for azure pipeline images, as well) +RUN cd ${HOME}/axom_repo && python3 config-build.py -hc *.cmake -bp build && cd build && make -j4 + + +USER root +ADD ./scripts/docker/supervisord.conf /etc/supervisord.conf +RUN sed -i "s/XXX/${USER}/g" /etc/supervisord.conf + +RUN touch /var/log/openvscode-server.log && chown -R ${USER}:${USER} /var/log/openvscode-server.log + +CMD ["/usr/bin/supervisord"] diff --git a/scripts/docker/supervisord.conf b/scripts/docker/supervisord.conf new file mode 100644 index 0000000000..4e364d4bc2 --- /dev/null +++ b/scripts/docker/supervisord.conf @@ -0,0 +1,10 @@ +[supervisord] + nodaemon = true + user = XXX + logfile = /tmp/supervisord.log + + [program:openvscode-server] + environment=HOME="/home/XXX",USER="XXX" + redirect_stderr = true + stdout_logfile = /var/log/openvscode-server.log + command = /opt/archives/openvscode-server-v1.69.1-linux-x64/bin/openvscode-server --without-connection-token --host 0.0.0.0 \ No newline at end of file From d1a0784c2ab45eae4e9552e502053e993f11bbd6 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 14 Aug 2023 07:43:49 -0700 Subject: [PATCH 342/639] Try with cuda and c2c --- scripts/docker/dockerfile_gcc-9_cuda-11 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 9e3509fcbb..d0807a9950 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -29,7 +29,8 @@ RUN cd ${HOME} && git clone --recursive --branch $branch --single-branch --depth # Build/install TPLs via spack and then remove the temporary build directory on success RUN cd ${HOME}/axom_repo && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml \ --project-json=.uberenv_config.json \ - --spec=%gcc@9.3.0+mfem+raja+umpire --prefix=${HOME}/axom_tpls -k \ + --spec="%gcc@9.3.0+mfem+c2c+cuda cuda_arch=70" \ + --prefix=${HOME}/axom_tpls -k \ && rm -rf ${HOME}/axom_tpls/builds RUN mkdir -p ${HOME}/export_hostconfig From 9f64f8c34b8db5d4eed47879ce6c4072c8ef6e74 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 14 Aug 2023 08:12:40 -0700 Subject: [PATCH 343/639] nevermind, no c2c --- scripts/docker/dockerfile_gcc-9_cuda-11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index d0807a9950..f8ed62e1ab 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -29,7 +29,7 @@ RUN cd ${HOME} && git clone --recursive --branch $branch --single-branch --depth # Build/install TPLs via spack and then remove the temporary build directory on success RUN cd ${HOME}/axom_repo && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml \ --project-json=.uberenv_config.json \ - --spec="%gcc@9.3.0+mfem+c2c+cuda cuda_arch=70" \ + --spec="%gcc@9.3.0+mfem+cuda cuda_arch=70" \ --prefix=${HOME}/axom_tpls -k \ && rm -rf ${HOME}/axom_tpls/builds From 5737f3c6fd83e31360d752fb2788f0af22b55097 Mon Sep 17 00:00:00 2001 From: Brian Han Date: Tue, 15 Aug 2023 12:17:33 -0700 Subject: [PATCH 344/639] Restructuring file structure, with debug statements --- scripts/docker/dockerfile_gcc-9_cuda-11 | 26 ++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index f8ed62e1ab..4725d18ce3 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -20,28 +20,40 @@ RUN curl -L https://github.com/gitpod-io/openvscode-server/releases/download/ope /opt/archives/openvscode-server-v1.69.1-linux-x64.tar.gz RUN tar xzf openvscode-server-v1.69.1-linux-x64.tar.gz && chown -R ${USER}:${USER} openvscode-server-v1.69.1-linux-x64 +WORKDIR ${HOME} +COPY . $HOME/axom +RUN chown -R axomdev:axomdev $HOME + #WORKDIR "/home/axom" USER ${USER} -COPY --chown=axomdev:axomdev . $HOME -RUN cd ${HOME} && git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo +#COPY --chown=axomdev:axomdev . $HOME/axom +RUN cd ${HOME}/axom && git submodule update --init +#RUN cd ${HOME} && git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo # Build/install TPLs via spack and then remove the temporary build directory on success -RUN cd ${HOME}/axom_repo && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml \ + +RUN cd ${HOME}/axom && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml \ --project-json=.uberenv_config.json \ --spec="%gcc@9.3.0+mfem+cuda cuda_arch=70" \ - --prefix=${HOME}/axom_tpls -k \ + --prefix=${HOME}/axom/axom_tpls -k \ && rm -rf ${HOME}/axom_tpls/builds -RUN mkdir -p ${HOME}/export_hostconfig -RUN cp ${HOME}/axom_repo/*.cmake ${HOME}/export_hostconfig +#RUN cd ${HOME}/axom_repo && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml \ +# --project-json=.uberenv_config.json \ +# --spec="%gcc@9.3.0+mfem+cuda cuda_arch=70" \ +# --prefix=${HOME}/axom_tpls -k \ +# && rm -rf ${HOME}/axom_tpls/builds + +#RUN mkdir -p ${HOME}/export_hostconfig +#RUN cp ${HOME}/axom_repo/*.cmake ${HOME}/export_hostconfig # Make sure the new hostconfig worked # Note: having high job slots causes build log to disappear and job to fail #RUN cd ${HOME}/axom_repo && python3 config-build.py -hc *.cmake -bp build && cd build && make -j4 && make -j4 test # Omit testing step, hangs at slam_lulesh unit test (same behavior for azure pipeline images, as well) -RUN cd ${HOME}/axom_repo && python3 config-build.py -hc *.cmake -bp build && cd build && make -j4 +RUN cd ${HOME}/axom && python3 config-build.py -hc *cuda.cmake -bp ${HOME}/build && cd ${HOME}/build && make -j4 USER root From df21da336fc4bfa1e7fe72d4c7262427642f9374 Mon Sep 17 00:00:00 2001 From: Brian Han Date: Tue, 15 Aug 2023 12:21:51 -0700 Subject: [PATCH 345/639] Cleanup debug comments --- scripts/docker/dockerfile_gcc-9_cuda-11 | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 4725d18ce3..61bdb54f12 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -24,34 +24,19 @@ WORKDIR ${HOME} COPY . $HOME/axom RUN chown -R axomdev:axomdev $HOME -#WORKDIR "/home/axom" USER ${USER} -#COPY --chown=axomdev:axomdev . $HOME/axom RUN cd ${HOME}/axom && git submodule update --init -#RUN cd ${HOME} && git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo # Build/install TPLs via spack and then remove the temporary build directory on success - RUN cd ${HOME}/axom && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml \ --project-json=.uberenv_config.json \ --spec="%gcc@9.3.0+mfem+cuda cuda_arch=70" \ --prefix=${HOME}/axom/axom_tpls -k \ - && rm -rf ${HOME}/axom_tpls/builds - -#RUN cd ${HOME}/axom_repo && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml \ -# --project-json=.uberenv_config.json \ -# --spec="%gcc@9.3.0+mfem+cuda cuda_arch=70" \ -# --prefix=${HOME}/axom_tpls -k \ -# && rm -rf ${HOME}/axom_tpls/builds - -#RUN mkdir -p ${HOME}/export_hostconfig -#RUN cp ${HOME}/axom_repo/*.cmake ${HOME}/export_hostconfig + && rm -rf ${HOME}/axom_tpls/builds # Make sure the new hostconfig worked # Note: having high job slots causes build log to disappear and job to fail -#RUN cd ${HOME}/axom_repo && python3 config-build.py -hc *.cmake -bp build && cd build && make -j4 && make -j4 test - # Omit testing step, hangs at slam_lulesh unit test (same behavior for azure pipeline images, as well) RUN cd ${HOME}/axom && python3 config-build.py -hc *cuda.cmake -bp ${HOME}/build && cd ${HOME}/build && make -j4 From ebfb0385237dadac89677f24b41736e816ef19da Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 15 Aug 2023 12:40:22 -0700 Subject: [PATCH 346/639] Undo unused recipe changes --- .../spack/configs/docker/ubuntu20/spack.yaml | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/scripts/spack/configs/docker/ubuntu20/spack.yaml b/scripts/spack/configs/docker/ubuntu20/spack.yaml index a8e9b3340c..1947847d52 100644 --- a/scripts/spack/configs/docker/ubuntu20/spack.yaml +++ b/scripts/spack/configs/docker/ubuntu20/spack.yaml @@ -48,21 +48,6 @@ spack: fc: /usr/bin/gfortran spec: gcc@11.1.0 target: x86_64 - - compiler: - environment: {} - extra_rpaths: [] - flags: - cflags: -pthread - cxxflags: -pthread - modules: [] - operating_system: ubuntu20.04 - paths: - cc: /usr/bin/gcc - cxx: /usr/bin/g++ - f77: /usr/bin/gfortran - fc: /usr/bin/gfortran - spec: gcc@9.3.0 - target: x86_64 packages: all: @@ -109,11 +94,6 @@ spack: externals: - spec: bzip2@1.0.6 prefix: /usr - cuda: - buildable: false - externals: - - spec: cuda@11.1.1 - prefix: /usr/local/cuda gettext: buildable: false externals: @@ -193,4 +173,4 @@ spack: buildable: false externals: - spec: py-sphinx@1.8.5 - prefix: /usr + prefix: /usr \ No newline at end of file From ec8a492926269b911d33467ada2f2929ba9f633f Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 15 Aug 2023 12:41:38 -0700 Subject: [PATCH 347/639] spacing --- scripts/spack/configs/docker/ubuntu20/spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spack/configs/docker/ubuntu20/spack.yaml b/scripts/spack/configs/docker/ubuntu20/spack.yaml index 1947847d52..8f0ea2529d 100644 --- a/scripts/spack/configs/docker/ubuntu20/spack.yaml +++ b/scripts/spack/configs/docker/ubuntu20/spack.yaml @@ -173,4 +173,4 @@ spack: buildable: false externals: - spec: py-sphinx@1.8.5 - prefix: /usr \ No newline at end of file + prefix: /usr From e45e6afe5e0833bf5084493a3d975238d226b16b Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Thu, 17 Aug 2023 13:17:11 -0700 Subject: [PATCH 348/639] Save some space with release build, update directions --- scripts/docker/dockerfile_gcc-9_cuda-11 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 61bdb54f12..04e03ad3da 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -2,10 +2,10 @@ # docker build --build-arg branch= -t "axom/tpls:gcc-9-cuda-11" -f ./scripts/docker/dockerfile_gcc-9_cuda-11 . # Command to launch openvscode server with the resulting docker image: -# docker run -it --init -p 3000:3000 -v "$(pwd):/home/workspace:cached" +# docker run --init --gpus all --restart=always -p 3000:3000 FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.1.1 -ARG branch=feature/han12/docker_tutorial +ARG branch=develop ARG USER=axomdev ENV HOME /home/${USER} @@ -38,7 +38,7 @@ RUN cd ${HOME}/axom && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./s # Make sure the new hostconfig worked # Note: having high job slots causes build log to disappear and job to fail # Omit testing step, hangs at slam_lulesh unit test (same behavior for azure pipeline images, as well) -RUN cd ${HOME}/axom && python3 config-build.py -hc *cuda.cmake -bp ${HOME}/build && cd ${HOME}/build && make -j4 +RUN cd ${HOME}/axom && python3 config-build.py -hc *cuda.cmake -bp ${HOME}/build -bt Release && cd ${HOME}/build && make -j4 USER root @@ -48,3 +48,4 @@ RUN sed -i "s/XXX/${USER}/g" /etc/supervisord.conf RUN touch /var/log/openvscode-server.log && chown -R ${USER}:${USER} /var/log/openvscode-server.log CMD ["/usr/bin/supervisord"] + From ac9efec96e01dce39ef2e27717d33e7dcc05b8b1 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 22 Aug 2023 13:11:44 -0700 Subject: [PATCH 349/639] Provide both release and debug build --- scripts/docker/dockerfile_gcc-9_cuda-11 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 04e03ad3da..afaf214b87 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -35,10 +35,11 @@ RUN cd ${HOME}/axom && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./s --prefix=${HOME}/axom/axom_tpls -k \ && rm -rf ${HOME}/axom_tpls/builds -# Make sure the new hostconfig worked +# Make sure the new hostconfig worked with a release and debug build # Note: having high job slots causes build log to disappear and job to fail # Omit testing step, hangs at slam_lulesh unit test (same behavior for azure pipeline images, as well) -RUN cd ${HOME}/axom && python3 config-build.py -hc *cuda.cmake -bp ${HOME}/build -bt Release && cd ${HOME}/build && make -j4 +RUN cd ${HOME}/axom && python3 config-build.py -hc *cuda.cmake -bp ${HOME}/build-release -bt Release && cd ${HOME}/build-release && make -j4 +RUN cd ${HOME}/axom && python3 config-build.py -hc *cuda.cmake -bp ${HOME}/build-debug -bt Debug && cd ${HOME}/build-debug && make -j4 USER root From fbaf01199378971cd4043f66d0fe1bc4a4979bef Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 23 Aug 2023 14:33:17 -0700 Subject: [PATCH 350/639] Create convenient symlinks to tutorial directory; Clone repo instead of copy local; simplify by install release build of axom; copy larger STL meshes into container --- scripts/docker/dockerfile_gcc-9_cuda-11 | 36 ++++++++++++++++--------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index afaf214b87..2acaf68878 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -5,7 +5,8 @@ # docker run --init --gpus all --restart=always -p 3000:3000 FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.1.1 -ARG branch=develop +# Tutorial branch +ARG branch=feature/han12/docker_tutorial ARG USER=axomdev ENV HOME /home/${USER} @@ -21,26 +22,35 @@ RUN curl -L https://github.com/gitpod-io/openvscode-server/releases/download/ope RUN tar xzf openvscode-server-v1.69.1-linux-x64.tar.gz && chown -R ${USER}:${USER} openvscode-server-v1.69.1-linux-x64 WORKDIR ${HOME} -COPY . $HOME/axom -RUN chown -R axomdev:axomdev $HOME - USER ${USER} -RUN cd ${HOME}/axom && git submodule update --init +# Clone axom at axom_repo directory +RUN git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo # Build/install TPLs via spack and then remove the temporary build directory on success -RUN cd ${HOME}/axom && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml \ - --project-json=.uberenv_config.json \ - --spec="%gcc@9.3.0+mfem+cuda cuda_arch=70" \ - --prefix=${HOME}/axom/axom_tpls -k \ - && rm -rf ${HOME}/axom_tpls/builds +RUN cd ${HOME}/axom_repo && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml \ + --project-json=.uberenv_config.json \ + --spec="%gcc@9.3.0+mfem+cuda cuda_arch=70" \ + --prefix=${HOME}/axom_tpls -k \ + && rm -rf ${HOME}/axom_tpls/builds -# Make sure the new hostconfig worked with a release and debug build +# Make sure the new hostconfig works with a release build # Note: having high job slots causes build log to disappear and job to fail # Omit testing step, hangs at slam_lulesh unit test (same behavior for azure pipeline images, as well) -RUN cd ${HOME}/axom && python3 config-build.py -hc *cuda.cmake -bp ${HOME}/build-release -bt Release && cd ${HOME}/build-release && make -j4 -RUN cd ${HOME}/axom && python3 config-build.py -hc *cuda.cmake -bp ${HOME}/build-debug -bt Debug && cd ${HOME}/build-debug && make -j4 +RUN cd ${HOME}/axom_repo && python3 config-build.py -hc *cuda.cmake \ + -bp ${HOME}/axom_repo/build-release \ + -ip ${HOME}/axom_repo/install-release \ + -bt Release \ + && cd ${HOME}/axom_repo/build-release \ + && make -j4 install + +# Larger STL meshes for testing +COPY boxedSphere.stl car.stl porsche.stl ${HOME}/axom_repo/data/quest + +# Create symlinks for easy access to tutorial material +RUN ln -s ${HOME}/axom_repo/install-release/examples/axom/radiuss_tutorial/ ${HOME}/radiuss_tutorial \ + && ln -s ${HOME}/axom_repo/data/quest ${HOME}/radiuss_tutorial/stl_meshes USER root ADD ./scripts/docker/supervisord.conf /etc/supervisord.conf From 97b2a203bdbef282782355885f6a1534d48af3d7 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 23 Aug 2023 16:47:23 -0700 Subject: [PATCH 351/639] Install less, language-pack-en-base, tree packages --- scripts/docker/dockerfile_gcc-9_cuda-11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 2acaf68878..5ba54a5bdf 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -14,7 +14,7 @@ SHELL ["/bin/bash", "-c"] RUN sudo apt-get update -y RUN sudo apt-get install -y supervisor RUN sudo useradd --create-home --shell /bin/bash ${USER} -RUN sudo apt-get install doxygen gfortran graphviz libopenblas-dev libomp-dev mpich python3-sphinx ssh texlive-full -fy +RUN sudo apt-get install doxygen gfortran graphviz language-pack-en-base less libopenblas-dev libomp-dev mpich python3-sphinx ssh texlive-full tree -fy WORKDIR /opt/archives RUN curl -L https://github.com/gitpod-io/openvscode-server/releases/download/openvscode-server-v1.69.1/openvscode-server-v1.69.1-linux-x64.tar.gz > \ From ac8df97752e43109dba85cde2e2caece2a6a7fdd Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 23 Aug 2023 23:57:08 -0700 Subject: [PATCH 352/639] More generous with the git clone for testing convenience --- scripts/docker/dockerfile_gcc-9_cuda-11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 5ba54a5bdf..4e965729bc 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -25,7 +25,7 @@ WORKDIR ${HOME} USER ${USER} # Clone axom at axom_repo directory -RUN git clone --recursive --branch $branch --single-branch --depth 1 https://github.com/LLNL/axom.git axom_repo +RUN git clone --recursive --branch $branch https://github.com/LLNL/axom.git axom_repo # Build/install TPLs via spack and then remove the temporary build directory on success RUN cd ${HOME}/axom_repo && python3 ./scripts/uberenv/uberenv.py --spack-env-file=./scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml \ From 68a43b8a2717154a127f48d68b5fd481d8d544a3 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 8 Dec 2023 12:51:47 -0800 Subject: [PATCH 353/639] Add clarifying comments --- scripts/docker/dockerfile_gcc-9_cuda-11 | 13 ++++++++++--- scripts/docker/supervisord.conf | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 4e965729bc..2ac0c95f9e 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -1,3 +1,8 @@ +# Docker image for Axom tutorial with CUDA support. +# Docker container runs a VS Code server accessible through a web browser. +# Docker and openvscode setup based on the RAJA suite tutorial: +# https://github.com/LLNL/raja-suite-tutorial/tree/main/containers/tutorial + # This script can be run with the following command from the root axom directory: # docker build --build-arg branch= -t "axom/tpls:gcc-9-cuda-11" -f ./scripts/docker/dockerfile_gcc-9_cuda-11 . @@ -6,7 +11,7 @@ FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.1.1 # Tutorial branch -ARG branch=feature/han12/docker_tutorial +ARG branch=develop ARG USER=axomdev ENV HOME /home/${USER} @@ -44,8 +49,10 @@ RUN cd ${HOME}/axom_repo && python3 config-build.py -hc *cuda.cmake \ && cd ${HOME}/axom_repo/build-release \ && make -j4 install -# Larger STL meshes for testing -COPY boxedSphere.stl car.stl porsche.stl ${HOME}/axom_repo/data/quest +# Larger STL meshes for testing (optional) +# Note: These meshes are large, copied from local directory instead of +# downloaded from Github. +# COPY boxedSphere.stl car.stl porsche.stl ${HOME}/axom_repo/data/quest # Create symlinks for easy access to tutorial material diff --git a/scripts/docker/supervisord.conf b/scripts/docker/supervisord.conf index 4e364d4bc2..9746046a2b 100644 --- a/scripts/docker/supervisord.conf +++ b/scripts/docker/supervisord.conf @@ -1,3 +1,5 @@ +; Supervisor config file to run the OpenVSCode server + [supervisord] nodaemon = true user = XXX From 66344495cd2a6a5ebeb9fad451c1c392982bbd8c Mon Sep 17 00:00:00 2001 From: Brian Han Date: Tue, 12 Dec 2023 14:13:56 -0800 Subject: [PATCH 354/639] docker build fixes --- scripts/docker/dockerfile_gcc-9_cuda-11 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 2ac0c95f9e..ca77c8e23f 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -55,9 +55,9 @@ RUN cd ${HOME}/axom_repo && python3 config-build.py -hc *cuda.cmake \ # COPY boxedSphere.stl car.stl porsche.stl ${HOME}/axom_repo/data/quest -# Create symlinks for easy access to tutorial material -RUN ln -s ${HOME}/axom_repo/install-release/examples/axom/radiuss_tutorial/ ${HOME}/radiuss_tutorial \ - && ln -s ${HOME}/axom_repo/data/quest ${HOME}/radiuss_tutorial/stl_meshes +# Create symlinks for easy access to tutorial material (optional) +# RUN ln -s ${HOME}/axom_repo/install-release/examples/axom/radiuss_tutorial/ ${HOME}/radiuss_tutorial \ +# && ln -s ${HOME}/axom_repo/data/quest ${HOME}/radiuss_tutorial/stl_meshes USER root ADD ./scripts/docker/supervisord.conf /etc/supervisord.conf From 9f3b72207cdf431a1124606540871c4cbae97c46 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 15 Dec 2023 12:07:50 -0800 Subject: [PATCH 355/639] Rename MarchingCubesPartParallel to MarchingCubesHybridParallel. --- RELEASE-NOTES.md | 2 +- src/axom/quest/CMakeLists.txt | 2 +- src/axom/quest/MarchingCubes.cpp | 10 +++--- src/axom/quest/MarchingCubes.hpp | 2 +- ...el.hpp => MarchingCubesHybridParallel.hpp} | 34 +++++++++---------- .../examples/quest_marching_cubes_example.cpp | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) rename src/axom/quest/detail/{MarchingCubesPartParallel.hpp => MarchingCubesHybridParallel.hpp} (95%) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 2a985a2cbe..5ae3572c45 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -32,7 +32,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ ### Changed - `MarchingCubes` allows user to select the underlying data-parallel implementation - `fullParallel` works best on GPUs. - - `partialParallel` reduces the amount of data processed and works best with + - `hybridParallel` reduces the amount of data processed and works best with `MarchingCubesRuntimePolicy::seq`. - `byPolicy` (the default) selects the implementation based on the runtime policy. - `MarchingCubes` and `DistributedClosestPoint` classes changed from requiring the Blueprint diff --git a/src/axom/quest/CMakeLists.txt b/src/axom/quest/CMakeLists.txt index 8c0f4c7f14..9b03447eee 100644 --- a/src/axom/quest/CMakeLists.txt +++ b/src/axom/quest/CMakeLists.txt @@ -111,7 +111,7 @@ endif() blt_list_append( TO quest_headers - ELEMENTS MarchingCubes.hpp detail/MarchingCubesPartParallel.hpp detail/MarchingCubesFullParallel.hpp + ELEMENTS MarchingCubes.hpp detail/MarchingCubesHybridParallel.hpp detail/MarchingCubesFullParallel.hpp IF CONDUIT_FOUND ) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 3f0ec62fab..da5d900eb5 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -11,7 +11,7 @@ #include "axom/core/execution/execution_space.hpp" #include "axom/quest/MarchingCubes.hpp" - #include "axom/quest/detail/MarchingCubesPartParallel.hpp" + #include "axom/quest/detail/MarchingCubesHybridParallel.hpp" #include "axom/quest/detail/MarchingCubesFullParallel.hpp" #include "axom/fmt.hpp" @@ -218,15 +218,15 @@ void MarchingCubesSingleDomain::computeIsocontour(double contourVal) SLIC_ASSERT_MSG(!m_fcnFieldName.empty(), "You must call setFunctionField before computeIsocontour."); - // We have 2 implementations. MarchingCubesPartParallel is faster on the host + // We have 2 implementations. MarchingCubesHybridParallel is faster on the host // and MarchingCubesFullParallel is faster on GPUs. Both work in all cases. - // but we can choose based on runtime policy or by user choice + // We can choose based on runtime policy or by user choice if(m_dataParallelism == - axom::quest::MarchingCubesDataParallelism::partialParallel || + axom::quest::MarchingCubesDataParallelism::hybridParallel || (m_dataParallelism == axom::quest::MarchingCubesDataParallelism::byPolicy && m_runtimePolicy == axom::quest::MarchingCubesRuntimePolicy::seq)) { - m_impl = axom::quest::detail::marching_cubes::newMarchingCubesPartParallel( + m_impl = axom::quest::detail::marching_cubes::newMarchingCubesHybridParallel( m_runtimePolicy, m_ndim); } diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 308cd35efa..27f106f84d 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -70,7 +70,7 @@ enum class MarchingCubesRuntimePolicy enum class MarchingCubesDataParallelism { byPolicy = 0, - partialParallel = 1, + hybridParallel = 1, fullParallel = 2 }; diff --git a/src/axom/quest/detail/MarchingCubesPartParallel.hpp b/src/axom/quest/detail/MarchingCubesHybridParallel.hpp similarity index 95% rename from src/axom/quest/detail/MarchingCubesPartParallel.hpp rename to src/axom/quest/detail/MarchingCubesHybridParallel.hpp index a7bc07f68c..7ea0066e1f 100644 --- a/src/axom/quest/detail/MarchingCubesPartParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesHybridParallel.hpp @@ -37,18 +37,18 @@ namespace marching_cubes cannot be parallelized but must access data allocated for ExecSpace. Use something like axom::SEQ_EXEC or axom::CUDA_EXEC<1>. - The difference between MarchingCubesPartParallel and MarchingCubesFullParallel + The difference between MarchingCubesHybridParallel and MarchingCubesFullParallel is how they compute indices for the unstructured surface mesh. - - MarchingCubesPartParallel uses sequential loop, and skips over parents + - MarchingCubesHybridParallel uses sequential loop, and skips over parents cells that don't touch the surface contour. It processes less data but is not data-parallel. - MarchingCubesFullParallel that checks all parents cells. It process more data but is data-parallel. - We've observed that MarchingCubesPartParallel is faster for seq policy - and MarchingCubesPartParallel is faster on the GPU. + We've observed that MarchingCubesHybridParallel is faster for seq policy + and MarchingCubesHybridParallel is faster on the GPU. */ template -class MarchingCubesPartParallel : public MarchingCubesSingleDomain::ImplBase +class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase { public: using Point = axom::primal::Point; @@ -181,7 +181,7 @@ class MarchingCubesPartParallel : public MarchingCubesSingleDomain::ImplBase } /*! - @brief Implementation used by MarchingCubesPartParallel::markCrossings_dim() + @brief Implementation used by MarchingCubesHybridParallel::markCrossings_dim() containing just the objects needed for that part, to be made available on devices. */ @@ -390,7 +390,7 @@ class MarchingCubesPartParallel : public MarchingCubesSingleDomain::ImplBase } /*! - @brief Implementation used by MarchingCubesPartParallel::computeContour(). + @brief Implementation used by MarchingCubesHybridParallel::computeContour(). containing just the objects needed for that part, to be made available on devices. */ @@ -813,7 +813,7 @@ class MarchingCubesPartParallel : public MarchingCubesSingleDomain::ImplBase /*! @brief Constructor. */ - MarchingCubesPartParallel() + MarchingCubesHybridParallel() : m_crossings(0, 0) , m_contourNodeCoords(0, 0) , m_contourCellCorners(0, 0) @@ -882,7 +882,7 @@ class MarchingCubesPartParallel : public MarchingCubesSingleDomain::ImplBase }; static std::unique_ptr -newMarchingCubesPartParallel(MarchingCubesRuntimePolicy runtimePolicy, int dim) +newMarchingCubesHybridParallel(MarchingCubesRuntimePolicy runtimePolicy, int dim) { using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; using RuntimePolicy = axom::quest::MarchingCubesRuntimePolicy; @@ -893,18 +893,18 @@ newMarchingCubesPartParallel(MarchingCubesRuntimePolicy runtimePolicy, int dim) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesPartParallel<2, axom::SEQ_EXEC, axom::SEQ_EXEC>) + new MarchingCubesHybridParallel<2, axom::SEQ_EXEC, axom::SEQ_EXEC>) : std::unique_ptr( - new MarchingCubesPartParallel<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); + new MarchingCubesHybridParallel<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); } #ifdef _AXOM_MARCHINGCUBES_USE_OPENMP else if(runtimePolicy == RuntimePolicy::omp) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesPartParallel<2, axom::OMP_EXEC, axom::SEQ_EXEC>) + new MarchingCubesHybridParallel<2, axom::OMP_EXEC, axom::SEQ_EXEC>) : std::unique_ptr( - new MarchingCubesPartParallel<3, axom::OMP_EXEC, axom::SEQ_EXEC>); + new MarchingCubesHybridParallel<3, axom::OMP_EXEC, axom::SEQ_EXEC>); } #endif #ifdef _AXOM_MARCHINGCUBES_USE_CUDA @@ -912,9 +912,9 @@ newMarchingCubesPartParallel(MarchingCubesRuntimePolicy runtimePolicy, int dim) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesPartParallel<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>) + new MarchingCubesHybridParallel<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>) : std::unique_ptr( - new MarchingCubesPartParallel<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); + new MarchingCubesHybridParallel<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); } #endif #ifdef _AXOM_MARCHINGCUBES_USE_HIP @@ -922,9 +922,9 @@ newMarchingCubesPartParallel(MarchingCubesRuntimePolicy runtimePolicy, int dim) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesPartParallel<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>) + new MarchingCubesHybridParallel<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>) : std::unique_ptr( - new MarchingCubesPartParallel<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>); + new MarchingCubesHybridParallel<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>); } #endif else diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 294a2cc872..732e5901f6 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -122,7 +122,7 @@ struct Input const std::map s_validImplChoices { {"byPolicy", quest::MarchingCubesDataParallelism::byPolicy} - , {"partialParallel", quest::MarchingCubesDataParallelism::partialParallel} + , {"hybridParallel", quest::MarchingCubesDataParallelism::hybridParallel} , {"fullParallel", quest::MarchingCubesDataParallelism::fullParallel} }; // clang-format on From 62d5999826a733bda20f214b15d0d5b075b85789 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 15 Dec 2023 12:22:02 -0800 Subject: [PATCH 356/639] Change how we check for non-conduit builds in MarchingCubes. --- .../detail/MarchingCubesFullParallel.hpp | 25 ++++++++++--------- .../detail/MarchingCubesHybridParallel.hpp | 25 ++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index e4e858a58a..b7dc76bb30 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -6,17 +6,19 @@ #include "axom/config.hpp" // Implementation requires Conduit. -#ifdef AXOM_USE_CONDUIT - #include "conduit_blueprint.hpp" - - #include "axom/core/execution/execution_space.hpp" - #include "axom/quest/ArrayIndexer.hpp" - #include "axom/quest/detail/marching_cubes_lookup.hpp" - #include "axom/quest/MeshViewUtil.hpp" - #include "axom/primal/geometry/Point.hpp" - #include "axom/primal/constants.hpp" - #include "axom/mint/execution/internal/structured_exec.hpp" - #include "axom/fmt.hpp" +#ifndef AXOM_USE_CONDUIT +#error "MarchingCubesFullParallel.hpp requires conduit" +#endif +#include "conduit_blueprint.hpp" + +#include "axom/core/execution/execution_space.hpp" +#include "axom/quest/ArrayIndexer.hpp" +#include "axom/quest/detail/marching_cubes_lookup.hpp" +#include "axom/quest/MeshViewUtil.hpp" +#include "axom/primal/geometry/Point.hpp" +#include "axom/primal/constants.hpp" +#include "axom/mint/execution/internal/structured_exec.hpp" +#include "axom/fmt.hpp" namespace axom { @@ -880,7 +882,6 @@ newMarchingCubesFullParallel(MarchingCubesRuntimePolicy runtimePolicy, int dim) } return impl; } -#endif // AXOM_USE_CONDUIT } // end namespace marching_cubes } // end namespace detail diff --git a/src/axom/quest/detail/MarchingCubesHybridParallel.hpp b/src/axom/quest/detail/MarchingCubesHybridParallel.hpp index 7ea0066e1f..f962228e9b 100644 --- a/src/axom/quest/detail/MarchingCubesHybridParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesHybridParallel.hpp @@ -6,17 +6,19 @@ #include "axom/config.hpp" // Implementation requires Conduit. -#ifdef AXOM_USE_CONDUIT - #include "conduit_blueprint.hpp" - - #include "axom/core/execution/execution_space.hpp" - #include "axom/quest/ArrayIndexer.hpp" - #include "axom/quest/detail/marching_cubes_lookup.hpp" - #include "axom/quest/MeshViewUtil.hpp" - #include "axom/primal/geometry/Point.hpp" - #include "axom/primal/constants.hpp" - #include "axom/mint/execution/internal/structured_exec.hpp" - #include "axom/fmt.hpp" +#ifndef AXOM_USE_CONDUIT +#error "MarchingCubesFullParallel.hpp requires conduit" +#endif +#include "conduit_blueprint.hpp" + +#include "axom/core/execution/execution_space.hpp" +#include "axom/quest/ArrayIndexer.hpp" +#include "axom/quest/detail/marching_cubes_lookup.hpp" +#include "axom/quest/MeshViewUtil.hpp" +#include "axom/primal/geometry/Point.hpp" +#include "axom/primal/constants.hpp" +#include "axom/mint/execution/internal/structured_exec.hpp" +#include "axom/fmt.hpp" namespace axom { @@ -935,7 +937,6 @@ newMarchingCubesHybridParallel(MarchingCubesRuntimePolicy runtimePolicy, int dim } return impl; } -#endif // AXOM_USE_CONDUIT } // end namespace marching_cubes } // end namespace detail From cab0659805d51b4d4d5d2abbe7cb8a27c2023553 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 15 Dec 2023 13:02:23 -0800 Subject: [PATCH 357/639] Fix non-RAJA build. --- .../quest/detail/MarchingCubesFullParallel.hpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index b7dc76bb30..41f11782fc 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -257,14 +257,6 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase */ void scanCrossings() { - #ifdef __INTEL_LLVM_COMPILER - // Intel oneAPI compiler segfaults with OpenMP RAJA scan - using ScanPolicy = - typename axom::execution_space::loop_policy; - #else - using ScanPolicy = typename axom::execution_space::loop_policy; - #endif - const axom::IndexType parentCellCount = m_caseIds.size(); auto caseIdsView = m_caseIds.view(); @@ -286,6 +278,14 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase const axom::ArrayView firstFacetIdsView = m_firstFacetIds.view(); #if defined(AXOM_USE_RAJA) + #ifdef __INTEL_LLVM_COMPILER + // Intel oneAPI compiler segfaults with OpenMP RAJA scan + using ScanPolicy = + typename axom::execution_space::loop_policy; + #else + using ScanPolicy = typename axom::execution_space::loop_policy; + #endif + RAJA::exclusive_scan( RAJA::make_span(facetIncrsView.data(), parentCellCount), RAJA::make_span(firstFacetIdsView.data(), parentCellCount), @@ -338,13 +338,13 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase setting sortFacetsIncrs. Requires RAJA. */ const bool sortFacetsIncrs = false; - #if defined(AXOM_USE_RAJA) // sortedIndices are parent cell indices, sorted by number // of facets in them. axom::Array sortedIndices( sortFacetsIncrs ? parentCellCount : 0); auto sortedIndicesView = sortedIndices.view(); + #if defined(AXOM_USE_RAJA) if(sortFacetsIncrs) { auto sortedFacetIncrs = m_facetIncrs; From 7ba499674331328d9342d905a2654128bbd9bc65 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 15 Dec 2023 15:05:16 -0800 Subject: [PATCH 358/639] Autoformat. --- src/axom/quest/MarchingCubes.cpp | 2 +- src/axom/quest/MarchingCubes.hpp | 2 +- .../detail/MarchingCubesFullParallel.hpp | 64 ++++---- .../detail/MarchingCubesHybridParallel.hpp | 76 ++++----- .../examples/quest_marching_cubes_example.cpp | 146 +++++++++--------- 5 files changed, 146 insertions(+), 144 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index afb7b7d76f..db8a0178ca 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -7,7 +7,7 @@ // Implementation requires Conduit. #ifndef AXOM_USE_CONDUIT -#error "MarchingCubes.cpp requires conduit" + #error "MarchingCubes.cpp requires conduit" #endif #include "conduit_blueprint.hpp" diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 81c56a80ef..22e5c712a9 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -38,8 +38,8 @@ namespace marching_cubes { template class MarchingCubesImpl; +} // namespace marching_cubes } // namespace detail -} /*! @brief Enum for implementation. diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index b42c639c26..8e7e2e12e6 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -7,7 +7,7 @@ // Implementation requires Conduit. #ifndef AXOM_USE_CONDUIT -#error "MarchingCubesFullParallel.hpp requires conduit" + #error "MarchingCubesFullParallel.hpp requires conduit" #endif #include "conduit_blueprint.hpp" @@ -120,7 +120,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase { MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); - #if defined(AXOM_USE_RAJA) +#if defined(AXOM_USE_RAJA) RAJA::RangeSegment jRange(0, m_bShape[1]); RAJA::RangeSegment iRange(0, m_bShape[0]); using EXEC_POL = @@ -130,7 +130,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase AXOM_LAMBDA(axom::IndexType i, axom::IndexType j) { mcu.computeCaseId(i, j); }); - #else +#else for(int j = 0; j < m_bShape[1]; ++j) { for(int i = 0; i < m_bShape[0]; ++i) @@ -138,7 +138,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase mcu.computeCaseId(i, j); } } - #endif +#endif } //!@brief Populate m_caseIds with crossing indices. @@ -147,7 +147,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase { MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); - #if defined(AXOM_USE_RAJA) +#if defined(AXOM_USE_RAJA) RAJA::RangeSegment kRange(0, m_bShape[2]); RAJA::RangeSegment jRange(0, m_bShape[1]); RAJA::RangeSegment iRange(0, m_bShape[0]); @@ -158,7 +158,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase AXOM_LAMBDA(axom::IndexType i, axom::IndexType j, axom::IndexType k) { mcu.computeCaseId(i, j, k); }); - #else +#else for(int k = 0; k < m_bShape[2]; ++k) { for(int j = 0; j < m_bShape[1]; ++j) @@ -169,7 +169,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase } } } - #endif +#endif } /*! @@ -277,7 +277,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_firstFacetIds.resize(parentCellCount); const axom::ArrayView firstFacetIdsView = m_firstFacetIds.view(); - #if defined(AXOM_USE_RAJA) +#if defined(AXOM_USE_RAJA) #ifdef __INTEL_LLVM_COMPILER // Intel oneAPI compiler segfaults with OpenMP RAJA scan using ScanPolicy = @@ -291,16 +291,16 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase RAJA::make_span(firstFacetIdsView.data(), parentCellCount), RAJA::operators::plus {}); - // m_facetIncrs and m_firstFacetIds, combined with m_caseIds, - // are all we need to compute the surface mesh. - #else + // m_facetIncrs and m_firstFacetIds, combined with m_caseIds, + // are all we need to compute the surface mesh. +#else firstFacetIdsView[0] = 0; for(axom::IndexType pcId = 1; pcId < parentCellCount; ++pcId) { firstFacetIdsView[pcId] = firstFacetIdsView[pcId - 1] + facetIncrsView[pcId - 1]; } - #endif +#endif // Use last facet info to compute number of facets in domain. // In case data is on device, copy to host before computing. @@ -344,7 +344,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase sortFacetsIncrs ? parentCellCount : 0); auto sortedIndicesView = sortedIndices.view(); - #if defined(AXOM_USE_RAJA) +#if defined(AXOM_USE_RAJA) if(sortFacetsIncrs) { auto sortedFacetIncrs = m_facetIncrs; @@ -357,7 +357,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase RAJA::make_span(sortedIndices.data(), parentCellCount), RAJA::operators::greater {}); } - #endif +#endif auto contourCellParentsView = m_contourCellParents.view(); auto contourCellCornersView = m_contourCellCorners.view(); @@ -600,9 +600,9 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type num_contour_cells(int iCase) const { - #define _MC_LOOKUP_NUM_SEGMENTS - #include "marching_cubes_lookup.hpp" - #undef _MC_LOOKUP_NUM_SEGMENTS +#define _MC_LOOKUP_NUM_SEGMENTS +#include "marching_cubes_lookup.hpp" +#undef _MC_LOOKUP_NUM_SEGMENTS SLIC_ASSERT(iCase >= 0 && iCase < 16); return num_segments[iCase]; } @@ -611,9 +611,9 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type cases_table(int iCase, int iEdge) const { - #define _MC_LOOKUP_CASES2D - #include "marching_cubes_lookup.hpp" - #undef _MC_LOOKUP_CASES2D +#define _MC_LOOKUP_CASES2D +#include "marching_cubes_lookup.hpp" +#undef _MC_LOOKUP_CASES2D SLIC_ASSERT(iCase >= 0 && iCase < 16); return cases2D[iCase][iEdge]; } @@ -622,9 +622,9 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type num_contour_cells(int iCase) const { - #define _MC_LOOKUP_NUM_TRIANGLES - #include "marching_cubes_lookup.hpp" - #undef _MC_LOOKUP_NUM_TRIANGLES +#define _MC_LOOKUP_NUM_TRIANGLES +#include "marching_cubes_lookup.hpp" +#undef _MC_LOOKUP_NUM_TRIANGLES SLIC_ASSERT(iCase >= 0 && iCase < 256); return num_triangles[iCase]; } @@ -633,9 +633,9 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type cases_table(int iCase, int iEdge) const { - #define _MC_LOOKUP_CASES3D - #include "marching_cubes_lookup.hpp" - #undef _MC_LOOKUP_CASES3D +#define _MC_LOOKUP_CASES3D +#include "marching_cubes_lookup.hpp" +#undef _MC_LOOKUP_CASES3D SLIC_ASSERT(iCase >= 0 && iCase < 256); return cases3D[iCase][iEdge]; } @@ -846,7 +846,7 @@ newMarchingCubesFullParallel(MarchingCubes::RuntimePolicy runtimePolicy, int dim : std::unique_ptr( new MarchingCubesFullParallel<3, axom::SEQ_EXEC>); } - #ifdef AXOM_RUNTIME_POLICY_USE_OPENMP +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP else if(runtimePolicy == MarchingCubes::RuntimePolicy::omp) { impl = dim == 2 ? std::unique_ptr( @@ -854,8 +854,8 @@ newMarchingCubesFullParallel(MarchingCubes::RuntimePolicy runtimePolicy, int dim : std::unique_ptr( new MarchingCubesFullParallel<3, axom::OMP_EXEC>); } - #endif - #ifdef AXOM_RUNTIME_POLICY_USE_CUDA +#endif +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA else if(runtimePolicy == MarchingCubes::RuntimePolicy::cuda) { impl = dim == 2 ? std::unique_ptr( @@ -863,8 +863,8 @@ newMarchingCubesFullParallel(MarchingCubes::RuntimePolicy runtimePolicy, int dim : std::unique_ptr( new MarchingCubesFullParallel<3, axom::CUDA_EXEC<256>>); } - #endif - #ifdef AXOM_RUNTIME_POLICY_USE_HIP +#endif +#ifdef AXOM_RUNTIME_POLICY_USE_HIP else if(runtimePolicy == MarchingCubes::RuntimePolicy::hip) { impl = dim == 2 ? std::unique_ptr( @@ -872,7 +872,7 @@ newMarchingCubesFullParallel(MarchingCubes::RuntimePolicy runtimePolicy, int dim : std::unique_ptr( new MarchingCubesFullParallel<3, axom::HIP_EXEC<256>>); } - #endif +#endif else { SLIC_ERROR(axom::fmt::format( diff --git a/src/axom/quest/detail/MarchingCubesHybridParallel.hpp b/src/axom/quest/detail/MarchingCubesHybridParallel.hpp index 369fd771a2..8515c39c14 100644 --- a/src/axom/quest/detail/MarchingCubesHybridParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesHybridParallel.hpp @@ -7,7 +7,7 @@ // Implementation requires Conduit. #ifndef AXOM_USE_CONDUIT -#error "MarchingCubesHybridParallel.hpp requires conduit" + #error "MarchingCubesHybridParallel.hpp requires conduit" #endif #include "conduit_blueprint.hpp" @@ -130,7 +130,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase { MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); - #if defined(AXOM_USE_RAJA) +#if defined(AXOM_USE_RAJA) RAJA::RangeSegment jRange(0, m_bShape[1]); RAJA::RangeSegment iRange(0, m_bShape[0]); using EXEC_POL = @@ -140,7 +140,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase AXOM_LAMBDA(axom::IndexType i, axom::IndexType j) { mcu.computeCaseId(i, j); }); - #else +#else for(int j = 0; j < m_bShape[1]; ++j) { for(int i = 0; i < m_bShape[0]; ++i) @@ -148,7 +148,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase mcu.computeCaseId(i, j); } } - #endif +#endif } //!@brief Populate m_caseIds with crossing indices. @@ -157,7 +157,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase { MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); - #if defined(AXOM_USE_RAJA) +#if defined(AXOM_USE_RAJA) RAJA::RangeSegment kRange(0, m_bShape[2]); RAJA::RangeSegment jRange(0, m_bShape[1]); RAJA::RangeSegment iRange(0, m_bShape[0]); @@ -168,7 +168,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase AXOM_LAMBDA(axom::IndexType i, axom::IndexType j, axom::IndexType k) { mcu.computeCaseId(i, j, k); }); - #else +#else for(int k = 0; k < m_bShape[2]; ++k) { for(int j = 0; j < m_bShape[1]; ++j) @@ -179,7 +179,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase } } } - #endif +#endif } /*! @@ -271,7 +271,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase { const axom::IndexType parentCellCount = m_caseIds.size(); auto caseIdsView = m_caseIds.view(); - #if defined(AXOM_USE_RAJA) +#if defined(AXOM_USE_RAJA) RAJA::ReduceSum vsum(0); RAJA::forall( RAJA::RangeSegment(0, parentCellCount), @@ -279,14 +279,14 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase vsum += bool(num_contour_cells(caseIdsView.flatIndex(n))); }); m_crossingCount = static_cast(vsum.get()); - #else +#else axom::IndexType vsum = 0; for(axom::IndexType n = 0; n < parentCellCount; ++n) { vsum += bool(num_contour_cells(caseIdsView.flatIndex(n))); } m_crossingCount = vsum; - #endif +#endif m_crossings.resize(m_crossingCount, {0, 0}); axom::ArrayView crossingsView = @@ -312,7 +312,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase } }; - #if defined(AXOM_USE_RAJA) +#if defined(AXOM_USE_RAJA) /* The m_crossings filling loop isn't data-parallel and shouldn't be parallelized. This contrived RAJA::forall forces it to run @@ -327,14 +327,14 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase loopBody(n); } }); - #else +#else *crossingId = 0; for(axom::IndexType n = 0; n < parentCellCount; ++n) { loopBody(n); } SLIC_ASSERT(*crossingId == m_crossingCount); - #endif +#endif axom::deallocate(crossingId); @@ -346,21 +346,21 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase { crossingsView[n].firstSurfaceCellId = prefixSumView[n]; }; - #if defined(AXOM_USE_RAJA) - // Intel oneAPI compiler segfaults with OpenMP RAJA scan - #ifdef __INTEL_LLVM_COMPILER +#if defined(AXOM_USE_RAJA) + // Intel oneAPI compiler segfaults with OpenMP RAJA scan + #ifdef __INTEL_LLVM_COMPILER using ScanPolicy = typename axom::execution_space::loop_policy; - #else + #else using ScanPolicy = typename axom::execution_space::loop_policy; - #endif + #endif RAJA::exclusive_scan( RAJA::make_span(addCellsView.data(), m_crossingCount), RAJA::make_span(prefixSumView.data(), m_crossingCount), RAJA::operators::plus {}); RAJA::forall(RAJA::RangeSegment(0, m_crossingCount), copyFirstSurfaceCellId); - #else +#else if(m_crossingCount > 0) { prefixSumView[0] = 0; @@ -373,7 +373,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase copyFirstSurfaceCellId(i); } } - #endif +#endif // Data from the last crossing tells us how many contour cells there are. if(m_crossings.empty()) @@ -650,9 +650,9 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type num_contour_cells(int iCase) const { - #define _MC_LOOKUP_NUM_SEGMENTS - #include "marching_cubes_lookup.hpp" - #undef _MC_LOOKUP_NUM_SEGMENTS +#define _MC_LOOKUP_NUM_SEGMENTS +#include "marching_cubes_lookup.hpp" +#undef _MC_LOOKUP_NUM_SEGMENTS SLIC_ASSERT(iCase >= 0 && iCase < 16); return num_segments[iCase]; } @@ -661,9 +661,9 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type cases_table(int iCase, int iEdge) const { - #define _MC_LOOKUP_CASES2D - #include "marching_cubes_lookup.hpp" - #undef _MC_LOOKUP_CASES2D +#define _MC_LOOKUP_CASES2D +#include "marching_cubes_lookup.hpp" +#undef _MC_LOOKUP_CASES2D SLIC_ASSERT(iCase >= 0 && iCase < 16); return cases2D[iCase][iEdge]; } @@ -672,9 +672,9 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type num_contour_cells(int iCase) const { - #define _MC_LOOKUP_NUM_TRIANGLES - #include "marching_cubes_lookup.hpp" - #undef _MC_LOOKUP_NUM_TRIANGLES +#define _MC_LOOKUP_NUM_TRIANGLES +#include "marching_cubes_lookup.hpp" +#undef _MC_LOOKUP_NUM_TRIANGLES SLIC_ASSERT(iCase >= 0 && iCase < 256); return num_triangles[iCase]; } @@ -683,9 +683,9 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase AXOM_HOST_DEVICE inline typename std::enable_if::type cases_table(int iCase, int iEdge) const { - #define _MC_LOOKUP_CASES3D - #include "marching_cubes_lookup.hpp" - #undef _MC_LOOKUP_CASES3D +#define _MC_LOOKUP_CASES3D +#include "marching_cubes_lookup.hpp" +#undef _MC_LOOKUP_CASES3D SLIC_ASSERT(iCase >= 0 && iCase < 256); return cases3D[iCase][iEdge]; } @@ -898,7 +898,7 @@ newMarchingCubesHybridParallel(MarchingCubes::RuntimePolicy runtimePolicy, int d : std::unique_ptr( new MarchingCubesHybridParallel<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); } - #ifdef AXOM_RUNTIME_POLICY_USE_OPENMP +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP else if(runtimePolicy == MarchingCubes::RuntimePolicy::omp) { impl = dim == 2 @@ -907,8 +907,8 @@ newMarchingCubesHybridParallel(MarchingCubes::RuntimePolicy runtimePolicy, int d : std::unique_ptr( new MarchingCubesHybridParallel<3, axom::OMP_EXEC, axom::SEQ_EXEC>); } - #endif - #ifdef AXOM_RUNTIME_POLICY_USE_CUDA +#endif +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA else if(runtimePolicy == MarchingCubes::RuntimePolicy::cuda) { impl = dim == 2 @@ -917,8 +917,8 @@ newMarchingCubesHybridParallel(MarchingCubes::RuntimePolicy runtimePolicy, int d : std::unique_ptr( new MarchingCubesHybridParallel<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); } - #endif - #ifdef AXOM_RUNTIME_POLICY_USE_HIP +#endif +#ifdef AXOM_RUNTIME_POLICY_USE_HIP else if(runtimePolicy == MarchingCubes::RuntimePolicy::hip) { impl = dim == 2 @@ -927,7 +927,7 @@ newMarchingCubesHybridParallel(MarchingCubes::RuntimePolicy runtimePolicy, int d : std::unique_ptr( new MarchingCubesHybridParallel<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>); } - #endif +#endif else { SLIC_ERROR(axom::fmt::format( diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 8ef2ea707c..90517f296d 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -18,7 +18,7 @@ // Implementation requires Conduit. #ifndef AXOM_USE_CONDUIT -#error "MarchingCubesFullParallel.hpp requires conduit" + #error "MarchingCubesFullParallel.hpp requires conduit" #endif // Axom includes @@ -36,15 +36,15 @@ #include "conduit_blueprint.hpp" #include "conduit_relay_io_blueprint.hpp" #ifdef AXOM_USE_MPI -#include "conduit_blueprint_mpi.hpp" -#include "conduit_relay_mpi_io_blueprint.hpp" + #include "conduit_blueprint_mpi.hpp" + #include "conduit_relay_mpi_io_blueprint.hpp" #endif #include "axom/fmt.hpp" #include "axom/CLI11.hpp" #ifdef AXOM_USE_MPI -#include "mpi.h" + #include "mpi.h" #endif // C/C++ includes @@ -142,9 +142,9 @@ struct Input ->description("Enable/disable verbose output") ->capture_default_str(); - auto* distanceFunctionOption = app.add_option_group( - "distanceFunctionOption", - "Options for specifying a distance function."); + auto* distanceFunctionOption = + app.add_option_group("distanceFunctionOption", + "Options for specifying a distance function."); auto* distFromPtOption = distanceFunctionOption->add_option_group( "distFromPtOption", @@ -153,9 +153,9 @@ struct Input ->description("Center for distance-from-point function (x,y[,z])") ->expected(2, 3); - auto* gyroidOption = - distanceFunctionOption->add_option_group("gyroidOption", - "Options for setting up gyroid function"); + auto* gyroidOption = distanceFunctionOption->add_option_group( + "gyroidOption", + "Options for setting up gyroid function"); gyroidOption->add_option("--scale", gyroidScale) ->description("Scaling factor for gyroid function (x,y[,z])") ->expected(2, 3); @@ -163,10 +163,11 @@ struct Input auto* distFromPlaneOption = distanceFunctionOption->add_option_group( "distFromPlaneOption", "Options for setting up distance-from-plane function"); - auto* perpDirOption = distFromPlaneOption->add_option("--dir", perpDir) - ->description( - "Positive direction for distance-from-plane function (x,y[,z])") - ->expected(2, 3); + auto* perpDirOption = + distFromPlaneOption->add_option("--dir", perpDir) + ->description( + "Positive direction for distance-from-plane function (x,y[,z])") + ->expected(2, 3); distFromPlaneOption->add_option("--inPlane", inPlane) ->description("In-plane point for distance-from-plane function (x,y[,z])") ->expected(2, 3) @@ -192,7 +193,8 @@ struct Input slic::setLoggingMsgLevel(_verboseOutput ? slic::message::Debug : slic::message::Info); - ndim = std::max({ndim, fcnCenter.size(), inPlane.size(), perpDir.size(), gyroidScale.size() }); + ndim = std::max( + {ndim, fcnCenter.size(), inPlane.size(), perpDir.size(), gyroidScale.size()}); SLIC_ASSERT_MSG((fcnCenter.empty() || fcnCenter.size() == ndim) && (inPlane.empty() || inPlane.size() == ndim) && (perpDir.empty() || perpDir.size() == ndim) && @@ -306,15 +308,15 @@ void moveConduitDataToNewMemorySpace(conduit::Node& node, void getIntMinMax(int inVal, int& minVal, int& maxVal, int& sumVal) { - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI MPI_Allreduce(&inVal, &minVal, 1, MPI_INT, MPI_MIN, MPI_COMM_WORLD); MPI_Allreduce(&inVal, &maxVal, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD); MPI_Allreduce(&inVal, &sumVal, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); - #else +#else minVal = inVal; maxVal = inVal; sumVal = inVal; - #endif +#endif } Input params; @@ -464,9 +466,9 @@ struct BlueprintStructuredMesh } double rval = localRval; - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI MPI_Allreduce(&localRval, &rval, 1, MPI_DOUBLE, MPI_MAX, MPI_COMM_WORLD); - #endif +#endif return rval; } @@ -527,11 +529,11 @@ struct BlueprintStructuredMesh bool isValid() const { conduit::Node info; - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI if(!conduit::blueprint::mpi::verify("mesh", _mdMesh, info, MPI_COMM_WORLD)) - #else +#else if(!conduit::blueprint::verify("mesh", _mdMesh, info)) - #endif +#endif { SLIC_INFO("Invalid blueprint for mesh: \n" << info.to_yaml()); slic::flushStreams(); @@ -575,13 +577,13 @@ struct BlueprintStructuredMesh SLIC_ASSERT(!meshFilename.empty()); _mdMesh.reset(); - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI conduit::relay::mpi::io::blueprint::load_mesh(meshFilename, _mdMesh, MPI_COMM_WORLD); - #else +#else conduit::relay::io::blueprint::load_mesh(meshFilename, _mdMesh); - #endif +#endif SLIC_ASSERT(conduit::blueprint::mesh::is_multi_domain(_mdMesh)); _domCount = conduit::blueprint::mesh::number_of_domains(_mdMesh); @@ -599,9 +601,9 @@ struct BlueprintStructuredMesh const conduit::Node coordsetNode = _mdMesh[0].fetch_existing(_coordsetPath); _ndims = conduit::blueprint::mesh::coordset::dims(coordsetNode); } - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI MPI_Allreduce(MPI_IN_PLACE, &_ndims, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD); - #endif +#endif SLIC_ASSERT(_ndims > 0); SLIC_ASSERT(isValid()); @@ -613,15 +615,15 @@ void printTimingStats(axom::utilities::Timer& t, const std::string& description) { auto getDoubleMinMax = [](double inVal, double& minVal, double& maxVal, double& sumVal) { - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI MPI_Allreduce(&inVal, &minVal, 1, MPI_DOUBLE, MPI_MIN, MPI_COMM_WORLD); MPI_Allreduce(&inVal, &maxVal, 1, MPI_DOUBLE, MPI_MAX, MPI_COMM_WORLD); MPI_Allreduce(&inVal, &sumVal, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD); - #else +#else minVal = inVal; maxVal = inVal; sumVal = inVal; - #endif +#endif }; { @@ -639,14 +641,14 @@ void printTimingStats(axom::utilities::Timer& t, const std::string& description) /// Write blueprint mesh to disk void saveMesh(const conduit::Node& mesh, const std::string& filename) { - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI conduit::relay::mpi::io::blueprint::save_mesh(mesh, filename, "hdf5", MPI_COMM_WORLD); - #else +#else conduit::relay::io::blueprint::save_mesh(mesh, filename, "hdf5"); - #endif +#endif } /// Write blueprint mesh to disk @@ -656,11 +658,11 @@ void saveMesh(const sidre::Group& mesh, const std::string& filename) mesh.createNativeLayout(tmpMesh); { conduit::Node info; - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI if(!conduit::blueprint::mpi::verify("mesh", tmpMesh, info, MPI_COMM_WORLD)) - #else +#else if(!conduit::blueprint::verify("mesh", tmpMesh, info)) - #endif +#endif { SLIC_INFO("Invalid blueprint for mesh: \n" << info.to_yaml()); slic::flushStreams(); @@ -741,7 +743,7 @@ struct ContourTestBase s_allocatorId); } - #if defined(AXOM_USE_UMPIRE) +#if defined(AXOM_USE_UMPIRE) /* Make sure data is correctly on host or device. We don't test with Unified memory because it's too forgiving. @@ -768,25 +770,25 @@ struct ContourTestBase { SLIC_ASSERT(resourceName == "HOST"); } - #if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) + #if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) else if(params.policy == axom::runtime_policy::Policy::omp) { SLIC_ASSERT(resourceName == "HOST"); } - #endif + #endif else { SLIC_ASSERT(resourceName == "DEVICE"); } } - #endif +#endif mc.setFunctionField(functionName()); axom::utilities::Timer computeTimer(false); - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI MPI_Barrier(MPI_COMM_WORLD); - #endif +#endif computeTimer.start(); mc.setDataParallelism(params.dataParallelism); mc.computeIsocontour(params.contourVal); @@ -906,7 +908,7 @@ struct ContourTestBase SLIC_ASSERT(coordsViews[d].shape() == fieldShape); } - #if defined(AXOM_USE_RAJA) +#if defined(AXOM_USE_RAJA) auto valueFunctor = m_valueFunctor; RAJA::RangeSegment iRange(0, fieldShape[0]); RAJA::RangeSegment jRange(0, fieldShape[1]); @@ -922,7 +924,7 @@ struct ContourTestBase } fieldView(i, j) = valueFunctor(pt); }); - #else +#else for(axom::IndexType j = 0; j < fieldShape[1]; ++j) { for(axom::IndexType i = 0; i < fieldShape[0]; ++i) @@ -935,7 +937,7 @@ struct ContourTestBase fieldView(i, j) = m_valueFunctor(pt); } } - #endif +#endif } template @@ -950,7 +952,7 @@ struct ContourTestBase SLIC_ASSERT(coordsViews[d].shape() == fieldShape); } - #if defined(AXOM_USE_RAJA) +#if defined(AXOM_USE_RAJA) auto valueFunctor = m_valueFunctor; RAJA::RangeSegment iRange(0, fieldShape[0]); RAJA::RangeSegment jRange(0, fieldShape[1]); @@ -967,7 +969,7 @@ struct ContourTestBase } fieldView(i, j, k) = valueFunctor(pt); }); - #else +#else for(axom::IndexType k = 0; k < fieldShape[2]; ++k) { for(axom::IndexType j = 0; j < fieldShape[1]; ++j) @@ -983,7 +985,7 @@ struct ContourTestBase } } } - #endif +#endif } /* @@ -1501,18 +1503,18 @@ void initializeLogger() slic::LogStream* logStream; - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI std::string fmt = "[][]: \n"; - #ifdef AXOM_USE_LUMBERJACK + #ifdef AXOM_USE_LUMBERJACK const int RLIMIT = 8; logStream = new slic::LumberjackStream(&std::cout, MPI_COMM_WORLD, RLIMIT, fmt); - #else - logStream = new slic::SynchronizedStream(&std::cout, MPI_COMM_WORLD, fmt); - #endif #else + logStream = new slic::SynchronizedStream(&std::cout, MPI_COMM_WORLD, fmt); + #endif +#else std::string fmt = "[]: \n"; logStream = new slic::GenericOutputStream(&std::cout, fmt); - #endif // AXOM_USE_MPI +#endif // AXOM_USE_MPI slic::addStreamToAllMsgLevels(logStream); @@ -1611,11 +1613,11 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) int errCount = 0; if(params.checkResults) { - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI MPI_Allreduce(&localErrCount, &errCount, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); - #else +#else errCount = localErrCount; - #endif +#endif if(errCount) { @@ -1637,14 +1639,14 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) //------------------------------------------------------------------------------ int main(int argc, char** argv) { - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI MPI_Init(&argc, &argv); MPI_Comm_rank(MPI_COMM_WORLD, &myRank); MPI_Comm_size(MPI_COMM_WORLD, &numRanks); - #else +#else numRanks = 1; myRank = 0; - #endif +#endif initializeLogger(); //slic::setAbortOnWarning(true); @@ -1666,10 +1668,10 @@ int main(int argc, char** argv) retval = app.exit(e); } - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI MPI_Bcast(&retval, 1, MPI_INT, 0, MPI_COMM_WORLD); MPI_Finalize(); - #endif +#endif exit(retval); } @@ -1727,8 +1729,8 @@ int main(int argc, char** argv) errCount = testNdimInstance<3, axom::SEQ_EXEC>(computationalMesh); } } - #if defined(AXOM_USE_RAJA) - #ifdef AXOM_USE_OPENMP +#if defined(AXOM_USE_RAJA) + #ifdef AXOM_USE_OPENMP else if(params.policy == axom::runtime_policy::Policy::omp) { if(params.ndim == 2) @@ -1740,8 +1742,8 @@ int main(int argc, char** argv) errCount = testNdimInstance<3, axom::OMP_EXEC>(computationalMesh); } } - #endif - #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) + #endif + #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) else if(params.policy == axom::runtime_policy::Policy::cuda) { if(params.ndim == 2) @@ -1753,8 +1755,8 @@ int main(int argc, char** argv) errCount = testNdimInstance<3, axom::CUDA_EXEC<256>>(computationalMesh); } } - #endif - #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) + #endif + #if defined(AXOM_USE_HIP) && defined(AXOM_USE_UMPIRE) else if(params.policy == axom::runtime_policy::Policy::hip) { if(params.ndim == 2) @@ -1766,13 +1768,13 @@ int main(int argc, char** argv) errCount = testNdimInstance<3, axom::HIP_EXEC<256>>(computationalMesh); } } - #endif #endif +#endif finalizeLogger(); - #ifdef AXOM_USE_MPI +#ifdef AXOM_USE_MPI MPI_Finalize(); - #endif +#endif return errCount != 0; } From 1bcfdb6975c75f321fb4ab912116f466991846a1 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 18 Dec 2023 10:14:49 -0800 Subject: [PATCH 359/639] Minor grammar fix in comment. --- src/axom/quest/MarchingCubes.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 22e5c712a9..cf600213cb 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -167,7 +167,7 @@ class MarchingCubes const std::string &domainIdField = {}); /*! - @brief Set choice of data-parallelism implementation. + @brief Set choice of data-parallel implementation. By default, choice is MarchingCubesDataParallelism::byPolicy. */ From 29fda42e4437c076e24808aab600f37aab9c3c11 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Wed, 20 Dec 2023 10:36:40 -0800 Subject: [PATCH 360/639] Enables fmt formatting for Matrix --- src/axom/core/numerics/Matrix.hpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/axom/core/numerics/Matrix.hpp b/src/axom/core/numerics/Matrix.hpp index 904fdd34ac..d8b61c8c99 100644 --- a/src/axom/core/numerics/Matrix.hpp +++ b/src/axom/core/numerics/Matrix.hpp @@ -7,6 +7,8 @@ #include "axom/core/utilities/Utilities.hpp" // for utilities::swap() #include "axom/core/memory_management.hpp" // for alloc(), free() +#include "axom/fmt.hpp" + // C/C++ includes #include // for assert() #include // for memcpy() @@ -1040,4 +1042,9 @@ std::ostream& operator<<(std::ostream& os, const Matrix& M) } /* end namespace numerics */ } /* end namespace axom */ +/// Overload to format a numerics::Matrix using fmt +template +struct axom::fmt::formatter> : ostream_formatter +{ }; + #endif /* AXOM_MATRIX_HPP_ */ From 24f00ab96e8f56bb1f7221309fa1a6078371ebc4 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Wed, 20 Dec 2023 10:42:13 -0800 Subject: [PATCH 361/639] Optimization for 3D Polygon::area function Also allows Polygon to be used in fmt formatting. --- src/axom/primal/geometry/Polygon.hpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/axom/primal/geometry/Polygon.hpp b/src/axom/primal/geometry/Polygon.hpp index b3273c6e27..6e9357f232 100644 --- a/src/axom/primal/geometry/Polygon.hpp +++ b/src/axom/primal/geometry/Polygon.hpp @@ -155,13 +155,11 @@ class Polygon const auto O = vertexMean(); // 'O' for (local) origin for(int curr = 0, prev = nVerts - 1; curr < nVerts; prev = curr++) { - const VectorType v0(O, m_vertices[prev]); - const VectorType v1(O, m_vertices[curr]); - - sum += VectorType::cross_product(v0, v1); + sum += + VectorType::cross_product(m_vertices[prev] - O, m_vertices[curr] - O); } - return axom::utilities::abs(0.5 * sum.norm()); + return 0.5 * axom::utilities::abs(sum.norm()); } /** @@ -256,4 +254,9 @@ std::ostream& operator<<(std::ostream& os, const Polygon& poly) } // namespace primal } // namespace axom +/// Overload to format a primal::Polygon using fmt +template +struct axom::fmt::formatter> : ostream_formatter +{ }; + #endif // AXOM_PRIMAL_POLYGON_HPP_ From d7498842694e38b4dc890d974595e265a926e8dc Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Wed, 20 Dec 2023 10:45:44 -0800 Subject: [PATCH 362/639] Adds tests for polygon area under general affine transforms Previously, we were only testing axis-aligned polygons centered at the origin. --- src/axom/primal/tests/primal_polygon.cpp | 276 ++++++++++++++++++++--- 1 file changed, 248 insertions(+), 28 deletions(-) diff --git a/src/axom/primal/tests/primal_polygon.cpp b/src/axom/primal/tests/primal_polygon.cpp index ead2f5ee7e..e77162858c 100644 --- a/src/axom/primal/tests/primal_polygon.cpp +++ b/src/axom/primal/tests/primal_polygon.cpp @@ -10,6 +10,11 @@ #include #include "gtest/gtest.h" +namespace +{ +constexpr double EPS = 1e-8; +} + //------------------------------------------------------------------------------ TEST(primal_polygon, empty) { @@ -353,7 +358,7 @@ TEST(primal_polygon, signed_area_2d) } //------------------------------------------------------------------------------ -TEST(primal_polygon, area_2d_3d) +TEST(primal_polygon, area_2d_3d_axis_aligned) { using Polygon2D = axom::primal::Polygon; using Point2D = axom::primal::Point; @@ -362,45 +367,260 @@ TEST(primal_polygon, area_2d_3d) using Point3D = axom::primal::Point; // test a simple right triangle - { - Polygon2D poly2D({Point2D {0, 0}, Point2D {1, 0}, Point2D {1, 1}}); - EXPECT_DOUBLE_EQ(.5, poly2D.area()); + Polygon2D poly2D({Point2D {0, 0}, Point2D {1, 0}, Point2D {1, 1}}); + EXPECT_DOUBLE_EQ(.5, poly2D.area()); - // in xy-plane - Polygon3D poly3Da({Point3D {0, 0, 0}, Point3D {1, 0, 0}, Point3D {1, 1, 0}}); - EXPECT_DOUBLE_EQ(.5, poly3Da.area()); + // in xy-plane + Polygon3D poly3Da({Point3D {0, 0, 0}, Point3D {1, 0, 0}, Point3D {1, 1, 0}}); + EXPECT_DOUBLE_EQ(.5, poly3Da.area()); - // in xz-plane - Polygon3D poly3Db({Point3D {0, 0, 0}, Point3D {1, 0, 0}, Point3D {1, 0, 1}}); - EXPECT_DOUBLE_EQ(.5, poly3Db.area()); + // in xz-plane + Polygon3D poly3Db({Point3D {0, 0, 0}, Point3D {1, 0, 0}, Point3D {1, 0, 1}}); + EXPECT_DOUBLE_EQ(.5, poly3Db.area()); - // in yz-plane - Polygon3D poly3Dc({Point3D {0, 0, 0}, Point3D {0, 1, 0}, Point3D {0, 1, 1}}); - EXPECT_DOUBLE_EQ(.5, poly3Dc.area()); - } + // in yz-plane + Polygon3D poly3Dc({Point3D {0, 0, 0}, Point3D {0, 1, 0}, Point3D {0, 1, 1}}); + EXPECT_DOUBLE_EQ(.5, poly3Dc.area()); +} - // test regular polygons - // use same xy-data in 2D and 3D - for(int nSides = 3; nSides < 10; ++nSides) - { - Polygon2D poly2D(nSides); - Polygon3D poly3D(nSides); +//------------------------------------------------------------------------------ +TEST(primal_polygon, area_2d_3d_affine_transforms) +{ + using Polygon2D = axom::primal::Polygon; + using Point2D = axom::primal::Point; + + using Polygon3D = axom::primal::Polygon; + using Point3D = axom::primal::Point; + using Vector3D = axom::primal::Vector; + + using TransformMatrix = axom::numerics::Matrix; - // choose an arbitrary z_offset for 3D polygon - const double z_offset = 5.; + // lambda to generate a regular n-sided 2D polygon centered around origin + auto generateNSidedPolygon = [](int nSides) { + Polygon2D polygon(nSides); for(int i = 0; i < nSides; ++i) { const double angle = 2. * M_PI * i / nSides; - poly2D.addVertex(Point2D {cos(angle), sin(angle)}); - poly3D.addVertex(Point3D {cos(angle), sin(angle), z_offset}); + polygon.addVertex(Point2D {cos(angle), sin(angle)}); } - const double expected_area = nSides / 2. * sin(2 * M_PI / nSides); + return polygon; + }; + + // lambda to generate an affine transformation matrix for 2D points + auto generateTransformMatrix2D = + [](const Point2D& scale, const Point2D& translate, double rotation_angle) { + // create scaling matrix + auto sc_matx = TransformMatrix::identity(3); + { + sc_matx(0, 0) = scale[0]; + sc_matx(1, 1) = scale[1]; + } + + // create rotation matrix + auto rot_matx = TransformMatrix::identity(3); + { + const double sinT = std::sin(rotation_angle); + const double cosT = std::cos(rotation_angle); + + rot_matx(0, 0) = cosT; + rot_matx(0, 1) = -sinT; + rot_matx(1, 0) = sinT; + rot_matx(1, 1) = cosT; + } + + // create translation matrix + auto tr_matx = TransformMatrix::identity(3); + { + tr_matx(0, 2) = translate[0]; + tr_matx(1, 2) = translate[1]; + } + + // multiply them to get the final transform + TransformMatrix affine_matx1(3, 3); + matrix_multiply(rot_matx, sc_matx, affine_matx1); + + TransformMatrix affine_matx2(3, 3); + matrix_multiply(tr_matx, affine_matx1, affine_matx2); + + EXPECT_NEAR(scale[0] * scale[1], determinant(affine_matx2), EPS); + return affine_matx2; + }; + + // lambda to generate an affine transformation matrix for 2D points + auto generateTransformMatrix3D = [](const Point3D& scale, + const Point3D& translate, + const Vector3D& axis, + double angle) { + // create scaling matrix + auto sc_matx = TransformMatrix::identity(4); + { + sc_matx(0, 0) = scale[0]; + sc_matx(1, 1) = scale[1]; + sc_matx(2, 2) = scale[2]; + } - EXPECT_DOUBLE_EQ(expected_area, poly2D.area()); - EXPECT_DOUBLE_EQ(expected_area, poly3D.area()); - EXPECT_DOUBLE_EQ(poly2D.area(), poly3D.area()); + // create rotation matrix + auto rot_matx = TransformMatrix::zeros(4, 4); + { + const double sinT = std::sin(angle); + const double cosT = std::cos(angle); + + const auto unitAxis = axis.unitVector(); + const double& ux = unitAxis[0]; + const double& uy = unitAxis[1]; + const double& uz = unitAxis[2]; + + rot_matx(0, 0) = cosT + ux * ux * (1 - cosT); + rot_matx(0, 1) = ux * uy * (1 - cosT) - uz * sinT; + rot_matx(0, 2) = ux * uz * (1 - cosT) + uy * sinT; + rot_matx(1, 0) = uy * ux * (1 - cosT) + uz * sinT; + rot_matx(1, 1) = cosT + uy * uy * (1 - cosT); + rot_matx(1, 2) = uy * uz * (1 - cosT) - ux * sinT; + rot_matx(2, 0) = uz * ux * (1 - cosT) - uy * sinT; + rot_matx(2, 1) = uz * uy * (1 - cosT) + ux * sinT; + rot_matx(2, 2) = cosT + uz * uz * (1 - cosT); + rot_matx(3, 3) = 1; + } + + // create translation matrix + auto tr_matx = TransformMatrix::identity(4); + { + tr_matx(0, 3) = translate[0]; + tr_matx(1, 3) = translate[1]; + tr_matx(2, 3) = translate[2]; + } + + // multiply them to get the final transform + TransformMatrix affine_matx1(4, 4); + matrix_multiply(rot_matx, sc_matx, affine_matx1); + TransformMatrix affine_matx2(4, 4); + matrix_multiply(tr_matx, affine_matx1, affine_matx2); + + EXPECT_NEAR(scale[0] * scale[1] * scale[2], determinant(affine_matx2), EPS); + return affine_matx2; + }; + + // lambda to transform a 2D polygon into 2D + auto transformedPolygon2d = [](const Polygon2D& poly, + const TransformMatrix& matx) { + Polygon2D xformed(poly.numVertices()); + for(int i = 0; i < poly.numVertices(); ++i) + { + const double vec_in[3] = {poly[i][0], poly[i][1], 1.}; + double vec_out[3] = {0., 0., 0.}; + axom::numerics::matrix_vector_multiply(matx, vec_in, vec_out); + xformed.addVertex(Point2D {vec_out[0], vec_out[1]}); + } + return xformed; + }; + + // lambda to transform a 2D polygon into 3D + auto transformedPolygon3d = [](const Polygon2D& poly, + const TransformMatrix& matx) { + Polygon3D xformed(poly.numVertices()); + for(int i = 0; i < poly.numVertices(); ++i) + { + const double vec_in[4] = {poly[i][0], poly[i][1], 0., 1.}; + double vec_out[4] = {0., 0., 0., 0.}; + axom::numerics::matrix_vector_multiply(matx, vec_in, vec_out); + xformed.addVertex(Point3D {vec_out[0], vec_out[1], vec_out[2]}); + } + return xformed; + }; + + const auto scales = axom::Array({-3., -1., -.5, 0., 0.01, 1., 42.3}); + const auto translations = axom::Array({-.5, 0., 1., 42.3}); + const auto angles = axom::Array({-.57, 0., 2. / 3. * M_PI}); + const auto axes = axom::Array({ + Vector3D {0., 0., 1.}, + Vector3D {0., 1., 0.}, + Vector3D {1., 0., 0.}, + Vector3D {1., 0., 1.}, + Vector3D {1., 1., 1.}, + Vector3D {-2., -5., 0.}, + }); + + for(int nSides = 3; nSides < 10; ++nSides) + { + Polygon2D polygon2d = generateNSidedPolygon(nSides); + const double unscaled_area = nSides / 2. * sin(2 * M_PI / nSides); + EXPECT_DOUBLE_EQ(unscaled_area, polygon2d.area()); + + // check area of 2D polygons after affine transforms + for(double sc_x : scales) + { + for(double sc_y : scales) + { + for(double tr_x : translations) + { + for(double tr_y : translations) + { + for(double theta : angles) + { + const auto sc = Point2D {sc_x, sc_y}; + const auto tr = Point2D {tr_x, tr_y}; + auto affine_matx = generateTransformMatrix2D(sc, tr, theta); + auto xformed_polygon = transformedPolygon2d(polygon2d, affine_matx); + + const double expected_area = + unscaled_area * determinant(affine_matx); + EXPECT_NEAR(expected_area, xformed_polygon.signedArea(), EPS); + + if(nSides == 3) + { + axom::primal::Triangle tri(xformed_polygon[0], + xformed_polygon[1], + xformed_polygon[2]); + EXPECT_NEAR(xformed_polygon.signedArea(), tri.signedArea(), EPS); + } + } + } + } + } + } + + // check area of 3D polygons after affine transforms + for(double sc_x : scales) + { + for(double sc_y : scales) + { + for(double tr_x : translations) + { + for(double tr_y : translations) + { + for(double tr_z : translations) + { + for(const auto& axis : axes) + { + for(double theta : angles) + { + const auto sc = Point3D {sc_x, sc_y, 1.}; + const auto tr = Point3D {tr_x, tr_y, tr_z}; + auto affine_matx = + generateTransformMatrix3D(sc, tr, axis, theta); + auto xformed_polygon = + transformedPolygon3d(polygon2d, affine_matx); + + const auto expected_area = unscaled_area * + axom::utilities::abs(determinant(affine_matx)); + EXPECT_NEAR(expected_area, xformed_polygon.area(), EPS); + + if(nSides == 3) + { + axom::primal::Triangle tri(xformed_polygon[0], + xformed_polygon[1], + xformed_polygon[2]); + EXPECT_NEAR(xformed_polygon.area(), tri.area(), EPS); + } + } + } + } + } + } + } + } } } From 27e3f5447fff3138dde1c0638654a3025fcaa791 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Wed, 20 Dec 2023 10:49:25 -0800 Subject: [PATCH 363/639] Updates RELEASE-NOTES --- RELEASE-NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index abf0bc86c8..b9a1fffcb7 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -49,6 +49,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ ### Fixed - quest's `SamplingShaper` now properly handles material names containing underscores - quest's `SamplingShaper` can now be used with an mfem that is configured for (GPU) devices +- primal's `Polygon` area computation in 3D previously only worked when the polygon was aligned with the XY-plane. It now works for arbitrary polygons. ## [Version 0.8.1] - Release date 2023-08-16 From ede5e025aa726a57596f545f3e02e43e0fc73891 Mon Sep 17 00:00:00 2001 From: Arlie Capps <48997041+agcapps@users.noreply.github.com> Date: Thu, 21 Dec 2023 13:59:48 -0800 Subject: [PATCH 364/639] Log an explanatory message for quest_point_in_cell_mfem (#1250) * Update to December 12 release of vcpkg * Log problem size parameters before and after the quest_point_in_cell_mfem test --- .uberenv_config.json | 2 +- RELEASE-NOTES.md | 1 + .../quest/tests/quest_point_in_cell_mfem.cpp | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index 290a1fd8fc..fcc57b112b 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -9,7 +9,7 @@ "spack_packages_path": ["scripts/spack/radiuss-spack-configs/packages", "scripts/spack/packages"], "spack_concretizer": "clingo", "vcpkg_url": "https://github.com/microsoft/vcpkg", -"vcpkg_commit": "6f7ffeb18f99796233b958aaaf14ec7bd4fb64b2", +"vcpkg_commit": "c8696863d371ab7f46e213d8f5ca923c4aef2a00", "vcpkg_triplet": "x64-windows", "vcpkg_ports_path": "scripts/vcpkg_ports" } diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 8193bc3e9e..443c336058 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -55,6 +55,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - quest's `SamplingShaper` now properly handles material names containing underscores - quest's `SamplingShaper` can now be used with an mfem that is configured for (GPU) devices - primal's `Polygon` area computation in 3D previously only worked when the polygon was aligned with the XY-plane. It now works for arbitrary polygons. +- Upgrades our `vcpkg` usage for automated Windows builds of our TPLs to its [2023.12.12 release](https://github.com/microsoft/vcpkg/releases/tag/2023.12.12) ## [Version 0.8.1] - Release date 2023-08-16 diff --git a/src/axom/quest/tests/quest_point_in_cell_mfem.cpp b/src/axom/quest/tests/quest_point_in_cell_mfem.cpp index 1c796e1a99..bd84c6720a 100644 --- a/src/axom/quest/tests/quest_point_in_cell_mfem.cpp +++ b/src/axom/quest/tests/quest_point_in_cell_mfem.cpp @@ -1676,6 +1676,22 @@ TYPED_TEST(PointInCell3DTest, pic_curved_refined_hex_jittered) this->testIsoGridPointsOnMesh(meshTypeStr); } +void printSummary() +{ +#ifdef AXOM_DEBUG + const std::string buildtype {"DEBUG"}; +#else + const std::string buildtype {"RELEASE"}; +#endif + SLIC_INFO( + axom::fmt::format("{} build; running {} test points with {} refinements; " + "grid resolution factor {}", + buildtype, + NUM_TEST_PTS, + NREFINE, + TEST_GRID_RES)); +} + int main(int argc, char* argv[]) { int result = 0; @@ -1685,6 +1701,9 @@ int main(int argc, char* argv[]) std::srand(SRAND_SEED); + printSummary(); result = RUN_ALL_TESTS(); + printSummary(); + return result; } From b00d22f8e07051e7d1000e8d8d59d3413da9fd15 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 3 Jan 2024 08:52:42 -0800 Subject: [PATCH 365/639] Add missing hex tet example --- src/axom/primal/tests/primal_clip.cpp | 44 +++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index 5a77dd4ce0..6bf84e79dc 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -823,6 +823,50 @@ TEST(primal_clip, hex_tet_clip_point) EXPECT_EQ(axom::primal::clip(tet, hex).volume(), poly.volume()); } +// Tetrahedron with a negative volume clips hexahedron +TEST(primal_clip, hex_tet_negative_tet_vol) +{ + using namespace Primal3D; + constexpr double EPS = 1e-4; + constexpr bool CHECK_ORIENTATION = true; + + TetrahedronType tet(PointType {0.0774795, -11.3217, -33.5237}, + PointType {0.482086, -12.283, -33.5237}, + PointType {-0.503954, -12.216, -33.5237}, + PointType {0.0368068, -12.1403, -33.4339}); + HexahedronType hex(PointType {0, -12.1295, -33.6323}, + PointType {0, -12.2774, -33.6323}, + PointType {0.185429, -12.276, -33.6323}, + PointType {0.183195, -12.1281, -33.6323}, + PointType {0, -12.1295, -33.5186}, + PointType {0, -12.2774, -33.5186}, + PointType {0.185429, -12.276, -33.5186}, + PointType {0.183195, -12.1281, -33.5186}); + + // Clipped polyhedron has volume of zero due to tetrahedron orientation + PolyhedronType zeroPoly = axom::primal::clip(hex, tet); + + EXPECT_EQ(0.0, zeroPoly.volume()); + EXPECT_EQ(0.0, axom::primal::intersection_volume(hex, tet)); + EXPECT_EQ(0.0, axom::primal::intersection_volume(tet, hex)); + EXPECT_EQ(axom::primal::clip(tet, hex).volume(), zeroPoly.volume()); + + // Run clip operation with orientation flag enabled to fix tetrahedron + PolyhedronType fixedPoly = axom::primal::clip(hex, tet, EPS, CHECK_ORIENTATION); + + EXPECT_NEAR(0.00011, fixedPoly.volume(), EPS); + EXPECT_NEAR( + 0.00011, + axom::primal::intersection_volume(hex, tet, EPS, CHECK_ORIENTATION), + EPS); + EXPECT_NEAR( + 0.00011, + axom::primal::intersection_volume(tet, hex, EPS, CHECK_ORIENTATION), + EPS); + EXPECT_EQ(axom::primal::clip(tet, hex, EPS, CHECK_ORIENTATION).volume(), + fixedPoly.volume()); +} + // Tetrahedron does not clip octahedron. TEST(primal_clip, oct_tet_clip_nonintersect) { From e78d78481aabb62a1ab172384cdbac9eec488288 Mon Sep 17 00:00:00 2001 From: Simon Radler Date: Fri, 8 Dec 2023 13:14:06 +0100 Subject: [PATCH 366/639] Fix clipping of 3D triangle against axis-aligned bounding box --- src/axom/primal/operators/clip.hpp | 5 ++--- src/axom/primal/tests/primal_clip.cpp | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/axom/primal/operators/clip.hpp b/src/axom/primal/operators/clip.hpp index 7e450630be..ae74c26c86 100644 --- a/src/axom/primal/operators/clip.hpp +++ b/src/axom/primal/operators/clip.hpp @@ -82,14 +82,13 @@ Polygon clip(const Triangle& tri, const BoundingBox& bbox) { // Optimization note: we should be able to save some work based on // the clipping plane and the triangle's bounding box - - if(triBox.getMax()[dim] > bbox.getMin()[dim]) + if(triBox.getMin()[dim] < bbox.getMin()[dim]) { axom::utilities::swap(prevPoly, currentPoly); detail::clipAxisPlane(prevPoly, currentPoly, 2 * dim + 0, bbox.getMin()[dim]); } - if(triBox.getMin()[dim] < bbox.getMax()[dim]) + if(triBox.getMax()[dim] > bbox.getMax()[dim]) { axom::utilities::swap(prevPoly, currentPoly); detail::clipAxisPlane(prevPoly, currentPoly, 2 * dim + 1, bbox.getMax()[dim]); diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index 6bf84e79dc..e35f44a1b8 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -57,8 +57,11 @@ TEST(primal_clip, simple_clip) PointType {0.25, 0.25, 0.5}, PointType {0.75, 0.25, 0.5}, - PointType {0.66, 0.5, 0.5}, PointType {1.5, 0.5, 0.5}, + + PointType {2, 1, 0.5}, + PointType {2, 2, 0.5}, + PointType {1, 2, 0.5}, }; { @@ -94,7 +97,7 @@ TEST(primal_clip, simple_clip) } { - TriangleType tri(points[6], points[7], points[9]); + TriangleType tri(points[6], points[7], points[8]); PolygonType poly = axom::primal::clip(tri, bbox); EXPECT_EQ(4, poly.numVertices()); @@ -102,6 +105,13 @@ TEST(primal_clip, simple_clip) SLIC_INFO("Intersection of triangle " << tri << " and bounding box " << bbox << " is polygon" << poly); } + + { + TriangleType tri(points[9], points[10], points[11]); + + PolygonType poly = axom::primal::clip(tri, bbox); + EXPECT_EQ(0, poly.numVertices()); + } } TEST(primal_clip, unit_simplex) From aa88dc4a13a82350078fb333bf986be13434e35e Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 21 Dec 2023 10:55:20 -0800 Subject: [PATCH 367/639] Outsources primal's fuzzy comparison functions to a new file --- src/axom/primal/CMakeLists.txt | 1 + .../operators/detail/fuzzy_comparators.hpp | 96 +++++++++++++++++++ .../operators/detail/intersect_impl.hpp | 89 +---------------- 3 files changed, 98 insertions(+), 88 deletions(-) create mode 100644 src/axom/primal/operators/detail/fuzzy_comparators.hpp diff --git a/src/axom/primal/CMakeLists.txt b/src/axom/primal/CMakeLists.txt index 64a5636039..2e9053554a 100644 --- a/src/axom/primal/CMakeLists.txt +++ b/src/axom/primal/CMakeLists.txt @@ -60,6 +60,7 @@ set( primal_headers operators/detail/clip_impl.hpp operators/detail/compute_moments_impl.hpp + operators/detail/fuzzy_comparators.hpp operators/detail/intersect_bezier_impl.hpp operators/detail/intersect_bounding_box_impl.hpp operators/detail/intersect_impl.hpp diff --git a/src/axom/primal/operators/detail/fuzzy_comparators.hpp b/src/axom/primal/operators/detail/fuzzy_comparators.hpp new file mode 100644 index 0000000000..c893df8f50 --- /dev/null +++ b/src/axom/primal/operators/detail/fuzzy_comparators.hpp @@ -0,0 +1,96 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +/*! + * \file fuzzy_comparators.hpp + * + * This file provides helper functions for fuzzy comparisons + */ + +#ifndef AXOM_PRIMAL_FUZZY_COMPARATORS_HPP_ +#define AXOM_PRIMAL_FUZZY_COMPARATORS_HPP_ + +#include "axom/core/Macros.hpp" +#include "axom/core/utilities/Utilities.hpp" + +namespace axom +{ +namespace primal +{ +namespace detail +{ +/// \brief Checks if x > y, within a specified tolerance. +AXOM_HOST_DEVICE +inline bool isGt(double x, double y, double EPS = 1e-12) +{ + return ((x > y) && !(axom::utilities::isNearlyEqual(x, y, EPS))); +} + +/// \brief Checks if x < y, within a specified tolerance. +AXOM_HOST_DEVICE +inline bool isLt(double x, double y, double EPS = 1e-12) +{ + return ((x < y) && !(axom::utilities::isNearlyEqual(x, y, EPS))); +} + +/// \brief Checks if x <= y, within a specified tolerance. +AXOM_HOST_DEVICE +inline bool isLeq(double x, double y, double EPS = 1e-12) +{ + return !(isGt(x, y, EPS)); +} + +/// \brief Checks if x >= y, within a specified tolerance. +AXOM_HOST_DEVICE +inline bool isGeq(double x, double y, double EPS = 1e-12) +{ + return !(isLt(x, y, EPS)); +} + +/*! + * \brief Checks if x < y, or possibly x == y, within a specified tolerance. + * + * The check for equality is controlled by parameter includeEqual. This + * lets users specify at compile time whether triangles intersecting only on + * border points are reported as intersecting or not. + * + * Supports checkEdge and checkVertex + */ +AXOM_HOST_DEVICE +inline bool isLpeq(double x, double y, bool includeEqual = false, double EPS = 1e-12) +{ + if(includeEqual && axom::utilities::isNearlyEqual(x, y, EPS)) + { + return true; + } + + return isLt(x, y, EPS); +} + +/*! + * \brief Checks if x > y, or possibly x == y, within a specified tolerance. + * + * The check for equality is controlled by parameter includeEqual. This + * lets users specify at compile time whether triangles intersecting only on + * border points are reported as intersecting or not. + * + * Supports checkEdge and checkVertex + */ +AXOM_HOST_DEVICE +inline bool isGpeq(double x, double y, bool includeEqual = false, double EPS = 1e-12) +{ + if(includeEqual && axom::utilities::isNearlyEqual(x, y, EPS)) + { + return true; + } + + return isGt(x, y, EPS); +} + +} // namespace detail +} // namespace primal +} // namespace axom + +#endif // AXOM_PRIMAL_FUZZY_COMPARATORS_HPP_ \ No newline at end of file diff --git a/src/axom/primal/operators/detail/intersect_impl.hpp b/src/axom/primal/operators/detail/intersect_impl.hpp index aa3537c0a1..6db127622f 100644 --- a/src/axom/primal/operators/detail/intersect_impl.hpp +++ b/src/axom/primal/operators/detail/intersect_impl.hpp @@ -17,6 +17,7 @@ #include "axom/core/numerics/Determinants.hpp" #include "axom/core/utilities/Utilities.hpp" +#include "axom/primal/operators/detail/fuzzy_comparators.hpp" #include "axom/primal/geometry/BoundingBox.hpp" #include "axom/primal/geometry/OrientedBoundingBox.hpp" #include "axom/primal/geometry/Plane.hpp" @@ -39,24 +40,6 @@ using Triangle3 = primal::Triangle; using Triangle2 = primal::Triangle; using Point2 = primal::Point; -AXOM_HOST_DEVICE -bool isGt(double x, double y, double EPS = 1E-12); - -AXOM_HOST_DEVICE -bool isLt(double x, double y, double EPS = 1E-12); - -AXOM_HOST_DEVICE -bool isLeq(double x, double y, double EPS = 1E-12); - -AXOM_HOST_DEVICE -bool isLpeq(double x, double y, bool includeEqual = false, double EPS = 1E-12); - -AXOM_HOST_DEVICE -bool isGeq(double x, double y, double EPS = 1E-12); - -AXOM_HOST_DEVICE -bool isGpeq(double x, double y, bool includeEqual = false, double EPS = 1E-12); - AXOM_HOST_DEVICE bool nonzeroSignMatch(double x, double y, double z, double EPS = 1E-12); @@ -566,76 +549,6 @@ inline double twoDcross(const Point2& A, const Point2& B, const Point2& C) return (((A[0] - C[0]) * (B[1] - C[1]) - (A[1] - C[1]) * (B[0] - C[0]))); } -/*! - * \brief Checks if x > y, within a specified tolerance. - */ -AXOM_HOST_DEVICE -inline bool isGt(double x, double y, double EPS) -{ - return ((x > y) && !(axom::utilities::isNearlyEqual(x, y, EPS))); -} - -/*! - * \brief Checks if x < y, within a specified tolerance. - */ -AXOM_HOST_DEVICE -inline bool isLt(double x, double y, double EPS) -{ - return ((x < y) && !(axom::utilities::isNearlyEqual(x, y, EPS))); -} - -/*! - * \brief Checks if x <= y, within a specified tolerance. - */ -AXOM_HOST_DEVICE -inline bool isLeq(double x, double y, double EPS) { return !(isGt(x, y, EPS)); } - -/*! - * \brief Checks if x < y, or possibly x == y, within a specified tolerance. - * - * The check for equality is controlled by parameter includeEqual. This - * lets users specify at compile time whether triangles intersecting only on - * border points are reported as intersecting or not. - * - * Supports checkEdge and checkVertex - */ -AXOM_HOST_DEVICE -inline bool isLpeq(double x, double y, bool includeEqual, double EPS) -{ - if(includeEqual && axom::utilities::isNearlyEqual(x, y, EPS)) - { - return true; - } - - return isLt(x, y, EPS); -} - -/*! - * \brief Checks if x >= y, within a specified tolerance. - */ -AXOM_HOST_DEVICE -inline bool isGeq(double x, double y, double EPS) { return !(isLt(x, y, EPS)); } - -/*! - * \brief Checks if x > y, or possibly x == y, within a specified tolerance. - * - * The check for equality is controlled by parameter includeEqual. This - * lets users specify at compile time whether triangles intersecting only on - * border points are reported as intersecting or not. - * - * Supports checkEdge and checkVertex - */ -AXOM_HOST_DEVICE -inline bool isGpeq(double x, double y, bool includeEqual, double EPS) -{ - if(includeEqual && axom::utilities::isNearlyEqual(x, y, EPS)) - { - return true; - } - - return isGt(x, y, EPS); -} - /*! * \brief Check if x, y, and z all have the same sign. */ From af43991a6718fa43b2506609de815cd02a9cc079 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 21 Dec 2023 18:31:55 -0800 Subject: [PATCH 368/639] Minor cleanup of clip implementation --- src/axom/primal/operators/detail/clip_impl.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index 764e385767..29be3819a8 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -68,7 +68,7 @@ int classifyPointAxisPlane(const Point& pt, // Note: we are exploiting the fact that the planes are axis aligned // So the dot product is +/- the given coordinate. // In general, we would need to call distance(pt, plane) here - T dist = isEven(index) ? val - pt[index / 2] : pt[index / 2] - val; + const T dist = isEven(index) ? val - pt[index / 2] : pt[index / 2] - val; if(dist > eps) { @@ -109,7 +109,7 @@ Point findIntersectionPoint(const Point& a, T t = (val - a[index / 2]) / (b[index / 2] - a[index / 2]); SLIC_ASSERT(0. <= t && t <= 1.); - PointType ret = PointType(a.array() + t * (b.array() - a.array())); + auto ret = PointType::lerp(a, b, t); SLIC_ASSERT(classifyPointAxisPlane(ret, index, val) == ON_BOUNDARY); return ret; @@ -142,7 +142,7 @@ void clipAxisPlane(const Polygon* prevPoly, using PointType = Point; currentPoly->clear(); - int numVerts = prevPoly->numVertices(); + const int numVerts = prevPoly->numVertices(); if(numVerts == 0) { @@ -156,7 +156,7 @@ void clipAxisPlane(const Polygon* prevPoly, for(int i = 0; i < numVerts; ++i) { const PointType* b = &(*prevPoly)[i]; - int bSide = classifyPointAxisPlane(*b, index, val); + const int bSide = classifyPointAxisPlane(*b, index, val); switch(bSide) { From 5c50a020b8133460d68694ee025597794fdf66e8 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 21 Dec 2023 18:32:47 -0800 Subject: [PATCH 369/639] Adds more clip(Triangle, BBox) tests --- src/axom/primal/tests/primal_clip.cpp | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index e35f44a1b8..44217f8c5f 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -112,6 +112,42 @@ TEST(primal_clip, simple_clip) PolygonType poly = axom::primal::clip(tri, bbox); EXPECT_EQ(0, poly.numVertices()); } + + { + TriangleType tri(PointType {-1, .25, .5}, + PointType {.25, .25, .5}, + PointType {.25, .75, .5}); + + PolygonType poly = axom::primal::clip(tri, bbox); + EXPECT_EQ(4, poly.numVertices()); + + SLIC_INFO("Intersection of triangle " << tri << " and bounding box " << bbox + << " is polygon" << poly); + } + + { + TriangleType tri(PointType {-1, .25, .5}, + PointType {.75, .25, .5}, + PointType {.75, .75, .5}); + + PolygonType poly = axom::primal::clip(tri, bbox); + EXPECT_EQ(4, poly.numVertices()); + + SLIC_INFO("Intersection of triangle " << tri << " and bounding box " << bbox + << " is polygon" << poly); + } + + { + TriangleType tri(PointType {.9, 100, .5}, + PointType {100, -1, .5}, + PointType {100, 100, .5}); + + PolygonType poly = axom::primal::clip(tri, bbox); + EXPECT_EQ(0, poly.numVertices()); + + SLIC_INFO("Intersection of triangle " << tri << " and bounding box " << bbox + << " is polygon" << poly); + } } TEST(primal_clip, unit_simplex) From 609c47f44db4cf725d6899e0add9dc715d5d3f1a Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 21 Dec 2023 20:02:23 -0800 Subject: [PATCH 370/639] Improves testing of primal::clip(Triangle, BoundingBox) --- src/axom/primal/operators/clip.hpp | 7 +- src/axom/primal/tests/primal_clip.cpp | 133 +++++++++++++++++--------- 2 files changed, 92 insertions(+), 48 deletions(-) diff --git a/src/axom/primal/operators/clip.hpp b/src/axom/primal/operators/clip.hpp index ae74c26c86..370781d2e4 100644 --- a/src/axom/primal/operators/clip.hpp +++ b/src/axom/primal/operators/clip.hpp @@ -50,16 +50,13 @@ Polygon clip(const Triangle& tri, const BoundingBox& bbox) using PolygonType = Polygon; // Use two polygons with pointers for 'back-buffer'-like swapping - const int MAX_VERTS = 6; + constexpr int MAX_VERTS = 6; PolygonType poly[2] = {PolygonType(MAX_VERTS), PolygonType(MAX_VERTS)}; PolygonType* currentPoly = &poly[0]; PolygonType* prevPoly = &poly[1]; // First check if the triangle is contained in the bbox, if not we are empty - BoundingBoxType triBox; - triBox.addPoint(tri[0]); - triBox.addPoint(tri[1]); - triBox.addPoint(tri[2]); + BoundingBoxType triBox {tri[0], tri[1], tri[2]}; if(!bbox.intersectsWith(triBox)) { diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index 44217f8c5f..035422c4b1 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -42,99 +42,147 @@ TEST(primal_clip, simple_clip) { using namespace Primal3D; constexpr double EPS = 1e-8; - BoundingBoxType bbox; - bbox.addPoint(PointType::zero()); - bbox.addPoint(PointType::ones()); - - PointType points[] = { - PointType {2, 2, 2}, - PointType {2, 2, 4}, - PointType {2, 4, 2}, - PointType {-100, -100, 0.5}, - PointType {-100, 100, 0.5}, - PointType {100, 0, 0.5}, - - PointType {0.25, 0.25, 0.5}, - PointType {0.75, 0.25, 0.5}, - PointType {1.5, 0.5, 0.5}, + // all checks in this test are against the cube [-1,-1,-1] to [1,1,1] + BoundingBoxType bbox; + bbox.addPoint(PointType {-1, -1, -1}); + bbox.addPoint(PointType {1, 1, 1}); - PointType {2, 1, 0.5}, - PointType {2, 2, 0.5}, - PointType {1, 2, 0.5}, - }; + const std::string print_template = + "Intersection of triangle {} and bbox {} is polygon {}"; + // this triangle is clearly outside the reference cube { - TriangleType tri(points[0], points[1], points[2]); + TriangleType tri(PointType {2, 2, 2}, + PointType {2, 2, 4}, + PointType {2, 4, 2}); PolygonType poly = axom::primal::clip(tri, bbox); EXPECT_EQ(0, poly.numVertices()); } + // triangle at z=0 that spans entire cube { - TriangleType tri(points[3], points[4], points[5]); + TriangleType tri(PointType {-100, -100, 0.}, + PointType {-100, 100, 0.}, + PointType {100, 0, 0.}); PolygonType poly = axom::primal::clip(tri, bbox); EXPECT_EQ(4, poly.numVertices()); - SLIC_INFO("Intersection of triangle " << tri << " and bounding box " << bbox - << " is polygon" << poly); + EXPECT_NEAR(0., poly.vertexMean()[0], EPS); + EXPECT_NEAR(0., poly.vertexMean()[1], EPS); + EXPECT_NEAR(0., poly.vertexMean()[2], EPS); + + SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); } + // triangle at z=0 w/ two vertices inside unit cube { - TriangleType tri(points[3], points[4], points[5]); + TriangleType tri(PointType {0.25, 0.25, 0.}, + PointType {0.75, 0.25, 0.}, + PointType {1.5, 0.5, 0.}); PolygonType poly = axom::primal::clip(tri, bbox); EXPECT_EQ(4, poly.numVertices()); - for(int dim = 0; dim < 3; ++dim) - { - EXPECT_NEAR(0.5, poly.vertexMean()[dim], EPS); - } + SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); + } - SLIC_INFO("Intersection of triangle " << tri << " and bounding box " << bbox - << " is polygon" << poly); + // triangle at z=0 w/ vertices aligned w/ bounding box planes + { + TriangleType tri(PointType {2, 1, 0.}, + PointType {2, 2, 0.}, + PointType {1, 2, 0.}); + + PolygonType poly = axom::primal::clip(tri, bbox); + EXPECT_EQ(0, poly.numVertices()); } + // triangle at z=0 w/ one vertex coincident w/ cube { - TriangleType tri(points[6], points[7], points[8]); + TriangleType tri(PointType {1, 2, 0.}, + PointType {1, 1, 0.}, + PointType {2, 1, 0.}); PolygonType poly = axom::primal::clip(tri, bbox); - EXPECT_EQ(4, poly.numVertices()); + EXPECT_EQ(0, poly.numVertices()); + } - SLIC_INFO("Intersection of triangle " << tri << " and bounding box " << bbox - << " is polygon" << poly); + // triangle at z=0 w/ one edge midpoint coincident w/ cube + { + TriangleType tri(PointType {0, 2, 0.}, + PointType {2, 0, 0.}, + PointType {2, 2, 0.}); + + PolygonType poly = axom::primal::clip(tri, bbox); + EXPECT_EQ(0, poly.numVertices()); } + // triangle at z=0 w/ one edge coincident w/ unit cube and the other outside { - TriangleType tri(points[9], points[10], points[11]); + TriangleType tri(PointType {-10, 1, 0.}, + PointType {10, 1, 0.}, + PointType {0, 10, 0.}); PolygonType poly = axom::primal::clip(tri, bbox); EXPECT_EQ(0, poly.numVertices()); } + // triangle at z=0 w/ one edge coincident w/ unit cube and the last vertex inside + { + TriangleType tri(PointType {-10, 1, 0.}, + PointType {10, 1, 0.}, + PointType {0, 0, 0.}); + + PolygonType poly = axom::primal::clip(tri, bbox); + EXPECT_EQ(5, poly.numVertices()); + + SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); + } + + // triangle at z=0 w/ one edge coincident w/ unit cube and the last vertex on the other side + { + TriangleType tri(PointType {-10, 1, 0.}, + PointType {10, 1, 0.}, + PointType {0, -10, 0.}); + + PolygonType poly = axom::primal::clip(tri, bbox); + EXPECT_EQ(4, poly.numVertices()); + + SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); + } + + // triangle at z=1 w/ one edge coincident w/ unit cube and the last vertex on the other side + { + TriangleType tri(PointType {-10, 1, 1.}, + PointType {10, 1, 1.}, + PointType {0, -10, 1.}); + + PolygonType poly_no_bdry = axom::primal::clip(tri, bbox); + EXPECT_EQ(4, poly_no_bdry.numVertices()); + } + { - TriangleType tri(PointType {-1, .25, .5}, + TriangleType tri(PointType {-2, .25, .5}, PointType {.25, .25, .5}, PointType {.25, .75, .5}); PolygonType poly = axom::primal::clip(tri, bbox); EXPECT_EQ(4, poly.numVertices()); - SLIC_INFO("Intersection of triangle " << tri << " and bounding box " << bbox - << " is polygon" << poly); + SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); } { - TriangleType tri(PointType {-1, .25, .5}, + TriangleType tri(PointType {-2, .25, .5}, PointType {.75, .25, .5}, PointType {.75, .75, .5}); PolygonType poly = axom::primal::clip(tri, bbox); EXPECT_EQ(4, poly.numVertices()); - SLIC_INFO("Intersection of triangle " << tri << " and bounding box " << bbox - << " is polygon" << poly); + SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); } { @@ -145,8 +193,7 @@ TEST(primal_clip, simple_clip) PolygonType poly = axom::primal::clip(tri, bbox); EXPECT_EQ(0, poly.numVertices()); - SLIC_INFO("Intersection of triangle " << tri << " and bounding box " << bbox - << " is polygon" << poly); + SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); } } From 147b3a149376611f8187df2b1b42fe3600559ec1 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 2 Jan 2024 12:24:33 -0800 Subject: [PATCH 371/639] Changes behavior of BoundingBox::contains(BoundingBox) to return true if the latter is empty And adds tests for BoundingBox::contains(BoundingBox). --- src/axom/primal/geometry/BoundingBox.hpp | 5 +- src/axom/primal/tests/primal_boundingbox.cpp | 215 ++++++++++++------- 2 files changed, 138 insertions(+), 82 deletions(-) diff --git a/src/axom/primal/geometry/BoundingBox.hpp b/src/axom/primal/geometry/BoundingBox.hpp index f32da0a46a..ff7fcf9b91 100644 --- a/src/axom/primal/geometry/BoundingBox.hpp +++ b/src/axom/primal/geometry/BoundingBox.hpp @@ -255,6 +255,7 @@ class BoundingBox * \note We are allowing the other bounding box to have a different coordinate * type. This should work as long as the two Ts are comparable with * operator<(). + * \note If \a otherBB is empty, we return true */ template bool contains(const BoundingBox& otherBB) const; @@ -438,7 +439,9 @@ template template bool BoundingBox::contains(const BoundingBox& otherBB) const { - return this->contains(otherBB.getMin()) && this->contains(otherBB.getMax()); + return otherBB.isValid() + ? this->contains(otherBB.getMin()) && this->contains(otherBB.getMax()) + : true; } //------------------------------------------------------------------------------ diff --git a/src/axom/primal/tests/primal_boundingbox.cpp b/src/axom/primal/tests/primal_boundingbox.cpp index e928ef7a67..4f654d8d25 100644 --- a/src/axom/primal/tests/primal_boundingbox.cpp +++ b/src/axom/primal/tests/primal_boundingbox.cpp @@ -14,7 +14,7 @@ #include "axom/primal/geometry/Point.hpp" #include "axom/primal/geometry/BoundingBox.hpp" -using namespace axom; +namespace primal = axom::primal; //------------------------------------------------------------------------------ template @@ -48,10 +48,10 @@ void check_bb_policy() //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_default_constructor) { - static const int DIM = 2; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; + constexpr int DIM = 2; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; QBBox bbox; EXPECT_FALSE(bbox.isValid()) << "Default constructed bounding box is invalid"; @@ -64,10 +64,10 @@ TEST(primal_boundingBox, bb_default_constructor) //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_ctor_from_singlePt) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; QPoint pt1; QPoint pt2(2); @@ -92,10 +92,10 @@ TEST(primal_boundingBox, bb_ctor_from_singlePt) //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_ctor_from_twoPoints) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; QPoint pt1(1); QPoint pt2(3); @@ -129,7 +129,6 @@ TEST(primal_boundingBox, bb_ctor_from_twoPoints) const int val = 10; QPoint pt101 = QPoint::make_point(val, 0, val); QPoint pt010 = QPoint::make_point(0, val, 0); - ; QPoint midPt2 = QPoint::midpoint(pt101, pt010); QBBox bbox3(pt101, pt010); @@ -146,10 +145,10 @@ TEST(primal_boundingBox, bb_ctor_from_twoPoints) //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_ctor_from_many_points) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; // test single point QPoint pt1(0.); @@ -179,10 +178,10 @@ TEST(primal_boundingBox, bb_ctor_from_many_points) //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_addPoint) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; QPoint pt1(1); QPoint pt2(3); @@ -203,8 +202,7 @@ TEST(primal_boundingBox, bb_addPoint) bbox1.addPoint(pt10); EXPECT_TRUE(bbox1.contains(pt10)); - // Testing that if we add a point, then points outside the bounds remain - // outside + // Testing that if we add a point, then points outside the bounds remain outside EXPECT_FALSE(bbox1.contains(pt30)); bbox1.addPoint(pt20); // note: adding 20, but testing 30 EXPECT_FALSE(bbox1.contains(pt30)); @@ -213,10 +211,10 @@ TEST(primal_boundingBox, bb_addPoint) //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_test_clear) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; QPoint pt1(1); QPoint pt2(3); @@ -242,10 +240,10 @@ TEST(primal_boundingBox, bb_test_clear) //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_copy_and_assignment) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; QPoint pt1(1); QPoint pt2(3); @@ -261,8 +259,7 @@ TEST(primal_boundingBox, bb_copy_and_assignment) EXPECT_EQ(bbox1.getMax(), bbox2.getMax()); EXPECT_TRUE(bbox2.contains(midPt)); - QBBox bbox3(pt2); // some initialization that we don't care - // about + QBBox bbox3(pt2); // some initialization that we don't care about EXPECT_TRUE(bbox3.isValid()); EXPECT_FALSE(bbox3.contains(pt1)); bbox3 = bbox1; // assignment operation @@ -284,10 +281,10 @@ TEST(primal_boundingBox, bb_copy_and_assignment) //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_test_equality) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; QPoint pt1(1); QPoint pt2(3); @@ -325,10 +322,10 @@ TEST(primal_boundingBox, bb_test_equality) //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_add_box) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; // SLIC_INFO("Testing addBox() for two simple bounding boxes"); @@ -395,12 +392,12 @@ TEST(primal_boundingBox, bb_add_box) //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_different_coord_types) { - static const int DIM = 3; - typedef primal::Point PointD; - typedef primal::BoundingBox BBoxD; + constexpr int DIM = 3; + using PointD = primal::Point; + using BBoxD = primal::BoundingBox; - typedef primal::Point PointI; - typedef primal::BoundingBox BBoxI; + using PointI = primal::Point; + using BBoxI = primal::BoundingBox; // checking that an integer point is in the double bounding box BBoxD dBox(PointD(1.), PointD(3.)); @@ -428,13 +425,74 @@ TEST(primal_boundingBox, bb_different_coord_types) EXPECT_FALSE(iBox.contains(PointD(4.25))); } +//------------------------------------------------------------------------------ +TEST(primal_boundingBox, bb_contains_bb) +{ + constexpr int DIM = 3; + constexpr double ONE_THIRD = 1. / 3.; + constexpr double TWO_THIRDS = 2. / 3.; + + using PointD = primal::Point; + using BBoxD = primal::BoundingBox; + + BBoxD unit_box; + unit_box.addPoint(PointD(0.)); + unit_box.addPoint(PointD(1.)); + + const BBoxD empty_box; + const BBoxD empty_box2; + + // check identity + { + EXPECT_TRUE(unit_box.contains(unit_box)); + } + + // check contains w/ empty boxes + { + EXPECT_TRUE(unit_box.contains(empty_box)); + EXPECT_FALSE(empty_box.contains(unit_box)); + + EXPECT_TRUE(empty_box.contains(empty_box2)); + } + + // check full overlap + { + BBoxD other_box; + other_box.addPoint(PointD(ONE_THIRD)); + other_box.addPoint(PointD(TWO_THIRDS)); + + EXPECT_TRUE(unit_box.contains(other_box)); + EXPECT_FALSE(other_box.contains(unit_box)); + } + + // check full overlap, one point at boundary + { + BBoxD other_box; + other_box.addPoint(PointD(ONE_THIRD)); + other_box.addPoint(PointD(1.)); + + EXPECT_TRUE(unit_box.contains(other_box)); + EXPECT_FALSE(other_box.contains(unit_box)); + } + + // check partial overlap + { + BBoxD other_box; + other_box.addPoint(PointD(0.5)); + other_box.addPoint(PointD(1.5)); + + EXPECT_FALSE(unit_box.contains(other_box)); + EXPECT_FALSE(other_box.contains(unit_box)); + } +} + //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_expand) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; // SLIC_INFO("Testing bounding box inflate"); @@ -467,10 +525,10 @@ TEST(primal_boundingBox, bb_expand) //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_scale) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; // SLIC_INFO("Testing bounding box scale"); @@ -515,11 +573,11 @@ TEST(primal_boundingBox, bb_scale) //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_shift) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; - typedef primal::Vector QVec; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; + using QVec = primal::Vector; // SLIC_INFO("Testing bounding box shift"); @@ -545,9 +603,7 @@ TEST(primal_boundingBox, bb_shift) //------------------------------------------------------------------------------ TEST(primal_boundingBox, highest_lowest_values) { - using namespace axom::primal; - - static const int DIM = 3; + constexpr int DIM = 3; // Testing that our type trait for highest and lowest values // is doing the right thing in our CXX11 and pre-CXX11 compilers @@ -576,27 +632,24 @@ TEST(primal_boundingBox, highest_lowest_values) EXPECT_EQ(maxU, std::numeric_limits::max()); EXPECT_EQ(minU, std::numeric_limits::lowest()); - // Testing that our default constructor for bounding boxes is properly - // setting the range. + // Testing that our default constructor for bounding boxes is properly setting the range. - // Note: The bounds are intentionally in the reverse order -- this is how we - // ensure - // that adding a point to an empty bounding box always updates the bounds - // properly + // Note: The bounds are intentionally in the reverse order -- this is how we ensure + // that adding a point to an empty bounding box always updates the bounds properly - typedef primal::BoundingBox BBoxD; + using BBoxD = primal::BoundingBox; EXPECT_TRUE(BBoxD().getMin()[0] > 0); EXPECT_TRUE(BBoxD().getMax()[0] < 0); - typedef primal::BoundingBox BBoxF; + using BBoxF = primal::BoundingBox; EXPECT_TRUE(BBoxF().getMin()[0] > 0); EXPECT_TRUE(BBoxF().getMax()[0] < 0); - typedef primal::BoundingBox BBoxI; + using BBoxI = primal::BoundingBox; EXPECT_TRUE(BBoxI().getMin()[0] > 0); EXPECT_TRUE(BBoxI().getMax()[0] < 0); - typedef primal::BoundingBox BBoxU; + using BBoxU = primal::BoundingBox; EXPECT_TRUE(BBoxU().getMin()[0] > 0); EXPECT_TRUE(BBoxU().getMax()[0] == 0); } @@ -604,19 +657,19 @@ TEST(primal_boundingBox, highest_lowest_values) //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_longest_dimension) { - typedef primal::Point PointType; - typedef primal::BoundingBox BoxType; + using PointType = primal::Point; + using BoxType = primal::BoundingBox; - BoxType bbox(PointType::zero(), PointType::make_point(5.0, 10.0)); - int longest_dimension = bbox.getLongestDimension(); + const BoxType bbox(PointType::zero(), PointType::make_point(5.0, 10.0)); + const int longest_dimension = bbox.getLongestDimension(); EXPECT_EQ(1, longest_dimension); } //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_bisect) { - typedef primal::Point PointType; - typedef primal::BoundingBox BoxType; + using PointType = primal::Point; + using BoxType = primal::BoundingBox; BoxType bbox(PointType::zero(), PointType::ones()); @@ -642,8 +695,8 @@ TEST(primal_boundingBox, bb_bisect) //------------------------------------------------------------------------------ TEST(primal_boundingBox, bb_get_centroid) { - typedef primal::Point PointType; - typedef primal::BoundingBox BoxType; + using PointType = primal::Point; + using BoxType = primal::BoundingBox; BoxType bbox(PointType::zero(), PointType::ones()); PointType centroid = bbox.getCentroid(); From 5c6e40b1b637e95bbfdd04d2ab644b1a4ea10a63 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 2 Jan 2024 12:27:07 -0800 Subject: [PATCH 372/639] Fixes warning in OrientedBoundingBox::contains for empty input --- src/axom/primal/geometry/OrientedBoundingBox.hpp | 8 ++------ src/axom/primal/tests/primal_orientedboundingbox.cpp | 5 ++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/axom/primal/geometry/OrientedBoundingBox.hpp b/src/axom/primal/geometry/OrientedBoundingBox.hpp index 7c0f82a446..fc5a3a0d30 100644 --- a/src/axom/primal/geometry/OrientedBoundingBox.hpp +++ b/src/axom/primal/geometry/OrientedBoundingBox.hpp @@ -518,19 +518,15 @@ void OrientedBoundingBox::addPoint(Point pt) template void OrientedBoundingBox::addBox(OrientedBoundingBox obb) { - SLIC_CHECK_MSG(obb.isValid(), "Passed in OBB is invalid."); if(!obb.isValid()) { // don't do anything return; } - std::vector> res = obb.vertices(); - int size = static_cast(res.size()); - - for(int i = 0; i < size; i++) + for(const auto& vert : obb.vertices()) { - this->addPoint(res[i]); + this->addPoint(vert); } } diff --git a/src/axom/primal/tests/primal_orientedboundingbox.cpp b/src/axom/primal/tests/primal_orientedboundingbox.cpp index e7c8aaa87b..7b9bd6d942 100644 --- a/src/axom/primal/tests/primal_orientedboundingbox.cpp +++ b/src/axom/primal/tests/primal_orientedboundingbox.cpp @@ -9,6 +9,8 @@ #include "gtest/gtest.h" #include "axom/config.hpp" +#include "axom/slic.hpp" + #include "axom/primal/geometry/NumericArray.hpp" #include "axom/primal/geometry/Point.hpp" #include "axom/primal/geometry/Vector.hpp" @@ -270,7 +272,7 @@ TEST(primal_OBBox, obb_test_add_box) obbox3.addBox(obbox4); EXPECT_TRUE(obbox3.contains(obbox1)); - // adding invalid box should make it invalid + // adding empty/invalid box is a no-op QOBBox obbox5; obbox3.addBox(obbox5); EXPECT_FALSE(obbox5.isValid()); @@ -604,6 +606,7 @@ TEST(primal_OBBox, obb_test_furthest_point) int main(int argc, char* argv[]) { ::testing::InitGoogleTest(&argc, argv); + axom::slic::SimpleLogger logger; #ifdef ORIENTEDBOUNDINGBOX_TESTER_SHOULD_SEED std::srand(std::time(0)); From 84cfc1e64f4c1ea16d5f1305b4b8abebdbf2911a Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 2 Jan 2024 12:28:10 -0800 Subject: [PATCH 373/639] Fixes some warnings --- src/axom/primal/tests/primal_bezier_patch.cpp | 7 +++---- src/axom/primal/tests/primal_tetrahedron.cpp | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/axom/primal/tests/primal_bezier_patch.cpp b/src/axom/primal/tests/primal_bezier_patch.cpp index 885cc1f73f..43b11c02ce 100644 --- a/src/axom/primal/tests/primal_bezier_patch.cpp +++ b/src/axom/primal/tests/primal_bezier_patch.cpp @@ -555,14 +555,13 @@ TEST(primal_bezierpatch, normal) //------------------------------------------------------------------------------ TEST(primal_bezierpatch, rational_evaluation) { - const int DIM = 3; + constexpr int DIM = 3; using CoordType = double; using PointType = primal::Point; - using VectorType = primal::Vector; using BezierPatchType = primal::BezierPatch; - const int max_order_u = 3; - const int order_v = 4; + constexpr int max_order_u = 3; + constexpr int order_v = 4; // clang-format off PointType controlPoints[(max_order_u + 1) * (order_v + 1)] = { diff --git a/src/axom/primal/tests/primal_tetrahedron.cpp b/src/axom/primal/tests/primal_tetrahedron.cpp index 470e1c87f6..eab9dc789c 100644 --- a/src/axom/primal/tests/primal_tetrahedron.cpp +++ b/src/axom/primal/tests/primal_tetrahedron.cpp @@ -627,7 +627,6 @@ TEST_F(TetrahedronTest, regularTetrahedron) TEST_F(TetrahedronTest, checkAndFixOrientation) { - using QPoint = TetrahedronTest::QPoint; using QTet = TetrahedronTest::QTet; int indices[] = {0, 1, 2, 3}; From 096b628a9c08ce65c6543c9dd04f58218772b06b Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 2 Jan 2024 12:42:35 -0800 Subject: [PATCH 374/639] Adds primal::compute_bounding_box overload for primal::Polygon With unit tests. --- .../primal/operators/compute_bounding_box.hpp | 24 ++++- .../tests/primal_compute_bounding_box.cpp | 100 +++++++++++++----- 2 files changed, 93 insertions(+), 31 deletions(-) diff --git a/src/axom/primal/operators/compute_bounding_box.hpp b/src/axom/primal/operators/compute_bounding_box.hpp index 0d73a4c9d5..9e834cfb94 100644 --- a/src/axom/primal/operators/compute_bounding_box.hpp +++ b/src/axom/primal/operators/compute_bounding_box.hpp @@ -22,6 +22,7 @@ #include "axom/primal/geometry/Point.hpp" #include "axom/primal/geometry/Triangle.hpp" #include "axom/primal/geometry/Quadrilateral.hpp" +#include "axom/primal/geometry/Polygon.hpp" #include "axom/primal/geometry/Vector.hpp" #include "axom/primal/geometry/OrientedBoundingBox.hpp" @@ -169,8 +170,8 @@ template AXOM_HOST_DEVICE BoundingBox compute_bounding_box( const Polyhedron &poly) { - BoundingBox res(poly[0]); - for(int i = 1; i < poly.numVertices(); i++) + BoundingBox res; + for(int i = 0; i < poly.numVertices(); i++) { res.addPoint(poly[i]); } @@ -180,7 +181,7 @@ AXOM_HOST_DEVICE BoundingBox compute_bounding_box( /*! * \brief Creates a bounding box around a Tetrahedron * - * \param [in] tet The Tetrahedron + * \param [in] tet The tetrahedron */ template AXOM_HOST_DEVICE BoundingBox compute_bounding_box( @@ -189,6 +190,23 @@ AXOM_HOST_DEVICE BoundingBox compute_bounding_box( return BoundingBox {tet[0], tet[1], tet[2], tet[3]}; } +/*! + * \brief Creates a bounding box around a Polygon + * + * \param [in] poly The polygon + */ +template +AXOM_HOST_DEVICE BoundingBox compute_bounding_box( + const Polygon &poly) +{ + BoundingBox res; + for(int i = 0; i < poly.numVertices(); ++i) + { + res.addPoint(poly[i]); + } + return res; +} + } // namespace primal } // namespace axom diff --git a/src/axom/primal/tests/primal_compute_bounding_box.cpp b/src/axom/primal/tests/primal_compute_bounding_box.cpp index 0750757b08..51ba7e7766 100644 --- a/src/axom/primal/tests/primal_compute_bounding_box.cpp +++ b/src/axom/primal/tests/primal_compute_bounding_box.cpp @@ -12,17 +12,18 @@ #include "axom/primal/geometry/Point.hpp" #include "axom/primal/geometry/Vector.hpp" #include "axom/primal/geometry/OrientedBoundingBox.hpp" +#include "axom/primal/geometry/Polygon.hpp" #include "axom/primal/operators/compute_bounding_box.hpp" -using namespace axom; +namespace primal = axom::primal; TEST(primal_compute_bounding_box, compute_oriented_box_test) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::Vector QVector; - typedef primal::OrientedBoundingBox QOBBox; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QVector = primal::Vector; + using QOBBox = primal::OrientedBoundingBox; QPoint pt1; // origin QVector u[DIM]; // make standard axes @@ -66,11 +67,11 @@ TEST(primal_compute_bounding_box, compute_oriented_box_test) TEST(primal_compute_bounding_box, merge_oriented_box_test) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::Vector QVector; - typedef primal::OrientedBoundingBox QOBBox; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QVector = primal::Vector; + using QOBBox = primal::OrientedBoundingBox; const double ONE_OVER_SQRT_TWO = 0.7071; QPoint pt1; // origin @@ -105,11 +106,11 @@ TEST(primal_compute_bounding_box, merge_oriented_box_test) TEST(primal_compute_bounding_box, merge_aligned_box_test) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::Vector QVector; - typedef primal::BoundingBox QBBox; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QVector = primal::Vector; + using QBBox = primal::BoundingBox; QPoint pt1(0.); QPoint pt2(1.); @@ -135,7 +136,7 @@ TEST(primal_compute_bounding_box, compute_quad_2d_box_test) using CoordinateType = double; using PointType = primal::Point; using BoundingBoxType = primal::BoundingBox; - using QuadrilateralType = primal::Octahedron; + using QuadrilateralType = primal::Quadrilateral; PointType A {-1.0, 0.1}; PointType B {-0.1, 0.5}; @@ -159,7 +160,7 @@ TEST(primal_compute_bounding_box, compute_quad_3d_box_test) using CoordinateType = double; using PointType = primal::Point; using BoundingBoxType = primal::BoundingBox; - using QuadrilateralType = primal::Octahedron; + using QuadrilateralType = primal::Quadrilateral; PointType A {-1.0, 0.1, 0.0}; PointType B {-0.1, 0.5, 0.0}; @@ -179,11 +180,11 @@ TEST(primal_compute_bounding_box, compute_quad_3d_box_test) TEST(primal_compute_bounding_box, compute_oct_box_test) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; - typedef primal::Octahedron QOct; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; + using QOct = primal::Octahedron; QPoint p1({1, 0, 0}); QPoint p2({1, 1, 0}); @@ -207,11 +208,11 @@ TEST(primal_compute_bounding_box, compute_oct_box_test) TEST(primal_compute_bounding_box, compute_poly_box_test) { - static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::BoundingBox QBBox; - typedef primal::Polyhedron QPoly; + constexpr int DIM = 3; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; + using QPoly = primal::Polyhedron; QPoly poly; QPoint p1({0, 0, 0}); @@ -245,9 +246,52 @@ TEST(primal_compute_bounding_box, compute_poly_box_test) EXPECT_EQ(box.getMax(), QPoint::ones()); } +TEST(primal_compute_bounding_box, compute_polygon_2) +{ + constexpr int DIM = 2; + using CoordType = double; + using QPoint = primal::Point; + using QBBox = primal::BoundingBox; + using QPoly = primal::Polygon; + + // empty polygon generates an empty (invalid) bounding box + { + QPoly empty_poly; + QBBox box = primal::compute_bounding_box(empty_poly); + EXPECT_FALSE(box.isValid()); + } + + // non-empty polygon generates expected axis-aligned bounding box + { + QPoint p1({1, 0}); + QPoint p2({5, 0}); + QPoint p3({7, 2}); + QPoint p4({9, 4}); + QPoint p5({-1, 4}); + + QPoly polygon(5); + polygon.addVertex(p1); + polygon.addVertex(p2); + polygon.addVertex(p3); + polygon.addVertex(p4); + polygon.addVertex(p5); + + QBBox box = primal::compute_bounding_box(polygon); + EXPECT_TRUE(box.contains(p1)); + EXPECT_TRUE(box.contains(p2)); + EXPECT_TRUE(box.contains(p3)); + EXPECT_TRUE(box.contains(p4)); + EXPECT_TRUE(box.contains(p5)); + + EXPECT_EQ(box.getMin(), (QPoint {-1., 0.})); + EXPECT_EQ(box.getMax(), (QPoint {9., 4.})); + } +} + int main(int argc, char* argv[]) { ::testing::InitGoogleTest(&argc, argv); + axom::slic::SimpleLogger logger; #ifdef COMPUTE_BOUNDING_BOX_TESTER_SHOULD_SEED std::srand(std::time(0)); From 6227e68dce836c088d698c76deb0bf0f78493659 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 2 Jan 2024 12:44:21 -0800 Subject: [PATCH 375/639] Improves unit tests for primal::clip(Triangle, BoundingBox) --- .../primal/operators/detail/clip_impl.hpp | 5 +- src/axom/primal/tests/primal_clip.cpp | 238 ++++++++---------- 2 files changed, 103 insertions(+), 140 deletions(-) diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index 29be3819a8..5da8f57a39 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -106,10 +106,11 @@ Point findIntersectionPoint(const Point& a, // * pt = a + t * (b-a) // * pt[ index/2] == val - T t = (val - a[index / 2]) / (b[index / 2] - a[index / 2]); + const int coord = index / 2; + const T t = (val - a[coord]) / (b[coord] - a[coord]); SLIC_ASSERT(0. <= t && t <= 1.); - auto ret = PointType::lerp(a, b, t); + const auto ret = PointType::lerp(a, b, t); SLIC_ASSERT(classifyPointAxisPlane(ret, index, val) == ON_BOUNDARY); return ret; diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index 035422c4b1..ed9ca65612 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -20,6 +20,7 @@ #include "axom/primal/operators/clip.hpp" #include "axom/primal/operators/intersection_volume.hpp" #include "axom/primal/operators/split.hpp" +#include "axom/primal/operators/compute_bounding_box.hpp" #include @@ -41,159 +42,120 @@ using PolyhedronType = axom::primal::Polyhedron; TEST(primal_clip, simple_clip) { using namespace Primal3D; - constexpr double EPS = 1e-8; // all checks in this test are against the cube [-1,-1,-1] to [1,1,1] BoundingBoxType bbox; bbox.addPoint(PointType {-1, -1, -1}); bbox.addPoint(PointType {1, 1, 1}); - const std::string print_template = - "Intersection of triangle {} and bbox {} is polygon {}"; - - // this triangle is clearly outside the reference cube - { - TriangleType tri(PointType {2, 2, 2}, - PointType {2, 2, 4}, - PointType {2, 4, 2}); - - PolygonType poly = axom::primal::clip(tri, bbox); - EXPECT_EQ(0, poly.numVertices()); - } - - // triangle at z=0 that spans entire cube - { - TriangleType tri(PointType {-100, -100, 0.}, - PointType {-100, 100, 0.}, - PointType {100, 0, 0.}); - - PolygonType poly = axom::primal::clip(tri, bbox); - EXPECT_EQ(4, poly.numVertices()); - - EXPECT_NEAR(0., poly.vertexMean()[0], EPS); - EXPECT_NEAR(0., poly.vertexMean()[1], EPS); - EXPECT_NEAR(0., poly.vertexMean()[2], EPS); - - SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); - } - - // triangle at z=0 w/ two vertices inside unit cube - { - TriangleType tri(PointType {0.25, 0.25, 0.}, - PointType {0.75, 0.25, 0.}, - PointType {1.5, 0.5, 0.}); - - PolygonType poly = axom::primal::clip(tri, bbox); - EXPECT_EQ(4, poly.numVertices()); - - SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); - } - - // triangle at z=0 w/ vertices aligned w/ bounding box planes - { - TriangleType tri(PointType {2, 1, 0.}, - PointType {2, 2, 0.}, - PointType {1, 2, 0.}); - - PolygonType poly = axom::primal::clip(tri, bbox); - EXPECT_EQ(0, poly.numVertices()); - } - - // triangle at z=0 w/ one vertex coincident w/ cube - { - TriangleType tri(PointType {1, 2, 0.}, - PointType {1, 1, 0.}, - PointType {2, 1, 0.}); - - PolygonType poly = axom::primal::clip(tri, bbox); - EXPECT_EQ(0, poly.numVertices()); - } - - // triangle at z=0 w/ one edge midpoint coincident w/ cube - { - TriangleType tri(PointType {0, 2, 0.}, - PointType {2, 0, 0.}, - PointType {2, 2, 0.}); - - PolygonType poly = axom::primal::clip(tri, bbox); - EXPECT_EQ(0, poly.numVertices()); - } - - // triangle at z=0 w/ one edge coincident w/ unit cube and the other outside - { - TriangleType tri(PointType {-10, 1, 0.}, - PointType {10, 1, 0.}, - PointType {0, 10, 0.}); - - PolygonType poly = axom::primal::clip(tri, bbox); - EXPECT_EQ(0, poly.numVertices()); - } - - // triangle at z=0 w/ one edge coincident w/ unit cube and the last vertex inside - { - TriangleType tri(PointType {-10, 1, 0.}, - PointType {10, 1, 0.}, - PointType {0, 0, 0.}); - - PolygonType poly = axom::primal::clip(tri, bbox); - EXPECT_EQ(5, poly.numVertices()); - - SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); - } - - // triangle at z=0 w/ one edge coincident w/ unit cube and the last vertex on the other side - { - TriangleType tri(PointType {-10, 1, 0.}, - PointType {10, 1, 0.}, - PointType {0, -10, 0.}); - - PolygonType poly = axom::primal::clip(tri, bbox); - EXPECT_EQ(4, poly.numVertices()); - - SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); - } - - // triangle at z=1 w/ one edge coincident w/ unit cube and the last vertex on the other side - { - TriangleType tri(PointType {-10, 1, 1.}, - PointType {10, 1, 1.}, - PointType {0, -10, 1.}); - - PolygonType poly_no_bdry = axom::primal::clip(tri, bbox); - EXPECT_EQ(4, poly_no_bdry.numVertices()); - } - - { - TriangleType tri(PointType {-2, .25, .5}, - PointType {.25, .25, .5}, - PointType {.25, .75, .5}); - - PolygonType poly = axom::primal::clip(tri, bbox); - EXPECT_EQ(4, poly.numVertices()); + // define a slightly inflated bbox for containment tests + constexpr double EPS = 1e-8; + BoundingBoxType expanded_bbox(bbox); + expanded_bbox.expand(EPS); - SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); - } + std::vector> test_cases; + // add a bunch of test cases { - TriangleType tri(PointType {-2, .25, .5}, - PointType {.75, .25, .5}, - PointType {.75, .75, .5}); - - PolygonType poly = axom::primal::clip(tri, bbox); - EXPECT_EQ(4, poly.numVertices()); - - SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); + // this triangle is clearly outside the reference cube + test_cases.push_back(std::make_pair( + TriangleType {PointType {2, 2, 2}, PointType {2, 2, 4}, PointType {2, 4, 2}}, + 0)); + + // triangle at z=0 that spans entire cube + test_cases.push_back(std::make_pair(TriangleType {PointType {-100, -100, 0.}, + PointType {-100, 100, 0.}, + PointType {100, 0, 0.}}, + 4)); + + // triangle at z=0 w/ two vertices inside unit cube + test_cases.push_back(std::make_pair(TriangleType {PointType {0.25, 0.25, 0.}, + PointType {0.75, 0.25, 0.}, + PointType {1.5, 0.5, 0.}}, + 4)); + + // triangle at z=0 w/ vertices aligned w/ bounding box planes + test_cases.push_back(std::make_pair(TriangleType {PointType {2, 1, 0.}, + PointType {2, 2, 0.}, + PointType {1, 2, 0.}}, + 0)); + + // triangle at z=0 w/ one vertex coincident w/ cube + test_cases.push_back(std::make_pair(TriangleType {PointType {1, 2, 0.}, + PointType {1, 1, 0.}, + PointType {2, 1, 0.}}, + 0)); + + // triangle at z=0 w/ one edge midpoint coincident w/ cube + test_cases.push_back(std::make_pair(TriangleType {PointType {0, 2, 0.}, + PointType {2, 0, 0.}, + PointType {2, 2, 0.}}, + 0)); + + // triangle at z=0 w/ one edge coincident w/ unit cube and the other outside + test_cases.push_back(std::make_pair(TriangleType {PointType {-10, 1, 0.}, + PointType {10, 1, 0.}, + PointType {0, 10, 0.}}, + 0)); + + // triangle at z=0 w/ one edge coincident w/ unit cube and the last vertex inside + test_cases.push_back(std::make_pair(TriangleType {PointType {-10, 1, 0.}, + PointType {10, 1, 0.}, + PointType {0, 0, 0.}}, + 5)); + + // triangle at z=0 w/ one edge coincident w/ unit cube and the last vertex on the other side + test_cases.push_back(std::make_pair(TriangleType {PointType {-10, 1, 0.}, + PointType {10, 1, 0.}, + PointType {0, -10, 0.}}, + 4)); + + // triangle at z=1 w/ one edge coincident w/ unit cube and the last vertex on the other side + test_cases.push_back(std::make_pair(TriangleType {PointType {-10, 1, 1.}, + PointType {10, 1, 1.}, + PointType {0, -10, 1.}}, + 4)); + + // triangle at z=.5 w/ two vertices inside cube and one to the left + test_cases.push_back(std::make_pair(TriangleType {PointType {-2, .25, .5}, + PointType {.25, .25, .5}, + PointType {.25, .75, .5}}, + 4)); + + // triangle at z=.5 w/ two vertices inside cube and one to the left + test_cases.push_back(std::make_pair(TriangleType {PointType {-2, .25, .5}, + PointType {.75, .25, .5}, + PointType {.75, .75, .5}}, + 4)); + + // all vertices outside cube, one vertex above, one vertex to the left and one to the top left + test_cases.push_back(std::make_pair(TriangleType {PointType {.9, 100, .5}, + PointType {100, -1, .5}, + PointType {100, 100, .5}}, + 0)); } + // check each test case + for(const auto& pair : test_cases) { - TriangleType tri(PointType {.9, 100, .5}, - PointType {100, -1, .5}, - PointType {100, 100, .5}); + const auto& tri = pair.first; + const int expected_verts = pair.second; PolygonType poly = axom::primal::clip(tri, bbox); - EXPECT_EQ(0, poly.numVertices()); - SLIC_INFO(axom::fmt::format(print_template, tri, bbox, poly)); + SLIC_INFO( + axom::fmt::format("Intersection of triangle {} and bbox {} is polygon {}", + tri, + bbox, + poly)); + + // The clipped polygon + // ... should have the expected number of vertices + EXPECT_EQ(expected_verts, poly.numVertices()); + // ... should lie inside the bounding box (inflated by EPS to deal w/ boundaries) + EXPECT_TRUE(expanded_bbox.contains(axom::primal::compute_bounding_box(poly))); + // ... and its area should be at most that of the original triangle + EXPECT_GE(tri.area(), poly.area()); } } From e4f06a4a392fd9b2c6af5630b1802befa38c24fa Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 2 Jan 2024 13:09:57 -0800 Subject: [PATCH 376/639] Updates RELEASE-NOTES --- RELEASE-NOTES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 443c336058..b64e1d9734 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -50,12 +50,14 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ returns the signed volume. - Primal: `intersection_volume()` operators changed from returning a signed volume to an unsigned volume. +- Primal's `BoundingBox::contains(BoundingBox)` now returns `true` when the input is empty ### Fixed - quest's `SamplingShaper` now properly handles material names containing underscores - quest's `SamplingShaper` can now be used with an mfem that is configured for (GPU) devices - primal's `Polygon` area computation in 3D previously only worked when the polygon was aligned with the XY-plane. It now works for arbitrary polygons. - Upgrades our `vcpkg` usage for automated Windows builds of our TPLs to its [2023.12.12 release](https://github.com/microsoft/vcpkg/releases/tag/2023.12.12) +- Fixed a bug in the bounds checks for `primal::clip(Triangle, BoundingBox)` ## [Version 0.8.1] - Release date 2023-08-16 From 5aa1cbc30f9e261b0d342725d51a1232c06513b3 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 2 Jan 2024 13:50:51 -0800 Subject: [PATCH 377/639] Fixes release mode warnings w/ clang on LLNL's toss4 platform --- src/axom/mint/mesh/StructuredMesh.cpp | 1 + src/axom/multimat/examples/traversal.cpp | 3 +++ src/axom/multimat/multimat.hpp | 8 ++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/axom/mint/mesh/StructuredMesh.cpp b/src/axom/mint/mesh/StructuredMesh.cpp index 08348e0d54..3cf5821420 100644 --- a/src/axom/mint/mesh/StructuredMesh.cpp +++ b/src/axom/mint/mesh/StructuredMesh.cpp @@ -57,6 +57,7 @@ void StructuredMesh::setExtent(int ndims, const int64* extent) } SLIC_ASSERT(numNodes == getNumberOfNodes()); + AXOM_UNUSED_VAR(numNodes); #ifdef AXOM_MINT_USE_SIDRE if(hasSidreGroup()) diff --git a/src/axom/multimat/examples/traversal.cpp b/src/axom/multimat/examples/traversal.cpp index 025639303e..18831a0861 100644 --- a/src/axom/multimat/examples/traversal.cpp +++ b/src/axom/multimat/examples/traversal.cpp @@ -168,6 +168,8 @@ void various_traversal_methods(int nmats, timer.stop(); SLIC_INFO(" Field1D: " << timer.elapsed() << " sec"); SLIC_ASSERT(c_sum == sum); + AXOM_UNUSED_VAR(c_sum); + AXOM_UNUSED_VAR(sum); sum = 0; timer.reset(); @@ -203,6 +205,7 @@ void various_traversal_methods(int nmats, timer.stop(); SLIC_INFO(" Field2D: " << timer.elapsed() << " sec"); SLIC_ASSERT(x_sum == sum); + AXOM_UNUSED_VAR(x_sum); // ------- Dense Access ---------- SLIC_INFO("\n -- Dense Access via map-- "); diff --git a/src/axom/multimat/multimat.hpp b/src/axom/multimat/multimat.hpp index c0451987d3..cae4763a24 100644 --- a/src/axom/multimat/multimat.hpp +++ b/src/axom/multimat/multimat.hpp @@ -1055,21 +1055,21 @@ int MultiMat::addFieldArray_impl(const std::string& field_name, SLIC_ASSERT(m_fieldNameVec.size() == m_fieldSparsityLayoutVec.size()); SLIC_ASSERT(m_fieldNameVec.size() == m_fieldStrideVec.size()); - axom::IndexType set_size = 0; +#ifdef AXOM_DEBUG if(field_mapping == FieldMapping::PER_CELL_MAT) { const BivariateSetType* s = get_mapped_biSet(data_layout, sparsity_layout); SLIC_ASSERT(s != nullptr); - set_size = s->size(); + SLIC_ASSERT(s->size() * stride == data_arr.size()); } else { SLIC_ASSERT(field_mapping == FieldMapping::PER_CELL || field_mapping == FieldMapping::PER_MAT); const RangeSetType& s = *getMappedRangeSet(field_mapping); - set_size = s.size(); + SLIC_ASSERT(s.size() * stride == data_arr.size()); } - SLIC_ASSERT(set_size * stride == data_arr.size()); +#endif m_fieldBackingVec.back() = std::make_unique(data_arr, owned, m_fieldAllocatorId); From 654da2d467c27de00892282b350b8af86a7af3ee Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 4 Jan 2024 10:30:53 -0800 Subject: [PATCH 378/639] Minor: Updates formatting for debugging InOutOctree --- src/axom/primal/geometry/Ray.hpp | 5 +++ src/axom/quest/InOutOctree.hpp | 39 +++++++++++---------- src/axom/quest/detail/inout/BlockData.hpp | 5 +++ src/axom/quest/detail/inout/MeshWrapper.hpp | 2 +- src/axom/spin/OctreeBase.hpp | 2 +- 5 files changed, 32 insertions(+), 21 deletions(-) diff --git a/src/axom/primal/geometry/Ray.hpp b/src/axom/primal/geometry/Ray.hpp index f5f0f1f732..fe9669faa2 100644 --- a/src/axom/primal/geometry/Ray.hpp +++ b/src/axom/primal/geometry/Ray.hpp @@ -162,4 +162,9 @@ std::ostream& operator<<(std::ostream& os, const Ray& ray) } // namespace primal } // namespace axom +/// Overload to format a primal::Ray using fmt +template +struct axom::fmt::formatter> : ostream_formatter +{ }; + #endif // AXOM_PRIMAL_RAY_HPP_ diff --git a/src/axom/quest/InOutOctree.hpp b/src/axom/quest/InOutOctree.hpp index b70219bd93..063cbf8456 100644 --- a/src/axom/quest/InOutOctree.hpp +++ b/src/axom/quest/InOutOctree.hpp @@ -546,7 +546,7 @@ void InOutOctree::insertVertex(VertexIndex idx, int startingLevel) "Looking at block {} w/ blockBB {} indexing leaf vertex {}", pt, idx, - block, + axom::fmt::streamed(block), this->blockBoundingBox(block), blkData.dataIndex())); @@ -579,7 +579,7 @@ void InOutOctree::insertVertex(VertexIndex idx, int startingLevel) blkData.dataIndex() == DEBUG_VERT_IDX, fmt::format("-- vertex {} is indexed in block {}. Leaf vertex is {}", idx, - block, + axom::fmt::streamed(block), blkData.dataIndex())); } @@ -660,7 +660,7 @@ void InOutOctree::insertMeshCells() "\n\tDynamic data: {}" "\n\tBlock data: {}" "\n\tAbout to finalize? {}", - blk, + axom::fmt::streamed(blk), dynamicLeafData, blkData, (!isInternal && !isLeafThatMustRefine ? " yes" : "no"))); @@ -688,7 +688,7 @@ void InOutOctree::insertMeshCells() fmt::format("[Added block {} into tree as a gray leaf]." "\n\tDynamic data: {}" "\n\tBlock data: {}", - blk, + axom::fmt::streamed(blk), dynamicLeafData, blkData)); } @@ -788,7 +788,7 @@ void InOutOctree::insertMeshCells() tIdx, spaceTri, tBB, - childBlk[j], + axom::fmt::streamed(childBlk[j]), childBB[j], *childDataPtr[j], (shouldAddCell ? " yes" : "no"))); @@ -819,7 +819,7 @@ void InOutOctree::insertMeshCells() tIdx, spaceTri, fmt::join(m_meshWrapper.cellVertexIndices(tIdx), ", "), - childBlk[j], + axom::fmt::streamed(childBlk[j]), *(childDataPtr[j]))); } } @@ -941,9 +941,10 @@ bool InOutOctree::colorLeafAndNeighbors(const BlockIndex& leafBlk, { bool isColored = leafData.isColored(); - QUEST_OCTREE_DEBUG_LOG_IF( - leafBlk == DEBUG_BLOCK_1 || leafBlk == DEBUG_BLOCK_2, - fmt::format("Trying to color {} with data: {}", leafBlk, leafData)); + QUEST_OCTREE_DEBUG_LOG_IF(leafBlk == DEBUG_BLOCK_1 || leafBlk == DEBUG_BLOCK_2, + fmt::format("Trying to color {} with data: {}", + axom::fmt::streamed(leafBlk), + leafData)); if(!isColored) { @@ -962,11 +963,11 @@ bool InOutOctree::colorLeafAndNeighbors(const BlockIndex& leafBlk, "bounding box {} w/ midpoint {}" "\n\t\t from block {} with data {}, " "bounding box {} w/ midpoint {}.", - leafBlk, + axom::fmt::streamed(leafBlk), leafData, this->blockBoundingBox(leafBlk), this->blockBoundingBox(leafBlk).getCentroid(), - neighborBlk, + axom::fmt::streamed(neighborBlk), neighborData, this->blockBoundingBox(neighborBlk), this->blockBoundingBox(neighborBlk).getCentroid())); @@ -1004,7 +1005,7 @@ bool InOutOctree::colorLeafAndNeighbors(const BlockIndex& leafBlk, isColored && (DEBUG_BLOCK_1 == neighborBlk || DEBUG_BLOCK_2 == neighborBlk), fmt::format("Leaf block was colored -- {} now has data {}", - leafBlk, + axom::fmt::streamed(leafBlk), leafData)); } } @@ -1028,11 +1029,11 @@ bool InOutOctree::colorLeafAndNeighbors(const BlockIndex& leafBlk, "bounding box {} w/ midpoint {}" "\n\t\t to block {} with data {}, " "bounding box {} w/ midpoint {}.", - leafBlk, + axom::fmt::streamed(leafBlk), leafData, this->blockBoundingBox(leafBlk), this->blockBoundingBox(leafBlk).getCentroid(), - neighborBlk, + axom::fmt::streamed(neighborBlk), neighborData, this->blockBoundingBox(neighborBlk), this->blockBoundingBox(neighborBlk).getCentroid())); @@ -1070,7 +1071,7 @@ bool InOutOctree::colorLeafAndNeighbors(const BlockIndex& leafBlk, neighborData.isColored() && (DEBUG_BLOCK_1 == neighborBlk || DEBUG_BLOCK_2 == neighborBlk), fmt::format("Neighbor block was colored -- {} now has data {}", - neighborBlk, + axom::fmt::streamed(neighborBlk), neighborData)); } } @@ -1169,7 +1170,7 @@ typename std::enable_if::type InOutOctree::withinGrayBlock fmt::format("Checking if pt {} is within block {} with data {}, " "ray is {}, triangle point is {} on triangle with index {}.", queryPt, - leafBlk, + axom::fmt::streamed(leafBlk), leafData, ray, triPt, @@ -1228,8 +1229,8 @@ typename std::enable_if::type InOutOctree::withinGrayBlock return normal.dot(ray.direction()) > 0.; } - SLIC_DEBUG("Could not determine inside/outside for point " - << queryPt << " on block " << leafBlk); + // SLIC_DEBUG("Could not determine inside/outside for point " + // << queryPt << " on block " << leafBlk); return false; // query points on boundary might get here -- revisit this. } @@ -1285,7 +1286,7 @@ typename std::enable_if::type InOutOctree::withinGrayBlock fmt::format("Checking if pt {} is within block {} with data {}, " "ray is {}, segment point is {} on segment with index {}.", queryPt, - leafBlk, + axom::fmt::streamed(leafBlk), leafData, ray, segmentPt, diff --git a/src/axom/quest/detail/inout/BlockData.hpp b/src/axom/quest/detail/inout/BlockData.hpp index d8ab99e011..2a6a125316 100644 --- a/src/axom/quest/detail/inout/BlockData.hpp +++ b/src/axom/quest/detail/inout/BlockData.hpp @@ -438,4 +438,9 @@ template <> struct axom::fmt::formatter : ostream_formatter { }; +/// Overload to format a quest::DynamicGrayBlockData using fmt +template <> +struct axom::fmt::formatter : ostream_formatter +{ }; + #endif // AXOM_QUEST_INOUT_OCTREE_BLOCKDATA__HPP_ diff --git a/src/axom/quest/detail/inout/MeshWrapper.hpp b/src/axom/quest/detail/inout/MeshWrapper.hpp index 3f59018d7f..f9b6cc492a 100644 --- a/src/axom/quest/detail/inout/MeshWrapper.hpp +++ b/src/axom/quest/detail/inout/MeshWrapper.hpp @@ -26,7 +26,7 @@ namespace axom namespace quest { /** - * \brief A utility class that wraps access to the mesh data of and InOutOctree + * \brief A utility class that wraps access to the mesh data of an InOutOctree * * This class helps separate the specifics of accessing the underlying mesh * for an InOutOctree. It is customized for unstructured Segment meshes in 2D diff --git a/src/axom/spin/OctreeBase.hpp b/src/axom/spin/OctreeBase.hpp index ff344d86ff..c5470443d9 100644 --- a/src/axom/spin/OctreeBase.hpp +++ b/src/axom/spin/OctreeBase.hpp @@ -20,7 +20,7 @@ #include "axom/spin/OctreeLevel.hpp" #include "axom/spin/SparseOctreeLevel.hpp" -#include // for ostream in print +#include namespace axom { From be1fc6b09717872b0c6c7c713c700e88a2c64acc Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 4 Jan 2024 10:32:18 -0800 Subject: [PATCH 379/639] Updates quest_regression test to show distances in case of disagreeements --- src/axom/quest/tests/quest_regression.cpp | 120 +++++++++++++--------- 1 file changed, 72 insertions(+), 48 deletions(-) diff --git a/src/axom/quest/tests/quest_regression.cpp b/src/axom/quest/tests/quest_regression.cpp index 209f480d26..021c0aa219 100644 --- a/src/axom/quest/tests/quest_regression.cpp +++ b/src/axom/quest/tests/quest_regression.cpp @@ -52,13 +52,14 @@ #endif // C/C++ includes -#include // for std::signbit() +#include #include -const int DIM = 3; -const int MAX_RESULTS = 10; // Max number of disagreeing entries to show - // when comparing results -const int DEFAULT_RESOLUTION = 32; // Default resolution of query grid +constexpr int DIM = 3; +// Default resolution of query grid +constexpr int DEFAULT_RESOLUTION = 32; +// Max number of disagreeing entries to show when comparing results +constexpr int MAX_RESULTS = 10; namespace mint = axom::mint; namespace primal = axom::primal; @@ -71,7 +72,7 @@ using SpacePt = primal::Point; using SpaceVec = primal::Vector; using GridPt = primal::Point; -/** Simple structure to hold the command line arguments */ +/// Simple structure to hold the command line arguments struct Input { Input() = default; @@ -104,9 +105,7 @@ struct Input bool hasBoundingBox() const { return meshBoundingBox != SpaceBoundingBox(); } bool hasQueryMesh() const { return queryMesh != nullptr; } - /** - * \brief Parses the command line options - */ + /// Parses the command line options void parse(int argc, char** argv, axom::CLI::App& app) { app @@ -138,8 +137,7 @@ struct Input ->check(axom::CLI::ExistingFile); #endif - // user can supply 1 or 3 values for resolution - // the following is not quite right + // user can supply 1 or 3 values for resolution the following is not quite right auto* res = app .add_option("-r,--resolution", m_resolution, @@ -211,7 +209,7 @@ struct Input } }; -/** Loads the baseline dataset into the given sidre group */ +/// Loads the baseline dataset into the given sidre group void loadBaselineData(sidre::Group* grp, Input& args) { sidre::IOManager reader(MPI_COMM_WORLD); @@ -587,11 +585,12 @@ bool compareDistanceAndContainment(Input& clargs) if(diffCount != 0) { passed = false; - SLIC_INFO("** Disagreement between SignedDistance " - << " and InOutOctree containment queries. " - << "\n There were " << diffCount << " differences." - << "\n Showing first " << std::min(diffCount, MAX_RESULTS) - << " results:" << out.data()); + SLIC_INFO(axom::fmt::format( + "** Disagreement between SignedDistance and InOutOctree queries.\n" + "There were {} differences.\n Showing first {} results -- {}", + diffCount, + std::min(diffCount, MAX_RESULTS), + std::string(out.begin(), out.end()))); } } @@ -599,8 +598,7 @@ bool compareDistanceAndContainment(Input& clargs) } /** - * \brief Function to compare the results from the InOutOctree and - * SignedDistance queries + * \brief Function to compare the results from the InOutOctree and SignedDistance queries * \return True if all results agree, False otherwise. * \note When there are differences, the first few are logged */ @@ -614,19 +612,41 @@ bool compareToBaselineResults(axom::sidre::Group* grp, Input& clargs) mint::UniformMesh* umesh = clargs.queryMesh; const int nnodes = umesh->getNumberOfNodes(); + int* base_inout_containment = nullptr; + int* exp_inout_containment = nullptr; + int* base_sd_containment = nullptr; + int* exp_sd_containment = nullptr; + double* base_sd_distance = nullptr; + double* exp_sd_distance = nullptr; + + // grab pointers to data arrays when appropriate + if(clargs.testContainment) + { + base_inout_containment = grp->getView("octree_containment")->getArray(); + exp_inout_containment = + umesh->getFieldPtr("octree_containment", mint::NODE_CENTERED); + } + + if(clargs.testDistance) + { + base_sd_containment = grp->getView("bvh_containment")->getArray(); + exp_sd_containment = + umesh->getFieldPtr("bvh_containment", mint::NODE_CENTERED); + + base_sd_distance = grp->getView("bvh_distance")->getArray(); + exp_sd_distance = + umesh->getFieldPtr("bvh_distance", mint::NODE_CENTERED); + } + if(clargs.testContainment) { int diffCount = 0; axom::fmt::memory_buffer out; - int* exp_containment = - umesh->getFieldPtr("octree_containment", mint::NODE_CENTERED); - int* base_containment = grp->getView("octree_containment")->getArray(); - for(int inode = 0; inode < nnodes; ++inode) { - const int expected = base_containment[inode]; - const int actual = exp_containment[inode]; + const int expected = base_inout_containment[inode]; + const int actual = exp_inout_containment[inode]; if(expected != actual) { if(diffCount < MAX_RESULTS) @@ -639,8 +659,16 @@ bool compareToBaselineResults(axom::sidre::Group* grp, Input& clargs) "\n Disagreement on sample {} @ {}. Expected {}, got {}", inode, pt, - expected, - actual); + expected ? "inside" : "outside", + actual ? "inside" : "outside"); + + if(clargs.testDistance) + { + axom::fmt::format_to( + std::back_inserter(out), + " -- distance from query point to surface is {} ", + base_sd_distance[inode]); + } } ++diffCount; } @@ -649,9 +677,12 @@ bool compareToBaselineResults(axom::sidre::Group* grp, Input& clargs) if(diffCount != 0) { passed = false; - SLIC_INFO("** Containment test failed. There were " - << diffCount << " differences. Showing first " - << std::min(diffCount, MAX_RESULTS) << out.data()); + SLIC_INFO(axom::fmt::format( + "** Containment test failed. There were {} differences. " + "Showing first {} -- {}", + diffCount, + std::min(diffCount, MAX_RESULTS), + std::string(out.begin(), out.end()))); } } @@ -660,20 +691,12 @@ bool compareToBaselineResults(axom::sidre::Group* grp, Input& clargs) int diffCount = 0; axom::fmt::memory_buffer out; - int* base_containment = grp->getView("bvh_containment")->getArray(); - int* exp_containment = - umesh->getFieldPtr("bvh_containment", mint::NODE_CENTERED); - - double* base_distance = grp->getView("bvh_distance")->getArray(); - double* exp_distance = - umesh->getFieldPtr("bvh_distance", mint::NODE_CENTERED); - for(int inode = 0; inode < nnodes; ++inode) { - const int expected_c = base_containment[inode]; - const int actual_c = exp_containment[inode]; - const double expected_d = base_distance[inode]; - const double actual_d = exp_distance[inode]; + const int expected_c = base_sd_containment[inode]; + const int actual_c = exp_sd_containment[inode]; + const double expected_d = base_sd_distance[inode]; + const double actual_d = exp_sd_distance[inode]; if(expected_c != actual_c || !utilities::isNearlyEqual(expected_d, actual_d)) { @@ -699,9 +722,12 @@ bool compareToBaselineResults(axom::sidre::Group* grp, Input& clargs) if(diffCount != 0) { passed = false; - SLIC_INFO("** Distance test failed. There were " - << diffCount << " differences. Showing first " - << std::min(diffCount, MAX_RESULTS) << out.data()); + SLIC_INFO(axom::fmt::format( + "** Distance test failed. There were {} differences. " + "Showing first {} -- {}", + diffCount, + std::min(diffCount, MAX_RESULTS), + std::string(out.begin(), out.end()))); } } @@ -784,9 +810,7 @@ void saveBaseline(axom::sidre::Group* grp, Input& clargs) protocol)); } -/** - * \brief Runs regression test for quest containment and signed distance queries - */ +/// Runs regression test for quest containment and signed distance queries int main(int argc, char** argv) { bool allTestsPassed = true; From 50a48b34fa71d06e078bd43d615dbc511f3b0798 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 4 Jan 2024 12:58:17 -0800 Subject: [PATCH 380/639] Updates documentation for `OrientedBoundingBox::addBox()` to reflect implementation --- src/axom/primal/geometry/OrientedBoundingBox.hpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/axom/primal/geometry/OrientedBoundingBox.hpp b/src/axom/primal/geometry/OrientedBoundingBox.hpp index fc5a3a0d30..294c2f555d 100644 --- a/src/axom/primal/geometry/OrientedBoundingBox.hpp +++ b/src/axom/primal/geometry/OrientedBoundingBox.hpp @@ -181,10 +181,9 @@ class OrientedBoundingBox /*! * \brief Expands the box so it contains the passed in box. * \param obb [in] OBB to add in - * \note If obb is invalid, makes this invalid too. - * \note Expands the extents so this box contains obb. This loses - * optimality of the box; for a better fit use merge_boxes in - * primal/compute_bounding_box. + * \note If obb is invalid, this is a no-op + * \note Expands the extents so this box contains obb. This loses optimality of the box + * for a better fit use merge_boxes in primal/compute_bounding_box. * \post this->contains(obb) == true */ void addBox(OrientedBoxType obb); From 08572582d39cad001ee766e641518307a1b407db Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 4 Jan 2024 12:56:14 -0800 Subject: [PATCH 381/639] Updates data submodule to include baseline changes --- data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data b/data index 04ecb2babe..ae15cb5f72 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 04ecb2babe63284af18501e945fc049f11f569c4 +Subproject commit ae15cb5f7279a5b89f7db39e69b82d2331e45a80 From bd07107b9fd9b67e8d9d99e44abca986a53e1914 Mon Sep 17 00:00:00 2001 From: format-robot Date: Thu, 4 Jan 2024 16:18:58 -0800 Subject: [PATCH 382/639] Applies clang-tidy rules to the code --- src/axom/primal/geometry/BezierPatch.hpp | 46 ++++++++++++++++---- src/axom/primal/operators/winding_number.hpp | 4 ++ src/axom/primal/tests/primal_solid_angle.cpp | 2 + 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index 50eff3e337..0c95d4b971 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -1896,14 +1896,20 @@ class BezierPatch VectorType::scalar_triple_product(v1, v2, v3), 0.0, tol)) + { return false; + } // Find three points that produce a nonzero normal Vector3D plane_normal = VectorType::cross_product(v1, v2); if(axom::utilities::isNearlyEqual(plane_normal.norm(), 0.0, tol)) + { plane_normal = VectorType::cross_product(v1, v3); + } if(axom::utilities::isNearlyEqual(plane_normal.norm(), 0.0, tol)) + { plane_normal = VectorType::cross_product(v2, v3); + } plane_normal = plane_normal.unitVector(); double sqDist = 0.0; @@ -1936,18 +1942,42 @@ class BezierPatch const int ord_u = getOrder_u(); const int ord_v = getOrder_v(); - if(ord_u <= 0 && ord_v <= 0) return true; - if(ord_u == 1 && ord_v == 0) return true; - if(ord_u == 0 && ord_v == 1) return true; + if(ord_u <= 0 && ord_v <= 0) + { + return true; + } + if(ord_u == 1 && ord_v == 0) + { + return true; + } + if(ord_u == 0 && ord_v == 1) + { + return true; + } // Check if the patch is planar - if(!isPlanar(tol)) return false; + if(!isPlanar(tol)) + { + return false; + } // Check if each bounding curve is linear - if(!isocurve_u(0).isLinear(tol)) return false; - if(!isocurve_v(0).isLinear(tol)) return false; - if(!isocurve_u(1).isLinear(tol)) return false; - if(!isocurve_v(1).isLinear(tol)) return false; + if(!isocurve_u(0).isLinear(tol)) + { + return false; + } + if(!isocurve_v(0).isLinear(tol)) + { + return false; + } + if(!isocurve_u(1).isLinear(tol)) + { + return false; + } + if(!isocurve_v(1).isLinear(tol)) + { + return false; + } return true; } diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index d4112c6ad1..4f12880c1a 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -657,9 +657,13 @@ double winding_number(const Point& query, // Find the direction of a ray perpendicular to that Vector v1; if(axom::utilities::isNearlyEqual(v0[0], v0[1], EPS)) + { v1 = Vector({v0[2], v0[2], -v0[0] - v0[1]}).unitVector(); + } else + { v1 = Vector({-v0[1] - v0[2], v0[0], v0[0]}).unitVector(); + } // Rotate v0 around v1 until it is perpendicular to the plane spanned by k and v1 double ang = (v0[2] < 0 ? 1.0 : -1.0) * diff --git a/src/axom/primal/tests/primal_solid_angle.cpp b/src/axom/primal/tests/primal_solid_angle.cpp index 95574be9cf..607b961f37 100644 --- a/src/axom/primal/tests/primal_solid_angle.cpp +++ b/src/axom/primal/tests/primal_solid_angle.cpp @@ -582,7 +582,9 @@ TEST(primal_integral, bezierpatch_sphere) { const int idx = 5 * i + j; for(int n = 0; n < 6; ++n) + { sphere_faces[n].setWeight(i, j, weight_data[idx]); + } // Set up each face by rotating one of the patch faces sphere_faces[0](i, j)[0] = node_data[idx][1]; From 1e982352950f388a084cd25f5faad23c7d6a83d2 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 4 Jan 2024 16:43:45 -0800 Subject: [PATCH 383/639] Adds modernize-use-using rule to clang-tidy --- src/.clang-tidy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/.clang-tidy b/src/.clang-tidy index e950a133fc..66f5c0ca24 100644 --- a/src/.clang-tidy +++ b/src/.clang-tidy @@ -1,4 +1,4 @@ -Checks: '-*,readability-braces-around-statements' +Checks: '-*,readability-braces-around-statements,modernize-use-using' WarningsAsErrors: '' HeaderFilterRegex: '.*' AnalyzeTemporaryDtors: false From 2fd614d2c60babeecfff5f2b5703b32a23cf73bb Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 4 Jan 2024 17:18:12 -0800 Subject: [PATCH 384/639] Only apply clang-tidy rules to c++ files --- src/.clang-tidy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/.clang-tidy b/src/.clang-tidy index 66f5c0ca24..62861da495 100644 --- a/src/.clang-tidy +++ b/src/.clang-tidy @@ -1,6 +1,6 @@ Checks: '-*,readability-braces-around-statements,modernize-use-using' WarningsAsErrors: '' -HeaderFilterRegex: '.*' +HeaderFilterRegex: "^.*.hpp$|^.*.cpp$" AnalyzeTemporaryDtors: false FormatStyle: none CheckOptions: From 4a3a27a74915d477330fa5cfa36df6d26b1dabb2 Mon Sep 17 00:00:00 2001 From: format-robot Date: Thu, 4 Jan 2024 17:14:21 -0800 Subject: [PATCH 385/639] Applies clang-tidy modernize-use-using rule --- src/axom/mint/examples/mint_heat_equation.cpp | 4 +- src/axom/mint/fem/FiniteElement.hpp | 8 ++-- src/axom/mint/mesh/CellTypes.hpp | 4 +- src/axom/mint/mesh/internal/MeshHelpers.cpp | 3 +- .../mint/tests/mint_fem_shape_functions.cpp | 12 +++--- src/axom/primal/geometry/NumericArray.hpp | 6 +-- .../primal/geometry/OrientedBoundingBox.hpp | 10 ++--- src/axom/primal/geometry/Point.hpp | 4 +- src/axom/primal/geometry/Vector.hpp | 4 +- .../operators/detail/intersect_impl.hpp | 6 +-- src/axom/primal/tests/primal_octahedron.cpp | 18 ++++----- src/axom/primal/tests/primal_point.cpp | 38 +++++++++---------- src/axom/quest/AllNearestNeighbors.cpp | 8 ++-- src/axom/quest/Shaper.hpp | 6 +-- src/axom/quest/tests/quest_vertex_weld.cpp | 8 ++-- src/axom/sidre/tests/sidre_opaque_C.cpp | 8 ++-- src/axom/sidre/tests/sidre_view.cpp | 2 +- src/axom/sidre/tests/spio/spio_basic.hpp | 2 +- .../compiler_flag_unused_local_typedef.cpp | 2 +- src/thirdparty/tests/sparsehash_smoke.cpp | 2 +- 20 files changed, 76 insertions(+), 79 deletions(-) diff --git a/src/axom/mint/examples/mint_heat_equation.cpp b/src/axom/mint/examples/mint_heat_equation.cpp index 0d19b3f634..d4c011ad7f 100644 --- a/src/axom/mint/examples/mint_heat_equation.cpp +++ b/src/axom/mint/examples/mint_heat_equation.cpp @@ -366,7 +366,7 @@ const std::string help_string = /*! * \brief A structure that holds the command line arguments. */ -typedef struct +using Arguments = struct { double h; double lower_bound[2]; @@ -379,7 +379,7 @@ typedef struct double t_max; int period; std::string path; -} Arguments; +}; /*! * \brief Parses and validates the command line arguments. diff --git a/src/axom/mint/fem/FiniteElement.hpp b/src/axom/mint/fem/FiniteElement.hpp index 4a4d89c3d6..2f6892fccb 100644 --- a/src/axom/mint/fem/FiniteElement.hpp +++ b/src/axom/mint/fem/FiniteElement.hpp @@ -499,7 +499,7 @@ class FiniteElement /// \name Reference Element Attributes /// @{ - typedef void (*ShapeFunctionPtr)(const double* lc, double* phi); + using ShapeFunctionPtr = void (*)(const double* lc, double* phi); ShapeFunctionPtr m_shapeFunction; /*! shape function functor */ ShapeFunctionPtr m_shapeFunctionDerivatives; /*! derivatives functor */ @@ -517,7 +517,7 @@ class FiniteElement DISABLE_MOVE_AND_ASSIGNMENT(FiniteElement); }; -} /* namespace mint */ +} // namespace mint } // namespace axom //------------------------------------------------------------------------------ @@ -534,8 +534,8 @@ void bind_basis(FiniteElement& fe) SLIC_ASSERT(fe.m_reference_center != nullptr); SLIC_ASSERT(fe.m_reference_coords != nullptr); - typedef mint::FEBasis FEBasisType; - typedef typename FEBasisType::ShapeFunctionType ShapeType; + using FEBasisType = mint::FEBasis; + using ShapeType = typename FEBasisType::ShapeFunctionType; if(CELLTYPE != fe.getCellType()) { diff --git a/src/axom/mint/mesh/CellTypes.hpp b/src/axom/mint/mesh/CellTypes.hpp index c65d83d029..93eecf12c5 100644 --- a/src/axom/mint/mesh/CellTypes.hpp +++ b/src/axom/mint/mesh/CellTypes.hpp @@ -108,7 +108,7 @@ constexpr int NUM_CELL_TYPES = static_cast(CellType::NUM_CELL_TYPES); * * \brief Holds information associated with a given cell type. */ -typedef struct +using CellInfo = struct { CellType cell_type; /*!< cell type, e.g. mint::QUAD, mint::HEX */ const char* name; /*!< the name associated with the cell */ @@ -119,7 +119,7 @@ typedef struct int face_nodecount[MAX_CELL_FACES]; /*!< number of nodes for each of cell's faces */ CellType face_types[MAX_CELL_FACES]; /*!< face type, e.g. mint::SEGMENT, mint::QUAD */ IndexType face_nodes[MAX_ALL_FACES_NODES]; /*!< nodes for each of cell's faces */ -} CellInfo; +}; // This construct lets us pass literal arrays to function-like macros. // AR stands for ARray. diff --git a/src/axom/mint/mesh/internal/MeshHelpers.cpp b/src/axom/mint/mesh/internal/MeshHelpers.cpp index 76906c3486..a2147b8467 100644 --- a/src/axom/mint/mesh/internal/MeshHelpers.cpp +++ b/src/axom/mint/mesh/internal/MeshHelpers.cpp @@ -195,7 +195,8 @@ bool initFaces(Mesh* mesh, f2noffsets[facecount] = faceNodeOffset; // Step 4. Now that we have face IDs, record cell-to-face relation. - typedef std::unordered_map> CellFaceBuilderType; + using CellFaceBuilderType = + std::unordered_map>; CellFaceBuilderType cell_to_face; int cellFaceCount = 0; diff --git a/src/axom/mint/tests/mint_fem_shape_functions.cpp b/src/axom/mint/tests/mint_fem_shape_functions.cpp index b47961d819..17781c45a5 100644 --- a/src/axom/mint/tests/mint_fem_shape_functions.cpp +++ b/src/axom/mint/tests/mint_fem_shape_functions.cpp @@ -34,8 +34,8 @@ namespace template void reference_element(double TOL = std::numeric_limits::epsilon()) { - typedef typename mint::FEBasis FEMType; - typedef typename FEMType::ShapeFunctionType ShapeFunctionType; + using FEMType = typename mint::FEBasis; + using ShapeFunctionType = typename FEMType::ShapeFunctionType; ShapeFunctionType sf; SLIC_INFO("checking " << mint::basis_name[BasisType] << " / " @@ -84,8 +84,8 @@ void reference_element(double TOL = std::numeric_limits::epsilon()) template void kronecker_delta() { - typedef typename mint::FEBasis FEMType; - typedef typename FEMType::ShapeFunctionType ShapeFunctionType; + using FEMType = typename mint::FEBasis; + using ShapeFunctionType = typename FEMType::ShapeFunctionType; ShapeFunctionType sf; SLIC_INFO("checking " << mint::basis_name[BasisType] << " / " @@ -122,8 +122,8 @@ void kronecker_delta() template void partition_of_unity() { - typedef typename mint::FEBasis FEMType; - typedef typename FEMType::ShapeFunctionType ShapeFunctionType; + using FEMType = typename mint::FEBasis; + using ShapeFunctionType = typename FEMType::ShapeFunctionType; ShapeFunctionType sf; SLIC_INFO("checking " << mint::basis_name[BasisType] << " / " diff --git a/src/axom/primal/geometry/NumericArray.hpp b/src/axom/primal/geometry/NumericArray.hpp index 011075f8ec..f6de8153c1 100644 --- a/src/axom/primal/geometry/NumericArray.hpp +++ b/src/axom/primal/geometry/NumericArray.hpp @@ -150,21 +150,21 @@ std::ostream& operator<<(std::ostream& os, const NumericArray& arr); template struct NonChar { - typedef T type; /** The non-char type to return */ + using type = T; // The non-char type to return }; template <> struct NonChar { /** A non-char signed type to which we can cast a char for output */ - typedef int type; + using type = int; }; template <> struct NonChar { /** A non-char unsigned type to which we can cast a char for output */ - typedef unsigned int type; + using type = unsigned int; }; /*! diff --git a/src/axom/primal/geometry/OrientedBoundingBox.hpp b/src/axom/primal/geometry/OrientedBoundingBox.hpp index 294c2f555d..f5d4a8694d 100644 --- a/src/axom/primal/geometry/OrientedBoundingBox.hpp +++ b/src/axom/primal/geometry/OrientedBoundingBox.hpp @@ -77,11 +77,11 @@ template class OrientedBoundingBox { public: - typedef T CoordType; - typedef Point PointType; - typedef Vector VectorType; - typedef OrientedBoundingBox OrientedBoxType; - typedef BoundingBox BoxType; + using CoordType = T; + using PointType = Point; + using VectorType = Vector; + using OrientedBoxType = OrientedBoundingBox; + using BoxType = BoundingBox; public: /*! diff --git a/src/axom/primal/geometry/Point.hpp b/src/axom/primal/geometry/Point.hpp index 9957d00b8d..a50256a9a1 100644 --- a/src/axom/primal/geometry/Point.hpp +++ b/src/axom/primal/geometry/Point.hpp @@ -250,8 +250,8 @@ class Point /// \name Pre-defined point types /// @{ -typedef Point Point2D; -typedef Point Point3D; +using Point2D = Point; +using Point3D = Point; /// @} diff --git a/src/axom/primal/geometry/Vector.hpp b/src/axom/primal/geometry/Vector.hpp index 50f1042ccf..4fbc158e0f 100644 --- a/src/axom/primal/geometry/Vector.hpp +++ b/src/axom/primal/geometry/Vector.hpp @@ -422,8 +422,8 @@ class Vector /// \name Pre-defined Vector types /// @{ -typedef Vector Vector2D; -typedef Vector Vector3D; +using Vector2D = Vector; +using Vector3D = Vector; /// @} diff --git a/src/axom/primal/operators/detail/intersect_impl.hpp b/src/axom/primal/operators/detail/intersect_impl.hpp index 6db127622f..29b7af8878 100644 --- a/src/axom/primal/operators/detail/intersect_impl.hpp +++ b/src/axom/primal/operators/detail/intersect_impl.hpp @@ -158,7 +158,7 @@ AXOM_HOST_DEVICE bool intersect_tri3D_tri3D(const Triangle& t1, bool includeBoundary, double EPS) { - typedef primal::Vector Vector3; + using Vector3 = primal::Vector; SLIC_CHECK_MSG(!t1.degenerate(), "\n\n WARNING \n\n Triangle " << t1 << " is degenerate"); @@ -762,7 +762,7 @@ bool intersect_tri_ray(const Triangle& tri, // I (Arlie Capps, Jan. 2017) don't understand the motivation at this // point, but I'll accept this for now. - typedef NumericArray NumArray; + using NumArray = NumericArray; const T zero = T(); //find out dimension where ray direction is maximal @@ -874,7 +874,7 @@ bool intersect_tri_segment(const Triangle& tri, T& t, Point& p) { - typedef Vector Vector3; + using Vector3 = Vector; Ray r(S.source(), Vector3(S.source(), S.target())); //Ray-triangle intersection does not check endpoints, so we explicitly check diff --git a/src/axom/primal/tests/primal_octahedron.cpp b/src/axom/primal/tests/primal_octahedron.cpp index f1a2d37477..c53581eee4 100644 --- a/src/axom/primal/tests/primal_octahedron.cpp +++ b/src/axom/primal/tests/primal_octahedron.cpp @@ -23,9 +23,9 @@ class OctahedronTest : public ::testing::Test public: static const int DIM = 3; - typedef double CoordType; - typedef primal::Point QPoint; - typedef primal::Octahedron QOct; + using CoordType = double; + using QPoint = primal::Point; + using QOct = primal::Octahedron; protected: virtual void SetUp() @@ -94,8 +94,8 @@ class OctahedronTest : public ::testing::Test //------------------------------------------------------------------------------ TEST_F(OctahedronTest, defaultConstructor) { - typedef OctahedronTest::QPoint QPoint; - typedef OctahedronTest::QOct QOct; + using QPoint = OctahedronTest::QPoint; + using QOct = OctahedronTest::QOct; const QOct oct; @@ -113,8 +113,8 @@ TEST_F(OctahedronTest, defaultConstructor) TEST_F(OctahedronTest, constructFromPoints) { - typedef OctahedronTest::QPoint QPoint; - typedef OctahedronTest::QOct QOct; + using QPoint = OctahedronTest::QPoint; + using QOct = OctahedronTest::QOct; // Access the test data const QPoint* pt = this->qData0; @@ -167,8 +167,8 @@ TEST_F(OctahedronTest, constructFromPoints) TEST_F(OctahedronTest, equals) { - typedef OctahedronTest::QPoint QPoint; - typedef OctahedronTest::QOct QOct; + using QPoint = OctahedronTest::QPoint; + using QOct = OctahedronTest::QOct; // Access the test data const QPoint* pt0 = this->qData0; diff --git a/src/axom/primal/tests/primal_point.cpp b/src/axom/primal/tests/primal_point.cpp index 73bf672c60..b3187440bd 100644 --- a/src/axom/primal/tests/primal_point.cpp +++ b/src/axom/primal/tests/primal_point.cpp @@ -37,8 +37,8 @@ void check_point_policy() TEST(primal_point, point_default_constructor) { static const int DIM = 2; - typedef double CoordType; - typedef primal::Point QPoint; + using CoordType = double; + using QPoint = primal::Point; QPoint pt; @@ -50,8 +50,8 @@ TEST(primal_point, point_default_constructor) TEST(primal_point, point_singleVal_constructor) { static const int DIM = 5; - typedef int CoordType; - typedef primal::Point QPoint; + using CoordType = int; + using QPoint = primal::Point; const int singleVal = 10; // @@ -103,8 +103,8 @@ TEST(primal_point, point_singleVal_constructor) TEST(primal_point, point_array_constructor) { static const int DIM = 5; - typedef int CoordType; - typedef primal::Point QPoint; + using CoordType = int; + using QPoint = primal::Point; // Set elt i of input array to i CoordType arr[DIM]; @@ -167,9 +167,9 @@ TEST(primal_point, point_array_constructor) TEST(primal_point, point_numericArray_constructor) { static const int DIM = 5; - typedef int CoordType; - typedef primal::NumericArray QArray; - typedef primal::Point QPoint; + using CoordType = int; + using QArray = primal::NumericArray; + using QPoint = primal::Point; // Set elt i of input array to i CoordType arr[DIM]; @@ -226,8 +226,8 @@ TEST(primal_point, point_initializerList_constructor) TEST(primal_point, point_copy_and_assignment) { static const int DIM = 5; - typedef int CoordType; - typedef primal::Point QPoint; + using CoordType = int; + using QPoint = primal::Point; // Set elt i of input array to i CoordType arr[DIM]; @@ -262,8 +262,8 @@ TEST(primal_point, point_copy_and_assignment) TEST(primal_point, point_equality) { static const int DIM = 5; - typedef int CoordType; - typedef primal::Point QPoint; + using CoordType = int; + using QPoint = primal::Point; // Set elt i of input array to i CoordType arr[DIM]; @@ -297,8 +297,8 @@ TEST(primal_point, point_equality) TEST(primal_point, point_to_array) { static const int DIM = 5; - typedef int CoordType; - typedef primal::Point QPoint; + using CoordType = int; + using QPoint = primal::Point; // Set elt i of input array to i CoordType arr[DIM]; @@ -321,8 +321,8 @@ TEST(primal_point, point_to_array) TEST(primal_point, point_make_point) { static const int DIM = 3; - typedef int CoordType; - typedef primal::Point QPoint; + using CoordType = int; + using QPoint = primal::Point; const int x = 10; const int y = 20; @@ -346,8 +346,8 @@ TEST(primal_point, point_make_point) TEST(primal_point, point_midpoint) { static const int DIM = 3; - typedef int CoordType; - typedef primal::Point QPoint; + using CoordType = int; + using QPoint = primal::Point; QPoint p10(10); QPoint p30(30); diff --git a/src/axom/quest/AllNearestNeighbors.cpp b/src/axom/quest/AllNearestNeighbors.cpp index 81b7b3d81b..bc0be2416c 100644 --- a/src/axom/quest/AllNearestNeighbors.cpp +++ b/src/axom/quest/AllNearestNeighbors.cpp @@ -31,10 +31,10 @@ void all_nearest_neighbors(const double* x, // points in this and neighboring UniformGrid bins (out to distance limit) // and report result. - typedef spin::UniformGrid GridType; - typedef GridType::BoxType BoxType; - typedef GridType::PointType PointType; - typedef BoxType::VectorType VectorType; + using GridType = spin::UniformGrid; + using BoxType = GridType::BoxType; + using PointType = GridType::PointType; + using VectorType = BoxType::VectorType; double sqlimit = limit * limit; diff --git a/src/axom/quest/Shaper.hpp b/src/axom/quest/Shaper.hpp index 265a79eef4..802a33e284 100644 --- a/src/axom/quest/Shaper.hpp +++ b/src/axom/quest/Shaper.hpp @@ -48,11 +48,7 @@ class Shaper static constexpr double DEFAULT_VERTEX_WELD_THRESHOLD {1e-9}; /// Refinement type. - typedef enum - { - RefinementUniformSegments, - RefinementDynamic - } RefinementType; + using RefinementType = enum { RefinementUniformSegments, RefinementDynamic }; //@{ //! @name Functions to get and set shaping parameters diff --git a/src/axom/quest/tests/quest_vertex_weld.cpp b/src/axom/quest/tests/quest_vertex_weld.cpp index 7e70391140..6eefff874b 100644 --- a/src/axom/quest/tests/quest_vertex_weld.cpp +++ b/src/axom/quest/tests/quest_vertex_weld.cpp @@ -13,11 +13,11 @@ namespace { -static const int DIM = 3; -static const double EPS = 1e-6; +constexpr int DIM = 3; +constexpr double EPS = 1e-6; -typedef axom::mint::UnstructuredMesh UMesh; -typedef axom::primal::Point Point3; +using UMesh = axom::mint::UnstructuredMesh; +using Point3 = axom::primal::Point; /*! Insert a vertex with coordinates (x,y,z) into \a mesh */ void insertVertex(UMesh* mesh, double x, double y, double z) diff --git a/src/axom/sidre/tests/sidre_opaque_C.cpp b/src/axom/sidre/tests/sidre_opaque_C.cpp index 1e4832fd63..401830b057 100644 --- a/src/axom/sidre/tests/sidre_opaque_C.cpp +++ b/src/axom/sidre/tests/sidre_opaque_C.cpp @@ -25,11 +25,11 @@ enum DType _UnknownType_ }; -typedef struct +using AA_extent = struct { int ilo; int ihi; -} AA_extent; +}; AA_extent* AA_extent_new(int lo, int hi) { @@ -60,12 +60,12 @@ int AA_get_num_pts(AA_extent* self, Centering cent) return retval; } -typedef struct +using AA_meshvar = struct { Centering cent; DType type; int depth; -} AA_meshvar; +}; AA_meshvar* AA_meshvar_new(Centering cent, DType type, int depth) { diff --git a/src/axom/sidre/tests/sidre_view.cpp b/src/axom/sidre/tests/sidre_view.cpp index e32196ad60..f2ee48532f 100644 --- a/src/axom/sidre/tests/sidre_view.cpp +++ b/src/axom/sidre/tests/sidre_view.cpp @@ -1180,7 +1180,7 @@ TEST(sidre_view, view_offset_and_stride) // string, scalar, empty, opaque Group* othersGroup = root->createGroup("others"); - typedef std::vector ViewVec; + using ViewVec = std::vector; ViewVec views; std::uint8_t ui8 = 3; std::uint16_t ui16 = 4; diff --git a/src/axom/sidre/tests/spio/spio_basic.hpp b/src/axom/sidre/tests/spio/spio_basic.hpp index d1ec7dddc7..d874c9d0fe 100644 --- a/src/axom/sidre/tests/spio/spio_basic.hpp +++ b/src/axom/sidre/tests/spio/spio_basic.hpp @@ -29,7 +29,7 @@ TEST(spio_basic, root_name) protocolMap["json"] = "json"; protocolMap["sidre_conduit_json"] = "conduit_json"; - typedef std::map::const_iterator MapIt; + using MapIt = std::map::const_iterator; for(MapIt it = protocolMap.begin(); it != protocolMap.end(); ++it) { const std::string& sidreProtocol = it->first; diff --git a/src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp b/src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp index f1a25f1685..037a14c53e 100644 --- a/src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp +++ b/src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp @@ -14,7 +14,7 @@ int main() { - typedef int IntT; + using IntT = int; std::cout << "I have defined type IntT, but am not using it." << std::endl; return 0; diff --git a/src/thirdparty/tests/sparsehash_smoke.cpp b/src/thirdparty/tests/sparsehash_smoke.cpp index 39b1bd2e87..4252169295 100644 --- a/src/thirdparty/tests/sparsehash_smoke.cpp +++ b/src/thirdparty/tests/sparsehash_smoke.cpp @@ -17,7 +17,7 @@ //----------------------------------------------------------------------------- TEST(sparsehash_smoke, basic_use) { - typedef axom::google::dense_hash_map MapType; + using MapType = axom::google::dense_hash_map; const std::string deletedKey = "DELETED"; const std::string emptyKey = "EMPTY"; From 845a13ac62479f67cec071348496b0c851e5c860 Mon Sep 17 00:00:00 2001 From: format-robot Date: Thu, 4 Jan 2024 17:28:18 -0800 Subject: [PATCH 386/639] Applies clang-tidy modernize-use-nullptr rule I didn't add it to the clang-tidy file to avoid it changing sidre auto-generated files. --- src/axom/core/examples/core_numerics.cpp | 2 +- src/axom/sidre/core/MFEMSidreDataCollection.cpp | 2 +- src/axom/sidre/core/View.cpp | 2 +- src/axom/sidre/examples/sidre_shocktube.cpp | 2 +- src/axom/sidre/tests/sidre_buffer.cpp | 6 +++--- src/axom/sidre/tests/sidre_external.cpp | 2 +- src/axom/sidre/tests/sidre_group.cpp | 4 ++-- src/thirdparty/tests/compiler_flag_strict_aliasing.cpp | 2 +- src/thirdparty/tests/hdf5_smoke.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/axom/core/examples/core_numerics.cpp b/src/axom/core/examples/core_numerics.cpp index c75adc94b2..518fed703b 100644 --- a/src/axom/core/examples/core_numerics.cpp +++ b/src/axom/core/examples/core_numerics.cpp @@ -192,7 +192,7 @@ void demoMatrix() // _eigs_start // Solve for eigenvectors and values using the power method // The power method calls rand(), so we need to initialize it with srand(). - std::srand(std::time(0)); + std::srand(std::time(nullptr)); double eigvec[nrows * ncols]; double eigval[nrows]; int res = numerics::eigen_solve(A, nrows, eigvec, eigval); diff --git a/src/axom/sidre/core/MFEMSidreDataCollection.cpp b/src/axom/sidre/core/MFEMSidreDataCollection.cpp index 8b3616fca0..651cacb749 100644 --- a/src/axom/sidre/core/MFEMSidreDataCollection.cpp +++ b/src/axom/sidre/core/MFEMSidreDataCollection.cpp @@ -979,7 +979,7 @@ void MFEMSidreDataCollection::UpdateStateFromDS() void MFEMSidreDataCollection::UpdateStateToDS() { SLIC_ASSERT_MSG( - mesh != NULL, + mesh != nullptr, "Need to set mesh before updating state in MFEMSidreDataCollection."); m_bp_grp->getView("state/cycle")->setScalar(GetCycle()); diff --git a/src/axom/sidre/core/View.cpp b/src/axom/sidre/core/View.cpp index ca8650ea2e..d70d50b8f5 100644 --- a/src/axom/sidre/core/View.cpp +++ b/src/axom/sidre/core/View.cpp @@ -1239,7 +1239,7 @@ bool View::isApplyValid() const */ char const* View::getStateStringName(State state) { - char const* ret_string = NULL; + char const* ret_string = nullptr; switch(state) { diff --git a/src/axom/sidre/examples/sidre_shocktube.cpp b/src/axom/sidre/examples/sidre_shocktube.cpp index 606fa52e5e..16df004982 100644 --- a/src/axom/sidre/examples/sidre_shocktube.cpp +++ b/src/axom/sidre/examples/sidre_shocktube.cpp @@ -503,7 +503,7 @@ void DumpUltra(Group* const prob) sprintf(tail, "_%04d.ult", prob->getView("cycle")->getData()); - if((fp = fopen(fname, "w")) == NULL) + if((fp = fopen(fname, "w")) == nullptr) { printf("Could not open file %s. Aborting.\n", fname); exit(-1); diff --git a/src/axom/sidre/tests/sidre_buffer.cpp b/src/axom/sidre/tests/sidre_buffer.cpp index 18d031b669..5537a0b0bc 100644 --- a/src/axom/sidre/tests/sidre_buffer.cpp +++ b/src/axom/sidre/tests/sidre_buffer.cpp @@ -298,18 +298,18 @@ TEST(sidre_buffer, with_multiple_views) EXPECT_EQ(dbuff->getNumViews(), 2); // Detach buffer from first view will not detach from datastore. - dv1->attachBuffer(NULL); + dv1->attachBuffer(nullptr); EXPECT_FALSE(dv1->hasBuffer()); EXPECT_EQ(ds->getNumBuffers(), 1u); EXPECT_EQ(dbuff->getNumViews(), 1); // Detach buffer from second view will detach from datastore. - dv2->attachBuffer(NULL); + dv2->attachBuffer(nullptr); EXPECT_FALSE(dv2->hasBuffer()); EXPECT_EQ(ds->getNumBuffers(), 0u); // Buffer has been destroyed since there are no more attached views - EXPECT_TRUE(ds->getBuffer(idx) == NULL); + EXPECT_TRUE(ds->getBuffer(idx) == nullptr); delete ds; } diff --git a/src/axom/sidre/tests/sidre_external.cpp b/src/axom/sidre/tests/sidre_external.cpp index 8ecbddd8a3..1f81785a52 100644 --- a/src/axom/sidre/tests/sidre_external.cpp +++ b/src/axom/sidre/tests/sidre_external.cpp @@ -171,7 +171,7 @@ TEST(sidre_external, transition_external_view_to_empty) EXPECT_EQ(idata, view->getVoidPtr()); // Transition from EXTERNAL to EMPTY - view->setExternalDataPtr(NULL); + view->setExternalDataPtr(nullptr); EXPECT_TRUE(view->isDescribed()); EXPECT_FALSE(view->isAllocated()); diff --git a/src/axom/sidre/tests/sidre_group.cpp b/src/axom/sidre/tests/sidre_group.cpp index 5294897e78..3a58de83bd 100644 --- a/src/axom/sidre/tests/sidre_group.cpp +++ b/src/axom/sidre/tests/sidre_group.cpp @@ -1024,7 +1024,7 @@ TEST(sidre_group, create_destroy_has_view) IndexType indx = group->getFirstValidViewIndex(); IndexType bindx = group->getView(indx)->getBuffer()->getIndex(); group->destroyViewAndData(indx); - EXPECT_TRUE(ds->getBuffer(bindx) == NULL); + EXPECT_TRUE(ds->getBuffer(bindx) == nullptr); // Destroy view but not the buffer view = group->createViewAndAllocate("viewWithLength2", INT_ID, 50); @@ -2323,7 +2323,7 @@ TEST(sidre_group, save_restore_external_data) int2d1[i] = i; int2d2[i] = 0; } - foo3 = NULL; + foo3 = nullptr; DataStore* ds1 = new DataStore(); Group* root1 = ds1->getRoot(); diff --git a/src/thirdparty/tests/compiler_flag_strict_aliasing.cpp b/src/thirdparty/tests/compiler_flag_strict_aliasing.cpp index 7fa2b796fd..10ad0a5987 100644 --- a/src/thirdparty/tests/compiler_flag_strict_aliasing.cpp +++ b/src/thirdparty/tests/compiler_flag_strict_aliasing.cpp @@ -29,7 +29,7 @@ struct Bar int main() { - Foo foo = {1, NULL}; + Foo foo = {1, nullptr}; ((Bar*)(&foo))->i++; // violates strict aliasing std::cout << " foo.i: " << foo.i << std::endl; diff --git a/src/thirdparty/tests/hdf5_smoke.cpp b/src/thirdparty/tests/hdf5_smoke.cpp index 2bdafad2c8..5b907f61dd 100644 --- a/src/thirdparty/tests/hdf5_smoke.cpp +++ b/src/thirdparty/tests/hdf5_smoke.cpp @@ -59,7 +59,7 @@ TEST(hdf5_smoke, create_dset) // Create the data space for the dataset. dims[0] = 4; dims[1] = 6; - dataspace_id = H5Screate_simple(2, dims, NULL); + dataspace_id = H5Screate_simple(2, dims, nullptr); EXPECT_GE(dataspace_id, 0); // Create the dataset. From cf34c4eefa5c3077c6e6823cdba134c632c855df Mon Sep 17 00:00:00 2001 From: format-robot Date: Thu, 4 Jan 2024 17:52:17 -0800 Subject: [PATCH 387/639] Applies clang-tidy readability-static-definition-in-anonymous-namespace rule --- src/axom/quest/tests/quest_c2c_reader.cpp | 8 ++++---- src/axom/slam/tests/slam_map_BivariateMap.cpp | 10 +++++----- src/axom/slam/tests/slam_map_DynamicMap.cpp | 2 +- src/axom/slam/tests/slam_map_Map.cpp | 2 +- src/axom/slam/tests/slam_map_SubMap.cpp | 4 ++-- src/axom/slam/tests/slam_set_BivariateSet.cpp | 8 ++++---- src/axom/slam/tests/slam_set_IndirectionSet.cpp | 2 +- src/axom/slam/tests/slam_set_Iterator.cpp | 2 +- src/axom/slam/tests/slam_set_PositionSet.cpp | 2 +- src/axom/slam/tests/slam_set_RangeSet.cpp | 8 ++++---- src/axom/slam/tests/slam_set_Set.cpp | 2 +- src/axom/spin/tests/spin_morton.cpp | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/axom/quest/tests/quest_c2c_reader.cpp b/src/axom/quest/tests/quest_c2c_reader.cpp index 41c0a1e252..40b1bd4fd5 100644 --- a/src/axom/quest/tests/quest_c2c_reader.cpp +++ b/src/axom/quest/tests/quest_c2c_reader.cpp @@ -32,10 +32,10 @@ namespace quest = axom::quest; namespace { -static const std::string C2C_LINE_FILENAME = "test_line.contour"; -static const std::string C2C_CIRCLE_FILENAME = "test_circle.contour"; -static const std::string C2C_SQUARE_FILENAME = "test_square.contour"; -static const std::string C2C_SPLINE_FILENAME = "test_spline.contour"; +const std::string C2C_LINE_FILENAME = "test_line.contour"; +const std::string C2C_CIRCLE_FILENAME = "test_circle.contour"; +const std::string C2C_SQUARE_FILENAME = "test_square.contour"; +const std::string C2C_SPLINE_FILENAME = "test_spline.contour"; } // end anonymous namespace /// Writes out a c2c file for a circle diff --git a/src/axom/slam/tests/slam_map_BivariateMap.cpp b/src/axom/slam/tests/slam_map_BivariateMap.cpp index f972718240..fe38bc1cda 100644 --- a/src/axom/slam/tests/slam_map_BivariateMap.cpp +++ b/src/axom/slam/tests/slam_map_BivariateMap.cpp @@ -51,12 +51,12 @@ using RelationSetType = slam::RelationSet; template using BivariateMapType = slam::BivariateMap; -static const SetPosition MAX_SET_SIZE1 = 10; -static const SetPosition MAX_SET_SIZE2 = 15; +constexpr SetPosition MAX_SET_SIZE1 = 10; +constexpr SetPosition MAX_SET_SIZE2 = 15; -static double const multFac3 = 0000.1; -static double const multFac1 = 1000.0; -static double const multFac2 = 0010.0; +constexpr double multFac3 = 0000.1; +constexpr double multFac1 = 1000.0; +constexpr double multFac2 = 0010.0; } // end anonymous namespace diff --git a/src/axom/slam/tests/slam_map_DynamicMap.cpp b/src/axom/slam/tests/slam_map_DynamicMap.cpp index 8a65c0cdad..4c9615fb43 100644 --- a/src/axom/slam/tests/slam_map_DynamicMap.cpp +++ b/src/axom/slam/tests/slam_map_DynamicMap.cpp @@ -26,7 +26,7 @@ using SetPosition = slam::DefaultPositionType; using SetElement = slam::DefaultElementType; using SetType = slam::DynamicSet; -static const SetPosition MAX_SET_SIZE = 10; +constexpr SetPosition MAX_SET_SIZE = 10; using IntMap = slam::DynamicMap; using RealMap = slam::DynamicMap; diff --git a/src/axom/slam/tests/slam_map_Map.cpp b/src/axom/slam/tests/slam_map_Map.cpp index 3fa933d513..12380e9147 100644 --- a/src/axom/slam/tests/slam_map_Map.cpp +++ b/src/axom/slam/tests/slam_map_Map.cpp @@ -31,7 +31,7 @@ using RealMap = slam::Map; template using VecIndirection = policies::STLVectorIndirection; -static SetPosition const MAX_SET_SIZE = 10; +constexpr SetPosition MAX_SET_SIZE = 10; template using CompileTimeStrideType = policies::CompileTimeStride; diff --git a/src/axom/slam/tests/slam_map_SubMap.cpp b/src/axom/slam/tests/slam_map_SubMap.cpp index 99d1c0a125..e6e99f0f4c 100644 --- a/src/axom/slam/tests/slam_map_SubMap.cpp +++ b/src/axom/slam/tests/slam_map_SubMap.cpp @@ -41,9 +41,9 @@ using OrderedSetType = axom::slam::OrderedSet< slam::policies::StrideOne, slam::policies::STLVectorIndirection>; -static const double multFac = 1.0001; +constexpr double multFac = 1.0001; -static PositionType const MAX_SET_SIZE = 10; +PositionType const MAX_SET_SIZE = 10; template T getValue(int idx) diff --git a/src/axom/slam/tests/slam_set_BivariateSet.cpp b/src/axom/slam/tests/slam_set_BivariateSet.cpp index 9cf1c45cc0..898abcdb5f 100644 --- a/src/axom/slam/tests/slam_set_BivariateSet.cpp +++ b/src/axom/slam/tests/slam_set_BivariateSet.cpp @@ -26,11 +26,11 @@ namespace policies = axom::slam::policies; namespace { -static const int SET_SIZE_1 = 5; -static const int SET_SIZE_2 = 16; +constexpr int SET_SIZE_1 = 5; +constexpr int SET_SIZE_2 = 16; -static const int SET_OFFSET_1 = 3; -static const int SET_OFFSET_2 = 2; +constexpr int SET_OFFSET_1 = 3; +constexpr int SET_OFFSET_2 = 2; // Template aliases to simplify specifying some sets and relations template diff --git a/src/axom/slam/tests/slam_set_IndirectionSet.cpp b/src/axom/slam/tests/slam_set_IndirectionSet.cpp index f705b02c89..6d17182a16 100644 --- a/src/axom/slam/tests/slam_set_IndirectionSet.cpp +++ b/src/axom/slam/tests/slam_set_IndirectionSet.cpp @@ -24,7 +24,7 @@ namespace slam = axom::slam; namespace { -static const int MAX_SET_SIZE = 10; +constexpr int MAX_SET_SIZE = 10; } /** diff --git a/src/axom/slam/tests/slam_set_Iterator.cpp b/src/axom/slam/tests/slam_set_Iterator.cpp index 257f2e11c1..7a820416f9 100644 --- a/src/axom/slam/tests/slam_set_Iterator.cpp +++ b/src/axom/slam/tests/slam_set_Iterator.cpp @@ -41,7 +41,7 @@ using RangeSet = slam::RangeSet; using VectorSet = slam::VectorIndirectionSet; using CArraySet = slam::CArrayIndirectionSet; -static const int SET_SIZE = 10; +constexpr int SET_SIZE = 10; /// Utility function to initialize a set for the test data /// Specialized for each set type diff --git a/src/axom/slam/tests/slam_set_PositionSet.cpp b/src/axom/slam/tests/slam_set_PositionSet.cpp index 719cffa023..a72fe11b0a 100644 --- a/src/axom/slam/tests/slam_set_PositionSet.cpp +++ b/src/axom/slam/tests/slam_set_PositionSet.cpp @@ -27,7 +27,7 @@ using SetType = axom::slam::PositionSet<>; using SetPosition = SetType::PositionType; using SetElement = SetType::ElementType; -static const SetPosition MAX_SET_SIZE = 10; +constexpr SetPosition MAX_SET_SIZE = 10; } // end anonymous namespace diff --git a/src/axom/slam/tests/slam_set_RangeSet.cpp b/src/axom/slam/tests/slam_set_RangeSet.cpp index c6f7abb152..bd3138493b 100644 --- a/src/axom/slam/tests/slam_set_RangeSet.cpp +++ b/src/axom/slam/tests/slam_set_RangeSet.cpp @@ -32,10 +32,10 @@ using SetType = axom::slam::RangeSet<>; using SetPosition = SetType::PositionType; using SetElement = SetType::ElementType; -static const SetPosition MAX_SIZE = 20; -static const SetElement lowerIndex = static_cast(.3 * MAX_SIZE); -static const SetElement upperIndex = static_cast(.7 * MAX_SIZE); -static const SetElement range = upperIndex - lowerIndex; +constexpr SetPosition MAX_SIZE = 20; +constexpr SetElement lowerIndex = static_cast(.3 * MAX_SIZE); +constexpr SetElement upperIndex = static_cast(.7 * MAX_SIZE); +constexpr SetElement range = upperIndex - lowerIndex; } // end anonymous namespace diff --git a/src/axom/slam/tests/slam_set_Set.cpp b/src/axom/slam/tests/slam_set_Set.cpp index d4a4d7358c..7db0d33c03 100644 --- a/src/axom/slam/tests/slam_set_Set.cpp +++ b/src/axom/slam/tests/slam_set_Set.cpp @@ -14,7 +14,7 @@ namespace { -static int const NUM_ELEMS = 5; +constexpr int NUM_ELEMS = 5; namespace slam = axom::slam; using RangeSetType = slam::RangeSet<>; diff --git a/src/axom/spin/tests/spin_morton.cpp b/src/axom/spin/tests/spin_morton.cpp index 27ffd7c5fb..0bb26a072d 100644 --- a/src/axom/spin/tests/spin_morton.cpp +++ b/src/axom/spin/tests/spin_morton.cpp @@ -26,7 +26,7 @@ using axom::primal::Point; namespace { -static const int MAX_ITER = 10000; +constexpr int MAX_ITER = 10000; // Generate a random integer in the range [beg, end) template From f0c62157ee3b51c9fc3d7204a08632cfb9213f9e Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 4 Jan 2024 17:53:12 -0800 Subject: [PATCH 388/639] Adds `std` namespace to a uint32_t type I couldn't reproduce https://github.com/LLNL/axom/issues/1248, but this will likely resolve the issue. --- src/axom/core/utilities/nvtx/interface.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/axom/core/utilities/nvtx/interface.hpp b/src/axom/core/utilities/nvtx/interface.hpp index ac8f6a5f67..0f0164bc79 100644 --- a/src/axom/core/utilities/nvtx/interface.hpp +++ b/src/axom/core/utilities/nvtx/interface.hpp @@ -12,10 +12,8 @@ namespace axom { namespace nvtx { -/*! - * \brief Predefined set of NVTX colors to use with NVTXRange. - */ -enum class Color : uint32_t +/// \brief Predefined set of NVTX colors to use with NVTXRange +enum class Color : std::uint32_t { BLACK = 0x00000000, GREEN = 0x0000FF00, From b7a78317bce646635b2f47dd4af12be5ebc44a50 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 4 Jan 2024 21:20:00 -0800 Subject: [PATCH 389/639] Fixes initialization warnings w/ XL compiler --- src/axom/core/Array.hpp | 10 +++++----- src/axom/core/ArrayBase.hpp | 6 +++--- src/axom/core/ArrayView.hpp | 3 ++- src/axom/core/tests/core_array.hpp | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index 292a9a65cf..8e2f77c36c 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -730,7 +730,7 @@ class Array : public ArrayBase> "Cannot call Array::resize() when T is non-trivially-" "constructible. Use Array::reserve() and emplace_back()" "instead."); - const StackArray dims {static_cast(args)...}; + const StackArray dims {{static_cast(args)...}}; resizeImpl(dims, true); } @@ -738,14 +738,14 @@ class Array : public ArrayBase> template > void resize(ArrayOptions::Uninitialized, Args... args) { - const StackArray dims {static_cast(args)...}; + const StackArray dims {{static_cast(args)...}}; resizeImpl(dims, false); } template > void resize(IndexType size, const T& value) { - resizeImpl({size}, true, &value); + resizeImpl({{size}}, true, &value); } void resize(const StackArray& size, const T& value) @@ -911,7 +911,7 @@ template template Array::Array(Args... args) : ArrayBase>( - StackArray {static_cast(args)...}) + StackArray {{static_cast(args)...}}) , m_allocator_id(axom::detail::getAllocatorID()) { static_assert(sizeof...(Args) == DIM, @@ -927,7 +927,7 @@ template template Array::Array(ArrayOptions::Uninitialized, Args... args) : ArrayBase>( - StackArray {static_cast(args)...}) + StackArray {{static_cast(args)...}}) , m_allocator_id(axom::detail::getAllocatorID()) { static_assert(sizeof...(Args) == DIM, diff --git a/src/axom/core/ArrayBase.hpp b/src/axom/core/ArrayBase.hpp index fc1b6b4eba..5fd7d9bba1 100644 --- a/src/axom/core/ArrayBase.hpp +++ b/src/axom/core/ArrayBase.hpp @@ -231,7 +231,7 @@ class ArrayBase static_assert(sizeof...(Args) <= DIM, "Index dimensions different from array dimensions"); constexpr int UDim = sizeof...(Args); - const StackArray indices {static_cast(args)...}; + const StackArray indices {{static_cast(args)...}}; return (*this)[indices]; } /// \overload @@ -255,14 +255,14 @@ class ArrayBase */ AXOM_HOST_DEVICE SliceType<1> operator[](const IndexType idx) { - const StackArray slice {idx}; + const StackArray slice {{idx}}; return (*this)[slice]; } /// \overload AXOM_HOST_DEVICE ConstSliceType<1> operator[](const IndexType idx) const { - const StackArray slice {idx}; + const StackArray slice {{idx}}; return (*this)[slice]; } diff --git a/src/axom/core/ArrayView.hpp b/src/axom/core/ArrayView.hpp index 51c1f41d18..4e2d96a296 100644 --- a/src/axom/core/ArrayView.hpp +++ b/src/axom/core/ArrayView.hpp @@ -233,7 +233,8 @@ using MCArrayView = ArrayView; template template ArrayView::ArrayView(T* data, Args... args) - : ArrayView(data, StackArray {static_cast(args)...}) + : ArrayView(data, + StackArray {{static_cast(args)...}}) { static_assert(sizeof...(Args) == DIM, "Array size must match number of dimensions"); diff --git a/src/axom/core/tests/core_array.hpp b/src/axom/core/tests/core_array.hpp index fd0f51d7c3..f3245e9b04 100644 --- a/src/axom/core/tests/core_array.hpp +++ b/src/axom/core/tests/core_array.hpp @@ -2219,7 +2219,7 @@ void test_resize_with_stackarray(DataType value) const int K_DIMS = 7; axom::Array arr2; - axom::StackArray dims2 = {I_DIMS, J_DIMS}; + axom::StackArray dims2 = {{I_DIMS, J_DIMS}}; arr2.resize(dims2, value); EXPECT_EQ(arr2.size(), I_DIMS * J_DIMS); EXPECT_EQ(arr2.shape()[0], I_DIMS); @@ -2234,7 +2234,7 @@ void test_resize_with_stackarray(DataType value) axom::Array arr3; - axom::StackArray dims3 = {I_DIMS, J_DIMS, K_DIMS}; + axom::StackArray dims3 = {{I_DIMS, J_DIMS, K_DIMS}}; arr3.resize(dims3, value); EXPECT_EQ(arr3.size(), I_DIMS * J_DIMS * K_DIMS); EXPECT_EQ(arr3.shape()[0], I_DIMS); From a88ffaffabd871822cf640e82d5b8a338070ce57 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 4 Jan 2024 21:21:09 -0800 Subject: [PATCH 390/639] Adds comments to clang-tidy config file --- src/.clang-tidy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/.clang-tidy b/src/.clang-tidy index 62861da495..ae714d78be 100644 --- a/src/.clang-tidy +++ b/src/.clang-tidy @@ -1,3 +1,7 @@ +# Adds some checks to the code +# the following might also be useful: +# modernize-use-nullptr +# readability-static-definition-in-anonymous-namespace Checks: '-*,readability-braces-around-statements,modernize-use-using' WarningsAsErrors: '' HeaderFilterRegex: "^.*.hpp$|^.*.cpp$" From 030edb3532e5a43fd6642221d56052c93e6b25c4 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Mon, 8 Jan 2024 10:44:56 -0800 Subject: [PATCH 391/639] Manually fixes some clang-tidy changes --- src/axom/mint/examples/mint_heat_equation.cpp | 6 ++---- src/axom/mint/mesh/CellTypes.hpp | 2 +- src/axom/sidre/tests/sidre_opaque_C.cpp | 4 ++-- src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp | 4 +++- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/axom/mint/examples/mint_heat_equation.cpp b/src/axom/mint/examples/mint_heat_equation.cpp index d4c011ad7f..65954231eb 100644 --- a/src/axom/mint/examples/mint_heat_equation.cpp +++ b/src/axom/mint/examples/mint_heat_equation.cpp @@ -363,10 +363,8 @@ const std::string help_string = "-d INT, -dumpPeriod INT\n" "\tThe number of cycles to wait between writing a dump file.\n"; -/*! - * \brief A structure that holds the command line arguments. - */ -using Arguments = struct +/// A structure that holds the command line arguments. +struct Arguments { double h; double lower_bound[2]; diff --git a/src/axom/mint/mesh/CellTypes.hpp b/src/axom/mint/mesh/CellTypes.hpp index 93eecf12c5..5d27eeadf8 100644 --- a/src/axom/mint/mesh/CellTypes.hpp +++ b/src/axom/mint/mesh/CellTypes.hpp @@ -108,7 +108,7 @@ constexpr int NUM_CELL_TYPES = static_cast(CellType::NUM_CELL_TYPES); * * \brief Holds information associated with a given cell type. */ -using CellInfo = struct +struct CellInfo { CellType cell_type; /*!< cell type, e.g. mint::QUAD, mint::HEX */ const char* name; /*!< the name associated with the cell */ diff --git a/src/axom/sidre/tests/sidre_opaque_C.cpp b/src/axom/sidre/tests/sidre_opaque_C.cpp index 401830b057..cd7a68660f 100644 --- a/src/axom/sidre/tests/sidre_opaque_C.cpp +++ b/src/axom/sidre/tests/sidre_opaque_C.cpp @@ -25,7 +25,7 @@ enum DType _UnknownType_ }; -using AA_extent = struct +struct AA_extent { int ilo; int ihi; @@ -60,7 +60,7 @@ int AA_get_num_pts(AA_extent* self, Centering cent) return retval; } -using AA_meshvar = struct +struct AA_meshvar { Centering cent; DType type; diff --git a/src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp b/src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp index 037a14c53e..68d15d90b7 100644 --- a/src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp +++ b/src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp @@ -14,7 +14,9 @@ int main() { - using IntT = int; + // NOLINTBEGIN + typedef int IntT; + // NOLINTEND std::cout << "I have defined type IntT, but am not using it." << std::endl; return 0; From b72019b68fd80c76ff207f0dec02339f14c006eb Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 9 Jan 2024 11:36:21 -0800 Subject: [PATCH 392/639] Array: Static assert on value capture --- src/axom/core/Array.hpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index 8e2f77c36c..13cb5a7be3 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -199,7 +199,7 @@ class Array : public ArrayBase> /*! * \brief Copy constructor for an Array instance */ - Array(const Array& other); + AXOM_HOST_DEVICE Array(const Array& other); /*! * \brief Move constructor for an Array instance @@ -1003,6 +1003,13 @@ Array::Array(const Array& other) static_cast>&>(other)) , m_allocator_id(other.m_allocator_id) { +#ifdef AXOM_DEVICE_CODE + static_assert( + false, + "axom::Array: cannot copy-construct on the device.\n" + "This is usually the result of capturing an array by-value in a lambda. " + "Use axom::ArrayView for value captures instead."); +#else initialize(other.size(), other.capacity()); // Use fill_range to ensure that copy constructors are invoked for each // element. @@ -1017,6 +1024,7 @@ Array::Array(const Array& other) m_allocator_id, other.data(), srcSpace); +#endif } //------------------------------------------------------------------------------ From f959483683387acb9104ffa4fbd00a885ccc6ce3 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 9 Jan 2024 14:53:23 -0800 Subject: [PATCH 393/639] Use a runtime error for copy constructor instead --- src/axom/core/Array.hpp | 10 +++--- src/axom/core/tests/core_array_for_all.hpp | 42 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index 13cb5a7be3..2d6e0226a9 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -1003,12 +1003,14 @@ Array::Array(const Array& other) static_cast>&>(other)) , m_allocator_id(other.m_allocator_id) { -#ifdef AXOM_DEVICE_CODE - static_assert( - false, +#if defined(AXOM_DEVICE_CODE) + #if defined(AXOM_DEBUG) + printf( "axom::Array: cannot copy-construct on the device.\n" "This is usually the result of capturing an array by-value in a lambda. " - "Use axom::ArrayView for value captures instead."); + "Use axom::ArrayView for value captures instead.\n"); + #endif + __trap(); #else initialize(other.size(), other.capacity()); // Use fill_range to ensure that copy constructors are invoked for each diff --git a/src/axom/core/tests/core_array_for_all.hpp b/src/axom/core/tests/core_array_for_all.hpp index 6ab55c4a8c..1a2fd9ca0c 100644 --- a/src/axom/core/tests/core_array_for_all.hpp +++ b/src/axom/core/tests/core_array_for_all.hpp @@ -65,6 +65,48 @@ using MyTypes = ::testing::Types< TYPED_TEST_SUITE(core_array_for_all, MyTypes); +//------------------------------------------------------------------------------ +AXOM_TYPED_TEST(core_array_for_all, capture_test) +{ + using ExecSpace = typename TestFixture::ExecSpace; + using KernelArray = typename TestFixture::KernelArray; + using KernelArrayView = typename TestFixture::KernelArrayView; + using HostArray = typename TestFixture::HostArray; + + // Don't test on CPU. + if(std::is_same::value) + { + return; + } +#if defined(AXOM_USE_RAJA) && defined(AXOM_USE_OPENMP) + if(std::is_same::value) + { + return; + } +#endif + + EXPECT_DEATH_IF_SUPPORTED( + { + // Create an array of N items using default MemorySpace for ExecSpace + constexpr int N = 4; + KernelArray arr(N); + + // Capture of axom::Array should fail. + axom::for_all( + N, + AXOM_LAMBDA(axom::IndexType idx) { + if(arr[0]) return; + }); + + // handles synchronization, if necessary + if(axom::execution_space::async()) + { + axom::synchronize(); + } + }, + ""); +} + //------------------------------------------------------------------------------ AXOM_TYPED_TEST(core_array_for_all, explicit_ArrayView) { From 94286e516f24236c919cbd207c1353ce931cf160 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 9 Jan 2024 17:53:58 -0800 Subject: [PATCH 394/639] Changes for HIP --- src/axom/core/Array.hpp | 4 +++- src/axom/core/tests/core_array_for_all.hpp | 22 +++++----------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index 2d6e0226a9..7a86de82e7 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -998,7 +998,7 @@ Array::Array(std::initializer_list elems, int allocator_id) //------------------------------------------------------------------------------ template -Array::Array(const Array& other) +AXOM_HOST_DEVICE Array::Array(const Array& other) : ArrayBase>( static_cast>&>(other)) , m_allocator_id(other.m_allocator_id) @@ -1010,7 +1010,9 @@ Array::Array(const Array& other) "This is usually the result of capturing an array by-value in a lambda. " "Use axom::ArrayView for value captures instead.\n"); #endif + #if defined(__CUDA_ARCH__) __trap(); + #endif #else initialize(other.size(), other.capacity()); // Use fill_range to ensure that copy constructors are invoked for each diff --git a/src/axom/core/tests/core_array_for_all.hpp b/src/axom/core/tests/core_array_for_all.hpp index 1a2fd9ca0c..d410b3bf9c 100644 --- a/src/axom/core/tests/core_array_for_all.hpp +++ b/src/axom/core/tests/core_array_for_all.hpp @@ -66,24 +66,11 @@ using MyTypes = ::testing::Types< TYPED_TEST_SUITE(core_array_for_all, MyTypes); //------------------------------------------------------------------------------ -AXOM_TYPED_TEST(core_array_for_all, capture_test) +#if defined(AXOM_USE_RAJA) && defined(AXOM_USE_CUDA) && defined(AXOM_USE_UMPIRE) +AXOM_CUDA_TEST(core_array_for_all, capture_test) { - using ExecSpace = typename TestFixture::ExecSpace; - using KernelArray = typename TestFixture::KernelArray; - using KernelArrayView = typename TestFixture::KernelArrayView; - using HostArray = typename TestFixture::HostArray; - - // Don't test on CPU. - if(std::is_same::value) - { - return; - } -#if defined(AXOM_USE_RAJA) && defined(AXOM_USE_OPENMP) - if(std::is_same::value) - { - return; - } -#endif + using ExecSpace = axom::CUDA_EXEC<256>; + using KernelArray = axom::Array; EXPECT_DEATH_IF_SUPPORTED( { @@ -106,6 +93,7 @@ AXOM_TYPED_TEST(core_array_for_all, capture_test) }, ""); } +#endif //------------------------------------------------------------------------------ AXOM_TYPED_TEST(core_array_for_all, explicit_ArrayView) From 6550fef755d7617047fbf8ba508bc55a60acedda Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 10 Jan 2024 09:15:18 -0800 Subject: [PATCH 395/639] Added new parallel implementations new_scanCrossings and new_computeContour. The current versions are not removed yet, while I check out performance of the new implementations. --- .../detail/MarchingCubesFullParallel.hpp | 202 +++++++++++++----- 1 file changed, 147 insertions(+), 55 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index 8e7e2e12e6..90d1a85126 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -102,8 +102,8 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase void computeContourMesh() override { markCrossings(); - scanCrossings(); - computeContour(); + new_scanCrossings(); + new_computeContour(); } /*! @@ -313,12 +313,82 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_facetIncrs.data() + m_facetIncrs.size() - 1, sizeof(facetIncrs_back)); m_facetCount = firstFacetIds_back + facetIncrs_back; + } + void new_scanCrossings() + { +#if defined(AXOM_USE_RAJA) + #ifdef __INTEL_LLVM_COMPILER + // Intel oneAPI compiler segfaults with OpenMP RAJA scan + using ScanPolicy = + typename axom::execution_space::loop_policy; + #else + using ScanPolicy = typename axom::execution_space::loop_policy; + #endif +#endif + const axom::IndexType parentCellCount = m_caseIds.size(); + auto caseIdsView = m_caseIds.view(); - // Allocate space for surface mesh. - const axom::IndexType cornersCount = DIM * m_facetCount; - m_contourCellParents.resize(m_facetCount); - m_contourCellCorners.resize(m_facetCount); - m_contourNodeCoords.resize(cornersCount); + // + // Initialize crossingFlags to 0 or 1, prefix-sum it, and count the + // crossings. + // + + axom::Array crossingFlags(parentCellCount); + auto crossingFlagsView = crossingFlags.view(); + axom::for_all( + 0, + parentCellCount, + AXOM_LAMBDA(axom::IndexType parentCellId) { + auto numContourCells = num_contour_cells(caseIdsView.flatIndex(parentCellId)); + crossingFlagsView[parentCellId] = bool(numContourCells); + }); + + axom::Array scannedFlags(1 + parentCellCount); + auto scannedFlagsView = scannedFlags.view(); + RAJA::inclusive_scan( + RAJA::make_span(crossingFlags.data(), parentCellCount), + RAJA::make_span(scannedFlags.data() + 1, parentCellCount), + RAJA::operators::plus {}); + + axom::copy(&m_crossingCount, + scannedFlags.data() + scannedFlags.size() - 1, + sizeof(axom::IndexType)); + + // + // Generate crossing-cells index list and corresponding facet counts. + // + + m_crossingParentIds.resize(m_crossingCount); + m_facetIncrs.resize(m_crossingCount); + auto crossingParentIdsView = m_crossingParentIds.view(); + auto facetIncrsView = m_facetIncrs.view(); + + auto loopBody = AXOM_LAMBDA(axom::IndexType parentCellId) { + if(scannedFlagsView[parentCellId] != + scannedFlagsView[1+parentCellId]) { + auto crossingId = scannedFlagsView[parentCellId]; + auto facetIncr = num_contour_cells(caseIdsView.flatIndex(parentCellId)); + crossingParentIdsView[crossingId] = parentCellId; + facetIncrsView[crossingId] = facetIncr; + } + }; + axom::for_all(0, parentCellCount, loopBody); + + // + // Prefix-sum the facets counts to get first facet id for each crossing + // and the total number of facets. + // + + m_firstFacetIds.resize(1 + m_crossingCount); + RAJA::inclusive_scan( + RAJA::make_span(m_facetIncrs.data(), m_crossingCount), + RAJA::make_span(m_firstFacetIds.data() + 1, m_crossingCount), + RAJA::operators::plus {}); + + axom::copy(&m_facetCount, + m_firstFacetIds.data() + m_firstFacetIds.size() - 1, + sizeof(axom::IndexType)); + m_firstFacetIds.resize(m_crossingCount); } void computeContour() @@ -327,38 +397,17 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase // Fill in surface mesh data. // + // Allocate space for surface mesh. + const axom::IndexType cornersCount = DIM * m_facetCount; + m_contourCellParents.resize(m_facetCount); + m_contourCellCorners.resize(m_facetCount); + m_contourNodeCoords.resize(cornersCount); + const axom::IndexType parentCellCount = m_caseIds.size(); const auto facetIncrsView = m_facetIncrs.view(); const auto firstFacetIdsView = m_firstFacetIds.view(); const auto caseIdsView = m_caseIds.view(); - /* - To minimize diverence, sort parent indices by number of facets - they add. This is a disabled experimental option. Enable by - setting sortFacetsIncrs. Requires RAJA. - */ - const bool sortFacetsIncrs = false; - // sortedIndices are parent cell indices, sorted by number - // of facets in them. - axom::Array sortedIndices( - sortFacetsIncrs ? parentCellCount : 0); - auto sortedIndicesView = sortedIndices.view(); - -#if defined(AXOM_USE_RAJA) - if(sortFacetsIncrs) - { - auto sortedFacetIncrs = m_facetIncrs; - axom::for_all( - 0, - parentCellCount, - AXOM_LAMBDA(axom::IndexType pcId) { sortedIndicesView[pcId] = pcId; }); - RAJA::stable_sort_pairs( - RAJA::make_span(sortedFacetIncrs.data(), parentCellCount), - RAJA::make_span(sortedIndices.data(), parentCellCount), - RAJA::operators::greater {}); - } -#endif - auto contourCellParentsView = m_contourCellParents.view(); auto contourCellCornersView = m_contourCellCorners.view(); auto contourNodeCoordsView = m_contourNodeCoords.view(); @@ -367,11 +416,8 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_caseIds.strides(), m_fcnView, m_coordsViews); - auto gen_for_parent_cell = AXOM_LAMBDA(axom::IndexType loopIndex) + auto gen_for_parent_cell = AXOM_LAMBDA(axom::IndexType parentCellId) { - axom::IndexType parentCellId = - sortFacetsIncrs ? sortedIndicesView[loopIndex] : loopIndex; - Point cornerCoords[CELL_CORNER_COUNT]; double cornerValues[CELL_CORNER_COUNT]; ccu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); @@ -404,6 +450,65 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase axom::for_all(0, parentCellCount, gen_for_parent_cell); } + void new_computeContour() + { + // + // Fill in surface mesh data. + // + + // Allocate space for surface mesh. + const axom::IndexType cornersCount = DIM * m_facetCount; + m_contourCellParents.resize(m_facetCount); + m_contourCellCorners.resize(m_facetCount); + m_contourNodeCoords.resize(cornersCount); + + const auto facetIncrsView = m_facetIncrs.view(); + const auto firstFacetIdsView = m_firstFacetIds.view(); + const auto crossingParentIdsView = m_crossingParentIds.view(); + const auto caseIdsView = m_caseIds.view(); + + auto contourCellParentsView = m_contourCellParents.view(); + auto contourCellCornersView = m_contourCellCorners.view(); + auto contourNodeCoordsView = m_contourNodeCoords.view(); + + ComputeContour_Util ccu(m_contourVal, + m_caseIds.strides(), + m_fcnView, + m_coordsViews); + auto gen_for_parent_cell = AXOM_LAMBDA(axom::IndexType crossingId) + { + auto parentCellId = crossingParentIdsView[crossingId]; + auto caseId = caseIdsView.flatIndex(parentCellId); + Point cornerCoords[CELL_CORNER_COUNT]; + double cornerValues[CELL_CORNER_COUNT]; + ccu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); + + auto additionalFacets = facetIncrsView[crossingId]; + auto firstFacetId = firstFacetIdsView[crossingId]; + + for(axom::IndexType fId = 0; fId < additionalFacets; ++fId) + { + axom::IndexType newFacetId = firstFacetId + fId; + axom::IndexType firstCornerId = newFacetId * DIM; + + contourCellParentsView[newFacetId] = parentCellId; + + for(axom::IndexType d = 0; d < DIM; ++d) + { + axom::IndexType newCornerId = firstCornerId + d; + contourCellCornersView[newFacetId][d] = newCornerId; + + int edge = cases_table(caseId, fId * DIM + d); + ccu.linear_interp(edge, + cornerCoords, + cornerValues, + contourNodeCoordsView[newCornerId]); + } + } + }; + + axom::for_all(0, m_crossingCount, gen_for_parent_cell); + } /*! @brief Implementation used by MarchingCubesFullParallel::computeContour(). @@ -771,22 +876,6 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase , m_contourCellParents(0, 0) { } - /*! - @brief Info for a parent cell intersecting the contour surface. - */ - struct CrossingInfo - { - CrossingInfo() { } - CrossingInfo(axom::IndexType parentCellNum_, std::uint16_t caseNum_) - : parentCellNum(parentCellNum_) - , caseNum(caseNum_) - , firstSurfaceCellId(std::numeric_limits::max()) - { } - axom::IndexType parentCellNum; //!< @brief Flat index of parent cell in m_caseIds. - std::uint16_t caseNum; //!< @brief Index in cases2D or cases3D - axom::IndexType firstSurfaceCellId; //!< @brief First index for generated cells. - }; - private: MIdx m_bShape; //!< @brief Blueprint cell data shape. @@ -804,9 +893,12 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase //!@brief Number of parent cells crossing the contour surface. axom::IndexType m_crossingCount = 0; - //!@brief Number of surface mesh facets added by computational mesh cells. + //!@brief Number of surface mesh facets added by crossing mesh cells. axom::Array m_facetIncrs; + //!@brief Parent cell id for each crossing. + axom::Array m_crossingParentIds; + //!@brief First index of facets in computational mesh cells. axom::Array m_firstFacetIds; From 103a6f9efd3c4994bc3a7db0f1536a2c7c614a9c Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 16 Jan 2024 10:08:37 -0800 Subject: [PATCH 396/639] utilize ci queue --- .gitlab/build_tioga.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/build_tioga.yml b/.gitlab/build_tioga.yml index 8197f62089..80d4a44e51 100644 --- a/.gitlab/build_tioga.yml +++ b/.gitlab/build_tioga.yml @@ -21,14 +21,14 @@ .src_build_on_tioga: stage: build variables: - ALLOC_COMMAND: "flux run --exclusive --time-limit=30m --nodes=1" + ALLOC_COMMAND: "flux run --queue pci --exclusive --time-limit=30m --nodes=1" extends: [.src_build_script, .on_tioga, .src_workflow] needs: [] .full_build_on_tioga: stage: build variables: - ALLOC_COMMAND: "flux run --exclusive --time-limit=60m --nodes=1" + ALLOC_COMMAND: "flux run --queue pci --exclusive --time-limit=60m --nodes=1" extends: [.full_build_script, .on_tioga, .full_workflow] needs: [] From b89d583ce2a4416a2cf07d79ace6f82526948433 Mon Sep 17 00:00:00 2001 From: Arlie Capps <48997041+agcapps@users.noreply.github.com> Date: Mon, 22 Jan 2024 21:47:32 -0800 Subject: [PATCH 397/639] Feature/capps2/successreturnvalue (#1224) Return success or failure from Group::save, load, loadExternalData. During Group I/O calls (Group::save, load, loadExternalData), a utility class saves Conduit error handler routines, catches Conduit exceptions, logs them to the Group's DataStore. The I/O call then returns whether any exceptions have been logged to the DataStore. User code may directly query the DataStore for the presence of exception messages or the text of the messages themselves. Code may clear the messages, so that subsequent successful I/O messages will return true. Code may also append to the DataStore's exception messages. --------- Co-authored-by: Rich Hornung --- src/axom/sidre/core/DataStore.cpp | 1 + src/axom/sidre/core/DataStore.hpp | 29 +++ src/axom/sidre/core/Group.cpp | 311 ++++++++++++++++++----- src/axom/sidre/core/Group.hpp | 58 +++-- src/axom/sidre/docs/sphinx/datastore.rst | 6 + src/axom/sidre/docs/sphinx/file_io.rst | 11 +- src/axom/sidre/tests/sidre_group.cpp | 167 +++++++++--- 7 files changed, 458 insertions(+), 125 deletions(-) diff --git a/src/axom/sidre/core/DataStore.cpp b/src/axom/sidre/core/DataStore.cpp index 4c3c77b7d7..838569c751 100644 --- a/src/axom/sidre/core/DataStore.cpp +++ b/src/axom/sidre/core/DataStore.cpp @@ -86,6 +86,7 @@ DataStore::DataStore() , m_buffer_coll(new BufferCollection()) , m_attribute_coll(new AttributeCollection()) , m_need_to_finalize_slic(false) + , m_conduit_errors() { if(!axom::slic::isInitialized()) { diff --git a/src/axom/sidre/core/DataStore.hpp b/src/axom/sidre/core/DataStore.hpp index 7ee0b9f261..d9c9f1610e 100644 --- a/src/axom/sidre/core/DataStore.hpp +++ b/src/axom/sidre/core/DataStore.hpp @@ -88,6 +88,32 @@ class DataStore */ const Group* getRoot() const { return m_RootGroup; }; + //@{ + /*! @name Methods to query and clear Conduit I/O flags and exception messages. + * + * If an error occurs, the load(), save(), and loadExternalData() methods of + * any Group owned by this DataStore will return false (for I/O failure) and + * subsequent calls will continue to return false until the user clears the + * Conduit errors. + */ + + /// Return whether a Conduit error occurred. + bool getConduitErrorOccurred() const { return !m_conduit_errors.empty(); }; + + /// Return information on any Conduit errors. + std::string getConduitErrors() const { return m_conduit_errors; }; + + /// Clear any Conduit errors. + void clearConduitErrors() const { m_conduit_errors.clear(); }; + + /// Append a string to the accumulated Conduit errors. + void appendToConduitErrors(const std::string& mesg) const + { + m_conduit_errors = m_conduit_errors + "\n" + mesg; + }; + + //@} + public: //@{ //! @name Methods to query, access, create, and destroy Buffers. @@ -540,6 +566,9 @@ class DataStore /// Flag indicating whether SLIC logging environment was initialized in ctor. bool m_need_to_finalize_slic; + + /// Details of the most recent Conduit error. Length > 0 indicates an error occurred. + mutable std::string m_conduit_errors; }; } /* end namespace sidre */ diff --git a/src/axom/sidre/core/Group.cpp b/src/axom/sidre/core/Group.cpp index 2a957d72fb..dff30c462c 100644 --- a/src/axom/sidre/core/Group.cpp +++ b/src/axom/sidre/core/Group.cpp @@ -1790,6 +1790,105 @@ bool Group::isEquivalentTo(const Group* other, bool checkName) const return is_equiv; } +/* + ************************************************************************* + * + * Private class used to set Conduit error handler to default (throw exception) + * + * Creating an instance of this class will disable the current Conduit error + * callbacks. The default Conduit callbacks throw exceptions when they + * encounter I/O errors. When the instance is destroyed, the previous + * callbacks are restored. + * + * This class is also a functor. The operator() method takes a closure, + * catches any Conduit error, and saves that in the DataStore. + * + ************************************************************************* + */ + +class ConduitErrorSuppressor +{ +public: + using conduit_error_handler = void (*)(const std::string&, + const std::string&, + int); + + ConduitErrorSuppressor(const DataStore* ds, bool suppress_in_call = true); + ~ConduitErrorSuppressor(); + + void operator()(const std::function& conduitOp) + { + if(m_suppress_in_call) + { + disable_conduit_error_handlers(); + } + + try + { + conduitOp(); + } + catch(conduit::Error& e) + { + m_ds->appendToConduitErrors(e.what()); + } + + if(m_suppress_in_call) + { + restore_conduit_error_handlers(); + } + } + +private: + // saves current error func; set to default + void disable_conduit_error_handlers() + { + m_info_handler = conduit::utils::info_handler(); + m_warning_handler = conduit::utils::warning_handler(); + m_error_handler = conduit::utils::error_handler(); + + DataStore::setConduitDefaultMessageHandlers(); + } + + // restores saved error func + void restore_conduit_error_handlers() + { + conduit::utils::set_error_handler(m_error_handler); + conduit::utils::set_warning_handler(m_warning_handler); + conduit::utils::set_info_handler(m_info_handler); + } + + /// The DataStore we report to + const DataStore* m_ds; + + /// callbacks used for Conduit error interface + conduit_error_handler m_error_handler, m_warning_handler, m_info_handler; + + /// Suppress error handling in the call operator? + bool m_suppress_in_call; +}; + +ConduitErrorSuppressor::ConduitErrorSuppressor(const DataStore* ds, + bool suppress_in_call) + : m_ds(ds) + , m_error_handler(nullptr) + , m_warning_handler(nullptr) + , m_info_handler(nullptr) + , m_suppress_in_call(suppress_in_call) +{ + if(!m_suppress_in_call) + { + disable_conduit_error_handlers(); + } +} + +ConduitErrorSuppressor::~ConduitErrorSuppressor() +{ + if(!m_suppress_in_call) + { + restore_conduit_error_handlers(); + } +} + /* ************************************************************************* * @@ -1798,11 +1897,13 @@ bool Group::isEquivalentTo(const Group* other, bool checkName) const ************************************************************************* */ -void Group::save(const std::string& path, +bool Group::save(const std::string& path, const std::string& protocol, const Attribute* attr) const { const DataStore* ds = getDataStore(); + ConduitErrorSuppressor checkConduitCall(ds); + bool retval = false; if(protocol == "sidre_hdf5") { @@ -1811,7 +1912,8 @@ void Group::save(const std::string& path, ds->saveAttributeLayout(n["sidre/attribute"]); createExternalLayout(n["sidre/external"], attr); n["sidre_group_name"] = m_name; - conduit::relay::io::save(n, path, "hdf5"); + checkConduitCall([&] { conduit::relay::io::save(n, path, "hdf5"); }); + retval = !(getDataStore()->getConduitErrorOccurred()); } else if(protocol == "sidre_conduit_json") { @@ -1820,7 +1922,8 @@ void Group::save(const std::string& path, ds->saveAttributeLayout(n["sidre/attribute"]); createExternalLayout(n["sidre/external"], attr); n["sidre_group_name"] = m_name; - conduit::relay::io::save(n, path, "conduit_json"); + checkConduitCall([&] { conduit::relay::io::save(n, path, "conduit_json"); }); + retval = !(getDataStore()->getConduitErrorOccurred()); } else if(protocol == "sidre_json") { @@ -1829,7 +1932,8 @@ void Group::save(const std::string& path, ds->saveAttributeLayout(n["sidre/attribute"]); createExternalLayout(n["sidre/external"], attr); n["sidre_group_name"] = m_name; - conduit::relay::io::save(n, path, "json"); + checkConduitCall([&] { conduit::relay::io::save(n, path, "json"); }); + retval = !(getDataStore()->getConduitErrorOccurred()); } else if(protocol == "sidre_layout_json") { @@ -1837,14 +1941,16 @@ void Group::save(const std::string& path, exportWithoutBufferData(n["sidre"], attr); ds->saveAttributeLayout(n["sidre/attribute"]); n["sidre_group_name"] = m_name; - conduit::relay::io::save(n, path, "conduit_json"); + checkConduitCall([&] { conduit::relay::io::save(n, path, "conduit_json"); }); + retval = !(getDataStore()->getConduitErrorOccurred()); } else if(protocol == "conduit_hdf5") { Node n; createNativeLayout(n, attr); n["sidre_group_name"] = m_name; - conduit::relay::io::save(n, path, "hdf5"); + checkConduitCall([&] { conduit::relay::io::save(n, path, "hdf5"); }); + retval = !(getDataStore()->getConduitErrorOccurred()); } else if(protocol == "conduit_bin" || protocol == "conduit_json" || protocol == "json") @@ -1852,20 +1958,25 @@ void Group::save(const std::string& path, Node n; createNativeLayout(n, attr); n["sidre_group_name"] = m_name; - conduit::relay::io::save(n, path, protocol); + checkConduitCall([&] { conduit::relay::io::save(n, path, protocol); }); + retval = !(getDataStore()->getConduitErrorOccurred()); } else if(protocol == "conduit_layout_json") { Node n; createNoDataLayout(n, attr); n["sidre_group_name"] = m_name; - conduit::relay::io::save(n, path, "conduit_json"); + checkConduitCall([&] { conduit::relay::io::save(n, path, "conduit_json"); }); + retval = !(getDataStore()->getConduitErrorOccurred()); } else { SLIC_ERROR(SIDRE_GROUP_LOG_PREPEND << "Invalid protocol '" << protocol << "' for file save."); + retval = false; } + + return retval; } /*************************************************************************/ @@ -1877,87 +1988,112 @@ void Group::save(const std::string& path, * ************************************************************************* */ -void Group::load(const std::string& path, +bool Group::load(const std::string& path, const std::string& protocol, bool preserve_contents) { std::string new_name; - load(path, protocol, preserve_contents, new_name); + return load(path, protocol, preserve_contents, new_name); } -void Group::load(const std::string& path, +bool Group::load(const std::string& path, const std::string& protocol, bool preserve_contents, std::string& name_from_file) { + ConduitErrorSuppressor checkConduitCall(getDataStore()); + bool retval = false; if(protocol == "sidre_hdf5") { Node n; - conduit::relay::io::load(path, "hdf5", n); - SLIC_ASSERT_MSG(n.has_path("sidre"), - SIDRE_GROUP_LOG_PREPEND - << "Conduit Node " << n.path() << " does not have sidre " - << "data for this Group " << getPathName() << "."); - importFrom(n["sidre"], preserve_contents); - if(n.has_path("sidre_group_name")) + checkConduitCall([&] { conduit::relay::io::load(path, "hdf5", n); }); + if(!getDataStore()->getConduitErrorOccurred()) { - name_from_file = n["sidre_group_name"].as_string(); + SLIC_ASSERT_MSG(n.has_path("sidre"), + SIDRE_GROUP_LOG_PREPEND + << "Conduit Node " << n.path() << " does not have sidre " + << "data for this Group " << getPathName() << "."); + importFrom(n["sidre"], preserve_contents); + if(n.has_path("sidre_group_name")) + { + name_from_file = n["sidre_group_name"].as_string(); + } + retval = true; } } else if(protocol == "sidre_conduit_json") { Node n; - conduit::relay::io::load(path, "conduit_json", n); - SLIC_ASSERT_MSG(n.has_path("sidre"), - SIDRE_GROUP_LOG_PREPEND - << "Conduit Node " << n.path() << " does not have sidre " - << "data for Group " << getPathName() << "."); - importFrom(n["sidre"], preserve_contents); - if(n.has_path("sidre_group_name")) + checkConduitCall([&] { conduit::relay::io::load(path, "conduit_json", n); }); + if(!getDataStore()->getConduitErrorOccurred()) { - name_from_file = n["sidre_group_name"].as_string(); + SLIC_ASSERT_MSG(n.has_path("sidre"), + SIDRE_GROUP_LOG_PREPEND + << "Conduit Node " << n.path() << " does not have sidre " + << "data for Group " << getPathName() << "."); + importFrom(n["sidre"], preserve_contents); + if(n.has_path("sidre_group_name")) + { + name_from_file = n["sidre_group_name"].as_string(); + } + retval = true; } } else if(protocol == "sidre_json") { Node n; - conduit::relay::io::load(path, "json", n); - SLIC_ASSERT_MSG(n.has_path("sidre"), - SIDRE_GROUP_LOG_PREPEND - << "Conduit Node " << n.path() << " does not have sidre " - << "data for Group " << getPathName() << "."); - importFrom(n["sidre"], preserve_contents); - if(n.has_path("sidre_group_name")) + checkConduitCall([&] { conduit::relay::io::load(path, "json", n); }); + if(!getDataStore()->getConduitErrorOccurred()) { - name_from_file = n["sidre_group_name"].as_string(); + SLIC_ASSERT_MSG(n.has_path("sidre"), + SIDRE_GROUP_LOG_PREPEND + << "Conduit Node " << n.path() << " does not have sidre " + << "data for Group " << getPathName() << "."); + importFrom(n["sidre"], preserve_contents); + if(n.has_path("sidre_group_name")) + { + name_from_file = n["sidre_group_name"].as_string(); + } + retval = true; } } else if(protocol == "conduit_hdf5") { Node n; - conduit::relay::io::load(path, "hdf5", n); - importConduitTree(n, preserve_contents); - if(n.has_path("sidre_group_name")) + checkConduitCall([&] { conduit::relay::io::load(path, "hdf5", n); }); + if(!getDataStore()->getConduitErrorOccurred()) { - name_from_file = n["sidre_group_name"].as_string(); + importConduitTree(n, preserve_contents); + if(n.has_path("sidre_group_name")) + { + name_from_file = n["sidre_group_name"].as_string(); + } + retval = true; } } else if(protocol == "conduit_bin" || protocol == "conduit_json" || protocol == "json") { Node n; - conduit::relay::io::load(path, protocol, n); - importConduitTree(n, preserve_contents); - if(n.has_path("sidre_group_name")) + checkConduitCall([&] { conduit::relay::io::load(path, protocol, n); }); + if(!getDataStore()->getConduitErrorOccurred()) { - name_from_file = n["sidre_group_name"].as_string(); + importConduitTree(n, preserve_contents); + if(n.has_path("sidre_group_name")) + { + name_from_file = n["sidre_group_name"].as_string(); + } + retval = true; } } else { SLIC_ERROR(SIDRE_GROUP_LOG_PREPEND << "Invalid protocol '" << protocol << "' for file load."); + retval = false; } + + return retval; } /* @@ -1976,9 +2112,12 @@ Group* Group::createGroupAndLoad(std::string& group_name, Group* child = createGroup(group_name); if(child != nullptr) { - // In a forthcoming PR, load() will return a bool for success/failure - load_success = true; - child->load(path, protocol, false, group_name); + load_success = child->load(path, protocol, false, group_name); + if(!load_success) + { + destroyGroupAndData(group_name); + child = nullptr; + } } return child; @@ -1991,22 +2130,31 @@ Group* Group::createGroupAndLoad(std::string& group_name, * ************************************************************************* */ -void Group::loadExternalData(const std::string& path) +bool Group::loadExternalData(const std::string& path) { Node n; createExternalLayout(n); + ConduitErrorSuppressor checkConduitCall(getDataStore()); + bool success; #ifdef AXOM_USE_HDF5 // CYRUS'-NOTE, not sure ":" will work with multiple trees per // output file - conduit::relay::io::hdf5_read(path + ":sidre/external", n); + checkConduitCall( + [&] { conduit::relay::io::hdf5_read(path + ":sidre/external", n); }); + + success = !(getDataStore()->getConduitErrorOccurred()); #else AXOM_UNUSED_VAR(path); SLIC_WARNING(SIDRE_GROUP_LOG_PREPEND << "External data not loaded. " << "This function requires hdf5 support. " << " Please reconfigure with hdf5."); + + success = false; #endif + + return success; } // Functions that directly use the hdf5 API in their signature @@ -2019,10 +2167,13 @@ void Group::loadExternalData(const std::string& path) * ************************************************************************* */ -void Group::save(const hid_t& h5_id, +bool Group::save(const hid_t& h5_id, const std::string& protocol, const Attribute* attr) const { + ConduitErrorSuppressor checkConduitCall(getDataStore()); + bool retval = false; + // supported here: // "sidre_hdf5" // "conduit_hdf5" @@ -2032,20 +2183,25 @@ void Group::save(const hid_t& h5_id, exportTo(n["sidre"], attr); createExternalLayout(n["sidre/external"], attr); n["sidre_group_name"] = m_name; - conduit::relay::io::hdf5_write(n, h5_id); + checkConduitCall([&] { conduit::relay::io::hdf5_write(n, h5_id); }); + retval = !(getDataStore()->getConduitErrorOccurred()); } else if(protocol == "conduit_hdf5") { Node n; createNativeLayout(n, attr); n["sidre_group_name"] = m_name; - conduit::relay::io::hdf5_write(n, h5_id); + checkConduitCall([&] { conduit::relay::io::hdf5_write(n, h5_id); }); + retval = !(getDataStore()->getConduitErrorOccurred()); } else { SLIC_ERROR(SIDRE_GROUP_LOG_PREPEND << "Invalid protocol '" << protocol << "' for save with hdf5 handle."); + retval = false; } + + return retval; } /* @@ -2055,52 +2211,66 @@ void Group::save(const hid_t& h5_id, * ************************************************************************* */ -void Group::load(const hid_t& h5_id, +bool Group::load(const hid_t& h5_id, const std::string& protocol, bool preserve_contents) { std::string name_from_file; - load(h5_id, protocol, preserve_contents, name_from_file); + return load(h5_id, protocol, preserve_contents, name_from_file); } -void Group::load(const hid_t& h5_id, +bool Group::load(const hid_t& h5_id, const std::string& protocol, bool preserve_contents, std::string& name_from_file) { + ConduitErrorSuppressor checkConduitCall(getDataStore()); + bool retval = false; + // supported here: // "sidre_hdf5" // "conduit_hdf5" if(protocol == "sidre_hdf5") { Node n; - conduit::relay::io::hdf5_read(h5_id, n); - SLIC_ASSERT_MSG(n.has_path("sidre"), - SIDRE_GROUP_LOG_PREPEND - << "Conduit Node " << n.path() << " does not have sidre " - << "data for Group " << getPathName() << "."); - importFrom(n["sidre"], preserve_contents); - if(n.has_path("sidre_group_name")) + checkConduitCall([&] { conduit::relay::io::hdf5_read(h5_id, n); }); + if(!getDataStore()->getConduitErrorOccurred()) { - name_from_file = n["sidre_group_name"].as_string(); + SLIC_ASSERT_MSG(n.has_path("sidre"), + SIDRE_GROUP_LOG_PREPEND + << "Conduit Node " << n.path() << " does not have sidre " + << "data for Group " << getPathName() << "."); + importFrom(n["sidre"], preserve_contents); + if(n.has_path("sidre_group_name")) + { + name_from_file = n["sidre_group_name"].as_string(); + } + retval = true; } } else if(protocol == "conduit_hdf5") { SLIC_ERROR("Protocol " << protocol << " not yet supported for file load."); Node n; - conduit::relay::io::hdf5_read(h5_id, n); - importConduitTree(n, preserve_contents); - if(n.has_path("sidre_group_name")) + checkConduitCall([&] { conduit::relay::io::hdf5_read(h5_id, n); }); + if(!getDataStore()->getConduitErrorOccurred()) { - name_from_file = n["sidre_group_name"].as_string(); + importConduitTree(n, preserve_contents); + if(n.has_path("sidre_group_name")) + { + name_from_file = n["sidre_group_name"].as_string(); + } + retval = true; } } else { SLIC_ERROR(SIDRE_GROUP_LOG_PREPEND << "Invalid protocol '" << protocol << "' for file load."); + retval = false; } + + return retval; } /* @@ -2111,11 +2281,16 @@ void Group::load(const hid_t& h5_id, * Note: this ASSUMES uses the "sidre_hdf5" protocol ************************************************************************* */ -void Group::loadExternalData(const hid_t& h5_id) +bool Group::loadExternalData(const hid_t& h5_id) { Node n; createExternalLayout(n); - conduit::relay::io::hdf5_read(h5_id, "sidre/external", n); + ConduitErrorSuppressor checkConduitCall(getDataStore()); + + checkConduitCall( + [&] { conduit::relay::io::hdf5_read(h5_id, "sidre/external", n); }); + + return !(getDataStore()->getConduitErrorOccurred()); } #endif /* AXOM_USE_HDF5 */ diff --git a/src/axom/sidre/core/Group.hpp b/src/axom/sidre/core/Group.hpp index cb589bb787..496e5a1722 100644 --- a/src/axom/sidre/core/Group.hpp +++ b/src/axom/sidre/core/Group.hpp @@ -30,6 +30,7 @@ #include #include #include +#include // third party lib headers #ifdef AXOM_USE_HDF5 @@ -1440,7 +1441,9 @@ class Group * \brief Save the Group to a file. * * Saves the tree starting at this Group and the Buffers used by the Views - * in this tree. + * in this tree. Returns true (success) if no Conduit I/O error occurred + * since this Group's DataStore was created or had its error flag cleared; + * false, if an error occurred at some point. * * If attr is a null pointer, dump all Views. Otherwise, only dump Views * which have the Attribute set. @@ -1448,8 +1451,9 @@ class Group * \param path file path * \param protocol I/O protocol * \param attr Save Views that have Attribute set. + * \return True if no error occurred, otherwise false. */ - void save(const std::string& path, + bool save(const std::string& path, const std::string& protocol = Group::getDefaultIOProtocol(), const Attribute* attr = nullptr) const; @@ -1462,7 +1466,10 @@ class Group * * If preserve_contents is true, then the names of the children held by the * Node cannot be the same as the names of the children already held by this - * Group. If there is a naming conflict, an error will occur. + * Group. If there is a naming conflict, an error will occur. Returns true + * (success) if no Conduit I/O error occurred since this Group's DataStore + * was created or had its error flag cleared; false, if an error occurred at + * some point. * * \param path file path * \param protocol I/O protocol @@ -1470,8 +1477,9 @@ class Group * this Group remain in place. If false, all * child Groups and Views are destroyed before * loading data from the file. + * \return True if no error occurred, otherwise false. */ - void load(const std::string& path, + bool load(const std::string& path, const std::string& protocol = Group::getDefaultIOProtocol(), bool preserve_contents = false); @@ -1487,7 +1495,10 @@ class Group * * If preserve_contents is true, then the names of the children held by the * Node cannot be the same as the names of the children already held by this - * Group. If there is a naming conflict, an error will occur. + * Group. If there is a naming conflict, an error will occur. Returns true + * (success) if no Conduit I/O error occurred since this Group's DataStore + * was created or had its error flag cleared; false, if an error occurred at + * some point. * * \param [in] path file path to load * \param [in] protocol I/O protocol to use @@ -1496,8 +1507,9 @@ class Group * If false, all child Groups and Views are * destroyed before loading data from the file. * \param [out] name_from_file Group name stored in the file + * \return True if no error occurred, otherwise false. */ - void load(const std::string& path, + bool load(const std::string& path, const std::string& protocol, bool preserve_contents, std::string& name_from_file); @@ -1543,8 +1555,10 @@ class Group * protocol. * * \param path file path + * \return True if Axom was compiled with HDF5 and no error + * occurred in this method; otherwise false. */ - void loadExternalData(const std::string& path); + bool loadExternalData(const std::string& path); #ifdef AXOM_USE_HDF5 @@ -1552,13 +1566,16 @@ class Group * \brief Save the Group to an hdf5 handle. * * If attr is nullptr, dump all Views. Otherwise, only dump Views - * which have the Attribute set. + * which have the Attribute set. Returns true (success) if no Conduit + * I/O error occurred since this Group's DataStore was created or had + * its error flag cleared; false, if an error occurred at some point. * * \param h5_id hdf5 handle * \param protocol I/O protocol sidre_hdf5 or conduit_hdf5 * \param attr Save Views that have Attribute set. + * \return True if no error occurred, otherwise false. */ - void save(const hid_t& h5_id, + bool save(const hid_t& h5_id, const std::string& protocol = Group::getDefaultIOProtocol(), const Attribute* attr = nullptr) const; @@ -1567,7 +1584,10 @@ class Group * * If preserve_contents is true, then the names of the children held by the * Node cannot be the same as the names of the children already held by this - * Group. If there is a naming conflict, an error will occur. + * Group. If there is a naming conflict, an error will occur. Returns true + * (success) if no Conduit I/O error occurred since this Group's DataStore + * was created or had its error flag cleared; false, if an error occurred at + * some point. * * \param h5_id hdf5 handle * \param protocol I/O protocol sidre_hdf5 or conduit_hdf5 @@ -1575,8 +1595,9 @@ class Group * this Group remain in place. If false, all * child Groups and Views are destroyed before * loading data from the file. + * \return True if no error occurred, otherwise false. */ - void load(const hid_t& h5_id, + bool load(const hid_t& h5_id, const std::string& protocol = Group::getDefaultIOProtocol(), bool preserve_contents = false); @@ -1585,7 +1606,10 @@ class Group * * If preserve_contents is true, then the names of the children held by the * Node cannot be the same as the names of the children already held by this - * Group. If there is a naming conflict, an error will occur. + * Group. If there is a naming conflict, an error will occur. Returns true + * (success) if no Conduit I/O error occurred since this Group's DataStore + * was created or had its error flag cleared; false, if an error occurred at + * some point. * * \param [in] h5_id hdf5 handle * \param [in] protocol I/O protocol sidre_hdf5 or conduit_hdf5 @@ -1594,8 +1618,9 @@ class Group * child Groups and Views are destroyed before * loading data from the file. * \param [out] name_from_file Group name stored in the file + * \return True if no error occurred, otherwise false. */ - void load(const hid_t& h5_id, + bool load(const hid_t& h5_id, const std::string& protocol, bool preserve_contents, std::string& name_from_file); @@ -1604,11 +1629,14 @@ class Group * \brief Load data into the Group's external views from a hdf5 handle. * * No protocol argument is needed, as this only is used with the sidre_hdf5 - * protocol. + * protocol. Returns true (success) if no Conduit I/O error occurred since + * this Group's DataStore was created or had its error flag cleared; false, + * if an error occurred at some point. * * \param h5_id hdf5 handle + * \return True if no error occurred, otherwise false. */ - void loadExternalData(const hid_t& h5_id); + bool loadExternalData(const hid_t& h5_id); #endif /* AXOM_USE_HDF5 */ diff --git a/src/axom/sidre/docs/sphinx/datastore.rst b/src/axom/sidre/docs/sphinx/datastore.rst index 17d32eb0a5..939f3ef2f5 100644 --- a/src/axom/sidre/docs/sphinx/datastore.rst +++ b/src/axom/sidre/docs/sphinx/datastore.rst @@ -17,6 +17,12 @@ does is create the datastore object; this operation also creates the root group. Apart from providing access to the root group, a datastore provides methods to retrieve and interact with buffers and attributes. +The ``DataStore`` class provides methods to retrieve error state and messages +arising from I/O errors reading or writing ``Group`` data: + + * Query or set Conduit error flag + * Query, append, or clear exception messages from a Conduit I/O error + .. note:: ``Buffer`` and ``Attribute`` objects can only be created and destroyed using ``DataStore`` methods noted below. The ``Buffer`` and ``Attribute`` class constructors and destructors are private. diff --git a/src/axom/sidre/docs/sphinx/file_io.rst b/src/axom/sidre/docs/sphinx/file_io.rst index 9ea691c2c5..0c1bbd8d7a 100644 --- a/src/axom/sidre/docs/sphinx/file_io.rst +++ b/src/axom/sidre/docs/sphinx/file_io.rst @@ -39,7 +39,8 @@ can be suppressed by passing a Boolean value of true as the ``preserve_contents`` argument to the ``load()`` method, resulting in the current group subtree being merged with the file contents. -Usage of the ``save()`` and ``load()`` methods is shown in the following example. +Usage of the ``save()`` and ``load()`` methods is shown in the following example, +which omits error-checking and recovery for brevity and clarity. .. literalinclude:: ../../examples/sidre_createdatastore.cpp :start-after: _serial_io_save_start @@ -55,6 +56,14 @@ Overloads of the ``save()`` and ``load()`` methods that take HDF5 handles and the ``loadExternalData()`` method are used to implement parallel I/O through the Sidre ``IOManager`` class. +The ``save()``, ``load()``, and ``loadExternalData()`` methods return +a bool value indicating success or failure. If no Conduit error +occurred, the return value is true. If an error occurred, the method +returns false. The error state and accumulated messages are stored in +the ``DataStore`` object that owns the ``Group``. In the course of +recovering from the error, the user can clear the error flag and +messages from the ``DataStore``. + Please see `Sidre API Documentation <../../../../doxygen/html/sidretop.html>`_ for more detailed description of these ``Group`` class methods and the Sidre I/O protocols that can be used with them. diff --git a/src/axom/sidre/tests/sidre_group.cpp b/src/axom/sidre/tests/sidre_group.cpp index 3a58de83bd..936c89d937 100644 --- a/src/axom/sidre/tests/sidre_group.cpp +++ b/src/axom/sidre/tests/sidre_group.cpp @@ -1808,7 +1808,7 @@ TEST(sidre_group, save_restore_empty_datastore) for(const auto& protocol : protocols) { const std::string file_path = file_path_base + protocol; - ds1->getRoot()->save(file_path, protocol); + EXPECT_TRUE(ds1->getRoot()->save(file_path, protocol)); } delete ds1; @@ -1820,7 +1820,7 @@ TEST(sidre_group, save_restore_empty_datastore) DataStore* ds2 = new DataStore(); Group* root2 = ds2->getRoot(); - root2->load(file_path, default_protocol); + EXPECT_TRUE(root2->load(file_path, default_protocol)); EXPECT_TRUE(ds2->getNumBuffers() == 0); EXPECT_TRUE(root2->getNumGroups() == 0); @@ -1849,12 +1849,13 @@ TEST(sidre_group, save_load_via_hdf5_ids) } // save using the sidre_hdf5 protocol - root->save("out_save_load_via_hdf5_ids.sidre_hdf5", "sidre_hdf5"); + EXPECT_TRUE(root->save("out_save_load_via_hdf5_ids.sidre_hdf5", "sidre_hdf5")); // load via path based DataStore ds_load_generic; - ds_load_generic.getRoot()->load("out_save_load_via_hdf5_ids.sidre_hdf5", - "sidre_hdf5"); + EXPECT_TRUE( + ds_load_generic.getRoot()->load("out_save_load_via_hdf5_ids.sidre_hdf5", + "sidre_hdf5")); // load via hdf5 id DataStore ds_load_hdf5; @@ -1864,7 +1865,7 @@ TEST(sidre_group, save_load_via_hdf5_ids) EXPECT_TRUE(h5_id >= 0); // this implies protocol == "sidre_hdf5" - ds_load_hdf5.getRoot()->load(h5_id); + EXPECT_TRUE(ds_load_hdf5.getRoot()->load(h5_id)); // ? Does isEquivalentTo check values? // check path based with source @@ -1915,7 +1916,7 @@ TEST(sidre_group, save_root_restore_as_child) for(const auto& protocol : protocols) { const std::string file_path = file_path_base + protocol; - root->save(file_path, protocol); + EXPECT_TRUE(root->save(file_path, protocol)); } // Restore the original DataStore into a child group @@ -1938,7 +1939,7 @@ TEST(sidre_group, save_root_restore_as_child) if(axom::utilities::filesystem::pathExists(file_path)) { std::cout << "loading " << file_path << std::endl; - cg->load(file_path, protocol); + EXPECT_TRUE(cg->load(file_path, protocol)); EXPECT_TRUE(cg->isEquivalentTo(root, false)); EXPECT_TRUE(root->isEquivalentTo(cg, false)); @@ -1998,7 +1999,7 @@ TEST(sidre_group, save_child_restore_as_root) for(const auto& protocol : protocols) { const std::string file_path = file_path_base + protocol; - child1->save(file_path, protocol); + EXPECT_TRUE(child1->save(file_path, protocol)); } // Restore the saved child1 into a root group @@ -2014,7 +2015,7 @@ TEST(sidre_group, save_child_restore_as_root) const std::string file_path = file_path_base + protocol; if(axom::utilities::filesystem::pathExists(file_path)) { - dscopy->getRoot()->load(file_path, protocol); + EXPECT_TRUE(dscopy->getRoot()->load(file_path, protocol)); EXPECT_TRUE(dscopy->getRoot()->isEquivalentTo(child1, false)); EXPECT_TRUE(child1->isEquivalentTo(dscopy->getRoot(), false)); @@ -2043,13 +2044,13 @@ TEST(sidre_group, save_restore_api) // These should be produce identical files. // No group provided, defaults to root group - root1->save("sidre_save_fulltree_conduit", "json"); + EXPECT_TRUE(root1->save("sidre_save_fulltree_conduit", "json")); const std::vector& protocols = Group::getValidIOProtocols(); for(const auto& protocol : protocols) { const std::string file_path = file_path_base + protocol; - root1->save(file_path, protocol); + EXPECT_TRUE(root1->save(file_path, protocol)); } //These are commented out because createViewScalar creates a scalar View @@ -2059,13 +2060,13 @@ TEST(sidre_group, save_restore_api) #if 0 DataStore* ds2 = new DataStore(); Group* root2 = ds2->getRoot(); - root2->load("sidre_save_fulltree_conduit", "json"); + EXPECT_TRUE(root2->load("sidre_save_fulltree_conduit", "json")); EXPECT_TRUE( ds2->getRoot()->isEquivalentTo(root1) ); delete ds2; DataStore* ds3 = new DataStore(); Group* root3 = ds3->getRoot(); - root3->load("sidre_save_subtree_sidre_json", "sidre_json"); + EXPECT_TRUE(root3->load("sidre_save_subtree_sidre_json", "sidre_json")); EXPECT_TRUE( ds3->getRoot()->isEquivalentTo(root1) ); delete ds3; #endif @@ -2073,7 +2074,7 @@ TEST(sidre_group, save_restore_api) #ifdef AXOM_USE_HDF5 DataStore* ds4 = new DataStore(); Group* root4 = ds4->getRoot(); - root4->load("sidre_save_subtree_sidre_hdf5", "sidre_hdf5"); + EXPECT_TRUE(root4->load("sidre_save_subtree_sidre_hdf5", "sidre_hdf5")); EXPECT_TRUE(ds4->getRoot()->isEquivalentTo(root1)); delete ds4; #endif @@ -2081,7 +2082,7 @@ TEST(sidre_group, save_restore_api) #if 0 DataStore* ds5 = new DataStore(); Group* root5 = ds5->getRoot(); - root5->load("sidre_save_subtree_json", "json"); + EXPECT_TRUE(root5->load("sidre_save_subtree_json", "json")); EXPECT_TRUE( ds5->getRoot()->isEquivalentTo(root1) ); delete ds5; #endif @@ -2095,8 +2096,8 @@ TEST(sidre_group, save_restore_api) Group* load1 = tree1->createGroup("subtree"); Group* load2 = tree2->createGroup("subtree"); - load1->load("sidre_save_subtree_sidre_json", "sidre_json"); - load2->load("sidre_save_subtree_sidre_json", "sidre_json"); + EXPECT_TRUE(load1->load("sidre_save_subtree_sidre_json", "sidre_json")); + EXPECT_TRUE(load2->load("sidre_save_subtree_sidre_json", "sidre_json")); EXPECT_TRUE(load1->isEquivalentTo(load2)); @@ -2163,7 +2164,7 @@ TEST(sidre_group, save_restore_scalars_and_strings) // if ( protocol == "conduit_hdf5") // continue; // XXX - Does not work const std::string file_path = file_path_base + protocol; - root1->save(file_path, protocol); + EXPECT_TRUE(root1->save(file_path, protocol)); } for(const auto& protocol : protocols) @@ -2179,7 +2180,7 @@ TEST(sidre_group, save_restore_scalars_and_strings) DataStore* ds2 = new DataStore(); Group* root2 = ds2->getRoot(); - root2->load(file_path, protocol); + EXPECT_TRUE(root2->load(file_path, protocol)); EXPECT_TRUE(root1->isEquivalentTo(root2)); @@ -2262,7 +2263,7 @@ TEST(sidre_group, save_restore_name_change) // if ( protocol == "conduit_hdf5") // continue; // XXX - Does not work const std::string file_path = file_path_base + protocol; - child1->save(file_path, protocol); + EXPECT_TRUE(child1->save(file_path, protocol)); } std::string groupname; @@ -2282,7 +2283,7 @@ TEST(sidre_group, save_restore_name_change) EXPECT_EQ(child2->getName(), "child2"); - child2->load(file_path, protocol, false, groupname); + EXPECT_TRUE(child2->load(file_path, protocol, false, groupname)); EXPECT_EQ(child2->getName(), "child2"); @@ -2339,7 +2340,7 @@ TEST(sidre_group, save_restore_external_data) for(const auto& protocol : protocols) { const std::string file_path = file_path_base + protocol; - root1->save(file_path, protocol); + EXPECT_TRUE(root1->save(file_path, protocol)); } delete ds1; @@ -2360,7 +2361,7 @@ TEST(sidre_group, save_restore_external_data) DataStore* ds2 = new DataStore(); Group* root2 = ds2->getRoot(); - root2->load(file_path, protocol); + EXPECT_TRUE(root2->load(file_path, protocol)); // load has set the type and size of the view. // Now set the external address before calling loadExternal. @@ -2402,7 +2403,7 @@ TEST(sidre_group, save_restore_external_data) view4->setExternalDataPtr(int2d2); // Read external data into views - root2->loadExternalData(file_path); + EXPECT_TRUE(root2->loadExternalData(file_path)); // Make sure addresses have not changed EXPECT_TRUE(view1->getVoidPtr() == static_cast(foo2)); @@ -2420,6 +2421,25 @@ TEST(sidre_group, save_restore_external_data) } delete ds2; + + // Now try to load external from an incorrect path. This will fail, + // causing loadExternalData() to return false. + DataStore* ds3 = new DataStore(); + Group* root3 = ds3->getRoot(); + root3->load(file_path, protocol); + View* view31 = root3->getView("external_array"); + view31->setExternalDataPtr(foo2); + View* view32 = root3->getView("empty_array"); + view32->setExternalDataPtr(foo3); + View* view33 = root3->getView("external_undescribed"); + view33->setExternalDataPtr(foo2); + View* view34 = root3->getView("int2d"); + view34->setExternalDataPtr(int2d2); + + const std::string bad_file_path = "garbage_" + file_path; + EXPECT_FALSE(root3->loadExternalData(bad_file_path)); + + delete ds3; } } @@ -2553,7 +2573,7 @@ TEST(sidre_group, save_restore_buffer) for(const auto& protocol : protocols) { const std::string file_path = file_path_base + protocol; - root1->save(file_path, protocol); + EXPECT_TRUE(root1->save(file_path, protocol)); } // Now load back in. @@ -2570,7 +2590,7 @@ TEST(sidre_group, save_restore_buffer) DataStore* ds2 = new DataStore(); Group* root2 = ds2->getRoot(); - root2->load(file_path, protocol); + EXPECT_TRUE(root2->load(file_path, protocol)); bool isequivalent = root1->isEquivalentTo(root2); EXPECT_TRUE(isequivalent); @@ -2615,7 +2635,7 @@ TEST(sidre_group, save_restore_other) for(const auto& protocol : protocols) { const std::string file_path = file_path_base + protocol; - root1->save(file_path, protocol); + EXPECT_TRUE(root1->save(file_path, protocol)); } delete ds1; @@ -2636,7 +2656,7 @@ TEST(sidre_group, save_restore_other) DataStore* ds2 = new DataStore(); Group* root2 = ds2->getRoot(); - root2->load(file_path, protocol); + EXPECT_TRUE(root2->load(file_path, protocol)); View* view1 = root2->getView("empty_view"); EXPECT_TRUE(view1->isEmpty()); @@ -2701,7 +2721,7 @@ TEST(sidre_group, save_restore_complex) for(const auto& protocol : protocols) { const std::string file_path = file_path_base + protocol; - ds1->getRoot()->save(file_path, protocol); + EXPECT_TRUE(ds1->getRoot()->save(file_path, protocol)); } for(const auto& protocol : protocols) @@ -2716,7 +2736,7 @@ TEST(sidre_group, save_restore_complex) DataStore* ds2 = new DataStore(); - ds2->getRoot()->load(file_path, protocol); + EXPECT_TRUE(ds2->getRoot()->load(file_path, protocol)); EXPECT_TRUE(ds1->getRoot()->isEquivalentTo(ds2->getRoot())); @@ -2844,10 +2864,15 @@ TEST(sidre_group, save_load_all_protocols) SLIC_INFO("Testing protocol: " << protocol); const std::string file_path = file_path_base + protocol; // save using current protocol - ds.getRoot()->save(file_path, protocol); + EXPECT_TRUE(ds.getRoot()->save(file_path, protocol)); DataStore ds_load; - ds_load.getRoot()->load(file_path, protocol); + EXPECT_TRUE(ds_load.getRoot()->load(file_path, protocol)); + EXPECT_FALSE(ds.getConduitErrorOccurred()); + ds.appendToConduitErrors("test: dummy error"); + EXPECT_TRUE(ds.getConduitErrorOccurred()); + ds.clearConduitErrors(); + EXPECT_FALSE(ds.getConduitErrorOccurred()); SLIC_INFO("Tree from protocol: " << protocol); // show the result @@ -2878,6 +2903,66 @@ TEST(sidre_group, save_load_all_protocols) DataStore::setConduitDefaultMessageHandlers(); } +//------------------------------------------------------------------------------ +TEST(sidre_group, fail_save_all_protocols) +{ + const std::string file_path_base("sidre_fail_save_all_protocols."); + DataStore ds; + + Group* flds = ds.getRoot()->createGroup("fields"); + + Group* ga = flds->createGroup("a"); + Group* gb = flds->createGroup("b"); + Group* gc = flds->createGroup("c"); + int ndata = 10; + + // prep a tree that can exactly restored by all + // i/o protocols. + // Specially, use int64 and float64 b/c the + // json i/o case uses those types for parsed integers + // and floating point numbers. + + ga->createViewScalar("i0", 100); + ga->createViewScalar("d0", 3000.00); + gb->createViewString("s0", "foo"); + + gc->createViewAndAllocate("int10", DataType::int64(ndata)); + conduit::int64* data_ptr = gc->getView("int10")->getArray(); + for(int i = 0; i < ndata; ++i) + { + data_ptr[i] = (conduit::int64)i; + } + + // show the source tree + SLIC_INFO("Source tree"); + ds.print(); + + // + // test all protocols + // + const std::vector& protocols = Group::getValidIOProtocols(); + for(const auto& protocol : protocols) + { + SLIC_INFO("Testing fail to save or load protocol: " << protocol); + const std::string save_file_path = file_path_base + "save." + protocol; + // create a directory named file_path + axom::utilities::filesystem::makeDirsForPath(save_file_path); + // fail to save, since there's a directory with the same name + EXPECT_FALSE(ds.getRoot()->save(save_file_path, protocol)); + EXPECT_TRUE(ds.getConduitErrorOccurred()); + std::string errstring = ds.getConduitErrors(); + EXPECT_GT(errstring.length(), 0); + + DataStore ds_load; + const std::string load_file_path = file_path_base + "load." + protocol; + // fail to load, since there's a directory, not a data file + EXPECT_FALSE(ds_load.getRoot()->load(load_file_path, protocol)); + EXPECT_TRUE(ds.getConduitErrorOccurred()); + errstring = ds.getConduitErrors(); + EXPECT_GT(errstring.length(), 0); + } +} + //------------------------------------------------------------------------------ TEST(sidre_group, save_load_preserve_contents) { @@ -2915,7 +3000,7 @@ TEST(sidre_group, save_load_preserve_contents) for(const auto& protocol : protocols) { std::string file_path0 = file_path_tree0 + protocol; - tree0->save(file_path0, protocol); + EXPECT_TRUE(tree0->save(file_path0, protocol)); Group* tree1 = tree0->createGroup("tree1"); @@ -2934,7 +3019,7 @@ TEST(sidre_group, save_load_preserve_contents) std::string file_path1 = file_path_tree1 + protocol; - tree1->save(file_path1, protocol); + EXPECT_TRUE(tree1->save(file_path1, protocol)); // show the source tree SLIC_INFO("Source tree"); @@ -2942,8 +3027,8 @@ TEST(sidre_group, save_load_preserve_contents) DataStore ds_load; Group* loadtree0 = ds_load.getRoot()->createGroup("tree0"); - loadtree0->load(file_path0, protocol, false, groupname); - loadtree0->load(file_path1, protocol, true, groupname); + EXPECT_TRUE(loadtree0->load(file_path0, protocol, false, groupname)); + EXPECT_TRUE(loadtree0->load(file_path1, protocol, true, groupname)); loadtree0->rename(groupname); SLIC_INFO("Tree from protocol: " << protocol); @@ -3027,9 +3112,9 @@ TEST(sidre_group, save_layout_protocols) gc->createView("empty_view"); std::string file_path = file_path_base + "sidre_layout_json"; - ds.getRoot()->save(file_path, "sidre_layout_json"); + EXPECT_TRUE(ds.getRoot()->save(file_path, "sidre_layout_json")); file_path = file_path_base + "conduit_layout_json"; - ds.getRoot()->save(file_path, "conduit_layout_json"); + EXPECT_TRUE(ds.getRoot()->save(file_path, "conduit_layout_json")); //restore conduit default errors DataStore::setConduitDefaultMessageHandlers(); @@ -3263,10 +3348,10 @@ TEST(sidre_group, import_conduit_lists) std::string lists_protocol = "sidre_json"; #endif - ds.getRoot()->save(lists_file, lists_protocol); + EXPECT_TRUE(ds.getRoot()->save(lists_file, lists_protocol)); DataStore load_ds; - load_ds.getRoot()->load(lists_file, lists_protocol); + EXPECT_TRUE(load_ds.getRoot()->load(lists_file, lists_protocol)); { EXPECT_EQ( From 8ba0105f4d8b07e25f077ef614ba8b5ce396f068 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 23 Jan 2024 10:31:23 -0800 Subject: [PATCH 398/639] Rename new methods to make them the regular methods. --- src/axom/quest/MarchingCubes.hpp | 10 ++++++-- .../detail/MarchingCubesFullParallel.hpp | 24 ++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index cf600213cb..966e3954b3 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -149,8 +149,9 @@ class MarchingCubes /*! @brief Put generated contour in a mint::UnstructuredMesh. @param mesh Output contour mesh - @param cellIdField Name of field to store the (axom::IndexType) - parent cell ids. If omitted, the data is not provided. + @param cellIdField Name of field to store the array of + parent cells' multidimensional indices. + If empty, the data is not provided. @param domainIdField Name of field to store the (axom::IndexType) parent domain ids. If omitted, the data is not provided. @@ -310,6 +311,9 @@ class MarchingCubesSingleDomain virtual void setContourValue(double contourVal) = 0; //!@brief Compute the contour mesh. virtual void computeContourMesh() = 0; + + //@{ + //!@name Output methods //!@brief Return number of contour mesh facets generated. virtual axom::IndexType getContourCellCount() const = 0; /*! @@ -321,6 +325,8 @@ class MarchingCubesSingleDomain virtual void populateContourMesh( axom::mint::UnstructuredMesh &mesh, const std::string &cellIdField) const = 0; + //@} + virtual ~ImplBase() { } }; diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index 90d1a85126..57ff2bb892 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -102,8 +102,8 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase void computeContourMesh() override { markCrossings(); - new_scanCrossings(); - new_computeContour(); + scanCrossings(); + computeContour(); } /*! @@ -255,7 +255,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase and m_contourCellParents arrays that defines the unstructured contour mesh. */ - void scanCrossings() + void old_scanCrossings() { const axom::IndexType parentCellCount = m_caseIds.size(); auto caseIdsView = m_caseIds.view(); @@ -314,7 +314,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase sizeof(facetIncrs_back)); m_facetCount = firstFacetIds_back + facetIncrs_back; } - void new_scanCrossings() + void scanCrossings() { #if defined(AXOM_USE_RAJA) #ifdef __INTEL_LLVM_COMPILER @@ -391,7 +391,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_firstFacetIds.resize(m_crossingCount); } - void computeContour() + void old_computeContour() { // // Fill in surface mesh data. @@ -450,7 +450,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase axom::for_all(0, parentCellCount, gen_for_parent_cell); } - void new_computeContour() + void computeContour() { // // Fill in surface mesh data. @@ -537,14 +537,14 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase template AXOM_HOST_DEVICE typename std::enable_if::type - get_corner_coords_and_values(IndexType cellNum, + get_corner_coords_and_values(IndexType parentCellId, Point cornerCoords[], double cornerValues[]) const { const auto& x = coordsViews[0]; const auto& y = coordsViews[1]; - const auto c = indexer.toMultiIndex(cellNum); + const auto c = indexer.toMultiIndex(parentCellId); const auto& i = c[0]; const auto& j = c[1]; @@ -562,7 +562,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase } template AXOM_HOST_DEVICE typename std::enable_if::type - get_corner_coords_and_values(IndexType cellNum, + get_corner_coords_and_values(IndexType parentCellId, Point cornerCoords[], double cornerValues[]) const { @@ -570,7 +570,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase const auto& y = coordsViews[1]; const auto& z = coordsViews[2]; - const auto c = indexer.toMultiIndex(cellNum); + const auto c = indexer.toMultiIndex(parentCellId); const auto& i = c[0]; const auto& j = c[1]; const auto& k = c[2]; @@ -814,6 +814,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase mesh.appendNodes((double*)contourNodeCoords.data(), contourNodeCoords.size()); + for(int n = 0; n < addedCellCount; ++n) { MIdx cornerIds = contourCellCorners[n]; @@ -823,8 +824,9 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase { cornerIds[d] += priorNodeCount; } - mesh.appendCell(cornerIds); + mesh.appendCell(cornerIds); // This takes too long! } + axom::IndexType numComponents = -1; axom::IndexType* cellIdPtr = mesh.getFieldPtr(cellIdField, From d481592e497475bfd57e3508e1747a9a7485b72e Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 24 Jan 2024 12:08:11 -0800 Subject: [PATCH 399/639] bump spack version --- .uberenv_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index fcc57b112b..7a3e6b96d2 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_final_phase": "initconfig", "package_source_dir": "../..", "spack_url": "https://github.com/spack/spack.git", -"spack_commit": "44f0708af424cb12dd05dd761de1cdae986ea5cf", +"spack_commit": "61421b3a67941f5c91239360b4d7d3ee5c3428df", "spack_configs_path": "scripts/spack/configs", "spack_packages_path": ["scripts/spack/radiuss-spack-configs/packages", "scripts/spack/packages"], "spack_concretizer": "clingo", From eb18c8ec4c15d26d0d897378a0ddc314af709729 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 24 Jan 2024 12:08:34 -0800 Subject: [PATCH 400/639] merge changes from Spack's repo into ours --- scripts/spack/packages/axom/package.py | 55 ++++++++++++++------------ 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py index ac7b9c6a53..bb6f24f9fe 100644 --- a/scripts/spack/packages/axom/package.py +++ b/scripts/spack/packages/axom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) @@ -32,26 +32,28 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): """Axom provides a robust, flexible software infrastructure for the development of multi-physics applications and computational tools.""" - maintainers = ["white238"] + maintainers("white238") homepage = "https://github.com/LLNL/axom" git = "https://github.com/LLNL/axom.git" tags = ["radiuss"] + license("BSD-3-Clause") + version("main", branch="main") version("develop", branch="develop") - version("0.8.1", tag="v0.8.1") - version("0.8.0", tag="v0.8.0") - version("0.7.0", tag="v0.7.0") - version("0.6.1", tag="v0.6.1") - version("0.6.0", tag="v0.6.0") - version("0.5.0", tag="v0.5.0") - version("0.4.0", tag="v0.4.0") - version("0.3.3", tag="v0.3.3") - version("0.3.2", tag="v0.3.2") - version("0.3.1", tag="v0.3.1") - version("0.3.0", tag="v0.3.0") - version("0.2.9", tag="v0.2.9") + version("0.8.1", tag="v0.8.1", commit="0da8a5b1be596887158ac2fcd321524ba5259e15") + version("0.8.0", tag="v0.8.0", commit="71fab3262eb7e1aa44a04c21d072b77f06362f7b") + version("0.7.0", tag="v0.7.0", commit="ea5158191181c137117ae37959879bdc8b107f35") + version("0.6.1", tag="v0.6.1", commit="ee240d3963d7879ae0e9c392902195bd7b04e37d") + version("0.6.0", tag="v0.6.0", commit="65287dc00bc7c271a08cb86c632f5909c30e3506") + version("0.5.0", tag="v0.5.0", commit="db137349b3e28617c3e0570dbd18e4a91654da98") + version("0.4.0", tag="v0.4.0", commit="38c0d7495ece35a30fca5f5b578b8f9d54346bd2") + version("0.3.3", tag="v0.3.3", commit="f0539ef0525469ffda054d86144f310c15b4f9e0") + version("0.3.2", tag="v0.3.2", commit="c446b496e20e6118b8cba7e80f1f84c76a49e463") + version("0.3.1", tag="v0.3.1", commit="cbefc0457a229d8acfb70622360d0667e90e50a2") + version("0.3.0", tag="v0.3.0", commit="20068ccab4b4f70055918b4f17960ec3ed6dbce8") + version("0.2.9", tag="v0.2.9", commit="9e9a54ede3326817c05f35922738516e43b5ec3d") # https://github.com/spack/spack/issues/31829 patch("examples-oneapi.patch", when="@0.6.1 +examples %oneapi") @@ -123,7 +125,6 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("umpire@6.0.0", when="@0.6.0") depends_on("umpire@5:5.0.1", when="@:0.5.0") depends_on("umpire +openmp", when="+openmp") - depends_on("umpire +cuda", when="+cuda") with when("+raja"): depends_on("raja@2022.03.0:", when="@0.7.0:") @@ -131,15 +132,18 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("raja@:0.13.0", when="@:0.5.0") depends_on("raja~openmp", when="~openmp") depends_on("raja+openmp", when="+openmp") - depends_on("raja+cuda", when="+cuda") for val in CudaPackage.cuda_arch_values: - depends_on("raja cuda_arch={0}".format(val), when="+raja cuda_arch={0}".format(val)) - depends_on("umpire cuda_arch={0}".format(val), when="+umpire cuda_arch={0}".format(val)) + raja_cuda = "raja +cuda cuda_arch={0}".format(val) + umpire_cuda = "umpire +cuda cuda_arch={0}".format(val) + depends_on(raja_cuda, when="+{0}".format(raja_cuda)) + depends_on(umpire_cuda, when="+{0}".format(umpire_cuda)) for val in ROCmPackage.amdgpu_targets: - depends_on("raja amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val)) - depends_on("umpire amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val)) + raja_rocm = "raja +rocm amdgpu_target={0}".format(val) + umpire_rocm = "umpire +rocm amdgpu_target={0}".format(val) + depends_on(raja_rocm, when="+{0}".format(raja_rocm)) + depends_on(umpire_rocm, when="+{0}".format(umpire_rocm)) depends_on("rocprim", when="+rocm") @@ -174,6 +178,8 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): conflicts("+openmp", when="+rocm") conflicts("+cuda", when="+rocm") + conflicts("^blt@:0.3.6", when="+rocm") + def flag_handler(self, name, flags): if self.spec.satisfies("%cce") and name == "fflags": flags.append("-ef") @@ -217,7 +223,7 @@ def cache_name(self): def initconfig_compiler_entries(self): spec = self.spec - entries = super(Axom, self).initconfig_compiler_entries() + entries = super().initconfig_compiler_entries() if "+fortran" in spec: entries.append(cmake_cache_option("ENABLE_FORTRAN", True)) @@ -250,7 +256,7 @@ def initconfig_compiler_entries(self): def initconfig_hardware_entries(self): spec = self.spec - entries = super(Axom, self).initconfig_hardware_entries() + entries = super().initconfig_hardware_entries() if "+cuda" in spec: entries.append(cmake_cache_option("ENABLE_CUDA", True)) @@ -387,8 +393,7 @@ def initconfig_hardware_entries(self): if _existing_paths: entries.append( cmake_cache_string( - "BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE", - ";".join(_existing_paths), + "BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE", ";".join(_existing_paths) ) ) @@ -396,7 +401,7 @@ def initconfig_hardware_entries(self): def initconfig_mpi_entries(self): spec = self.spec - entries = super(Axom, self).initconfig_mpi_entries() + entries = super().initconfig_mpi_entries() if "+mpi" in spec: entries.append(cmake_cache_option("ENABLE_MPI", True)) From aa16a01f7b69fd0e15c8a4636436304ceb1c8391 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 24 Jan 2024 12:08:49 -0800 Subject: [PATCH 401/639] fix zlib to a concrete provider --- .../spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml index b048866918..634db542a6 100644 --- a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -113,6 +113,7 @@ spack: blas: [netlib-lapack] lapack: [netlib-lapack] mpi: [spectrum-mpi] + zlib-api: [zlib] # LLNL blueos CUDA cuda: @@ -266,6 +267,16 @@ spack: - spec: tar@1.26 prefix: /usr buildable: false + unzip: + buildable: false + externals: + - spec: unzip@6.0 + prefix: /usr + zlib: + buildable: false + externals: + - spec: zlib@1.2.7 + prefix: /usr # External dependencies for SCR lsf: From 8b758592272faa90fc82edd9bc7c9040409af451 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 24 Jan 2024 13:06:45 -0800 Subject: [PATCH 402/639] style from spack --- scripts/spack/packages/axom/package.py | 42 +++++++++++++++----------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py index bb6f24f9fe..1a53eedd47 100644 --- a/scripts/spack/packages/axom/package.py +++ b/scripts/spack/packages/axom/package.py @@ -10,6 +10,7 @@ from spack.package import * from spack.util.executable import which_string + def get_spec_path(spec, package_name, path_replacements={}, use_bin=False): """Extracts the prefix path for the given spack package path_replacements is a dictionary with string replacements for the path. @@ -232,7 +233,7 @@ def initconfig_compiler_entries(self): flags = "" for _libpath in [libdir, libdir + "64"]: if os.path.exists(_libpath): - if spec.satisfies('^cuda'): + if spec.satisfies("^cuda"): flags += " -Xlinker -rpath -Xlinker {0}".format(_libpath) else: flags += " -Wl,-rpath,{0}".format(_libpath) @@ -249,8 +250,7 @@ def initconfig_compiler_entries(self): # cray compiler or newer HIP if "+rocm" in spec: if "crayCC" in self.compiler.cxx or spec.satisfies("%clang@16"): - entries.append(cmake_cache_string("CMAKE_CXX_FLAGS_DEBUG","-O1 -g -DNDEBUG")) - + entries.append(cmake_cache_string("CMAKE_CXX_FLAGS_DEBUG", "-O1 -g -DNDEBUG")) return entries @@ -268,8 +268,8 @@ def initconfig_hardware_entries(self): cudaflags = "-restrict --expt-extended-lambda " # Pass through any cxxflags to the host compiler via nvcc's Xcompiler flag - host_cxx_flags = spec.compiler_flags['cxxflags'] - cudaflags += ' '.join(['-Xcompiler=%s ' % flag for flag in host_cxx_flags]) + host_cxx_flags = spec.compiler_flags["cxxflags"] + cudaflags += " ".join(["-Xcompiler=%s " % flag for flag in host_cxx_flags]) if not spec.satisfies("cuda_arch=none"): cuda_arch = spec.variants["cuda_arch"].value[0] @@ -299,12 +299,18 @@ def initconfig_hardware_entries(self): rocm_root = hip_root + "/.." # Fix blt_hip getting HIP_CLANG_INCLUDE_PATH-NOTFOUND bad include directory - if (self.spec.satisfies('%cce') or self.spec.satisfies('%clang')) and 'toss_4' in self._get_sys_type(spec): + if ( + self.spec.satisfies("%cce") or self.spec.satisfies("%clang") + ) and "toss_4" in self._get_sys_type(spec): # Set the patch version to 0 if not already - clang_version= str(self.compiler.version)[:-1] + "0" - hip_clang_include_path = rocm_root + "/llvm/lib/clang/" + clang_version + "/include" + clang_version = str(self.compiler.version)[:-1] + "0" + hip_clang_include_path = ( + rocm_root + "/llvm/lib/clang/" + clang_version + "/include" + ) if os.path.isdir(hip_clang_include_path): - entries.append(cmake_cache_path("HIP_CLANG_INCLUDE_PATH", hip_clang_include_path)) + entries.append( + cmake_cache_path("HIP_CLANG_INCLUDE_PATH", hip_clang_include_path) + ) # Fixes for mpi for rocm until wrapper paths are fixed # These flags are already part of the wrapped compilers on TOSS4 systems @@ -317,8 +323,9 @@ def initconfig_hardware_entries(self): # Remove extra link library for crayftn if "+fortran" in spec and self.is_fortran_compiler("crayftn"): - entries.append(cmake_cache_string("BLT_CMAKE_IMPLICIT_LINK_LIBRARIES_EXCLUDE", - "unwind")) + entries.append( + cmake_cache_string("BLT_CMAKE_IMPLICIT_LINK_LIBRARIES_EXCLUDE", "unwind") + ) # Additional libraries for TOSS4 hip_link_flags += " -L{0}/../lib64 -Wl,-rpath,{0}/../lib64 ".format(hip_root) @@ -411,10 +418,11 @@ def initconfig_mpi_entries(self): entries.append(cmake_cache_option("ENABLE_MPI", False)) # Replace /usr/bin/srun path with srun flux wrapper path on TOSS 4 - if 'toss_4' in self._get_sys_type(spec): + if "toss_4" in self._get_sys_type(spec): srun_wrapper = which_string("srun") - mpi_exec_index = [index for index,entry in enumerate(entries) - if "MPIEXEC_EXECUTABLE" in entry] + mpi_exec_index = [ + index for index, entry in enumerate(entries) if "MPIEXEC_EXECUTABLE" in entry + ] del entries[mpi_exec_index[0]] entries.append(cmake_cache_path("MPIEXEC_EXECUTABLE", srun_wrapper)) @@ -423,7 +431,7 @@ def initconfig_mpi_entries(self): def find_path_replacement(self, path1, path2, path_replacements, name, entries): root = os.path.commonprefix([path1, path2]) if root.endswith(os.path.sep): - root = root[:-len(os.path.sep)] + root = root[: -len(os.path.sep)] if root: path_replacements[root] = "${" + name + "}" entries.append(cmake_cache_path(name, root)) @@ -438,7 +446,7 @@ def initconfig_package_entries(self): entries.append("# TPLs") entries.append("#------------------{0}\n".format("-" * 60)) - # Try to find the common prefix of the TPL directory. + # Try to find the common prefix of the TPL directory. # If found, we will use this in the TPL paths path1 = os.path.realpath(spec["conduit"].prefix) path2 = os.path.realpath(self.prefix) @@ -514,7 +522,7 @@ def initconfig_package_entries(self): if spec.satisfies("^py-jsonschema"): jsonschema_dir = get_spec_path(spec, "py-jsonschema", path_replacements, use_bin=True) - jsonschema_path = os.path.join(jsonschema_dir, 'jsonschema') + jsonschema_path = os.path.join(jsonschema_dir, "jsonschema") entries.append(cmake_cache_path("JSONSCHEMA_EXECUTABLE", jsonschema_path)) enable_docs = spec.satisfies("^doxygen") or spec.satisfies("^py-sphinx") From 95521e38143ae2bbe089c4ce26ac3f6f2b7d61b6 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 25 Jan 2024 12:30:59 -0800 Subject: [PATCH 403/639] Partially working implementatino with stream-lined output data. Remove populateContourMesh for single-domain versions, because all output data now go into a buffer managed by the multidomain version. --- src/axom/quest/ArrayIndexer.hpp | 42 ++++- src/axom/quest/CMakeLists.txt | 2 +- src/axom/quest/MarchingCubes.cpp | 156 ++++++++++++++-- src/axom/quest/MarchingCubes.hpp | 159 +++++++++++++++-- src/axom/quest/MeshViewUtil.hpp | 9 + .../detail/MarchingCubesFullParallel.hpp | 118 +++++++++--- .../detail/MarchingCubesHybridParallel.hpp | 168 ++++++++++++------ .../examples/quest_marching_cubes_example.cpp | 55 ++++-- src/axom/quest/tests/quest_array_indexer.cpp | 14 +- 9 files changed, 599 insertions(+), 124 deletions(-) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index a43ec946d7..84e417e9bf 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -31,6 +31,22 @@ class ArrayIndexer @param [in] order: c is column major; r is row major. */ ArrayIndexer(const axom::StackArray& lengths, char order) + { + initialize(lengths, order); + } + + //!@brief Constructor for arbitrary-stride indexing. + ArrayIndexer(const axom::StackArray& strides) : m_strides(strides) + { + initialize(strides); + } + + /*! + @brief Initialize for row- or column major indexing. + @param [in] shape Shape of the array + @param [in] order: c is column major; r is row major. + */ + inline AXOM_HOST_DEVICE void initialize(const axom::StackArray& shape, char order) { SLIC_ASSERT(order == 'c' || order == 'r'); if(order == 'r') @@ -42,7 +58,7 @@ class ArrayIndexer m_strides[0] = 1; for(int d = 1; d < DIM; ++d) { - m_strides[d] = m_strides[d - 1] * lengths[d - 1]; + m_strides[d] = m_strides[d - 1] * shape[d - 1]; } } else @@ -54,14 +70,16 @@ class ArrayIndexer m_strides[DIM - 1] = 1; for(int d = DIM - 2; d >= 0; --d) { - m_strides[d] = m_strides[d + 1] * lengths[d + 1]; + m_strides[d] = m_strides[d + 1] * shape[d + 1]; } } + SLIC_ASSERT((DIM == 1 && getOrder() == 'r' | 's') || (getOrder() == order)); } - //!@brief Constructor for arbitrary-stride indexing. - ArrayIndexer(const axom::StackArray& strides) : m_strides(strides) + //!@brief Initialize for arbitrary-stride indexing. + inline AXOM_HOST_DEVICE void initialize(const axom::StackArray& strides) { + m_strides = strides; for(int d = 0; d < DIM; ++d) { m_slowestDirs[d] = d; @@ -90,6 +108,22 @@ class ArrayIndexer return m_strides; } + /*! + @brief Get the stride order (row- or column-major, or something else). + + @return 'r' or 'c' for row- or column major, '\0' for neither, + or if DIM == 1, the value of 'r' | 'c'. + */ + inline AXOM_HOST_DEVICE char getOrder() const + { + char order = 'r' | 'c'; + for(int d=0; d < DIM - 1; ++d) + { + order &= m_slowestDirs[d] < m_slowestDirs[d+1] ? 'c' : 'r'; + } + return order; + } + //!@brief Convert multidimensional index to flat index. inline AXOM_HOST_DEVICE T toFlatIndex(const axom::StackArray& multiIndex) const { diff --git a/src/axom/quest/CMakeLists.txt b/src/axom/quest/CMakeLists.txt index 130b411e08..9ddc1e2059 100644 --- a/src/axom/quest/CMakeLists.txt +++ b/src/axom/quest/CMakeLists.txt @@ -119,7 +119,7 @@ endif() blt_list_append( TO quest_headers - ELEMENTS MarchingCubes.hpp detail/MarchingCubesHybridParallel.hpp detail/MarchingCubesFullParallel.hpp + ELEMENTS MarchingCubes.hpp detail/MarchingCubesFullParallel.hpp IF CONDUIT_FOUND ) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index db8a0178ca..adc929b120 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -13,7 +13,7 @@ #include "axom/core/execution/execution_space.hpp" #include "axom/quest/MarchingCubes.hpp" -#include "axom/quest/detail/MarchingCubesHybridParallel.hpp" +// #include "axom/quest/detail/MarchingCubesHybridParallel.hpp" #include "axom/quest/detail/MarchingCubesFullParallel.hpp" #include "axom/fmt.hpp" @@ -41,6 +41,7 @@ MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, for(auto& dom : bpMesh.children()) { m_singles.emplace_back(new MarchingCubesSingleDomain(m_runtimePolicy, + m_dataParallelism, dom, m_topologyName, maskField)); @@ -59,6 +60,40 @@ void MarchingCubes::setFunctionField(const std::string& fcnField) void MarchingCubes::computeIsocontour(double contourVal) { +#if 1 + // Mark and scan domains while adding up their + // facet counts to get the total facet counts. + m_facetIndexOffsets.resize(m_singles.size()); + m_facetCount = 0; + for(axom::IndexType d=0; dsetOutputBuffers(facetNodeIdsView, + facetNodeCoordsView, + facetParentIdsView, + m_facetIndexOffsets[d]); + } + + for(axom::IndexType d=0; dcomputeContour(); + } +#else SLIC_ASSERT_MSG(!m_fcnFieldName.empty(), "You must call setFunctionField before computeIsocontour."); @@ -68,6 +103,7 @@ void MarchingCubes::computeIsocontour(double contourVal) single->setDataParallelism(m_dataParallelism); single->computeIsocontour(contourVal); } +#endif } axom::IndexType MarchingCubes::getContourCellCount() const @@ -98,9 +134,8 @@ void MarchingCubes::populateContourMesh( if(!cellIdField.empty() && !mesh.hasField(cellIdField, axom::mint::CELL_CENTERED)) { - mesh.createField(cellIdField, - axom::mint::CELL_CENTERED, - mesh.getDimension()); + // Create cellId field, currently the multidimensional index of the parent cell. + mesh.createField(cellIdField, axom::mint::CELL_CENTERED); } if(!domainIdField.empty() && @@ -115,6 +150,33 @@ void MarchingCubes::populateContourMesh( mesh.reserveCells(contourCellCount); mesh.reserveNodes(contourNodeCount); +#if 1 + if (m_facetCount) { + mesh.appendCells(m_facetNodeIds.data(), m_facetCount); + mesh.appendNodes(m_facetNodeCoords.data(), mesh.getDimension()*m_facetCount); + + axom::IndexType* cellIdPtr = + mesh.getFieldPtr(cellIdField, + axom::mint::CELL_CENTERED); + axom::copy(cellIdPtr, + m_facetParentIds.data(), + m_facetCount*sizeof(axom::IndexType)); + + // TODO: Move domain id stuff into a separate function. + auto* domainIdPtr = + mesh.getFieldPtr(domainIdField, + axom::mint::CELL_CENTERED); + for(int d = 0; d < m_singles.size(); ++d) + { + axom::detail::ArrayOps::fill( + domainIdPtr, + m_facetIndexOffsets[d], + m_singles[d]->getContourCellCount(), + execution_space::allocatorID(), + m_singles[d]->getDomainId(d)); + } + } +#else // Populate mesh from single domains and add domain id if requested. for(int dId = 0; dId < m_singles.size(); ++dId) { @@ -140,15 +202,64 @@ void MarchingCubes::populateContourMesh( userDomainId); } } +#endif SLIC_ASSERT(mesh.getNumberOfNodes() == contourNodeCount); SLIC_ASSERT(mesh.getNumberOfCells() == contourCellCount); } +void MarchingCubes::allocateOutputBuffers() +{ + int allocatorId = -1; + if(m_runtimePolicy == MarchingCubes::RuntimePolicy::seq) + { + allocatorId = axom::execution_space::allocatorID(); + } +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP + else if(m_runtimePolicy == MarchingCubes::RuntimePolicy::omp) + { + allocatorId = axom::execution_space::allocatorID(); + } +#endif +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + else if(m_runtimePolicy == MarchingCubes::RuntimePolicy::cuda) + { + allocatorId = axom::execution_space>::allocatorID(); + } +#endif +#ifdef AXOM_RUNTIME_POLICY_USE_HIP + else if(m_runtimePolicy == MarchingCubes::RuntimePolicy::hip) + { + allocatorId = axom::execution_space>::allocatorID(); + } +#endif + else + { + SLIC_ERROR(axom::fmt::format( + "MarchingCubes doesn't recognize runtime policy {}", + m_runtimePolicy)); + } + + if (!m_singles.empty()) + { + int ndim = m_singles[0]->spatialDimension(); + const auto nodeCount = m_facetCount * ndim; + m_facetNodeIds = + axom::Array({m_facetCount, ndim}, allocatorId); + m_facetNodeCoords = + axom::Array({nodeCount, ndim}, allocatorId); + axom::StackArray t1{m_facetCount}; + m_facetParentIds = + axom::Array(t1, allocatorId); + } +} + MarchingCubesSingleDomain::MarchingCubesSingleDomain(RuntimePolicy runtimePolicy, + MarchingCubesDataParallelism dataPar, const conduit::Node& dom, const std::string& topologyName, const std::string& maskField) : m_runtimePolicy(runtimePolicy) + , m_dataParallelism(dataPar) , m_dom(nullptr) , m_ndim(0) , m_topologyName(topologyName) @@ -157,7 +268,32 @@ MarchingCubesSingleDomain::MarchingCubesSingleDomain(RuntimePolicy runtimePolicy , m_maskFieldName(maskField) , m_maskPath(maskField.empty() ? std::string() : "fields/" + maskField) { + // Set domain first, to get m_ndim, which is required to allocate m_impl. setDomain(dom); + + /* + We have 2 implementations. MarchingCubesHybridParallel is faster on the host + and MarchingCubesFullParallel is faster on GPUs. Both work in all cases. + We can choose based on runtime policy or by user choice + */ + if(m_dataParallelism == + axom::quest::MarchingCubesDataParallelism::hybridParallel || + (m_dataParallelism == axom::quest::MarchingCubesDataParallelism::byPolicy && + m_runtimePolicy == RuntimePolicy::seq)) + { + SLIC_WARNING("Not really using hybrid while developing. Using full parallel."); + m_impl = axom::quest::detail::marching_cubes::newMarchingCubesFullParallel( + m_runtimePolicy, + m_ndim); + } + else + { + m_impl = axom::quest::detail::marching_cubes::newMarchingCubesFullParallel( + m_runtimePolicy, + m_ndim); + } + + m_impl->initialize(*m_dom, m_topologyName, m_maskFieldName); return; } @@ -191,16 +327,6 @@ void MarchingCubesSingleDomain::setDomain(const conduit::Node& dom) "MarchingCubes currently requires contiguous coordinates layout."); } -void MarchingCubesSingleDomain::setFunctionField(const std::string& fcnField) -{ - m_fcnFieldName = fcnField; - m_fcnPath = "fields/" + fcnField; - SLIC_ASSERT(m_dom->has_path(m_fcnPath)); - SLIC_ASSERT(m_dom->fetch_existing(m_fcnPath + "/association").as_string() == - "vertex"); - SLIC_ASSERT(m_dom->has_path(m_fcnPath + "/values")); -} - int MarchingCubesSingleDomain::getDomainId(int defaultId) const { int rval = defaultId; @@ -211,6 +337,7 @@ int MarchingCubesSingleDomain::getDomainId(int defaultId) const return rval; } +#if 0 void MarchingCubesSingleDomain::computeIsocontour(double contourVal) { SLIC_ASSERT_MSG(!m_fcnFieldName.empty(), @@ -238,6 +365,7 @@ void MarchingCubesSingleDomain::computeIsocontour(double contourVal) m_impl->setContourValue(contourVal); m_impl->computeContourMesh(); } +#endif } // end namespace quest } // end namespace axom diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 966e3954b3..5e9efd2889 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -82,8 +82,9 @@ class MarchingCubesSingleDomain; * const std::string &functionName, * double contourValue ) * { - * MarchingCubes mc(meshNode, coordsName); - * setFunctionField(functionName); + * MarchingCubes mc(axom::runtime_policy::Policy::seq, + * meshNode, coordsName); + * mc.setFunctionField(functionName); * mc.computeIsocontour(contourValue); * axom::mint::UnstructuredMesh * contourMesh(3, min::CellType::Triangle); @@ -146,6 +147,33 @@ class MarchingCubes //!@brief Get number of nodes in the generated contour mesh. axom::IndexType getContourNodeCount() const; + /*! + @brief Return pointer to facet corner node indices (connectivity) + + The buffer size is the x getContourCellCount(). + Memory space of data depends on runtime policy. + */ + axom::ArrayView getContourFacetCorners() const + { return m_facetNodeIds.view(); } + + /*! + @brief Return pointer to node coordinates. + + The buffer size is x getContourNodeCount(). + Memory space of data depends on runtime policy. + */ + axom::ArrayView getContourNodeCoords() const + { return m_facetNodeCoords.view(); } + + /*! + @brief Return pointer to parent cell indices + + The buffer size is getContourCellCount(). + Memory space of data depends on runtime policy. + */ + axom::ArrayView getContourFacetParents() const + { return m_facetParentIds.view(); } + /*! @brief Put generated contour in a mint::UnstructuredMesh. @param mesh Output contour mesh @@ -192,7 +220,37 @@ class MarchingCubes std::string m_maskFieldName; std::string m_maskPath; + //!@brief First facet index from each parent domain. + axom::Array m_facetIndexOffsets; + + //!@brief Facet count over all parent domains. + axom::IndexType m_facetCount = 0; + + //@{ + //!@name Generated contour mesh, shared with singles. + /*! + @brief Corners (index into m_facetNodeCoords) of generated facets. + @see allocateOutputBuffers(). + */ + axom::Array m_facetNodeIds; + + /*! + @brief Coordinates of generated surface mesh nodes. + @see allocateOutputBuffers(). + */ + axom::Array m_facetNodeCoords; + + /*! + @brief Flat index of parent cell of facets. + @see allocateOutputBuffers(). + */ + axom::Array m_facetParentIds; + //@} + void setMesh(const conduit::Node &bpMesh); + + //!@brief Allocate output buffers corresponding to runtime policy. + void allocateOutputBuffers(); }; /*! @@ -212,6 +270,7 @@ class MarchingCubesSingleDomain * \param [in] runtimePolicy A value from RuntimePolicy. * The simplest policy is RuntimePolicy::seq, which specifies * running sequentially on the CPU. + * \param [in] dataPar Choice of data-parallel implementation. * \param [in] dom Blueprint single-domain mesh containing scalar field. * \param [in] topologyName Name of Blueprint topology to use in \a dom * \param [in] maskField Cell-based std::int32_t mask field. If provided, @@ -230,10 +289,13 @@ class MarchingCubesSingleDomain * transformation and storage of the temporary contiguous layout. */ MarchingCubesSingleDomain(RuntimePolicy runtimePolicy, + MarchingCubesDataParallelism dataPar, const conduit::Node &dom, const std::string &topologyName, const std::string &maskfield); + int spatialDimension() const { return m_ndim; } + void setDataParallelism(MarchingCubesDataParallelism &dataPar) { m_dataParallelism = dataPar; @@ -244,7 +306,39 @@ class MarchingCubesSingleDomain in the input mesh. \param [in] fcnField Name of node-based scalar function values. */ - void setFunctionField(const std::string &fcnField); + void setFunctionField(const std::string &fcnField) + { + m_fcnFieldName = fcnField; + m_fcnPath = "fields/" + fcnField; + SLIC_ASSERT(m_dom->has_path(m_fcnPath)); + SLIC_ASSERT(m_dom->fetch_existing(m_fcnPath + "/association").as_string() == + "vertex"); + SLIC_ASSERT(m_dom->has_path(m_fcnPath + "/values")); + if (m_impl) m_impl->setFunctionField(fcnField); + } + + void setContourValue(double contourVal) + { + m_contourVal = contourVal; + if (m_impl) m_impl->setContourValue(m_contourVal); + } + + // Methods trivially delegated to implementation. + void markCrossings() { m_impl->markCrossings(); } + void scanCrossings() { m_impl->scanCrossings(); } + axom::IndexType getContourCellCount() { return m_impl->getContourCellCount(); } + void setOutputBuffers( + axom::ArrayView& facetNodeIds, + axom::ArrayView& facetNodeCoords, + axom::ArrayView& facetParentIds, + axom::IndexType facetIndexOffset) + { + m_impl->setOutputBuffers( facetNodeIds, + facetNodeCoords, + facetParentIds, + facetIndexOffset ); + } + void computeContour() { m_impl->computeContour(); } /*! @brief Get the Blueprint domain id specified in \a state/domain_id @@ -252,15 +346,17 @@ class MarchingCubesSingleDomain */ int getDomainId(int defaultId) const; +#if 0 /*! * \brief Compute the isocontour. * * \param [in] contourVal isocontour value * * Compute isocontour using the marching cubes algorithm. - * To get the isocontour mesh, use populateContourMesh. */ void computeIsocontour(double contourVal = 0.0); +#endif + //!@brief Get number of cells in the generated contour mesh. axom::IndexType getContourCellCount() const @@ -278,6 +374,7 @@ class MarchingCubesSingleDomain return m_ndim * getContourCellCount(); } +#if 0 /*! @brief Put generated contour surface in a mint::UnstructuredMesh object. @@ -292,30 +389,49 @@ class MarchingCubesSingleDomain { m_impl->populateContourMesh(mesh, cellIdField); } +#endif /*! - @brief Base class for implementations templated on dimension - and execution space. + @brief Base class for implementations templated on dimension DIM + and execution space ExecSpace. + + Implementation details templated on DIM and ExecSpace cannot + be in MarchingCubesSingleDomain so should live in this class. This class allows m_impl to refer to any implementation used at runtime. */ struct ImplBase { - //!@brief Prepare internal data for operating on the given domain. + /*! + @brief Prepare internal data for operating on the given domain. + + Put in here codes that can't be in MarchingCubesSingleDomain + due to template use (DIM and ExecSpace). + */ virtual void initialize(const conduit::Node &dom, const std::string &topologyName, - const std::string &fcnPath, const std::string &maskPath) = 0; - //!@brief Set the contour value + + virtual void setFunctionField(const std::string& fcnFieldName) = 0; virtual void setContourValue(double contourVal) = 0; + + //@{ + //!@name Distinct phases in contour generation. //!@brief Compute the contour mesh. - virtual void computeContourMesh() = 0; + //!@brief Mark parent cells that cross the contour value. + virtual void markCrossings() = 0; + //!@brief Scan operations to determine counts and offsets. + virtual void scanCrossings() = 0; + //!@brief Compute contour data. + virtual void computeContour() = 0; + //@} //@{ //!@name Output methods //!@brief Return number of contour mesh facets generated. virtual axom::IndexType getContourCellCount() const = 0; +#if 0 /*! @brief Populate output mesh object with generated contour. @@ -325,9 +441,28 @@ class MarchingCubesSingleDomain virtual void populateContourMesh( axom::mint::UnstructuredMesh &mesh, const std::string &cellIdField) const = 0; +#endif //@} + void setOutputBuffers( + axom::ArrayView& facetNodeIds, + axom::ArrayView& facetNodeCoords, + axom::ArrayView& facetParentIds, + axom::IndexType facetIndexOffset) + { + m_facetNodeIds = facetNodeIds; + m_facetNodeCoords = facetNodeCoords; + m_facetParentIds = facetParentIds; + m_facetIndexOffset = facetIndexOffset; + } + virtual ~ImplBase() { } + + double m_contourVal = 0.0; + axom::ArrayView m_facetNodeIds; + axom::ArrayView m_facetNodeCoords; + axom::ArrayView m_facetParentIds; + axom::IndexType m_facetIndexOffset = -1; }; private: @@ -354,12 +489,14 @@ class MarchingCubesSingleDomain //!@brief Path to mask in m_dom. const std::string m_maskPath; + double m_contourVal = 0.0; + std::unique_ptr m_impl; /*! * \brief Set the blueprint single-domain mesh. * - * Some data from \a dom may be cached by the constructor. + * Some data from \a dom may be cached. */ void setDomain(const conduit::Node &dom); diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index cb0eb3cd1c..7f898cfa09 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -214,6 +214,15 @@ class MeshViewUtil //@{ //@name Setting up + //!@brief Default constructor doesn't set up the view utility. + MeshViewUtil() + : m_dom(nullptr) + , m_topology(nullptr) + , m_coordset(nullptr) + , m_cdom(nullptr) + , m_ctopology(nullptr) + , m_ccoordset(nullptr) + {} /*! @brief Construct view of a non-const domain. diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index 57ff2bb892..efdf52f77e 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -55,7 +55,6 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase @param dom Blueprint structured mesh domain @param topologyName Name of mesh topology (see blueprint mesh documentation) - @param fcnFieldName Name of nodal function is in dom @param maskFieldName Name of integer cell mask function is in dom Set up views to domain data and allocate other data to work on the @@ -66,22 +65,20 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase */ AXOM_HOST void initialize(const conduit::Node& dom, const std::string& topologyName, - const std::string& fcnFieldName, const std::string& maskFieldName = {}) override { SLIC_ASSERT(conduit::blueprint::mesh::topology::dims(dom.fetch_existing( axom::fmt::format("topologies/{}", topologyName))) == DIM); - clear(); + // clear(); - axom::quest::MeshViewUtil mvu(dom, topologyName); + m_mvu = axom::quest::MeshViewUtil(dom, topologyName); - m_bShape = mvu.getCellShape(); - m_coordsViews = mvu.getConstCoordsViews(false); - m_fcnView = mvu.template getConstFieldView(fcnFieldName, false); + m_bShape = m_mvu.getCellShape(); + m_coordsViews = m_mvu.getConstCoordsViews(false); if(!maskFieldName.empty()) { - m_maskView = mvu.template getConstFieldView(maskFieldName, false); + m_maskView = m_mvu.template getConstFieldView(maskFieldName, false); } /* @@ -93,26 +90,36 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_caseIds.fill(0); } - //!@brief Set a value to find the contour for. + /*! + @brief Set the scale field name + @param fcnFieldName Name of nodal function is in dom + */ + void setFunctionField(const std::string& fcnFieldName) override + { + m_fcnView = m_mvu.template getConstFieldView(fcnFieldName, false); + } + void setContourValue(double contourVal) override { m_contourVal = contourVal; } +#if 0 void computeContourMesh() override { markCrossings(); scanCrossings(); computeContour(); } +#endif /*! @brief Implementation of virtual markCrossings. Virtual methods cannot be templated, so this implementation - delegates to a name templated on DIM. + delegates to an implementation templated on DIM. */ - void markCrossings() { markCrossings_dim(); } + void markCrossings() override { markCrossings_dim(); } //!@brief Populate m_caseIds with crossing indices. template @@ -314,7 +321,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase sizeof(facetIncrs_back)); m_facetCount = firstFacetIds_back + facetIncrs_back; } - void scanCrossings() + void scanCrossings() override { #if defined(AXOM_USE_RAJA) #ifdef __INTEL_LLVM_COMPILER @@ -332,6 +339,10 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase // Initialize crossingFlags to 0 or 1, prefix-sum it, and count the // crossings. // + // All 1D array data alligns with m_caseId, which is column-major + // (the default for Array class), leading to *column-major* parent + // cell ids, regardless of the ordering of the input mesh data. + // axom::Array crossingFlags(parentCellCount); auto crossingFlagsView = crossingFlags.view(); @@ -391,6 +402,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_firstFacetIds.resize(m_crossingCount); } +#if 0 void old_computeContour() { // @@ -450,12 +462,60 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase axom::for_all(0, parentCellCount, gen_for_parent_cell); } - void computeContour() +#endif + void computeContour() override { - // - // Fill in surface mesh data. - // +#if 1 + const auto facetIncrsView = m_facetIncrs.view(); + const auto firstFacetIdsView = m_firstFacetIds.view(); + const auto crossingParentIdsView = m_crossingParentIds.view(); + const auto caseIdsView = m_caseIds.view(); + + // Internal contour mesh data to populate + axom::ArrayView facetNodeIdsView = m_facetNodeIds; + axom::ArrayView facetNodeCoordsView = m_facetNodeCoords; + axom::ArrayView facetParentIdsView = m_facetParentIds; + const axom::IndexType facetIndexOffset = m_facetIndexOffset; + + ComputeContour_Util ccu(m_contourVal, + m_caseIds.strides(), + m_fcnView, + m_coordsViews); + + auto gen_for_parent_cell = AXOM_LAMBDA(axom::IndexType crossingId) + { + auto parentCellId = crossingParentIdsView[crossingId]; + auto caseId = caseIdsView.flatIndex(parentCellId); + Point cornerCoords[CELL_CORNER_COUNT]; + double cornerValues[CELL_CORNER_COUNT]; + ccu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); + + auto additionalFacets = facetIncrsView[crossingId]; + auto firstFacetId = facetIndexOffset + firstFacetIdsView[crossingId]; + + for(axom::IndexType fId = 0; fId < additionalFacets; ++fId) + { + axom::IndexType newFacetId = firstFacetId + fId; + axom::IndexType firstCornerId = newFacetId * DIM; + + facetParentIdsView[newFacetId] = parentCellId; + + for(axom::IndexType d = 0; d < DIM; ++d) + { + axom::IndexType newCornerId = firstCornerId + d; + facetNodeIdsView[newFacetId][d] = newCornerId; + + int edge = cases_table(caseId, fId * DIM + d); + ccu.linear_interp(edge, + cornerCoords, + cornerValues, + &facetNodeCoordsView(newCornerId, 0)); + } + } + }; + axom::for_all(0, m_crossingCount, gen_for_parent_cell); +#else // Allocate space for surface mesh. const axom::IndexType cornersCount = DIM * m_facetCount; m_contourCellParents.resize(m_facetCount); @@ -508,6 +568,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase }; axom::for_all(0, m_crossingCount, gen_for_parent_cell); +#endif } /*! @@ -602,7 +663,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase int edgeIdx, const Point cornerCoords[4], const double nodeValues[4], - Point& crossingPt) const + double* /* Point& */ crossingPt) const { // STEP 0: get the edge node indices // 2 nodes define the edge. n1 and n2 are the indices of @@ -623,13 +684,13 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase if(axom::utilities::isNearlyEqual(contourVal, f1) || axom::utilities::isNearlyEqual(f1, f2)) { - crossingPt = p1; + crossingPt[0] = p1[0]; crossingPt[1] = p1[1]; // crossingPt = p1; return; } if(axom::utilities::isNearlyEqual(contourVal, f2)) { - crossingPt = p2; + crossingPt[0] = p2[0]; crossingPt[1] = p2[1]; // crossingPt = p2; return; } @@ -649,7 +710,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase int edgeIdx, const Point cornerCoords[8], const double nodeValues[8], - Point& crossingPt) const + double* /* Point& */ crossingPt) const { // STEP 0: get the edge node indices // 2 nodes define the edge. n1 and n2 are the indices of @@ -676,13 +737,13 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase if(axom::utilities::isNearlyEqual(contourVal, f1) || axom::utilities::isNearlyEqual(f1, f2)) { - crossingPt = p1; + crossingPt[0] = p1[0]; crossingPt[1] = p1[1]; crossingPt[2] = p1[2]; // crossingPt = p1; return; } if(axom::utilities::isNearlyEqual(contourVal, f2)) { - crossingPt = p2; + crossingPt[0] = p2[0]; crossingPt[1] = p2[1]; crossingPt[2] = p2[2]; // crossingPt = p2; return; } @@ -745,6 +806,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase return cases3D[iCase][iEdge]; } +#if 0 /*! @brief Output contour mesh to a mint::UnstructuredMesh object. */ @@ -843,6 +905,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase } } } +#endif //!@brief Compute the case index into cases2D or cases3D. AXOM_HOST_DEVICE inline int compute_crossing_case(const double* f) const @@ -859,6 +922,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase return index; } +#if 0 //!@brief Clear data so you can rerun with a different contour value. void clear() { @@ -868,17 +932,21 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_crossingCount = 0; m_facetCount = 0; } +#endif /*! @brief Constructor. */ MarchingCubesFullParallel() +#if 0 : m_contourNodeCoords(0, 0) , m_contourCellCorners(0, 0) , m_contourCellParents(0, 0) +#endif { } private: + axom::quest::MeshViewUtil m_mvu; MIdx m_bShape; //!< @brief Blueprint cell data shape. // Views of parent domain data. @@ -911,6 +979,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase //!@brief Number of corners (nodes) on each parent cell. static constexpr std::uint8_t CELL_CORNER_COUNT = (DIM == 3) ? 8 : 4; +#if 0 //!@name Internal representation of generated contour mesh. //@{ //!@brief Coordinates of generated surface mesh nodes. @@ -922,10 +991,15 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase //!@brief Flat index of computational cell crossing the contour cell. axom::Array m_contourCellParents; //@} +#endif double m_contourVal = 0.0; }; +/*! + @brief Allocate a MarchingCubesFullParallel object, template-specialized + for caller-specified runtime policy and physical dimension. +*/ static std::unique_ptr newMarchingCubesFullParallel(MarchingCubes::RuntimePolicy runtimePolicy, int dim) { diff --git a/src/axom/quest/detail/MarchingCubesHybridParallel.hpp b/src/axom/quest/detail/MarchingCubesHybridParallel.hpp index 8515c39c14..3ab2a97d91 100644 --- a/src/axom/quest/detail/MarchingCubesHybridParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesHybridParallel.hpp @@ -76,22 +76,20 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase */ AXOM_HOST void initialize(const conduit::Node& dom, const std::string& topologyName, - const std::string& fcnFieldName, const std::string& maskFieldName = {}) override { SLIC_ASSERT(conduit::blueprint::mesh::topology::dims(dom.fetch_existing( axom::fmt::format("topologies/{}", topologyName))) == DIM); - clear(); + // clear(); - axom::quest::MeshViewUtil mvu(dom, topologyName); + m_mvu = axom::quest::MeshViewUtil(dom, topologyName); - m_bShape = mvu.getCellShape(); - m_coordsViews = mvu.getConstCoordsViews(false); - m_fcnView = mvu.template getConstFieldView(fcnFieldName, false); + m_bShape = m_mvu.getCellShape(); + m_coordsViews = m_mvu.getConstCoordsViews(false); if(!maskFieldName.empty()) { - m_maskView = mvu.template getConstFieldView(maskFieldName, false); + m_maskView = m_mvu.template getConstFieldView(maskFieldName, false); } /* @@ -103,18 +101,28 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase m_caseIds.fill(0); } - //!@brief Set a value to find the contour for. + /*! + @brief Set the scale field name + @param fcnFieldName Name of nodal function is in dom + */ + void setFunctionField(const std::string& fcnFieldName) override + { + m_fcnView = m_mvu.template getConstFieldView(fcnFieldName, false); + } + void setContourValue(double contourVal) override { m_contourVal = contourVal; } +#if 0 void computeContourMesh() override { markCrossings(); scanCrossings(); computeContour(); } +#endif /*! @brief Implementation of virtual markCrossings. @@ -122,7 +130,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase Virtual methods cannot be templated, so this implementation delegates to a name templated on DIM. */ - void markCrossings() { markCrossings_dim(); } + void markCrossings() override { markCrossings_dim(); } //!@brief Populate m_caseIds with crossing indices. template @@ -267,7 +275,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase We sum up the number of contour surface cells from the crossings, allocate space, then populate it. */ - void scanCrossings() + void scanCrossings() override { const axom::IndexType parentCellCount = m_caseIds.size(); auto caseIdsView = m_caseIds.view(); @@ -578,8 +586,60 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase } }; // ComputeContour_Util - void computeContour() + void computeContour() override { +#if 1 + auto crossingsView = m_crossings.view(); + + // Internal contour mesh data to populate + axom::ArrayView facetNodeIdsView = m_facetNodeIds; + axom::ArrayView facetNodeCoordsView = m_facetNodeCoords; + axom::ArrayView facetParentIdsView = m_facetParentIds; + const axom::IndexType facetIndexOffset = m_facetIndexOffset; + + ComputeContour_Util ccu(m_contourVal, + m_caseIds.strides(), + m_fcnView, + m_coordsViews); + + auto loopBody = AXOM_LAMBDA(axom::IndexType iCrossing) + { + const auto& crossingInfo = crossingsView[iCrossing]; + const IndexType crossingCellCount = num_contour_cells(crossingInfo.caseNum); + SLIC_ASSERT(crossingCellCount > 0); + + // Parent cell data for interpolating new node coordinates. + Point cornerCoords[CELL_CORNER_COUNT]; + double cornerValues[CELL_CORNER_COUNT]; + ccu.get_corner_coords_and_values(crossingInfo.parentCellNum, + cornerCoords, + cornerValues); + + /* + Create the new cell and its DIM nodes. New nodes are on + parent cell edges where the edge intersects the isocontour. + linear_interp for the exact coordinates. + */ + for(int iCell = 0; iCell < crossingCellCount; ++iCell) + { + IndexType newFacetId = facetIndexOffset + crossingInfo.firstSurfaceCellId + iCell; + facetParentIdsView[newFacetId] = crossingInfo.parentCellNum; + for(int d = 0; d < DIM; ++d) + { + IndexType newNodeId = newFacetId * DIM + d; + axom::StackArray idx{newFacetId, d}; + facetNodeIdsView[idx] = newNodeId; + + const int edge = cases_table(crossingInfo.caseNum, iCell * DIM + d); + ccu.linear_interp(edge, + cornerCoords, + cornerValues, + facetNodeCoordsView[newNodeId]); + } + } + }; + axom::for_all(0, m_crossingCount, loopBody); +#else auto crossingsView = m_crossings.view(); /* @@ -587,13 +647,13 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase reallocation. */ const axom::IndexType contourNodeCount = DIM * m_contourCellCount; - m_contourNodeCoords.resize(contourNodeCount); - m_contourCellCorners.resize(m_contourCellCount); - m_contourCellParents.resize(m_contourCellCount); + m_facetNodeCoords.resize(contourNodeCount); + m_facetNodeIds.resize(m_contourCellCount); + m_facetParentIds.resize(m_contourCellCount); - auto nodeCoordsView = m_contourNodeCoords.view(); - auto cellCornersView = m_contourCellCorners.view(); - auto cellParentsView = m_contourCellParents.view(); + auto nodeCoordsView = m_facetNodeCoords.view(); + auto cellCornersView = m_facetNodeIds.view(); + auto cellParentsView = m_facetParentIds.view(); ComputeContour_Util ccu(m_contourVal, m_caseIds.strides(), @@ -640,6 +700,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase } }; axom::for_all(0, m_crossingCount, loopBody); +#endif } // These 4 functions provide access to the look-up table @@ -690,6 +751,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase return cases3D[iCase][iEdge]; } +#if 0 /*! @brief Output contour mesh to a mint::UnstructuredMesh object. */ @@ -708,27 +770,27 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase { populateContourMesh(mesh, cellIdField, - m_contourNodeCoords, - m_contourCellCorners, - m_contourCellParents); + m_facetNodeCoords, + m_facetNodeIds, + m_facetParentIds); } else { - axom::Array contourNodeCoords( - m_contourNodeCoords, + axom::Array facetNodeCoords( + m_facetNodeCoords, hostAllocatorID); - axom::Array contourCellCorners( - m_contourCellCorners, + axom::Array facetNodeIds( + m_facetNodeIds, hostAllocatorID); - axom::Array contourCellParents( - m_contourCellParents, + axom::Array facetParentIds( + m_facetParentIds, hostAllocatorID); populateContourMesh(mesh, cellIdField, - contourNodeCoords, - contourCellCorners, - contourCellParents); + facetNodeCoords, + facetNodeIds, + facetParentIds); } } @@ -736,10 +798,11 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase void populateContourMesh( axom::mint::UnstructuredMesh& mesh, const std::string& cellIdField, - const axom::Array contourNodeCoords, - const axom::Array contourCellCorners, - const axom::Array contourCellParents) const + const axom::Array facetNodeCoords, + const axom::Array facetNodeIds, + const axom::Array facetParentIds) const { + // AXOM_PERF_MARK_FUNCTION("MarchingCubesHybridParallel::populateContourMesh"); if(!cellIdField.empty() && !mesh.hasField(cellIdField, axom::mint::CELL_CENTERED)) { @@ -748,8 +811,8 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase DIM); } - const axom::IndexType addedCellCount = contourCellCorners.size(); - const axom::IndexType addedNodeCount = contourNodeCoords.size(); + const axom::IndexType addedCellCount = facetNodeIds.size(); + const axom::IndexType addedNodeCount = facetNodeCoords.size(); if(addedCellCount != 0) { const axom::IndexType priorCellCount = mesh.getNumberOfCells(); @@ -757,11 +820,11 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase mesh.reserveNodes(priorNodeCount + addedNodeCount); mesh.reserveCells(priorCellCount + addedCellCount); - mesh.appendNodes((double*)contourNodeCoords.data(), - contourNodeCoords.size()); + mesh.appendNodes((double*)facetNodeCoords.data(), + facetNodeCoords.size()); for(int n = 0; n < addedCellCount; ++n) { - MIdx cornerIds = contourCellCorners[n]; + MIdx cornerIds = facetNodeIds[n]; // Bump corner indices by priorNodeCount to avoid indices // used by other parents domains. for(int d = 0; d < DIM; ++d) @@ -782,10 +845,11 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase axom::ArrayIndexer si(m_caseIds.shape(), 'c'); for(axom::IndexType i = 0; i < addedCellCount; ++i) { - cellIdView[priorCellCount + i] = si.toMultiIndex(contourCellParents[i]); + cellIdView[priorCellCount + i] = si.toMultiIndex(facetParentIds[i]); } } } +#endif //!@brief Compute the case index into cases2D or cases3D. AXOM_HOST_DEVICE inline int compute_crossing_case(const double* f) const @@ -802,24 +866,23 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase return index; } +#if 0 //!@brief Clear data so you can rerun with a different contour value. void clear() { - m_contourNodeCoords.clear(); - m_contourCellCorners.clear(); - m_contourCellParents.clear(); + m_facetNodeCoords.clear(); + m_facetNodeIds.clear(); + m_facetParentIds.clear(); m_crossingCount = 0; m_contourCellCount = 0; } +#endif /*! @brief Constructor. */ MarchingCubesHybridParallel() : m_crossings(0, 0) - , m_contourNodeCoords(0, 0) - , m_contourCellCorners(0, 0) - , m_contourCellParents(0, 0) { } /*! @@ -839,6 +902,7 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase }; private: + axom::quest::MeshViewUtil m_mvu; MIdx m_bShape; //!< @brief Blueprint cell data shape. // Views of parent domain data. @@ -868,21 +932,13 @@ class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase //!@brief Number of corners (nodes) on each parent cell. static constexpr std::uint8_t CELL_CORNER_COUNT = (DIM == 3) ? 8 : 4; - //!@name Internal representation of generated contour mesh. - //@{ - //!@brief Coordinates of generated surface mesh nodes. - axom::Array m_contourNodeCoords; - - //!@brief Corners (index into m_contourNodeCoords) of generated contour cells. - axom::Array m_contourCellCorners; - - //!@brief Flat index of computational cell crossing the contour cell. - axom::Array m_contourCellParents; - //@} - double m_contourVal = 0.0; }; +/*! + @brief Allocate a MarchingCubesHybridParallel object, template-specialized + for caller-specified runtime policy and physical dimension. +*/ static std::unique_ptr newMarchingCubesHybridParallel(MarchingCubes::RuntimePolicy runtimePolicy, int dim) { diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 90517f296d..e489adc8d8 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -840,7 +840,7 @@ struct ContourTestBase extractTimer.start(); mc.populateContourMesh(contourMesh, m_parentCellIdField, m_domainIdField); extractTimer.stop(); - // printTimingStats(extractTimer, name() + " extract"); + printTimingStats(extractTimer, name() + " extract"); int localErrCount = 0; if(params.checkResults) @@ -1076,6 +1076,23 @@ struct ContourTestBase return view; } + axom::ArrayView get_parent_cell_id_view( + axom::mint::UnstructuredMesh& contourMesh) const + { + axom::IndexType numIdxComponents = -1; + axom::IndexType* ptr = + contourMesh.getFieldPtr(m_parentCellIdField, + axom::mint::CELL_CENTERED, + numIdxComponents); + + SLIC_ASSERT(numIdxComponents == 1); + + axom::ArrayView view( + (axom::IndexType*)ptr, + contourMesh.getNumberOfCells()); + return view; + } + /** Check that generated cells fall within their parents. */ @@ -1086,7 +1103,7 @@ struct ContourTestBase int errCount = 0; const axom::IndexType cellCount = contourMesh.getNumberOfCells(); - auto parentCellIdxView = get_parent_cell_idx_view(contourMesh); + auto parentCellIdView = get_parent_cell_id_view(contourMesh); auto domainIdView = getDomainIdView(contourMesh); const axom::IndexType domainCount = computationalMesh.domainCount(); @@ -1111,6 +1128,14 @@ struct ContourTestBase domainIdToContiguousId[domainId] = n; } + axom::Array> indexers(domainCount); + for(int d=0; d domShape; + computationalMesh.domainLengths(d, domShape); + indexers[d].initialize(domShape, 'c'); + } + for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; ++contourCellNum) { @@ -1119,8 +1144,10 @@ struct ContourTestBase typename axom::quest::MeshViewUtil::ConstCoordsViewsType& coordsViews = allCoordsViews[contiguousIndex]; + axom::IndexType parentCellId = parentCellIdView[contourCellNum]; + axom::StackArray parentCellIdx = - parentCellIdxView[contourCellNum]; + indexers[contiguousIndex].toMultiIndex(parentCellId); axom::StackArray upperIdx = parentCellIdx; addToStackArray(upperIdx, 1); @@ -1175,7 +1202,7 @@ struct ContourTestBase int errCount = 0; const axom::IndexType cellCount = contourMesh.getNumberOfCells(); - auto parentCellIdxView = get_parent_cell_idx_view(contourMesh); + auto parentCellIdView = get_parent_cell_id_view(contourMesh); auto domainIdView = getDomainIdView(contourMesh); const axom::IndexType domainCount = computationalMesh.domainCount(); @@ -1187,17 +1214,16 @@ struct ContourTestBase */ axom::Array> fcnViews( domainCount); - axom::Array> hasContours(domainCount); + axom::Array> hasContours(domainCount); for(axom::IndexType domId = 0; domId < domainCount; ++domId) { const auto& dom = computationalMesh.domain(domId); axom::quest::MeshViewUtil mvu(dom, "mesh"); - const axom::StackArray domLengths = - mvu.getRealExtents("element"); + const axom::IndexType cellCount = mvu.getCellCount(); - axom::Array& hasContour = hasContours[domId]; - hasContour.resize(domLengths, false); + axom::Array& hasContour = hasContours[domId]; + hasContour.resize(cellCount, false); fcnViews[domId] = mvu.template getConstFieldView(functionName(), false); @@ -1220,9 +1246,8 @@ struct ContourTestBase { axom::IndexType domainId = domainIdView[contourCellNum]; axom::IndexType contiguousId = domainIdToContiguousId[domainId]; - const axom::StackArray& parentCellIdx = - parentCellIdxView[contourCellNum]; - hasContours[contiguousId][parentCellIdx] = true; + const axom::IndexType parentCellId = parentCellIdView[contourCellNum]; + hasContours[contiguousId][parentCellId] = true; } // Verify that cells marked by hasContours touches the contour @@ -1238,12 +1263,12 @@ struct ContourTestBase const auto& fcnView = fcnViews[domId]; - axom::ArrayIndexer rowMajor(domLengths, 'r'); + axom::ArrayIndexer colMajor(domLengths, 'c'); const axom::IndexType cellCount = product(domLengths); for(axom::IndexType cellId = 0; cellId < cellCount; ++cellId) { axom::StackArray cellIdx = - rowMajor.toMultiIndex(cellId); + colMajor.toMultiIndex(cellId); // Compute min and max function value in the cell. double minFcnValue = std::numeric_limits::max(); @@ -1272,7 +1297,7 @@ struct ContourTestBase { const bool touchesContour = (minFcnValue <= params.contourVal && maxFcnValue >= params.contourVal); - const bool hasCont = hasContours[domId][cellIdx]; + const bool hasCont = hasContours[domId][cellId]; if(touchesContour != hasCont) { ++errCount; diff --git a/src/axom/quest/tests/quest_array_indexer.cpp b/src/axom/quest/tests/quest_array_indexer.cpp index 01bc68fc1d..4a56846436 100644 --- a/src/axom/quest/tests/quest_array_indexer.cpp +++ b/src/axom/quest/tests/quest_array_indexer.cpp @@ -20,6 +20,7 @@ TEST(quest_array_indexer, quest_strides_and_permutatations) axom::StackArray lengths {2}; axom::ArrayIndexer colIndexer(lengths, 'c'); + EXPECT_EQ(colIndexer.getOrder(), 'c' | 'r'); axom::StackArray colSlowestDirs {0}; axom::StackArray colStrides {1}; for(int d = 0; d < DIM; ++d) @@ -29,6 +30,7 @@ TEST(quest_array_indexer, quest_strides_and_permutatations) } axom::ArrayIndexer rowIndexer(lengths, 'r'); + EXPECT_EQ(rowIndexer.getOrder(), 'c' | 'r'); axom::StackArray rowSlowestDirs {0}; axom::StackArray rowStrides {1}; for(int d = 0; d < DIM; ++d) @@ -43,6 +45,7 @@ TEST(quest_array_indexer, quest_strides_and_permutatations) axom::StackArray lengths {3, 2}; axom::ArrayIndexer colIndexer(lengths, 'c'); + EXPECT_EQ(colIndexer.getOrder(), 'c'); axom::StackArray colSlowestDirs {0, 1}; axom::StackArray colStrides {2, 1}; for(int d = 0; d < DIM; ++d) @@ -52,6 +55,7 @@ TEST(quest_array_indexer, quest_strides_and_permutatations) } axom::ArrayIndexer rowIndexer(lengths, 'r'); + EXPECT_EQ(rowIndexer.getOrder(), 'r'); axom::StackArray rowSlowestDirs {1, 0}; axom::StackArray rowStrides {1, 3}; for(int d = 0; d < DIM; ++d) @@ -66,6 +70,7 @@ TEST(quest_array_indexer, quest_strides_and_permutatations) axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer colIndexer(lengths, 'c'); + EXPECT_EQ(colIndexer.getOrder(), 'c'); axom::StackArray colSlowestDirs {0, 1, 2}; axom::StackArray colStrides {6, 2, 1}; for(int d = 0; d < DIM; ++d) @@ -75,6 +80,7 @@ TEST(quest_array_indexer, quest_strides_and_permutatations) } axom::ArrayIndexer rowIndexer(lengths, 'r'); + EXPECT_EQ(rowIndexer.getOrder(), 'r'); axom::StackArray rowSlowestDirs {2, 1, 0}; axom::StackArray rowStrides {1, 5, 15}; for(int d = 0; d < DIM; ++d) @@ -93,6 +99,7 @@ TEST(quest_array_indexer, quest_col_major_offset) constexpr int DIM = 1; axom::StackArray lengths {3}; axom::ArrayIndexer ai(lengths, 'c'); + EXPECT_EQ(ai.getOrder(), 'c' | 'r'); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -107,6 +114,7 @@ TEST(quest_array_indexer, quest_col_major_offset) constexpr int DIM = 2; axom::StackArray lengths {3, 2}; axom::ArrayIndexer ai(lengths, 'c'); + EXPECT_EQ(ai.getOrder(), 'c'); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -123,6 +131,7 @@ TEST(quest_array_indexer, quest_col_major_offset) // 3D axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer ai(lengths, 'c'); + EXPECT_EQ(ai.getOrder(), 'c'); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -148,6 +157,7 @@ TEST(quest_array_indexer, quest_row_major_offset) constexpr int DIM = 1; axom::StackArray lengths {3}; axom::ArrayIndexer ai(lengths, 'r'); + EXPECT_EQ(ai.getOrder(), 'r' | 'c'); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -162,6 +172,7 @@ TEST(quest_array_indexer, quest_row_major_offset) constexpr int DIM = 2; axom::StackArray lengths {3, 2}; axom::ArrayIndexer ai(lengths, 'r'); + EXPECT_EQ(ai.getOrder(), 'r'); axom::IndexType offset = 0; for(int j = 0; j < lengths[1]; ++j) { @@ -179,6 +190,7 @@ TEST(quest_array_indexer, quest_row_major_offset) constexpr int DIM = 3; axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer ai(lengths, 'r'); + EXPECT_EQ(ai.getOrder(), 'r'); axom::IndexType offset = 0; for(int k = 0; k < lengths[2]; ++k) { @@ -385,7 +397,7 @@ TEST(quest_array_indexer, quest_array_match) { for(axom::IndexType j = 0; j < lengths[1]; ++j) { - for(axom::IndexType k = 0; j < lengths[2]; ++j) + for(axom::IndexType k = 0; k < lengths[2]; ++k) { axom::StackArray indices {i, j, k}; EXPECT_EQ(&a(i, j, k), &a.flatIndex(ai.toFlatIndex(indices))); From d27a52daf25994a9e9a772721df2297d61d91161 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 25 Jan 2024 14:24:40 -0800 Subject: [PATCH 404/639] Remove code that has been superceded. --- src/axom/quest/MarchingCubes.cpp | 70 ---- src/axom/quest/MarchingCubes.hpp | 40 --- .../detail/MarchingCubesFullParallel.hpp | 337 +----------------- 3 files changed, 7 insertions(+), 440 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index adc929b120..55294bc630 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -60,7 +60,6 @@ void MarchingCubes::setFunctionField(const std::string& fcnField) void MarchingCubes::computeIsocontour(double contourVal) { -#if 1 // Mark and scan domains while adding up their // facet counts to get the total facet counts. m_facetIndexOffsets.resize(m_singles.size()); @@ -93,17 +92,6 @@ void MarchingCubes::computeIsocontour(double contourVal) { m_singles[d]->computeContour(); } -#else - SLIC_ASSERT_MSG(!m_fcnFieldName.empty(), - "You must call setFunctionField before computeIsocontour."); - - for(int dId = 0; dId < m_singles.size(); ++dId) - { - std::unique_ptr& single = m_singles[dId]; - single->setDataParallelism(m_dataParallelism); - single->computeIsocontour(contourVal); - } -#endif } axom::IndexType MarchingCubes::getContourCellCount() const @@ -150,7 +138,6 @@ void MarchingCubes::populateContourMesh( mesh.reserveCells(contourCellCount); mesh.reserveNodes(contourNodeCount); -#if 1 if (m_facetCount) { mesh.appendCells(m_facetNodeIds.data(), m_facetCount); mesh.appendNodes(m_facetNodeCoords.data(), mesh.getDimension()*m_facetCount); @@ -176,33 +163,6 @@ void MarchingCubes::populateContourMesh( m_singles[d]->getDomainId(d)); } } -#else - // Populate mesh from single domains and add domain id if requested. - for(int dId = 0; dId < m_singles.size(); ++dId) - { - std::unique_ptr& single = m_singles[dId]; - - auto nPrev = mesh.getNumberOfCells(); - single->populateContourMesh(mesh, cellIdField); - auto nNew = mesh.getNumberOfCells(); - - if(nNew > nPrev && !domainIdField.empty()) - { - auto* domainIdPtr = - mesh.getFieldPtr(domainIdField, - axom::mint::CELL_CENTERED); - - int userDomainId = single->getDomainId(dId); - - axom::detail::ArrayOps::fill( - domainIdPtr, - nPrev, - nNew - nPrev, - execution_space::allocatorID(), - userDomainId); - } - } -#endif SLIC_ASSERT(mesh.getNumberOfNodes() == contourNodeCount); SLIC_ASSERT(mesh.getNumberOfCells() == contourCellCount); } @@ -337,35 +297,5 @@ int MarchingCubesSingleDomain::getDomainId(int defaultId) const return rval; } -#if 0 -void MarchingCubesSingleDomain::computeIsocontour(double contourVal) -{ - SLIC_ASSERT_MSG(!m_fcnFieldName.empty(), - "You must call setFunctionField before computeIsocontour."); - - // We have 2 implementations. MarchingCubesHybridParallel is faster on the host - // and MarchingCubesFullParallel is faster on GPUs. Both work in all cases. - // We can choose based on runtime policy or by user choice - if(m_dataParallelism == - axom::quest::MarchingCubesDataParallelism::hybridParallel || - (m_dataParallelism == axom::quest::MarchingCubesDataParallelism::byPolicy && - m_runtimePolicy == RuntimePolicy::seq)) - { - m_impl = axom::quest::detail::marching_cubes::newMarchingCubesHybridParallel( - m_runtimePolicy, - m_ndim); - } - else - { - m_impl = axom::quest::detail::marching_cubes::newMarchingCubesFullParallel( - m_runtimePolicy, - m_ndim); - } - m_impl->initialize(*m_dom, m_topologyName, m_fcnFieldName, m_maskFieldName); - m_impl->setContourValue(contourVal); - m_impl->computeContourMesh(); -} -#endif - } // end namespace quest } // end namespace axom diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 5e9efd2889..21ac900dec 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -346,18 +346,6 @@ class MarchingCubesSingleDomain */ int getDomainId(int defaultId) const; -#if 0 - /*! - * \brief Compute the isocontour. - * - * \param [in] contourVal isocontour value - * - * Compute isocontour using the marching cubes algorithm. - */ - void computeIsocontour(double contourVal = 0.0); -#endif - - //!@brief Get number of cells in the generated contour mesh. axom::IndexType getContourCellCount() const { @@ -374,23 +362,6 @@ class MarchingCubesSingleDomain return m_ndim * getContourCellCount(); } -#if 0 - /*! - @brief Put generated contour surface in a mint::UnstructuredMesh - object. - - @param mesh Output mesh - @param cellIdField Name of field to store the prent cell ids. - If omitted, the data is not copied. - */ - void populateContourMesh( - axom::mint::UnstructuredMesh &mesh, - const std::string &cellIdField = {}) const - { - m_impl->populateContourMesh(mesh, cellIdField); - } -#endif - /*! @brief Base class for implementations templated on dimension DIM and execution space ExecSpace. @@ -431,17 +402,6 @@ class MarchingCubesSingleDomain //!@name Output methods //!@brief Return number of contour mesh facets generated. virtual axom::IndexType getContourCellCount() const = 0; -#if 0 - /*! - @brief Populate output mesh object with generated contour. - - Note: Output format is in flux. We will likely output - a blueprint object in the future. - */ - virtual void populateContourMesh( - axom::mint::UnstructuredMesh &mesh, - const std::string &cellIdField) const = 0; -#endif //@} void setOutputBuffers( diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index efdf52f77e..96c57f50d8 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -13,7 +13,6 @@ #include "axom/core/execution/execution_space.hpp" #include "axom/quest/ArrayIndexer.hpp" -#include "axom/quest/detail/marching_cubes_lookup.hpp" #include "axom/quest/MeshViewUtil.hpp" #include "axom/primal/geometry/Point.hpp" #include "axom/primal/constants.hpp" @@ -104,15 +103,6 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_contourVal = contourVal; } -#if 0 - void computeContourMesh() override - { - markCrossings(); - scanCrossings(); - computeContour(); - } -#endif - /*! @brief Implementation of virtual markCrossings. @@ -256,71 +246,6 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase } } }; // MarkCrossings_Util - - /*! - @brief Populate the 1D m_contourNodeCoords, m_contourCellCorners - and m_contourCellParents arrays that defines the unstructured - contour mesh. - */ - void old_scanCrossings() - { - const axom::IndexType parentCellCount = m_caseIds.size(); - auto caseIdsView = m_caseIds.view(); - - // Compute number of surface facets added by each parent cell. - m_facetIncrs.resize(parentCellCount); - const auto facetIncrsView = m_facetIncrs.view(); - - axom::for_all( - 0, - parentCellCount, - AXOM_LAMBDA(axom::IndexType parentCellId) { - facetIncrsView.flatIndex(parentCellId) = - num_contour_cells(caseIdsView.flatIndex(parentCellId)); - }); - - // Compute index of first facet added by each parent cell - // (whether the cell generates any facet!). - m_firstFacetIds.resize(parentCellCount); - const axom::ArrayView firstFacetIdsView = - m_firstFacetIds.view(); -#if defined(AXOM_USE_RAJA) - #ifdef __INTEL_LLVM_COMPILER - // Intel oneAPI compiler segfaults with OpenMP RAJA scan - using ScanPolicy = - typename axom::execution_space::loop_policy; - #else - using ScanPolicy = typename axom::execution_space::loop_policy; - #endif - - RAJA::exclusive_scan( - RAJA::make_span(facetIncrsView.data(), parentCellCount), - RAJA::make_span(firstFacetIdsView.data(), parentCellCount), - RAJA::operators::plus {}); - - // m_facetIncrs and m_firstFacetIds, combined with m_caseIds, - // are all we need to compute the surface mesh. -#else - firstFacetIdsView[0] = 0; - for(axom::IndexType pcId = 1; pcId < parentCellCount; ++pcId) - { - firstFacetIdsView[pcId] = - firstFacetIdsView[pcId - 1] + facetIncrsView[pcId - 1]; - } -#endif - - // Use last facet info to compute number of facets in domain. - // In case data is on device, copy to host before computing. - axom::IndexType firstFacetIds_back = 0; - FacetIdType facetIncrs_back = 0; - axom::copy(&firstFacetIds_back, - m_firstFacetIds.data() + m_firstFacetIds.size() - 1, - sizeof(firstFacetIds_back)); - axom::copy(&facetIncrs_back, - m_facetIncrs.data() + m_facetIncrs.size() - 1, - sizeof(facetIncrs_back)); - m_facetCount = firstFacetIds_back + facetIncrs_back; - } void scanCrossings() override { #if defined(AXOM_USE_RAJA) @@ -402,70 +327,8 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_firstFacetIds.resize(m_crossingCount); } -#if 0 - void old_computeContour() - { - // - // Fill in surface mesh data. - // - - // Allocate space for surface mesh. - const axom::IndexType cornersCount = DIM * m_facetCount; - m_contourCellParents.resize(m_facetCount); - m_contourCellCorners.resize(m_facetCount); - m_contourNodeCoords.resize(cornersCount); - - const axom::IndexType parentCellCount = m_caseIds.size(); - const auto facetIncrsView = m_facetIncrs.view(); - const auto firstFacetIdsView = m_firstFacetIds.view(); - const auto caseIdsView = m_caseIds.view(); - - auto contourCellParentsView = m_contourCellParents.view(); - auto contourCellCornersView = m_contourCellCorners.view(); - auto contourNodeCoordsView = m_contourNodeCoords.view(); - - ComputeContour_Util ccu(m_contourVal, - m_caseIds.strides(), - m_fcnView, - m_coordsViews); - auto gen_for_parent_cell = AXOM_LAMBDA(axom::IndexType parentCellId) - { - Point cornerCoords[CELL_CORNER_COUNT]; - double cornerValues[CELL_CORNER_COUNT]; - ccu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); - - auto additionalFacets = facetIncrsView[parentCellId]; - auto firstFacetId = firstFacetIdsView[parentCellId]; - - auto caseId = caseIdsView.flatIndex(parentCellId); - - for(axom::IndexType fId = 0; fId < additionalFacets; ++fId) - { - axom::IndexType newFacetId = firstFacetId + fId; - axom::IndexType firstCornerId = newFacetId * DIM; - - contourCellParentsView[newFacetId] = parentCellId; - - for(axom::IndexType d = 0; d < DIM; ++d) - { - axom::IndexType newCornerId = firstCornerId + d; - contourCellCornersView[newFacetId][d] = newCornerId; - - int edge = cases_table(caseId, fId * DIM + d); - ccu.linear_interp(edge, - cornerCoords, - cornerValues, - contourNodeCoordsView[newCornerId]); - } - } - }; - - axom::for_all(0, parentCellCount, gen_for_parent_cell); - } -#endif void computeContour() override { -#if 1 const auto facetIncrsView = m_facetIncrs.view(); const auto firstFacetIdsView = m_firstFacetIds.view(); const auto crossingParentIdsView = m_crossingParentIds.view(); @@ -515,60 +378,6 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase }; axom::for_all(0, m_crossingCount, gen_for_parent_cell); -#else - // Allocate space for surface mesh. - const axom::IndexType cornersCount = DIM * m_facetCount; - m_contourCellParents.resize(m_facetCount); - m_contourCellCorners.resize(m_facetCount); - m_contourNodeCoords.resize(cornersCount); - - const auto facetIncrsView = m_facetIncrs.view(); - const auto firstFacetIdsView = m_firstFacetIds.view(); - const auto crossingParentIdsView = m_crossingParentIds.view(); - const auto caseIdsView = m_caseIds.view(); - - auto contourCellParentsView = m_contourCellParents.view(); - auto contourCellCornersView = m_contourCellCorners.view(); - auto contourNodeCoordsView = m_contourNodeCoords.view(); - - ComputeContour_Util ccu(m_contourVal, - m_caseIds.strides(), - m_fcnView, - m_coordsViews); - auto gen_for_parent_cell = AXOM_LAMBDA(axom::IndexType crossingId) - { - auto parentCellId = crossingParentIdsView[crossingId]; - auto caseId = caseIdsView.flatIndex(parentCellId); - Point cornerCoords[CELL_CORNER_COUNT]; - double cornerValues[CELL_CORNER_COUNT]; - ccu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); - - auto additionalFacets = facetIncrsView[crossingId]; - auto firstFacetId = firstFacetIdsView[crossingId]; - - for(axom::IndexType fId = 0; fId < additionalFacets; ++fId) - { - axom::IndexType newFacetId = firstFacetId + fId; - axom::IndexType firstCornerId = newFacetId * DIM; - - contourCellParentsView[newFacetId] = parentCellId; - - for(axom::IndexType d = 0; d < DIM; ++d) - { - axom::IndexType newCornerId = firstCornerId + d; - contourCellCornersView[newFacetId][d] = newCornerId; - - int edge = cases_table(caseId, fId * DIM + d); - ccu.linear_interp(edge, - cornerCoords, - cornerValues, - contourNodeCoordsView[newCornerId]); - } - } - }; - - axom::for_all(0, m_crossingCount, gen_for_parent_cell); -#endif } /*! @@ -806,107 +615,6 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase return cases3D[iCase][iEdge]; } -#if 0 - /*! - @brief Output contour mesh to a mint::UnstructuredMesh object. - */ - void populateContourMesh( - axom::mint::UnstructuredMesh& mesh, - const std::string& cellIdField) const override - { - auto internalAllocatorID = axom::execution_space::allocatorID(); - auto hostAllocatorID = axom::execution_space::allocatorID(); - - /* - mint uses host memory. If internal memory is on the host, use - it. Otherwise, make a temporary copy of it on the host. - */ - if(internalAllocatorID == hostAllocatorID) - { - populateContourMesh(mesh, - cellIdField, - m_contourNodeCoords, - m_contourCellCorners, - m_contourCellParents); - } - else - { - axom::Array contourNodeCoords( - m_contourNodeCoords, - hostAllocatorID); - axom::Array contourCellCorners( - m_contourCellCorners, - hostAllocatorID); - axom::Array contourCellParents( - m_contourCellParents, - hostAllocatorID); - - populateContourMesh(mesh, - cellIdField, - contourNodeCoords, - contourCellCorners, - contourCellParents); - } - } - - //!@brief Output contour mesh to a mint::UnstructuredMesh object. - void populateContourMesh( - axom::mint::UnstructuredMesh& mesh, - const std::string& cellIdField, - const axom::Array contourNodeCoords, - const axom::Array contourCellCorners, - const axom::Array contourCellParents) const - { - if(!cellIdField.empty() && - !mesh.hasField(cellIdField, axom::mint::CELL_CENTERED)) - { - mesh.createField(cellIdField, - axom::mint::CELL_CENTERED, - DIM); - } - - const axom::IndexType addedCellCount = contourCellCorners.size(); - const axom::IndexType addedNodeCount = contourNodeCoords.size(); - if(addedCellCount != 0) - { - const axom::IndexType priorCellCount = mesh.getNumberOfCells(); - const axom::IndexType priorNodeCount = mesh.getNumberOfNodes(); - mesh.reserveNodes(priorNodeCount + addedNodeCount); - mesh.reserveCells(priorCellCount + addedCellCount); - - mesh.appendNodes((double*)contourNodeCoords.data(), - contourNodeCoords.size()); - - for(int n = 0; n < addedCellCount; ++n) - { - MIdx cornerIds = contourCellCorners[n]; - // Bump corner indices by priorNodeCount to avoid indices - // used by other parents domains. - for(int d = 0; d < DIM; ++d) - { - cornerIds[d] += priorNodeCount; - } - mesh.appendCell(cornerIds); // This takes too long! - } - - axom::IndexType numComponents = -1; - axom::IndexType* cellIdPtr = - mesh.getFieldPtr(cellIdField, - axom::mint::CELL_CENTERED, - numComponents); - SLIC_ASSERT(numComponents == DIM); - axom::ArrayView> cellIdView( - (axom::StackArray*)cellIdPtr, - priorCellCount + addedCellCount); - axom::ArrayIndexer si(m_caseIds.shape(), 'c'); - for(axom::IndexType i = 0; i < addedCellCount; ++i) - { - cellIdView[priorCellCount + i] = si.toMultiIndex(contourCellParents[i]); - } - } - } -#endif - //!@brief Compute the case index into cases2D or cases3D. AXOM_HOST_DEVICE inline int compute_crossing_case(const double* f) const { @@ -922,27 +630,10 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase return index; } -#if 0 - //!@brief Clear data so you can rerun with a different contour value. - void clear() - { - m_contourNodeCoords.clear(); - m_contourCellCorners.clear(); - m_contourCellParents.clear(); - m_crossingCount = 0; - m_facetCount = 0; - } -#endif - /*! @brief Constructor. */ MarchingCubesFullParallel() -#if 0 - : m_contourNodeCoords(0, 0) - , m_contourCellCorners(0, 0) - , m_contourCellParents(0, 0) -#endif { } private: @@ -963,36 +654,22 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase //!@brief Number of parent cells crossing the contour surface. axom::IndexType m_crossingCount = 0; - //!@brief Number of surface mesh facets added by crossing mesh cells. + //!@brief Number of contour surface cells from all crossings. + axom::IndexType m_facetCount = 0; + axom::IndexType getContourCellCount() const override { return m_facetCount; } + + //!@brief Number of surface mesh facets added by each crossing. axom::Array m_facetIncrs; - //!@brief Parent cell id for each crossing. + //!@brief Parent cell id (flat index into m_caseIds) for each crossing. axom::Array m_crossingParentIds; - //!@brief First index of facets in computational mesh cells. + //!@brief First index of facets for each crossing. axom::Array m_firstFacetIds; - //!@brief Number of contour surface cells from crossings. - axom::IndexType m_facetCount = 0; - axom::IndexType getContourCellCount() const override { return m_facetCount; } - //!@brief Number of corners (nodes) on each parent cell. static constexpr std::uint8_t CELL_CORNER_COUNT = (DIM == 3) ? 8 : 4; -#if 0 - //!@name Internal representation of generated contour mesh. - //@{ - //!@brief Coordinates of generated surface mesh nodes. - axom::Array m_contourNodeCoords; - - //!@brief Corners (index into m_contourNodeCoords) of generated contour cells. - axom::Array m_contourCellCorners; - - //!@brief Flat index of computational cell crossing the contour cell. - axom::Array m_contourCellParents; - //@} -#endif - double m_contourVal = 0.0; }; From df2e1966f85353008e54aa328b7a4f3f74b034df Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 25 Jan 2024 16:00:18 -0800 Subject: [PATCH 405/639] more suggestions and styling from spack --- scripts/spack/packages/axom/package.py | 32 ++++++++++++++++---------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py index 1a53eedd47..1e2eba6610 100644 --- a/scripts/spack/packages/axom/package.py +++ b/scripts/spack/packages/axom/package.py @@ -99,7 +99,7 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): # Dependencies # ----------------------------------------------------------------------- # Basics - depends_on("cmake@3.14:", type="build", when="@:0.6.1") + depends_on("cmake@3.14:", type="build") depends_on("cmake@3.18:", type="build", when="@0.7.0:") depends_on("cmake@3.21:", type="build", when="+rocm") @@ -249,7 +249,7 @@ def initconfig_compiler_entries(self): # Add optimization flag workaround for Debug builds with # cray compiler or newer HIP if "+rocm" in spec: - if "crayCC" in self.compiler.cxx or spec.satisfies("%clang@16"): + if spec.satisfies("%cce") or spec.satisfies("%clang@16"): entries.append(cmake_cache_string("CMAKE_CXX_FLAGS_DEBUG", "-O1 -g -DNDEBUG")) return entries @@ -299,6 +299,7 @@ def initconfig_hardware_entries(self): rocm_root = hip_root + "/.." # Fix blt_hip getting HIP_CLANG_INCLUDE_PATH-NOTFOUND bad include directory + # TODO: verify that this is still needed and is indeed specific to LC if ( self.spec.satisfies("%cce") or self.spec.satisfies("%clang") ) and "toss_4" in self._get_sys_type(spec): @@ -372,18 +373,22 @@ def initconfig_hardware_entries(self): ) ) - if "+openmp" in spec and \ - "clang" in self.compiler.cxx and \ - "+fortran" in spec and self.is_fortran_compiler("xlf"): - openmp_gen_exp = ( "$<$>:" - "-fopenmp=libomp>;$<$:-qsmp=omp>") + if ( + "+openmp" in spec + and "clang" in self.compiler.cxx + and "+fortran" in spec + and self.is_fortran_compiler("xlf") + ): + openmp_gen_exp = ( + "$<$>:" + "-fopenmp=libomp>;$<$:-qsmp=omp>" + ) description = "Different OpenMP linker flag between CXX and Fortran" - entries.append(cmake_cache_string( - "BLT_OPENMP_LINK_FLAGS", - openmp_gen_exp, - description)) + entries.append( + cmake_cache_string("BLT_OPENMP_LINK_FLAGS", openmp_gen_exp, description) + ) if spec.satisfies("target=ppc64le:"): # Fix for working around CMake adding implicit link directories @@ -418,6 +423,9 @@ def initconfig_mpi_entries(self): entries.append(cmake_cache_option("ENABLE_MPI", False)) # Replace /usr/bin/srun path with srun flux wrapper path on TOSS 4 + # TODO: Remove this logic by adding `using_flux` case in + # spack/lib/spack/spack/build_systems/cached_cmake.py:196 and remove hard-coded + # path to srun in same file. if "toss_4" in self._get_sys_type(spec): srun_wrapper = which_string("srun") mpi_exec_index = [ From caa230b1445cff24b83c01a519ca4bdb22c050f4 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 25 Jan 2024 16:13:14 -0800 Subject: [PATCH 406/639] even more styling --- scripts/spack/packages/axom/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py index 1e2eba6610..b5cd2a296e 100644 --- a/scripts/spack/packages/axom/package.py +++ b/scripts/spack/packages/axom/package.py @@ -423,7 +423,7 @@ def initconfig_mpi_entries(self): entries.append(cmake_cache_option("ENABLE_MPI", False)) # Replace /usr/bin/srun path with srun flux wrapper path on TOSS 4 - # TODO: Remove this logic by adding `using_flux` case in + # TODO: Remove this logic by adding `using_flux` case in # spack/lib/spack/spack/build_systems/cached_cmake.py:196 and remove hard-coded # path to srun in same file. if "toss_4" in self._get_sys_type(spec): From ba3d3f844f4c0382873b00935f06fe2b218c6e0a Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 25 Jan 2024 17:23:43 -0800 Subject: [PATCH 407/639] Add in hybrid parallel implementation. The hybrid implementation just uses an alternate scanCrossing method. The MarchingCubesFullParallel is not both full and hybrid and will be renamed. --- src/axom/quest/MarchingCubes.cpp | 27 +--- src/axom/quest/MarchingCubes.hpp | 25 +-- .../detail/MarchingCubesFullParallel.hpp | 150 ++++++++++++++++-- .../examples/quest_marching_cubes_example.cpp | 2 +- 4 files changed, 155 insertions(+), 49 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 55294bc630..4de0cf165d 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -22,10 +22,12 @@ namespace axom namespace quest { MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, + MarchingCubesDataParallelism dataParallelism, const conduit::Node& bpMesh, const std::string& topologyName, const std::string& maskField) : m_runtimePolicy(runtimePolicy) + , m_dataParallelism(dataParallelism) , m_singles() , m_topologyName(topologyName) , m_fcnFieldName() @@ -231,29 +233,12 @@ MarchingCubesSingleDomain::MarchingCubesSingleDomain(RuntimePolicy runtimePolicy // Set domain first, to get m_ndim, which is required to allocate m_impl. setDomain(dom); - /* - We have 2 implementations. MarchingCubesHybridParallel is faster on the host - and MarchingCubesFullParallel is faster on GPUs. Both work in all cases. - We can choose based on runtime policy or by user choice - */ - if(m_dataParallelism == - axom::quest::MarchingCubesDataParallelism::hybridParallel || - (m_dataParallelism == axom::quest::MarchingCubesDataParallelism::byPolicy && - m_runtimePolicy == RuntimePolicy::seq)) - { - SLIC_WARNING("Not really using hybrid while developing. Using full parallel."); - m_impl = axom::quest::detail::marching_cubes::newMarchingCubesFullParallel( - m_runtimePolicy, - m_ndim); - } - else - { - m_impl = axom::quest::detail::marching_cubes::newMarchingCubesFullParallel( - m_runtimePolicy, - m_ndim); - } + m_impl = axom::quest::detail::marching_cubes::newMarchingCubesFullParallel( + m_runtimePolicy, + m_ndim); m_impl->initialize(*m_dom, m_topologyName, m_maskFieldName); + m_impl->setDataParallelism(m_dataParallelism); return; } diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 21ac900dec..b4ccb03975 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -107,6 +107,7 @@ class MarchingCubes * \param [in] runtimePolicy A value from RuntimePolicy. * The simplest policy is RuntimePolicy::seq, which specifies * running sequentially on the CPU. + * \param [in] dataParallelism Data parallel implementation choice. * \param [in] bpMesh Blueprint multi-domain mesh containing scalar field. * \param [in] topologyName Name of Blueprint topology to use in \a bpMesh. * \param [in] maskField Cell-based std::int32_t mask field. If provided, @@ -125,6 +126,7 @@ class MarchingCubes * transformation and storage of the temporary contiguous layout. */ MarchingCubes(RuntimePolicy runtimePolicy, + MarchingCubesDataParallelism dataParallelism, const conduit::Node &bpMesh, const std::string &topologyName, const std::string &maskField = {}); @@ -195,16 +197,6 @@ class MarchingCubes const std::string &cellIdField = {}, const std::string &domainIdField = {}); - /*! - @brief Set choice of data-parallel implementation. - - By default, choice is MarchingCubesDataParallelism::byPolicy. - */ - void setDataParallelism(MarchingCubesDataParallelism dataPar) - { - m_dataParallelism = dataPar; - } - private: RuntimePolicy m_runtimePolicy; @@ -247,8 +239,6 @@ class MarchingCubes axom::Array m_facetParentIds; //@} - void setMesh(const conduit::Node &bpMesh); - //!@brief Allocate output buffers corresponding to runtime policy. void allocateOutputBuffers(); }; @@ -296,11 +286,6 @@ class MarchingCubesSingleDomain int spatialDimension() const { return m_ndim; } - void setDataParallelism(MarchingCubesDataParallelism &dataPar) - { - m_dataParallelism = dataPar; - } - /*! @brief Specify the field containing the nodal scalar function in the input mesh. @@ -387,6 +372,9 @@ class MarchingCubesSingleDomain virtual void setFunctionField(const std::string& fcnFieldName) = 0; virtual void setContourValue(double contourVal) = 0; + void setDataParallelism(MarchingCubesDataParallelism dataPar) + { m_dataParallelism = dataPar; } + //@{ //!@name Distinct phases in contour generation. //!@brief Compute the contour mesh. @@ -418,6 +406,9 @@ class MarchingCubesSingleDomain virtual ~ImplBase() { } + MarchingCubesDataParallelism m_dataParallelism = + MarchingCubesDataParallelism::byPolicy; + double m_contourVal = 0.0; axom::ArrayView m_facetNodeIds; axom::ArrayView m_facetNodeCoords; diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index 96c57f50d8..c6a4f2b800 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -39,7 +39,7 @@ namespace marching_cubes See MarchingCubesImpl for the difference between that class and MarchingCubesFullParallel. */ -template +template class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase { public: @@ -48,6 +48,8 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase using FacetIdType = int; using LoopPolicy = typename execution_space::loop_policy; using ReducePolicy = typename execution_space::reduce_policy; + using SequentialLoopPolicy = + typename execution_space::loop_policy; static constexpr auto MemorySpace = execution_space::memory_space; /*! @brief Initialize data to a blueprint domain. @@ -246,7 +248,28 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase } } }; // MarkCrossings_Util + void scanCrossings() override + { + constexpr MarchingCubesDataParallelism autoPolicy = + std::is_same::value ? MarchingCubesDataParallelism::hybridParallel : + std::is_same::value ? MarchingCubesDataParallelism::hybridParallel : + MarchingCubesDataParallelism::fullParallel; + + if(m_dataParallelism == + axom::quest::MarchingCubesDataParallelism::hybridParallel || + (m_dataParallelism == axom::quest::MarchingCubesDataParallelism::byPolicy && + autoPolicy == MarchingCubesDataParallelism::hybridParallel)) + { + scanCrossings_hybridParallel(); + } + else + { + scanCrossings_fullParallel(); + } + } + + void scanCrossings_fullParallel() { #if defined(AXOM_USE_RAJA) #ifdef __INTEL_LLVM_COMPILER @@ -296,6 +319,8 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_crossingParentIds.resize(m_crossingCount); m_facetIncrs.resize(m_crossingCount); + m_firstFacetIds.resize(1 + m_crossingCount); + auto crossingParentIdsView = m_crossingParentIds.view(); auto facetIncrsView = m_facetIncrs.view(); @@ -315,7 +340,6 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase // and the total number of facets. // - m_firstFacetIds.resize(1 + m_crossingCount); RAJA::inclusive_scan( RAJA::make_span(m_facetIncrs.data(), m_crossingCount), RAJA::make_span(m_firstFacetIds.data() + 1, m_crossingCount), @@ -327,6 +351,112 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase m_firstFacetIds.resize(m_crossingCount); } + void scanCrossings_hybridParallel() + { + // + // Compute number of crossings in m_caseIds + // + const axom::IndexType parentCellCount = m_caseIds.size(); + auto caseIdsView = m_caseIds.view(); +#if defined(AXOM_USE_RAJA) + RAJA::ReduceSum vsum(0); + RAJA::forall( + RAJA::RangeSegment(0, parentCellCount), + AXOM_LAMBDA(RAJA::Index_type n) { + vsum += bool(num_contour_cells(caseIdsView.flatIndex(n))); + }); + m_crossingCount = static_cast(vsum.get()); +#else + axom::IndexType vsum = 0; + for(axom::IndexType n = 0; n < parentCellCount; ++n) + { + vsum += bool(num_contour_cells(caseIdsView.flatIndex(n))); + } + m_crossingCount = vsum; +#endif + + // + // Allocate space for crossing info + // + m_crossingParentIds.resize(m_crossingCount); + m_facetIncrs.resize(m_crossingCount); + m_firstFacetIds.resize(1 + m_crossingCount); + + auto crossingParentIdsView = m_crossingParentIds.view(); + auto facetIncrsView = m_facetIncrs.view(); + + axom::IndexType* crossingId = axom::allocate( + 1, + axom::detail::getAllocatorID()); + + auto loopBody = AXOM_LAMBDA(axom::IndexType n) + { + auto caseId = caseIdsView.flatIndex(n); + auto ccc = num_contour_cells(caseId); + if(ccc != 0) + { + facetIncrsView[*crossingId] = ccc; + crossingParentIdsView[*crossingId] = n; + ++(*crossingId); + } + }; + +#if defined(AXOM_USE_RAJA) + /* + loopBody isn't data-parallel and shouldn't be parallelized. + This contrived RAJA::forall forces it to run sequentially. + */ + RAJA::forall( + RAJA::RangeSegment(0, 1), + [=] AXOM_HOST_DEVICE(int /* i */) { + *crossingId = 0; + for(axom::IndexType n = 0; n < parentCellCount; ++n) + { + loopBody(n); + } + }); +#else + *crossingId = 0; + for(axom::IndexType n = 0; n < parentCellCount; ++n) + { + loopBody(n); + } + SLIC_ASSERT(*crossingId == m_crossingCount); +#endif + + axom::deallocate(crossingId); + + // axom::Array prefixSum(m_crossingCount, m_crossingCount); + const auto firstFacetIdsView = m_firstFacetIds.view(); + +#if defined(AXOM_USE_RAJA) + // Intel oneAPI compiler segfaults with OpenMP RAJA scan + #ifdef __INTEL_LLVM_COMPILER + using ScanPolicy = + typename axom::execution_space::loop_policy; + #else + using ScanPolicy = typename axom::execution_space::loop_policy; + #endif + RAJA::inclusive_scan( + RAJA::make_span(facetIncrsView.data(), m_crossingCount), + RAJA::make_span(firstFacetIdsView.data() + 1, m_crossingCount), + RAJA::operators::plus {}); +#else + if(m_crossingCount > 0) + { + firstFacetIdsView[0] = 0; + for(axom::IndexType i = 1; i < 1 + m_crossingCount; ++i) + { + firstFacetIdsView[i] = firstFacetIdsView[i - 1] + facetIncrsView[i - 1]; + } + } +#endif + axom::copy(&m_facetCount, + m_firstFacetIds.data() + m_firstFacetIds.size() - 1, + sizeof(axom::IndexType)); + m_firstFacetIds.resize(m_crossingCount); + } + void computeContour() override { const auto facetIncrsView = m_facetIncrs.view(); @@ -687,35 +817,35 @@ newMarchingCubesFullParallel(MarchingCubes::RuntimePolicy runtimePolicy, int dim if(runtimePolicy == MarchingCubes::RuntimePolicy::seq) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesFullParallel<2, axom::SEQ_EXEC>) + new MarchingCubesFullParallel<2, axom::SEQ_EXEC, axom::SEQ_EXEC>) : std::unique_ptr( - new MarchingCubesFullParallel<3, axom::SEQ_EXEC>); + new MarchingCubesFullParallel<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); } #ifdef AXOM_RUNTIME_POLICY_USE_OPENMP else if(runtimePolicy == MarchingCubes::RuntimePolicy::omp) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesFullParallel<2, axom::OMP_EXEC>) + new MarchingCubesFullParallel<2, axom::OMP_EXEC, axom::SEQ_EXEC>) : std::unique_ptr( - new MarchingCubesFullParallel<3, axom::OMP_EXEC>); + new MarchingCubesFullParallel<3, axom::OMP_EXEC, axom::SEQ_EXEC>); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_CUDA else if(runtimePolicy == MarchingCubes::RuntimePolicy::cuda) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesFullParallel<2, axom::CUDA_EXEC<256>>) + new MarchingCubesFullParallel<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>) : std::unique_ptr( - new MarchingCubesFullParallel<3, axom::CUDA_EXEC<256>>); + new MarchingCubesFullParallel<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_HIP else if(runtimePolicy == MarchingCubes::RuntimePolicy::hip) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesFullParallel<2, axom::HIP_EXEC<256>>) + new MarchingCubesFullParallel<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>) : std::unique_ptr( - new MarchingCubesFullParallel<3, axom::HIP_EXEC<256>>); + new MarchingCubesFullParallel<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>); } #endif else diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index e489adc8d8..0f22d2324f 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -790,7 +790,6 @@ struct ContourTestBase MPI_Barrier(MPI_COMM_WORLD); #endif computeTimer.start(); - mc.setDataParallelism(params.dataParallelism); mc.computeIsocontour(params.contourVal); computeTimer.stop(); printTimingStats(computeTimer, name() + " contour"); @@ -1572,6 +1571,7 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) { // Create marching cubes algorithm object and set some parameters quest::MarchingCubes mc(params.policy, + params.dataParallelism, computationalMesh.asConduitNode(), "mesh"); From a6c86b3775c7e549007c484e8d951e90d6660f20 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 25 Jan 2024 17:46:41 -0800 Subject: [PATCH 408/639] Rehame MarchingCubesFullParallel -> MarchingCubesImpl and remove MarchingCubesHybridParallel. --- src/axom/quest/CMakeLists.txt | 2 +- src/axom/quest/MarchingCubes.cpp | 4 +- .../detail/MarchingCubesHybridParallel.hpp | 999 ------------------ ...FullParallel.hpp => MarchingCubesImpl.hpp} | 32 +- 4 files changed, 19 insertions(+), 1018 deletions(-) delete mode 100644 src/axom/quest/detail/MarchingCubesHybridParallel.hpp rename src/axom/quest/detail/{MarchingCubesFullParallel.hpp => MarchingCubesImpl.hpp} (95%) diff --git a/src/axom/quest/CMakeLists.txt b/src/axom/quest/CMakeLists.txt index 9ddc1e2059..9f3597326f 100644 --- a/src/axom/quest/CMakeLists.txt +++ b/src/axom/quest/CMakeLists.txt @@ -119,7 +119,7 @@ endif() blt_list_append( TO quest_headers - ELEMENTS MarchingCubes.hpp detail/MarchingCubesFullParallel.hpp + ELEMENTS MarchingCubes.hpp detail/MarchingCubesImpl.hpp IF CONDUIT_FOUND ) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 4de0cf165d..1733531ac1 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -14,7 +14,7 @@ #include "axom/core/execution/execution_space.hpp" #include "axom/quest/MarchingCubes.hpp" // #include "axom/quest/detail/MarchingCubesHybridParallel.hpp" -#include "axom/quest/detail/MarchingCubesFullParallel.hpp" +#include "axom/quest/detail/MarchingCubesImpl.hpp" #include "axom/fmt.hpp" namespace axom @@ -233,7 +233,7 @@ MarchingCubesSingleDomain::MarchingCubesSingleDomain(RuntimePolicy runtimePolicy // Set domain first, to get m_ndim, which is required to allocate m_impl. setDomain(dom); - m_impl = axom::quest::detail::marching_cubes::newMarchingCubesFullParallel( + m_impl = axom::quest::detail::marching_cubes::newMarchingCubesImpl( m_runtimePolicy, m_ndim); diff --git a/src/axom/quest/detail/MarchingCubesHybridParallel.hpp b/src/axom/quest/detail/MarchingCubesHybridParallel.hpp deleted file mode 100644 index 3ab2a97d91..0000000000 --- a/src/axom/quest/detail/MarchingCubesHybridParallel.hpp +++ /dev/null @@ -1,999 +0,0 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and -// other Axom Project Developers. See the top-level LICENSE file for details. -// -// SPDX-License-Identifier: (BSD-3-Clause) - -#include "axom/config.hpp" - -// Implementation requires Conduit. -#ifndef AXOM_USE_CONDUIT - #error "MarchingCubesHybridParallel.hpp requires conduit" -#endif -#include "conduit_blueprint.hpp" - -#include "axom/core/execution/execution_space.hpp" -#include "axom/quest/ArrayIndexer.hpp" -#include "axom/quest/detail/marching_cubes_lookup.hpp" -#include "axom/quest/MeshViewUtil.hpp" -#include "axom/primal/geometry/Point.hpp" -#include "axom/primal/constants.hpp" -#include "axom/mint/execution/internal/structured_exec.hpp" -#include "axom/fmt.hpp" - -namespace axom -{ -namespace quest -{ -namespace detail -{ -namespace marching_cubes -{ -/*! - @brief Computations for MarchingCubesSingleDomain - - Spatial dimension templating is here, to keep out of higher level - classes MarchCubes and MarchingCubesSingleDomain. - - ExecSpace is the general execution space, like axom::SEQ_EXEC and - axom::CUDA_EXEC<256>. SequentialExecSpace is used for loops that - cannot be parallelized but must access data allocated for ExecSpace. - Use something like axom::SEQ_EXEC or axom::CUDA_EXEC<1>. - - The difference between MarchingCubesHybridParallel and MarchingCubesFullParallel - is how they compute indices for the unstructured surface mesh. - - MarchingCubesHybridParallel uses sequential loop, and skips over parents - cells that don't touch the surface contour. It processes less data - but is not data-parallel. - - MarchingCubesFullParallel that checks all parents cells. - It process more data but is data-parallel. - We've observed that MarchingCubesHybridParallel is faster for seq policy - and MarchingCubesHybridParallel is faster on the GPU. -*/ -template -class MarchingCubesHybridParallel : public MarchingCubesSingleDomain::ImplBase -{ -public: - using Point = axom::primal::Point; - using MIdx = axom::StackArray; - using LoopPolicy = typename execution_space::loop_policy; - using ReducePolicy = typename execution_space::reduce_policy; - using SequentialLoopPolicy = - typename execution_space::loop_policy; - static constexpr auto MemorySpace = execution_space::memory_space; - /*! - @brief Initialize data to a blueprint domain. - @param dom Blueprint structured mesh domain - @param topologyName Name of mesh topology (see blueprint - mesh documentation) - @param fcnFieldName Name of nodal function in dom - @param maskFieldName Name of integer cell mask function is in dom - - Set up views to domain data and allocate other data to work on the - given domain. - - The above data from the domain MUST be in a memory space - compatible with ExecSpace. - */ - AXOM_HOST void initialize(const conduit::Node& dom, - const std::string& topologyName, - const std::string& maskFieldName = {}) override - { - SLIC_ASSERT(conduit::blueprint::mesh::topology::dims(dom.fetch_existing( - axom::fmt::format("topologies/{}", topologyName))) == DIM); - - // clear(); - - m_mvu = axom::quest::MeshViewUtil(dom, topologyName); - - m_bShape = m_mvu.getCellShape(); - m_coordsViews = m_mvu.getConstCoordsViews(false); - if(!maskFieldName.empty()) - { - m_maskView = m_mvu.template getConstFieldView(maskFieldName, false); - } - - /* - TODO: To get good cache performance, we should make m_caseIds - row-major if fcn is that way, and vice versa. However, Array - only support column-major, so we're stuck with that for now. - */ - m_caseIds = axom::Array(m_bShape); - m_caseIds.fill(0); - } - - /*! - @brief Set the scale field name - @param fcnFieldName Name of nodal function is in dom - */ - void setFunctionField(const std::string& fcnFieldName) override - { - m_fcnView = m_mvu.template getConstFieldView(fcnFieldName, false); - } - - void setContourValue(double contourVal) override - { - m_contourVal = contourVal; - } - -#if 0 - void computeContourMesh() override - { - markCrossings(); - scanCrossings(); - computeContour(); - } -#endif - - /*! - @brief Implementation of virtual markCrossings. - - Virtual methods cannot be templated, so this implementation - delegates to a name templated on DIM. - */ - void markCrossings() override { markCrossings_dim(); } - - //!@brief Populate m_caseIds with crossing indices. - template - typename std::enable_if::type markCrossings_dim() - { - MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); - -#if defined(AXOM_USE_RAJA) - RAJA::RangeSegment jRange(0, m_bShape[1]); - RAJA::RangeSegment iRange(0, m_bShape[0]); - using EXEC_POL = - typename axom::mint::internal::structured_exec::loop2d_policy; - RAJA::kernel( - RAJA::make_tuple(iRange, jRange), - AXOM_LAMBDA(axom::IndexType i, axom::IndexType j) { - mcu.computeCaseId(i, j); - }); -#else - for(int j = 0; j < m_bShape[1]; ++j) - { - for(int i = 0; i < m_bShape[0]; ++i) - { - mcu.computeCaseId(i, j); - } - } -#endif - } - - //!@brief Populate m_caseIds with crossing indices. - template - typename std::enable_if::type markCrossings_dim() - { - MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); - -#if defined(AXOM_USE_RAJA) - RAJA::RangeSegment kRange(0, m_bShape[2]); - RAJA::RangeSegment jRange(0, m_bShape[1]); - RAJA::RangeSegment iRange(0, m_bShape[0]); - using EXEC_POL = - typename axom::mint::internal::structured_exec::loop3d_policy; - RAJA::kernel( - RAJA::make_tuple(iRange, jRange, kRange), - AXOM_LAMBDA(axom::IndexType i, axom::IndexType j, axom::IndexType k) { - mcu.computeCaseId(i, j, k); - }); -#else - for(int k = 0; k < m_bShape[2]; ++k) - { - for(int j = 0; j < m_bShape[1]; ++j) - { - for(int i = 0; i < m_bShape[0]; ++i) - { - mcu.computeCaseId(i, j, k); - } - } - } -#endif - } - - /*! - @brief Implementation used by MarchingCubesHybridParallel::markCrossings_dim() - containing just the objects needed for that part, to be made available - on devices. - */ - struct MarkCrossings_Util - { - axom::ArrayView caseIdsView; - axom::ArrayView fcnView; - axom::ArrayView maskView; - double contourVal; - MarkCrossings_Util(axom::Array& caseIds, - axom::ArrayView& fcnView_, - axom::ArrayView& maskView_, - double contourVal_) - : caseIdsView(caseIds.view()) - , fcnView(fcnView_) - , maskView(maskView_) - , contourVal(contourVal_) - { } - - //!@brief Compute the case index into cases2D or cases3D. - AXOM_HOST_DEVICE inline int computeCrossingCase(const double* f) const - { - int index = 0; - for(int n = 0; n < CELL_CORNER_COUNT; ++n) - { - if(f[n] >= contourVal) - { - const int bit = (1 << n); - index |= bit; - } - } - return index; - } - - template - AXOM_HOST_DEVICE inline typename std::enable_if::type - computeCaseId(axom::IndexType i, axom::IndexType j) const - { - const bool useZone = maskView.empty() || bool(maskView(i, j)); - if(useZone) - { - // clang-format off - double nodalValues[CELL_CORNER_COUNT] = - {fcnView(i , j ), - fcnView(i + 1, j ), - fcnView(i + 1, j + 1), - fcnView(i , j + 1)}; - // clang-format on - caseIdsView(i, j) = computeCrossingCase(nodalValues); - } - } - - //!@brief Populate m_caseIds with crossing indices. - template - AXOM_HOST_DEVICE inline typename std::enable_if::type - computeCaseId(axom::IndexType i, axom::IndexType j, axom::IndexType k) const - { - const bool useZone = maskView.empty() || bool(maskView(i, j, k)); - if(useZone) - { - // clang-format off - double nodalValues[CELL_CORNER_COUNT] = - {fcnView(i + 1, j , k ), - fcnView(i + 1, j + 1, k ), - fcnView(i , j + 1, k ), - fcnView(i , j , k ), - fcnView(i + 1, j , k + 1), - fcnView(i + 1, j + 1, k + 1), - fcnView(i , j + 1, k + 1), - fcnView(i , j , k + 1)}; - // clang-format on - caseIdsView(i, j, k) = computeCrossingCase(nodalValues); - } - } - }; // MarkCrossings_Util - - /*! - @brief Populate the 1D m_crossings array, one entry for each - parent cell that crosses the contour. - - We sum up the number of contour surface cells from the crossings, - allocate space, then populate it. - */ - void scanCrossings() override - { - const axom::IndexType parentCellCount = m_caseIds.size(); - auto caseIdsView = m_caseIds.view(); -#if defined(AXOM_USE_RAJA) - RAJA::ReduceSum vsum(0); - RAJA::forall( - RAJA::RangeSegment(0, parentCellCount), - AXOM_LAMBDA(RAJA::Index_type n) { - vsum += bool(num_contour_cells(caseIdsView.flatIndex(n))); - }); - m_crossingCount = static_cast(vsum.get()); -#else - axom::IndexType vsum = 0; - for(axom::IndexType n = 0; n < parentCellCount; ++n) - { - vsum += bool(num_contour_cells(caseIdsView.flatIndex(n))); - } - m_crossingCount = vsum; -#endif - - m_crossings.resize(m_crossingCount, {0, 0}); - axom::ArrayView crossingsView = - m_crossings.view(); - - axom::Array addCells(m_crossingCount, m_crossingCount); - const axom::ArrayView addCellsView = addCells.view(); - - axom::IndexType* crossingId = axom::allocate( - 1, - axom::detail::getAllocatorID()); - - auto loopBody = AXOM_LAMBDA(axom::IndexType n) - { - auto caseId = caseIdsView.flatIndex(n); - auto ccc = num_contour_cells(caseId); - if(ccc != 0) - { - addCellsView[*crossingId] = ccc; - crossingsView[*crossingId].caseNum = caseId; - crossingsView[*crossingId].parentCellNum = n; - ++(*crossingId); - } - }; - -#if defined(AXOM_USE_RAJA) - /* - The m_crossings filling loop isn't data-parallel and shouldn't - be parallelized. This contrived RAJA::forall forces it to run - sequentially. - */ - RAJA::forall( - RAJA::RangeSegment(0, 1), - [=] AXOM_HOST_DEVICE(int /* i */) { - *crossingId = 0; - for(axom::IndexType n = 0; n < parentCellCount; ++n) - { - loopBody(n); - } - }); -#else - *crossingId = 0; - for(axom::IndexType n = 0; n < parentCellCount; ++n) - { - loopBody(n); - } - SLIC_ASSERT(*crossingId == m_crossingCount); -#endif - - axom::deallocate(crossingId); - - axom::Array prefixSum(m_crossingCount, - m_crossingCount); - const auto prefixSumView = prefixSum.view(); - - auto copyFirstSurfaceCellId = AXOM_LAMBDA(axom::IndexType n) - { - crossingsView[n].firstSurfaceCellId = prefixSumView[n]; - }; -#if defined(AXOM_USE_RAJA) - // Intel oneAPI compiler segfaults with OpenMP RAJA scan - #ifdef __INTEL_LLVM_COMPILER - using ScanPolicy = - typename axom::execution_space::loop_policy; - #else - using ScanPolicy = typename axom::execution_space::loop_policy; - #endif - RAJA::exclusive_scan( - RAJA::make_span(addCellsView.data(), m_crossingCount), - RAJA::make_span(prefixSumView.data(), m_crossingCount), - RAJA::operators::plus {}); - RAJA::forall(RAJA::RangeSegment(0, m_crossingCount), - copyFirstSurfaceCellId); -#else - if(m_crossingCount > 0) - { - prefixSumView[0] = 0; - for(axom::IndexType i = 1; i < m_crossingCount; ++i) - { - prefixSumView[i] = prefixSumView[i - 1] + addCellsView[i - 1]; - } - for(axom::IndexType i = 0; i < m_crossingCount; ++i) - { - copyFirstSurfaceCellId(i); - } - } -#endif - - // Data from the last crossing tells us how many contour cells there are. - if(m_crossings.empty()) - { - m_contourCellCount = 0; - } - else - { - CrossingInfo back; - axom::copy(&back, - m_crossings.data() + m_crossings.size() - 1, - sizeof(CrossingInfo)); - m_contourCellCount = - back.firstSurfaceCellId + num_contour_cells(back.caseNum); - } - } - - /*! - @brief Implementation used by MarchingCubesHybridParallel::computeContour(). - containing just the objects needed for that part, to be made available - on devices. - */ - struct ComputeContour_Util - { - double contourVal; - MIdx bStrides; - axom::ArrayIndexer indexer; - axom::ArrayView fcnView; - axom::StackArray, DIM> coordsViews; - ComputeContour_Util( - double contourVal_, - const MIdx& bStrides_, - const axom::ArrayView& fcnView_, - const axom::StackArray, DIM> - coordsViews_) - : contourVal(contourVal_) - , bStrides(bStrides_) - , indexer(bStrides_) - , fcnView(fcnView_) - , coordsViews(coordsViews_) - { } - - template - AXOM_HOST_DEVICE typename std::enable_if::type - get_corner_coords_and_values(IndexType cellNum, - Point cornerCoords[], - double cornerValues[]) const - { - const auto& x = coordsViews[0]; - const auto& y = coordsViews[1]; - - const auto c = indexer.toMultiIndex(cellNum); - const auto& i = c[0]; - const auto& j = c[1]; - - // clang-format off - cornerCoords[0] = { x(i , j ), y(i , j ) }; - cornerCoords[1] = { x(i+1, j ), y(i+1, j ) }; - cornerCoords[2] = { x(i+1, j+1), y(i+1, j+1) }; - cornerCoords[3] = { x(i , j+1), y(i , j+1) }; - - cornerValues[0] = fcnView(i , j ); - cornerValues[1] = fcnView(i+1, j ); - cornerValues[2] = fcnView(i+1, j+1); - cornerValues[3] = fcnView(i , j+1); - // clang-format on - } - template - AXOM_HOST_DEVICE typename std::enable_if::type - get_corner_coords_and_values(IndexType cellNum, - Point cornerCoords[], - double cornerValues[]) const - { - const auto& x = coordsViews[0]; - const auto& y = coordsViews[1]; - const auto& z = coordsViews[2]; - - const auto c = indexer.toMultiIndex(cellNum); - const auto& i = c[0]; - const auto& j = c[1]; - const auto& k = c[2]; - - // clang-format off - cornerCoords[0] = { x(i+1, j , k ), y(i+1, j , k ), z(i+1, j , k ) }; - cornerCoords[1] = { x(i+1, j+1, k ), y(i+1, j+1, k ), z(i+1, j+1, k ) }; - cornerCoords[2] = { x(i , j+1, k ), y(i , j+1, k ), z(i , j+1, k ) }; - cornerCoords[3] = { x(i , j , k ), y(i , j , k ), z(i , j , k ) }; - cornerCoords[4] = { x(i+1, j , k+1), y(i+1, j , k+1), z(i+1, j , k+1) }; - cornerCoords[5] = { x(i+1, j+1, k+1), y(i+1, j+1, k+1), z(i+1, j+1, k+1) }; - cornerCoords[6] = { x(i , j+1, k+1), y(i , j+1, k+1), z(i , j+1, k+1) }; - cornerCoords[7] = { x(i , j , k+1), y(i , j , k+1), z(i , j , k+1) }; - - cornerValues[0] = fcnView(i+1, j , k ); - cornerValues[1] = fcnView(i+1, j+1, k ); - cornerValues[2] = fcnView(i , j+1, k ); - cornerValues[3] = fcnView(i , j , k ); - cornerValues[4] = fcnView(i+1, j , k+1); - cornerValues[5] = fcnView(i+1, j+1, k+1); - cornerValues[6] = fcnView(i , j+1, k+1); - cornerValues[7] = fcnView(i , j , k+1); - // clang-format on - } - - //!@brief Interpolate for the contour location crossing a parent edge. - template - AXOM_HOST_DEVICE typename std::enable_if::type linear_interp( - int edgeIdx, - const Point cornerCoords[4], - const double nodeValues[4], - Point& crossingPt) const - { - // STEP 0: get the edge node indices - // 2 nodes define the edge. n1 and n2 are the indices of - // the nodes w.r.t. the square or cubic zone. There is a - // agreed-on ordering of these indices in the arrays xx, yy, - // zz, nodeValues, crossingPt. - int n1 = edgeIdx; - int n2 = (edgeIdx == 3) ? 0 : edgeIdx + 1; - - // STEP 1: get the fields and coordinates from the two points - const double f1 = nodeValues[n1]; - const double f2 = nodeValues[n2]; - - const Point& p1 = cornerCoords[n1]; - const Point& p2 = cornerCoords[n2]; - - // STEP 2: check whether the interpolated point is at one of the two corners. - if(axom::utilities::isNearlyEqual(contourVal, f1) || - axom::utilities::isNearlyEqual(f1, f2)) - { - crossingPt = p1; - return; - } - - if(axom::utilities::isNearlyEqual(contourVal, f2)) - { - crossingPt = p2; - return; - } - - // STEP 3: point is in between the edge points, interpolate its position - constexpr double ptiny = axom::primal::PRIMAL_TINY; - const double df = f2 - f1 + ptiny; //add ptiny to avoid division by zero - const double w = (contourVal - f1) / df; - for(int d = 0; d < DIM; ++d) - { - crossingPt[d] = p1[d] + w * (p2[d] - p1[d]); - } - } - - //!@brief Interpolate for the contour location crossing a parent edge. - template - AXOM_HOST_DEVICE typename std::enable_if::type linear_interp( - int edgeIdx, - const Point cornerCoords[8], - const double nodeValues[8], - Point& crossingPt) const - { - // STEP 0: get the edge node indices - // 2 nodes define the edge. n1 and n2 are the indices of - // the nodes w.r.t. the square or cubic zone. There is a - // agreed-on ordering of these indices in the arrays - // cornerCoords, nodeValues, hex_edge_table. - const int hex_edge_table[] = { - 0, 1, 1, 2, 2, 3, 3, 0, // base - 4, 5, 5, 6, 6, 7, 7, 4, // top - 0, 4, 1, 5, 2, 6, 3, 7 // vertical - }; - - int n1 = hex_edge_table[edgeIdx * 2]; - int n2 = hex_edge_table[edgeIdx * 2 + 1]; - - // STEP 1: get the fields and coordinates from the two points - const double f1 = nodeValues[n1]; - const double f2 = nodeValues[n2]; - - const Point& p1 = cornerCoords[n1]; - const Point& p2 = cornerCoords[n2]; - - // STEP 2: check whether the interpolated point is at one of the two corners. - if(axom::utilities::isNearlyEqual(contourVal, f1) || - axom::utilities::isNearlyEqual(f1, f2)) - { - crossingPt = p1; - return; - } - - if(axom::utilities::isNearlyEqual(contourVal, f2)) - { - crossingPt = p2; - return; - } - - // STEP 3: point is not at corner; interpolate its position - constexpr double ptiny = axom::primal::PRIMAL_TINY; - const double df = f2 - f1 + ptiny; //add ptiny to avoid division by zero - const double w = (contourVal - f1) / df; - for(int d = 0; d < DIM; ++d) - { - crossingPt[d] = p1[d] + w * (p2[d] - p1[d]); - } - } - }; // ComputeContour_Util - - void computeContour() override - { -#if 1 - auto crossingsView = m_crossings.view(); - - // Internal contour mesh data to populate - axom::ArrayView facetNodeIdsView = m_facetNodeIds; - axom::ArrayView facetNodeCoordsView = m_facetNodeCoords; - axom::ArrayView facetParentIdsView = m_facetParentIds; - const axom::IndexType facetIndexOffset = m_facetIndexOffset; - - ComputeContour_Util ccu(m_contourVal, - m_caseIds.strides(), - m_fcnView, - m_coordsViews); - - auto loopBody = AXOM_LAMBDA(axom::IndexType iCrossing) - { - const auto& crossingInfo = crossingsView[iCrossing]; - const IndexType crossingCellCount = num_contour_cells(crossingInfo.caseNum); - SLIC_ASSERT(crossingCellCount > 0); - - // Parent cell data for interpolating new node coordinates. - Point cornerCoords[CELL_CORNER_COUNT]; - double cornerValues[CELL_CORNER_COUNT]; - ccu.get_corner_coords_and_values(crossingInfo.parentCellNum, - cornerCoords, - cornerValues); - - /* - Create the new cell and its DIM nodes. New nodes are on - parent cell edges where the edge intersects the isocontour. - linear_interp for the exact coordinates. - */ - for(int iCell = 0; iCell < crossingCellCount; ++iCell) - { - IndexType newFacetId = facetIndexOffset + crossingInfo.firstSurfaceCellId + iCell; - facetParentIdsView[newFacetId] = crossingInfo.parentCellNum; - for(int d = 0; d < DIM; ++d) - { - IndexType newNodeId = newFacetId * DIM + d; - axom::StackArray idx{newFacetId, d}; - facetNodeIdsView[idx] = newNodeId; - - const int edge = cases_table(crossingInfo.caseNum, iCell * DIM + d); - ccu.linear_interp(edge, - cornerCoords, - cornerValues, - facetNodeCoordsView[newNodeId]); - } - } - }; - axom::for_all(0, m_crossingCount, loopBody); -#else - auto crossingsView = m_crossings.view(); - - /* - Reserve contour mesh data space so we can add data without - reallocation. - */ - const axom::IndexType contourNodeCount = DIM * m_contourCellCount; - m_facetNodeCoords.resize(contourNodeCount); - m_facetNodeIds.resize(m_contourCellCount); - m_facetParentIds.resize(m_contourCellCount); - - auto nodeCoordsView = m_facetNodeCoords.view(); - auto cellCornersView = m_facetNodeIds.view(); - auto cellParentsView = m_facetParentIds.view(); - - ComputeContour_Util ccu(m_contourVal, - m_caseIds.strides(), - m_fcnView, - m_coordsViews); - - auto loopBody = AXOM_LAMBDA(axom::IndexType iCrossing) - { - const auto& crossingInfo = crossingsView[iCrossing]; - const IndexType crossingCellCount = num_contour_cells(crossingInfo.caseNum); - SLIC_ASSERT(crossingCellCount > 0); - - // Parent cell data for interpolating new node coordinates. - Point cornerCoords[CELL_CORNER_COUNT]; - double cornerValues[CELL_CORNER_COUNT]; - ccu.get_corner_coords_and_values(crossingInfo.parentCellNum, - cornerCoords, - cornerValues); - - /* - Create the new cell and its DIM nodes. New nodes are on - parent cell edges where the edge intersects the isocontour. - linear_interp for the exact coordinates. - - TODO: The varying crossingCellCount value may inhibit device - performance. Try grouping m_crossings items that have the - same values for crossingCellCount. - */ - for(int iCell = 0; iCell < crossingCellCount; ++iCell) - { - IndexType contourCellId = crossingInfo.firstSurfaceCellId + iCell; - cellParentsView[contourCellId] = crossingInfo.parentCellNum; - for(int d = 0; d < DIM; ++d) - { - IndexType contourNodeId = contourCellId * DIM + d; - cellCornersView[contourCellId][d] = contourNodeId; - - const int edge = cases_table(crossingInfo.caseNum, iCell * DIM + d); - ccu.linear_interp(edge, - cornerCoords, - cornerValues, - nodeCoordsView[contourNodeId]); - } - } - }; - axom::for_all(0, m_crossingCount, loopBody); -#endif - } - - // These 4 functions provide access to the look-up table - // whether on host or device. Is there a more elegant way - // to put static 1D and 2D arrays on both host and device? BTNG. - - template - AXOM_HOST_DEVICE inline typename std::enable_if::type - num_contour_cells(int iCase) const - { -#define _MC_LOOKUP_NUM_SEGMENTS -#include "marching_cubes_lookup.hpp" -#undef _MC_LOOKUP_NUM_SEGMENTS - SLIC_ASSERT(iCase >= 0 && iCase < 16); - return num_segments[iCase]; - } - - template - AXOM_HOST_DEVICE inline typename std::enable_if::type - cases_table(int iCase, int iEdge) const - { -#define _MC_LOOKUP_CASES2D -#include "marching_cubes_lookup.hpp" -#undef _MC_LOOKUP_CASES2D - SLIC_ASSERT(iCase >= 0 && iCase < 16); - return cases2D[iCase][iEdge]; - } - - template - AXOM_HOST_DEVICE inline typename std::enable_if::type - num_contour_cells(int iCase) const - { -#define _MC_LOOKUP_NUM_TRIANGLES -#include "marching_cubes_lookup.hpp" -#undef _MC_LOOKUP_NUM_TRIANGLES - SLIC_ASSERT(iCase >= 0 && iCase < 256); - return num_triangles[iCase]; - } - - template - AXOM_HOST_DEVICE inline typename std::enable_if::type - cases_table(int iCase, int iEdge) const - { -#define _MC_LOOKUP_CASES3D -#include "marching_cubes_lookup.hpp" -#undef _MC_LOOKUP_CASES3D - SLIC_ASSERT(iCase >= 0 && iCase < 256); - return cases3D[iCase][iEdge]; - } - -#if 0 - /*! - @brief Output contour mesh to a mint::UnstructuredMesh object. - */ - void populateContourMesh( - axom::mint::UnstructuredMesh& mesh, - const std::string& cellIdField) const override - { - auto internalAllocatorID = axom::execution_space::allocatorID(); - auto hostAllocatorID = axom::execution_space::allocatorID(); - - /* - mint uses host memory. If internal memory is on the host, use - it. Otherwise, make a temporary copy of it on the host. - */ - if(internalAllocatorID == hostAllocatorID) - { - populateContourMesh(mesh, - cellIdField, - m_facetNodeCoords, - m_facetNodeIds, - m_facetParentIds); - } - else - { - axom::Array facetNodeCoords( - m_facetNodeCoords, - hostAllocatorID); - axom::Array facetNodeIds( - m_facetNodeIds, - hostAllocatorID); - axom::Array facetParentIds( - m_facetParentIds, - hostAllocatorID); - - populateContourMesh(mesh, - cellIdField, - facetNodeCoords, - facetNodeIds, - facetParentIds); - } - } - - //!@brief Output contour mesh to a mint::UnstructuredMesh object. - void populateContourMesh( - axom::mint::UnstructuredMesh& mesh, - const std::string& cellIdField, - const axom::Array facetNodeCoords, - const axom::Array facetNodeIds, - const axom::Array facetParentIds) const - { - // AXOM_PERF_MARK_FUNCTION("MarchingCubesHybridParallel::populateContourMesh"); - if(!cellIdField.empty() && - !mesh.hasField(cellIdField, axom::mint::CELL_CENTERED)) - { - mesh.createField(cellIdField, - axom::mint::CELL_CENTERED, - DIM); - } - - const axom::IndexType addedCellCount = facetNodeIds.size(); - const axom::IndexType addedNodeCount = facetNodeCoords.size(); - if(addedCellCount != 0) - { - const axom::IndexType priorCellCount = mesh.getNumberOfCells(); - const axom::IndexType priorNodeCount = mesh.getNumberOfNodes(); - mesh.reserveNodes(priorNodeCount + addedNodeCount); - mesh.reserveCells(priorCellCount + addedCellCount); - - mesh.appendNodes((double*)facetNodeCoords.data(), - facetNodeCoords.size()); - for(int n = 0; n < addedCellCount; ++n) - { - MIdx cornerIds = facetNodeIds[n]; - // Bump corner indices by priorNodeCount to avoid indices - // used by other parents domains. - for(int d = 0; d < DIM; ++d) - { - cornerIds[d] += priorNodeCount; - } - mesh.appendCell(cornerIds); - } - axom::IndexType numComponents = -1; - axom::IndexType* cellIdPtr = - mesh.getFieldPtr(cellIdField, - axom::mint::CELL_CENTERED, - numComponents); - SLIC_ASSERT(numComponents == DIM); - axom::ArrayView> cellIdView( - (axom::StackArray*)cellIdPtr, - priorCellCount + addedCellCount); - axom::ArrayIndexer si(m_caseIds.shape(), 'c'); - for(axom::IndexType i = 0; i < addedCellCount; ++i) - { - cellIdView[priorCellCount + i] = si.toMultiIndex(facetParentIds[i]); - } - } - } -#endif - - //!@brief Compute the case index into cases2D or cases3D. - AXOM_HOST_DEVICE inline int compute_crossing_case(const double* f) const - { - int index = 0; - for(int n = 0; n < CELL_CORNER_COUNT; ++n) - { - if(f[n] >= m_contourVal) - { - const int bit = (1 << n); - index |= bit; - } - } - return index; - } - -#if 0 - //!@brief Clear data so you can rerun with a different contour value. - void clear() - { - m_facetNodeCoords.clear(); - m_facetNodeIds.clear(); - m_facetParentIds.clear(); - m_crossingCount = 0; - m_contourCellCount = 0; - } -#endif - - /*! - @brief Constructor. - */ - MarchingCubesHybridParallel() - : m_crossings(0, 0) - { } - - /*! - @brief Info for a parent cell intersecting the contour surface. - */ - struct CrossingInfo - { - CrossingInfo() { } - CrossingInfo(axom::IndexType parentCellNum_, std::uint16_t caseNum_) - : parentCellNum(parentCellNum_) - , caseNum(caseNum_) - , firstSurfaceCellId(std::numeric_limits::max()) - { } - axom::IndexType parentCellNum; //!< @brief Flat index of parent cell in m_caseIds. - std::uint16_t caseNum; //!< @brief Index in cases2D or cases3D - axom::IndexType firstSurfaceCellId; //!< @brief First index for generated cells. - }; - -private: - axom::quest::MeshViewUtil m_mvu; - MIdx m_bShape; //!< @brief Blueprint cell data shape. - - // Views of parent domain data. - // DIM coordinate components, each on a DIM-dimensional mesh. - using CoordViews = - axom::StackArray, DIM>; - CoordViews m_coordsViews; - axom::ArrayView m_fcnView; - axom::ArrayView m_maskView; - - //!@brief Crossing case for each computational mesh cell. - axom::Array m_caseIds; - - //!@brief Info on every parent cell that crosses the contour surface. - axom::Array m_crossings; - - //!@brief Number of parent cells crossing the contour surface. - axom::IndexType m_crossingCount = 0; - - //!@brief Number of contour surface cells from crossings. - axom::IndexType m_contourCellCount = 0; - axom::IndexType getContourCellCount() const override - { - return m_contourCellCount; - } - - //!@brief Number of corners (nodes) on each parent cell. - static constexpr std::uint8_t CELL_CORNER_COUNT = (DIM == 3) ? 8 : 4; - - double m_contourVal = 0.0; -}; - -/*! - @brief Allocate a MarchingCubesHybridParallel object, template-specialized - for caller-specified runtime policy and physical dimension. -*/ -static std::unique_ptr -newMarchingCubesHybridParallel(MarchingCubes::RuntimePolicy runtimePolicy, int dim) -{ - using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; - - SLIC_ASSERT(dim >= 2 && dim <= 3); - std::unique_ptr impl; - if(runtimePolicy == MarchingCubes::RuntimePolicy::seq) - { - impl = dim == 2 - ? std::unique_ptr( - new MarchingCubesHybridParallel<2, axom::SEQ_EXEC, axom::SEQ_EXEC>) - : std::unique_ptr( - new MarchingCubesHybridParallel<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); - } -#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP - else if(runtimePolicy == MarchingCubes::RuntimePolicy::omp) - { - impl = dim == 2 - ? std::unique_ptr( - new MarchingCubesHybridParallel<2, axom::OMP_EXEC, axom::SEQ_EXEC>) - : std::unique_ptr( - new MarchingCubesHybridParallel<3, axom::OMP_EXEC, axom::SEQ_EXEC>); - } -#endif -#ifdef AXOM_RUNTIME_POLICY_USE_CUDA - else if(runtimePolicy == MarchingCubes::RuntimePolicy::cuda) - { - impl = dim == 2 - ? std::unique_ptr( - new MarchingCubesHybridParallel<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>) - : std::unique_ptr( - new MarchingCubesHybridParallel<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); - } -#endif -#ifdef AXOM_RUNTIME_POLICY_USE_HIP - else if(runtimePolicy == MarchingCubes::RuntimePolicy::hip) - { - impl = dim == 2 - ? std::unique_ptr( - new MarchingCubesHybridParallel<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>) - : std::unique_ptr( - new MarchingCubesHybridParallel<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>); - } -#endif - else - { - SLIC_ERROR(axom::fmt::format( - "MarchingCubesSingleDomain has no implementation for runtime policy {}", - runtimePolicy)); - } - return impl; -} - -} // end namespace marching_cubes -} // end namespace detail -} // end namespace quest -} // end namespace axom diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp similarity index 95% rename from src/axom/quest/detail/MarchingCubesFullParallel.hpp rename to src/axom/quest/detail/MarchingCubesImpl.hpp index c6a4f2b800..f2c6117540 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -7,7 +7,7 @@ // Implementation requires Conduit. #ifndef AXOM_USE_CONDUIT - #error "MarchingCubesFullParallel.hpp requires conduit" + #error "MarchingCubesImpl.hpp requires conduit" #endif #include "conduit_blueprint.hpp" @@ -37,10 +37,10 @@ namespace marching_cubes axom::CUDA_EXEC<256>. See MarchingCubesImpl for the difference between that class and - MarchingCubesFullParallel. + MarchingCubesImpl. */ template -class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase +class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { public: using Point = axom::primal::Point; @@ -172,7 +172,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase } /*! - @brief Implementation used by MarchingCubesFullParallel::markCrossings_dim() + @brief Implementation used by MarchingCubesImpl::markCrossings_dim() containing just the objects needed for that part, to be made available on devices. */ @@ -511,7 +511,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase } /*! - @brief Implementation used by MarchingCubesFullParallel::computeContour(). + @brief Implementation used by MarchingCubesImpl::computeContour(). containing just the objects needed for that part, to be made available on devices. */ @@ -763,7 +763,7 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase /*! @brief Constructor. */ - MarchingCubesFullParallel() + MarchingCubesImpl() { } private: @@ -804,11 +804,11 @@ class MarchingCubesFullParallel : public MarchingCubesSingleDomain::ImplBase }; /*! - @brief Allocate a MarchingCubesFullParallel object, template-specialized + @brief Allocate a MarchingCubesImpl object, template-specialized for caller-specified runtime policy and physical dimension. */ static std::unique_ptr -newMarchingCubesFullParallel(MarchingCubes::RuntimePolicy runtimePolicy, int dim) +newMarchingCubesImpl(MarchingCubes::RuntimePolicy runtimePolicy, int dim) { using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; @@ -817,35 +817,35 @@ newMarchingCubesFullParallel(MarchingCubes::RuntimePolicy runtimePolicy, int dim if(runtimePolicy == MarchingCubes::RuntimePolicy::seq) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesFullParallel<2, axom::SEQ_EXEC, axom::SEQ_EXEC>) + new MarchingCubesImpl<2, axom::SEQ_EXEC, axom::SEQ_EXEC>) : std::unique_ptr( - new MarchingCubesFullParallel<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); + new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); } #ifdef AXOM_RUNTIME_POLICY_USE_OPENMP else if(runtimePolicy == MarchingCubes::RuntimePolicy::omp) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesFullParallel<2, axom::OMP_EXEC, axom::SEQ_EXEC>) + new MarchingCubesImpl<2, axom::OMP_EXEC, axom::SEQ_EXEC>) : std::unique_ptr( - new MarchingCubesFullParallel<3, axom::OMP_EXEC, axom::SEQ_EXEC>); + new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_CUDA else if(runtimePolicy == MarchingCubes::RuntimePolicy::cuda) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesFullParallel<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>) + new MarchingCubesImpl<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>) : std::unique_ptr( - new MarchingCubesFullParallel<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); + new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_HIP else if(runtimePolicy == MarchingCubes::RuntimePolicy::hip) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesFullParallel<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>) + new MarchingCubesImpl<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>) : std::unique_ptr( - new MarchingCubesFullParallel<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>); + new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>); } #endif else From 2fcc51ad8e61253e1c8487c4aada581c9570f3a3 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Fri, 26 Jan 2024 15:55:49 -0800 Subject: [PATCH 409/639] Minor changes while reviewing sidre::Attribute functionality --- src/axom/sidre/core/AttrValues.cpp | 36 ++++++++---------------- src/axom/sidre/core/AttrValues.hpp | 24 +++++++--------- src/axom/sidre/core/DataStore.hpp | 25 ++++++---------- src/axom/sidre/tests/sidre_attribute.cpp | 5 ++-- 4 files changed, 31 insertions(+), 59 deletions(-) diff --git a/src/axom/sidre/core/AttrValues.cpp b/src/axom/sidre/core/AttrValues.cpp index 6901b1a69f..d785074b3d 100644 --- a/src/axom/sidre/core/AttrValues.cpp +++ b/src/axom/sidre/core/AttrValues.cpp @@ -35,33 +35,21 @@ namespace sidre */ bool AttrValues::hasValue(const Attribute* attr) const { - if(attr == nullptr) + // check for empty values + if(attr == nullptr || m_values == nullptr) { return false; } - if(m_values == nullptr) - { - // No attributes have been set in this View. - return false; - } - - IndexType iattr = attr->getIndex(); - - if((size_t)iattr >= m_values->size()) + const auto iattr = static_cast(attr->getIndex()); + if(iattr >= m_values->size()) { // This attribute has not been set for this View. return false; } Node& value = (*m_values)[iattr]; - - if(isEmpty(value)) - { - return false; - } - - return true; + return !isEmpty(value); } /* @@ -87,9 +75,8 @@ bool AttrValues::setToDefault(const Attribute* attr) return true; } - IndexType iattr = attr->getIndex(); - - if((size_t)iattr >= m_values->size()) + const auto iattr = static_cast(attr->getIndex()); + if(iattr >= m_values->size()) { // This attribute has not been set for this View, already default. return true; @@ -117,13 +104,13 @@ bool AttrValues::createNode(IndexType iattr) m_values = new(std::nothrow) Values(); } - if((size_t)iattr >= m_values->size()) + if(static_cast(iattr) >= m_values->size()) { // Create all attributes up to iattr, push back empty Nodes m_values->reserve(iattr + 1); for(int n = m_values->size(); n < iattr + 1; ++n) { - m_values->push_back(Node()); + m_values->emplace_back(Node()); } } @@ -192,9 +179,8 @@ const Node& AttrValues::getValueNodeRef(const Attribute* attr) const return attr->getDefaultNodeRef(); } - IndexType iattr = attr->getIndex(); - - if((size_t)iattr >= m_values->size()) + const auto iattr = static_cast(attr->getIndex()); + if(iattr >= m_values->size()) { // This attribute has not been set for this View return attr->getDefaultNodeRef(); diff --git a/src/axom/sidre/core/AttrValues.hpp b/src/axom/sidre/core/AttrValues.hpp index f5ff8b5880..1014c96b2e 100644 --- a/src/axom/sidre/core/AttrValues.hpp +++ b/src/axom/sidre/core/AttrValues.hpp @@ -58,16 +58,12 @@ class View; * avoid multiple messages for the same error. For example, if the * index cannot be converted to an Attribute pointer in the View * class, an error message will be printing and then a NULL pointer - * passed to the AttrValues class which will not print another - * message. + * passed to the AttrValues class which will not print another message. */ class AttrValues { public: - /*! - * Friend declarations to constrain usage via controlled access to - * private members. - */ + /// Friend declarations to constrain usage via controlled access to private members. friend class View; private: @@ -106,7 +102,7 @@ class AttrValues template bool setScalar(const Attribute* attr, ScalarType value) { - DataTypeId arg_id = detail::SidreTT::id; + const DataTypeId arg_id = detail::SidreTT::id; if(arg_id != attr->getTypeID()) { SLIC_CHECK_MSG(arg_id == attr->getTypeID(), @@ -117,8 +113,8 @@ class AttrValues return false; } - IndexType iattr = attr->getIndex(); - bool ok = createNode(iattr); + const IndexType iattr = attr->getIndex(); + const bool ok = createNode(iattr); if(ok) { (*m_values)[iattr] = value; @@ -131,7 +127,7 @@ class AttrValues */ bool setString(const Attribute* attr, const std::string& value) { - DataTypeId arg_id = CHAR8_STR_ID; + const DataTypeId arg_id = CHAR8_STR_ID; if(arg_id != attr->getTypeID()) { SLIC_CHECK_MSG(arg_id == attr->getTypeID(), @@ -142,8 +138,8 @@ class AttrValues return false; } - IndexType iattr = attr->getIndex(); - bool ok = createNode(iattr); + const IndexType iattr = attr->getIndex(); + const bool ok = createNode(iattr); if(ok) { (*m_values)[iattr] = value; @@ -159,8 +155,8 @@ class AttrValues */ bool setNode(const Attribute* attr, const Node& node) { - IndexType iattr = attr->getIndex(); - bool ok = createNode(iattr); + const IndexType iattr = attr->getIndex(); + const bool ok = createNode(iattr); if(ok) { (*m_values)[iattr] = node; diff --git a/src/axom/sidre/core/DataStore.hpp b/src/axom/sidre/core/DataStore.hpp index d9c9f1610e..7622740afc 100644 --- a/src/axom/sidre/core/DataStore.hpp +++ b/src/axom/sidre/core/DataStore.hpp @@ -279,7 +279,7 @@ class DataStore IndexType getNumAttributes() const; /*! - * \brief Create a Attribute object with a default scalar value. + * \brief Create an Attribute object with a default scalar value. * * The Attribute object is assigned a unique index when created and the * Attribute object is owned by the DataStore object. @@ -297,7 +297,7 @@ class DataStore } /*! - * \brief Create a Attribute object with a default string value. + * \brief Create an Attribute object with a default string value. * * The Attribute object is assigned a unique index when created and the * Attribute object is owned by the DataStore object. @@ -313,20 +313,14 @@ class DataStore return new_attribute; } - /*! - * \brief Return true if DataStore has created attribute name; else false. - */ + /// \brief Return true if DataStore has created attribute name, else false bool hasAttribute(const std::string& name) const; - /*! - * \brief Return true if DataStore has created attribute with index; else - * false. - */ + /// \brief Return true if DataStore has created attribute with index, else false bool hasAttribute(IndexType idx) const; /*! - * \brief Remove Attribute from the DataStore and destroy it and - * its data. + * \brief Remove Attribute from the DataStore and destroy it and its data. * * \note Destruction of an Attribute detaches it from all Views to * which it is attached. @@ -343,8 +337,7 @@ class DataStore void destroyAttribute(IndexType idx); /*! - * \brief Remove Attribute from the DataStore and destroy it and - * its data. + * \brief Remove Attribute from the DataStore and destroy it and its data. * * \note Destruction of an Attribute detaches it from all Views to * which it is attached. @@ -352,8 +345,7 @@ class DataStore void destroyAttribute(Attribute* attr); /*! - * \brief Remove all Attributes from the DataStore and destroy them - * and their data. + * \brief Remove all Attributes from the DataStore and destroy them and their data. * * \note Destruction of an Attribute detaches it from all Views to * which it is attached. @@ -434,8 +426,7 @@ class DataStore /*! * \brief Return next valid Attribute index in DataStore object after given - * index (i.e., smallest index over all Attribute indices larger than given - * one). + * index (i.e., smallest index over all Attribute indices larger than given one). * * sidre::InvalidIndex is returned if there is no valid index greater * than given one. diff --git a/src/axom/sidre/tests/sidre_attribute.cpp b/src/axom/sidre/tests/sidre_attribute.cpp index c0e276b7b7..8f69d10e46 100644 --- a/src/axom/sidre/tests/sidre_attribute.cpp +++ b/src/axom/sidre/tests/sidre_attribute.cpp @@ -3,7 +3,7 @@ // // SPDX-License-Identifier: (BSD-3-Clause) -#include "axom/config.hpp" // for AXOM_USE_HDF5 +#include "axom/config.hpp" #include "axom/sidre.hpp" #include "axom/fmt.hpp" @@ -916,8 +916,7 @@ TEST(sidre_attribute, save_by_attribute) // Create a deep path with and without attribute root1->createViewScalar("grp1a/grp1b/view3", 3); - root1->createViewScalar("grp2a/view4", 4); // make sure empty "views" not - // saved + root1->createViewScalar("grp2a/view4", 4); // make sure empty "views" not saved root1->createViewScalar("grp2a/grp2b/view5", 5) ->setAttributeScalar(dump, g_dump_yes); From ceada96c7ed7706d97bc561c53b33719bf0ca2c6 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Fri, 26 Jan 2024 17:33:55 -0800 Subject: [PATCH 410/639] Bugfix for loading groups with attributes into datastores with existing attributes Only create attributes if they don't already exist. In either case, overwrite the default values using values from file. --- src/axom/sidre/core/DataStore.cpp | 13 +- src/axom/sidre/core/DataStore.hpp | 4 +- src/axom/sidre/tests/sidre_attribute.cpp | 173 +++++++++++++++++++++++ 3 files changed, 179 insertions(+), 11 deletions(-) diff --git a/src/axom/sidre/core/DataStore.cpp b/src/axom/sidre/core/DataStore.cpp index 838569c751..ab87905f32 100644 --- a/src/axom/sidre/core/DataStore.cpp +++ b/src/axom/sidre/core/DataStore.cpp @@ -637,14 +637,9 @@ bool DataStore::saveAttributeLayout(Node& node) const bool hasAttributes = false; - IndexType aidx = getFirstValidAttributeIndex(); - while(indexIsValid(aidx)) + for(const auto& attr : attributes()) { - const Attribute* attr = getAttribute(aidx); - - node[attr->getName()] = attr->getDefaultNodeRef(); - - aidx = getNextValidAttributeIndex(aidx); + node[attr.getName()] = attr.getDefaultNodeRef(); hasAttributes = true; } @@ -670,7 +665,9 @@ void DataStore::loadAttributeLayout(Node& node) Node& n_attr = attrs_itr.next(); std::string attr_name = attrs_itr.name(); - Attribute* attr = createAttributeEmpty(attr_name); + auto* attr = !hasAttribute(attr_name) ? createAttributeEmpty(attr_name) + : getAttribute(attr_name); + attr->setDefaultNodeRef(n_attr); } } diff --git a/src/axom/sidre/core/DataStore.hpp b/src/axom/sidre/core/DataStore.hpp index 7622740afc..e4b6b673cc 100644 --- a/src/axom/sidre/core/DataStore.hpp +++ b/src/axom/sidre/core/DataStore.hpp @@ -391,9 +391,7 @@ class DataStore */ bool saveAttributeLayout(Node& node) const; - /*! - * \brief Create attributes from name/value pairs in node["attribute"]. - */ + /// \brief Create attributes from name/value pairs in node["attribute"]. void loadAttributeLayout(Node& node); //@} diff --git a/src/axom/sidre/tests/sidre_attribute.cpp b/src/axom/sidre/tests/sidre_attribute.cpp index 8f69d10e46..6d0d782264 100644 --- a/src/axom/sidre/tests/sidre_attribute.cpp +++ b/src/axom/sidre/tests/sidre_attribute.cpp @@ -16,6 +16,8 @@ using axom::sidre::DataStore; using axom::sidre::DOUBLE_ID; using axom::sidre::Group; using axom::sidre::IndexType; +using axom::sidre::INT32_ID; +using axom::sidre::INT64_ID; using axom::sidre::INT_ID; using axom::sidre::InvalidIndex; using axom::sidre::Node; @@ -61,6 +63,8 @@ const std::string g_protocols[] = {"sidre_json", "json"}; // TEST(sidre_attribute, create_attr) { + SLIC_INFO("Some warnings are expected in the 'create_attr' test"); + bool ok; DataStore* ds = new DataStore(); @@ -162,6 +166,8 @@ TEST(sidre_attribute, create_attr) TEST(sidre_attribute, view_attr) { + SLIC_INFO("Some warnings are expected in the 'view_attr' test"); + // Note: This test relies on re-wiring conduit error handlers DataStore::setConduitSLICMessageHandlers(); @@ -302,6 +308,8 @@ TEST(sidre_attribute, view_attr) TEST(sidre_attribute, view_int_and_double) { + SLIC_INFO("Some warnings are expected in the 'view_int_and_double' test"); + // Note: This test relies on re-wiring conduit error handlers DataStore::setConduitSLICMessageHandlers(); @@ -377,6 +385,8 @@ TEST(sidre_attribute, view_int_and_double) TEST(sidre_attribute, set_default) { + SLIC_INFO("Some warnings are expected in the 'set_default' test"); + bool ok; DataStore* ds = new DataStore(); @@ -436,6 +446,8 @@ TEST(sidre_attribute, set_default) TEST(sidre_attribute, as_node) { + SLIC_INFO("Some warnings are expected in the 'as_node' test"); + bool ok; DataStore* ds = new DataStore(); @@ -475,6 +487,8 @@ TEST(sidre_attribute, as_node) TEST(sidre_attribute, overloads) { + SLIC_INFO("Some warnings are expected in the 'overloads' test"); + // Note: This test relies on re-wiring conduit error handlers DataStore::setConduitSLICMessageHandlers(); @@ -970,3 +984,162 @@ TEST(sidre_attribute, save_by_attribute) delete ds2; } } + +TEST(sidre_attribute, save_load_group_with_attributes_new_ds) +{ + const std::string protocol = "sidre_json"; + const std::string filename = "saveFile.json"; + + axom::sidre::DataStore ds1; + axom::sidre::DataStore ds2; + + // set up first datastore and save to disk + { + ds1.createAttributeScalar("attr", 10); + ds1.createAttributeString(g_name_color, g_color_none); // create the attribute + + auto* gr = ds1.getRoot()->createGroup("gr"); + gr->createViewScalar("scalar1", 1); + gr->createViewScalar("scalar2", 2)->setAttributeString(g_name_color, g_color_red); + gr->createViewScalar("scalar3", 3)->setAttributeString(g_name_color, g_color_blue); + + EXPECT_EQ(2, ds1.getNumAttributes()); + EXPECT_TRUE(INT32_ID == ds1.getAttribute("attr")->getTypeID() || + INT64_ID == ds1.getAttribute("attr")->getTypeID()); + EXPECT_EQ(CHAR8_STR_ID, ds1.getAttribute(g_name_color)->getTypeID()); + + EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); + + EXPECT_TRUE(gr->getView("scalar2")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_red, + gr->getView("scalar2")->getAttributeString(g_name_color)); + + EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_blue, + gr->getView("scalar3")->getAttributeString(g_name_color)); + + gr->save(filename, protocol); + } + + // load second datastore from saved data + { + auto* gr = ds2.getRoot()->createGroup("gr"); + gr->load(filename, protocol); + + EXPECT_EQ(2, ds2.getNumAttributes()); + EXPECT_TRUE(INT32_ID == ds2.getAttribute("attr")->getTypeID() || + INT64_ID == ds2.getAttribute("attr")->getTypeID()); + + EXPECT_EQ(CHAR8_STR_ID, ds2.getAttribute(g_name_color)->getTypeID()); + + EXPECT_TRUE(gr->hasView("scalar1")); + EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); + + EXPECT_TRUE(gr->hasView("scalar2")); + EXPECT_TRUE(gr->getView("scalar2")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_red, + gr->getView("scalar2")->getAttributeString(g_name_color)); + + EXPECT_TRUE(gr->hasView("scalar3")); + EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_blue, + gr->getView("scalar3")->getAttributeString(g_name_color)); + } + + EXPECT_EQ(ds1.getNumAttributes(), ds2.getNumAttributes()); + EXPECT_EQ(ds1.getAttribute(g_name_color)->getName(), + ds2.getAttribute(g_name_color)->getName()); + EXPECT_EQ(ds1.getAttribute(g_name_color)->getTypeID(), + ds2.getAttribute(g_name_color)->getTypeID()); + EXPECT_EQ(ds1.getAttribute(g_name_color)->getDefaultNodeRef().to_string(), + ds2.getAttribute(g_name_color)->getDefaultNodeRef().to_string()); +} + +TEST(sidre_attribute, save_load_group_with_attributes_same_ds) +{ + const std::string protocol = "sidre_json"; + const std::string filename = "saveFile.json"; + + axom::sidre::DataStore ds; + + // create the attributes + ds.createAttributeScalar("attr", 10); + ds.createAttributeString(g_name_color, g_color_none); + + // attach some attributes to views + auto* gr = ds.getRoot()->createGroup("gr"); + gr->createViewScalar("scalar1", 1); + gr->createViewScalar("scalar2", 2)->setAttributeString(g_name_color, g_color_red); + gr->createViewScalar("scalar3", 3)->setAttributeString(g_name_color, g_color_blue); + + EXPECT_EQ(2, ds.getNumAttributes()); + + EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); + + EXPECT_TRUE(gr->getView("scalar2")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_red, + gr->getView("scalar2")->getAttributeString(g_name_color)); + + EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_blue, + gr->getView("scalar3")->getAttributeString(g_name_color)); + + gr->save(filename, protocol); + + { + gr->load(filename, protocol); + + // Check that things are still as expected after loading + EXPECT_EQ(2, ds.getNumAttributes()); + + EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); + + EXPECT_TRUE(gr->getView("scalar2")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_red, + gr->getView("scalar2")->getAttributeString(g_name_color)); + + EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_blue, + gr->getView("scalar3")->getAttributeString(g_name_color)); + } + + // check that changes to attributes get overwritten when loading + { + // modify/remove some attributes before loading + ds.destroyAttribute("attr"); + gr->getView("scalar1")->setAttributeString(g_name_color, g_color_red); + gr->getView("scalar2")->setAttributeToDefault(g_name_color); + gr->getView("scalar3")->setAttributeString(g_name_color, g_color_red); + + EXPECT_EQ(1, ds.getNumAttributes()); + + // reload group from file; this should revert changes + gr->load(filename, protocol); + + // Check that things are reverted after loading + EXPECT_EQ(2, ds.getNumAttributes()); + + EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); + + EXPECT_TRUE(gr->getView("scalar2")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_red, + gr->getView("scalar2")->getAttributeString(g_name_color)); + + EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_blue, + gr->getView("scalar3")->getAttributeString(g_name_color)); + } +} + +//------------------------------------------------------------------------------ +int main(int argc, char* argv[]) +{ + int result = 0; + + ::testing::InitGoogleTest(&argc, argv); + axom::slic::SimpleLogger logger; + + result = RUN_ALL_TESTS(); + + return result; +} From 249f458965ec8c232ac6357f3a3a5ff2656300c6 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Sun, 28 Jan 2024 15:27:39 -0800 Subject: [PATCH 411/639] Tests all supported protocols in sidre attribute save/load tests --- src/axom/sidre/tests/sidre_attribute.cpp | 249 ++++++++++++++--------- 1 file changed, 150 insertions(+), 99 deletions(-) diff --git a/src/axom/sidre/tests/sidre_attribute.cpp b/src/axom/sidre/tests/sidre_attribute.cpp index 6d0d782264..59a545339c 100644 --- a/src/axom/sidre/tests/sidre_attribute.cpp +++ b/src/axom/sidre/tests/sidre_attribute.cpp @@ -4,6 +4,7 @@ // SPDX-License-Identifier: (BSD-3-Clause) #include "axom/config.hpp" +#include "axom/core.hpp" #include "axom/sidre.hpp" #include "axom/fmt.hpp" @@ -58,6 +59,11 @@ const int g_nprotocols = 2; const std::string g_protocols[] = {"sidre_json", "json"}; #endif +const std::set g_protocol_saves_attributes {"sidre_hdf5", + "sidre_conduit_json", + "sidre_json", + "sidre_layout_json"}; + //------------------------------------------------------------------------------ // Create attribute in a Datastore // @@ -987,109 +993,125 @@ TEST(sidre_attribute, save_by_attribute) TEST(sidre_attribute, save_load_group_with_attributes_new_ds) { - const std::string protocol = "sidre_json"; - const std::string filename = "saveFile.json"; - - axom::sidre::DataStore ds1; - axom::sidre::DataStore ds2; + using axom::utilities::string::endsWith; - // set up first datastore and save to disk + for(const auto& protocol : g_protocols) { - ds1.createAttributeScalar("attr", 10); - ds1.createAttributeString(g_name_color, g_color_none); // create the attribute + axom::sidre::DataStore ds1, ds2; - auto* gr = ds1.getRoot()->createGroup("gr"); - gr->createViewScalar("scalar1", 1); - gr->createViewScalar("scalar2", 2)->setAttributeString(g_name_color, g_color_red); - gr->createViewScalar("scalar3", 3)->setAttributeString(g_name_color, g_color_blue); + const std::string ext = endsWith(protocol, "hdf5") ? "hdf5" : "json"; + const std::string filename = + axom::fmt::format("saveFile_{}.{}", protocol, ext); - EXPECT_EQ(2, ds1.getNumAttributes()); - EXPECT_TRUE(INT32_ID == ds1.getAttribute("attr")->getTypeID() || - INT64_ID == ds1.getAttribute("attr")->getTypeID()); - EXPECT_EQ(CHAR8_STR_ID, ds1.getAttribute(g_name_color)->getTypeID()); + SLIC_INFO(axom::fmt::format( + "Checking attribute save/load w/ protocol '{}' using file '{}'", + protocol, + filename)); - EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); - - EXPECT_TRUE(gr->getView("scalar2")->hasAttributeValue(g_name_color)); - EXPECT_EQ(g_color_red, - gr->getView("scalar2")->getAttributeString(g_name_color)); + // set up first datastore and save to disk + { + // create the attributes + ds1.createAttributeScalar("attr", 10); + ds1.createAttributeString(g_name_color, g_color_none); + + // create groups/views and attach attributes + auto* gr = ds1.getRoot()->createGroup("gr"); + gr->createViewScalar("scalar1", 1); + gr->createViewScalar("scalar2", 2) + ->setAttributeString(g_name_color, g_color_red); + gr->createViewScalar("scalar3", 3) + ->setAttributeString(g_name_color, g_color_blue); + + EXPECT_EQ(2, ds1.getNumAttributes()); + EXPECT_TRUE(INT32_ID == ds1.getAttribute("attr")->getTypeID() || + INT64_ID == ds1.getAttribute("attr")->getTypeID()); + EXPECT_EQ(CHAR8_STR_ID, ds1.getAttribute(g_name_color)->getTypeID()); + + EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); + + EXPECT_TRUE(gr->getView("scalar2")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_red, + gr->getView("scalar2")->getAttributeString(g_name_color)); + + EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_blue, + gr->getView("scalar3")->getAttributeString(g_name_color)); + + gr->save(filename, protocol); + } - EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); - EXPECT_EQ(g_color_blue, - gr->getView("scalar3")->getAttributeString(g_name_color)); + if(g_protocol_saves_attributes.find(protocol) == + g_protocol_saves_attributes.end()) + { + SLIC_INFO( + axom::fmt::format("Skipping attribute load tests for protocol '{}' -- " + "it doesn't support saving attributes", + protocol)); + continue; + } - gr->save(filename, protocol); - } + // load second datastore from saved data + { + auto* gr = ds2.getRoot()->createGroup("gr"); + gr->load(filename, protocol); - // load second datastore from saved data - { - auto* gr = ds2.getRoot()->createGroup("gr"); - gr->load(filename, protocol); + EXPECT_EQ(2, ds2.getNumAttributes()); + EXPECT_TRUE(INT32_ID == ds2.getAttribute("attr")->getTypeID() || + INT64_ID == ds2.getAttribute("attr")->getTypeID()); - EXPECT_EQ(2, ds2.getNumAttributes()); - EXPECT_TRUE(INT32_ID == ds2.getAttribute("attr")->getTypeID() || - INT64_ID == ds2.getAttribute("attr")->getTypeID()); + EXPECT_EQ(CHAR8_STR_ID, ds2.getAttribute(g_name_color)->getTypeID()); - EXPECT_EQ(CHAR8_STR_ID, ds2.getAttribute(g_name_color)->getTypeID()); + EXPECT_TRUE(gr->hasView("scalar1")); + EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); - EXPECT_TRUE(gr->hasView("scalar1")); - EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); + EXPECT_TRUE(gr->hasView("scalar2")); + EXPECT_TRUE(gr->getView("scalar2")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_red, + gr->getView("scalar2")->getAttributeString(g_name_color)); - EXPECT_TRUE(gr->hasView("scalar2")); - EXPECT_TRUE(gr->getView("scalar2")->hasAttributeValue(g_name_color)); - EXPECT_EQ(g_color_red, - gr->getView("scalar2")->getAttributeString(g_name_color)); + EXPECT_TRUE(gr->hasView("scalar3")); + EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_blue, + gr->getView("scalar3")->getAttributeString(g_name_color)); + } - EXPECT_TRUE(gr->hasView("scalar3")); - EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); - EXPECT_EQ(g_color_blue, - gr->getView("scalar3")->getAttributeString(g_name_color)); + EXPECT_EQ(ds1.getNumAttributes(), ds2.getNumAttributes()); + EXPECT_EQ(ds1.getAttribute(g_name_color)->getName(), + ds2.getAttribute(g_name_color)->getName()); + EXPECT_EQ(ds1.getAttribute(g_name_color)->getTypeID(), + ds2.getAttribute(g_name_color)->getTypeID()); + EXPECT_EQ(ds1.getAttribute(g_name_color)->getDefaultNodeRef().to_string(), + ds2.getAttribute(g_name_color)->getDefaultNodeRef().to_string()); } - - EXPECT_EQ(ds1.getNumAttributes(), ds2.getNumAttributes()); - EXPECT_EQ(ds1.getAttribute(g_name_color)->getName(), - ds2.getAttribute(g_name_color)->getName()); - EXPECT_EQ(ds1.getAttribute(g_name_color)->getTypeID(), - ds2.getAttribute(g_name_color)->getTypeID()); - EXPECT_EQ(ds1.getAttribute(g_name_color)->getDefaultNodeRef().to_string(), - ds2.getAttribute(g_name_color)->getDefaultNodeRef().to_string()); } TEST(sidre_attribute, save_load_group_with_attributes_same_ds) { - const std::string protocol = "sidre_json"; - const std::string filename = "saveFile.json"; - - axom::sidre::DataStore ds; - - // create the attributes - ds.createAttributeScalar("attr", 10); - ds.createAttributeString(g_name_color, g_color_none); + using axom::utilities::string::endsWith; - // attach some attributes to views - auto* gr = ds.getRoot()->createGroup("gr"); - gr->createViewScalar("scalar1", 1); - gr->createViewScalar("scalar2", 2)->setAttributeString(g_name_color, g_color_red); - gr->createViewScalar("scalar3", 3)->setAttributeString(g_name_color, g_color_blue); - - EXPECT_EQ(2, ds.getNumAttributes()); - - EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); + for(const auto& protocol : g_protocols) + { + axom::sidre::DataStore ds; - EXPECT_TRUE(gr->getView("scalar2")->hasAttributeValue(g_name_color)); - EXPECT_EQ(g_color_red, - gr->getView("scalar2")->getAttributeString(g_name_color)); + const std::string ext = endsWith(protocol, "hdf5") ? "hdf5" : "json"; + const std::string filename = + axom::fmt::format("saveFile_{}.{}", protocol, ext); - EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); - EXPECT_EQ(g_color_blue, - gr->getView("scalar3")->getAttributeString(g_name_color)); + SLIC_INFO(axom::fmt::format( + "Checking attribute save/load w/ protocol '{}' using file '{}'", + protocol, + filename)); - gr->save(filename, protocol); + // create the attributes + ds.createAttributeScalar("attr", 10); + ds.createAttributeString(g_name_color, g_color_none); - { - gr->load(filename, protocol); + // attach some attributes to views + auto* gr = ds.getRoot()->createGroup("gr"); + gr->createViewScalar("scalar1", 1); + gr->createViewScalar("scalar2", 2)->setAttributeString(g_name_color, g_color_red); + gr->createViewScalar("scalar3", 3)->setAttributeString(g_name_color, g_color_blue); - // Check that things are still as expected after loading EXPECT_EQ(2, ds.getNumAttributes()); EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); @@ -1101,33 +1123,62 @@ TEST(sidre_attribute, save_load_group_with_attributes_same_ds) EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); EXPECT_EQ(g_color_blue, gr->getView("scalar3")->getAttributeString(g_name_color)); - } - // check that changes to attributes get overwritten when loading - { - // modify/remove some attributes before loading - ds.destroyAttribute("attr"); - gr->getView("scalar1")->setAttributeString(g_name_color, g_color_red); - gr->getView("scalar2")->setAttributeToDefault(g_name_color); - gr->getView("scalar3")->setAttributeString(g_name_color, g_color_red); + gr->save(filename, protocol); - EXPECT_EQ(1, ds.getNumAttributes()); + if(g_protocol_saves_attributes.find(protocol) == + g_protocol_saves_attributes.end()) + { + SLIC_INFO( + axom::fmt::format("Skipping attribute load tests for protocol '{}' -- " + "it doesn't support saving attributes", + protocol)); + continue; + } - // reload group from file; this should revert changes - gr->load(filename, protocol); + { + gr->load(filename, protocol); - // Check that things are reverted after loading - EXPECT_EQ(2, ds.getNumAttributes()); + // Check that things are still as expected after loading + EXPECT_EQ(2, ds.getNumAttributes()); - EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); + EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); - EXPECT_TRUE(gr->getView("scalar2")->hasAttributeValue(g_name_color)); - EXPECT_EQ(g_color_red, - gr->getView("scalar2")->getAttributeString(g_name_color)); + EXPECT_TRUE(gr->getView("scalar2")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_red, + gr->getView("scalar2")->getAttributeString(g_name_color)); - EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); - EXPECT_EQ(g_color_blue, - gr->getView("scalar3")->getAttributeString(g_name_color)); + EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_blue, + gr->getView("scalar3")->getAttributeString(g_name_color)); + } + + // check that changes to attributes get overwritten when loading + { + // modify/remove some attributes before loading + ds.destroyAttribute("attr"); + gr->getView("scalar1")->setAttributeString(g_name_color, g_color_red); + gr->getView("scalar2")->setAttributeToDefault(g_name_color); + gr->getView("scalar3")->setAttributeString(g_name_color, g_color_red); + + EXPECT_EQ(1, ds.getNumAttributes()); + + // reload group from file; this should revert changes + gr->load(filename, protocol); + + // Check that things are reverted after loading + EXPECT_EQ(2, ds.getNumAttributes()); + + EXPECT_FALSE(gr->getView("scalar1")->hasAttributeValue(g_name_color)); + + EXPECT_TRUE(gr->getView("scalar2")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_red, + gr->getView("scalar2")->getAttributeString(g_name_color)); + + EXPECT_TRUE(gr->getView("scalar3")->hasAttributeValue(g_name_color)); + EXPECT_EQ(g_color_blue, + gr->getView("scalar3")->getAttributeString(g_name_color)); + } } } From 3cd50fd72ef5d373058e81546110b23690a8407c Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Sun, 28 Jan 2024 15:29:45 -0800 Subject: [PATCH 412/639] Update RELEASE-NOTES --- RELEASE-NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 5b8cfc8bb2..fab6fdef1f 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -59,6 +59,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - primal's `Polygon` area computation in 3D previously only worked when the polygon was aligned with the XY-plane. It now works for arbitrary polygons. - Upgrades our `vcpkg` usage for automated Windows builds of our TPLs to its [2023.12.12 release](https://github.com/microsoft/vcpkg/releases/tag/2023.12.12) - Fixed a bug in the bounds checks for `primal::clip(Triangle, BoundingBox)` +- Fixed a bug when loading Sidre groups with attributes that already exist ## [Version 0.8.1] - Release date 2023-08-16 From eb9b87d52aeb59a5666920006d7c88d82f940b6e Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 26 Jan 2024 12:51:24 -0800 Subject: [PATCH 413/639] Fix some issues with where memory is and getting output data. --- src/axom/quest/ArrayIndexer.hpp | 7 +- src/axom/quest/DistributedClosestPoint.hpp | 2 +- src/axom/quest/MarchingCubes.cpp | 131 ++++++++++-------- src/axom/quest/MarchingCubes.hpp | 119 ++++++++++++---- src/axom/quest/detail/MarchingCubesImpl.hpp | 33 +++-- .../examples/quest_marching_cubes_example.cpp | 103 ++++++-------- 6 files changed, 242 insertions(+), 153 deletions(-) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index 84e417e9bf..0b627511c3 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -73,7 +73,7 @@ class ArrayIndexer m_strides[d] = m_strides[d + 1] * shape[d + 1]; } } - SLIC_ASSERT((DIM == 1 && getOrder() == 'r' | 's') || (getOrder() == order)); + SLIC_ASSERT((DIM == 1 && getOrder() == ('r' | 's')) || (getOrder() == order)); } //!@brief Initialize for arbitrary-stride indexing. @@ -90,7 +90,10 @@ class ArrayIndexer { if(m_strides[m_slowestDirs[s]] < m_strides[m_slowestDirs[d]]) { - std::swap(m_slowestDirs[s], m_slowestDirs[d]); + // Swap values. + auto tmp = m_slowestDirs[s]; + m_slowestDirs[s] = m_slowestDirs[d]; + m_slowestDirs[d] = tmp; } } } diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index 35b4009a01..0d6d070223 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -78,7 +78,7 @@ class DistributedClosestPoint /*! @brief Sets the allocator ID. If not explitly set, the allocator ID is the default is the id - associated with the runtimer policy. + associated with the runtime policy. */ void setAllocatorID(int allocatorID); diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 1733531ac1..8a86747c27 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -21,12 +21,15 @@ namespace axom { namespace quest { + MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, + int allocatorID, MarchingCubesDataParallelism dataParallelism, const conduit::Node& bpMesh, const std::string& topologyName, const std::string& maskField) : m_runtimePolicy(runtimePolicy) + , m_allocatorID(allocatorID) , m_dataParallelism(dataParallelism) , m_singles() , m_topologyName(topologyName) @@ -43,6 +46,7 @@ MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, for(auto& dom : bpMesh.children()) { m_singles.emplace_back(new MarchingCubesSingleDomain(m_runtimePolicy, + m_allocatorID, m_dataParallelism, dom, m_topologyName, @@ -116,10 +120,33 @@ axom::IndexType MarchingCubes::getContourNodeCount() const return contourNodeCount; } +/* + Domain ids are provided as a new Array instead of ArrayView because + we don't store it internally. +*/ +axom::Array MarchingCubes::getContourFacetDomainIds( + int allocatorID) const +{ + // Put parent domain ids into a new Array. + const axom::IndexType len = getContourCellCount(); + axom::Array rval(len, len, allocatorID != axom::INVALID_ALLOCATOR_ID ? + allocatorID : m_allocatorID); + for(int d = 0; d < m_singles.size(); ++d) + { + axom::detail::ArrayOps::fill( + rval.data(), + m_facetIndexOffsets[d], + m_singles[d]->getContourCellCount(), + m_allocatorID, + m_singles[d]->getDomainId(d)); + } + return rval; +} + void MarchingCubes::populateContourMesh( axom::mint::UnstructuredMesh& mesh, const std::string& cellIdField, - const std::string& domainIdField) + const std::string& domainIdField) const { if(!cellIdField.empty() && !mesh.hasField(cellIdField, axom::mint::CELL_CENTERED)) @@ -141,86 +168,75 @@ void MarchingCubes::populateContourMesh( mesh.reserveNodes(contourNodeCount); if (m_facetCount) { - mesh.appendCells(m_facetNodeIds.data(), m_facetCount); - mesh.appendNodes(m_facetNodeCoords.data(), mesh.getDimension()*m_facetCount); - - axom::IndexType* cellIdPtr = - mesh.getFieldPtr(cellIdField, - axom::mint::CELL_CENTERED); - axom::copy(cellIdPtr, - m_facetParentIds.data(), - m_facetCount*sizeof(axom::IndexType)); - - // TODO: Move domain id stuff into a separate function. - auto* domainIdPtr = - mesh.getFieldPtr(domainIdField, - axom::mint::CELL_CENTERED); - for(int d = 0; d < m_singles.size(); ++d) + // Put nodes and cells into the mesh. + // If data is not in host memory, copy to temporary host memory first. + axom::MemorySpace internalMemorySpace = axom::detail::getAllocatorSpace(m_allocatorID); + bool copyToHost = internalMemorySpace != axom::MemorySpace::Dynamic +#ifdef AXOM_USE_UMPIRE + && internalMemorySpace != axom::MemorySpace::Host +#endif + ; + if(copyToHost) { + const int hostAllocatorId = axom::detail::getAllocatorID(); + axom::ArraytmpfacetNodeCoords(m_facetNodeCoords, hostAllocatorId); + axom::ArraytmpfacetNodeIds(m_facetNodeIds, hostAllocatorId); + mesh.appendNodes(tmpfacetNodeCoords.data(), mesh.getDimension()*m_facetCount); + mesh.appendCells(tmpfacetNodeIds.data(), m_facetCount); + } + else + { + mesh.appendNodes(m_facetNodeCoords.data(), mesh.getDimension()*m_facetCount); + mesh.appendCells(m_facetNodeIds.data(), m_facetCount); + } + + if(!cellIdField.empty()) + { + // Put parent cell ids into the mesh. + axom::IndexType* cellIdPtr = + mesh.getFieldPtr(cellIdField, + axom::mint::CELL_CENTERED); + axom::copy(cellIdPtr, + m_facetParentIds.data(), + m_facetCount*sizeof(axom::IndexType)); + } + + if(!domainIdField.empty()) { - axom::detail::ArrayOps::fill( - domainIdPtr, - m_facetIndexOffsets[d], - m_singles[d]->getContourCellCount(), - execution_space::allocatorID(), - m_singles[d]->getDomainId(d)); + // Put parent domain ids into the mesh. + auto* domainIdPtr = + mesh.getFieldPtr(domainIdField, + axom::mint::CELL_CENTERED); + auto tmpContourFacetDomainIds = getContourFacetDomainIds( + axom::execution_space::allocatorID()); + axom::copy(domainIdPtr, tmpContourFacetDomainIds.data(), m_facetCount*sizeof(axom::IndexType)); } } - SLIC_ASSERT(mesh.getNumberOfNodes() == contourNodeCount); - SLIC_ASSERT(mesh.getNumberOfCells() == contourCellCount); } void MarchingCubes::allocateOutputBuffers() { - int allocatorId = -1; - if(m_runtimePolicy == MarchingCubes::RuntimePolicy::seq) - { - allocatorId = axom::execution_space::allocatorID(); - } -#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP - else if(m_runtimePolicy == MarchingCubes::RuntimePolicy::omp) - { - allocatorId = axom::execution_space::allocatorID(); - } -#endif -#ifdef AXOM_RUNTIME_POLICY_USE_CUDA - else if(m_runtimePolicy == MarchingCubes::RuntimePolicy::cuda) - { - allocatorId = axom::execution_space>::allocatorID(); - } -#endif -#ifdef AXOM_RUNTIME_POLICY_USE_HIP - else if(m_runtimePolicy == MarchingCubes::RuntimePolicy::hip) - { - allocatorId = axom::execution_space>::allocatorID(); - } -#endif - else - { - SLIC_ERROR(axom::fmt::format( - "MarchingCubes doesn't recognize runtime policy {}", - m_runtimePolicy)); - } - if (!m_singles.empty()) { int ndim = m_singles[0]->spatialDimension(); const auto nodeCount = m_facetCount * ndim; m_facetNodeIds = - axom::Array({m_facetCount, ndim}, allocatorId); + axom::Array({m_facetCount, ndim}, m_allocatorID); m_facetNodeCoords = - axom::Array({nodeCount, ndim}, allocatorId); + axom::Array({nodeCount, ndim}, m_allocatorID); axom::StackArray t1{m_facetCount}; m_facetParentIds = - axom::Array(t1, allocatorId); + axom::Array(t1, m_allocatorID); } } MarchingCubesSingleDomain::MarchingCubesSingleDomain(RuntimePolicy runtimePolicy, + int allocatorID, MarchingCubesDataParallelism dataPar, const conduit::Node& dom, const std::string& topologyName, const std::string& maskField) : m_runtimePolicy(runtimePolicy) + , m_allocatorID(allocatorID) , m_dataParallelism(dataPar) , m_dom(nullptr) , m_ndim(0) @@ -235,6 +251,7 @@ MarchingCubesSingleDomain::MarchingCubesSingleDomain(RuntimePolicy runtimePolicy m_impl = axom::quest::detail::marching_cubes::newMarchingCubesImpl( m_runtimePolicy, + m_allocatorID, m_ndim); m_impl->initialize(*m_dom, m_topologyName, m_maskFieldName); diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index b4ccb03975..284fa8f421 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -95,6 +95,13 @@ class MarchingCubesSingleDomain; * To avoid confusion between the two meshes, we refer to the input * mesh with the scalar function as "parent" and the generated mesh * as the "contour". + * + * The output contour mesh format can be a mint::UnstructuredMesh or + * Array data. IDs of parent cell and domain that generated the + * individual contour facets are provided. Blueprint allows users to + * specify ids for the domains. If "state/domain_id" exists in the + * domains, it is used as the domain id. Otherwise, the domain's + * interation index within the multidomain mesh is used. */ class MarchingCubes { @@ -107,6 +114,8 @@ class MarchingCubes * \param [in] runtimePolicy A value from RuntimePolicy. * The simplest policy is RuntimePolicy::seq, which specifies * running sequentially on the CPU. + * \param [in] allocatorID Data allocator ID. Choose something compatible + * with \c runtimePolicy. See \c esecution_space. * \param [in] dataParallelism Data parallel implementation choice. * \param [in] bpMesh Blueprint multi-domain mesh containing scalar field. * \param [in] topologyName Name of Blueprint topology to use in \a bpMesh. @@ -124,8 +133,14 @@ class MarchingCubes * conduit::blueprint::is_contiguous(). In the future, this * requirement may be relaxed, possibly at the cost of a * transformation and storage of the temporary contiguous layout. + * + * Blueprint allows users to specify ids for the domains. If + * "state/domain_id" exists in the domains, it is used as the domain + * id. Otherwise, the domain's interation index within the + * multidomain mesh is used. */ MarchingCubes(RuntimePolicy runtimePolicy, + int allocatorId, MarchingCubesDataParallelism dataParallelism, const conduit::Node &bpMesh, const std::string &topologyName, @@ -149,56 +164,103 @@ class MarchingCubes //!@brief Get number of nodes in the generated contour mesh. axom::IndexType getContourNodeCount() const; + //@{ + //!@name Output methods + /*! + @brief Put generated contour in a mint::UnstructuredMesh. + @param mesh Output contour mesh + @param cellIdField Name of field to store the array of + parent cells' multidimensional indices. + If empty, the data is not provided. + @param domainIdField Name of field to store the (axom::IndexType) + parent domain ids. If omitted, the data is not provided. + + If the fields aren't in the mesh, they will be created. + + Important: mint::UnstructuredMesh only supports host memory, so + regardless of the allocator ID, this method always deep-copies + data to host memory. To access the data without deep-copying, see + the other output methods. + */ + void populateContourMesh( + axom::mint::UnstructuredMesh &mesh, + const std::string &cellIdField = {}, + const std::string &domainIdField = {}) const; + /*! - @brief Return pointer to facet corner node indices (connectivity) + @brief Return view of facet corner node indices (connectivity) Array. + + The array shape is (getContourCellCount(), ), where + the second index is index of the facet corner. - The buffer size is the x getContourCellCount(). - Memory space of data depends on runtime policy. + Memory space of data corresponds to allocator set in the constructor. */ axom::ArrayView getContourFacetCorners() const { return m_facetNodeIds.view(); } /*! - @brief Return pointer to node coordinates. + @brief Return view of node coordinates Array. - The buffer size is x getContourNodeCount(). - Memory space of data depends on runtime policy. + The array shape is (getContourNodeCount(), ), where + the second index is the spatial index. + + Memory space of data corresponds to allocator set in the constructor. */ axom::ArrayView getContourNodeCoords() const { return m_facetNodeCoords.view(); } /*! - @brief Return pointer to parent cell indices + @brief Return view of parent cell indices Array. - The buffer size is getContourCellCount(). - Memory space of data depends on runtime policy. + The buffer size is getContourCellCount(). The parent ID is the + column-major ordered flat index of the cell in the parent domain + (see ArrayIndexer), not counting ghost cells. + + Memory space of data corresponds to allocator set in the constructor. */ axom::ArrayView getContourFacetParents() const { return m_facetParentIds.view(); } /*! - @brief Put generated contour in a mint::UnstructuredMesh. - @param mesh Output contour mesh - @param cellIdField Name of field to store the array of - parent cells' multidimensional indices. - If empty, the data is not provided. - @param domainIdField Name of field to store the (axom::IndexType) - parent domain ids. If omitted, the data is not provided. + @brief Return view of parent domain indices Array. + @param allocatorID Allocator id for the output data. If omitted, + use the id set in the constructor. - If the fields aren't in the mesh, they will be created. + The buffer size is getContourCellCount(). - Blueprint allows users to specify ids for the domains. If - "state/domain_id" exists in the domains, it is used as the domain - id. Otherwise, the domain's interation index within the - multidomain mesh is used. + Memory space of data corresponds to allocator set in the constructor. */ - void populateContourMesh( - axom::mint::UnstructuredMesh &mesh, - const std::string &cellIdField = {}, - const std::string &domainIdField = {}); + axom::Array getContourFacetDomainIds(int allocatorID=axom::INVALID_ALLOCATOR_ID) const; + +#if 1 + // Is there a use case for this? + /*! + @brief Give caller posession of the contour data. + + This efficiently turns the generated contour data to the caller, + to stay in scope after the MarchingCubes object is deleted. + + @pre isoContour() must have been called. + @post outputs can no longer be accessed from object. + */ + void relinguishContourData( + axom::Array& facetNodeIds, + axom::Array& facetNodeCoords, + axom::Array& facetParentIds) + { + facetNodeIds.swap(m_facetNodeIds); + facetNodeCoords.swap(m_facetNodeCoords); + facetParentIds.swap(m_facetParentIds); + m_facetNodeIds.clear(); + m_facetNodeCoords.clear(); + m_facetParentIds.clear(); + } +#endif + //@} private: RuntimePolicy m_runtimePolicy; + int m_allocatorID = axom::INVALID_ALLOCATOR_ID; //@brief Choice of full or partial data-parallelism, or byPolicy. MarchingCubesDataParallelism m_dataParallelism = @@ -260,6 +322,8 @@ class MarchingCubesSingleDomain * \param [in] runtimePolicy A value from RuntimePolicy. * The simplest policy is RuntimePolicy::seq, which specifies * running sequentially on the CPU. + * \param [in] allocatorID Data allocator ID. Choose something compatible + * with \c runtimePolicy. See \c esecution_space. * \param [in] dataPar Choice of data-parallel implementation. * \param [in] dom Blueprint single-domain mesh containing scalar field. * \param [in] topologyName Name of Blueprint topology to use in \a dom @@ -279,6 +343,7 @@ class MarchingCubesSingleDomain * transformation and storage of the temporary contiguous layout. */ MarchingCubesSingleDomain(RuntimePolicy runtimePolicy, + int allocatorID, MarchingCubesDataParallelism dataPar, const conduit::Node &dom, const std::string &topologyName, @@ -318,6 +383,9 @@ class MarchingCubesSingleDomain axom::ArrayView& facetParentIds, axom::IndexType facetIndexOffset) { + SLIC_ASSERT(facetNodeIds.getAllocatorID() == m_allocatorID); + SLIC_ASSERT(facetNodeCoords.getAllocatorID() == m_allocatorID); + SLIC_ASSERT(facetParentIds.getAllocatorID() == m_allocatorID); m_impl->setOutputBuffers( facetNodeIds, facetNodeCoords, facetParentIds, @@ -418,6 +486,7 @@ class MarchingCubesSingleDomain private: RuntimePolicy m_runtimePolicy; + int m_allocatorID = axom::INVALID_ALLOCATOR_ID; //@brief Choice of full or partial data-parallelism, or byPolicy. MarchingCubesDataParallelism m_dataParallelism = diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index f2c6117540..34c1e78c8a 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -51,6 +51,12 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase using SequentialLoopPolicy = typename execution_space::loop_policy; static constexpr auto MemorySpace = execution_space::memory_space; + + AXOM_HOST MarchingCubesImpl(int allocatorID) + : m_allocatorID(allocatorID) + , m_caseIds(emptyShape(), m_allocatorID) + {} + /*! @brief Initialize data to a blueprint domain. @param dom Blueprint structured mesh domain @@ -767,6 +773,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { } private: + int m_allocatorID; + axom::quest::MeshViewUtil m_mvu; MIdx m_bShape; //!< @brief Blueprint cell data shape. @@ -801,6 +809,13 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase static constexpr std::uint8_t CELL_CORNER_COUNT = (DIM == 3) ? 8 : 4; double m_contourVal = 0.0; + + axom::StackArray emptyShape() + { + axom::StackArray rval; + for(int d=0; d -newMarchingCubesImpl(MarchingCubes::RuntimePolicy runtimePolicy, int dim) +newMarchingCubesImpl(MarchingCubes::RuntimePolicy runtimePolicy, int allocatorID, int dim) { using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; @@ -817,35 +832,35 @@ newMarchingCubesImpl(MarchingCubes::RuntimePolicy runtimePolicy, int dim) if(runtimePolicy == MarchingCubes::RuntimePolicy::seq) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::SEQ_EXEC, axom::SEQ_EXEC>) + new MarchingCubesImpl<2, axom::SEQ_EXEC, axom::SEQ_EXEC>(allocatorID)) : std::unique_ptr( - new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>); + new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>(allocatorID)); } #ifdef AXOM_RUNTIME_POLICY_USE_OPENMP else if(runtimePolicy == MarchingCubes::RuntimePolicy::omp) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::OMP_EXEC, axom::SEQ_EXEC>) + new MarchingCubesImpl<2, axom::OMP_EXEC, axom::SEQ_EXEC>(allocatorID)) : std::unique_ptr( - new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>); + new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>(allocatorID)); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_CUDA else if(runtimePolicy == MarchingCubes::RuntimePolicy::cuda) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>) + new MarchingCubesImpl<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>(allocatorID)) : std::unique_ptr( - new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>); + new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>(allocatorID)); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_HIP else if(runtimePolicy == MarchingCubes::RuntimePolicy::hip) { impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>) + new MarchingCubesImpl<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>(allocatorID)) : std::unique_ptr( - new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>); + new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>(allocatorID)); } #endif else diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 0f22d2324f..73164fbc10 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -244,45 +244,6 @@ struct Input //!@brief Our allocator id, based on execution policy. static int s_allocatorId = axom::INVALID_ALLOCATOR_ID; // Set in main. -static int allocatorIdForPolicy(axom::runtime_policy::Policy policy) -{ - //--------------------------------------------------------------------------- - // Set default allocator for possibly testing on devices - //--------------------------------------------------------------------------- - int aid = axom::INVALID_ALLOCATOR_ID; - - // clang-format off - if(policy == axom::runtime_policy::Policy::seq) - { - aid = axom::execution_space::allocatorID(); - } -#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP - else if(policy == axom::runtime_policy::Policy::omp) - { - aid = axom::execution_space::allocatorID(); - } -#endif -#ifdef AXOM_RUNTIME_POLICY_USE_CUDA - else if(policy == axom::runtime_policy::Policy::cuda) - { - // aid = axom::execution_space>::allocatorID(); - aid = axom::getUmpireResourceAllocatorID(umpire::resource::Device); - } -#endif -#ifdef AXOM_RUNTIME_POLICY_USE_HIP - else if(policy == axom::runtime_policy::Policy::hip) - { - // aid = axom::execution_space>::allocatorID(); - aid = axom::getUmpireResourceAllocatorID(umpire::resource::Device); - } -#endif - // clang-format on - - SLIC_ERROR_IF( - aid == axom::INVALID_ALLOCATOR_ID, - axom::fmt::format("Cannot find allocator id for policy '{}'", policy)); - return aid; -} //!@brief Put a conduit::Node array data into the specified memory space. template @@ -724,7 +685,7 @@ struct ContourTestBase const std::string m_domainIdField; ValueFunctorType m_valueFunctor; - int runTest(BlueprintStructuredMesh& computationalMesh, quest::MarchingCubes& mc) + int runTest(BlueprintStructuredMesh& computationalMesh) { SLIC_INFO(banner(axom::fmt::format("Testing {} contour.", name()))); @@ -782,6 +743,12 @@ struct ContourTestBase } } #endif + // Create marching cubes algorithm object and set some parameters + quest::MarchingCubes mc(params.policy, + s_allocatorId, + params.dataParallelism, + computationalMesh.asConduitNode(), + "mesh"); mc.setFunctionField(functionName()); @@ -825,16 +792,14 @@ struct ContourTestBase axom::execution_space::allocatorID()); } - // Put mesh mesh in a mint object for error checking and output. + // Put contour mesh in a mint object for error checking and output. std::string sidreGroupName = name() + "_mesh"; sidre::DataStore objectDS; sidre::Group* meshGroup = objectDS.getRoot()->createGroup(sidreGroupName); axom::mint::UnstructuredMesh contourMesh( DIM, DIM == 2 ? mint::CellType::SEGMENT : mint::CellType::TRIANGLE, - meshGroup, - mc.getContourNodeCount(), - mc.getContourCellCount()); + meshGroup); axom::utilities::Timer extractTimer(false); extractTimer.start(); mc.populateContourMesh(contourMesh, m_parentCellIdField, m_domainIdField); @@ -1076,10 +1041,10 @@ struct ContourTestBase } axom::ArrayView get_parent_cell_id_view( - axom::mint::UnstructuredMesh& contourMesh) const + const axom::mint::UnstructuredMesh& contourMesh) const { axom::IndexType numIdxComponents = -1; - axom::IndexType* ptr = + const axom::IndexType* ptr = contourMesh.getFieldPtr(m_parentCellIdField, axom::mint::CELL_CENTERED, numIdxComponents); @@ -1087,7 +1052,7 @@ struct ContourTestBase SLIC_ASSERT(numIdxComponents == 1); axom::ArrayView view( - (axom::IndexType*)ptr, + (const axom::IndexType*)ptr, contourMesh.getNumberOfCells()); return view; } @@ -1329,7 +1294,7 @@ struct RoundFunctor using PointType = axom::primal::Point; const axom::primal::Sphere _sphere; RoundFunctor(const PointType& center) : _sphere(center, 0.0) { } - double operator()(const PointType& pt) const + AXOM_HOST_DEVICE double operator()(const PointType& pt) const { return _sphere.computeSignedDistance(pt); } @@ -1388,7 +1353,7 @@ struct GyroidFunctor : _scale(scale) , _offset(offset) { } - double operator()(const PointType& pt) const + AXOM_HOST_DEVICE double operator()(const PointType& pt) const { if(DIM == 3) { @@ -1458,7 +1423,7 @@ struct PlanarFunctor const PointType& inPlane) : _plane(perpDir.unitVector(), inPlane) { } - double operator()(const PointType& pt) const + AXOM_HOST_DEVICE double operator()(const PointType& pt) const { return _plane.signedDistance(pt); } @@ -1518,6 +1483,31 @@ void makeCoordsInterleaved(conduit::Node& coordValues) } } +/// +int allocatorIdToTest(axom::runtime_policy::Policy policy) +{ +#if defined(AXOM_USE_UMPIRE) + //--------------------------------------------------------------------------- + // Memory resource. For testing, choose device memory if appropriate. + //--------------------------------------------------------------------------- + int allocatorID = + policy == RuntimePolicy::seq ? axom::detail::getAllocatorID() : +#if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) + policy == RuntimePolicy::omp ? axom::detail::getAllocatorID() : +#endif +#if defined(AXOM_RUNTIME_POLICY_USE_CUDA) + policy == RuntimePolicy::cuda ? axom::detail::getAllocatorID() : +#endif +#if defined(AXOM_RUNTIME_POLICY_USE_HIP) + policy == RuntimePolicy::hip ? axom::detail::getAllocatorID() : +#endif + axom::INVALID_ALLOCATOR_ID; +#else + int allocatorID = axom::getDefaultAllocatorID(); +#endif + return allocatorID; +} + /// Utility function to initialize the logger void initializeLogger() { @@ -1569,11 +1559,6 @@ void finalizeLogger() template int testNdimInstance(BlueprintStructuredMesh& computationalMesh) { - // Create marching cubes algorithm object and set some parameters - quest::MarchingCubes mc(params.policy, - params.dataParallelism, - computationalMesh.asConduitNode(), - "mesh"); //--------------------------------------------------------------------------- // params specify which tests to run. @@ -1617,19 +1602,19 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) if(planarTest) { - localErrCount += planarTest->runTest(computationalMesh, mc); + localErrCount += planarTest->runTest(computationalMesh); } slic::flushStreams(); if(roundTest) { - localErrCount += roundTest->runTest(computationalMesh, mc); + localErrCount += roundTest->runTest(computationalMesh); } slic::flushStreams(); if(gyroidTest) { - localErrCount += gyroidTest->runTest(computationalMesh, mc); + localErrCount += gyroidTest->runTest(computationalMesh); } slic::flushStreams(); @@ -1701,7 +1686,7 @@ int main(int argc, char** argv) exit(retval); } - s_allocatorId = allocatorIdForPolicy(params.policy); + s_allocatorId = allocatorIdToTest(params.policy); //--------------------------------------------------------------------------- // Load computational mesh. From 32f5ae0caa1d1e69d41a4c10a2683673fd71eed5 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 30 Jan 2024 08:35:18 -0800 Subject: [PATCH 414/639] Use specified alloator id for internal data. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 34c1e78c8a..b6fa046461 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -55,6 +55,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_HOST MarchingCubesImpl(int allocatorID) : m_allocatorID(allocatorID) , m_caseIds(emptyShape(), m_allocatorID) + , m_crossingParentIds(0, 0, m_allocatorID) + , m_facetIncrs(0, 0, m_allocatorID) + , m_firstFacetIds(0, 0, m_allocatorID) {} /*! @@ -93,7 +96,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase row-major if fcn is that way, and vice versa. However, Array only support column-major, so we're stuck with that for now. */ - m_caseIds = axom::Array(m_bShape); + // m_caseIds.resize(m_bShape, 0); // This unexpectedly fails. + m_caseIds = axom::Array(m_bShape, m_allocatorID); m_caseIds.fill(0); } @@ -259,7 +263,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { constexpr MarchingCubesDataParallelism autoPolicy = std::is_same::value ? MarchingCubesDataParallelism::hybridParallel : +#ifdef AXOM_USE_OPENMP std::is_same::value ? MarchingCubesDataParallelism::hybridParallel : +#endif MarchingCubesDataParallelism::fullParallel; if(m_dataParallelism == From 3b7951ead0a1fdf71a573f56554e927cb17e14d6 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 30 Jan 2024 12:34:00 -0800 Subject: [PATCH 415/639] Silence warnings. --- src/axom/quest/MarchingCubes.hpp | 2 +- src/axom/quest/detail/MarchingCubesImpl.hpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 284fa8f421..e6743456a8 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -435,7 +435,7 @@ class MarchingCubesSingleDomain */ virtual void initialize(const conduit::Node &dom, const std::string &topologyName, - const std::string &maskPath) = 0; + const std::string &maskPath = {}) = 0; virtual void setFunctionField(const std::string& fcnFieldName) = 0; virtual void setContourValue(double contourVal) = 0; diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index b6fa046461..4b33c024bd 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -75,7 +75,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase */ AXOM_HOST void initialize(const conduit::Node& dom, const std::string& topologyName, - const std::string& maskFieldName = {}) override + const std::string& maskFieldName) override { SLIC_ASSERT(conduit::blueprint::mesh::topology::dims(dom.fetch_existing( axom::fmt::format("topologies/{}", topologyName))) == DIM); @@ -802,12 +802,12 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::IndexType m_facetCount = 0; axom::IndexType getContourCellCount() const override { return m_facetCount; } - //!@brief Number of surface mesh facets added by each crossing. - axom::Array m_facetIncrs; - //!@brief Parent cell id (flat index into m_caseIds) for each crossing. axom::Array m_crossingParentIds; + //!@brief Number of surface mesh facets added by each crossing. + axom::Array m_facetIncrs; + //!@brief First index of facets for each crossing. axom::Array m_firstFacetIds; From c03f5c21172d2e28d0dccb0836a119274973e754 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 30 Jan 2024 12:48:01 -0800 Subject: [PATCH 416/639] Autoformat. --- src/axom/quest/ArrayIndexer.hpp | 7 +- src/axom/quest/MarchingCubes.cpp | 79 ++++++++------- src/axom/quest/MarchingCubes.hpp | 77 ++++++++------- src/axom/quest/MeshViewUtil.hpp | 2 +- src/axom/quest/detail/MarchingCubesImpl.hpp | 95 ++++++++++++------- .../examples/quest_marching_cubes_example.cpp | 47 +++++---- 6 files changed, 178 insertions(+), 129 deletions(-) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index 0b627511c3..8e17e71ab8 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -46,7 +46,8 @@ class ArrayIndexer @param [in] shape Shape of the array @param [in] order: c is column major; r is row major. */ - inline AXOM_HOST_DEVICE void initialize(const axom::StackArray& shape, char order) + inline AXOM_HOST_DEVICE void initialize(const axom::StackArray& shape, + char order) { SLIC_ASSERT(order == 'c' || order == 'r'); if(order == 'r') @@ -120,9 +121,9 @@ class ArrayIndexer inline AXOM_HOST_DEVICE char getOrder() const { char order = 'r' | 'c'; - for(int d=0; d < DIM - 1; ++d) + for(int d = 0; d < DIM - 1; ++d) { - order &= m_slowestDirs[d] < m_slowestDirs[d+1] ? 'c' : 'r'; + order &= m_slowestDirs[d] < m_slowestDirs[d + 1] ? 'c' : 'r'; } return order; } diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 8a86747c27..e0568658d3 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -21,7 +21,6 @@ namespace axom { namespace quest { - MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, int allocatorID, MarchingCubesDataParallelism dataParallelism, @@ -70,7 +69,7 @@ void MarchingCubes::computeIsocontour(double contourVal) // facet counts to get the total facet counts. m_facetIndexOffsets.resize(m_singles.size()); m_facetCount = 0; - for(axom::IndexType d=0; dsetOutputBuffers(facetNodeIdsView, facetNodeCoordsView, @@ -94,7 +93,7 @@ void MarchingCubes::computeIsocontour(double contourVal) m_facetIndexOffsets[d]); } - for(axom::IndexType d=0; dcomputeContour(); } @@ -129,8 +128,10 @@ axom::Array MarchingCubes::getContourFacetDomainIds( { // Put parent domain ids into a new Array. const axom::IndexType len = getContourCellCount(); - axom::Array rval(len, len, allocatorID != axom::INVALID_ALLOCATOR_ID ? - allocatorID : m_allocatorID); + axom::Array rval( + len, + len, + allocatorID != axom::INVALID_ALLOCATOR_ID ? allocatorID : m_allocatorID); for(int d = 0; d < m_singles.size(); ++d) { axom::detail::ArrayOps::fill( @@ -167,25 +168,33 @@ void MarchingCubes::populateContourMesh( mesh.reserveCells(contourCellCount); mesh.reserveNodes(contourNodeCount); - if (m_facetCount) { + if(m_facetCount) + { // Put nodes and cells into the mesh. // If data is not in host memory, copy to temporary host memory first. - axom::MemorySpace internalMemorySpace = axom::detail::getAllocatorSpace(m_allocatorID); + axom::MemorySpace internalMemorySpace = + axom::detail::getAllocatorSpace(m_allocatorID); bool copyToHost = internalMemorySpace != axom::MemorySpace::Dynamic #ifdef AXOM_USE_UMPIRE - && internalMemorySpace != axom::MemorySpace::Host + && internalMemorySpace != axom::MemorySpace::Host #endif ; - if(copyToHost) { - const int hostAllocatorId = axom::detail::getAllocatorID(); - axom::ArraytmpfacetNodeCoords(m_facetNodeCoords, hostAllocatorId); - axom::ArraytmpfacetNodeIds(m_facetNodeIds, hostAllocatorId); - mesh.appendNodes(tmpfacetNodeCoords.data(), mesh.getDimension()*m_facetCount); + if(copyToHost) + { + const int hostAllocatorId = + axom::detail::getAllocatorID(); + axom::Array tmpfacetNodeCoords(m_facetNodeCoords, + hostAllocatorId); + axom::Array tmpfacetNodeIds(m_facetNodeIds, + hostAllocatorId); + mesh.appendNodes(tmpfacetNodeCoords.data(), + mesh.getDimension() * m_facetCount); mesh.appendCells(tmpfacetNodeIds.data(), m_facetCount); } else { - mesh.appendNodes(m_facetNodeCoords.data(), mesh.getDimension()*m_facetCount); + mesh.appendNodes(m_facetNodeCoords.data(), + mesh.getDimension() * m_facetCount); mesh.appendCells(m_facetNodeIds.data(), m_facetCount); } @@ -193,11 +202,10 @@ void MarchingCubes::populateContourMesh( { // Put parent cell ids into the mesh. axom::IndexType* cellIdPtr = - mesh.getFieldPtr(cellIdField, - axom::mint::CELL_CENTERED); + mesh.getFieldPtr(cellIdField, axom::mint::CELL_CENTERED); axom::copy(cellIdPtr, m_facetParentIds.data(), - m_facetCount*sizeof(axom::IndexType)); + m_facetCount * sizeof(axom::IndexType)); } if(!domainIdField.empty()) @@ -208,33 +216,34 @@ void MarchingCubes::populateContourMesh( axom::mint::CELL_CENTERED); auto tmpContourFacetDomainIds = getContourFacetDomainIds( axom::execution_space::allocatorID()); - axom::copy(domainIdPtr, tmpContourFacetDomainIds.data(), m_facetCount*sizeof(axom::IndexType)); + axom::copy(domainIdPtr, + tmpContourFacetDomainIds.data(), + m_facetCount * sizeof(axom::IndexType)); } } } void MarchingCubes::allocateOutputBuffers() { - if (!m_singles.empty()) + if(!m_singles.empty()) { int ndim = m_singles[0]->spatialDimension(); const auto nodeCount = m_facetCount * ndim; m_facetNodeIds = axom::Array({m_facetCount, ndim}, m_allocatorID); - m_facetNodeCoords = - axom::Array({nodeCount, ndim}, m_allocatorID); - axom::StackArray t1{m_facetCount}; - m_facetParentIds = - axom::Array(t1, m_allocatorID); + m_facetNodeCoords = axom::Array({nodeCount, ndim}, m_allocatorID); + axom::StackArray t1 {m_facetCount}; + m_facetParentIds = axom::Array(t1, m_allocatorID); } } -MarchingCubesSingleDomain::MarchingCubesSingleDomain(RuntimePolicy runtimePolicy, - int allocatorID, - MarchingCubesDataParallelism dataPar, - const conduit::Node& dom, - const std::string& topologyName, - const std::string& maskField) +MarchingCubesSingleDomain::MarchingCubesSingleDomain( + RuntimePolicy runtimePolicy, + int allocatorID, + MarchingCubesDataParallelism dataPar, + const conduit::Node& dom, + const std::string& topologyName, + const std::string& maskField) : m_runtimePolicy(runtimePolicy) , m_allocatorID(allocatorID) , m_dataParallelism(dataPar) @@ -249,10 +258,10 @@ MarchingCubesSingleDomain::MarchingCubesSingleDomain(RuntimePolicy runtimePolicy // Set domain first, to get m_ndim, which is required to allocate m_impl. setDomain(dom); - m_impl = axom::quest::detail::marching_cubes::newMarchingCubesImpl( - m_runtimePolicy, - m_allocatorID, - m_ndim); + m_impl = + axom::quest::detail::marching_cubes::newMarchingCubesImpl(m_runtimePolicy, + m_allocatorID, + m_ndim); m_impl->initialize(*m_dom, m_topologyName, m_maskFieldName); m_impl->setDataParallelism(m_dataParallelism); diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index e6743456a8..ba170eb01d 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -196,7 +196,9 @@ class MarchingCubes Memory space of data corresponds to allocator set in the constructor. */ axom::ArrayView getContourFacetCorners() const - { return m_facetNodeIds.view(); } + { + return m_facetNodeIds.view(); + } /*! @brief Return view of node coordinates Array. @@ -207,7 +209,9 @@ class MarchingCubes Memory space of data corresponds to allocator set in the constructor. */ axom::ArrayView getContourNodeCoords() const - { return m_facetNodeCoords.view(); } + { + return m_facetNodeCoords.view(); + } /*! @brief Return view of parent cell indices Array. @@ -219,7 +223,9 @@ class MarchingCubes Memory space of data corresponds to allocator set in the constructor. */ axom::ArrayView getContourFacetParents() const - { return m_facetParentIds.view(); } + { + return m_facetParentIds.view(); + } /*! @brief Return view of parent domain indices Array. @@ -230,9 +236,10 @@ class MarchingCubes Memory space of data corresponds to allocator set in the constructor. */ - axom::Array getContourFacetDomainIds(int allocatorID=axom::INVALID_ALLOCATOR_ID) const; + axom::Array getContourFacetDomainIds( + int allocatorID = axom::INVALID_ALLOCATOR_ID) const; -#if 1 + #if 1 // Is there a use case for this? /*! @brief Give caller posession of the contour data. @@ -243,10 +250,9 @@ class MarchingCubes @pre isoContour() must have been called. @post outputs can no longer be accessed from object. */ - void relinguishContourData( - axom::Array& facetNodeIds, - axom::Array& facetNodeCoords, - axom::Array& facetParentIds) + void relinguishContourData(axom::Array &facetNodeIds, + axom::Array &facetNodeCoords, + axom::Array &facetParentIds) { facetNodeIds.swap(m_facetNodeIds); facetNodeCoords.swap(m_facetNodeCoords); @@ -255,7 +261,7 @@ class MarchingCubes m_facetNodeCoords.clear(); m_facetParentIds.clear(); } -#endif + #endif //@} private: @@ -364,33 +370,35 @@ class MarchingCubesSingleDomain SLIC_ASSERT(m_dom->fetch_existing(m_fcnPath + "/association").as_string() == "vertex"); SLIC_ASSERT(m_dom->has_path(m_fcnPath + "/values")); - if (m_impl) m_impl->setFunctionField(fcnField); + if(m_impl) m_impl->setFunctionField(fcnField); } void setContourValue(double contourVal) { m_contourVal = contourVal; - if (m_impl) m_impl->setContourValue(m_contourVal); + if(m_impl) m_impl->setContourValue(m_contourVal); } // Methods trivially delegated to implementation. void markCrossings() { m_impl->markCrossings(); } void scanCrossings() { m_impl->scanCrossings(); } - axom::IndexType getContourCellCount() { return m_impl->getContourCellCount(); } - void setOutputBuffers( - axom::ArrayView& facetNodeIds, - axom::ArrayView& facetNodeCoords, - axom::ArrayView& facetParentIds, - axom::IndexType facetIndexOffset) - { - SLIC_ASSERT(facetNodeIds.getAllocatorID() == m_allocatorID); - SLIC_ASSERT(facetNodeCoords.getAllocatorID() == m_allocatorID); - SLIC_ASSERT(facetParentIds.getAllocatorID() == m_allocatorID); - m_impl->setOutputBuffers( facetNodeIds, - facetNodeCoords, - facetParentIds, - facetIndexOffset ); - } + axom::IndexType getContourCellCount() + { + return m_impl->getContourCellCount(); + } + void setOutputBuffers(axom::ArrayView &facetNodeIds, + axom::ArrayView &facetNodeCoords, + axom::ArrayView &facetParentIds, + axom::IndexType facetIndexOffset) + { + SLIC_ASSERT(facetNodeIds.getAllocatorID() == m_allocatorID); + SLIC_ASSERT(facetNodeCoords.getAllocatorID() == m_allocatorID); + SLIC_ASSERT(facetParentIds.getAllocatorID() == m_allocatorID); + m_impl->setOutputBuffers(facetNodeIds, + facetNodeCoords, + facetParentIds, + facetIndexOffset); + } void computeContour() { m_impl->computeContour(); } /*! @@ -437,11 +445,13 @@ class MarchingCubesSingleDomain const std::string &topologyName, const std::string &maskPath = {}) = 0; - virtual void setFunctionField(const std::string& fcnFieldName) = 0; + virtual void setFunctionField(const std::string &fcnFieldName) = 0; virtual void setContourValue(double contourVal) = 0; void setDataParallelism(MarchingCubesDataParallelism dataPar) - { m_dataParallelism = dataPar; } + { + m_dataParallelism = dataPar; + } //@{ //!@name Distinct phases in contour generation. @@ -460,11 +470,10 @@ class MarchingCubesSingleDomain virtual axom::IndexType getContourCellCount() const = 0; //@} - void setOutputBuffers( - axom::ArrayView& facetNodeIds, - axom::ArrayView& facetNodeCoords, - axom::ArrayView& facetParentIds, - axom::IndexType facetIndexOffset) + void setOutputBuffers(axom::ArrayView &facetNodeIds, + axom::ArrayView &facetNodeCoords, + axom::ArrayView &facetParentIds, + axom::IndexType facetIndexOffset) { m_facetNodeIds = facetNodeIds; m_facetNodeCoords = facetNodeCoords; diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 7f898cfa09..d87d529deb 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -222,7 +222,7 @@ class MeshViewUtil , m_cdom(nullptr) , m_ctopology(nullptr) , m_ccoordset(nullptr) - {} + { } /*! @brief Construct view of a non-const domain. diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 4b33c024bd..949ac2b2c0 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -58,7 +58,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase , m_crossingParentIds(0, 0, m_allocatorID) , m_facetIncrs(0, 0, m_allocatorID) , m_firstFacetIds(0, 0, m_allocatorID) - {} + { } /*! @brief Initialize data to a blueprint domain. @@ -97,7 +97,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase only support column-major, so we're stuck with that for now. */ // m_caseIds.resize(m_bShape, 0); // This unexpectedly fails. - m_caseIds = axom::Array(m_bShape, m_allocatorID); + m_caseIds = + axom::Array(m_bShape, m_allocatorID); m_caseIds.fill(0); } @@ -262,14 +263,18 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase void scanCrossings() override { constexpr MarchingCubesDataParallelism autoPolicy = - std::is_same::value ? MarchingCubesDataParallelism::hybridParallel : + std::is_same::value + ? MarchingCubesDataParallelism::hybridParallel + : #ifdef AXOM_USE_OPENMP - std::is_same::value ? MarchingCubesDataParallelism::hybridParallel : + std::is_same::value + ? MarchingCubesDataParallelism::hybridParallel + : #endif - MarchingCubesDataParallelism::fullParallel; + MarchingCubesDataParallelism::fullParallel; if(m_dataParallelism == - axom::quest::MarchingCubesDataParallelism::hybridParallel || + axom::quest::MarchingCubesDataParallelism::hybridParallel || (m_dataParallelism == axom::quest::MarchingCubesDataParallelism::byPolicy && autoPolicy == MarchingCubesDataParallelism::hybridParallel)) { @@ -310,7 +315,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase 0, parentCellCount, AXOM_LAMBDA(axom::IndexType parentCellId) { - auto numContourCells = num_contour_cells(caseIdsView.flatIndex(parentCellId)); + auto numContourCells = + num_contour_cells(caseIdsView.flatIndex(parentCellId)); crossingFlagsView[parentCellId] = bool(numContourCells); }); @@ -336,9 +342,10 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase auto crossingParentIdsView = m_crossingParentIds.view(); auto facetIncrsView = m_facetIncrs.view(); - auto loopBody = AXOM_LAMBDA(axom::IndexType parentCellId) { - if(scannedFlagsView[parentCellId] != - scannedFlagsView[1+parentCellId]) { + auto loopBody = AXOM_LAMBDA(axom::IndexType parentCellId) + { + if(scannedFlagsView[parentCellId] != scannedFlagsView[1 + parentCellId]) + { auto crossingId = scannedFlagsView[parentCellId]; auto facetIncr = num_contour_cells(caseIdsView.flatIndex(parentCellId)); crossingParentIdsView[crossingId] = parentCellId; @@ -442,7 +449,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const auto firstFacetIdsView = m_firstFacetIds.view(); #if defined(AXOM_USE_RAJA) - // Intel oneAPI compiler segfaults with OpenMP RAJA scan + // Intel oneAPI compiler segfaults with OpenMP RAJA scan #ifdef __INTEL_LLVM_COMPILER using ScanPolicy = typename axom::execution_space::loop_policy; @@ -635,13 +642,15 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase if(axom::utilities::isNearlyEqual(contourVal, f1) || axom::utilities::isNearlyEqual(f1, f2)) { - crossingPt[0] = p1[0]; crossingPt[1] = p1[1]; // crossingPt = p1; + crossingPt[0] = p1[0]; + crossingPt[1] = p1[1]; // crossingPt = p1; return; } if(axom::utilities::isNearlyEqual(contourVal, f2)) { - crossingPt[0] = p2[0]; crossingPt[1] = p2[1]; // crossingPt = p2; + crossingPt[0] = p2[0]; + crossingPt[1] = p2[1]; // crossingPt = p2; return; } @@ -688,13 +697,17 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase if(axom::utilities::isNearlyEqual(contourVal, f1) || axom::utilities::isNearlyEqual(f1, f2)) { - crossingPt[0] = p1[0]; crossingPt[1] = p1[1]; crossingPt[2] = p1[2]; // crossingPt = p1; + crossingPt[0] = p1[0]; + crossingPt[1] = p1[1]; + crossingPt[2] = p1[2]; // crossingPt = p1; return; } if(axom::utilities::isNearlyEqual(contourVal, f2)) { - crossingPt[0] = p2[0]; crossingPt[1] = p2[1]; crossingPt[2] = p2[2]; // crossingPt = p2; + crossingPt[0] = p2[0]; + crossingPt[1] = p2[1]; + crossingPt[2] = p2[2]; // crossingPt = p2; return; } @@ -775,8 +788,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase /*! @brief Constructor. */ - MarchingCubesImpl() - { } + MarchingCubesImpl() { } private: int m_allocatorID; @@ -819,7 +831,10 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::StackArray emptyShape() { axom::StackArray rval; - for(int d=0; d -newMarchingCubesImpl(MarchingCubes::RuntimePolicy runtimePolicy, int allocatorID, int dim) +newMarchingCubesImpl(MarchingCubes::RuntimePolicy runtimePolicy, + int allocatorID, + int dim) { using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; @@ -837,36 +854,44 @@ newMarchingCubesImpl(MarchingCubes::RuntimePolicy runtimePolicy, int allocatorID std::unique_ptr impl; if(runtimePolicy == MarchingCubes::RuntimePolicy::seq) { - impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::SEQ_EXEC, axom::SEQ_EXEC>(allocatorID)) - : std::unique_ptr( - new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>(allocatorID)); + impl = dim == 2 + ? std::unique_ptr( + new MarchingCubesImpl<2, axom::SEQ_EXEC, axom::SEQ_EXEC>(allocatorID)) + : std::unique_ptr( + new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>(allocatorID)); } #ifdef AXOM_RUNTIME_POLICY_USE_OPENMP else if(runtimePolicy == MarchingCubes::RuntimePolicy::omp) { - impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::OMP_EXEC, axom::SEQ_EXEC>(allocatorID)) - : std::unique_ptr( - new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>(allocatorID)); + impl = dim == 2 + ? std::unique_ptr( + new MarchingCubesImpl<2, axom::OMP_EXEC, axom::SEQ_EXEC>(allocatorID)) + : std::unique_ptr( + new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>(allocatorID)); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_CUDA else if(runtimePolicy == MarchingCubes::RuntimePolicy::cuda) { - impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>(allocatorID)) - : std::unique_ptr( - new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>(allocatorID)); + impl = dim == 2 + ? std::unique_ptr( + new MarchingCubesImpl<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>( + allocatorID)) + : std::unique_ptr( + new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>( + allocatorID)); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_HIP else if(runtimePolicy == MarchingCubes::RuntimePolicy::hip) { - impl = dim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>(allocatorID)) - : std::unique_ptr( - new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>(allocatorID)); + impl = dim == 2 + ? std::unique_ptr( + new MarchingCubesImpl<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>( + allocatorID)) + : std::unique_ptr( + new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>( + allocatorID)); } #endif else diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 73164fbc10..8426c89d3b 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -745,10 +745,10 @@ struct ContourTestBase #endif // Create marching cubes algorithm object and set some parameters quest::MarchingCubes mc(params.policy, - s_allocatorId, - params.dataParallelism, - computationalMesh.asConduitNode(), - "mesh"); + s_allocatorId, + params.dataParallelism, + computationalMesh.asConduitNode(), + "mesh"); mc.setFunctionField(functionName()); @@ -1051,9 +1051,8 @@ struct ContourTestBase SLIC_ASSERT(numIdxComponents == 1); - axom::ArrayView view( - (const axom::IndexType*)ptr, - contourMesh.getNumberOfCells()); + axom::ArrayView view((const axom::IndexType*)ptr, + contourMesh.getNumberOfCells()); return view; } @@ -1093,7 +1092,7 @@ struct ContourTestBase } axom::Array> indexers(domainCount); - for(int d=0; d domShape; computationalMesh.domainLengths(d, domShape); @@ -1490,18 +1489,25 @@ int allocatorIdToTest(axom::runtime_policy::Policy policy) //--------------------------------------------------------------------------- // Memory resource. For testing, choose device memory if appropriate. //--------------------------------------------------------------------------- - int allocatorID = - policy == RuntimePolicy::seq ? axom::detail::getAllocatorID() : -#if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) - policy == RuntimePolicy::omp ? axom::detail::getAllocatorID() : -#endif -#if defined(AXOM_RUNTIME_POLICY_USE_CUDA) - policy == RuntimePolicy::cuda ? axom::detail::getAllocatorID() : -#endif -#if defined(AXOM_RUNTIME_POLICY_USE_HIP) - policy == RuntimePolicy::hip ? axom::detail::getAllocatorID() : -#endif - axom::INVALID_ALLOCATOR_ID; + int allocatorID = policy == RuntimePolicy::seq + ? axom::detail::getAllocatorID() + : + #if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) + policy == RuntimePolicy::omp + ? axom::detail::getAllocatorID() + : + #endif + #if defined(AXOM_RUNTIME_POLICY_USE_CUDA) + policy == RuntimePolicy::cuda + ? axom::detail::getAllocatorID() + : + #endif + #if defined(AXOM_RUNTIME_POLICY_USE_HIP) + policy == RuntimePolicy::hip + ? axom::detail::getAllocatorID() + : + #endif + axom::INVALID_ALLOCATOR_ID; #else int allocatorID = axom::getDefaultAllocatorID(); #endif @@ -1559,7 +1565,6 @@ void finalizeLogger() template int testNdimInstance(BlueprintStructuredMesh& computationalMesh) { - //--------------------------------------------------------------------------- // params specify which tests to run. //--------------------------------------------------------------------------- From 6bbd8b97ac6aacc13548afb2d7a265f749e36e1a Mon Sep 17 00:00:00 2001 From: Alex Tyler Chapman Date: Tue, 30 Jan 2024 13:28:52 -0800 Subject: [PATCH 417/639] Set file back too cpp due to nvcc compiler error --- src/axom/core/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/axom/core/CMakeLists.txt b/src/axom/core/CMakeLists.txt index 2090d7e2fc..211683be84 100644 --- a/src/axom/core/CMakeLists.txt +++ b/src/axom/core/CMakeLists.txt @@ -122,6 +122,9 @@ axom_add_library(NAME core FOLDER axom/core ) +# Set file back to C++ due to nvcc compiler error +set_source_files_properties(utilities/System.cpp PROPERTIES LANGUAGE CXX) + # Basic includes that should be inherited to all Axom targets target_include_directories(core PUBLIC $ From 6159dd25dfa4adc3ac2bf860bab9d236e442374c Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 30 Jan 2024 13:39:40 -0800 Subject: [PATCH 418/639] Fix non-raja build. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 949ac2b2c0..776419b987 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -266,7 +266,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase std::is_same::value ? MarchingCubesDataParallelism::hybridParallel : -#ifdef AXOM_USE_OPENMP +#if defined(AXOM_USE_OPENMP) && defined(AXOM_USE_RAJA) std::is_same::value ? MarchingCubesDataParallelism::hybridParallel : @@ -322,10 +322,18 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::Array scannedFlags(1 + parentCellCount); auto scannedFlagsView = scannedFlags.view(); +#if defined(AXOM_USE_RAJA) RAJA::inclusive_scan( RAJA::make_span(crossingFlags.data(), parentCellCount), RAJA::make_span(scannedFlags.data() + 1, parentCellCount), RAJA::operators::plus {}); +#else + scannedFlags[0] = 0; + for(axom::IndexType n = 0; n < parentCellCount; ++n) + { + scannedFlags[n+1] = scannedFlags[n] + crossingFlags[n]; + } +#endif axom::copy(&m_crossingCount, scannedFlags.data() + scannedFlags.size() - 1, @@ -359,10 +367,18 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase // and the total number of facets. // +#if defined(AXOM_USE_RAJA) RAJA::inclusive_scan( RAJA::make_span(m_facetIncrs.data(), m_crossingCount), RAJA::make_span(m_firstFacetIds.data() + 1, m_crossingCount), RAJA::operators::plus {}); +#else + m_firstFacetIds[0] = 0; + for(axom::IndexType n = 0; n < parentCellCount; ++n) + { + m_firstFacetIds[n+1] = m_firstFacetIds[n] + m_facetIncrs[n]; + } +#endif axom::copy(&m_facetCount, m_firstFacetIds.data() + m_firstFacetIds.size() - 1, From d002cb5487688477c4e5907a8d19a4bc297133a9 Mon Sep 17 00:00:00 2001 From: Alex Tyler Chapman Date: Tue, 30 Jan 2024 15:34:39 -0800 Subject: [PATCH 419/639] Add nvcc bug to notes --- RELEASE-NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index fab6fdef1f..2d006f5bed 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -60,6 +60,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - Upgrades our `vcpkg` usage for automated Windows builds of our TPLs to its [2023.12.12 release](https://github.com/microsoft/vcpkg/releases/tag/2023.12.12) - Fixed a bug in the bounds checks for `primal::clip(Triangle, BoundingBox)` - Fixed a bug when loading Sidre groups with attributes that already exist +- Fixed `std::locale` error when when compiling `src/axom/core/utilities/System.cpp` using nvcc ## [Version 0.8.1] - Release date 2023-08-16 From bdd6005f4aa6b088512392131a61c94d9837f7d8 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 30 Jan 2024 19:16:47 -0800 Subject: [PATCH 420/639] Autoformat. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 776419b987..2aa40c6b68 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -331,7 +331,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase scannedFlags[0] = 0; for(axom::IndexType n = 0; n < parentCellCount; ++n) { - scannedFlags[n+1] = scannedFlags[n] + crossingFlags[n]; + scannedFlags[n + 1] = scannedFlags[n] + crossingFlags[n]; } #endif @@ -376,7 +376,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase m_firstFacetIds[0] = 0; for(axom::IndexType n = 0; n < parentCellCount; ++n) { - m_firstFacetIds[n+1] = m_firstFacetIds[n] + m_facetIncrs[n]; + m_firstFacetIds[n + 1] = m_firstFacetIds[n] + m_facetIncrs[n]; } #endif From e703128e116eae59138ec11c2bbe632cfb3b0c7c Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 30 Jan 2024 23:15:58 -0800 Subject: [PATCH 421/639] Fix inconsistent declaration of output domain id type. --- src/axom/quest/MarchingCubes.cpp | 36 +++++++++++++++++++------------- src/axom/quest/MarchingCubes.hpp | 5 +++-- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index e0568658d3..e046614bd6 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -123,23 +123,26 @@ axom::IndexType MarchingCubes::getContourNodeCount() const Domain ids are provided as a new Array instead of ArrayView because we don't store it internally. */ -axom::Array MarchingCubes::getContourFacetDomainIds( +axom::Array MarchingCubes::getContourFacetDomainIds( int allocatorID) const { // Put parent domain ids into a new Array. const axom::IndexType len = getContourCellCount(); - axom::Array rval( + axom::Array rval( len, len, allocatorID != axom::INVALID_ALLOCATOR_ID ? allocatorID : m_allocatorID); for(int d = 0; d < m_singles.size(); ++d) { - axom::detail::ArrayOps::fill( + MarchingCubes::DomainIdType domainId = m_singles[d]->getDomainId(d); + axom::IndexType contourCellCount = m_singles[d]->getContourCellCount(); + axom::IndexType offset = m_facetIndexOffsets[d]; + axom::detail::ArrayOps::fill( rval.data(), - m_facetIndexOffsets[d], - m_singles[d]->getContourCellCount(), - m_allocatorID, - m_singles[d]->getDomainId(d)); + offset, + contourCellCount, + allocatorID, + domainId); } return rval; } @@ -174,15 +177,18 @@ void MarchingCubes::populateContourMesh( // If data is not in host memory, copy to temporary host memory first. axom::MemorySpace internalMemorySpace = axom::detail::getAllocatorSpace(m_allocatorID); - bool copyToHost = internalMemorySpace != axom::MemorySpace::Dynamic + const bool hostAndInternalMemoriesAreSeparate = + internalMemorySpace != axom::MemorySpace::Dynamic #ifdef AXOM_USE_UMPIRE && internalMemorySpace != axom::MemorySpace::Host #endif ; - if(copyToHost) + const int hostAllocatorId = hostAndInternalMemoriesAreSeparate + ? axom::detail::getAllocatorID() + : m_allocatorID; + + if(hostAndInternalMemoriesAreSeparate) { - const int hostAllocatorId = - axom::detail::getAllocatorID(); axom::Array tmpfacetNodeCoords(m_facetNodeCoords, hostAllocatorId); axom::Array tmpfacetNodeIds(m_facetNodeIds, @@ -214,8 +220,7 @@ void MarchingCubes::populateContourMesh( auto* domainIdPtr = mesh.getFieldPtr(domainIdField, axom::mint::CELL_CENTERED); - auto tmpContourFacetDomainIds = getContourFacetDomainIds( - axom::execution_space::allocatorID()); + auto tmpContourFacetDomainIds = getContourFacetDomainIds(hostAllocatorId); axom::copy(domainIdPtr, tmpContourFacetDomainIds.data(), m_facetCount * sizeof(axom::IndexType)); @@ -298,9 +303,10 @@ void MarchingCubesSingleDomain::setDomain(const conduit::Node& dom) "MarchingCubes currently requires contiguous coordinates layout."); } -int MarchingCubesSingleDomain::getDomainId(int defaultId) const +MarchingCubes::DomainIdType MarchingCubesSingleDomain::getDomainId( + MarchingCubes::DomainIdType defaultId) const { - int rval = defaultId; + MarchingCubes::DomainIdType rval = defaultId; if(m_dom->has_path("state/domain_id")) { rval = m_dom->fetch_existing("state/domain_id").as_int(); diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index ba170eb01d..06e83bccf7 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -107,6 +107,7 @@ class MarchingCubes { public: using RuntimePolicy = axom::runtime_policy::Policy; + using DomainIdType = int; /*! * \brief Constructor sets up computational mesh and data for running the * marching cubes algorithm. @@ -236,7 +237,7 @@ class MarchingCubes Memory space of data corresponds to allocator set in the constructor. */ - axom::Array getContourFacetDomainIds( + axom::Array getContourFacetDomainIds( int allocatorID = axom::INVALID_ALLOCATOR_ID) const; #if 1 @@ -405,7 +406,7 @@ class MarchingCubesSingleDomain @brief Get the Blueprint domain id specified in \a state/domain_id if it is provided, or use the given default if not provided. */ - int getDomainId(int defaultId) const; + MarchingCubes::DomainIdType getDomainId(MarchingCubes::DomainIdType defaultId) const; //!@brief Get number of cells in the generated contour mesh. axom::IndexType getContourCellCount() const From ba20ad76f42d780630dc28d6748cda2785c0d658 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 31 Jan 2024 00:24:16 -0800 Subject: [PATCH 422/639] Fix more inconsistent domain id types. --- src/axom/quest/MarchingCubes.cpp | 7 ++-- .../examples/quest_marching_cubes_example.cpp | 34 ++++++++++++------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index e046614bd6..34adc863bf 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -162,7 +162,7 @@ void MarchingCubes::populateContourMesh( if(!domainIdField.empty() && !mesh.hasField(domainIdField, axom::mint::CELL_CENTERED)) { - mesh.createField(domainIdField, axom::mint::CELL_CENTERED); + mesh.createField(domainIdField, axom::mint::CELL_CENTERED); } // Reserve space once for all local domains. @@ -218,12 +218,11 @@ void MarchingCubes::populateContourMesh( { // Put parent domain ids into the mesh. auto* domainIdPtr = - mesh.getFieldPtr(domainIdField, - axom::mint::CELL_CENTERED); + mesh.getFieldPtr(domainIdField, axom::mint::CELL_CENTERED); auto tmpContourFacetDomainIds = getContourFacetDomainIds(hostAllocatorId); axom::copy(domainIdPtr, tmpContourFacetDomainIds.data(), - m_facetCount * sizeof(axom::IndexType)); + m_facetCount * sizeof(DomainIdType)); } } } diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 8426c89d3b..5364944278 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -1011,14 +1011,16 @@ struct ContourTestBase } //!@brief Get view of output domain id data. - axom::ArrayView getDomainIdView( + axom::ArrayView getDomainIdView( axom::mint::UnstructuredMesh& contourMesh) const { const auto* ptr = - contourMesh.getFieldPtr(m_domainIdField, - axom::mint::CELL_CENTERED); - axom::ArrayView view(ptr, - contourMesh.getNumberOfCells()); + contourMesh.getFieldPtr( + m_domainIdField, + axom::mint::CELL_CENTERED); + axom::ArrayView view( + ptr, + contourMesh.getNumberOfCells()); return view; } @@ -1079,11 +1081,13 @@ struct ContourTestBase allCoordsViews[n] = mvu.getConstCoordsViews(false); } - std::map domainIdToContiguousId; + std::map + domainIdToContiguousId; for(int n = 0; n < domainCount; ++n) { const auto& dom = computationalMesh.domain(n); - int domainId = n; + axom::quest::MarchingCubes::DomainIdType domainId = n; if(dom.has_path("state/domain_id")) { domainId = dom.fetch_existing("state/domain_id").value(); @@ -1102,8 +1106,10 @@ struct ContourTestBase for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; ++contourCellNum) { - axom::IndexType domainId = domainIdView[contourCellNum]; - axom::IndexType contiguousIndex = domainIdToContiguousId[domainId]; + axom::quest::MarchingCubes::DomainIdType domainId = + domainIdView[contourCellNum]; + axom::quest::MarchingCubes::DomainIdType contiguousIndex = + domainIdToContiguousId[domainId]; typename axom::quest::MeshViewUtil::ConstCoordsViewsType& coordsViews = allCoordsViews[contiguousIndex]; @@ -1193,10 +1199,10 @@ struct ContourTestBase } std::map domainIdToContiguousId; - for(int n = 0; n < domainCount; ++n) + for(axom::quest::MarchingCubes::DomainIdType n = 0; n < domainCount; ++n) { const auto& dom = computationalMesh.domain(n); - int domainId = n; + axom::quest::MarchingCubes::DomainIdType domainId = n; if(dom.has_path("state/domain_id")) { domainId = dom.fetch_existing("state/domain_id").value(); @@ -1207,8 +1213,10 @@ struct ContourTestBase for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; ++contourCellNum) { - axom::IndexType domainId = domainIdView[contourCellNum]; - axom::IndexType contiguousId = domainIdToContiguousId[domainId]; + axom::quest::MarchingCubes::DomainIdType domainId = + domainIdView[contourCellNum]; + axom::quest::MarchingCubes::DomainIdType contiguousId = + domainIdToContiguousId[domainId]; const axom::IndexType parentCellId = parentCellIdView[contourCellNum]; hasContours[contiguousId][parentCellId] = true; } From 6a152f1ad1fb582c01c5e4ee66c3351d6f4d307a Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 31 Jan 2024 14:26:58 -0800 Subject: [PATCH 423/639] Attempt to fix weird crash in Umpire. Make sure the correct overloaded Array functions are used. --- src/axom/quest/MarchingCubes.cpp | 18 ++++++------------ src/axom/quest/MarchingCubes.hpp | 2 +- src/axom/quest/detail/MarchingCubesImpl.hpp | 20 ++++++++++++-------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 34adc863bf..e01d298d89 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -13,7 +13,6 @@ #include "axom/core/execution/execution_space.hpp" #include "axom/quest/MarchingCubes.hpp" -// #include "axom/quest/detail/MarchingCubesHybridParallel.hpp" #include "axom/quest/detail/MarchingCubesImpl.hpp" #include "axom/fmt.hpp" @@ -99,16 +98,6 @@ void MarchingCubes::computeIsocontour(double contourVal) } } -axom::IndexType MarchingCubes::getContourCellCount() const -{ - axom::IndexType contourCellCount = 0; - for(int dId = 0; dId < m_singles.size(); ++dId) - { - contourCellCount += m_singles[dId]->getContourCellCount(); - } - return contourCellCount; -} - axom::IndexType MarchingCubes::getContourNodeCount() const { axom::IndexType contourNodeCount = 0; @@ -184,7 +173,12 @@ void MarchingCubes::populateContourMesh( #endif ; const int hostAllocatorId = hostAndInternalMemoriesAreSeparate - ? axom::detail::getAllocatorID() + ? +#ifdef AXOM_USE_UMPIRE + axom::detail::getAllocatorID() +#else + axom::detail::getAllocatorID() +#endif : m_allocatorID; if(hostAndInternalMemoriesAreSeparate) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 06e83bccf7..15313d026f 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -160,7 +160,7 @@ class MarchingCubes void computeIsocontour(double contourVal = 0.0); //!@brief Get number of cells in the generated contour mesh. - axom::IndexType getContourCellCount() const; + axom::IndexType getContourCellCount() const { return m_facetCount; } //!@brief Get number of nodes in the generated contour mesh. axom::IndexType getContourNodeCount() const; diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 2aa40c6b68..419a4fbf60 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -55,9 +55,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_HOST MarchingCubesImpl(int allocatorID) : m_allocatorID(allocatorID) , m_caseIds(emptyShape(), m_allocatorID) - , m_crossingParentIds(0, 0, m_allocatorID) - , m_facetIncrs(0, 0, m_allocatorID) - , m_firstFacetIds(0, 0, m_allocatorID) + , m_crossingParentIds(axom::StackArray {0}, m_allocatorID) + , m_facetIncrs(axom::StackArray {0}, m_allocatorID) + , m_firstFacetIds(axom::StackArray {0}, m_allocatorID) { } /*! @@ -309,7 +309,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase // cell ids, regardless of the ordering of the input mesh data. // - axom::Array crossingFlags(parentCellCount); + axom::StackArray tmpShape {parentCellCount}; + axom::Array crossingFlags(tmpShape); auto crossingFlagsView = crossingFlags.view(); axom::for_all( 0, @@ -320,7 +321,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase crossingFlagsView[parentCellId] = bool(numContourCells); }); - axom::Array scannedFlags(1 + parentCellCount); + axom::StackArray tmpShape1 {1 + parentCellCount}; + axom::Array scannedFlags(tmpShape1); auto scannedFlagsView = scannedFlags.view(); #if defined(AXOM_USE_RAJA) RAJA::inclusive_scan( @@ -343,9 +345,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase // Generate crossing-cells index list and corresponding facet counts. // - m_crossingParentIds.resize(m_crossingCount); - m_facetIncrs.resize(m_crossingCount); - m_firstFacetIds.resize(1 + m_crossingCount); + const axom::StackArray tmpShape2 {m_crossingCount}; + const axom::StackArray tmpShape3 {1 + m_crossingCount}; + m_crossingParentIds.resize(tmpShape2, 0); + m_facetIncrs.resize(tmpShape2, 0); + m_firstFacetIds.resize(tmpShape3, 0); auto crossingParentIdsView = m_crossingParentIds.view(); auto facetIncrsView = m_facetIncrs.view(); From 06465cf4cffc82a14b30f0b049da2085efb74948 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 31 Jan 2024 17:49:35 -0800 Subject: [PATCH 424/639] Fix doxygen comments. --- src/axom/quest/MarchingCubes.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 15313d026f..2080f0248a 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -78,12 +78,13 @@ class MarchingCubesSingleDomain; * Usage example: * @beginverbatim * void foo( conduit::Node &meshNode, - * const std::string &coordsName, + * const std::string &topologyName, * const std::string &functionName, * double contourValue ) * { * MarchingCubes mc(axom::runtime_policy::Policy::seq, - * meshNode, coordsName); + * MarchingCubesDataParallelism::byPolicy, + * meshNode, topologyName); * mc.setFunctionField(functionName); * mc.computeIsocontour(contourValue); * axom::mint::UnstructuredMesh From 2a07e8d90eddfa46090e8f87a91d9a9b9a931a85 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 1 Feb 2024 11:44:48 -0800 Subject: [PATCH 425/639] Updates update_copyright_date script to 2024 --- scripts/update_copyright_date.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/update_copyright_date.sh b/scripts/update_copyright_date.sh index d10df611ab..a205d981fb 100755 --- a/scripts/update_copyright_date.sh +++ b/scripts/update_copyright_date.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) @@ -43,28 +43,28 @@ for i in `cat files2change` do echo $i cp $i $i.sed.bak - sed "s/Copyright (c) 2017-2022/Copyright (c) 2017-2023/" $i.sed.bak > $i + sed "s/Copyright (c) 2017-2023/Copyright (c) 2017-2024/" $i.sed.bak > $i done echo LICENSE cp LICENSE LICENSE.sed.bak -sed "s/Copyright (c) 2017-2022/Copyright (c) 2017-2023/" LICENSE.sed.bak > LICENSE +sed "s/Copyright (c) 2017-2023/Copyright (c) 2017-2024/" LICENSE.sed.bak > LICENSE echo RELEASE cp RELEASE RELEASE.sed.bak -sed "s/2017-2022/2017-2023/" RELEASE.sed.bak > RELEASE +sed "s/2017-2023/2017-2024/" RELEASE.sed.bak > RELEASE echo README cp README.md README.md.sed.bak -sed "s/2017-2022/2017-2023/" README.md.sed.bak > README.md +sed "s/2017-2023/2017-2024/" README.md.sed.bak > README.md echo RELEASE-NOTES cp RELEASE-NOTES.md RELEASE-NOTES.md.sed.bak -sed "s/2017-2022/2017-2023/" RELEASE-NOTES.md.sed.bak > RELEASE-NOTES.md +sed "s/2017-2023/2017-2024/" RELEASE-NOTES.md.sed.bak > RELEASE-NOTES.md echo src/conf.py cp src/conf.py src/conf.py.sed.bak -sed "s/2017-2022/2017-2023/" src/conf.py.sed.bak > src/conf.py +sed "s/2017-2023/2017-2024/" src/conf.py.sed.bak > src/conf.py #============================================================================= # Remove temporary files created in the process From 519eab38b795cdc61d498a9329c744d9d4106130 Mon Sep 17 00:00:00 2001 From: Axom Shared User Date: Thu, 1 Feb 2024 11:50:56 -0800 Subject: [PATCH 426/639] Applies update-copyright script to checked in files --- .gitlab-ci.yml | 2 +- .gitlab/build_lassen.yml | 2 +- .gitlab/build_quartz.yml | 2 +- .gitlab/build_rzansel.yml | 2 +- .gitlab/build_rzgenie.yml | 2 +- .gitlab/build_tioga.yml | 2 +- LICENSE | 2 +- README.md | 4 ++-- RELEASE | 2 +- RELEASE-NOTES.md | 2 +- azure-pipelines.yml | 2 +- config-build.py | 2 +- host-configs/other/Darwin.cmake | 2 +- host-configs/other/battra.cmake | 2 +- host-configs/other/empress.llnl.gov.cmake | 2 +- host-configs/other/naples.cmake | 2 +- .../other/no-tpl-toss_3_x86_64_ib-clang@10-ifort@19.cmake | 2 +- .../other/no-tpl-toss_3_x86_64_ib-clang@10.0.0.cmake | 2 +- .../other/no-tpl-toss_3_x86_64_ib-intel@19.0.4.cmake | 2 +- host-configs/other/sqa-uno-MSVC-INTEL.cmake | 2 +- host-configs/other/sqa-uno-MSVC.cmake | 2 +- scripts/azure-pipelines/linux-build_and_test.sh | 2 +- scripts/azure-pipelines/linux-check.sh | 2 +- scripts/copyrightPrepender.py | 6 +++--- scripts/gitsetup/hooks/commit-msg | 2 +- scripts/gitsetup/hooks/post-checkout | 2 +- scripts/gitsetup/setup-git-aliases.sh | 2 +- scripts/gitsetup/setup-git-colors.sh | 2 +- scripts/gitsetup/setup-git-editor.sh | 2 +- scripts/gitsetup/setup-git-hooks.sh | 2 +- scripts/gitsetup/setup-git-user.sh | 2 +- scripts/gitsetup/tips.sh | 2 +- scripts/llnl_scripts/archive_job.py | 2 +- .../batch_scripts/bsub_llnl_cz_blueos_all_compilers.sh | 2 +- .../llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_src.sh | 2 +- .../batch_scripts/bsub_llnl_rz_blueos_all_compilers.sh | 2 +- .../llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_src.sh | 2 +- .../batch_scripts/msub_llnl_cz_toss3_all_compilers.sh | 2 +- .../llnl_scripts/batch_scripts/msub_llnl_cz_toss3_src.sh | 2 +- .../batch_scripts/msub_llnl_rz_toss3_all_compilers.sh | 2 +- .../llnl_scripts/batch_scripts/msub_llnl_rz_toss3_src.sh | 2 +- .../batch_scripts/msub_llnl_test_uberenv_host_configs.sh | 2 +- scripts/llnl_scripts/build_devtools.py | 2 +- scripts/llnl_scripts/build_src.py | 2 +- scripts/llnl_scripts/build_tpls.py | 2 +- scripts/llnl_scripts/find_unused_tpl_dirs.py | 2 +- scripts/llnl_scripts/fix_permissions.py | 2 +- scripts/llnl_scripts/llnl_lc_build_tools.py | 2 +- scripts/llnl_scripts/move_unused_tpl_dirs_to_graveyard.py | 2 +- scripts/llnl_scripts/report.py | 2 +- scripts/make_release_tarball.sh | 2 +- scripts/setup-for-development.sh | 2 +- scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml | 2 +- scripts/spack/configs/darwin/spack.yaml | 2 +- scripts/spack/configs/docker/ubuntu20/spack.yaml | 2 +- scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml | 2 +- scripts/spack/configs/linux_ubuntu_20/spack.yaml | 2 +- scripts/spack/configs/toss_3_x86_64_ib/spack.yaml | 2 +- scripts/spack/configs/toss_4_x86_64_ib/spack.yaml | 2 +- scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml | 2 +- .../devtools_configs/blueos_3_ppc64le_ib_p9/spack.yaml | 2 +- scripts/spack/devtools_configs/toss_3_x86_64_ib/spack.yaml | 2 +- scripts/spack/devtools_configs/toss_4_x86_64_ib/spack.yaml | 2 +- scripts/spack/specs.json | 2 +- scripts/uncrustfiy.bash | 2 +- scripts/vcpkg_ports/axom/portfile.cmake | 4 ++-- src/CMakeLists.txt | 2 +- src/axom/CMakeLists.txt | 2 +- src/axom/config.hpp.in | 2 +- src/axom/core/Array.hpp | 2 +- src/axom/core/ArrayBase.hpp | 2 +- src/axom/core/ArrayIteratorBase.hpp | 2 +- src/axom/core/ArrayView.hpp | 2 +- src/axom/core/CMakeLists.txt | 2 +- src/axom/core/FlatMap.hpp | 2 +- src/axom/core/IteratorBase.hpp | 2 +- src/axom/core/Macros.hpp | 2 +- src/axom/core/Map.hpp | 2 +- src/axom/core/Path.cpp | 2 +- src/axom/core/Path.hpp | 2 +- src/axom/core/StackArray.hpp | 2 +- src/axom/core/Types.cpp | 2 +- src/axom/core/Types.hpp | 2 +- src/axom/core/detail/FlatTable.hpp | 2 +- src/axom/core/docs/sphinx/core_acceleration.rst | 2 +- src/axom/core/docs/sphinx/core_containers.rst | 2 +- src/axom/core/docs/sphinx/core_numerics.rst | 2 +- src/axom/core/docs/sphinx/core_utilities.rst | 2 +- src/axom/core/docs/sphinx/index.rst | 2 +- src/axom/core/examples/CMakeLists.txt | 2 +- src/axom/core/examples/core_acceleration.cpp | 2 +- src/axom/core/examples/core_containers.cpp | 2 +- src/axom/core/examples/core_numerics.cpp | 2 +- src/axom/core/examples/core_utilities.cpp | 2 +- src/axom/core/execution/doc.hpp | 2 +- src/axom/core/execution/execution_space.hpp | 2 +- src/axom/core/execution/for_all.hpp | 2 +- src/axom/core/execution/internal/cuda_exec.hpp | 2 +- src/axom/core/execution/internal/hip_exec.hpp | 2 +- src/axom/core/execution/internal/omp_exec.hpp | 2 +- src/axom/core/execution/internal/seq_exec.hpp | 2 +- src/axom/core/execution/runtime_policy.hpp | 2 +- src/axom/core/execution/synchronize.hpp | 2 +- src/axom/core/memory_management.hpp | 2 +- src/axom/core/numerics/Determinants.hpp | 2 +- src/axom/core/numerics/LU.hpp | 2 +- src/axom/core/numerics/Matrix.hpp | 2 +- src/axom/core/numerics/eigen_solve.hpp | 2 +- src/axom/core/numerics/eigen_sort.hpp | 2 +- src/axom/core/numerics/floating_point_limits.hpp | 2 +- src/axom/core/numerics/internal/matrix_norms.hpp | 2 +- src/axom/core/numerics/jacobi_eigensolve.hpp | 2 +- src/axom/core/numerics/linear_solve.hpp | 2 +- src/axom/core/numerics/matvecops.hpp | 2 +- src/axom/core/numerics/polynomial_solvers.cpp | 2 +- src/axom/core/numerics/polynomial_solvers.hpp | 2 +- src/axom/core/tests/CMakeLists.txt | 2 +- src/axom/core/tests/core_Path.hpp | 2 +- src/axom/core/tests/core_about.hpp | 2 +- src/axom/core/tests/core_array.hpp | 2 +- src/axom/core/tests/core_array_for_all.hpp | 2 +- src/axom/core/tests/core_bit_utilities.hpp | 2 +- src/axom/core/tests/core_execution_for_all.hpp | 2 +- src/axom/core/tests/core_execution_space.hpp | 2 +- src/axom/core/tests/core_flatmap.hpp | 2 +- src/axom/core/tests/core_map.hpp | 2 +- src/axom/core/tests/core_memory_management.hpp | 2 +- src/axom/core/tests/core_mpi_main.cpp | 2 +- src/axom/core/tests/core_openmp_main.cpp | 2 +- src/axom/core/tests/core_openmp_map.hpp | 2 +- src/axom/core/tests/core_serial_main.cpp | 2 +- src/axom/core/tests/core_stack_array.hpp | 2 +- src/axom/core/tests/core_types.hpp | 2 +- src/axom/core/tests/core_utilities.hpp | 2 +- src/axom/core/tests/numerics_determinants.hpp | 2 +- src/axom/core/tests/numerics_eigen_solve.hpp | 2 +- src/axom/core/tests/numerics_eigen_sort.hpp | 2 +- src/axom/core/tests/numerics_floating_point_limits.hpp | 2 +- src/axom/core/tests/numerics_jacobi_eigensolve.hpp | 2 +- src/axom/core/tests/numerics_linear_solve.hpp | 2 +- src/axom/core/tests/numerics_lu.hpp | 2 +- src/axom/core/tests/numerics_matrix.hpp | 2 +- src/axom/core/tests/numerics_matvecops.hpp | 2 +- src/axom/core/tests/numerics_polynomial_solvers.hpp | 2 +- src/axom/core/tests/utils_Timer.hpp | 2 +- src/axom/core/tests/utils_config.cpp | 2 +- src/axom/core/tests/utils_endianness.hpp | 2 +- src/axom/core/tests/utils_fileUtilities.hpp | 2 +- src/axom/core/tests/utils_locale.hpp | 2 +- src/axom/core/tests/utils_nvtx_settings.hpp | 2 +- src/axom/core/tests/utils_stringUtilities.hpp | 2 +- src/axom/core/tests/utils_system.hpp | 2 +- src/axom/core/tests/utils_utilities.hpp | 2 +- src/axom/core/utilities/About.cpp.in | 2 +- src/axom/core/utilities/About.hpp | 2 +- src/axom/core/utilities/AnnotationMacros.hpp | 2 +- src/axom/core/utilities/BitUtilities.hpp | 2 +- src/axom/core/utilities/FileUtilities.cpp | 2 +- src/axom/core/utilities/FileUtilities.hpp | 2 +- src/axom/core/utilities/StringUtilities.cpp | 2 +- src/axom/core/utilities/StringUtilities.hpp | 2 +- src/axom/core/utilities/System.cpp | 2 +- src/axom/core/utilities/System.hpp | 2 +- src/axom/core/utilities/Timer.hpp | 2 +- src/axom/core/utilities/Utilities.cpp | 2 +- src/axom/core/utilities/Utilities.hpp | 2 +- src/axom/core/utilities/nvtx/Macros.hpp | 2 +- src/axom/core/utilities/nvtx/Range.cpp | 2 +- src/axom/core/utilities/nvtx/Range.hpp | 2 +- src/axom/core/utilities/nvtx/interface.cpp | 2 +- src/axom/core/utilities/nvtx/interface.hpp | 2 +- src/axom/inlet/CMakeLists.txt | 2 +- src/axom/inlet/ConduitReader.cpp | 2 +- src/axom/inlet/ConduitReader.hpp | 2 +- src/axom/inlet/Container.cpp | 2 +- src/axom/inlet/Container.hpp | 2 +- src/axom/inlet/Field.cpp | 2 +- src/axom/inlet/Field.hpp | 2 +- src/axom/inlet/Function.cpp | 2 +- src/axom/inlet/Function.hpp | 2 +- src/axom/inlet/Inlet.cpp | 2 +- src/axom/inlet/Inlet.hpp | 2 +- src/axom/inlet/InletVector.hpp | 2 +- src/axom/inlet/JSONReader.hpp | 2 +- src/axom/inlet/JSONSchemaWriter.cpp | 2 +- src/axom/inlet/JSONSchemaWriter.hpp | 2 +- src/axom/inlet/LuaReader.cpp | 2 +- src/axom/inlet/LuaReader.hpp | 2 +- src/axom/inlet/Proxy.cpp | 2 +- src/axom/inlet/Proxy.hpp | 2 +- src/axom/inlet/Reader.hpp | 2 +- src/axom/inlet/SphinxWriter.cpp | 2 +- src/axom/inlet/SphinxWriter.hpp | 2 +- src/axom/inlet/VariantKey.cpp | 2 +- src/axom/inlet/VariantKey.hpp | 2 +- src/axom/inlet/Verifiable.hpp | 2 +- src/axom/inlet/VerifiableScalar.cpp | 2 +- src/axom/inlet/VerifiableScalar.hpp | 2 +- src/axom/inlet/Writer.hpp | 2 +- src/axom/inlet/YAMLReader.hpp | 2 +- src/axom/inlet/examples/CMakeLists.txt | 2 +- src/axom/inlet/examples/arrays.cpp | 2 +- src/axom/inlet/examples/containers.cpp | 2 +- src/axom/inlet/examples/documentation_generation.cpp | 2 +- src/axom/inlet/examples/fields.cpp | 2 +- src/axom/inlet/examples/lua_library.cpp | 2 +- src/axom/inlet/examples/mfem_coefficient.cpp | 2 +- src/axom/inlet/examples/nested_structs.cpp | 2 +- src/axom/inlet/examples/user_defined_type.cpp | 2 +- src/axom/inlet/examples/verification.cpp | 2 +- src/axom/inlet/inlet_utils.cpp | 2 +- src/axom/inlet/inlet_utils.hpp | 2 +- src/axom/inlet/tests/CMakeLists.txt | 2 +- src/axom/inlet/tests/inlet_Inlet.cpp | 2 +- src/axom/inlet/tests/inlet_Reader.cpp | 2 +- src/axom/inlet/tests/inlet_errors.cpp | 2 +- src/axom/inlet/tests/inlet_function.cpp | 2 +- src/axom/inlet/tests/inlet_jsonschema_writer.cpp | 2 +- src/axom/inlet/tests/inlet_object.cpp | 2 +- src/axom/inlet/tests/inlet_restart.cpp | 2 +- src/axom/inlet/tests/inlet_test_utils.cpp | 2 +- src/axom/inlet/tests/inlet_test_utils.hpp | 2 +- src/axom/klee/CMakeLists.txt | 2 +- src/axom/klee/Dimensions.hpp | 2 +- src/axom/klee/Geometry.cpp | 2 +- src/axom/klee/Geometry.hpp | 2 +- src/axom/klee/GeometryOperators.cpp | 2 +- src/axom/klee/GeometryOperators.hpp | 2 +- src/axom/klee/GeometryOperatorsIO.cpp | 2 +- src/axom/klee/GeometryOperatorsIO.hpp | 2 +- src/axom/klee/IO.cpp | 2 +- src/axom/klee/IO.hpp | 2 +- src/axom/klee/IOUtil.cpp | 2 +- src/axom/klee/IOUtil.hpp | 2 +- src/axom/klee/KleeError.cpp | 2 +- src/axom/klee/KleeError.hpp | 2 +- src/axom/klee/Shape.cpp | 2 +- src/axom/klee/Shape.hpp | 2 +- src/axom/klee/ShapeSet.cpp | 2 +- src/axom/klee/ShapeSet.hpp | 2 +- src/axom/klee/Units.cpp | 2 +- src/axom/klee/Units.hpp | 2 +- src/axom/klee/docs/sphinx/index.rst | 2 +- src/axom/klee/tests/CMakeLists.txt | 2 +- src/axom/klee/tests/KleeMatchers.hpp | 2 +- src/axom/klee/tests/KleeTestUtils.cpp | 2 +- src/axom/klee/tests/KleeTestUtils.hpp | 2 +- src/axom/klee/tests/klee_config.cpp | 2 +- src/axom/klee/tests/klee_geometry.cpp | 2 +- src/axom/klee/tests/klee_geometry_operators.cpp | 2 +- src/axom/klee/tests/klee_geometry_operators_io.cpp | 2 +- src/axom/klee/tests/klee_io.cpp | 2 +- src/axom/klee/tests/klee_io_util.cpp | 2 +- src/axom/klee/tests/klee_shape.cpp | 2 +- src/axom/klee/tests/klee_shape_set.cpp | 2 +- src/axom/klee/tests/klee_units.cpp | 2 +- src/axom/lumberjack/BinaryTreeCommunicator.cpp | 2 +- src/axom/lumberjack/BinaryTreeCommunicator.hpp | 2 +- src/axom/lumberjack/CMakeLists.txt | 2 +- src/axom/lumberjack/Combiner.hpp | 2 +- src/axom/lumberjack/Communicator.hpp | 2 +- src/axom/lumberjack/Lumberjack.cpp | 2 +- src/axom/lumberjack/Lumberjack.hpp | 2 +- src/axom/lumberjack/MPIUtility.cpp | 2 +- src/axom/lumberjack/MPIUtility.hpp | 2 +- src/axom/lumberjack/Message.cpp | 2 +- src/axom/lumberjack/Message.hpp | 2 +- src/axom/lumberjack/RootCommunicator.cpp | 2 +- src/axom/lumberjack/RootCommunicator.hpp | 2 +- src/axom/lumberjack/TextEqualityCombiner.hpp | 2 +- src/axom/lumberjack/examples/CMakeLists.txt | 2 +- src/axom/lumberjack/examples/basicExample.cpp | 2 +- src/axom/lumberjack/tests/CMakeLists.txt | 2 +- src/axom/lumberjack/tests/lumberjack_BinaryCommunicator.hpp | 2 +- src/axom/lumberjack/tests/lumberjack_Lumberjack.hpp | 2 +- src/axom/lumberjack/tests/lumberjack_Message.hpp | 2 +- src/axom/lumberjack/tests/lumberjack_RootCommunicator.hpp | 2 +- .../lumberjack/tests/lumberjack_TextEqualityCombiner.hpp | 2 +- src/axom/lumberjack/tests/lumberjack_mpi_main.cpp | 2 +- src/axom/lumberjack/tests/lumberjack_serial_main.cpp | 2 +- src/axom/lumberjack/tests/lumberjack_speedTest.cpp | 2 +- src/axom/mint/CMakeLists.txt | 2 +- src/axom/mint/core/config.hpp.in | 2 +- src/axom/mint/deprecated/MCArray.hpp | 2 +- src/axom/mint/deprecated/SidreMCArray.hpp | 2 +- src/axom/mint/docs/sphinx/index.rst | 2 +- src/axom/mint/docs/sphinx/sections/appendix.rst | 2 +- src/axom/mint/docs/sphinx/sections/architecture.rst | 2 +- src/axom/mint/docs/sphinx/sections/citations.rst | 2 +- src/axom/mint/docs/sphinx/sections/examples.rst | 2 +- src/axom/mint/docs/sphinx/sections/execution_model.rst | 2 +- src/axom/mint/docs/sphinx/sections/faq.rst | 2 +- src/axom/mint/docs/sphinx/sections/fem.rst | 2 +- src/axom/mint/docs/sphinx/sections/getting_started.rst | 2 +- src/axom/mint/docs/sphinx/sections/mesh_representation.rst | 2 +- src/axom/mint/docs/sphinx/sections/mesh_types.rst | 2 +- src/axom/mint/docs/sphinx/sections/preliminary_concepts.rst | 2 +- src/axom/mint/docs/sphinx/sections/tutorial.rst | 2 +- src/axom/mint/examples/CMakeLists.txt | 2 +- src/axom/mint/examples/mint_curvilinear_mesh.cpp | 2 +- src/axom/mint/examples/mint_heat_equation.cpp | 2 +- src/axom/mint/examples/mint_nbody_solver.cpp | 2 +- src/axom/mint/examples/mint_particle_mesh.cpp | 2 +- src/axom/mint/examples/mint_rectilinear_mesh.cpp | 2 +- src/axom/mint/examples/mint_su2_mesh.cpp | 2 +- .../mint/examples/mint_unstructured_mixed_topology_mesh.cpp | 2 +- .../examples/mint_unstructured_single_topology_mesh.cpp | 2 +- src/axom/mint/examples/user_guide/mint_getting_started.cpp | 2 +- src/axom/mint/examples/user_guide/mint_tutorial.cpp | 2 +- src/axom/mint/execution/interface.hpp | 2 +- src/axom/mint/execution/internal/for_all_cells.hpp | 2 +- src/axom/mint/execution/internal/for_all_faces.hpp | 2 +- src/axom/mint/execution/internal/for_all_nodes.hpp | 2 +- src/axom/mint/execution/internal/helpers.hpp | 2 +- src/axom/mint/execution/internal/structured_exec.hpp | 2 +- src/axom/mint/execution/xargs.hpp | 2 +- src/axom/mint/fem/FEBasis.hpp | 2 +- src/axom/mint/fem/FEBasisTypes.hpp | 2 +- src/axom/mint/fem/FiniteElement.cpp | 2 +- src/axom/mint/fem/FiniteElement.hpp | 2 +- src/axom/mint/fem/shape_functions/Lagrange.hpp | 2 +- src/axom/mint/fem/shape_functions/ShapeFunction.hpp | 2 +- .../mint/fem/shape_functions/lagrange/lagrange_hexa_27.hpp | 2 +- .../mint/fem/shape_functions/lagrange/lagrange_hexa_8.hpp | 2 +- .../mint/fem/shape_functions/lagrange/lagrange_prism_6.hpp | 2 +- .../mint/fem/shape_functions/lagrange/lagrange_pyra_5.hpp | 2 +- .../mint/fem/shape_functions/lagrange/lagrange_quad_4.hpp | 2 +- .../mint/fem/shape_functions/lagrange/lagrange_quad_9.hpp | 2 +- .../mint/fem/shape_functions/lagrange/lagrange_tetra_4.hpp | 2 +- .../mint/fem/shape_functions/lagrange/lagrange_tri_3.hpp | 2 +- src/axom/mint/mesh/CellTypes.hpp | 2 +- src/axom/mint/mesh/ConnectivityArray.hpp | 2 +- src/axom/mint/mesh/CurvilinearMesh.cpp | 2 +- src/axom/mint/mesh/CurvilinearMesh.hpp | 2 +- src/axom/mint/mesh/Field.hpp | 2 +- src/axom/mint/mesh/FieldAssociation.hpp | 2 +- src/axom/mint/mesh/FieldData.cpp | 2 +- src/axom/mint/mesh/FieldData.hpp | 2 +- src/axom/mint/mesh/FieldTypes.hpp | 2 +- src/axom/mint/mesh/FieldVariable.hpp | 2 +- src/axom/mint/mesh/Mesh.cpp | 2 +- src/axom/mint/mesh/Mesh.hpp | 2 +- src/axom/mint/mesh/MeshCoordinates.cpp | 2 +- src/axom/mint/mesh/MeshCoordinates.hpp | 2 +- src/axom/mint/mesh/MeshTypes.hpp | 2 +- src/axom/mint/mesh/ParticleMesh.cpp | 2 +- src/axom/mint/mesh/ParticleMesh.hpp | 2 +- src/axom/mint/mesh/RectilinearMesh.cpp | 2 +- src/axom/mint/mesh/RectilinearMesh.hpp | 2 +- src/axom/mint/mesh/StructuredMesh.cpp | 2 +- src/axom/mint/mesh/StructuredMesh.hpp | 2 +- src/axom/mint/mesh/UniformMesh.cpp | 2 +- src/axom/mint/mesh/UniformMesh.hpp | 2 +- src/axom/mint/mesh/UnstructuredMesh.hpp | 2 +- src/axom/mint/mesh/blueprint.cpp | 2 +- src/axom/mint/mesh/blueprint.hpp | 2 +- src/axom/mint/mesh/internal/ConnectivityArrayHelpers.hpp | 2 +- .../mesh/internal/ConnectivityArray_typed_indirection.hpp | 2 +- src/axom/mint/mesh/internal/MeshHelpers.cpp | 2 +- src/axom/mint/mesh/internal/MeshHelpers.hpp | 2 +- src/axom/mint/tests/CMakeLists.txt | 2 +- src/axom/mint/tests/StructuredMesh_helpers.hpp | 2 +- src/axom/mint/tests/mint_deprecated_mcarray.cpp | 2 +- src/axom/mint/tests/mint_execution_cell_traversals.cpp | 2 +- src/axom/mint/tests/mint_execution_face_traversals.cpp | 2 +- src/axom/mint/tests/mint_execution_node_traversals.cpp | 2 +- src/axom/mint/tests/mint_execution_xargs.cpp | 2 +- src/axom/mint/tests/mint_fem_shape_functions.cpp | 2 +- src/axom/mint/tests/mint_fem_single_fe.cpp | 2 +- src/axom/mint/tests/mint_mesh.cpp | 2 +- src/axom/mint/tests/mint_mesh_blueprint.cpp | 2 +- src/axom/mint/tests/mint_mesh_cell_types.cpp | 2 +- src/axom/mint/tests/mint_mesh_connectivity_array.cpp | 2 +- src/axom/mint/tests/mint_mesh_coordinates.cpp | 2 +- src/axom/mint/tests/mint_mesh_curvilinear_mesh.cpp | 2 +- src/axom/mint/tests/mint_mesh_face_relation.cpp | 2 +- src/axom/mint/tests/mint_mesh_field.cpp | 2 +- src/axom/mint/tests/mint_mesh_field_data.cpp | 2 +- src/axom/mint/tests/mint_mesh_field_types.cpp | 2 +- src/axom/mint/tests/mint_mesh_field_variable.cpp | 2 +- src/axom/mint/tests/mint_mesh_particle_mesh.cpp | 2 +- src/axom/mint/tests/mint_mesh_rectilinear_mesh.cpp | 2 +- src/axom/mint/tests/mint_mesh_uniform_mesh.cpp | 2 +- src/axom/mint/tests/mint_mesh_unstructured_mesh.cpp | 2 +- src/axom/mint/tests/mint_su2_io.cpp | 2 +- src/axom/mint/tests/mint_test_utilities.hpp | 2 +- src/axom/mint/tests/mint_util_write_vtk.cpp | 2 +- src/axom/mint/utils/ExternalArray.hpp | 2 +- src/axom/mint/utils/su2_utils.cpp | 2 +- src/axom/mint/utils/su2_utils.hpp | 2 +- src/axom/mint/utils/vtk_utils.cpp | 2 +- src/axom/mint/utils/vtk_utils.hpp | 2 +- src/axom/multimat/CMakeLists.txt | 2 +- src/axom/multimat/docs/sphinx/index.rst | 2 +- src/axom/multimat/examples/CMakeLists.txt | 2 +- src/axom/multimat/examples/calculate.cpp | 2 +- src/axom/multimat/examples/calculate_gpu.cpp | 2 +- src/axom/multimat/examples/helper.hpp | 2 +- src/axom/multimat/examples/traversal.cpp | 2 +- src/axom/multimat/mmfield.hpp | 2 +- src/axom/multimat/mmsubfield.hpp | 2 +- src/axom/multimat/multimat.cpp | 2 +- src/axom/multimat/multimat.hpp | 2 +- src/axom/multimat/tests/CMakeLists.txt | 2 +- src/axom/multimat/tests/multimat_test.cpp | 2 +- src/axom/primal/CMakeLists.txt | 2 +- src/axom/primal/constants.hpp | 2 +- src/axom/primal/examples/CMakeLists.txt | 2 +- src/axom/primal/examples/hex_tet_volume.cpp | 2 +- src/axom/primal/examples/primal_introduction.cpp | 2 +- src/axom/primal/geometry/BezierCurve.hpp | 2 +- src/axom/primal/geometry/BezierPatch.hpp | 2 +- src/axom/primal/geometry/BoundingBox.hpp | 2 +- src/axom/primal/geometry/CurvedPolygon.hpp | 2 +- src/axom/primal/geometry/Hexahedron.hpp | 2 +- src/axom/primal/geometry/NumericArray.hpp | 2 +- src/axom/primal/geometry/Octahedron.hpp | 2 +- src/axom/primal/geometry/OrientationResult.hpp | 2 +- src/axom/primal/geometry/OrientedBoundingBox.hpp | 2 +- src/axom/primal/geometry/Plane.hpp | 2 +- src/axom/primal/geometry/Point.hpp | 2 +- src/axom/primal/geometry/Polygon.hpp | 2 +- src/axom/primal/geometry/Polyhedron.hpp | 2 +- src/axom/primal/geometry/Quadrilateral.hpp | 2 +- src/axom/primal/geometry/Ray.hpp | 2 +- src/axom/primal/geometry/Segment.hpp | 2 +- src/axom/primal/geometry/Sphere.hpp | 2 +- src/axom/primal/geometry/Tetrahedron.hpp | 2 +- src/axom/primal/geometry/Triangle.hpp | 2 +- src/axom/primal/geometry/Vector.hpp | 2 +- src/axom/primal/operators/clip.hpp | 2 +- src/axom/primal/operators/closest_point.hpp | 2 +- src/axom/primal/operators/compute_bounding_box.hpp | 2 +- src/axom/primal/operators/compute_moments.hpp | 2 +- src/axom/primal/operators/detail/clip_impl.hpp | 2 +- src/axom/primal/operators/detail/compute_moments_impl.hpp | 2 +- src/axom/primal/operators/detail/evaluate_integral_impl.hpp | 2 +- src/axom/primal/operators/detail/fuzzy_comparators.hpp | 2 +- src/axom/primal/operators/detail/intersect_bezier_impl.hpp | 2 +- .../primal/operators/detail/intersect_bounding_box_impl.hpp | 2 +- src/axom/primal/operators/detail/intersect_impl.hpp | 2 +- src/axom/primal/operators/detail/intersect_ray_impl.hpp | 2 +- src/axom/primal/operators/detail/winding_number_impl.hpp | 2 +- src/axom/primal/operators/evaluate_integral.hpp | 2 +- src/axom/primal/operators/in_curved_polygon.hpp | 2 +- src/axom/primal/operators/in_polygon.hpp | 2 +- src/axom/primal/operators/in_polyhedron.hpp | 2 +- src/axom/primal/operators/in_sphere.hpp | 2 +- src/axom/primal/operators/intersect.hpp | 2 +- src/axom/primal/operators/intersection_volume.hpp | 2 +- src/axom/primal/operators/is_convex.hpp | 2 +- src/axom/primal/operators/orientation.hpp | 2 +- src/axom/primal/operators/split.hpp | 2 +- src/axom/primal/operators/squared_distance.hpp | 2 +- src/axom/primal/operators/winding_number.hpp | 2 +- src/axom/primal/tests/CMakeLists.txt | 2 +- src/axom/primal/tests/primal_bezier_curve.cpp | 2 +- src/axom/primal/tests/primal_bezier_intersect.cpp | 2 +- src/axom/primal/tests/primal_bezier_patch.cpp | 2 +- src/axom/primal/tests/primal_bounding_box_intersect.cpp | 2 +- src/axom/primal/tests/primal_boundingbox.cpp | 2 +- src/axom/primal/tests/primal_clip.cpp | 2 +- src/axom/primal/tests/primal_closest_point.cpp | 2 +- src/axom/primal/tests/primal_compute_bounding_box.cpp | 2 +- src/axom/primal/tests/primal_compute_moments.cpp | 2 +- src/axom/primal/tests/primal_curved_polygon.cpp | 2 +- src/axom/primal/tests/primal_hexahedron.cpp | 2 +- src/axom/primal/tests/primal_in_sphere.cpp | 2 +- src/axom/primal/tests/primal_integral.cpp | 2 +- src/axom/primal/tests/primal_intersect.cpp | 2 +- src/axom/primal/tests/primal_intersect_impl.cpp | 2 +- src/axom/primal/tests/primal_numeric_array.cpp | 2 +- src/axom/primal/tests/primal_octahedron.cpp | 2 +- src/axom/primal/tests/primal_orientation.cpp | 2 +- src/axom/primal/tests/primal_orientedboundingbox.cpp | 2 +- src/axom/primal/tests/primal_plane.cpp | 2 +- src/axom/primal/tests/primal_point.cpp | 2 +- src/axom/primal/tests/primal_polygon.cpp | 2 +- src/axom/primal/tests/primal_polyhedron.cpp | 2 +- src/axom/primal/tests/primal_quadrilateral.cpp | 2 +- src/axom/primal/tests/primal_rational_bezier.cpp | 2 +- src/axom/primal/tests/primal_ray_intersect.cpp | 2 +- src/axom/primal/tests/primal_segment.cpp | 2 +- src/axom/primal/tests/primal_solid_angle.cpp | 2 +- src/axom/primal/tests/primal_sphere.cpp | 2 +- src/axom/primal/tests/primal_split.cpp | 2 +- src/axom/primal/tests/primal_squared_distance.cpp | 2 +- src/axom/primal/tests/primal_tetrahedron.cpp | 2 +- src/axom/primal/tests/primal_triangle.cpp | 2 +- src/axom/primal/tests/primal_vector.cpp | 2 +- src/axom/primal/tests/primal_winding_number.cpp | 2 +- src/axom/primal/tests/primal_zip.cpp | 2 +- src/axom/primal/utils/ZipBoundingBox.hpp | 2 +- src/axom/primal/utils/ZipIndexable.hpp | 2 +- src/axom/primal/utils/ZipPoint.hpp | 2 +- src/axom/primal/utils/ZipRay.hpp | 2 +- src/axom/primal/utils/ZipVector.hpp | 2 +- src/axom/quest/AllNearestNeighbors.cpp | 2 +- src/axom/quest/AllNearestNeighbors.hpp | 2 +- src/axom/quest/ArrayIndexer.hpp | 2 +- src/axom/quest/CMakeLists.txt | 2 +- src/axom/quest/Delaunay.hpp | 2 +- src/axom/quest/Discretize.cpp | 2 +- src/axom/quest/Discretize.hpp | 2 +- src/axom/quest/DistributedClosestPoint.cpp | 2 +- src/axom/quest/DistributedClosestPoint.hpp | 2 +- src/axom/quest/InOutOctree.hpp | 2 +- src/axom/quest/IntersectionShaper.hpp | 2 +- src/axom/quest/MarchingCubes.cpp | 2 +- src/axom/quest/MarchingCubes.hpp | 2 +- src/axom/quest/MeshTester.cpp | 2 +- src/axom/quest/MeshTester.hpp | 2 +- src/axom/quest/MeshViewUtil.hpp | 2 +- src/axom/quest/PointInCell.hpp | 2 +- src/axom/quest/SamplingShaper.hpp | 2 +- src/axom/quest/ScatteredInterpolation.hpp | 2 +- src/axom/quest/Shaper.cpp | 2 +- src/axom/quest/Shaper.hpp | 2 +- src/axom/quest/SignedDistance.cpp | 2 +- src/axom/quest/SignedDistance.hpp | 2 +- src/axom/quest/detail/AllNearestNeighbors_detail.hpp | 2 +- src/axom/quest/detail/Discretize_detail.hpp | 2 +- src/axom/quest/detail/DistributedClosestPointImpl.hpp | 2 +- src/axom/quest/detail/MarchingCubesFullParallel.hpp | 2 +- src/axom/quest/detail/MarchingCubesHybridParallel.hpp | 2 +- src/axom/quest/detail/MeshTester_detail.hpp | 2 +- src/axom/quest/detail/PointFinder.hpp | 2 +- src/axom/quest/detail/PointInCellMeshWrapper_mfem.hpp | 2 +- src/axom/quest/detail/inout/BlockData.hpp | 2 +- src/axom/quest/detail/inout/InOutOctreeMeshDumper.hpp | 2 +- src/axom/quest/detail/inout/InOutOctreeStats.hpp | 2 +- src/axom/quest/detail/inout/InOutOctreeValidator.hpp | 2 +- src/axom/quest/detail/inout/MeshWrapper.hpp | 2 +- src/axom/quest/detail/marching_cubes_lookup.hpp | 2 +- src/axom/quest/detail/shaping/shaping_helpers.cpp | 2 +- src/axom/quest/detail/shaping/shaping_helpers.hpp | 2 +- src/axom/quest/docs/sphinx/all_nearest_neighbors.rst | 2 +- src/axom/quest/docs/sphinx/check_and_repair.rst | 2 +- src/axom/quest/docs/sphinx/index.rst | 2 +- src/axom/quest/docs/sphinx/isosurface_detection.rst | 2 +- src/axom/quest/docs/sphinx/point_in_cell.rst | 2 +- src/axom/quest/docs/sphinx/point_mesh_query.rst | 2 +- src/axom/quest/docs/sphinx/point_mesh_query_cpp.rst | 2 +- src/axom/quest/docs/sphinx/read_mesh.rst | 2 +- src/axom/quest/examples/CMakeLists.txt | 2 +- src/axom/quest/examples/containment_driver.cpp | 2 +- src/axom/quest/examples/delaunay_triangulation.cpp | 2 +- src/axom/quest/examples/point_in_cell_benchmark.cpp | 2 +- src/axom/quest/examples/quest_bvh_two_pass.cpp | 2 +- .../examples/quest_distributed_distance_query_example.cpp | 2 +- src/axom/quest/examples/quest_inout_interface.F | 2 +- src/axom/quest/examples/quest_inout_interface.cpp | 2 +- src/axom/quest/examples/quest_marching_cubes_example.cpp | 2 +- src/axom/quest/examples/quest_signed_distance_interface.F | 2 +- src/axom/quest/examples/quest_signed_distance_interface.cpp | 2 +- src/axom/quest/examples/scattered_interpolation.cpp | 2 +- src/axom/quest/examples/shaping_driver.cpp | 2 +- src/axom/quest/interface/CMakeLists.txt | 2 +- src/axom/quest/interface/c_fortran/typesQUEST.h | 2 +- src/axom/quest/interface/c_fortran/wrapQUEST.cpp | 2 +- src/axom/quest/interface/c_fortran/wrapQUEST.h | 2 +- src/axom/quest/interface/c_fortran/wrapfquest.F | 2 +- src/axom/quest/interface/inout.cpp | 2 +- src/axom/quest/interface/inout.hpp | 2 +- src/axom/quest/interface/internal/QuestHelpers.cpp | 2 +- src/axom/quest/interface/internal/QuestHelpers.hpp | 2 +- src/axom/quest/interface/internal/mpicomm_wrapper.hpp | 2 +- src/axom/quest/interface/python/pyQUESThelper.cpp | 2 +- src/axom/quest/interface/python/pyQUESTmodule.cpp | 2 +- src/axom/quest/interface/python/pyQUESTmodule.hpp | 2 +- src/axom/quest/interface/python/pyQUESTutil.cpp | 2 +- src/axom/quest/interface/python/quest_test.py.in | 2 +- src/axom/quest/interface/python/setup.py.in | 2 +- src/axom/quest/interface/quest_shroud.yaml | 2 +- src/axom/quest/interface/signed_distance.cpp | 2 +- src/axom/quest/interface/signed_distance.hpp | 2 +- src/axom/quest/interface/yaml/quest_types.yaml | 2 +- src/axom/quest/readers/C2CReader.cpp | 2 +- src/axom/quest/readers/C2CReader.hpp | 2 +- src/axom/quest/readers/PC2CReader.cpp | 2 +- src/axom/quest/readers/PC2CReader.hpp | 2 +- src/axom/quest/readers/PProEReader.cpp | 2 +- src/axom/quest/readers/PProEReader.hpp | 2 +- src/axom/quest/readers/PSTLReader.cpp | 2 +- src/axom/quest/readers/PSTLReader.hpp | 2 +- src/axom/quest/readers/ProEReader.cpp | 2 +- src/axom/quest/readers/ProEReader.hpp | 2 +- src/axom/quest/readers/STLReader.cpp | 2 +- src/axom/quest/readers/STLReader.hpp | 2 +- src/axom/quest/tests/CMakeLists.txt | 2 +- src/axom/quest/tests/quest_all_nearest_neighbors.cpp | 2 +- src/axom/quest/tests/quest_array_indexer.cpp | 2 +- src/axom/quest/tests/quest_c2c_reader.cpp | 2 +- src/axom/quest/tests/quest_discretize.cpp | 2 +- src/axom/quest/tests/quest_initialize.cpp | 2 +- src/axom/quest/tests/quest_inout_interface.cpp | 2 +- src/axom/quest/tests/quest_inout_octree.cpp | 2 +- src/axom/quest/tests/quest_inout_quadtree.cpp | 2 +- src/axom/quest/tests/quest_intersection_shaper.cpp | 2 +- src/axom/quest/tests/quest_mesh_view_util.cpp | 2 +- src/axom/quest/tests/quest_meshtester.cpp | 2 +- src/axom/quest/tests/quest_point_in_cell_mfem.cpp | 2 +- src/axom/quest/tests/quest_pro_e_reader.cpp | 2 +- src/axom/quest/tests/quest_pro_e_reader_parallel.cpp | 2 +- src/axom/quest/tests/quest_regression.cpp | 2 +- src/axom/quest/tests/quest_sampling_shaper.cpp | 2 +- src/axom/quest/tests/quest_signed_distance.cpp | 2 +- src/axom/quest/tests/quest_signed_distance_interface.cpp | 2 +- src/axom/quest/tests/quest_stl_reader.cpp | 2 +- src/axom/quest/tests/quest_test_utilities.hpp | 2 +- src/axom/quest/tests/quest_vertex_weld.cpp | 2 +- src/axom/quest/util/mesh_helpers.cpp | 2 +- src/axom/quest/util/mesh_helpers.hpp | 2 +- src/axom/sidre/CMakeLists.txt | 2 +- src/axom/sidre/core/Array.hpp | 2 +- src/axom/sidre/core/AttrValues.cpp | 2 +- src/axom/sidre/core/AttrValues.hpp | 2 +- src/axom/sidre/core/Attribute.cpp | 2 +- src/axom/sidre/core/Attribute.hpp | 2 +- src/axom/sidre/core/Buffer.cpp | 2 +- src/axom/sidre/core/Buffer.hpp | 2 +- src/axom/sidre/core/DataStore.cpp | 2 +- src/axom/sidre/core/DataStore.hpp | 2 +- src/axom/sidre/core/Group.cpp | 2 +- src/axom/sidre/core/Group.hpp | 2 +- src/axom/sidre/core/IndexedCollection.hpp | 2 +- src/axom/sidre/core/ItemCollection.hpp | 2 +- src/axom/sidre/core/ListCollection.hpp | 2 +- src/axom/sidre/core/MFEMSidreDataCollection.cpp | 2 +- src/axom/sidre/core/MFEMSidreDataCollection.hpp | 2 +- src/axom/sidre/core/MapCollection.hpp | 2 +- src/axom/sidre/core/SidreDataTypeIds.h | 2 +- src/axom/sidre/core/SidreTypes.hpp | 2 +- src/axom/sidre/core/View.cpp | 2 +- src/axom/sidre/core/View.hpp | 2 +- src/axom/sidre/docs/sphinx/attribute.rst | 2 +- src/axom/sidre/docs/sphinx/buffer.rst | 2 +- src/axom/sidre/docs/sphinx/core_concepts.rst | 2 +- src/axom/sidre/docs/sphinx/data_vs_metadata.rst | 2 +- src/axom/sidre/docs/sphinx/datastore.rst | 2 +- src/axom/sidre/docs/sphinx/file_io.rst | 2 +- src/axom/sidre/docs/sphinx/first_example.rst | 2 +- src/axom/sidre/docs/sphinx/group.rst | 2 +- src/axom/sidre/docs/sphinx/index.rst | 2 +- src/axom/sidre/docs/sphinx/mfem_sidre_datacollection.rst | 2 +- src/axom/sidre/docs/sphinx/parallel_io_concepts.rst | 2 +- src/axom/sidre/docs/sphinx/query_data.rst | 2 +- src/axom/sidre/docs/sphinx/sidre_conduit.rst | 2 +- src/axom/sidre/docs/sphinx/view.rst | 2 +- src/axom/sidre/examples/CMakeLists.txt | 2 +- src/axom/sidre/examples/lulesh2/CMakeLists.txt | 2 +- src/axom/sidre/examples/lulesh2/lulesh-comm.cc | 2 +- src/axom/sidre/examples/lulesh2/lulesh-init.cc | 2 +- src/axom/sidre/examples/lulesh2/lulesh-util.cc | 2 +- src/axom/sidre/examples/lulesh2/lulesh-viz.cc | 2 +- src/axom/sidre/examples/lulesh2/lulesh.h | 2 +- src/axom/sidre/examples/lulesh2/lulesh_tuple.h | 2 +- src/axom/sidre/examples/sidre_array.cpp | 2 +- src/axom/sidre/examples/sidre_createdatastore.cpp | 2 +- src/axom/sidre/examples/sidre_data_vs_metadata.cpp | 2 +- src/axom/sidre/examples/sidre_external_array.cpp | 2 +- src/axom/sidre/examples/sidre_generateindex.cpp | 2 +- .../sidre/examples/sidre_mfem_datacollection_materials.cpp | 2 +- .../sidre/examples/sidre_mfem_datacollection_restart.cpp | 2 +- src/axom/sidre/examples/sidre_mfem_datacollection_vis.cpp | 2 +- src/axom/sidre/examples/sidre_shocktube.cpp | 2 +- src/axom/sidre/examples/sidre_shocktube_F.f | 2 +- src/axom/sidre/examples/sidre_stressgroups.cpp | 2 +- src/axom/sidre/examples/spio/CMakeLists.txt | 2 +- src/axom/sidre/examples/spio/IORead.cpp | 2 +- src/axom/sidre/examples/spio/IOWrite.cpp | 2 +- src/axom/sidre/examples/spio/IO_SCR_Checkpoint.cpp | 2 +- src/axom/sidre/examples/spio/spio_scr.hpp | 2 +- src/axom/sidre/interface/CMakeLists.txt | 2 +- src/axom/sidre/interface/SidreTypes.h | 2 +- src/axom/sidre/interface/c_fortran/csidresplicer.c | 2 +- src/axom/sidre/interface/c_fortran/fsidresplicer.f | 2 +- src/axom/sidre/interface/c_fortran/genfsidresplicer.py | 2 +- src/axom/sidre/interface/c_fortran/typesSidre.h | 2 +- src/axom/sidre/interface/c_fortran/wrapBuffer.cpp | 2 +- src/axom/sidre/interface/c_fortran/wrapBuffer.h | 2 +- src/axom/sidre/interface/c_fortran/wrapDataStore.cpp | 2 +- src/axom/sidre/interface/c_fortran/wrapDataStore.h | 2 +- src/axom/sidre/interface/c_fortran/wrapGroup.cpp | 2 +- src/axom/sidre/interface/c_fortran/wrapGroup.h | 2 +- src/axom/sidre/interface/c_fortran/wrapSidre.cpp | 2 +- src/axom/sidre/interface/c_fortran/wrapSidre.h | 2 +- src/axom/sidre/interface/c_fortran/wrapView.cpp | 2 +- src/axom/sidre/interface/c_fortran/wrapView.h | 2 +- src/axom/sidre/interface/c_fortran/wrapfsidre.F | 2 +- src/axom/sidre/interface/sidre.h | 2 +- src/axom/sidre/interface/sidre_shroud.yaml | 2 +- src/axom/sidre/interface/yaml/sidre_types.yaml | 2 +- src/axom/sidre/spio/IOBaton.cpp | 2 +- src/axom/sidre/spio/IOBaton.hpp | 2 +- src/axom/sidre/spio/IOManager.cpp | 2 +- src/axom/sidre/spio/IOManager.hpp | 2 +- src/axom/sidre/spio/interface/CMakeLists.txt | 2 +- src/axom/sidre/spio/interface/c_fortran/typesSPIO.h | 2 +- src/axom/sidre/spio/interface/c_fortran/wrapIOManager.cpp | 2 +- src/axom/sidre/spio/interface/c_fortran/wrapIOManager.h | 2 +- src/axom/sidre/spio/interface/c_fortran/wrapSPIO.cpp | 2 +- src/axom/sidre/spio/interface/c_fortran/wrapfspio.f | 2 +- src/axom/sidre/spio/interface/spio_shroud.yaml | 2 +- src/axom/sidre/spio/interface/yaml/spio_types.yaml | 2 +- src/axom/sidre/tests/CMakeLists.txt | 2 +- src/axom/sidre/tests/cpp2fortran | 2 +- src/axom/sidre/tests/sidre_allocatable_F.f | 2 +- src/axom/sidre/tests/sidre_attribute.cpp | 2 +- src/axom/sidre/tests/sidre_buffer.cpp | 2 +- src/axom/sidre/tests/sidre_buffer_C.cpp | 2 +- src/axom/sidre/tests/sidre_buffer_F.f | 2 +- src/axom/sidre/tests/sidre_buffer_unit.cpp | 2 +- src/axom/sidre/tests/sidre_class.cpp | 2 +- src/axom/sidre/tests/sidre_collections.cpp | 2 +- src/axom/sidre/tests/sidre_datastore.cpp | 2 +- src/axom/sidre/tests/sidre_datastore_unit.cpp | 2 +- src/axom/sidre/tests/sidre_external.cpp | 2 +- src/axom/sidre/tests/sidre_external_C.cpp | 2 +- src/axom/sidre/tests/sidre_external_F.f | 2 +- src/axom/sidre/tests/sidre_group.cpp | 2 +- src/axom/sidre/tests/sidre_group_C.cpp | 2 +- src/axom/sidre/tests/sidre_group_F.F | 2 +- src/axom/sidre/tests/sidre_mcarray.cpp | 2 +- src/axom/sidre/tests/sidre_mfem_datacollection.cpp | 2 +- src/axom/sidre/tests/sidre_native_layout.cpp | 2 +- src/axom/sidre/tests/sidre_opaque.cpp | 2 +- src/axom/sidre/tests/sidre_opaque_C.cpp | 2 +- src/axom/sidre/tests/sidre_opaque_F.f | 2 +- src/axom/sidre/tests/sidre_smoke.cpp | 2 +- src/axom/sidre/tests/sidre_smoke_C.cpp | 2 +- src/axom/sidre/tests/sidre_smoke_F.f | 2 +- src/axom/sidre/tests/sidre_types_C.cpp | 2 +- src/axom/sidre/tests/sidre_view.cpp | 2 +- src/axom/sidre/tests/sidre_view_C.cpp | 2 +- src/axom/sidre/tests/sidre_view_F.f | 2 +- src/axom/sidre/tests/spio/CMakeLists.txt | 2 +- src/axom/sidre/tests/spio/F_spio_basicWriteRead.F | 2 +- src/axom/sidre/tests/spio/F_spio_blueprintIndex.F | 2 +- src/axom/sidre/tests/spio/F_spio_externalWriteRead.F | 2 +- src/axom/sidre/tests/spio/F_spio_irregularWriteRead.F | 2 +- src/axom/sidre/tests/spio/F_spio_parallelWriteRead.F | 2 +- src/axom/sidre/tests/spio/F_spio_preserveWriteRead.F | 2 +- src/axom/sidre/tests/spio/spio_basic.hpp | 2 +- src/axom/sidre/tests/spio/spio_main.cpp | 2 +- src/axom/sidre/tests/spio/spio_parallel.hpp | 2 +- src/axom/sidre/tests/spio/spio_serial.hpp | 2 +- src/axom/slam/BitSet.cpp | 2 +- src/axom/slam/BitSet.hpp | 2 +- src/axom/slam/BivariateMap.hpp | 2 +- src/axom/slam/BivariateSet.hpp | 2 +- src/axom/slam/CMakeLists.txt | 2 +- src/axom/slam/DynamicConstantRelation.hpp | 2 +- src/axom/slam/DynamicMap.hpp | 2 +- src/axom/slam/DynamicSet.hpp | 2 +- src/axom/slam/DynamicVariableRelation.cpp | 2 +- src/axom/slam/DynamicVariableRelation.hpp | 2 +- src/axom/slam/FieldRegistry.hpp | 2 +- src/axom/slam/IndirectionSet.hpp | 2 +- src/axom/slam/Map.hpp | 2 +- src/axom/slam/MapBase.hpp | 2 +- src/axom/slam/ModularInt.hpp | 2 +- src/axom/slam/NullSet.hpp | 2 +- src/axom/slam/OrderedSet.cpp | 2 +- src/axom/slam/OrderedSet.hpp | 2 +- src/axom/slam/ProductSet.hpp | 2 +- src/axom/slam/RangeSet.hpp | 2 +- src/axom/slam/Relation.hpp | 2 +- src/axom/slam/RelationSet.hpp | 2 +- src/axom/slam/Set.hpp | 2 +- src/axom/slam/StaticRelation.hpp | 2 +- src/axom/slam/SubMap.hpp | 2 +- src/axom/slam/Utilities.hpp | 2 +- src/axom/slam/benchmarks/CMakeLists.txt | 2 +- src/axom/slam/benchmarks/slam_array.cpp | 2 +- src/axom/slam/benchmarks/slam_sets.cpp | 2 +- src/axom/slam/docs/sphinx/core_concepts.rst | 2 +- src/axom/slam/docs/sphinx/examples.rst | 2 +- src/axom/slam/docs/sphinx/first_example.rst | 2 +- src/axom/slam/docs/sphinx/implementation_details.rst | 2 +- src/axom/slam/docs/sphinx/index.rst | 2 +- src/axom/slam/docs/sphinx/more.rst | 2 +- src/axom/slam/examples/CMakeLists.txt | 2 +- src/axom/slam/examples/HandleMesh.cpp | 2 +- src/axom/slam/examples/PolicyPrototype.cpp | 2 +- src/axom/slam/examples/ShockTube.cpp | 2 +- src/axom/slam/examples/UnstructMeshField.cpp | 2 +- src/axom/slam/examples/UserDocs.cpp | 2 +- src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt | 2 +- src/axom/slam/examples/lulesh2.0.3/lulesh-comm.cpp | 2 +- src/axom/slam/examples/lulesh2.0.3/lulesh-init.cpp | 2 +- src/axom/slam/examples/lulesh2.0.3/lulesh-util.cpp | 2 +- src/axom/slam/examples/lulesh2.0.3/lulesh-viz.cpp | 2 +- src/axom/slam/examples/lulesh2.0.3/lulesh.cpp | 2 +- src/axom/slam/examples/lulesh2.0.3/lulesh.hpp | 2 +- src/axom/slam/examples/lulesh2.0.3/lulesh_tuple.hpp | 2 +- src/axom/slam/examples/lulesh2.0.3_orig/CMakeLists.txt | 2 +- src/axom/slam/examples/tinyHydro/CMakeLists.txt | 2 +- src/axom/slam/examples/tinyHydro/HydroC.cpp | 2 +- src/axom/slam/examples/tinyHydro/HydroC.hpp | 2 +- src/axom/slam/examples/tinyHydro/Part.cpp | 2 +- src/axom/slam/examples/tinyHydro/Part.hpp | 2 +- src/axom/slam/examples/tinyHydro/PolygonMeshXY.cpp | 2 +- src/axom/slam/examples/tinyHydro/PolygonMeshXY.hpp | 2 +- src/axom/slam/examples/tinyHydro/State.cpp | 2 +- src/axom/slam/examples/tinyHydro/State.hpp | 2 +- src/axom/slam/examples/tinyHydro/TinyHydroTypes.cpp | 2 +- src/axom/slam/examples/tinyHydro/TinyHydroTypes.hpp | 2 +- src/axom/slam/examples/tinyHydro/VectorXY.hpp | 2 +- .../tinyHydro/tests/slam_tinyHydro_sedovTwoPart.cpp | 2 +- .../tinyHydro/tests/slam_tinyHydro_sod1DTwoPart.cpp | 2 +- .../examples/tinyHydro/tests/slam_tinyHydro_unitTests.cpp | 2 +- src/axom/slam/mesh_struct/IA.hpp | 2 +- src/axom/slam/mesh_struct/IA_impl.hpp | 2 +- src/axom/slam/policies/BivariateSetInterfacePolicies.hpp | 2 +- src/axom/slam/policies/CardinalityPolicies.hpp | 2 +- src/axom/slam/policies/IndirectionPolicies.hpp | 2 +- src/axom/slam/policies/InterfacePolicies.hpp | 2 +- src/axom/slam/policies/MapInterfacePolicies.hpp | 2 +- src/axom/slam/policies/OffsetPolicies.hpp | 2 +- src/axom/slam/policies/PolicyTraits.hpp | 2 +- src/axom/slam/policies/SetInterfacePolicies.hpp | 2 +- src/axom/slam/policies/SizePolicies.hpp | 2 +- src/axom/slam/policies/StridePolicies.hpp | 2 +- src/axom/slam/policies/SubsettingPolicies.hpp | 2 +- src/axom/slam/tests/CMakeLists.txt | 2 +- src/axom/slam/tests/slam_AccessingRelationDataInMap.cpp | 2 +- src/axom/slam/tests/slam_IA.cpp | 2 +- src/axom/slam/tests/slam_ModularInt.cpp | 2 +- src/axom/slam/tests/slam_map_BivariateMap.cpp | 2 +- src/axom/slam/tests/slam_map_DynamicMap.cpp | 2 +- src/axom/slam/tests/slam_map_Map.cpp | 2 +- src/axom/slam/tests/slam_map_SubMap.cpp | 2 +- src/axom/slam/tests/slam_relation_DynamicConstant.cpp | 2 +- src/axom/slam/tests/slam_relation_DynamicVariable.cpp | 2 +- src/axom/slam/tests/slam_relation_StaticConstant.cpp | 2 +- src/axom/slam/tests/slam_relation_StaticVariable.cpp | 2 +- src/axom/slam/tests/slam_set_BitSet.cpp | 2 +- src/axom/slam/tests/slam_set_BivariateSet.cpp | 2 +- src/axom/slam/tests/slam_set_DynamicSet.cpp | 2 +- src/axom/slam/tests/slam_set_IndirectionSet.cpp | 2 +- src/axom/slam/tests/slam_set_Iterator.cpp | 2 +- src/axom/slam/tests/slam_set_NullSet.cpp | 2 +- src/axom/slam/tests/slam_set_PositionSet.cpp | 2 +- src/axom/slam/tests/slam_set_RangeSet.cpp | 2 +- src/axom/slam/tests/slam_set_Set.cpp | 2 +- src/axom/slic/CMakeLists.txt | 2 +- src/axom/slic/core/LogStream.cpp | 2 +- src/axom/slic/core/LogStream.hpp | 2 +- src/axom/slic/core/Logger.cpp | 2 +- src/axom/slic/core/Logger.hpp | 2 +- src/axom/slic/core/MessageLevel.hpp | 2 +- src/axom/slic/core/SimpleLogger.hpp | 2 +- src/axom/slic/docs/sphinx/index.rst | 2 +- src/axom/slic/docs/sphinx/sections/appendix.rst | 2 +- src/axom/slic/docs/sphinx/sections/architecture.rst | 2 +- src/axom/slic/docs/sphinx/sections/citations.rst | 2 +- src/axom/slic/docs/sphinx/sections/getting_started.rst | 2 +- .../slic/docs/sphinx/sections/wrapping_slic_in_macros.rst | 2 +- src/axom/slic/examples/CMakeLists.txt | 2 +- src/axom/slic/examples/basic/cpplogger.cpp | 2 +- src/axom/slic/examples/basic/custom_abort_logger.cpp | 2 +- src/axom/slic/examples/basic/flogger.f | 2 +- src/axom/slic/examples/basic/logging.cpp | 2 +- src/axom/slic/examples/basic/logging_F.f | 2 +- src/axom/slic/examples/basic/lumberjack_logging.cpp | 2 +- src/axom/slic/examples/basic/parallel_logging.cpp | 2 +- src/axom/slic/examples/basic/separate_file_per_rank.cpp | 2 +- src/axom/slic/examples/multicode/driver.cpp | 2 +- src/axom/slic/examples/multicode/physicsA.hpp | 2 +- src/axom/slic/examples/multicode/physicsB.hpp | 2 +- src/axom/slic/interface/CMakeLists.txt | 2 +- src/axom/slic/interface/c_fortran/typesSLIC.h | 2 +- .../slic/interface/c_fortran/wrapGenericOutputStream.cpp | 2 +- src/axom/slic/interface/c_fortran/wrapGenericOutputStream.h | 2 +- src/axom/slic/interface/c_fortran/wrapSLIC.cpp | 2 +- src/axom/slic/interface/c_fortran/wrapSLIC.h | 2 +- src/axom/slic/interface/c_fortran/wrapfslic.f | 2 +- src/axom/slic/interface/slic.cpp | 2 +- src/axom/slic/interface/slic.hpp | 2 +- src/axom/slic/interface/slic_macros.hpp | 2 +- src/axom/slic/interface/slic_shroud.yaml | 2 +- src/axom/slic/interface/slic_types.yaml | 2 +- src/axom/slic/internal/stacktrace.cpp | 2 +- src/axom/slic/internal/stacktrace.hpp | 2 +- src/axom/slic/streams/GenericOutputStream.cpp | 2 +- src/axom/slic/streams/GenericOutputStream.hpp | 2 +- src/axom/slic/streams/LumberjackStream.cpp | 2 +- src/axom/slic/streams/LumberjackStream.hpp | 2 +- src/axom/slic/streams/SynchronizedStream.cpp | 2 +- src/axom/slic/streams/SynchronizedStream.hpp | 2 +- src/axom/slic/tests/CMakeLists.txt | 2 +- src/axom/slic/tests/slic_asserts.cpp | 2 +- src/axom/slic/tests/slic_benchmark_asserts.cpp | 2 +- src/axom/slic/tests/slic_fmt.cpp | 2 +- src/axom/slic/tests/slic_interface.cpp | 2 +- src/axom/slic/tests/slic_interface_F.f | 2 +- src/axom/slic/tests/slic_macros.cpp | 2 +- src/axom/slic/tests/slic_macros_parallel.cpp | 2 +- src/axom/slic/tests/slic_uninit.cpp | 2 +- src/axom/spin/BVH.hpp | 2 +- src/axom/spin/Brood.hpp | 2 +- src/axom/spin/CMakeLists.txt | 2 +- src/axom/spin/DenseOctreeLevel.hpp | 2 +- src/axom/spin/ImplicitGrid.hpp | 2 +- src/axom/spin/MortonIndex.hpp | 2 +- src/axom/spin/OctreeBase.hpp | 2 +- src/axom/spin/OctreeLevel.hpp | 2 +- src/axom/spin/RectangularLattice.hpp | 2 +- src/axom/spin/SparseOctreeLevel.hpp | 2 +- src/axom/spin/SpatialOctree.hpp | 2 +- src/axom/spin/UniformGrid.hpp | 2 +- src/axom/spin/docs/sphinx/index.rst | 2 +- src/axom/spin/examples/CMakeLists.txt | 2 +- src/axom/spin/examples/spin_introduction.cpp | 2 +- src/axom/spin/internal/linear_bvh/RadixTree.hpp | 2 +- src/axom/spin/internal/linear_bvh/build_radix_tree.hpp | 2 +- src/axom/spin/internal/linear_bvh/bvh_traverse.hpp | 2 +- src/axom/spin/internal/linear_bvh/bvh_vtkio.hpp | 2 +- src/axom/spin/policy/LinearBVH.hpp | 2 +- src/axom/spin/policy/UniformGridStorage.hpp | 2 +- src/axom/spin/tests/CMakeLists.txt | 2 +- src/axom/spin/tests/spin_bvh.cpp | 2 +- src/axom/spin/tests/spin_implicit_grid.cpp | 2 +- src/axom/spin/tests/spin_morton.cpp | 2 +- src/axom/spin/tests/spin_octree.cpp | 2 +- src/axom/spin/tests/spin_rectangular_lattice.cpp | 2 +- src/axom/spin/tests/spin_spatial_octree.cpp | 2 +- src/axom/spin/tests/spin_uniform_grid.cpp | 2 +- src/cmake/AxomConfig.cmake | 2 +- src/cmake/AxomMacros.cmake | 4 ++-- src/cmake/AxomOptions.cmake | 2 +- src/cmake/AxomVersion.cmake | 2 +- src/cmake/CMakeBasics.cmake | 2 +- src/cmake/Dashboard.cmake.in | 2 +- src/cmake/axom-config.cmake.in | 2 +- src/cmake/thirdparty/FindC2C.cmake | 2 +- src/cmake/thirdparty/FindConduit.cmake | 2 +- src/cmake/thirdparty/FindLUA.cmake | 2 +- src/cmake/thirdparty/FindMFEM.cmake | 2 +- src/cmake/thirdparty/FindROCTracer.cmake | 2 +- src/cmake/thirdparty/FindSCR.cmake | 2 +- src/cmake/thirdparty/SetupAxomThirdParty.cmake | 2 +- src/cmake/thirdparty/SetupHDF5.cmake | 2 +- src/conf.py | 2 +- src/docs/CMakeLists.txt | 2 +- src/docs/doxygen/CMakeLists.txt | 2 +- src/docs/licenses.rst | 2 +- src/docs/sphinx/coding_guide/index.rst | 2 +- src/docs/sphinx/coding_guide/references.rst | 2 +- src/docs/sphinx/coding_guide/sec01_changing_code.rst | 2 +- src/docs/sphinx/coding_guide/sec02_names.rst | 2 +- src/docs/sphinx/coding_guide/sec03_dir_org.rst | 2 +- src/docs/sphinx/coding_guide/sec04_header_org.rst | 2 +- src/docs/sphinx/coding_guide/sec05_source_org.rst | 2 +- src/docs/sphinx/coding_guide/sec06_scope.rst | 2 +- src/docs/sphinx/coding_guide/sec07_documentation.rst | 4 ++-- src/docs/sphinx/coding_guide/sec08_design_implement.rst | 2 +- src/docs/sphinx/coding_guide/sec09_format.rst | 2 +- src/docs/sphinx/coding_guide/sec10_dev_macros.rst | 2 +- src/docs/sphinx/coding_guide/sec11_portability.rst | 2 +- src/docs/sphinx/dev_guide/component_org.rst | 2 +- src/docs/sphinx/dev_guide/continuous_integration.rst | 2 +- src/docs/sphinx/dev_guide/dev_summary.rst | 2 +- src/docs/sphinx/dev_guide/gitflow_branching.rst | 2 +- src/docs/sphinx/dev_guide/github.rst | 2 +- src/docs/sphinx/dev_guide/gpu_porting.rst | 2 +- src/docs/sphinx/dev_guide/index.rst | 2 +- src/docs/sphinx/dev_guide/misc_tasks.rst | 2 +- src/docs/sphinx/dev_guide/pull_requests.rst | 2 +- src/docs/sphinx/dev_guide/release.rst | 2 +- src/docs/sphinx/dev_guide/semantic_versioning.rst | 2 +- src/docs/sphinx/dev_guide/testing.rst | 2 +- src/docs/sphinx/dev_guide/updating_tpls.rst | 2 +- src/docs/sphinx/quickstart_guide/config_build.rst | 2 +- src/docs/sphinx/quickstart_guide/index.rst | 2 +- src/docs/sphinx/quickstart_guide/the_code.rst | 2 +- src/docs/sphinx/quickstart_guide/zero_to_axom.rst | 2 +- src/examples/CMakeLists.txt | 2 +- src/examples/using-with-blt/CMakeLists.txt | 2 +- src/examples/using-with-blt/example.cpp | 2 +- src/examples/using-with-blt/host-config.cmake.in | 2 +- src/examples/using-with-cmake/CMakeLists.txt | 2 +- src/examples/using-with-cmake/example.cpp | 2 +- src/examples/using-with-cmake/host-config.cmake.in | 2 +- src/examples/using-with-make/Makefile.in | 2 +- src/examples/using-with-make/example.cpp | 2 +- src/index.rst | 4 ++-- src/thirdparty/CMakeLists.txt | 2 +- src/thirdparty/axom/fmt.hpp | 2 +- src/thirdparty/tests/CMakeLists.txt | 2 +- src/thirdparty/tests/c2c_smoke.cpp | 2 +- src/thirdparty/tests/cli11_smoke.cpp | 2 +- src/thirdparty/tests/compiler_flag_fortran_preprocessor.F | 2 +- src/thirdparty/tests/compiler_flag_omp_pragma.cpp | 2 +- src/thirdparty/tests/compiler_flag_strict_aliasing.cpp | 2 +- src/thirdparty/tests/compiler_flag_uninitialized.cpp | 2 +- src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp | 2 +- src/thirdparty/tests/compiler_flag_unused_param.cpp | 2 +- src/thirdparty/tests/compiler_flag_unused_var.cpp | 2 +- src/thirdparty/tests/conduit_smoke.cpp | 2 +- src/thirdparty/tests/fmt_smoke.cpp | 2 +- src/thirdparty/tests/hdf5_smoke.cpp | 2 +- src/thirdparty/tests/mfem_smoke.cpp | 2 +- src/thirdparty/tests/raja_smoke.cpp | 2 +- src/thirdparty/tests/sol_smoke.cpp | 2 +- src/thirdparty/tests/sparsehash_smoke.cpp | 2 +- src/thirdparty/tests/umpire_smoke.cpp | 2 +- src/tools/CMakeLists.txt | 2 +- src/tools/convert_sidre_protocol.cpp | 2 +- src/tools/data_collection_util.cpp | 2 +- src/tools/mesh_tester.cpp | 2 +- 1012 files changed, 1019 insertions(+), 1019 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f821b1adf0..2eaf2c8d66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/.gitlab/build_lassen.yml b/.gitlab/build_lassen.yml index 1a334a6307..e2d22eba23 100644 --- a/.gitlab/build_lassen.yml +++ b/.gitlab/build_lassen.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/.gitlab/build_quartz.yml b/.gitlab/build_quartz.yml index 3c0e851846..c5a4e3d1d8 100644 --- a/.gitlab/build_quartz.yml +++ b/.gitlab/build_quartz.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/.gitlab/build_rzansel.yml b/.gitlab/build_rzansel.yml index b6988a13fe..37ad6b482b 100644 --- a/.gitlab/build_rzansel.yml +++ b/.gitlab/build_rzansel.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/.gitlab/build_rzgenie.yml b/.gitlab/build_rzgenie.yml index 8ea204f366..2e0300bb04 100644 --- a/.gitlab/build_rzgenie.yml +++ b/.gitlab/build_rzgenie.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/.gitlab/build_tioga.yml b/.gitlab/build_tioga.yml index 80d4a44e51..4e0c9bde20 100644 --- a/.gitlab/build_tioga.yml +++ b/.gitlab/build_tioga.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/LICENSE b/LICENSE index 039a20b015..27c1ef4314 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC. +Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.md b/README.md index e99023dcaa..347e5b886e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [comment]: # (#################################################################) -[comment]: # (Copyright 2017-2023, Lawrence Livermore National Security, LLC) +[comment]: # (Copyright 2017-2024, Lawrence Livermore National Security, LLC) [comment]: # (and Axom Project Developers. See the top-level LICENSE file) [comment]: # (for details.) [comment]: # @@ -56,7 +56,7 @@ Thanks to all of Axom's License ------- -Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC. +Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory. Copyrights and patents in the Axom project are retained by contributors. diff --git a/RELEASE b/RELEASE index 6a5a3129ca..725fd3d051 100644 --- a/RELEASE +++ b/RELEASE @@ -2,7 +2,7 @@ Axom: ................................, version 0.8.1 -Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC. +Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory. All rights reserved. See details in the file axom/LICENSE. diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index fab6fdef1f..75dd438a7c 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,6 +1,6 @@ [comment]: # (#################################################################) -[comment]: # (Copyright 2017-2023, Lawrence Livermore National Security, LLC) +[comment]: # (Copyright 2017-2024, Lawrence Livermore National Security, LLC) [comment]: # (and Axom Project Developers. See the top-level LICENSE file) [comment]: # (for details.) [comment]: # diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7aa5a555fa..b9fc173e5a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ # -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/config-build.py b/config-build.py index 30a385a103..e87a575928 100755 --- a/config-build.py +++ b/config-build.py @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/host-configs/other/Darwin.cmake b/host-configs/other/Darwin.cmake index c8b00ae8e7..7849e8c98e 100755 --- a/host-configs/other/Darwin.cmake +++ b/host-configs/other/Darwin.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/host-configs/other/battra.cmake b/host-configs/other/battra.cmake index 66fbbb1386..1c0a836f77 100644 --- a/host-configs/other/battra.cmake +++ b/host-configs/other/battra.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/host-configs/other/empress.llnl.gov.cmake b/host-configs/other/empress.llnl.gov.cmake index a2ec8202b2..b14db44c58 100644 --- a/host-configs/other/empress.llnl.gov.cmake +++ b/host-configs/other/empress.llnl.gov.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/host-configs/other/naples.cmake b/host-configs/other/naples.cmake index 7ecec19f1f..26e09b5c7d 100644 --- a/host-configs/other/naples.cmake +++ b/host-configs/other/naples.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10-ifort@19.cmake b/host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10-ifort@19.cmake index 7f1f5ff7a7..0938856265 100644 --- a/host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10-ifort@19.cmake +++ b/host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10-ifort@19.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10.0.0.cmake b/host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10.0.0.cmake index ca1fd5252c..6587e28b7e 100644 --- a/host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10.0.0.cmake +++ b/host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10.0.0.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/host-configs/other/no-tpl-toss_3_x86_64_ib-intel@19.0.4.cmake b/host-configs/other/no-tpl-toss_3_x86_64_ib-intel@19.0.4.cmake index cc926b19d1..bf0ef9100f 100644 --- a/host-configs/other/no-tpl-toss_3_x86_64_ib-intel@19.0.4.cmake +++ b/host-configs/other/no-tpl-toss_3_x86_64_ib-intel@19.0.4.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/host-configs/other/sqa-uno-MSVC-INTEL.cmake b/host-configs/other/sqa-uno-MSVC-INTEL.cmake index 70e910635b..6fa3ab12f9 100644 --- a/host-configs/other/sqa-uno-MSVC-INTEL.cmake +++ b/host-configs/other/sqa-uno-MSVC-INTEL.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/host-configs/other/sqa-uno-MSVC.cmake b/host-configs/other/sqa-uno-MSVC.cmake index 6cc090680b..5ae02afae9 100644 --- a/host-configs/other/sqa-uno-MSVC.cmake +++ b/host-configs/other/sqa-uno-MSVC.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/azure-pipelines/linux-build_and_test.sh b/scripts/azure-pipelines/linux-build_and_test.sh index c6ec4dee87..880f30fc79 100755 --- a/scripts/azure-pipelines/linux-build_and_test.sh +++ b/scripts/azure-pipelines/linux-build_and_test.sh @@ -1,6 +1,6 @@ #!/bin/bash ############################################################################## -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/azure-pipelines/linux-check.sh b/scripts/azure-pipelines/linux-check.sh index 3bebcc3e97..94be36a049 100755 --- a/scripts/azure-pipelines/linux-check.sh +++ b/scripts/azure-pipelines/linux-check.sh @@ -1,6 +1,6 @@ #!/bin/bash ############################################################################## -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/copyrightPrepender.py b/scripts/copyrightPrepender.py index 88af8ada5b..f1a421064e 100755 --- a/scripts/copyrightPrepender.py +++ b/scripts/copyrightPrepender.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) @@ -16,13 +16,13 @@ import sys import argparse -axom_copyright_str = """// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +axom_copyright_str = """// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) \n\n""" -axom_copyright_begin_str = "Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and" +axom_copyright_begin_str = "Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and" def checkAndAddCopyrightHeader(filename, testOnly=False): diff --git a/scripts/gitsetup/hooks/commit-msg b/scripts/gitsetup/hooks/commit-msg index 13385e7225..9bc7721a11 100755 --- a/scripts/gitsetup/hooks/commit-msg +++ b/scripts/gitsetup/hooks/commit-msg @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/gitsetup/hooks/post-checkout b/scripts/gitsetup/hooks/post-checkout index 4accac8c75..a0669d600f 100755 --- a/scripts/gitsetup/hooks/post-checkout +++ b/scripts/gitsetup/hooks/post-checkout @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/gitsetup/setup-git-aliases.sh b/scripts/gitsetup/setup-git-aliases.sh index 425cfc198c..9ca150cfd0 100755 --- a/scripts/gitsetup/setup-git-aliases.sh +++ b/scripts/gitsetup/setup-git-aliases.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/gitsetup/setup-git-colors.sh b/scripts/gitsetup/setup-git-colors.sh index bb8eebffcb..de13b25702 100755 --- a/scripts/gitsetup/setup-git-colors.sh +++ b/scripts/gitsetup/setup-git-colors.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/gitsetup/setup-git-editor.sh b/scripts/gitsetup/setup-git-editor.sh index 0ea74d5d10..b9fdef9923 100755 --- a/scripts/gitsetup/setup-git-editor.sh +++ b/scripts/gitsetup/setup-git-editor.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/gitsetup/setup-git-hooks.sh b/scripts/gitsetup/setup-git-hooks.sh index 1d2b833e2f..4502a88fc5 100755 --- a/scripts/gitsetup/setup-git-hooks.sh +++ b/scripts/gitsetup/setup-git-hooks.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/gitsetup/setup-git-user.sh b/scripts/gitsetup/setup-git-user.sh index ea95cc3e5f..b5d05cf480 100755 --- a/scripts/gitsetup/setup-git-user.sh +++ b/scripts/gitsetup/setup-git-user.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/gitsetup/tips.sh b/scripts/gitsetup/tips.sh index 1910bf6d73..a5f24a4edb 100755 --- a/scripts/gitsetup/tips.sh +++ b/scripts/gitsetup/tips.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/archive_job.py b/scripts/llnl_scripts/archive_job.py index db930b280e..df915be5c9 100755 --- a/scripts/llnl_scripts/archive_job.py +++ b/scripts/llnl_scripts/archive_job.py @@ -1,7 +1,7 @@ #!/bin/sh "exec" "python" "-u" "-B" "$0" "$@" -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_all_compilers.sh b/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_all_compilers.sh index e58dc3739d..28af8c5711 100755 --- a/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_all_compilers.sh +++ b/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_all_compilers.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_src.sh b/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_src.sh index 0f90aad7a1..0c7025b31a 100755 --- a/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_src.sh +++ b/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_src.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_all_compilers.sh b/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_all_compilers.sh index 8327a5b0f1..84f0ab48df 100755 --- a/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_all_compilers.sh +++ b/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_all_compilers.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_src.sh b/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_src.sh index 3e356e7ca3..0463fd8a16 100755 --- a/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_src.sh +++ b/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_src.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_all_compilers.sh b/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_all_compilers.sh index 2307c2c57f..c17ae004aa 100755 --- a/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_all_compilers.sh +++ b/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_all_compilers.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_src.sh b/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_src.sh index 25dc377565..7867c7368d 100755 --- a/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_src.sh +++ b/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_src.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_all_compilers.sh b/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_all_compilers.sh index 1d48243302..dbdd4d2b3a 100755 --- a/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_all_compilers.sh +++ b/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_all_compilers.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_src.sh b/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_src.sh index 9de76195c5..132a4fe93a 100755 --- a/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_src.sh +++ b/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_src.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/batch_scripts/msub_llnl_test_uberenv_host_configs.sh b/scripts/llnl_scripts/batch_scripts/msub_llnl_test_uberenv_host_configs.sh index c0d853dc3e..dc587b5747 100755 --- a/scripts/llnl_scripts/batch_scripts/msub_llnl_test_uberenv_host_configs.sh +++ b/scripts/llnl_scripts/batch_scripts/msub_llnl_test_uberenv_host_configs.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/build_devtools.py b/scripts/llnl_scripts/build_devtools.py index b358faa02a..d1300e0c16 100755 --- a/scripts/llnl_scripts/build_devtools.py +++ b/scripts/llnl_scripts/build_devtools.py @@ -1,7 +1,7 @@ #!/bin/sh "exec" "python3" "-u" "-B" "$0" "$@" -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/build_src.py b/scripts/llnl_scripts/build_src.py index b4641fa82e..1054cb7556 100755 --- a/scripts/llnl_scripts/build_src.py +++ b/scripts/llnl_scripts/build_src.py @@ -1,7 +1,7 @@ #!/bin/sh "exec" "python3" "-u" "-B" "$0" "$@" -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/build_tpls.py b/scripts/llnl_scripts/build_tpls.py index 74ce2a3962..245e330209 100755 --- a/scripts/llnl_scripts/build_tpls.py +++ b/scripts/llnl_scripts/build_tpls.py @@ -1,7 +1,7 @@ #!/bin/sh "exec" "python3" "-u" "-B" "$0" "$@" -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/find_unused_tpl_dirs.py b/scripts/llnl_scripts/find_unused_tpl_dirs.py index 8615c356df..dc413d2e1c 100755 --- a/scripts/llnl_scripts/find_unused_tpl_dirs.py +++ b/scripts/llnl_scripts/find_unused_tpl_dirs.py @@ -1,7 +1,7 @@ #!/bin/sh "exec" "python" "-u" "-B" "$0" "$@" -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/fix_permissions.py b/scripts/llnl_scripts/fix_permissions.py index 62589c3b98..0297cc394d 100755 --- a/scripts/llnl_scripts/fix_permissions.py +++ b/scripts/llnl_scripts/fix_permissions.py @@ -1,7 +1,7 @@ #!/bin/sh "exec" "python" "-u" "-B" "$0" "$@" -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/llnl_lc_build_tools.py b/scripts/llnl_scripts/llnl_lc_build_tools.py index 8195fbe7b1..ae1c4e57e5 100755 --- a/scripts/llnl_scripts/llnl_lc_build_tools.py +++ b/scripts/llnl_scripts/llnl_lc_build_tools.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/move_unused_tpl_dirs_to_graveyard.py b/scripts/llnl_scripts/move_unused_tpl_dirs_to_graveyard.py index fe90df57b3..19280c46a4 100755 --- a/scripts/llnl_scripts/move_unused_tpl_dirs_to_graveyard.py +++ b/scripts/llnl_scripts/move_unused_tpl_dirs_to_graveyard.py @@ -1,7 +1,7 @@ #!/bin/sh "exec" "python" "-u" "-B" "$0" "$@" -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/llnl_scripts/report.py b/scripts/llnl_scripts/report.py index 1edb62b745..8d99bf72b4 100755 --- a/scripts/llnl_scripts/report.py +++ b/scripts/llnl_scripts/report.py @@ -1,7 +1,7 @@ #!/bin/sh "exec" "python" "-u" "-B" "$0" "$@" -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/make_release_tarball.sh b/scripts/make_release_tarball.sh index 974a412ea5..5b8fa4289d 100755 --- a/scripts/make_release_tarball.sh +++ b/scripts/make_release_tarball.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/setup-for-development.sh b/scripts/setup-for-development.sh index 68f7c957d4..c88fcaad79 100755 --- a/scripts/setup-for-development.sh +++ b/scripts/setup-for-development.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml index 634db542a6..674b34a7c8 100644 --- a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/spack/configs/darwin/spack.yaml b/scripts/spack/configs/darwin/spack.yaml index ab4c98230d..5da42d4017 100644 --- a/scripts/spack/configs/darwin/spack.yaml +++ b/scripts/spack/configs/darwin/spack.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/spack/configs/docker/ubuntu20/spack.yaml b/scripts/spack/configs/docker/ubuntu20/spack.yaml index 8f0ea2529d..c76610f703 100644 --- a/scripts/spack/configs/docker/ubuntu20/spack.yaml +++ b/scripts/spack/configs/docker/ubuntu20/spack.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml b/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml index 706a94fe88..b7b409bc92 100644 --- a/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml +++ b/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/spack/configs/linux_ubuntu_20/spack.yaml b/scripts/spack/configs/linux_ubuntu_20/spack.yaml index 3b890f03d0..901e514028 100644 --- a/scripts/spack/configs/linux_ubuntu_20/spack.yaml +++ b/scripts/spack/configs/linux_ubuntu_20/spack.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/spack/configs/toss_3_x86_64_ib/spack.yaml b/scripts/spack/configs/toss_3_x86_64_ib/spack.yaml index 4b5a21c30f..9f81d830e7 100644 --- a/scripts/spack/configs/toss_3_x86_64_ib/spack.yaml +++ b/scripts/spack/configs/toss_3_x86_64_ib/spack.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml index 87feb05b89..0f489afec8 100644 --- a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml b/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml index c17903aedf..b1f1ed7ca0 100644 --- a/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml +++ b/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/spack/devtools_configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/spack/devtools_configs/blueos_3_ppc64le_ib_p9/spack.yaml index 70410f0dea..f0007bb6a7 100644 --- a/scripts/spack/devtools_configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/spack/devtools_configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/spack/devtools_configs/toss_3_x86_64_ib/spack.yaml b/scripts/spack/devtools_configs/toss_3_x86_64_ib/spack.yaml index 1dd232eee1..9476208461 100644 --- a/scripts/spack/devtools_configs/toss_3_x86_64_ib/spack.yaml +++ b/scripts/spack/devtools_configs/toss_3_x86_64_ib/spack.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/spack/devtools_configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack/devtools_configs/toss_4_x86_64_ib/spack.yaml index 04cd1f7058..c328cd3f79 100644 --- a/scripts/spack/devtools_configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack/devtools_configs/toss_4_x86_64_ib/spack.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/spack/specs.json b/scripts/spack/specs.json index c6527f25b7..dfd374d837 100644 --- a/scripts/spack/specs.json +++ b/scripts/spack/specs.json @@ -1,6 +1,6 @@ { "__comment__":"##############################################################################", - "__comment__":"# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and ", + "__comment__":"# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ", "__comment__":"# other Axom Project Developers. See the top-level LICENSE file for details. ", "__comment__":"# ", "__comment__":"# SPDX-License-Identifier: (BSD-3-Clause) ", diff --git a/scripts/uncrustfiy.bash b/scripts/uncrustfiy.bash index 74bb093d3d..44514c391a 100755 --- a/scripts/uncrustfiy.bash +++ b/scripts/uncrustfiy.bash @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/scripts/vcpkg_ports/axom/portfile.cmake b/scripts/vcpkg_ports/axom/portfile.cmake index afd8199975..7df33f210e 100644 --- a/scripts/vcpkg_ports/axom/portfile.cmake +++ b/scripts/vcpkg_ports/axom/portfile.cmake @@ -3,7 +3,7 @@ message(STATUS "CURRENT_INSTALLED_DIR -- ${CURRENT_INSTALLED_DIR}") message(STATUS "PORT -- ${PORT}") set(_copyright [=[ -Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and other Axom Project Developers. See the top-level LICENSE file for details. SPDX-License-Identifier: (BSD-3-Clause) @@ -14,7 +14,7 @@ set(_host-config_hdr [=[ #------------------------------------------------------------------------------ # !!!! This is a generated file, edit at own risk !!!! #------------------------------------------------------------------------------ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3c0a70aad7..e1c4836cc4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/CMakeLists.txt b/src/axom/CMakeLists.txt index 4765918ddb..a78442837e 100644 --- a/src/axom/CMakeLists.txt +++ b/src/axom/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/config.hpp.in b/src/axom/config.hpp.in index c762e1be32..e2f278e54f 100644 --- a/src/axom/config.hpp.in +++ b/src/axom/config.hpp.in @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and + * Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and * other Axom Project Developers. See the top-level LICENSE file for details. * * SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index 7a86de82e7..aaf9f81dc3 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/ArrayBase.hpp b/src/axom/core/ArrayBase.hpp index 5fd7d9bba1..1e54da7a3d 100644 --- a/src/axom/core/ArrayBase.hpp +++ b/src/axom/core/ArrayBase.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/ArrayIteratorBase.hpp b/src/axom/core/ArrayIteratorBase.hpp index ded36734d5..e549ee981d 100644 --- a/src/axom/core/ArrayIteratorBase.hpp +++ b/src/axom/core/ArrayIteratorBase.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/ArrayView.hpp b/src/axom/core/ArrayView.hpp index 4e2d96a296..b98790bf20 100644 --- a/src/axom/core/ArrayView.hpp +++ b/src/axom/core/ArrayView.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/CMakeLists.txt b/src/axom/core/CMakeLists.txt index 2090d7e2fc..0f700a7d8c 100644 --- a/src/axom/core/CMakeLists.txt +++ b/src/axom/core/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index 0d7d97640c..aff1ac0209 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/IteratorBase.hpp b/src/axom/core/IteratorBase.hpp index 0d98da65e0..6b9df6c912 100644 --- a/src/axom/core/IteratorBase.hpp +++ b/src/axom/core/IteratorBase.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/Macros.hpp b/src/axom/core/Macros.hpp index 2e772ea69e..e5b9cb73fd 100644 --- a/src/axom/core/Macros.hpp +++ b/src/axom/core/Macros.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/Map.hpp b/src/axom/core/Map.hpp index 69a7e06bb0..7ff8cd30cb 100644 --- a/src/axom/core/Map.hpp +++ b/src/axom/core/Map.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/Path.cpp b/src/axom/core/Path.cpp index e028cef9a7..faa84ba730 100644 --- a/src/axom/core/Path.cpp +++ b/src/axom/core/Path.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/Path.hpp b/src/axom/core/Path.hpp index 0c39ccf99d..787a867c48 100644 --- a/src/axom/core/Path.hpp +++ b/src/axom/core/Path.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/StackArray.hpp b/src/axom/core/StackArray.hpp index 08ad3f5217..e638e9ca69 100644 --- a/src/axom/core/StackArray.hpp +++ b/src/axom/core/StackArray.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/Types.cpp b/src/axom/core/Types.cpp index 8e1f47a171..ddadfc8aa7 100644 --- a/src/axom/core/Types.cpp +++ b/src/axom/core/Types.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/Types.hpp b/src/axom/core/Types.hpp index 6e535d4a8e..519cfd8e5a 100644 --- a/src/axom/core/Types.hpp +++ b/src/axom/core/Types.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/detail/FlatTable.hpp b/src/axom/core/detail/FlatTable.hpp index a4c0851362..490e8d0c9f 100644 --- a/src/axom/core/detail/FlatTable.hpp +++ b/src/axom/core/detail/FlatTable.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/docs/sphinx/core_acceleration.rst b/src/axom/core/docs/sphinx/core_acceleration.rst index 005ae429ed..906cb04c72 100644 --- a/src/axom/core/docs/sphinx/core_acceleration.rst +++ b/src/axom/core/docs/sphinx/core_acceleration.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/docs/sphinx/core_containers.rst b/src/axom/core/docs/sphinx/core_containers.rst index 5e5d65028d..69dae01795 100644 --- a/src/axom/core/docs/sphinx/core_containers.rst +++ b/src/axom/core/docs/sphinx/core_containers.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/docs/sphinx/core_numerics.rst b/src/axom/core/docs/sphinx/core_numerics.rst index cb8682fcf5..0cc94714b7 100644 --- a/src/axom/core/docs/sphinx/core_numerics.rst +++ b/src/axom/core/docs/sphinx/core_numerics.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/docs/sphinx/core_utilities.rst b/src/axom/core/docs/sphinx/core_utilities.rst index eb945e8564..797fdac3ae 100644 --- a/src/axom/core/docs/sphinx/core_utilities.rst +++ b/src/axom/core/docs/sphinx/core_utilities.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/docs/sphinx/index.rst b/src/axom/core/docs/sphinx/index.rst index b994dd9d4e..106939d872 100644 --- a/src/axom/core/docs/sphinx/index.rst +++ b/src/axom/core/docs/sphinx/index.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/examples/CMakeLists.txt b/src/axom/core/examples/CMakeLists.txt index 37d8e98340..adcb21d57c 100644 --- a/src/axom/core/examples/CMakeLists.txt +++ b/src/axom/core/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/examples/core_acceleration.cpp b/src/axom/core/examples/core_acceleration.cpp index a33732a53f..b0345bddb6 100644 --- a/src/axom/core/examples/core_acceleration.cpp +++ b/src/axom/core/examples/core_acceleration.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/examples/core_containers.cpp b/src/axom/core/examples/core_containers.cpp index 194245231a..052d724fb4 100644 --- a/src/axom/core/examples/core_containers.cpp +++ b/src/axom/core/examples/core_containers.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/examples/core_numerics.cpp b/src/axom/core/examples/core_numerics.cpp index 518fed703b..5d25f09973 100644 --- a/src/axom/core/examples/core_numerics.cpp +++ b/src/axom/core/examples/core_numerics.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/examples/core_utilities.cpp b/src/axom/core/examples/core_utilities.cpp index ae2d82170d..45ed474dd8 100644 --- a/src/axom/core/examples/core_utilities.cpp +++ b/src/axom/core/examples/core_utilities.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/execution/doc.hpp b/src/axom/core/execution/doc.hpp index 80ebe124f3..5363042105 100644 --- a/src/axom/core/execution/doc.hpp +++ b/src/axom/core/execution/doc.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/execution/execution_space.hpp b/src/axom/core/execution/execution_space.hpp index 888cc9e856..1c23a74d90 100644 --- a/src/axom/core/execution/execution_space.hpp +++ b/src/axom/core/execution/execution_space.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/execution/for_all.hpp b/src/axom/core/execution/for_all.hpp index baf4c0297c..ef08f4f57c 100644 --- a/src/axom/core/execution/for_all.hpp +++ b/src/axom/core/execution/for_all.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/execution/internal/cuda_exec.hpp b/src/axom/core/execution/internal/cuda_exec.hpp index 72ec00064d..fc9144a1df 100644 --- a/src/axom/core/execution/internal/cuda_exec.hpp +++ b/src/axom/core/execution/internal/cuda_exec.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/execution/internal/hip_exec.hpp b/src/axom/core/execution/internal/hip_exec.hpp index 7c7edf0f8a..ed377380ea 100644 --- a/src/axom/core/execution/internal/hip_exec.hpp +++ b/src/axom/core/execution/internal/hip_exec.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/execution/internal/omp_exec.hpp b/src/axom/core/execution/internal/omp_exec.hpp index 39243fd1c9..448b0fc923 100644 --- a/src/axom/core/execution/internal/omp_exec.hpp +++ b/src/axom/core/execution/internal/omp_exec.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/execution/internal/seq_exec.hpp b/src/axom/core/execution/internal/seq_exec.hpp index 7fae6c69ae..2ed0cb3256 100644 --- a/src/axom/core/execution/internal/seq_exec.hpp +++ b/src/axom/core/execution/internal/seq_exec.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/execution/runtime_policy.hpp b/src/axom/core/execution/runtime_policy.hpp index 263db3a1f4..401cc82fdf 100644 --- a/src/axom/core/execution/runtime_policy.hpp +++ b/src/axom/core/execution/runtime_policy.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/execution/synchronize.hpp b/src/axom/core/execution/synchronize.hpp index 302888405b..83a961a470 100644 --- a/src/axom/core/execution/synchronize.hpp +++ b/src/axom/core/execution/synchronize.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/memory_management.hpp b/src/axom/core/memory_management.hpp index e0bf983b5a..7edbd51304 100644 --- a/src/axom/core/memory_management.hpp +++ b/src/axom/core/memory_management.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/numerics/Determinants.hpp b/src/axom/core/numerics/Determinants.hpp index b54c2de28a..b29bc8f7df 100644 --- a/src/axom/core/numerics/Determinants.hpp +++ b/src/axom/core/numerics/Determinants.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/numerics/LU.hpp b/src/axom/core/numerics/LU.hpp index fb352b2979..ebbb7fc6db 100644 --- a/src/axom/core/numerics/LU.hpp +++ b/src/axom/core/numerics/LU.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/numerics/Matrix.hpp b/src/axom/core/numerics/Matrix.hpp index d8b61c8c99..4b3b6253ca 100644 --- a/src/axom/core/numerics/Matrix.hpp +++ b/src/axom/core/numerics/Matrix.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/numerics/eigen_solve.hpp b/src/axom/core/numerics/eigen_solve.hpp index b257b972b7..81fa50667b 100644 --- a/src/axom/core/numerics/eigen_solve.hpp +++ b/src/axom/core/numerics/eigen_solve.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/numerics/eigen_sort.hpp b/src/axom/core/numerics/eigen_sort.hpp index 6bf94cf619..62498a82e3 100644 --- a/src/axom/core/numerics/eigen_sort.hpp +++ b/src/axom/core/numerics/eigen_sort.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/numerics/floating_point_limits.hpp b/src/axom/core/numerics/floating_point_limits.hpp index 7f54510fd3..fdc3ce348a 100644 --- a/src/axom/core/numerics/floating_point_limits.hpp +++ b/src/axom/core/numerics/floating_point_limits.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/numerics/internal/matrix_norms.hpp b/src/axom/core/numerics/internal/matrix_norms.hpp index 5f93f526fc..78871a40b9 100644 --- a/src/axom/core/numerics/internal/matrix_norms.hpp +++ b/src/axom/core/numerics/internal/matrix_norms.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/numerics/jacobi_eigensolve.hpp b/src/axom/core/numerics/jacobi_eigensolve.hpp index 7c3949571b..5de1567831 100644 --- a/src/axom/core/numerics/jacobi_eigensolve.hpp +++ b/src/axom/core/numerics/jacobi_eigensolve.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/numerics/linear_solve.hpp b/src/axom/core/numerics/linear_solve.hpp index f0cc1c4f7d..7140f573b4 100644 --- a/src/axom/core/numerics/linear_solve.hpp +++ b/src/axom/core/numerics/linear_solve.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/numerics/matvecops.hpp b/src/axom/core/numerics/matvecops.hpp index d8f247d8c8..d3db788a82 100644 --- a/src/axom/core/numerics/matvecops.hpp +++ b/src/axom/core/numerics/matvecops.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/numerics/polynomial_solvers.cpp b/src/axom/core/numerics/polynomial_solvers.cpp index 69b04ce8d9..84586c1cab 100644 --- a/src/axom/core/numerics/polynomial_solvers.cpp +++ b/src/axom/core/numerics/polynomial_solvers.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/numerics/polynomial_solvers.hpp b/src/axom/core/numerics/polynomial_solvers.hpp index 20200bfedf..0f08da66a4 100644 --- a/src/axom/core/numerics/polynomial_solvers.hpp +++ b/src/axom/core/numerics/polynomial_solvers.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/CMakeLists.txt b/src/axom/core/tests/CMakeLists.txt index 4e2f0f4c6e..c9eb08bb5c 100644 --- a/src/axom/core/tests/CMakeLists.txt +++ b/src/axom/core/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_Path.hpp b/src/axom/core/tests/core_Path.hpp index 3255d00b85..7e5abc868f 100644 --- a/src/axom/core/tests/core_Path.hpp +++ b/src/axom/core/tests/core_Path.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_about.hpp b/src/axom/core/tests/core_about.hpp index 50bc4f5255..63bc18bd38 100644 --- a/src/axom/core/tests/core_about.hpp +++ b/src/axom/core/tests/core_about.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_array.hpp b/src/axom/core/tests/core_array.hpp index f3245e9b04..35b7a525d7 100644 --- a/src/axom/core/tests/core_array.hpp +++ b/src/axom/core/tests/core_array.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_array_for_all.hpp b/src/axom/core/tests/core_array_for_all.hpp index d410b3bf9c..dcfe405832 100644 --- a/src/axom/core/tests/core_array_for_all.hpp +++ b/src/axom/core/tests/core_array_for_all.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_bit_utilities.hpp b/src/axom/core/tests/core_bit_utilities.hpp index 0746cbd238..e020d9fcc0 100644 --- a/src/axom/core/tests/core_bit_utilities.hpp +++ b/src/axom/core/tests/core_bit_utilities.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_execution_for_all.hpp b/src/axom/core/tests/core_execution_for_all.hpp index 5ba8f79816..5b93132811 100644 --- a/src/axom/core/tests/core_execution_for_all.hpp +++ b/src/axom/core/tests/core_execution_for_all.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_execution_space.hpp b/src/axom/core/tests/core_execution_space.hpp index a4405bd9d1..b06f86b5f1 100644 --- a/src/axom/core/tests/core_execution_space.hpp +++ b/src/axom/core/tests/core_execution_space.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_flatmap.hpp b/src/axom/core/tests/core_flatmap.hpp index b3aebf1987..bd69fd2da0 100644 --- a/src/axom/core/tests/core_flatmap.hpp +++ b/src/axom/core/tests/core_flatmap.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_map.hpp b/src/axom/core/tests/core_map.hpp index af6640e59f..255b08f058 100644 --- a/src/axom/core/tests/core_map.hpp +++ b/src/axom/core/tests/core_map.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_memory_management.hpp b/src/axom/core/tests/core_memory_management.hpp index ddba1e3a37..669f6df6b9 100644 --- a/src/axom/core/tests/core_memory_management.hpp +++ b/src/axom/core/tests/core_memory_management.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_mpi_main.cpp b/src/axom/core/tests/core_mpi_main.cpp index 67e63d59ab..2aa78d07aa 100644 --- a/src/axom/core/tests/core_mpi_main.cpp +++ b/src/axom/core/tests/core_mpi_main.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_openmp_main.cpp b/src/axom/core/tests/core_openmp_main.cpp index 637e0f1823..2b5d73c22a 100644 --- a/src/axom/core/tests/core_openmp_main.cpp +++ b/src/axom/core/tests/core_openmp_main.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_openmp_map.hpp b/src/axom/core/tests/core_openmp_map.hpp index f75cc65b44..d1abe2bd49 100644 --- a/src/axom/core/tests/core_openmp_map.hpp +++ b/src/axom/core/tests/core_openmp_map.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_serial_main.cpp b/src/axom/core/tests/core_serial_main.cpp index 97da472582..68c93b6cfa 100644 --- a/src/axom/core/tests/core_serial_main.cpp +++ b/src/axom/core/tests/core_serial_main.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_stack_array.hpp b/src/axom/core/tests/core_stack_array.hpp index 4370322a44..1002d1d3f7 100644 --- a/src/axom/core/tests/core_stack_array.hpp +++ b/src/axom/core/tests/core_stack_array.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_types.hpp b/src/axom/core/tests/core_types.hpp index bf666e4e0e..6a5cfd4ce1 100644 --- a/src/axom/core/tests/core_types.hpp +++ b/src/axom/core/tests/core_types.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/core_utilities.hpp b/src/axom/core/tests/core_utilities.hpp index 808645542a..31b73981d4 100644 --- a/src/axom/core/tests/core_utilities.hpp +++ b/src/axom/core/tests/core_utilities.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/numerics_determinants.hpp b/src/axom/core/tests/numerics_determinants.hpp index a8579722f5..3f405f2eff 100644 --- a/src/axom/core/tests/numerics_determinants.hpp +++ b/src/axom/core/tests/numerics_determinants.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/numerics_eigen_solve.hpp b/src/axom/core/tests/numerics_eigen_solve.hpp index 5adbead5c5..4dfa0640fc 100644 --- a/src/axom/core/tests/numerics_eigen_solve.hpp +++ b/src/axom/core/tests/numerics_eigen_solve.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/numerics_eigen_sort.hpp b/src/axom/core/tests/numerics_eigen_sort.hpp index 230e372b40..8ab395d806 100644 --- a/src/axom/core/tests/numerics_eigen_sort.hpp +++ b/src/axom/core/tests/numerics_eigen_sort.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/numerics_floating_point_limits.hpp b/src/axom/core/tests/numerics_floating_point_limits.hpp index b3d7996b95..a9e4bab880 100644 --- a/src/axom/core/tests/numerics_floating_point_limits.hpp +++ b/src/axom/core/tests/numerics_floating_point_limits.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/numerics_jacobi_eigensolve.hpp b/src/axom/core/tests/numerics_jacobi_eigensolve.hpp index 201f933d48..53f3bb6367 100644 --- a/src/axom/core/tests/numerics_jacobi_eigensolve.hpp +++ b/src/axom/core/tests/numerics_jacobi_eigensolve.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/numerics_linear_solve.hpp b/src/axom/core/tests/numerics_linear_solve.hpp index a990163b5e..a10b64074b 100644 --- a/src/axom/core/tests/numerics_linear_solve.hpp +++ b/src/axom/core/tests/numerics_linear_solve.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/numerics_lu.hpp b/src/axom/core/tests/numerics_lu.hpp index 7ff4f54c0f..b3af348d4e 100644 --- a/src/axom/core/tests/numerics_lu.hpp +++ b/src/axom/core/tests/numerics_lu.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/numerics_matrix.hpp b/src/axom/core/tests/numerics_matrix.hpp index fb86fb78af..a4292eb433 100644 --- a/src/axom/core/tests/numerics_matrix.hpp +++ b/src/axom/core/tests/numerics_matrix.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/numerics_matvecops.hpp b/src/axom/core/tests/numerics_matvecops.hpp index 1ad8723d5c..88903a726c 100644 --- a/src/axom/core/tests/numerics_matvecops.hpp +++ b/src/axom/core/tests/numerics_matvecops.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/numerics_polynomial_solvers.hpp b/src/axom/core/tests/numerics_polynomial_solvers.hpp index 92f2bcc719..fe902f3141 100644 --- a/src/axom/core/tests/numerics_polynomial_solvers.hpp +++ b/src/axom/core/tests/numerics_polynomial_solvers.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/utils_Timer.hpp b/src/axom/core/tests/utils_Timer.hpp index b8fc29b082..ad26de0ff1 100644 --- a/src/axom/core/tests/utils_Timer.hpp +++ b/src/axom/core/tests/utils_Timer.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/utils_config.cpp b/src/axom/core/tests/utils_config.cpp index 3709d80adf..6bc261d49b 100644 --- a/src/axom/core/tests/utils_config.cpp +++ b/src/axom/core/tests/utils_config.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/utils_endianness.hpp b/src/axom/core/tests/utils_endianness.hpp index 056d53a5b7..50dd9491e1 100644 --- a/src/axom/core/tests/utils_endianness.hpp +++ b/src/axom/core/tests/utils_endianness.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/utils_fileUtilities.hpp b/src/axom/core/tests/utils_fileUtilities.hpp index caf13bcecf..97de0bcc2f 100644 --- a/src/axom/core/tests/utils_fileUtilities.hpp +++ b/src/axom/core/tests/utils_fileUtilities.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/utils_locale.hpp b/src/axom/core/tests/utils_locale.hpp index 04e97a788e..fa72bf3662 100644 --- a/src/axom/core/tests/utils_locale.hpp +++ b/src/axom/core/tests/utils_locale.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/utils_nvtx_settings.hpp b/src/axom/core/tests/utils_nvtx_settings.hpp index 63a40595fe..59a2d85408 100644 --- a/src/axom/core/tests/utils_nvtx_settings.hpp +++ b/src/axom/core/tests/utils_nvtx_settings.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/utils_stringUtilities.hpp b/src/axom/core/tests/utils_stringUtilities.hpp index 90dc8c65bd..e05988828c 100644 --- a/src/axom/core/tests/utils_stringUtilities.hpp +++ b/src/axom/core/tests/utils_stringUtilities.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/utils_system.hpp b/src/axom/core/tests/utils_system.hpp index dbcdb6ea53..e143b9d6f5 100644 --- a/src/axom/core/tests/utils_system.hpp +++ b/src/axom/core/tests/utils_system.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/tests/utils_utilities.hpp b/src/axom/core/tests/utils_utilities.hpp index 8da634f4b0..6490951dd9 100644 --- a/src/axom/core/tests/utils_utilities.hpp +++ b/src/axom/core/tests/utils_utilities.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/About.cpp.in b/src/axom/core/utilities/About.cpp.in index 8176951e0e..499d2e5770 100644 --- a/src/axom/core/utilities/About.cpp.in +++ b/src/axom/core/utilities/About.cpp.in @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/About.hpp b/src/axom/core/utilities/About.hpp index 381a89d845..13594a0b9d 100644 --- a/src/axom/core/utilities/About.hpp +++ b/src/axom/core/utilities/About.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/AnnotationMacros.hpp b/src/axom/core/utilities/AnnotationMacros.hpp index 9299744471..28f5dbed94 100644 --- a/src/axom/core/utilities/AnnotationMacros.hpp +++ b/src/axom/core/utilities/AnnotationMacros.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/BitUtilities.hpp b/src/axom/core/utilities/BitUtilities.hpp index e36a97da93..079cb2ce92 100644 --- a/src/axom/core/utilities/BitUtilities.hpp +++ b/src/axom/core/utilities/BitUtilities.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/FileUtilities.cpp b/src/axom/core/utilities/FileUtilities.cpp index b0b45e58de..c359ed9dd6 100644 --- a/src/axom/core/utilities/FileUtilities.cpp +++ b/src/axom/core/utilities/FileUtilities.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/FileUtilities.hpp b/src/axom/core/utilities/FileUtilities.hpp index 5c1da67e22..48a38666db 100644 --- a/src/axom/core/utilities/FileUtilities.hpp +++ b/src/axom/core/utilities/FileUtilities.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/StringUtilities.cpp b/src/axom/core/utilities/StringUtilities.cpp index 5c3c7da65d..6fe775304b 100644 --- a/src/axom/core/utilities/StringUtilities.cpp +++ b/src/axom/core/utilities/StringUtilities.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/StringUtilities.hpp b/src/axom/core/utilities/StringUtilities.hpp index 10b127b2e0..3f411fcd64 100644 --- a/src/axom/core/utilities/StringUtilities.hpp +++ b/src/axom/core/utilities/StringUtilities.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/System.cpp b/src/axom/core/utilities/System.cpp index cc9d4c2da4..19aa48dfad 100644 --- a/src/axom/core/utilities/System.cpp +++ b/src/axom/core/utilities/System.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/System.hpp b/src/axom/core/utilities/System.hpp index 45dc3fdffb..9873a685d8 100644 --- a/src/axom/core/utilities/System.hpp +++ b/src/axom/core/utilities/System.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/Timer.hpp b/src/axom/core/utilities/Timer.hpp index 0ffbd5297e..90dfbcece8 100644 --- a/src/axom/core/utilities/Timer.hpp +++ b/src/axom/core/utilities/Timer.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/Utilities.cpp b/src/axom/core/utilities/Utilities.cpp index c5fe262eef..7edf95d46f 100644 --- a/src/axom/core/utilities/Utilities.cpp +++ b/src/axom/core/utilities/Utilities.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/Utilities.hpp b/src/axom/core/utilities/Utilities.hpp index 260d5a6c61..f6428d22d3 100644 --- a/src/axom/core/utilities/Utilities.hpp +++ b/src/axom/core/utilities/Utilities.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/nvtx/Macros.hpp b/src/axom/core/utilities/nvtx/Macros.hpp index fb42e62b3f..11eb77ad13 100644 --- a/src/axom/core/utilities/nvtx/Macros.hpp +++ b/src/axom/core/utilities/nvtx/Macros.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/nvtx/Range.cpp b/src/axom/core/utilities/nvtx/Range.cpp index 14549d3c21..fd7c382da8 100644 --- a/src/axom/core/utilities/nvtx/Range.cpp +++ b/src/axom/core/utilities/nvtx/Range.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/nvtx/Range.hpp b/src/axom/core/utilities/nvtx/Range.hpp index d179ae1f9d..7a67a7bd4c 100644 --- a/src/axom/core/utilities/nvtx/Range.hpp +++ b/src/axom/core/utilities/nvtx/Range.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/nvtx/interface.cpp b/src/axom/core/utilities/nvtx/interface.cpp index 92a418d55b..f409c9673c 100644 --- a/src/axom/core/utilities/nvtx/interface.cpp +++ b/src/axom/core/utilities/nvtx/interface.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/core/utilities/nvtx/interface.hpp b/src/axom/core/utilities/nvtx/interface.hpp index 0f0164bc79..4c9239aa93 100644 --- a/src/axom/core/utilities/nvtx/interface.hpp +++ b/src/axom/core/utilities/nvtx/interface.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/CMakeLists.txt b/src/axom/inlet/CMakeLists.txt index bf7d6a71df..e65d90b95d 100644 --- a/src/axom/inlet/CMakeLists.txt +++ b/src/axom/inlet/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/ConduitReader.cpp b/src/axom/inlet/ConduitReader.cpp index 657a1d70a3..e14ccd3a35 100644 --- a/src/axom/inlet/ConduitReader.cpp +++ b/src/axom/inlet/ConduitReader.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/ConduitReader.hpp b/src/axom/inlet/ConduitReader.hpp index 8d8f5caf7e..0c7445920c 100644 --- a/src/axom/inlet/ConduitReader.hpp +++ b/src/axom/inlet/ConduitReader.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/Container.cpp b/src/axom/inlet/Container.cpp index 198832cc41..78879f0b5f 100644 --- a/src/axom/inlet/Container.cpp +++ b/src/axom/inlet/Container.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/Container.hpp b/src/axom/inlet/Container.hpp index 7672350dc6..a4eb740a05 100644 --- a/src/axom/inlet/Container.hpp +++ b/src/axom/inlet/Container.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/Field.cpp b/src/axom/inlet/Field.cpp index 97bfaa2b0b..5455c211eb 100644 --- a/src/axom/inlet/Field.cpp +++ b/src/axom/inlet/Field.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/Field.hpp b/src/axom/inlet/Field.hpp index a58c645e77..b895c0f92d 100644 --- a/src/axom/inlet/Field.hpp +++ b/src/axom/inlet/Field.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/Function.cpp b/src/axom/inlet/Function.cpp index 7137a337e0..638a2a466d 100644 --- a/src/axom/inlet/Function.cpp +++ b/src/axom/inlet/Function.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/Function.hpp b/src/axom/inlet/Function.hpp index 44b67a87b1..23c8113012 100644 --- a/src/axom/inlet/Function.hpp +++ b/src/axom/inlet/Function.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/Inlet.cpp b/src/axom/inlet/Inlet.cpp index 11d9f86020..d610102eff 100644 --- a/src/axom/inlet/Inlet.cpp +++ b/src/axom/inlet/Inlet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/Inlet.hpp b/src/axom/inlet/Inlet.hpp index dc9a1b1c4e..c3aec617bd 100644 --- a/src/axom/inlet/Inlet.hpp +++ b/src/axom/inlet/Inlet.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/InletVector.hpp b/src/axom/inlet/InletVector.hpp index 9b0200c682..82f8e42a44 100644 --- a/src/axom/inlet/InletVector.hpp +++ b/src/axom/inlet/InletVector.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/JSONReader.hpp b/src/axom/inlet/JSONReader.hpp index ae2b7fe32c..c63e54a12b 100644 --- a/src/axom/inlet/JSONReader.hpp +++ b/src/axom/inlet/JSONReader.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/JSONSchemaWriter.cpp b/src/axom/inlet/JSONSchemaWriter.cpp index afbbc5c45e..41716da921 100644 --- a/src/axom/inlet/JSONSchemaWriter.cpp +++ b/src/axom/inlet/JSONSchemaWriter.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/JSONSchemaWriter.hpp b/src/axom/inlet/JSONSchemaWriter.hpp index c50d43395b..0d57e101fb 100644 --- a/src/axom/inlet/JSONSchemaWriter.hpp +++ b/src/axom/inlet/JSONSchemaWriter.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/LuaReader.cpp b/src/axom/inlet/LuaReader.cpp index ec7bad0449..e6b280a937 100644 --- a/src/axom/inlet/LuaReader.cpp +++ b/src/axom/inlet/LuaReader.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/LuaReader.hpp b/src/axom/inlet/LuaReader.hpp index e2168eef59..5f9e5d6819 100644 --- a/src/axom/inlet/LuaReader.hpp +++ b/src/axom/inlet/LuaReader.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/Proxy.cpp b/src/axom/inlet/Proxy.cpp index 2f090fb42b..a995587f85 100644 --- a/src/axom/inlet/Proxy.cpp +++ b/src/axom/inlet/Proxy.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/Proxy.hpp b/src/axom/inlet/Proxy.hpp index d69a1e267c..7f6a867df9 100644 --- a/src/axom/inlet/Proxy.hpp +++ b/src/axom/inlet/Proxy.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/Reader.hpp b/src/axom/inlet/Reader.hpp index bd8f4aba73..c66fc64b44 100644 --- a/src/axom/inlet/Reader.hpp +++ b/src/axom/inlet/Reader.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/SphinxWriter.cpp b/src/axom/inlet/SphinxWriter.cpp index b280dbf384..adfc7622d8 100644 --- a/src/axom/inlet/SphinxWriter.cpp +++ b/src/axom/inlet/SphinxWriter.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/SphinxWriter.hpp b/src/axom/inlet/SphinxWriter.hpp index 7c4046093d..7400f61b1e 100644 --- a/src/axom/inlet/SphinxWriter.hpp +++ b/src/axom/inlet/SphinxWriter.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/VariantKey.cpp b/src/axom/inlet/VariantKey.cpp index 8bc751d4e9..b273be84af 100644 --- a/src/axom/inlet/VariantKey.cpp +++ b/src/axom/inlet/VariantKey.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/VariantKey.hpp b/src/axom/inlet/VariantKey.hpp index 0a801958be..7b5320a666 100644 --- a/src/axom/inlet/VariantKey.hpp +++ b/src/axom/inlet/VariantKey.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/Verifiable.hpp b/src/axom/inlet/Verifiable.hpp index 4c747859d3..f8c06f0eff 100644 --- a/src/axom/inlet/Verifiable.hpp +++ b/src/axom/inlet/Verifiable.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/VerifiableScalar.cpp b/src/axom/inlet/VerifiableScalar.cpp index 71492e49a6..ff446abf0c 100644 --- a/src/axom/inlet/VerifiableScalar.cpp +++ b/src/axom/inlet/VerifiableScalar.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/VerifiableScalar.hpp b/src/axom/inlet/VerifiableScalar.hpp index ac5458ad45..9b052b43da 100644 --- a/src/axom/inlet/VerifiableScalar.hpp +++ b/src/axom/inlet/VerifiableScalar.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/Writer.hpp b/src/axom/inlet/Writer.hpp index 0cf3596a44..416a2e44f7 100644 --- a/src/axom/inlet/Writer.hpp +++ b/src/axom/inlet/Writer.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/YAMLReader.hpp b/src/axom/inlet/YAMLReader.hpp index b126777519..87892b1417 100644 --- a/src/axom/inlet/YAMLReader.hpp +++ b/src/axom/inlet/YAMLReader.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/examples/CMakeLists.txt b/src/axom/inlet/examples/CMakeLists.txt index 8ddf34dff0..822270d66f 100644 --- a/src/axom/inlet/examples/CMakeLists.txt +++ b/src/axom/inlet/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/examples/arrays.cpp b/src/axom/inlet/examples/arrays.cpp index 1a7d9d2c9f..67717ddb81 100644 --- a/src/axom/inlet/examples/arrays.cpp +++ b/src/axom/inlet/examples/arrays.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/examples/containers.cpp b/src/axom/inlet/examples/containers.cpp index ac92a497ec..2549f321fe 100644 --- a/src/axom/inlet/examples/containers.cpp +++ b/src/axom/inlet/examples/containers.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/examples/documentation_generation.cpp b/src/axom/inlet/examples/documentation_generation.cpp index db956d21cf..c9748b4cf6 100644 --- a/src/axom/inlet/examples/documentation_generation.cpp +++ b/src/axom/inlet/examples/documentation_generation.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/examples/fields.cpp b/src/axom/inlet/examples/fields.cpp index ac50910940..01739830c6 100644 --- a/src/axom/inlet/examples/fields.cpp +++ b/src/axom/inlet/examples/fields.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/examples/lua_library.cpp b/src/axom/inlet/examples/lua_library.cpp index b47b2045fe..b57a7b7f4c 100644 --- a/src/axom/inlet/examples/lua_library.cpp +++ b/src/axom/inlet/examples/lua_library.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/examples/mfem_coefficient.cpp b/src/axom/inlet/examples/mfem_coefficient.cpp index f57d9df694..ba84c717d3 100644 --- a/src/axom/inlet/examples/mfem_coefficient.cpp +++ b/src/axom/inlet/examples/mfem_coefficient.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/examples/nested_structs.cpp b/src/axom/inlet/examples/nested_structs.cpp index 6b2366f18b..82119fa736 100644 --- a/src/axom/inlet/examples/nested_structs.cpp +++ b/src/axom/inlet/examples/nested_structs.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/examples/user_defined_type.cpp b/src/axom/inlet/examples/user_defined_type.cpp index 99bcc56fda..e2047b2711 100644 --- a/src/axom/inlet/examples/user_defined_type.cpp +++ b/src/axom/inlet/examples/user_defined_type.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/examples/verification.cpp b/src/axom/inlet/examples/verification.cpp index f1eb6b352d..2dfc4c316a 100644 --- a/src/axom/inlet/examples/verification.cpp +++ b/src/axom/inlet/examples/verification.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/inlet_utils.cpp b/src/axom/inlet/inlet_utils.cpp index c65a1739e6..86596719b4 100644 --- a/src/axom/inlet/inlet_utils.cpp +++ b/src/axom/inlet/inlet_utils.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/inlet_utils.hpp b/src/axom/inlet/inlet_utils.hpp index 1dc61f1259..033ab89dd8 100644 --- a/src/axom/inlet/inlet_utils.hpp +++ b/src/axom/inlet/inlet_utils.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/tests/CMakeLists.txt b/src/axom/inlet/tests/CMakeLists.txt index c3df689b74..706156ed82 100644 --- a/src/axom/inlet/tests/CMakeLists.txt +++ b/src/axom/inlet/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/tests/inlet_Inlet.cpp b/src/axom/inlet/tests/inlet_Inlet.cpp index acb97203a9..4a95cf9a1a 100644 --- a/src/axom/inlet/tests/inlet_Inlet.cpp +++ b/src/axom/inlet/tests/inlet_Inlet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/tests/inlet_Reader.cpp b/src/axom/inlet/tests/inlet_Reader.cpp index 7fab6160f7..85990cc664 100644 --- a/src/axom/inlet/tests/inlet_Reader.cpp +++ b/src/axom/inlet/tests/inlet_Reader.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/tests/inlet_errors.cpp b/src/axom/inlet/tests/inlet_errors.cpp index 094b33a31e..d4c6f5915c 100644 --- a/src/axom/inlet/tests/inlet_errors.cpp +++ b/src/axom/inlet/tests/inlet_errors.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/tests/inlet_function.cpp b/src/axom/inlet/tests/inlet_function.cpp index f9192aa4bf..d7a2c44413 100644 --- a/src/axom/inlet/tests/inlet_function.cpp +++ b/src/axom/inlet/tests/inlet_function.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/tests/inlet_jsonschema_writer.cpp b/src/axom/inlet/tests/inlet_jsonschema_writer.cpp index aae23219e8..2e1ef205e8 100644 --- a/src/axom/inlet/tests/inlet_jsonschema_writer.cpp +++ b/src/axom/inlet/tests/inlet_jsonschema_writer.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/tests/inlet_object.cpp b/src/axom/inlet/tests/inlet_object.cpp index b19a737165..5c52d8efe1 100644 --- a/src/axom/inlet/tests/inlet_object.cpp +++ b/src/axom/inlet/tests/inlet_object.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/tests/inlet_restart.cpp b/src/axom/inlet/tests/inlet_restart.cpp index f991853911..2fc91eff7d 100644 --- a/src/axom/inlet/tests/inlet_restart.cpp +++ b/src/axom/inlet/tests/inlet_restart.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/tests/inlet_test_utils.cpp b/src/axom/inlet/tests/inlet_test_utils.cpp index e341fa5cfb..d70843e2f8 100644 --- a/src/axom/inlet/tests/inlet_test_utils.cpp +++ b/src/axom/inlet/tests/inlet_test_utils.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/inlet/tests/inlet_test_utils.hpp b/src/axom/inlet/tests/inlet_test_utils.hpp index 7a41c04b40..75750c202b 100644 --- a/src/axom/inlet/tests/inlet_test_utils.hpp +++ b/src/axom/inlet/tests/inlet_test_utils.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/CMakeLists.txt b/src/axom/klee/CMakeLists.txt index 588cda5225..e49699aed9 100644 --- a/src/axom/klee/CMakeLists.txt +++ b/src/axom/klee/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/Dimensions.hpp b/src/axom/klee/Dimensions.hpp index 2bf4f6e5a8..41f08ce054 100644 --- a/src/axom/klee/Dimensions.hpp +++ b/src/axom/klee/Dimensions.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/Geometry.cpp b/src/axom/klee/Geometry.cpp index dac4e85a02..35fe74940c 100644 --- a/src/axom/klee/Geometry.cpp +++ b/src/axom/klee/Geometry.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/Geometry.hpp b/src/axom/klee/Geometry.hpp index 44b3e6f884..2e8e63abe8 100644 --- a/src/axom/klee/Geometry.hpp +++ b/src/axom/klee/Geometry.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/GeometryOperators.cpp b/src/axom/klee/GeometryOperators.cpp index 6a14f7d17c..e1f5c459bb 100644 --- a/src/axom/klee/GeometryOperators.cpp +++ b/src/axom/klee/GeometryOperators.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/GeometryOperators.hpp b/src/axom/klee/GeometryOperators.hpp index c39c260209..7f217cf2ff 100644 --- a/src/axom/klee/GeometryOperators.hpp +++ b/src/axom/klee/GeometryOperators.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/GeometryOperatorsIO.cpp b/src/axom/klee/GeometryOperatorsIO.cpp index 67d406e92c..b8c811bd6f 100644 --- a/src/axom/klee/GeometryOperatorsIO.cpp +++ b/src/axom/klee/GeometryOperatorsIO.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/GeometryOperatorsIO.hpp b/src/axom/klee/GeometryOperatorsIO.hpp index 169543c81a..04bf55f138 100644 --- a/src/axom/klee/GeometryOperatorsIO.hpp +++ b/src/axom/klee/GeometryOperatorsIO.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/IO.cpp b/src/axom/klee/IO.cpp index 2295e014be..dd0ef6c0df 100644 --- a/src/axom/klee/IO.cpp +++ b/src/axom/klee/IO.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/IO.hpp b/src/axom/klee/IO.hpp index 36301f1cff..ef2c398d6c 100644 --- a/src/axom/klee/IO.hpp +++ b/src/axom/klee/IO.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/IOUtil.cpp b/src/axom/klee/IOUtil.cpp index 19c6eaddef..06b02ea0e0 100644 --- a/src/axom/klee/IOUtil.cpp +++ b/src/axom/klee/IOUtil.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/IOUtil.hpp b/src/axom/klee/IOUtil.hpp index c98447e3af..0f1e1ded34 100644 --- a/src/axom/klee/IOUtil.hpp +++ b/src/axom/klee/IOUtil.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/KleeError.cpp b/src/axom/klee/KleeError.cpp index be7fc3c1d9..a83c068da4 100644 --- a/src/axom/klee/KleeError.cpp +++ b/src/axom/klee/KleeError.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/KleeError.hpp b/src/axom/klee/KleeError.hpp index 7ea2ffcada..5de2439f82 100644 --- a/src/axom/klee/KleeError.hpp +++ b/src/axom/klee/KleeError.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/Shape.cpp b/src/axom/klee/Shape.cpp index 022bd4a0c9..8835aea4a5 100644 --- a/src/axom/klee/Shape.cpp +++ b/src/axom/klee/Shape.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/Shape.hpp b/src/axom/klee/Shape.hpp index 875859d364..4cdaf262b0 100644 --- a/src/axom/klee/Shape.hpp +++ b/src/axom/klee/Shape.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/ShapeSet.cpp b/src/axom/klee/ShapeSet.cpp index 26ef119d9e..326000bce9 100644 --- a/src/axom/klee/ShapeSet.cpp +++ b/src/axom/klee/ShapeSet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/ShapeSet.hpp b/src/axom/klee/ShapeSet.hpp index 46b5218a85..f8c197b31a 100644 --- a/src/axom/klee/ShapeSet.hpp +++ b/src/axom/klee/ShapeSet.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/Units.cpp b/src/axom/klee/Units.cpp index 385cdbe47a..827c9cc5c2 100644 --- a/src/axom/klee/Units.cpp +++ b/src/axom/klee/Units.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/Units.hpp b/src/axom/klee/Units.hpp index ccdf766734..7fe230c4c7 100644 --- a/src/axom/klee/Units.hpp +++ b/src/axom/klee/Units.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/docs/sphinx/index.rst b/src/axom/klee/docs/sphinx/index.rst index 9724cf30a0..cec475b040 100644 --- a/src/axom/klee/docs/sphinx/index.rst +++ b/src/axom/klee/docs/sphinx/index.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level COPYRIGHT file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/tests/CMakeLists.txt b/src/axom/klee/tests/CMakeLists.txt index ea49dddc61..5602c649c7 100644 --- a/src/axom/klee/tests/CMakeLists.txt +++ b/src/axom/klee/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/tests/KleeMatchers.hpp b/src/axom/klee/tests/KleeMatchers.hpp index 2497ea5bad..e37745d0db 100644 --- a/src/axom/klee/tests/KleeMatchers.hpp +++ b/src/axom/klee/tests/KleeMatchers.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/tests/KleeTestUtils.cpp b/src/axom/klee/tests/KleeTestUtils.cpp index 05c3819fc4..e4c4ae6031 100644 --- a/src/axom/klee/tests/KleeTestUtils.cpp +++ b/src/axom/klee/tests/KleeTestUtils.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/tests/KleeTestUtils.hpp b/src/axom/klee/tests/KleeTestUtils.hpp index 0ce9bbc8a1..c51dee9950 100644 --- a/src/axom/klee/tests/KleeTestUtils.hpp +++ b/src/axom/klee/tests/KleeTestUtils.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/tests/klee_config.cpp b/src/axom/klee/tests/klee_config.cpp index 8d50ae2f15..9f22cd06e8 100644 --- a/src/axom/klee/tests/klee_config.cpp +++ b/src/axom/klee/tests/klee_config.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/tests/klee_geometry.cpp b/src/axom/klee/tests/klee_geometry.cpp index d72caf4221..220235dcdc 100644 --- a/src/axom/klee/tests/klee_geometry.cpp +++ b/src/axom/klee/tests/klee_geometry.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/tests/klee_geometry_operators.cpp b/src/axom/klee/tests/klee_geometry_operators.cpp index 06e758e858..82e7204bdc 100644 --- a/src/axom/klee/tests/klee_geometry_operators.cpp +++ b/src/axom/klee/tests/klee_geometry_operators.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/tests/klee_geometry_operators_io.cpp b/src/axom/klee/tests/klee_geometry_operators_io.cpp index ba2da0e30d..6326d8a156 100644 --- a/src/axom/klee/tests/klee_geometry_operators_io.cpp +++ b/src/axom/klee/tests/klee_geometry_operators_io.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/tests/klee_io.cpp b/src/axom/klee/tests/klee_io.cpp index 9f78611f71..ba1d391151 100644 --- a/src/axom/klee/tests/klee_io.cpp +++ b/src/axom/klee/tests/klee_io.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/tests/klee_io_util.cpp b/src/axom/klee/tests/klee_io_util.cpp index 77d82457e1..ae62274b07 100644 --- a/src/axom/klee/tests/klee_io_util.cpp +++ b/src/axom/klee/tests/klee_io_util.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/tests/klee_shape.cpp b/src/axom/klee/tests/klee_shape.cpp index 0cac876828..e7a489996c 100644 --- a/src/axom/klee/tests/klee_shape.cpp +++ b/src/axom/klee/tests/klee_shape.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/tests/klee_shape_set.cpp b/src/axom/klee/tests/klee_shape_set.cpp index 8c0952d21f..40be40a136 100644 --- a/src/axom/klee/tests/klee_shape_set.cpp +++ b/src/axom/klee/tests/klee_shape_set.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/klee/tests/klee_units.cpp b/src/axom/klee/tests/klee_units.cpp index 1fa10dc8f5..89d31a1e08 100644 --- a/src/axom/klee/tests/klee_units.cpp +++ b/src/axom/klee/tests/klee_units.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/BinaryTreeCommunicator.cpp b/src/axom/lumberjack/BinaryTreeCommunicator.cpp index 4c7315e55a..83db61965d 100644 --- a/src/axom/lumberjack/BinaryTreeCommunicator.cpp +++ b/src/axom/lumberjack/BinaryTreeCommunicator.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/BinaryTreeCommunicator.hpp b/src/axom/lumberjack/BinaryTreeCommunicator.hpp index 241f2d7b5c..14b5d81fd9 100644 --- a/src/axom/lumberjack/BinaryTreeCommunicator.hpp +++ b/src/axom/lumberjack/BinaryTreeCommunicator.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/CMakeLists.txt b/src/axom/lumberjack/CMakeLists.txt index cceb414fb9..7545bb0322 100644 --- a/src/axom/lumberjack/CMakeLists.txt +++ b/src/axom/lumberjack/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/Combiner.hpp b/src/axom/lumberjack/Combiner.hpp index 12f97721af..2ce94e36db 100644 --- a/src/axom/lumberjack/Combiner.hpp +++ b/src/axom/lumberjack/Combiner.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/Communicator.hpp b/src/axom/lumberjack/Communicator.hpp index fde029a95c..be4a3f1678 100644 --- a/src/axom/lumberjack/Communicator.hpp +++ b/src/axom/lumberjack/Communicator.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/Lumberjack.cpp b/src/axom/lumberjack/Lumberjack.cpp index fc03663eed..f05cc57581 100644 --- a/src/axom/lumberjack/Lumberjack.cpp +++ b/src/axom/lumberjack/Lumberjack.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/Lumberjack.hpp b/src/axom/lumberjack/Lumberjack.hpp index d850d0fdd3..51b38368d7 100644 --- a/src/axom/lumberjack/Lumberjack.hpp +++ b/src/axom/lumberjack/Lumberjack.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/MPIUtility.cpp b/src/axom/lumberjack/MPIUtility.cpp index 0e0b49c5e5..3698bae967 100644 --- a/src/axom/lumberjack/MPIUtility.cpp +++ b/src/axom/lumberjack/MPIUtility.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/MPIUtility.hpp b/src/axom/lumberjack/MPIUtility.hpp index e21b72c406..1d499ea839 100644 --- a/src/axom/lumberjack/MPIUtility.hpp +++ b/src/axom/lumberjack/MPIUtility.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/Message.cpp b/src/axom/lumberjack/Message.cpp index 17d3dde11f..b23ec0788d 100644 --- a/src/axom/lumberjack/Message.cpp +++ b/src/axom/lumberjack/Message.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/Message.hpp b/src/axom/lumberjack/Message.hpp index f24b0dd37b..09f99a29ab 100644 --- a/src/axom/lumberjack/Message.hpp +++ b/src/axom/lumberjack/Message.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/RootCommunicator.cpp b/src/axom/lumberjack/RootCommunicator.cpp index 93593d70d9..15bfab036f 100644 --- a/src/axom/lumberjack/RootCommunicator.cpp +++ b/src/axom/lumberjack/RootCommunicator.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/RootCommunicator.hpp b/src/axom/lumberjack/RootCommunicator.hpp index 54d67b7058..167788d02f 100644 --- a/src/axom/lumberjack/RootCommunicator.hpp +++ b/src/axom/lumberjack/RootCommunicator.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/TextEqualityCombiner.hpp b/src/axom/lumberjack/TextEqualityCombiner.hpp index 84bb8a2660..3db4753814 100644 --- a/src/axom/lumberjack/TextEqualityCombiner.hpp +++ b/src/axom/lumberjack/TextEqualityCombiner.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/examples/CMakeLists.txt b/src/axom/lumberjack/examples/CMakeLists.txt index 9993d9aee9..4ee196c641 100644 --- a/src/axom/lumberjack/examples/CMakeLists.txt +++ b/src/axom/lumberjack/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/examples/basicExample.cpp b/src/axom/lumberjack/examples/basicExample.cpp index 6186af0e5f..a921ee6609 100644 --- a/src/axom/lumberjack/examples/basicExample.cpp +++ b/src/axom/lumberjack/examples/basicExample.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/tests/CMakeLists.txt b/src/axom/lumberjack/tests/CMakeLists.txt index f3188fa84b..19acf997cf 100644 --- a/src/axom/lumberjack/tests/CMakeLists.txt +++ b/src/axom/lumberjack/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/tests/lumberjack_BinaryCommunicator.hpp b/src/axom/lumberjack/tests/lumberjack_BinaryCommunicator.hpp index fcffe81368..d96124b52f 100644 --- a/src/axom/lumberjack/tests/lumberjack_BinaryCommunicator.hpp +++ b/src/axom/lumberjack/tests/lumberjack_BinaryCommunicator.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/tests/lumberjack_Lumberjack.hpp b/src/axom/lumberjack/tests/lumberjack_Lumberjack.hpp index f9911dcde2..229a69cbfc 100644 --- a/src/axom/lumberjack/tests/lumberjack_Lumberjack.hpp +++ b/src/axom/lumberjack/tests/lumberjack_Lumberjack.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/tests/lumberjack_Message.hpp b/src/axom/lumberjack/tests/lumberjack_Message.hpp index 0bb02dfb52..793dc80d3a 100644 --- a/src/axom/lumberjack/tests/lumberjack_Message.hpp +++ b/src/axom/lumberjack/tests/lumberjack_Message.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/tests/lumberjack_RootCommunicator.hpp b/src/axom/lumberjack/tests/lumberjack_RootCommunicator.hpp index b9255d8d2d..df1dd5d4a1 100644 --- a/src/axom/lumberjack/tests/lumberjack_RootCommunicator.hpp +++ b/src/axom/lumberjack/tests/lumberjack_RootCommunicator.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/tests/lumberjack_TextEqualityCombiner.hpp b/src/axom/lumberjack/tests/lumberjack_TextEqualityCombiner.hpp index 81db0f0f6e..0970740be9 100644 --- a/src/axom/lumberjack/tests/lumberjack_TextEqualityCombiner.hpp +++ b/src/axom/lumberjack/tests/lumberjack_TextEqualityCombiner.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/tests/lumberjack_mpi_main.cpp b/src/axom/lumberjack/tests/lumberjack_mpi_main.cpp index 4b5bbb60bb..616f7e45af 100644 --- a/src/axom/lumberjack/tests/lumberjack_mpi_main.cpp +++ b/src/axom/lumberjack/tests/lumberjack_mpi_main.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/tests/lumberjack_serial_main.cpp b/src/axom/lumberjack/tests/lumberjack_serial_main.cpp index 09c638bdd2..449728ae97 100644 --- a/src/axom/lumberjack/tests/lumberjack_serial_main.cpp +++ b/src/axom/lumberjack/tests/lumberjack_serial_main.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/tests/lumberjack_speedTest.cpp b/src/axom/lumberjack/tests/lumberjack_speedTest.cpp index 1ab6f361ae..32e33a82e6 100644 --- a/src/axom/lumberjack/tests/lumberjack_speedTest.cpp +++ b/src/axom/lumberjack/tests/lumberjack_speedTest.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/CMakeLists.txt b/src/axom/mint/CMakeLists.txt index a613a97220..36ea73cb71 100644 --- a/src/axom/mint/CMakeLists.txt +++ b/src/axom/mint/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/core/config.hpp.in b/src/axom/mint/core/config.hpp.in index 99bf5ece80..a429650685 100644 --- a/src/axom/mint/core/config.hpp.in +++ b/src/axom/mint/core/config.hpp.in @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/deprecated/MCArray.hpp b/src/axom/mint/deprecated/MCArray.hpp index f1b1bf1643..daa3df5cda 100644 --- a/src/axom/mint/deprecated/MCArray.hpp +++ b/src/axom/mint/deprecated/MCArray.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/deprecated/SidreMCArray.hpp b/src/axom/mint/deprecated/SidreMCArray.hpp index 25e004bdd3..9d2bc0faf7 100644 --- a/src/axom/mint/deprecated/SidreMCArray.hpp +++ b/src/axom/mint/deprecated/SidreMCArray.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/docs/sphinx/index.rst b/src/axom/mint/docs/sphinx/index.rst index 084858d27c..e6caa588d3 100644 --- a/src/axom/mint/docs/sphinx/index.rst +++ b/src/axom/mint/docs/sphinx/index.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/docs/sphinx/sections/appendix.rst b/src/axom/mint/docs/sphinx/sections/appendix.rst index 1ee7b6ac05..580ebbf7f9 100644 --- a/src/axom/mint/docs/sphinx/sections/appendix.rst +++ b/src/axom/mint/docs/sphinx/sections/appendix.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/docs/sphinx/sections/architecture.rst b/src/axom/mint/docs/sphinx/sections/architecture.rst index 48e07b3300..401f6b733d 100644 --- a/src/axom/mint/docs/sphinx/sections/architecture.rst +++ b/src/axom/mint/docs/sphinx/sections/architecture.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/docs/sphinx/sections/citations.rst b/src/axom/mint/docs/sphinx/sections/citations.rst index d043c41ea4..1f73e17311 100644 --- a/src/axom/mint/docs/sphinx/sections/citations.rst +++ b/src/axom/mint/docs/sphinx/sections/citations.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/docs/sphinx/sections/examples.rst b/src/axom/mint/docs/sphinx/sections/examples.rst index 9390852e32..6ba1beb244 100644 --- a/src/axom/mint/docs/sphinx/sections/examples.rst +++ b/src/axom/mint/docs/sphinx/sections/examples.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/docs/sphinx/sections/execution_model.rst b/src/axom/mint/docs/sphinx/sections/execution_model.rst index f9cfe2d3d9..85294fc17e 100644 --- a/src/axom/mint/docs/sphinx/sections/execution_model.rst +++ b/src/axom/mint/docs/sphinx/sections/execution_model.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/docs/sphinx/sections/faq.rst b/src/axom/mint/docs/sphinx/sections/faq.rst index 2a390d7133..05283901aa 100644 --- a/src/axom/mint/docs/sphinx/sections/faq.rst +++ b/src/axom/mint/docs/sphinx/sections/faq.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/docs/sphinx/sections/fem.rst b/src/axom/mint/docs/sphinx/sections/fem.rst index 30fad342db..960458de94 100644 --- a/src/axom/mint/docs/sphinx/sections/fem.rst +++ b/src/axom/mint/docs/sphinx/sections/fem.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/docs/sphinx/sections/getting_started.rst b/src/axom/mint/docs/sphinx/sections/getting_started.rst index 89410038fb..5d878942d2 100644 --- a/src/axom/mint/docs/sphinx/sections/getting_started.rst +++ b/src/axom/mint/docs/sphinx/sections/getting_started.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/docs/sphinx/sections/mesh_representation.rst b/src/axom/mint/docs/sphinx/sections/mesh_representation.rst index 635b51ae3d..13a967a86e 100644 --- a/src/axom/mint/docs/sphinx/sections/mesh_representation.rst +++ b/src/axom/mint/docs/sphinx/sections/mesh_representation.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/docs/sphinx/sections/mesh_types.rst b/src/axom/mint/docs/sphinx/sections/mesh_types.rst index 88e56eec79..bea332c493 100644 --- a/src/axom/mint/docs/sphinx/sections/mesh_types.rst +++ b/src/axom/mint/docs/sphinx/sections/mesh_types.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/docs/sphinx/sections/preliminary_concepts.rst b/src/axom/mint/docs/sphinx/sections/preliminary_concepts.rst index c530c54cdf..84a788a8ae 100644 --- a/src/axom/mint/docs/sphinx/sections/preliminary_concepts.rst +++ b/src/axom/mint/docs/sphinx/sections/preliminary_concepts.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/docs/sphinx/sections/tutorial.rst b/src/axom/mint/docs/sphinx/sections/tutorial.rst index 213ecf9f39..365698dce9 100644 --- a/src/axom/mint/docs/sphinx/sections/tutorial.rst +++ b/src/axom/mint/docs/sphinx/sections/tutorial.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/examples/CMakeLists.txt b/src/axom/mint/examples/CMakeLists.txt index 2b8de0ea23..991b545028 100644 --- a/src/axom/mint/examples/CMakeLists.txt +++ b/src/axom/mint/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/examples/mint_curvilinear_mesh.cpp b/src/axom/mint/examples/mint_curvilinear_mesh.cpp index e957e22a44..c41127db87 100644 --- a/src/axom/mint/examples/mint_curvilinear_mesh.cpp +++ b/src/axom/mint/examples/mint_curvilinear_mesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/examples/mint_heat_equation.cpp b/src/axom/mint/examples/mint_heat_equation.cpp index 65954231eb..cc2b0b5e23 100644 --- a/src/axom/mint/examples/mint_heat_equation.cpp +++ b/src/axom/mint/examples/mint_heat_equation.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/examples/mint_nbody_solver.cpp b/src/axom/mint/examples/mint_nbody_solver.cpp index 78f2c3548e..5046b3549f 100644 --- a/src/axom/mint/examples/mint_nbody_solver.cpp +++ b/src/axom/mint/examples/mint_nbody_solver.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/examples/mint_particle_mesh.cpp b/src/axom/mint/examples/mint_particle_mesh.cpp index 3ababa30d2..32612f8696 100644 --- a/src/axom/mint/examples/mint_particle_mesh.cpp +++ b/src/axom/mint/examples/mint_particle_mesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/examples/mint_rectilinear_mesh.cpp b/src/axom/mint/examples/mint_rectilinear_mesh.cpp index c013e1abad..5938a1034e 100644 --- a/src/axom/mint/examples/mint_rectilinear_mesh.cpp +++ b/src/axom/mint/examples/mint_rectilinear_mesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/examples/mint_su2_mesh.cpp b/src/axom/mint/examples/mint_su2_mesh.cpp index c437e6123d..ba463a0db2 100644 --- a/src/axom/mint/examples/mint_su2_mesh.cpp +++ b/src/axom/mint/examples/mint_su2_mesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/examples/mint_unstructured_mixed_topology_mesh.cpp b/src/axom/mint/examples/mint_unstructured_mixed_topology_mesh.cpp index 0c2a5acb12..8ee77da4e9 100644 --- a/src/axom/mint/examples/mint_unstructured_mixed_topology_mesh.cpp +++ b/src/axom/mint/examples/mint_unstructured_mixed_topology_mesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/examples/mint_unstructured_single_topology_mesh.cpp b/src/axom/mint/examples/mint_unstructured_single_topology_mesh.cpp index 2e8895cb10..bdda6cf47e 100644 --- a/src/axom/mint/examples/mint_unstructured_single_topology_mesh.cpp +++ b/src/axom/mint/examples/mint_unstructured_single_topology_mesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/examples/user_guide/mint_getting_started.cpp b/src/axom/mint/examples/user_guide/mint_getting_started.cpp index 647d6f5f0f..2f6b593356 100644 --- a/src/axom/mint/examples/user_guide/mint_getting_started.cpp +++ b/src/axom/mint/examples/user_guide/mint_getting_started.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/examples/user_guide/mint_tutorial.cpp b/src/axom/mint/examples/user_guide/mint_tutorial.cpp index 96c1d5a4b0..d0bcf8256c 100644 --- a/src/axom/mint/examples/user_guide/mint_tutorial.cpp +++ b/src/axom/mint/examples/user_guide/mint_tutorial.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/execution/interface.hpp b/src/axom/mint/execution/interface.hpp index 66b38b9fad..6c5174590c 100644 --- a/src/axom/mint/execution/interface.hpp +++ b/src/axom/mint/execution/interface.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/execution/internal/for_all_cells.hpp b/src/axom/mint/execution/internal/for_all_cells.hpp index 6c8e8c8191..da0df50032 100644 --- a/src/axom/mint/execution/internal/for_all_cells.hpp +++ b/src/axom/mint/execution/internal/for_all_cells.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/execution/internal/for_all_faces.hpp b/src/axom/mint/execution/internal/for_all_faces.hpp index 398916ae9e..b1a4482857 100644 --- a/src/axom/mint/execution/internal/for_all_faces.hpp +++ b/src/axom/mint/execution/internal/for_all_faces.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/execution/internal/for_all_nodes.hpp b/src/axom/mint/execution/internal/for_all_nodes.hpp index fcbe0b271e..d8162a6248 100644 --- a/src/axom/mint/execution/internal/for_all_nodes.hpp +++ b/src/axom/mint/execution/internal/for_all_nodes.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/execution/internal/helpers.hpp b/src/axom/mint/execution/internal/helpers.hpp index 0b303098e7..9b2f7e819c 100644 --- a/src/axom/mint/execution/internal/helpers.hpp +++ b/src/axom/mint/execution/internal/helpers.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/execution/internal/structured_exec.hpp b/src/axom/mint/execution/internal/structured_exec.hpp index fa5f76cb9a..486db0792a 100644 --- a/src/axom/mint/execution/internal/structured_exec.hpp +++ b/src/axom/mint/execution/internal/structured_exec.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/execution/xargs.hpp b/src/axom/mint/execution/xargs.hpp index 2cdeb37506..64a91d9f2c 100644 --- a/src/axom/mint/execution/xargs.hpp +++ b/src/axom/mint/execution/xargs.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/FEBasis.hpp b/src/axom/mint/fem/FEBasis.hpp index 921895cad4..8f95082bed 100644 --- a/src/axom/mint/fem/FEBasis.hpp +++ b/src/axom/mint/fem/FEBasis.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/FEBasisTypes.hpp b/src/axom/mint/fem/FEBasisTypes.hpp index 60d160c250..354e0811e5 100644 --- a/src/axom/mint/fem/FEBasisTypes.hpp +++ b/src/axom/mint/fem/FEBasisTypes.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/FiniteElement.cpp b/src/axom/mint/fem/FiniteElement.cpp index 761188f8d7..dc8a3eb202 100644 --- a/src/axom/mint/fem/FiniteElement.cpp +++ b/src/axom/mint/fem/FiniteElement.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/FiniteElement.hpp b/src/axom/mint/fem/FiniteElement.hpp index 2f6892fccb..3baa000003 100644 --- a/src/axom/mint/fem/FiniteElement.hpp +++ b/src/axom/mint/fem/FiniteElement.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/shape_functions/Lagrange.hpp b/src/axom/mint/fem/shape_functions/Lagrange.hpp index 2c1a3add75..76cc40d214 100644 --- a/src/axom/mint/fem/shape_functions/Lagrange.hpp +++ b/src/axom/mint/fem/shape_functions/Lagrange.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/shape_functions/ShapeFunction.hpp b/src/axom/mint/fem/shape_functions/ShapeFunction.hpp index 191f9944e6..0ec92232d2 100644 --- a/src/axom/mint/fem/shape_functions/ShapeFunction.hpp +++ b/src/axom/mint/fem/shape_functions/ShapeFunction.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/shape_functions/lagrange/lagrange_hexa_27.hpp b/src/axom/mint/fem/shape_functions/lagrange/lagrange_hexa_27.hpp index aa5bfa9e88..361508f48d 100644 --- a/src/axom/mint/fem/shape_functions/lagrange/lagrange_hexa_27.hpp +++ b/src/axom/mint/fem/shape_functions/lagrange/lagrange_hexa_27.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/shape_functions/lagrange/lagrange_hexa_8.hpp b/src/axom/mint/fem/shape_functions/lagrange/lagrange_hexa_8.hpp index 18a86cbc7c..94a2c796d0 100644 --- a/src/axom/mint/fem/shape_functions/lagrange/lagrange_hexa_8.hpp +++ b/src/axom/mint/fem/shape_functions/lagrange/lagrange_hexa_8.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/shape_functions/lagrange/lagrange_prism_6.hpp b/src/axom/mint/fem/shape_functions/lagrange/lagrange_prism_6.hpp index 0f132fdcdd..a093f4ce74 100644 --- a/src/axom/mint/fem/shape_functions/lagrange/lagrange_prism_6.hpp +++ b/src/axom/mint/fem/shape_functions/lagrange/lagrange_prism_6.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/shape_functions/lagrange/lagrange_pyra_5.hpp b/src/axom/mint/fem/shape_functions/lagrange/lagrange_pyra_5.hpp index b6669f714f..9f86ebe440 100644 --- a/src/axom/mint/fem/shape_functions/lagrange/lagrange_pyra_5.hpp +++ b/src/axom/mint/fem/shape_functions/lagrange/lagrange_pyra_5.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/shape_functions/lagrange/lagrange_quad_4.hpp b/src/axom/mint/fem/shape_functions/lagrange/lagrange_quad_4.hpp index a78969bb1a..f84852ef7b 100644 --- a/src/axom/mint/fem/shape_functions/lagrange/lagrange_quad_4.hpp +++ b/src/axom/mint/fem/shape_functions/lagrange/lagrange_quad_4.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/shape_functions/lagrange/lagrange_quad_9.hpp b/src/axom/mint/fem/shape_functions/lagrange/lagrange_quad_9.hpp index e68114fec3..4845e90662 100644 --- a/src/axom/mint/fem/shape_functions/lagrange/lagrange_quad_9.hpp +++ b/src/axom/mint/fem/shape_functions/lagrange/lagrange_quad_9.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/shape_functions/lagrange/lagrange_tetra_4.hpp b/src/axom/mint/fem/shape_functions/lagrange/lagrange_tetra_4.hpp index 9a9e1daa7e..144f31604e 100644 --- a/src/axom/mint/fem/shape_functions/lagrange/lagrange_tetra_4.hpp +++ b/src/axom/mint/fem/shape_functions/lagrange/lagrange_tetra_4.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/fem/shape_functions/lagrange/lagrange_tri_3.hpp b/src/axom/mint/fem/shape_functions/lagrange/lagrange_tri_3.hpp index 4ee2a81232..7271900e9d 100644 --- a/src/axom/mint/fem/shape_functions/lagrange/lagrange_tri_3.hpp +++ b/src/axom/mint/fem/shape_functions/lagrange/lagrange_tri_3.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/CellTypes.hpp b/src/axom/mint/mesh/CellTypes.hpp index 5d27eeadf8..fe3dae6ef2 100644 --- a/src/axom/mint/mesh/CellTypes.hpp +++ b/src/axom/mint/mesh/CellTypes.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/ConnectivityArray.hpp b/src/axom/mint/mesh/ConnectivityArray.hpp index 2375bfc2f7..3bdab0944d 100644 --- a/src/axom/mint/mesh/ConnectivityArray.hpp +++ b/src/axom/mint/mesh/ConnectivityArray.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/CurvilinearMesh.cpp b/src/axom/mint/mesh/CurvilinearMesh.cpp index 5231b5ffaa..c8f3493f15 100644 --- a/src/axom/mint/mesh/CurvilinearMesh.cpp +++ b/src/axom/mint/mesh/CurvilinearMesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/CurvilinearMesh.hpp b/src/axom/mint/mesh/CurvilinearMesh.hpp index 623edcb4db..95483be9e7 100644 --- a/src/axom/mint/mesh/CurvilinearMesh.hpp +++ b/src/axom/mint/mesh/CurvilinearMesh.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/Field.hpp b/src/axom/mint/mesh/Field.hpp index 6e76904620..09f293ee13 100644 --- a/src/axom/mint/mesh/Field.hpp +++ b/src/axom/mint/mesh/Field.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/FieldAssociation.hpp b/src/axom/mint/mesh/FieldAssociation.hpp index 716718b336..ef509c75a4 100644 --- a/src/axom/mint/mesh/FieldAssociation.hpp +++ b/src/axom/mint/mesh/FieldAssociation.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/FieldData.cpp b/src/axom/mint/mesh/FieldData.cpp index 279acbd6ae..2d14113a92 100644 --- a/src/axom/mint/mesh/FieldData.cpp +++ b/src/axom/mint/mesh/FieldData.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/FieldData.hpp b/src/axom/mint/mesh/FieldData.hpp index d2cdb5fae4..56cd29a8e2 100644 --- a/src/axom/mint/mesh/FieldData.hpp +++ b/src/axom/mint/mesh/FieldData.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/FieldTypes.hpp b/src/axom/mint/mesh/FieldTypes.hpp index 8bb38f5dc8..31941dbbc2 100644 --- a/src/axom/mint/mesh/FieldTypes.hpp +++ b/src/axom/mint/mesh/FieldTypes.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/FieldVariable.hpp b/src/axom/mint/mesh/FieldVariable.hpp index 038e1b0534..da13f638d4 100644 --- a/src/axom/mint/mesh/FieldVariable.hpp +++ b/src/axom/mint/mesh/FieldVariable.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/Mesh.cpp b/src/axom/mint/mesh/Mesh.cpp index 997d82bebf..fc54c38395 100644 --- a/src/axom/mint/mesh/Mesh.cpp +++ b/src/axom/mint/mesh/Mesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/Mesh.hpp b/src/axom/mint/mesh/Mesh.hpp index 48ec43f3cf..f77e5e2279 100644 --- a/src/axom/mint/mesh/Mesh.hpp +++ b/src/axom/mint/mesh/Mesh.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/MeshCoordinates.cpp b/src/axom/mint/mesh/MeshCoordinates.cpp index 322947a7f6..0de27c710b 100644 --- a/src/axom/mint/mesh/MeshCoordinates.cpp +++ b/src/axom/mint/mesh/MeshCoordinates.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/MeshCoordinates.hpp b/src/axom/mint/mesh/MeshCoordinates.hpp index f61922ccb2..409dadcdb0 100644 --- a/src/axom/mint/mesh/MeshCoordinates.hpp +++ b/src/axom/mint/mesh/MeshCoordinates.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/MeshTypes.hpp b/src/axom/mint/mesh/MeshTypes.hpp index 7d6d2f9912..760cd9ca22 100644 --- a/src/axom/mint/mesh/MeshTypes.hpp +++ b/src/axom/mint/mesh/MeshTypes.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/ParticleMesh.cpp b/src/axom/mint/mesh/ParticleMesh.cpp index 14d310cb4f..926880651c 100644 --- a/src/axom/mint/mesh/ParticleMesh.cpp +++ b/src/axom/mint/mesh/ParticleMesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/ParticleMesh.hpp b/src/axom/mint/mesh/ParticleMesh.hpp index f490e69fa8..9a5eb97f2d 100644 --- a/src/axom/mint/mesh/ParticleMesh.hpp +++ b/src/axom/mint/mesh/ParticleMesh.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/RectilinearMesh.cpp b/src/axom/mint/mesh/RectilinearMesh.cpp index c3b5379149..c0ebe9c85b 100644 --- a/src/axom/mint/mesh/RectilinearMesh.cpp +++ b/src/axom/mint/mesh/RectilinearMesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/RectilinearMesh.hpp b/src/axom/mint/mesh/RectilinearMesh.hpp index 8b4425edcf..355b54cfa8 100644 --- a/src/axom/mint/mesh/RectilinearMesh.hpp +++ b/src/axom/mint/mesh/RectilinearMesh.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/StructuredMesh.cpp b/src/axom/mint/mesh/StructuredMesh.cpp index 3cf5821420..067028b821 100644 --- a/src/axom/mint/mesh/StructuredMesh.cpp +++ b/src/axom/mint/mesh/StructuredMesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/StructuredMesh.hpp b/src/axom/mint/mesh/StructuredMesh.hpp index 3e7e987ed6..13e3eaef47 100644 --- a/src/axom/mint/mesh/StructuredMesh.hpp +++ b/src/axom/mint/mesh/StructuredMesh.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/UniformMesh.cpp b/src/axom/mint/mesh/UniformMesh.cpp index c9efa1a322..56243abf0a 100644 --- a/src/axom/mint/mesh/UniformMesh.cpp +++ b/src/axom/mint/mesh/UniformMesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/UniformMesh.hpp b/src/axom/mint/mesh/UniformMesh.hpp index 056eb6b8b0..c756c06397 100644 --- a/src/axom/mint/mesh/UniformMesh.hpp +++ b/src/axom/mint/mesh/UniformMesh.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/UnstructuredMesh.hpp b/src/axom/mint/mesh/UnstructuredMesh.hpp index 4878109ad7..4b17361588 100644 --- a/src/axom/mint/mesh/UnstructuredMesh.hpp +++ b/src/axom/mint/mesh/UnstructuredMesh.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/blueprint.cpp b/src/axom/mint/mesh/blueprint.cpp index 5eae830be3..19865c7312 100644 --- a/src/axom/mint/mesh/blueprint.cpp +++ b/src/axom/mint/mesh/blueprint.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/blueprint.hpp b/src/axom/mint/mesh/blueprint.hpp index a4302b13d7..9745b3e0aa 100644 --- a/src/axom/mint/mesh/blueprint.hpp +++ b/src/axom/mint/mesh/blueprint.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/internal/ConnectivityArrayHelpers.hpp b/src/axom/mint/mesh/internal/ConnectivityArrayHelpers.hpp index e42dc05113..cfbe757be2 100644 --- a/src/axom/mint/mesh/internal/ConnectivityArrayHelpers.hpp +++ b/src/axom/mint/mesh/internal/ConnectivityArrayHelpers.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/internal/ConnectivityArray_typed_indirection.hpp b/src/axom/mint/mesh/internal/ConnectivityArray_typed_indirection.hpp index 14fbf93f89..ffab4a83de 100644 --- a/src/axom/mint/mesh/internal/ConnectivityArray_typed_indirection.hpp +++ b/src/axom/mint/mesh/internal/ConnectivityArray_typed_indirection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/internal/MeshHelpers.cpp b/src/axom/mint/mesh/internal/MeshHelpers.cpp index a2147b8467..2541f64bc5 100644 --- a/src/axom/mint/mesh/internal/MeshHelpers.cpp +++ b/src/axom/mint/mesh/internal/MeshHelpers.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/mesh/internal/MeshHelpers.hpp b/src/axom/mint/mesh/internal/MeshHelpers.hpp index c8097bc265..e1f4143944 100644 --- a/src/axom/mint/mesh/internal/MeshHelpers.hpp +++ b/src/axom/mint/mesh/internal/MeshHelpers.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/CMakeLists.txt b/src/axom/mint/tests/CMakeLists.txt index 2096506ec2..225db01769 100644 --- a/src/axom/mint/tests/CMakeLists.txt +++ b/src/axom/mint/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/StructuredMesh_helpers.hpp b/src/axom/mint/tests/StructuredMesh_helpers.hpp index 66f0c6fcc2..9049d6049c 100644 --- a/src/axom/mint/tests/StructuredMesh_helpers.hpp +++ b/src/axom/mint/tests/StructuredMesh_helpers.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_deprecated_mcarray.cpp b/src/axom/mint/tests/mint_deprecated_mcarray.cpp index f934d8683f..17b777d6ce 100644 --- a/src/axom/mint/tests/mint_deprecated_mcarray.cpp +++ b/src/axom/mint/tests/mint_deprecated_mcarray.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_execution_cell_traversals.cpp b/src/axom/mint/tests/mint_execution_cell_traversals.cpp index 838fc60a27..205e4c2446 100644 --- a/src/axom/mint/tests/mint_execution_cell_traversals.cpp +++ b/src/axom/mint/tests/mint_execution_cell_traversals.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_execution_face_traversals.cpp b/src/axom/mint/tests/mint_execution_face_traversals.cpp index a57c156d55..6fc4368309 100644 --- a/src/axom/mint/tests/mint_execution_face_traversals.cpp +++ b/src/axom/mint/tests/mint_execution_face_traversals.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_execution_node_traversals.cpp b/src/axom/mint/tests/mint_execution_node_traversals.cpp index 2964b3cd39..b1ac708536 100644 --- a/src/axom/mint/tests/mint_execution_node_traversals.cpp +++ b/src/axom/mint/tests/mint_execution_node_traversals.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_execution_xargs.cpp b/src/axom/mint/tests/mint_execution_xargs.cpp index 69f4012880..3889783de5 100644 --- a/src/axom/mint/tests/mint_execution_xargs.cpp +++ b/src/axom/mint/tests/mint_execution_xargs.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_fem_shape_functions.cpp b/src/axom/mint/tests/mint_fem_shape_functions.cpp index 17781c45a5..ab1ea065b3 100644 --- a/src/axom/mint/tests/mint_fem_shape_functions.cpp +++ b/src/axom/mint/tests/mint_fem_shape_functions.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_fem_single_fe.cpp b/src/axom/mint/tests/mint_fem_single_fe.cpp index 675390e943..a95854f2a9 100644 --- a/src/axom/mint/tests/mint_fem_single_fe.cpp +++ b/src/axom/mint/tests/mint_fem_single_fe.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh.cpp b/src/axom/mint/tests/mint_mesh.cpp index 59d654e53d..cc707aed21 100644 --- a/src/axom/mint/tests/mint_mesh.cpp +++ b/src/axom/mint/tests/mint_mesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_blueprint.cpp b/src/axom/mint/tests/mint_mesh_blueprint.cpp index c85f0082ed..5914bcd37b 100644 --- a/src/axom/mint/tests/mint_mesh_blueprint.cpp +++ b/src/axom/mint/tests/mint_mesh_blueprint.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_cell_types.cpp b/src/axom/mint/tests/mint_mesh_cell_types.cpp index bf321aa093..0a48cc841a 100644 --- a/src/axom/mint/tests/mint_mesh_cell_types.cpp +++ b/src/axom/mint/tests/mint_mesh_cell_types.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_connectivity_array.cpp b/src/axom/mint/tests/mint_mesh_connectivity_array.cpp index f2ec0faa31..19fddb174e 100644 --- a/src/axom/mint/tests/mint_mesh_connectivity_array.cpp +++ b/src/axom/mint/tests/mint_mesh_connectivity_array.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_coordinates.cpp b/src/axom/mint/tests/mint_mesh_coordinates.cpp index f8c31a2681..f29855ef8e 100644 --- a/src/axom/mint/tests/mint_mesh_coordinates.cpp +++ b/src/axom/mint/tests/mint_mesh_coordinates.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_curvilinear_mesh.cpp b/src/axom/mint/tests/mint_mesh_curvilinear_mesh.cpp index f6d67c71da..778de2e43b 100644 --- a/src/axom/mint/tests/mint_mesh_curvilinear_mesh.cpp +++ b/src/axom/mint/tests/mint_mesh_curvilinear_mesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_face_relation.cpp b/src/axom/mint/tests/mint_mesh_face_relation.cpp index 0268ae140f..e0699912ce 100644 --- a/src/axom/mint/tests/mint_mesh_face_relation.cpp +++ b/src/axom/mint/tests/mint_mesh_face_relation.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_field.cpp b/src/axom/mint/tests/mint_mesh_field.cpp index 2ae643cdef..6191a0a201 100644 --- a/src/axom/mint/tests/mint_mesh_field.cpp +++ b/src/axom/mint/tests/mint_mesh_field.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_field_data.cpp b/src/axom/mint/tests/mint_mesh_field_data.cpp index f1c58b288e..c2c83f76bc 100644 --- a/src/axom/mint/tests/mint_mesh_field_data.cpp +++ b/src/axom/mint/tests/mint_mesh_field_data.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_field_types.cpp b/src/axom/mint/tests/mint_mesh_field_types.cpp index a7c4c9ee5d..bc8f24102d 100644 --- a/src/axom/mint/tests/mint_mesh_field_types.cpp +++ b/src/axom/mint/tests/mint_mesh_field_types.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_field_variable.cpp b/src/axom/mint/tests/mint_mesh_field_variable.cpp index 0cbe334309..82f10b9fe8 100644 --- a/src/axom/mint/tests/mint_mesh_field_variable.cpp +++ b/src/axom/mint/tests/mint_mesh_field_variable.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_particle_mesh.cpp b/src/axom/mint/tests/mint_mesh_particle_mesh.cpp index d05df2d830..2e6a28d84c 100644 --- a/src/axom/mint/tests/mint_mesh_particle_mesh.cpp +++ b/src/axom/mint/tests/mint_mesh_particle_mesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_rectilinear_mesh.cpp b/src/axom/mint/tests/mint_mesh_rectilinear_mesh.cpp index ef0550f004..93bc43526a 100644 --- a/src/axom/mint/tests/mint_mesh_rectilinear_mesh.cpp +++ b/src/axom/mint/tests/mint_mesh_rectilinear_mesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_uniform_mesh.cpp b/src/axom/mint/tests/mint_mesh_uniform_mesh.cpp index 9aa86f9f52..cf03455adb 100644 --- a/src/axom/mint/tests/mint_mesh_uniform_mesh.cpp +++ b/src/axom/mint/tests/mint_mesh_uniform_mesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_mesh_unstructured_mesh.cpp b/src/axom/mint/tests/mint_mesh_unstructured_mesh.cpp index aba6dcabab..bdd1c301f3 100644 --- a/src/axom/mint/tests/mint_mesh_unstructured_mesh.cpp +++ b/src/axom/mint/tests/mint_mesh_unstructured_mesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_su2_io.cpp b/src/axom/mint/tests/mint_su2_io.cpp index 8b5c069877..48ac165f7e 100644 --- a/src/axom/mint/tests/mint_su2_io.cpp +++ b/src/axom/mint/tests/mint_su2_io.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_test_utilities.hpp b/src/axom/mint/tests/mint_test_utilities.hpp index 2ad9d3deb4..5ce51b259b 100644 --- a/src/axom/mint/tests/mint_test_utilities.hpp +++ b/src/axom/mint/tests/mint_test_utilities.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/tests/mint_util_write_vtk.cpp b/src/axom/mint/tests/mint_util_write_vtk.cpp index 31ac39a8b5..648ac3934a 100644 --- a/src/axom/mint/tests/mint_util_write_vtk.cpp +++ b/src/axom/mint/tests/mint_util_write_vtk.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/utils/ExternalArray.hpp b/src/axom/mint/utils/ExternalArray.hpp index f6ce501f1f..ec8d0dca53 100644 --- a/src/axom/mint/utils/ExternalArray.hpp +++ b/src/axom/mint/utils/ExternalArray.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/utils/su2_utils.cpp b/src/axom/mint/utils/su2_utils.cpp index 1a50b1defc..4f458331ed 100644 --- a/src/axom/mint/utils/su2_utils.cpp +++ b/src/axom/mint/utils/su2_utils.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/utils/su2_utils.hpp b/src/axom/mint/utils/su2_utils.hpp index 8e8f8c957c..a53fa09a0e 100644 --- a/src/axom/mint/utils/su2_utils.hpp +++ b/src/axom/mint/utils/su2_utils.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/utils/vtk_utils.cpp b/src/axom/mint/utils/vtk_utils.cpp index 0193c2ed15..4469226ebd 100644 --- a/src/axom/mint/utils/vtk_utils.cpp +++ b/src/axom/mint/utils/vtk_utils.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/mint/utils/vtk_utils.hpp b/src/axom/mint/utils/vtk_utils.hpp index 442f0d7264..7440fea3b1 100644 --- a/src/axom/mint/utils/vtk_utils.hpp +++ b/src/axom/mint/utils/vtk_utils.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/multimat/CMakeLists.txt b/src/axom/multimat/CMakeLists.txt index f439c67434..a26d66073a 100644 --- a/src/axom/multimat/CMakeLists.txt +++ b/src/axom/multimat/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/multimat/docs/sphinx/index.rst b/src/axom/multimat/docs/sphinx/index.rst index 167588a3d1..f063aa4d56 100644 --- a/src/axom/multimat/docs/sphinx/index.rst +++ b/src/axom/multimat/docs/sphinx/index.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/multimat/examples/CMakeLists.txt b/src/axom/multimat/examples/CMakeLists.txt index 74642c0a81..0f3eef4f07 100644 --- a/src/axom/multimat/examples/CMakeLists.txt +++ b/src/axom/multimat/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/multimat/examples/calculate.cpp b/src/axom/multimat/examples/calculate.cpp index a53eda814e..59904946fd 100644 --- a/src/axom/multimat/examples/calculate.cpp +++ b/src/axom/multimat/examples/calculate.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/multimat/examples/calculate_gpu.cpp b/src/axom/multimat/examples/calculate_gpu.cpp index 7dc6ed7327..0d309a08ee 100644 --- a/src/axom/multimat/examples/calculate_gpu.cpp +++ b/src/axom/multimat/examples/calculate_gpu.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/multimat/examples/helper.hpp b/src/axom/multimat/examples/helper.hpp index 73340dcd26..a95e54f3a8 100644 --- a/src/axom/multimat/examples/helper.hpp +++ b/src/axom/multimat/examples/helper.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/multimat/examples/traversal.cpp b/src/axom/multimat/examples/traversal.cpp index 18831a0861..6e8704660f 100644 --- a/src/axom/multimat/examples/traversal.cpp +++ b/src/axom/multimat/examples/traversal.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/multimat/mmfield.hpp b/src/axom/multimat/mmfield.hpp index be992ea13c..fa164a167f 100644 --- a/src/axom/multimat/mmfield.hpp +++ b/src/axom/multimat/mmfield.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/multimat/mmsubfield.hpp b/src/axom/multimat/mmsubfield.hpp index e7c89a2e74..4ee6f15978 100644 --- a/src/axom/multimat/mmsubfield.hpp +++ b/src/axom/multimat/mmsubfield.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/multimat/multimat.cpp b/src/axom/multimat/multimat.cpp index c3d03f4c4b..7ffdccf3a5 100644 --- a/src/axom/multimat/multimat.cpp +++ b/src/axom/multimat/multimat.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/multimat/multimat.hpp b/src/axom/multimat/multimat.hpp index cae4763a24..1e2a1bdc07 100644 --- a/src/axom/multimat/multimat.hpp +++ b/src/axom/multimat/multimat.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/multimat/tests/CMakeLists.txt b/src/axom/multimat/tests/CMakeLists.txt index 91fd4e307d..735f3576ac 100644 --- a/src/axom/multimat/tests/CMakeLists.txt +++ b/src/axom/multimat/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/multimat/tests/multimat_test.cpp b/src/axom/multimat/tests/multimat_test.cpp index 33a416e7bf..2019088f04 100644 --- a/src/axom/multimat/tests/multimat_test.cpp +++ b/src/axom/multimat/tests/multimat_test.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/CMakeLists.txt b/src/axom/primal/CMakeLists.txt index 2e9053554a..a16b1d0236 100644 --- a/src/axom/primal/CMakeLists.txt +++ b/src/axom/primal/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/constants.hpp b/src/axom/primal/constants.hpp index 73d2c9053d..02d176badb 100644 --- a/src/axom/primal/constants.hpp +++ b/src/axom/primal/constants.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/examples/CMakeLists.txt b/src/axom/primal/examples/CMakeLists.txt index 37d8c5de3a..97ec32ffeb 100644 --- a/src/axom/primal/examples/CMakeLists.txt +++ b/src/axom/primal/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/examples/hex_tet_volume.cpp b/src/axom/primal/examples/hex_tet_volume.cpp index f063aa1f7e..a2a166de00 100644 --- a/src/axom/primal/examples/hex_tet_volume.cpp +++ b/src/axom/primal/examples/hex_tet_volume.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/examples/primal_introduction.cpp b/src/axom/primal/examples/primal_introduction.cpp index 3e509a9098..1c74c543aa 100644 --- a/src/axom/primal/examples/primal_introduction.cpp +++ b/src/axom/primal/examples/primal_introduction.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/BezierCurve.hpp b/src/axom/primal/geometry/BezierCurve.hpp index 813a609e59..1da4960715 100644 --- a/src/axom/primal/geometry/BezierCurve.hpp +++ b/src/axom/primal/geometry/BezierCurve.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/BezierPatch.hpp b/src/axom/primal/geometry/BezierPatch.hpp index 0c95d4b971..54fae15c09 100644 --- a/src/axom/primal/geometry/BezierPatch.hpp +++ b/src/axom/primal/geometry/BezierPatch.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/BoundingBox.hpp b/src/axom/primal/geometry/BoundingBox.hpp index ff7fcf9b91..0d739c4dfb 100644 --- a/src/axom/primal/geometry/BoundingBox.hpp +++ b/src/axom/primal/geometry/BoundingBox.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/CurvedPolygon.hpp b/src/axom/primal/geometry/CurvedPolygon.hpp index 04d27d2880..e794e53bfd 100644 --- a/src/axom/primal/geometry/CurvedPolygon.hpp +++ b/src/axom/primal/geometry/CurvedPolygon.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Hexahedron.hpp b/src/axom/primal/geometry/Hexahedron.hpp index 8067576766..c16a55886b 100644 --- a/src/axom/primal/geometry/Hexahedron.hpp +++ b/src/axom/primal/geometry/Hexahedron.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/NumericArray.hpp b/src/axom/primal/geometry/NumericArray.hpp index f6de8153c1..3e40fdb0e4 100644 --- a/src/axom/primal/geometry/NumericArray.hpp +++ b/src/axom/primal/geometry/NumericArray.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Octahedron.hpp b/src/axom/primal/geometry/Octahedron.hpp index 29426ab65a..9916314724 100644 --- a/src/axom/primal/geometry/Octahedron.hpp +++ b/src/axom/primal/geometry/Octahedron.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/OrientationResult.hpp b/src/axom/primal/geometry/OrientationResult.hpp index c8734b49e3..f1a0a43029 100644 --- a/src/axom/primal/geometry/OrientationResult.hpp +++ b/src/axom/primal/geometry/OrientationResult.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/OrientedBoundingBox.hpp b/src/axom/primal/geometry/OrientedBoundingBox.hpp index f5d4a8694d..d45e1a0a48 100644 --- a/src/axom/primal/geometry/OrientedBoundingBox.hpp +++ b/src/axom/primal/geometry/OrientedBoundingBox.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Plane.hpp b/src/axom/primal/geometry/Plane.hpp index 755487bedf..15b556a872 100644 --- a/src/axom/primal/geometry/Plane.hpp +++ b/src/axom/primal/geometry/Plane.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Point.hpp b/src/axom/primal/geometry/Point.hpp index a50256a9a1..6c33efec5b 100644 --- a/src/axom/primal/geometry/Point.hpp +++ b/src/axom/primal/geometry/Point.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Polygon.hpp b/src/axom/primal/geometry/Polygon.hpp index 6e9357f232..b97d173aa2 100644 --- a/src/axom/primal/geometry/Polygon.hpp +++ b/src/axom/primal/geometry/Polygon.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp index bb9eb2cd4b..7fb6643971 100644 --- a/src/axom/primal/geometry/Polyhedron.hpp +++ b/src/axom/primal/geometry/Polyhedron.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Quadrilateral.hpp b/src/axom/primal/geometry/Quadrilateral.hpp index b3ca9ba7b1..0463e9f90a 100644 --- a/src/axom/primal/geometry/Quadrilateral.hpp +++ b/src/axom/primal/geometry/Quadrilateral.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Ray.hpp b/src/axom/primal/geometry/Ray.hpp index fe9669faa2..558d7cc504 100644 --- a/src/axom/primal/geometry/Ray.hpp +++ b/src/axom/primal/geometry/Ray.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Segment.hpp b/src/axom/primal/geometry/Segment.hpp index b603a13922..9c787a2889 100644 --- a/src/axom/primal/geometry/Segment.hpp +++ b/src/axom/primal/geometry/Segment.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Sphere.hpp b/src/axom/primal/geometry/Sphere.hpp index bcdbef2c4f..db8d14ed9c 100644 --- a/src/axom/primal/geometry/Sphere.hpp +++ b/src/axom/primal/geometry/Sphere.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Tetrahedron.hpp b/src/axom/primal/geometry/Tetrahedron.hpp index 9ca7911a14..2069e32f2f 100644 --- a/src/axom/primal/geometry/Tetrahedron.hpp +++ b/src/axom/primal/geometry/Tetrahedron.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Triangle.hpp b/src/axom/primal/geometry/Triangle.hpp index 2905f07bd0..010999efb2 100644 --- a/src/axom/primal/geometry/Triangle.hpp +++ b/src/axom/primal/geometry/Triangle.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/geometry/Vector.hpp b/src/axom/primal/geometry/Vector.hpp index 4fbc158e0f..2f1afc8362 100644 --- a/src/axom/primal/geometry/Vector.hpp +++ b/src/axom/primal/geometry/Vector.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/clip.hpp b/src/axom/primal/operators/clip.hpp index 370781d2e4..3585015afc 100644 --- a/src/axom/primal/operators/clip.hpp +++ b/src/axom/primal/operators/clip.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/closest_point.hpp b/src/axom/primal/operators/closest_point.hpp index 71a8542bd2..df9b55c28a 100644 --- a/src/axom/primal/operators/closest_point.hpp +++ b/src/axom/primal/operators/closest_point.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/compute_bounding_box.hpp b/src/axom/primal/operators/compute_bounding_box.hpp index 9e834cfb94..edbf1ee3de 100644 --- a/src/axom/primal/operators/compute_bounding_box.hpp +++ b/src/axom/primal/operators/compute_bounding_box.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/compute_moments.hpp b/src/axom/primal/operators/compute_moments.hpp index 18590661c7..cb8eb3e18c 100644 --- a/src/axom/primal/operators/compute_moments.hpp +++ b/src/axom/primal/operators/compute_moments.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index 5da8f57a39..fadc142609 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/detail/compute_moments_impl.hpp b/src/axom/primal/operators/detail/compute_moments_impl.hpp index 34e407f028..b22add439b 100644 --- a/src/axom/primal/operators/detail/compute_moments_impl.hpp +++ b/src/axom/primal/operators/detail/compute_moments_impl.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/detail/evaluate_integral_impl.hpp b/src/axom/primal/operators/detail/evaluate_integral_impl.hpp index ca422944ec..cc5f170966 100644 --- a/src/axom/primal/operators/detail/evaluate_integral_impl.hpp +++ b/src/axom/primal/operators/detail/evaluate_integral_impl.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/detail/fuzzy_comparators.hpp b/src/axom/primal/operators/detail/fuzzy_comparators.hpp index c893df8f50..d68d4629ce 100644 --- a/src/axom/primal/operators/detail/fuzzy_comparators.hpp +++ b/src/axom/primal/operators/detail/fuzzy_comparators.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/detail/intersect_bezier_impl.hpp b/src/axom/primal/operators/detail/intersect_bezier_impl.hpp index d36755fd57..a87750c077 100644 --- a/src/axom/primal/operators/detail/intersect_bezier_impl.hpp +++ b/src/axom/primal/operators/detail/intersect_bezier_impl.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/detail/intersect_bounding_box_impl.hpp b/src/axom/primal/operators/detail/intersect_bounding_box_impl.hpp index 7c49f15e10..b785bd76f9 100644 --- a/src/axom/primal/operators/detail/intersect_bounding_box_impl.hpp +++ b/src/axom/primal/operators/detail/intersect_bounding_box_impl.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/detail/intersect_impl.hpp b/src/axom/primal/operators/detail/intersect_impl.hpp index 29b7af8878..6978657eba 100644 --- a/src/axom/primal/operators/detail/intersect_impl.hpp +++ b/src/axom/primal/operators/detail/intersect_impl.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/detail/intersect_ray_impl.hpp b/src/axom/primal/operators/detail/intersect_ray_impl.hpp index d037af50ea..25c744a976 100644 --- a/src/axom/primal/operators/detail/intersect_ray_impl.hpp +++ b/src/axom/primal/operators/detail/intersect_ray_impl.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/detail/winding_number_impl.hpp b/src/axom/primal/operators/detail/winding_number_impl.hpp index 97cb6b222d..2f3d652359 100644 --- a/src/axom/primal/operators/detail/winding_number_impl.hpp +++ b/src/axom/primal/operators/detail/winding_number_impl.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/evaluate_integral.hpp b/src/axom/primal/operators/evaluate_integral.hpp index 7ac25a055f..8f65547f91 100644 --- a/src/axom/primal/operators/evaluate_integral.hpp +++ b/src/axom/primal/operators/evaluate_integral.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/in_curved_polygon.hpp b/src/axom/primal/operators/in_curved_polygon.hpp index bcac735b3a..bb1a8ae54e 100644 --- a/src/axom/primal/operators/in_curved_polygon.hpp +++ b/src/axom/primal/operators/in_curved_polygon.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/in_polygon.hpp b/src/axom/primal/operators/in_polygon.hpp index db118d7567..f29205bdf3 100644 --- a/src/axom/primal/operators/in_polygon.hpp +++ b/src/axom/primal/operators/in_polygon.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/in_polyhedron.hpp b/src/axom/primal/operators/in_polyhedron.hpp index 8a32e40e95..9a729120c1 100644 --- a/src/axom/primal/operators/in_polyhedron.hpp +++ b/src/axom/primal/operators/in_polyhedron.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/in_sphere.hpp b/src/axom/primal/operators/in_sphere.hpp index ba3a1204f5..e9aaf0e7bc 100644 --- a/src/axom/primal/operators/in_sphere.hpp +++ b/src/axom/primal/operators/in_sphere.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/intersect.hpp b/src/axom/primal/operators/intersect.hpp index 24d16801a3..c766327af6 100644 --- a/src/axom/primal/operators/intersect.hpp +++ b/src/axom/primal/operators/intersect.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/intersection_volume.hpp b/src/axom/primal/operators/intersection_volume.hpp index 8fd2194ffd..1774e63c63 100644 --- a/src/axom/primal/operators/intersection_volume.hpp +++ b/src/axom/primal/operators/intersection_volume.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/is_convex.hpp b/src/axom/primal/operators/is_convex.hpp index c84313e18a..06d2087487 100644 --- a/src/axom/primal/operators/is_convex.hpp +++ b/src/axom/primal/operators/is_convex.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/orientation.hpp b/src/axom/primal/operators/orientation.hpp index d7668e9764..51f5a9cab4 100644 --- a/src/axom/primal/operators/orientation.hpp +++ b/src/axom/primal/operators/orientation.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/split.hpp b/src/axom/primal/operators/split.hpp index 85b6e351c9..0fea650b4f 100644 --- a/src/axom/primal/operators/split.hpp +++ b/src/axom/primal/operators/split.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/squared_distance.hpp b/src/axom/primal/operators/squared_distance.hpp index 73f9e0c9f0..1ff3f1839a 100644 --- a/src/axom/primal/operators/squared_distance.hpp +++ b/src/axom/primal/operators/squared_distance.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/operators/winding_number.hpp b/src/axom/primal/operators/winding_number.hpp index 4f12880c1a..8773a66c93 100644 --- a/src/axom/primal/operators/winding_number.hpp +++ b/src/axom/primal/operators/winding_number.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/CMakeLists.txt b/src/axom/primal/tests/CMakeLists.txt index f00de2ff48..bf5d2aaa20 100644 --- a/src/axom/primal/tests/CMakeLists.txt +++ b/src/axom/primal/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_bezier_curve.cpp b/src/axom/primal/tests/primal_bezier_curve.cpp index d6a3a707b0..00f4d350d5 100644 --- a/src/axom/primal/tests/primal_bezier_curve.cpp +++ b/src/axom/primal/tests/primal_bezier_curve.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_bezier_intersect.cpp b/src/axom/primal/tests/primal_bezier_intersect.cpp index d4a615e09d..044e59bead 100644 --- a/src/axom/primal/tests/primal_bezier_intersect.cpp +++ b/src/axom/primal/tests/primal_bezier_intersect.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_bezier_patch.cpp b/src/axom/primal/tests/primal_bezier_patch.cpp index 43b11c02ce..d5b092ea81 100644 --- a/src/axom/primal/tests/primal_bezier_patch.cpp +++ b/src/axom/primal/tests/primal_bezier_patch.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_bounding_box_intersect.cpp b/src/axom/primal/tests/primal_bounding_box_intersect.cpp index fbf3241962..9e8781b844 100644 --- a/src/axom/primal/tests/primal_bounding_box_intersect.cpp +++ b/src/axom/primal/tests/primal_bounding_box_intersect.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_boundingbox.cpp b/src/axom/primal/tests/primal_boundingbox.cpp index 4f654d8d25..6c8f1ad8ec 100644 --- a/src/axom/primal/tests/primal_boundingbox.cpp +++ b/src/axom/primal/tests/primal_boundingbox.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_clip.cpp b/src/axom/primal/tests/primal_clip.cpp index ed9ca65612..c3bfe21757 100644 --- a/src/axom/primal/tests/primal_clip.cpp +++ b/src/axom/primal/tests/primal_clip.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_closest_point.cpp b/src/axom/primal/tests/primal_closest_point.cpp index 69b2db3dd0..770af91f29 100644 --- a/src/axom/primal/tests/primal_closest_point.cpp +++ b/src/axom/primal/tests/primal_closest_point.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_compute_bounding_box.cpp b/src/axom/primal/tests/primal_compute_bounding_box.cpp index 51ba7e7766..1f4ab4bc7c 100644 --- a/src/axom/primal/tests/primal_compute_bounding_box.cpp +++ b/src/axom/primal/tests/primal_compute_bounding_box.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_compute_moments.cpp b/src/axom/primal/tests/primal_compute_moments.cpp index 8d9ee8cd12..bf60bf5c1c 100644 --- a/src/axom/primal/tests/primal_compute_moments.cpp +++ b/src/axom/primal/tests/primal_compute_moments.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_curved_polygon.cpp b/src/axom/primal/tests/primal_curved_polygon.cpp index ce2ffce77b..2a52a4b7be 100644 --- a/src/axom/primal/tests/primal_curved_polygon.cpp +++ b/src/axom/primal/tests/primal_curved_polygon.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_hexahedron.cpp b/src/axom/primal/tests/primal_hexahedron.cpp index 62cefe69c0..2543cc93aa 100644 --- a/src/axom/primal/tests/primal_hexahedron.cpp +++ b/src/axom/primal/tests/primal_hexahedron.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_in_sphere.cpp b/src/axom/primal/tests/primal_in_sphere.cpp index 3f0cc54f88..5d294f3bf2 100644 --- a/src/axom/primal/tests/primal_in_sphere.cpp +++ b/src/axom/primal/tests/primal_in_sphere.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_integral.cpp b/src/axom/primal/tests/primal_integral.cpp index a4fd2d940b..9960a1c07a 100644 --- a/src/axom/primal/tests/primal_integral.cpp +++ b/src/axom/primal/tests/primal_integral.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_intersect.cpp b/src/axom/primal/tests/primal_intersect.cpp index 2f8e38418c..e98035d12d 100644 --- a/src/axom/primal/tests/primal_intersect.cpp +++ b/src/axom/primal/tests/primal_intersect.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_intersect_impl.cpp b/src/axom/primal/tests/primal_intersect_impl.cpp index cb40045699..59d742a8b3 100644 --- a/src/axom/primal/tests/primal_intersect_impl.cpp +++ b/src/axom/primal/tests/primal_intersect_impl.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_numeric_array.cpp b/src/axom/primal/tests/primal_numeric_array.cpp index f7d9f1df32..ba27011679 100644 --- a/src/axom/primal/tests/primal_numeric_array.cpp +++ b/src/axom/primal/tests/primal_numeric_array.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_octahedron.cpp b/src/axom/primal/tests/primal_octahedron.cpp index c53581eee4..c836e19686 100644 --- a/src/axom/primal/tests/primal_octahedron.cpp +++ b/src/axom/primal/tests/primal_octahedron.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_orientation.cpp b/src/axom/primal/tests/primal_orientation.cpp index 412460e85d..442f865c9a 100644 --- a/src/axom/primal/tests/primal_orientation.cpp +++ b/src/axom/primal/tests/primal_orientation.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_orientedboundingbox.cpp b/src/axom/primal/tests/primal_orientedboundingbox.cpp index 7b9bd6d942..01f57dfe14 100644 --- a/src/axom/primal/tests/primal_orientedboundingbox.cpp +++ b/src/axom/primal/tests/primal_orientedboundingbox.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_plane.cpp b/src/axom/primal/tests/primal_plane.cpp index cca73086a2..3e3487a413 100644 --- a/src/axom/primal/tests/primal_plane.cpp +++ b/src/axom/primal/tests/primal_plane.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_point.cpp b/src/axom/primal/tests/primal_point.cpp index b3187440bd..debe7368e8 100644 --- a/src/axom/primal/tests/primal_point.cpp +++ b/src/axom/primal/tests/primal_point.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_polygon.cpp b/src/axom/primal/tests/primal_polygon.cpp index e77162858c..8d2384be6f 100644 --- a/src/axom/primal/tests/primal_polygon.cpp +++ b/src/axom/primal/tests/primal_polygon.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_polyhedron.cpp b/src/axom/primal/tests/primal_polyhedron.cpp index 1a11a9f8c3..2aadb91c68 100644 --- a/src/axom/primal/tests/primal_polyhedron.cpp +++ b/src/axom/primal/tests/primal_polyhedron.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_quadrilateral.cpp b/src/axom/primal/tests/primal_quadrilateral.cpp index 65bd889c99..3836f339af 100644 --- a/src/axom/primal/tests/primal_quadrilateral.cpp +++ b/src/axom/primal/tests/primal_quadrilateral.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_rational_bezier.cpp b/src/axom/primal/tests/primal_rational_bezier.cpp index 83abfc018c..a7d14d973b 100644 --- a/src/axom/primal/tests/primal_rational_bezier.cpp +++ b/src/axom/primal/tests/primal_rational_bezier.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_ray_intersect.cpp b/src/axom/primal/tests/primal_ray_intersect.cpp index 975000bd47..c63ea2d2ed 100644 --- a/src/axom/primal/tests/primal_ray_intersect.cpp +++ b/src/axom/primal/tests/primal_ray_intersect.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_segment.cpp b/src/axom/primal/tests/primal_segment.cpp index d343a8ced6..3bc0297c0d 100644 --- a/src/axom/primal/tests/primal_segment.cpp +++ b/src/axom/primal/tests/primal_segment.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_solid_angle.cpp b/src/axom/primal/tests/primal_solid_angle.cpp index 607b961f37..ab16a6bb7f 100644 --- a/src/axom/primal/tests/primal_solid_angle.cpp +++ b/src/axom/primal/tests/primal_solid_angle.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_sphere.cpp b/src/axom/primal/tests/primal_sphere.cpp index 333be776f2..453053a4ae 100644 --- a/src/axom/primal/tests/primal_sphere.cpp +++ b/src/axom/primal/tests/primal_sphere.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_split.cpp b/src/axom/primal/tests/primal_split.cpp index ad958253d6..ab76148be8 100644 --- a/src/axom/primal/tests/primal_split.cpp +++ b/src/axom/primal/tests/primal_split.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_squared_distance.cpp b/src/axom/primal/tests/primal_squared_distance.cpp index aead022de2..d780694a49 100644 --- a/src/axom/primal/tests/primal_squared_distance.cpp +++ b/src/axom/primal/tests/primal_squared_distance.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_tetrahedron.cpp b/src/axom/primal/tests/primal_tetrahedron.cpp index eab9dc789c..8a54c56eb3 100644 --- a/src/axom/primal/tests/primal_tetrahedron.cpp +++ b/src/axom/primal/tests/primal_tetrahedron.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_triangle.cpp b/src/axom/primal/tests/primal_triangle.cpp index 28c0ea4357..cc652ea694 100644 --- a/src/axom/primal/tests/primal_triangle.cpp +++ b/src/axom/primal/tests/primal_triangle.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_vector.cpp b/src/axom/primal/tests/primal_vector.cpp index 15299307c8..730ae168d3 100644 --- a/src/axom/primal/tests/primal_vector.cpp +++ b/src/axom/primal/tests/primal_vector.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_winding_number.cpp b/src/axom/primal/tests/primal_winding_number.cpp index 976a4c7fbb..488b85a15f 100644 --- a/src/axom/primal/tests/primal_winding_number.cpp +++ b/src/axom/primal/tests/primal_winding_number.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/tests/primal_zip.cpp b/src/axom/primal/tests/primal_zip.cpp index 3b8026c2a1..18ef0eeb2a 100644 --- a/src/axom/primal/tests/primal_zip.cpp +++ b/src/axom/primal/tests/primal_zip.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/utils/ZipBoundingBox.hpp b/src/axom/primal/utils/ZipBoundingBox.hpp index d097a0c1ca..62eac6f2e6 100644 --- a/src/axom/primal/utils/ZipBoundingBox.hpp +++ b/src/axom/primal/utils/ZipBoundingBox.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/utils/ZipIndexable.hpp b/src/axom/primal/utils/ZipIndexable.hpp index 6097513aea..834423988a 100644 --- a/src/axom/primal/utils/ZipIndexable.hpp +++ b/src/axom/primal/utils/ZipIndexable.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/utils/ZipPoint.hpp b/src/axom/primal/utils/ZipPoint.hpp index 67e9b0515c..6a7c44bdaf 100644 --- a/src/axom/primal/utils/ZipPoint.hpp +++ b/src/axom/primal/utils/ZipPoint.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/utils/ZipRay.hpp b/src/axom/primal/utils/ZipRay.hpp index e6b310da71..2f0d610379 100644 --- a/src/axom/primal/utils/ZipRay.hpp +++ b/src/axom/primal/utils/ZipRay.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/primal/utils/ZipVector.hpp b/src/axom/primal/utils/ZipVector.hpp index ed12956171..9d7c01da89 100644 --- a/src/axom/primal/utils/ZipVector.hpp +++ b/src/axom/primal/utils/ZipVector.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/AllNearestNeighbors.cpp b/src/axom/quest/AllNearestNeighbors.cpp index bc0be2416c..d53fdd7be2 100644 --- a/src/axom/quest/AllNearestNeighbors.cpp +++ b/src/axom/quest/AllNearestNeighbors.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/AllNearestNeighbors.hpp b/src/axom/quest/AllNearestNeighbors.hpp index cbcf486fc4..fa5d4c6684 100644 --- a/src/axom/quest/AllNearestNeighbors.hpp +++ b/src/axom/quest/AllNearestNeighbors.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index a43ec946d7..abdc4fd554 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/CMakeLists.txt b/src/axom/quest/CMakeLists.txt index 130b411e08..12ab11ec3f 100644 --- a/src/axom/quest/CMakeLists.txt +++ b/src/axom/quest/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/Delaunay.hpp b/src/axom/quest/Delaunay.hpp index 1d4d094ad8..a3fd97896a 100644 --- a/src/axom/quest/Delaunay.hpp +++ b/src/axom/quest/Delaunay.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/Discretize.cpp b/src/axom/quest/Discretize.cpp index b096341df8..065a6aec2f 100644 --- a/src/axom/quest/Discretize.cpp +++ b/src/axom/quest/Discretize.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/Discretize.hpp b/src/axom/quest/Discretize.hpp index da85f22a71..e97efafd4e 100644 --- a/src/axom/quest/Discretize.hpp +++ b/src/axom/quest/Discretize.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/DistributedClosestPoint.cpp b/src/axom/quest/DistributedClosestPoint.cpp index 7429aa286d..7517200541 100644 --- a/src/axom/quest/DistributedClosestPoint.cpp +++ b/src/axom/quest/DistributedClosestPoint.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/DistributedClosestPoint.hpp b/src/axom/quest/DistributedClosestPoint.hpp index 35b4009a01..ab9e256407 100644 --- a/src/axom/quest/DistributedClosestPoint.hpp +++ b/src/axom/quest/DistributedClosestPoint.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/InOutOctree.hpp b/src/axom/quest/InOutOctree.hpp index 063cbf8456..4f52f1c9d2 100644 --- a/src/axom/quest/InOutOctree.hpp +++ b/src/axom/quest/InOutOctree.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/IntersectionShaper.hpp b/src/axom/quest/IntersectionShaper.hpp index a6d79d7838..c12802b5ec 100644 --- a/src/axom/quest/IntersectionShaper.hpp +++ b/src/axom/quest/IntersectionShaper.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index db8a0178ca..fc6a631022 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index cf600213cb..6b99a2e45d 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/MeshTester.cpp b/src/axom/quest/MeshTester.cpp index 64d6b3cfb1..6681091ada 100644 --- a/src/axom/quest/MeshTester.cpp +++ b/src/axom/quest/MeshTester.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/MeshTester.hpp b/src/axom/quest/MeshTester.hpp index 0edd878c32..c9c1f71e4d 100644 --- a/src/axom/quest/MeshTester.hpp +++ b/src/axom/quest/MeshTester.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index cb0eb3cd1c..51721aeafb 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/PointInCell.hpp b/src/axom/quest/PointInCell.hpp index 3ed6e79c4b..ee2f50d2ca 100644 --- a/src/axom/quest/PointInCell.hpp +++ b/src/axom/quest/PointInCell.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/SamplingShaper.hpp b/src/axom/quest/SamplingShaper.hpp index 13d602740c..5ccf0337ef 100644 --- a/src/axom/quest/SamplingShaper.hpp +++ b/src/axom/quest/SamplingShaper.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/ScatteredInterpolation.hpp b/src/axom/quest/ScatteredInterpolation.hpp index 1afb15a130..996b967a91 100644 --- a/src/axom/quest/ScatteredInterpolation.hpp +++ b/src/axom/quest/ScatteredInterpolation.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/Shaper.cpp b/src/axom/quest/Shaper.cpp index 443170c037..6c732aac70 100644 --- a/src/axom/quest/Shaper.cpp +++ b/src/axom/quest/Shaper.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/Shaper.hpp b/src/axom/quest/Shaper.hpp index 802a33e284..01942de782 100644 --- a/src/axom/quest/Shaper.hpp +++ b/src/axom/quest/Shaper.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/SignedDistance.cpp b/src/axom/quest/SignedDistance.cpp index 934381d5b5..500cd53102 100644 --- a/src/axom/quest/SignedDistance.cpp +++ b/src/axom/quest/SignedDistance.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/SignedDistance.hpp b/src/axom/quest/SignedDistance.hpp index dbc1b3868e..d6a5756837 100644 --- a/src/axom/quest/SignedDistance.hpp +++ b/src/axom/quest/SignedDistance.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/AllNearestNeighbors_detail.hpp b/src/axom/quest/detail/AllNearestNeighbors_detail.hpp index 82d45c56c7..089fe7014b 100644 --- a/src/axom/quest/detail/AllNearestNeighbors_detail.hpp +++ b/src/axom/quest/detail/AllNearestNeighbors_detail.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/Discretize_detail.hpp b/src/axom/quest/detail/Discretize_detail.hpp index 954e6e0b10..6dcd076a1b 100644 --- a/src/axom/quest/detail/Discretize_detail.hpp +++ b/src/axom/quest/detail/Discretize_detail.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/DistributedClosestPointImpl.hpp b/src/axom/quest/detail/DistributedClosestPointImpl.hpp index 554c86c2e2..0875eb889a 100644 --- a/src/axom/quest/detail/DistributedClosestPointImpl.hpp +++ b/src/axom/quest/detail/DistributedClosestPointImpl.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/MarchingCubesFullParallel.hpp b/src/axom/quest/detail/MarchingCubesFullParallel.hpp index 8e7e2e12e6..86def5600e 100644 --- a/src/axom/quest/detail/MarchingCubesFullParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesFullParallel.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/MarchingCubesHybridParallel.hpp b/src/axom/quest/detail/MarchingCubesHybridParallel.hpp index 8515c39c14..5a55b60f6a 100644 --- a/src/axom/quest/detail/MarchingCubesHybridParallel.hpp +++ b/src/axom/quest/detail/MarchingCubesHybridParallel.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/MeshTester_detail.hpp b/src/axom/quest/detail/MeshTester_detail.hpp index 483bf1bf97..2a453138ee 100644 --- a/src/axom/quest/detail/MeshTester_detail.hpp +++ b/src/axom/quest/detail/MeshTester_detail.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/PointFinder.hpp b/src/axom/quest/detail/PointFinder.hpp index 52d52b40d6..2c3a1c0612 100644 --- a/src/axom/quest/detail/PointFinder.hpp +++ b/src/axom/quest/detail/PointFinder.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/PointInCellMeshWrapper_mfem.hpp b/src/axom/quest/detail/PointInCellMeshWrapper_mfem.hpp index 1d1837cd3f..76e1e64395 100644 --- a/src/axom/quest/detail/PointInCellMeshWrapper_mfem.hpp +++ b/src/axom/quest/detail/PointInCellMeshWrapper_mfem.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/inout/BlockData.hpp b/src/axom/quest/detail/inout/BlockData.hpp index 2a6a125316..630b820f3d 100644 --- a/src/axom/quest/detail/inout/BlockData.hpp +++ b/src/axom/quest/detail/inout/BlockData.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/inout/InOutOctreeMeshDumper.hpp b/src/axom/quest/detail/inout/InOutOctreeMeshDumper.hpp index ff90877fae..6144530ccd 100644 --- a/src/axom/quest/detail/inout/InOutOctreeMeshDumper.hpp +++ b/src/axom/quest/detail/inout/InOutOctreeMeshDumper.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/inout/InOutOctreeStats.hpp b/src/axom/quest/detail/inout/InOutOctreeStats.hpp index 345088591f..75314004d1 100644 --- a/src/axom/quest/detail/inout/InOutOctreeStats.hpp +++ b/src/axom/quest/detail/inout/InOutOctreeStats.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/inout/InOutOctreeValidator.hpp b/src/axom/quest/detail/inout/InOutOctreeValidator.hpp index 5446190444..ac90e72b6f 100644 --- a/src/axom/quest/detail/inout/InOutOctreeValidator.hpp +++ b/src/axom/quest/detail/inout/InOutOctreeValidator.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/inout/MeshWrapper.hpp b/src/axom/quest/detail/inout/MeshWrapper.hpp index f9b6cc492a..1f72ab339d 100644 --- a/src/axom/quest/detail/inout/MeshWrapper.hpp +++ b/src/axom/quest/detail/inout/MeshWrapper.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/marching_cubes_lookup.hpp b/src/axom/quest/detail/marching_cubes_lookup.hpp index 05c3bb2c72..feb1d36195 100644 --- a/src/axom/quest/detail/marching_cubes_lookup.hpp +++ b/src/axom/quest/detail/marching_cubes_lookup.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/shaping/shaping_helpers.cpp b/src/axom/quest/detail/shaping/shaping_helpers.cpp index 6c9ac6d4ee..0cac0b8958 100644 --- a/src/axom/quest/detail/shaping/shaping_helpers.cpp +++ b/src/axom/quest/detail/shaping/shaping_helpers.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/detail/shaping/shaping_helpers.hpp b/src/axom/quest/detail/shaping/shaping_helpers.hpp index 34392546f2..4e223e3ab4 100644 --- a/src/axom/quest/detail/shaping/shaping_helpers.hpp +++ b/src/axom/quest/detail/shaping/shaping_helpers.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/docs/sphinx/all_nearest_neighbors.rst b/src/axom/quest/docs/sphinx/all_nearest_neighbors.rst index fb5b26488f..bb9d7f7e45 100644 --- a/src/axom/quest/docs/sphinx/all_nearest_neighbors.rst +++ b/src/axom/quest/docs/sphinx/all_nearest_neighbors.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/docs/sphinx/check_and_repair.rst b/src/axom/quest/docs/sphinx/check_and_repair.rst index af331ab133..f4d138baac 100644 --- a/src/axom/quest/docs/sphinx/check_and_repair.rst +++ b/src/axom/quest/docs/sphinx/check_and_repair.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/docs/sphinx/index.rst b/src/axom/quest/docs/sphinx/index.rst index fd9a8d91c8..5509de1893 100644 --- a/src/axom/quest/docs/sphinx/index.rst +++ b/src/axom/quest/docs/sphinx/index.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/docs/sphinx/isosurface_detection.rst b/src/axom/quest/docs/sphinx/isosurface_detection.rst index 1a7ba6c151..77e494f16b 100644 --- a/src/axom/quest/docs/sphinx/isosurface_detection.rst +++ b/src/axom/quest/docs/sphinx/isosurface_detection.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/docs/sphinx/point_in_cell.rst b/src/axom/quest/docs/sphinx/point_in_cell.rst index 1be3919a5b..5f24f70dba 100644 --- a/src/axom/quest/docs/sphinx/point_in_cell.rst +++ b/src/axom/quest/docs/sphinx/point_in_cell.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/docs/sphinx/point_mesh_query.rst b/src/axom/quest/docs/sphinx/point_mesh_query.rst index 29b6887a44..042c10906a 100644 --- a/src/axom/quest/docs/sphinx/point_mesh_query.rst +++ b/src/axom/quest/docs/sphinx/point_mesh_query.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/docs/sphinx/point_mesh_query_cpp.rst b/src/axom/quest/docs/sphinx/point_mesh_query_cpp.rst index dbbedf83d8..e5096a2488 100644 --- a/src/axom/quest/docs/sphinx/point_mesh_query_cpp.rst +++ b/src/axom/quest/docs/sphinx/point_mesh_query_cpp.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/docs/sphinx/read_mesh.rst b/src/axom/quest/docs/sphinx/read_mesh.rst index ef04217035..ed68be9a80 100644 --- a/src/axom/quest/docs/sphinx/read_mesh.rst +++ b/src/axom/quest/docs/sphinx/read_mesh.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index d518f59084..3f73f30a5c 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/containment_driver.cpp b/src/axom/quest/examples/containment_driver.cpp index 6924cae0b3..a53dac5657 100644 --- a/src/axom/quest/examples/containment_driver.cpp +++ b/src/axom/quest/examples/containment_driver.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/delaunay_triangulation.cpp b/src/axom/quest/examples/delaunay_triangulation.cpp index 46e36b6010..d1327258ef 100644 --- a/src/axom/quest/examples/delaunay_triangulation.cpp +++ b/src/axom/quest/examples/delaunay_triangulation.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/point_in_cell_benchmark.cpp b/src/axom/quest/examples/point_in_cell_benchmark.cpp index e667e8983d..4384a9f6cb 100644 --- a/src/axom/quest/examples/point_in_cell_benchmark.cpp +++ b/src/axom/quest/examples/point_in_cell_benchmark.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/quest_bvh_two_pass.cpp b/src/axom/quest/examples/quest_bvh_two_pass.cpp index e94e1c9597..2efae9d5f1 100644 --- a/src/axom/quest/examples/quest_bvh_two_pass.cpp +++ b/src/axom/quest/examples/quest_bvh_two_pass.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index 43f6d232fd..f5dc753d8d 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/quest_inout_interface.F b/src/axom/quest/examples/quest_inout_interface.F index 18d4c30ab0..ac646a0ccd 100644 --- a/src/axom/quest/examples/quest_inout_interface.F +++ b/src/axom/quest/examples/quest_inout_interface.F @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/quest_inout_interface.cpp b/src/axom/quest/examples/quest_inout_interface.cpp index aac2ab49a5..5aaf1d9594 100644 --- a/src/axom/quest/examples/quest_inout_interface.cpp +++ b/src/axom/quest/examples/quest_inout_interface.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 90517f296d..7d65ded69f 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/quest_signed_distance_interface.F b/src/axom/quest/examples/quest_signed_distance_interface.F index efaf226f4e..6d17397dad 100644 --- a/src/axom/quest/examples/quest_signed_distance_interface.F +++ b/src/axom/quest/examples/quest_signed_distance_interface.F @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/quest_signed_distance_interface.cpp b/src/axom/quest/examples/quest_signed_distance_interface.cpp index 28354b6420..ffd99a7535 100644 --- a/src/axom/quest/examples/quest_signed_distance_interface.cpp +++ b/src/axom/quest/examples/quest_signed_distance_interface.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/scattered_interpolation.cpp b/src/axom/quest/examples/scattered_interpolation.cpp index 42616e915f..3029456fd4 100644 --- a/src/axom/quest/examples/scattered_interpolation.cpp +++ b/src/axom/quest/examples/scattered_interpolation.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/shaping_driver.cpp b/src/axom/quest/examples/shaping_driver.cpp index 0ccbf4a35d..396dcecaaa 100644 --- a/src/axom/quest/examples/shaping_driver.cpp +++ b/src/axom/quest/examples/shaping_driver.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/CMakeLists.txt b/src/axom/quest/interface/CMakeLists.txt index b32e050b4b..7d609c0e56 100644 --- a/src/axom/quest/interface/CMakeLists.txt +++ b/src/axom/quest/interface/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/c_fortran/typesQUEST.h b/src/axom/quest/interface/c_fortran/typesQUEST.h index aaf2baddc6..5ed643de49 100644 --- a/src/axom/quest/interface/c_fortran/typesQUEST.h +++ b/src/axom/quest/interface/c_fortran/typesQUEST.h @@ -1,7 +1,7 @@ // typesQUEST.h // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/c_fortran/wrapQUEST.cpp b/src/axom/quest/interface/c_fortran/wrapQUEST.cpp index 023b8329bd..040caa8294 100644 --- a/src/axom/quest/interface/c_fortran/wrapQUEST.cpp +++ b/src/axom/quest/interface/c_fortran/wrapQUEST.cpp @@ -1,7 +1,7 @@ // wrapQUEST.cpp // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/c_fortran/wrapQUEST.h b/src/axom/quest/interface/c_fortran/wrapQUEST.h index 54491c36d5..88b2919aa2 100644 --- a/src/axom/quest/interface/c_fortran/wrapQUEST.h +++ b/src/axom/quest/interface/c_fortran/wrapQUEST.h @@ -1,7 +1,7 @@ // wrapQUEST.h // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/c_fortran/wrapfquest.F b/src/axom/quest/interface/c_fortran/wrapfquest.F index 1b1174f1c8..f5cf00e2a8 100644 --- a/src/axom/quest/interface/c_fortran/wrapfquest.F +++ b/src/axom/quest/interface/c_fortran/wrapfquest.F @@ -1,7 +1,7 @@ ! wrapfquest.F ! This file is generated by Shroud 0.12.2. Do not edit. ! -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/inout.cpp b/src/axom/quest/interface/inout.cpp index df743ae69b..a6062c268f 100644 --- a/src/axom/quest/interface/inout.cpp +++ b/src/axom/quest/interface/inout.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/inout.hpp b/src/axom/quest/interface/inout.hpp index 6246853208..63381a4c00 100644 --- a/src/axom/quest/interface/inout.hpp +++ b/src/axom/quest/interface/inout.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/internal/QuestHelpers.cpp b/src/axom/quest/interface/internal/QuestHelpers.cpp index 6d5efbfc67..33b8317bd3 100644 --- a/src/axom/quest/interface/internal/QuestHelpers.cpp +++ b/src/axom/quest/interface/internal/QuestHelpers.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/internal/QuestHelpers.hpp b/src/axom/quest/interface/internal/QuestHelpers.hpp index 67262afa9b..73455f4ab9 100644 --- a/src/axom/quest/interface/internal/QuestHelpers.hpp +++ b/src/axom/quest/interface/internal/QuestHelpers.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/internal/mpicomm_wrapper.hpp b/src/axom/quest/interface/internal/mpicomm_wrapper.hpp index 90a5310e67..e54573b664 100644 --- a/src/axom/quest/interface/internal/mpicomm_wrapper.hpp +++ b/src/axom/quest/interface/internal/mpicomm_wrapper.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/python/pyQUESThelper.cpp b/src/axom/quest/interface/python/pyQUESThelper.cpp index ce8738dd7d..064e6673e6 100644 --- a/src/axom/quest/interface/python/pyQUESThelper.cpp +++ b/src/axom/quest/interface/python/pyQUESThelper.cpp @@ -1,7 +1,7 @@ // pyQUESThelper.cpp // This is generated code, do not edit // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/python/pyQUESTmodule.cpp b/src/axom/quest/interface/python/pyQUESTmodule.cpp index 04abc13e45..1d10085cca 100644 --- a/src/axom/quest/interface/python/pyQUESTmodule.cpp +++ b/src/axom/quest/interface/python/pyQUESTmodule.cpp @@ -1,7 +1,7 @@ // pyQUESTmodule.cpp // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/python/pyQUESTmodule.hpp b/src/axom/quest/interface/python/pyQUESTmodule.hpp index c3344b42a9..7c2e82152a 100644 --- a/src/axom/quest/interface/python/pyQUESTmodule.hpp +++ b/src/axom/quest/interface/python/pyQUESTmodule.hpp @@ -1,7 +1,7 @@ // pyQUESTmodule.hpp // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/python/pyQUESTutil.cpp b/src/axom/quest/interface/python/pyQUESTutil.cpp index 62bec38448..8b72087c64 100644 --- a/src/axom/quest/interface/python/pyQUESTutil.cpp +++ b/src/axom/quest/interface/python/pyQUESTutil.cpp @@ -1,7 +1,7 @@ // pyQUESTutil.cpp // This is generated code, do not edit // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/python/quest_test.py.in b/src/axom/quest/interface/python/quest_test.py.in index 98968fcb97..f37d8291f5 100644 --- a/src/axom/quest/interface/python/quest_test.py.in +++ b/src/axom/quest/interface/python/quest_test.py.in @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/python/setup.py.in b/src/axom/quest/interface/python/setup.py.in index d8505c6004..a79ecace2e 100644 --- a/src/axom/quest/interface/python/setup.py.in +++ b/src/axom/quest/interface/python/setup.py.in @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/quest_shroud.yaml b/src/axom/quest/interface/quest_shroud.yaml index d20091a48b..5a3820d344 100644 --- a/src/axom/quest/interface/quest_shroud.yaml +++ b/src/axom/quest/interface/quest_shroud.yaml @@ -4,7 +4,7 @@ # copyright: - - - Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and + - Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and - other Axom Project Developers. See the top-level LICENSE file for details. - - "SPDX-License-Identifier: (BSD-3-Clause)" diff --git a/src/axom/quest/interface/signed_distance.cpp b/src/axom/quest/interface/signed_distance.cpp index 7a455233fe..4101c52eb0 100644 --- a/src/axom/quest/interface/signed_distance.cpp +++ b/src/axom/quest/interface/signed_distance.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/signed_distance.hpp b/src/axom/quest/interface/signed_distance.hpp index b0fd5cb99f..03916f2121 100644 --- a/src/axom/quest/interface/signed_distance.hpp +++ b/src/axom/quest/interface/signed_distance.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/interface/yaml/quest_types.yaml b/src/axom/quest/interface/yaml/quest_types.yaml index a3ee3065e6..45f8279e2a 100644 --- a/src/axom/quest/interface/yaml/quest_types.yaml +++ b/src/axom/quest/interface/yaml/quest_types.yaml @@ -1,7 +1,7 @@ # quest_types.yaml # This file is generated by Shroud 0.12.2. Do not edit. # -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/readers/C2CReader.cpp b/src/axom/quest/readers/C2CReader.cpp index 18646fd1aa..f4a898016e 100644 --- a/src/axom/quest/readers/C2CReader.cpp +++ b/src/axom/quest/readers/C2CReader.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/readers/C2CReader.hpp b/src/axom/quest/readers/C2CReader.hpp index fcb2401a58..9f934b21e0 100644 --- a/src/axom/quest/readers/C2CReader.hpp +++ b/src/axom/quest/readers/C2CReader.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/readers/PC2CReader.cpp b/src/axom/quest/readers/PC2CReader.cpp index 1ffa6d584a..5035f4fe78 100644 --- a/src/axom/quest/readers/PC2CReader.cpp +++ b/src/axom/quest/readers/PC2CReader.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/readers/PC2CReader.hpp b/src/axom/quest/readers/PC2CReader.hpp index d45b91fca0..4168ca49a6 100644 --- a/src/axom/quest/readers/PC2CReader.hpp +++ b/src/axom/quest/readers/PC2CReader.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/readers/PProEReader.cpp b/src/axom/quest/readers/PProEReader.cpp index 1133a306ab..05fcd9ea5d 100644 --- a/src/axom/quest/readers/PProEReader.cpp +++ b/src/axom/quest/readers/PProEReader.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/readers/PProEReader.hpp b/src/axom/quest/readers/PProEReader.hpp index 60c51ad317..5d3560d3d8 100644 --- a/src/axom/quest/readers/PProEReader.hpp +++ b/src/axom/quest/readers/PProEReader.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/readers/PSTLReader.cpp b/src/axom/quest/readers/PSTLReader.cpp index 45c610d1b7..4e222c59e9 100644 --- a/src/axom/quest/readers/PSTLReader.cpp +++ b/src/axom/quest/readers/PSTLReader.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/readers/PSTLReader.hpp b/src/axom/quest/readers/PSTLReader.hpp index f851c9b8e2..73d803144c 100644 --- a/src/axom/quest/readers/PSTLReader.hpp +++ b/src/axom/quest/readers/PSTLReader.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/readers/ProEReader.cpp b/src/axom/quest/readers/ProEReader.cpp index f4a76cfc5d..190f47d297 100644 --- a/src/axom/quest/readers/ProEReader.cpp +++ b/src/axom/quest/readers/ProEReader.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/readers/ProEReader.hpp b/src/axom/quest/readers/ProEReader.hpp index 2eb97fabc2..d12743f59a 100644 --- a/src/axom/quest/readers/ProEReader.hpp +++ b/src/axom/quest/readers/ProEReader.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/readers/STLReader.cpp b/src/axom/quest/readers/STLReader.cpp index 1ff1efa835..8d5b001ec4 100644 --- a/src/axom/quest/readers/STLReader.cpp +++ b/src/axom/quest/readers/STLReader.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/readers/STLReader.hpp b/src/axom/quest/readers/STLReader.hpp index 189d3a4d8f..3727d1fa19 100644 --- a/src/axom/quest/readers/STLReader.hpp +++ b/src/axom/quest/readers/STLReader.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/CMakeLists.txt b/src/axom/quest/tests/CMakeLists.txt index 7e4dd93a0e..95042c29d5 100644 --- a/src/axom/quest/tests/CMakeLists.txt +++ b/src/axom/quest/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_all_nearest_neighbors.cpp b/src/axom/quest/tests/quest_all_nearest_neighbors.cpp index e32548e0f4..42bdb9d324 100644 --- a/src/axom/quest/tests/quest_all_nearest_neighbors.cpp +++ b/src/axom/quest/tests/quest_all_nearest_neighbors.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_array_indexer.cpp b/src/axom/quest/tests/quest_array_indexer.cpp index 01bc68fc1d..b207be4562 100644 --- a/src/axom/quest/tests/quest_array_indexer.cpp +++ b/src/axom/quest/tests/quest_array_indexer.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_c2c_reader.cpp b/src/axom/quest/tests/quest_c2c_reader.cpp index 40b1bd4fd5..236c3a5926 100644 --- a/src/axom/quest/tests/quest_c2c_reader.cpp +++ b/src/axom/quest/tests/quest_c2c_reader.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_discretize.cpp b/src/axom/quest/tests/quest_discretize.cpp index 02c0bbeb82..c4b6b10120 100644 --- a/src/axom/quest/tests/quest_discretize.cpp +++ b/src/axom/quest/tests/quest_discretize.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_initialize.cpp b/src/axom/quest/tests/quest_initialize.cpp index 9444d81e14..f8f2f6c67f 100644 --- a/src/axom/quest/tests/quest_initialize.cpp +++ b/src/axom/quest/tests/quest_initialize.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_inout_interface.cpp b/src/axom/quest/tests/quest_inout_interface.cpp index c98b4266d1..a2095f11b1 100644 --- a/src/axom/quest/tests/quest_inout_interface.cpp +++ b/src/axom/quest/tests/quest_inout_interface.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_inout_octree.cpp b/src/axom/quest/tests/quest_inout_octree.cpp index 5f31653caf..61a9f45a53 100644 --- a/src/axom/quest/tests/quest_inout_octree.cpp +++ b/src/axom/quest/tests/quest_inout_octree.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_inout_quadtree.cpp b/src/axom/quest/tests/quest_inout_quadtree.cpp index 63c3734045..d25b0338cc 100644 --- a/src/axom/quest/tests/quest_inout_quadtree.cpp +++ b/src/axom/quest/tests/quest_inout_quadtree.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_intersection_shaper.cpp b/src/axom/quest/tests/quest_intersection_shaper.cpp index cb49686824..10d7373331 100644 --- a/src/axom/quest/tests/quest_intersection_shaper.cpp +++ b/src/axom/quest/tests/quest_intersection_shaper.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_mesh_view_util.cpp b/src/axom/quest/tests/quest_mesh_view_util.cpp index 4d45311ee5..24c46d05c1 100644 --- a/src/axom/quest/tests/quest_mesh_view_util.cpp +++ b/src/axom/quest/tests/quest_mesh_view_util.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_meshtester.cpp b/src/axom/quest/tests/quest_meshtester.cpp index e9d00e8f01..d6ea3f7c2c 100644 --- a/src/axom/quest/tests/quest_meshtester.cpp +++ b/src/axom/quest/tests/quest_meshtester.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_point_in_cell_mfem.cpp b/src/axom/quest/tests/quest_point_in_cell_mfem.cpp index bd84c6720a..28946fb15d 100644 --- a/src/axom/quest/tests/quest_point_in_cell_mfem.cpp +++ b/src/axom/quest/tests/quest_point_in_cell_mfem.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_pro_e_reader.cpp b/src/axom/quest/tests/quest_pro_e_reader.cpp index 18f0b93b74..10ab54f82b 100644 --- a/src/axom/quest/tests/quest_pro_e_reader.cpp +++ b/src/axom/quest/tests/quest_pro_e_reader.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_pro_e_reader_parallel.cpp b/src/axom/quest/tests/quest_pro_e_reader_parallel.cpp index f3ad766275..84c169c4e9 100644 --- a/src/axom/quest/tests/quest_pro_e_reader_parallel.cpp +++ b/src/axom/quest/tests/quest_pro_e_reader_parallel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_regression.cpp b/src/axom/quest/tests/quest_regression.cpp index 021c0aa219..692025604b 100644 --- a/src/axom/quest/tests/quest_regression.cpp +++ b/src/axom/quest/tests/quest_regression.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_sampling_shaper.cpp b/src/axom/quest/tests/quest_sampling_shaper.cpp index c05edbb539..641b7144be 100644 --- a/src/axom/quest/tests/quest_sampling_shaper.cpp +++ b/src/axom/quest/tests/quest_sampling_shaper.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_signed_distance.cpp b/src/axom/quest/tests/quest_signed_distance.cpp index b3ee4d0da8..ec6d2b7e8a 100644 --- a/src/axom/quest/tests/quest_signed_distance.cpp +++ b/src/axom/quest/tests/quest_signed_distance.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_signed_distance_interface.cpp b/src/axom/quest/tests/quest_signed_distance_interface.cpp index dad7bbff1d..b94851a0c9 100644 --- a/src/axom/quest/tests/quest_signed_distance_interface.cpp +++ b/src/axom/quest/tests/quest_signed_distance_interface.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_stl_reader.cpp b/src/axom/quest/tests/quest_stl_reader.cpp index b362136c8d..071ad2805c 100644 --- a/src/axom/quest/tests/quest_stl_reader.cpp +++ b/src/axom/quest/tests/quest_stl_reader.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_test_utilities.hpp b/src/axom/quest/tests/quest_test_utilities.hpp index 164e2ea76f..2b248cc673 100644 --- a/src/axom/quest/tests/quest_test_utilities.hpp +++ b/src/axom/quest/tests/quest_test_utilities.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/tests/quest_vertex_weld.cpp b/src/axom/quest/tests/quest_vertex_weld.cpp index 6eefff874b..2907d56b78 100644 --- a/src/axom/quest/tests/quest_vertex_weld.cpp +++ b/src/axom/quest/tests/quest_vertex_weld.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/util/mesh_helpers.cpp b/src/axom/quest/util/mesh_helpers.cpp index 760ace7b66..0bdac364b8 100644 --- a/src/axom/quest/util/mesh_helpers.cpp +++ b/src/axom/quest/util/mesh_helpers.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/util/mesh_helpers.hpp b/src/axom/quest/util/mesh_helpers.hpp index 2c1ab579bf..9bafb4375b 100644 --- a/src/axom/quest/util/mesh_helpers.hpp +++ b/src/axom/quest/util/mesh_helpers.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/CMakeLists.txt b/src/axom/sidre/CMakeLists.txt index 2e4b945072..bddbaff2f4 100644 --- a/src/axom/sidre/CMakeLists.txt +++ b/src/axom/sidre/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/Array.hpp b/src/axom/sidre/core/Array.hpp index cc5ddf76cc..7a1877cdc3 100644 --- a/src/axom/sidre/core/Array.hpp +++ b/src/axom/sidre/core/Array.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/AttrValues.cpp b/src/axom/sidre/core/AttrValues.cpp index d785074b3d..8ddbef140b 100644 --- a/src/axom/sidre/core/AttrValues.cpp +++ b/src/axom/sidre/core/AttrValues.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/AttrValues.hpp b/src/axom/sidre/core/AttrValues.hpp index 1014c96b2e..02963a8b9c 100644 --- a/src/axom/sidre/core/AttrValues.hpp +++ b/src/axom/sidre/core/AttrValues.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/Attribute.cpp b/src/axom/sidre/core/Attribute.cpp index 7e9481f1b5..c91bbe4fc8 100644 --- a/src/axom/sidre/core/Attribute.cpp +++ b/src/axom/sidre/core/Attribute.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/Attribute.hpp b/src/axom/sidre/core/Attribute.hpp index 7a785ba71d..c3e1fe2c25 100644 --- a/src/axom/sidre/core/Attribute.hpp +++ b/src/axom/sidre/core/Attribute.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/Buffer.cpp b/src/axom/sidre/core/Buffer.cpp index b7a7ec3fac..c051d9e9e6 100644 --- a/src/axom/sidre/core/Buffer.cpp +++ b/src/axom/sidre/core/Buffer.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/Buffer.hpp b/src/axom/sidre/core/Buffer.hpp index 26bf1667c8..c02c4226fc 100644 --- a/src/axom/sidre/core/Buffer.hpp +++ b/src/axom/sidre/core/Buffer.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/DataStore.cpp b/src/axom/sidre/core/DataStore.cpp index ab87905f32..e772cd8b4e 100644 --- a/src/axom/sidre/core/DataStore.cpp +++ b/src/axom/sidre/core/DataStore.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/DataStore.hpp b/src/axom/sidre/core/DataStore.hpp index e4b6b673cc..2baf4179ad 100644 --- a/src/axom/sidre/core/DataStore.hpp +++ b/src/axom/sidre/core/DataStore.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/Group.cpp b/src/axom/sidre/core/Group.cpp index dff30c462c..ed5901c319 100644 --- a/src/axom/sidre/core/Group.cpp +++ b/src/axom/sidre/core/Group.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/Group.hpp b/src/axom/sidre/core/Group.hpp index 496e5a1722..1743675741 100644 --- a/src/axom/sidre/core/Group.hpp +++ b/src/axom/sidre/core/Group.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/IndexedCollection.hpp b/src/axom/sidre/core/IndexedCollection.hpp index c499f7e282..c15cd1c66b 100644 --- a/src/axom/sidre/core/IndexedCollection.hpp +++ b/src/axom/sidre/core/IndexedCollection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/ItemCollection.hpp b/src/axom/sidre/core/ItemCollection.hpp index b848931d07..be3eb3aa0a 100644 --- a/src/axom/sidre/core/ItemCollection.hpp +++ b/src/axom/sidre/core/ItemCollection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/ListCollection.hpp b/src/axom/sidre/core/ListCollection.hpp index 55bd4d0f7f..c4e5ca0825 100644 --- a/src/axom/sidre/core/ListCollection.hpp +++ b/src/axom/sidre/core/ListCollection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/MFEMSidreDataCollection.cpp b/src/axom/sidre/core/MFEMSidreDataCollection.cpp index 651cacb749..9fa110a6d3 100644 --- a/src/axom/sidre/core/MFEMSidreDataCollection.cpp +++ b/src/axom/sidre/core/MFEMSidreDataCollection.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/MFEMSidreDataCollection.hpp b/src/axom/sidre/core/MFEMSidreDataCollection.hpp index 8fd9707358..0af0338335 100644 --- a/src/axom/sidre/core/MFEMSidreDataCollection.hpp +++ b/src/axom/sidre/core/MFEMSidreDataCollection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/MapCollection.hpp b/src/axom/sidre/core/MapCollection.hpp index fe2c9c8b49..99c0545ffa 100644 --- a/src/axom/sidre/core/MapCollection.hpp +++ b/src/axom/sidre/core/MapCollection.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/SidreDataTypeIds.h b/src/axom/sidre/core/SidreDataTypeIds.h index dc574e0bb8..ef1f2902af 100644 --- a/src/axom/sidre/core/SidreDataTypeIds.h +++ b/src/axom/sidre/core/SidreDataTypeIds.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/SidreTypes.hpp b/src/axom/sidre/core/SidreTypes.hpp index 2ee7c4a8f1..2bfa3c3c60 100644 --- a/src/axom/sidre/core/SidreTypes.hpp +++ b/src/axom/sidre/core/SidreTypes.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/View.cpp b/src/axom/sidre/core/View.cpp index d70d50b8f5..18a8a05fed 100644 --- a/src/axom/sidre/core/View.cpp +++ b/src/axom/sidre/core/View.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/core/View.hpp b/src/axom/sidre/core/View.hpp index 43798c7814..7d9572b022 100644 --- a/src/axom/sidre/core/View.hpp +++ b/src/axom/sidre/core/View.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/attribute.rst b/src/axom/sidre/docs/sphinx/attribute.rst index 580af90e0e..0a0ef68c61 100644 --- a/src/axom/sidre/docs/sphinx/attribute.rst +++ b/src/axom/sidre/docs/sphinx/attribute.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/buffer.rst b/src/axom/sidre/docs/sphinx/buffer.rst index 8ab2fbd66f..a5ad3f3d14 100644 --- a/src/axom/sidre/docs/sphinx/buffer.rst +++ b/src/axom/sidre/docs/sphinx/buffer.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/core_concepts.rst b/src/axom/sidre/docs/sphinx/core_concepts.rst index a204ff29a7..cb823dd83a 100644 --- a/src/axom/sidre/docs/sphinx/core_concepts.rst +++ b/src/axom/sidre/docs/sphinx/core_concepts.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/data_vs_metadata.rst b/src/axom/sidre/docs/sphinx/data_vs_metadata.rst index 2c155dba21..1fd655f5e6 100644 --- a/src/axom/sidre/docs/sphinx/data_vs_metadata.rst +++ b/src/axom/sidre/docs/sphinx/data_vs_metadata.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/datastore.rst b/src/axom/sidre/docs/sphinx/datastore.rst index 939f3ef2f5..6cf5f8c06c 100644 --- a/src/axom/sidre/docs/sphinx/datastore.rst +++ b/src/axom/sidre/docs/sphinx/datastore.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/file_io.rst b/src/axom/sidre/docs/sphinx/file_io.rst index 0c1bbd8d7a..30e81d6c66 100644 --- a/src/axom/sidre/docs/sphinx/file_io.rst +++ b/src/axom/sidre/docs/sphinx/file_io.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/first_example.rst b/src/axom/sidre/docs/sphinx/first_example.rst index 5e4db6e948..612925c3da 100644 --- a/src/axom/sidre/docs/sphinx/first_example.rst +++ b/src/axom/sidre/docs/sphinx/first_example.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/group.rst b/src/axom/sidre/docs/sphinx/group.rst index c3a0531ac7..fceef14ea7 100644 --- a/src/axom/sidre/docs/sphinx/group.rst +++ b/src/axom/sidre/docs/sphinx/group.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/index.rst b/src/axom/sidre/docs/sphinx/index.rst index 1a2fb588b6..fa133c317b 100644 --- a/src/axom/sidre/docs/sphinx/index.rst +++ b/src/axom/sidre/docs/sphinx/index.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/mfem_sidre_datacollection.rst b/src/axom/sidre/docs/sphinx/mfem_sidre_datacollection.rst index c1bae2c974..c0ef94cb72 100644 --- a/src/axom/sidre/docs/sphinx/mfem_sidre_datacollection.rst +++ b/src/axom/sidre/docs/sphinx/mfem_sidre_datacollection.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/parallel_io_concepts.rst b/src/axom/sidre/docs/sphinx/parallel_io_concepts.rst index ac6083b681..7a03d6bc4d 100644 --- a/src/axom/sidre/docs/sphinx/parallel_io_concepts.rst +++ b/src/axom/sidre/docs/sphinx/parallel_io_concepts.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/query_data.rst b/src/axom/sidre/docs/sphinx/query_data.rst index a9b440247c..cd4e173b13 100644 --- a/src/axom/sidre/docs/sphinx/query_data.rst +++ b/src/axom/sidre/docs/sphinx/query_data.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/sidre_conduit.rst b/src/axom/sidre/docs/sphinx/sidre_conduit.rst index d1e0cd4eb0..f8cbd14fae 100644 --- a/src/axom/sidre/docs/sphinx/sidre_conduit.rst +++ b/src/axom/sidre/docs/sphinx/sidre_conduit.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/docs/sphinx/view.rst b/src/axom/sidre/docs/sphinx/view.rst index cb2fb660be..41d2ab7c1c 100644 --- a/src/axom/sidre/docs/sphinx/view.rst +++ b/src/axom/sidre/docs/sphinx/view.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/CMakeLists.txt b/src/axom/sidre/examples/CMakeLists.txt index 2e51d518e1..86f81d9145 100644 --- a/src/axom/sidre/examples/CMakeLists.txt +++ b/src/axom/sidre/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/lulesh2/CMakeLists.txt b/src/axom/sidre/examples/lulesh2/CMakeLists.txt index 9e7b87b8bc..ea93d531a7 100644 --- a/src/axom/sidre/examples/lulesh2/CMakeLists.txt +++ b/src/axom/sidre/examples/lulesh2/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/lulesh2/lulesh-comm.cc b/src/axom/sidre/examples/lulesh2/lulesh-comm.cc index ddb6fe41f3..22771af438 100644 --- a/src/axom/sidre/examples/lulesh2/lulesh-comm.cc +++ b/src/axom/sidre/examples/lulesh2/lulesh-comm.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/lulesh2/lulesh-init.cc b/src/axom/sidre/examples/lulesh2/lulesh-init.cc index 94963fc6bc..d7e9b14474 100644 --- a/src/axom/sidre/examples/lulesh2/lulesh-init.cc +++ b/src/axom/sidre/examples/lulesh2/lulesh-init.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/lulesh2/lulesh-util.cc b/src/axom/sidre/examples/lulesh2/lulesh-util.cc index 14e2c585ae..0e69586da0 100644 --- a/src/axom/sidre/examples/lulesh2/lulesh-util.cc +++ b/src/axom/sidre/examples/lulesh2/lulesh-util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/lulesh2/lulesh-viz.cc b/src/axom/sidre/examples/lulesh2/lulesh-viz.cc index 941ce7e768..bb56ddabc9 100644 --- a/src/axom/sidre/examples/lulesh2/lulesh-viz.cc +++ b/src/axom/sidre/examples/lulesh2/lulesh-viz.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/lulesh2/lulesh.h b/src/axom/sidre/examples/lulesh2/lulesh.h index 06d931f3b8..5ce947a0de 100644 --- a/src/axom/sidre/examples/lulesh2/lulesh.h +++ b/src/axom/sidre/examples/lulesh2/lulesh.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/lulesh2/lulesh_tuple.h b/src/axom/sidre/examples/lulesh2/lulesh_tuple.h index 5797ba52eb..5863996421 100644 --- a/src/axom/sidre/examples/lulesh2/lulesh_tuple.h +++ b/src/axom/sidre/examples/lulesh2/lulesh_tuple.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/sidre_array.cpp b/src/axom/sidre/examples/sidre_array.cpp index 5cdeeef3c6..85734e737b 100644 --- a/src/axom/sidre/examples/sidre_array.cpp +++ b/src/axom/sidre/examples/sidre_array.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/sidre_createdatastore.cpp b/src/axom/sidre/examples/sidre_createdatastore.cpp index f3e001d8db..1045c7edc0 100644 --- a/src/axom/sidre/examples/sidre_createdatastore.cpp +++ b/src/axom/sidre/examples/sidre_createdatastore.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/sidre_data_vs_metadata.cpp b/src/axom/sidre/examples/sidre_data_vs_metadata.cpp index 23f9a2ec48..8697f5f04a 100644 --- a/src/axom/sidre/examples/sidre_data_vs_metadata.cpp +++ b/src/axom/sidre/examples/sidre_data_vs_metadata.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/sidre_external_array.cpp b/src/axom/sidre/examples/sidre_external_array.cpp index e96ed149c3..68c570678b 100644 --- a/src/axom/sidre/examples/sidre_external_array.cpp +++ b/src/axom/sidre/examples/sidre_external_array.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/sidre_generateindex.cpp b/src/axom/sidre/examples/sidre_generateindex.cpp index ca2440d39b..1db2c5b881 100644 --- a/src/axom/sidre/examples/sidre_generateindex.cpp +++ b/src/axom/sidre/examples/sidre_generateindex.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/sidre_mfem_datacollection_materials.cpp b/src/axom/sidre/examples/sidre_mfem_datacollection_materials.cpp index 2d121fc04c..1d99e7560a 100644 --- a/src/axom/sidre/examples/sidre_mfem_datacollection_materials.cpp +++ b/src/axom/sidre/examples/sidre_mfem_datacollection_materials.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/sidre_mfem_datacollection_restart.cpp b/src/axom/sidre/examples/sidre_mfem_datacollection_restart.cpp index b43fa76669..f34f04c40c 100644 --- a/src/axom/sidre/examples/sidre_mfem_datacollection_restart.cpp +++ b/src/axom/sidre/examples/sidre_mfem_datacollection_restart.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/sidre_mfem_datacollection_vis.cpp b/src/axom/sidre/examples/sidre_mfem_datacollection_vis.cpp index cc063e7fc2..8302a697ea 100644 --- a/src/axom/sidre/examples/sidre_mfem_datacollection_vis.cpp +++ b/src/axom/sidre/examples/sidre_mfem_datacollection_vis.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/sidre_shocktube.cpp b/src/axom/sidre/examples/sidre_shocktube.cpp index 16df004982..5b22a96761 100644 --- a/src/axom/sidre/examples/sidre_shocktube.cpp +++ b/src/axom/sidre/examples/sidre_shocktube.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/sidre_shocktube_F.f b/src/axom/sidre/examples/sidre_shocktube_F.f index aa32949a7a..96e026eac6 100644 --- a/src/axom/sidre/examples/sidre_shocktube_F.f +++ b/src/axom/sidre/examples/sidre_shocktube_F.f @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/sidre_stressgroups.cpp b/src/axom/sidre/examples/sidre_stressgroups.cpp index 8a9b71449d..b56b791f47 100644 --- a/src/axom/sidre/examples/sidre_stressgroups.cpp +++ b/src/axom/sidre/examples/sidre_stressgroups.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/spio/CMakeLists.txt b/src/axom/sidre/examples/spio/CMakeLists.txt index 7283455107..d11dc5cc83 100644 --- a/src/axom/sidre/examples/spio/CMakeLists.txt +++ b/src/axom/sidre/examples/spio/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/spio/IORead.cpp b/src/axom/sidre/examples/spio/IORead.cpp index e104a15768..1653421034 100644 --- a/src/axom/sidre/examples/spio/IORead.cpp +++ b/src/axom/sidre/examples/spio/IORead.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/spio/IOWrite.cpp b/src/axom/sidre/examples/spio/IOWrite.cpp index eef2df00e4..0f0a9ea379 100644 --- a/src/axom/sidre/examples/spio/IOWrite.cpp +++ b/src/axom/sidre/examples/spio/IOWrite.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/spio/IO_SCR_Checkpoint.cpp b/src/axom/sidre/examples/spio/IO_SCR_Checkpoint.cpp index 0ef7698a55..ecf941b59b 100644 --- a/src/axom/sidre/examples/spio/IO_SCR_Checkpoint.cpp +++ b/src/axom/sidre/examples/spio/IO_SCR_Checkpoint.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level COPYRIGHT file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/examples/spio/spio_scr.hpp b/src/axom/sidre/examples/spio/spio_scr.hpp index c4f3947946..3b487369dd 100644 --- a/src/axom/sidre/examples/spio/spio_scr.hpp +++ b/src/axom/sidre/examples/spio/spio_scr.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/CMakeLists.txt b/src/axom/sidre/interface/CMakeLists.txt index 3a0cd57f06..d8045007ed 100644 --- a/src/axom/sidre/interface/CMakeLists.txt +++ b/src/axom/sidre/interface/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/SidreTypes.h b/src/axom/sidre/interface/SidreTypes.h index 6ff058bf50..4cfac80909 100644 --- a/src/axom/sidre/interface/SidreTypes.h +++ b/src/axom/sidre/interface/SidreTypes.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/csidresplicer.c b/src/axom/sidre/interface/c_fortran/csidresplicer.c index 267ceb560d..15f8d91606 100644 --- a/src/axom/sidre/interface/c_fortran/csidresplicer.c +++ b/src/axom/sidre/interface/c_fortran/csidresplicer.c @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/fsidresplicer.f b/src/axom/sidre/interface/c_fortran/fsidresplicer.f index bba997c978..c2eeabbab8 100644 --- a/src/axom/sidre/interface/c_fortran/fsidresplicer.f +++ b/src/axom/sidre/interface/c_fortran/fsidresplicer.f @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/genfsidresplicer.py b/src/axom/sidre/interface/c_fortran/genfsidresplicer.py index 918988eec4..6d0912652f 100644 --- a/src/axom/sidre/interface/c_fortran/genfsidresplicer.py +++ b/src/axom/sidre/interface/c_fortran/genfsidresplicer.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/typesSidre.h b/src/axom/sidre/interface/c_fortran/typesSidre.h index 3c59b7a458..e9b0fefbe9 100644 --- a/src/axom/sidre/interface/c_fortran/typesSidre.h +++ b/src/axom/sidre/interface/c_fortran/typesSidre.h @@ -1,7 +1,7 @@ // typesSidre.h // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/wrapBuffer.cpp b/src/axom/sidre/interface/c_fortran/wrapBuffer.cpp index 516b17d8ae..8618e8b30c 100644 --- a/src/axom/sidre/interface/c_fortran/wrapBuffer.cpp +++ b/src/axom/sidre/interface/c_fortran/wrapBuffer.cpp @@ -1,7 +1,7 @@ // wrapBuffer.cpp // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/wrapBuffer.h b/src/axom/sidre/interface/c_fortran/wrapBuffer.h index 796d2e32a5..0aff9585e6 100644 --- a/src/axom/sidre/interface/c_fortran/wrapBuffer.h +++ b/src/axom/sidre/interface/c_fortran/wrapBuffer.h @@ -1,7 +1,7 @@ // wrapBuffer.h // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/wrapDataStore.cpp b/src/axom/sidre/interface/c_fortran/wrapDataStore.cpp index 72790604e8..e59d22d320 100644 --- a/src/axom/sidre/interface/c_fortran/wrapDataStore.cpp +++ b/src/axom/sidre/interface/c_fortran/wrapDataStore.cpp @@ -1,7 +1,7 @@ // wrapDataStore.cpp // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/wrapDataStore.h b/src/axom/sidre/interface/c_fortran/wrapDataStore.h index 80249a1c14..9b933dbdcc 100644 --- a/src/axom/sidre/interface/c_fortran/wrapDataStore.h +++ b/src/axom/sidre/interface/c_fortran/wrapDataStore.h @@ -1,7 +1,7 @@ // wrapDataStore.h // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/wrapGroup.cpp b/src/axom/sidre/interface/c_fortran/wrapGroup.cpp index 9ff22adbe2..ce2d3ef8ee 100644 --- a/src/axom/sidre/interface/c_fortran/wrapGroup.cpp +++ b/src/axom/sidre/interface/c_fortran/wrapGroup.cpp @@ -1,7 +1,7 @@ // wrapGroup.cpp // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/wrapGroup.h b/src/axom/sidre/interface/c_fortran/wrapGroup.h index ed7d3e2f9a..f246e1a132 100644 --- a/src/axom/sidre/interface/c_fortran/wrapGroup.h +++ b/src/axom/sidre/interface/c_fortran/wrapGroup.h @@ -1,7 +1,7 @@ // wrapGroup.h // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/wrapSidre.cpp b/src/axom/sidre/interface/c_fortran/wrapSidre.cpp index 2d75a833eb..3bbedda102 100644 --- a/src/axom/sidre/interface/c_fortran/wrapSidre.cpp +++ b/src/axom/sidre/interface/c_fortran/wrapSidre.cpp @@ -1,7 +1,7 @@ // wrapSidre.cpp // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/wrapSidre.h b/src/axom/sidre/interface/c_fortran/wrapSidre.h index dae2af763a..062ee46ab0 100644 --- a/src/axom/sidre/interface/c_fortran/wrapSidre.h +++ b/src/axom/sidre/interface/c_fortran/wrapSidre.h @@ -1,7 +1,7 @@ // wrapSidre.h // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/wrapView.cpp b/src/axom/sidre/interface/c_fortran/wrapView.cpp index 96893b811e..86d6f368a2 100644 --- a/src/axom/sidre/interface/c_fortran/wrapView.cpp +++ b/src/axom/sidre/interface/c_fortran/wrapView.cpp @@ -1,7 +1,7 @@ // wrapView.cpp // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/wrapView.h b/src/axom/sidre/interface/c_fortran/wrapView.h index 877bc75ea8..30834d2b11 100644 --- a/src/axom/sidre/interface/c_fortran/wrapView.h +++ b/src/axom/sidre/interface/c_fortran/wrapView.h @@ -1,7 +1,7 @@ // wrapView.h // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/c_fortran/wrapfsidre.F b/src/axom/sidre/interface/c_fortran/wrapfsidre.F index 92867d6357..ea7b1aa2af 100644 --- a/src/axom/sidre/interface/c_fortran/wrapfsidre.F +++ b/src/axom/sidre/interface/c_fortran/wrapfsidre.F @@ -1,7 +1,7 @@ ! wrapfsidre.F ! This file is generated by Shroud 0.12.2. Do not edit. ! -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/sidre.h b/src/axom/sidre/interface/sidre.h index 287285cbb6..a63ed079fa 100644 --- a/src/axom/sidre/interface/sidre.h +++ b/src/axom/sidre/interface/sidre.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/interface/sidre_shroud.yaml b/src/axom/sidre/interface/sidre_shroud.yaml index 7c0271a7e6..deb18ac077 100644 --- a/src/axom/sidre/interface/sidre_shroud.yaml +++ b/src/axom/sidre/interface/sidre_shroud.yaml @@ -3,7 +3,7 @@ # copyright: - - - Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and + - Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and - other Axom Project Developers. See the top-level LICENSE file for details. - - "SPDX-License-Identifier: (BSD-3-Clause)" diff --git a/src/axom/sidre/interface/yaml/sidre_types.yaml b/src/axom/sidre/interface/yaml/sidre_types.yaml index 6bbcbf54fc..88f07abb4a 100644 --- a/src/axom/sidre/interface/yaml/sidre_types.yaml +++ b/src/axom/sidre/interface/yaml/sidre_types.yaml @@ -1,7 +1,7 @@ # sidre_types.yaml # This file is generated by Shroud 0.12.2. Do not edit. # -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/spio/IOBaton.cpp b/src/axom/sidre/spio/IOBaton.cpp index ab39fec1db..7a0c246849 100644 --- a/src/axom/sidre/spio/IOBaton.cpp +++ b/src/axom/sidre/spio/IOBaton.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/spio/IOBaton.hpp b/src/axom/sidre/spio/IOBaton.hpp index 059effcb83..52b31ba0aa 100644 --- a/src/axom/sidre/spio/IOBaton.hpp +++ b/src/axom/sidre/spio/IOBaton.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/spio/IOManager.cpp b/src/axom/sidre/spio/IOManager.cpp index fb1f94ef04..dddf70b092 100644 --- a/src/axom/sidre/spio/IOManager.cpp +++ b/src/axom/sidre/spio/IOManager.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/spio/IOManager.hpp b/src/axom/sidre/spio/IOManager.hpp index f39c7be9f6..68af7be0a8 100644 --- a/src/axom/sidre/spio/IOManager.hpp +++ b/src/axom/sidre/spio/IOManager.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/spio/interface/CMakeLists.txt b/src/axom/sidre/spio/interface/CMakeLists.txt index 5eeade9597..9cb51a54d0 100644 --- a/src/axom/sidre/spio/interface/CMakeLists.txt +++ b/src/axom/sidre/spio/interface/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/spio/interface/c_fortran/typesSPIO.h b/src/axom/sidre/spio/interface/c_fortran/typesSPIO.h index 053aeb694c..205518a7af 100644 --- a/src/axom/sidre/spio/interface/c_fortran/typesSPIO.h +++ b/src/axom/sidre/spio/interface/c_fortran/typesSPIO.h @@ -1,7 +1,7 @@ // typesSPIO.h // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.cpp b/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.cpp index 3e1c849d39..5a8e0cd9ac 100644 --- a/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.cpp +++ b/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.cpp @@ -1,7 +1,7 @@ // wrapIOManager.cpp // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.h b/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.h index 1340f11438..3f6c5b9518 100644 --- a/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.h +++ b/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.h @@ -1,7 +1,7 @@ // wrapIOManager.h // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/spio/interface/c_fortran/wrapSPIO.cpp b/src/axom/sidre/spio/interface/c_fortran/wrapSPIO.cpp index 2cc0056143..53557a2000 100644 --- a/src/axom/sidre/spio/interface/c_fortran/wrapSPIO.cpp +++ b/src/axom/sidre/spio/interface/c_fortran/wrapSPIO.cpp @@ -1,7 +1,7 @@ // wrapSPIO.cpp // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/spio/interface/c_fortran/wrapfspio.f b/src/axom/sidre/spio/interface/c_fortran/wrapfspio.f index c1730d08dc..63815f3c4b 100644 --- a/src/axom/sidre/spio/interface/c_fortran/wrapfspio.f +++ b/src/axom/sidre/spio/interface/c_fortran/wrapfspio.f @@ -1,7 +1,7 @@ ! wrapfspio.f ! This file is generated by Shroud 0.12.2. Do not edit. ! -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/spio/interface/spio_shroud.yaml b/src/axom/sidre/spio/interface/spio_shroud.yaml index f351a0cf5d..e0a7e67e63 100644 --- a/src/axom/sidre/spio/interface/spio_shroud.yaml +++ b/src/axom/sidre/spio/interface/spio_shroud.yaml @@ -3,7 +3,7 @@ # copyright: - - - Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and + - Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and - other Axom Project Developers. See the top-level LICENSE file for details. - - "SPDX-License-Identifier: (BSD-3-Clause)" diff --git a/src/axom/sidre/spio/interface/yaml/spio_types.yaml b/src/axom/sidre/spio/interface/yaml/spio_types.yaml index 9031de5f30..f7fa07fa1f 100644 --- a/src/axom/sidre/spio/interface/yaml/spio_types.yaml +++ b/src/axom/sidre/spio/interface/yaml/spio_types.yaml @@ -1,7 +1,7 @@ # spio_types.yaml # This file is generated by Shroud 0.12.2. Do not edit. # -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/CMakeLists.txt b/src/axom/sidre/tests/CMakeLists.txt index baca405424..e7735b9951 100644 --- a/src/axom/sidre/tests/CMakeLists.txt +++ b/src/axom/sidre/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/cpp2fortran b/src/axom/sidre/tests/cpp2fortran index 903c012348..4b571305bf 100755 --- a/src/axom/sidre/tests/cpp2fortran +++ b/src/axom/sidre/tests/cpp2fortran @@ -1,6 +1,6 @@ #!/bin/env python -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_allocatable_F.f b/src/axom/sidre/tests/sidre_allocatable_F.f index 26a5b16738..df5513f108 100644 --- a/src/axom/sidre/tests/sidre_allocatable_F.f +++ b/src/axom/sidre/tests/sidre_allocatable_F.f @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_attribute.cpp b/src/axom/sidre/tests/sidre_attribute.cpp index 59a545339c..ec8b260d0d 100644 --- a/src/axom/sidre/tests/sidre_attribute.cpp +++ b/src/axom/sidre/tests/sidre_attribute.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_buffer.cpp b/src/axom/sidre/tests/sidre_buffer.cpp index 5537a0b0bc..54640f5d59 100644 --- a/src/axom/sidre/tests/sidre_buffer.cpp +++ b/src/axom/sidre/tests/sidre_buffer.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_buffer_C.cpp b/src/axom/sidre/tests/sidre_buffer_C.cpp index 53b7d4d7ba..9ef6e063be 100644 --- a/src/axom/sidre/tests/sidre_buffer_C.cpp +++ b/src/axom/sidre/tests/sidre_buffer_C.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_buffer_F.f b/src/axom/sidre/tests/sidre_buffer_F.f index 29dcf960e2..6c3ed78ab0 100644 --- a/src/axom/sidre/tests/sidre_buffer_F.f +++ b/src/axom/sidre/tests/sidre_buffer_F.f @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_buffer_unit.cpp b/src/axom/sidre/tests/sidre_buffer_unit.cpp index c352f5a881..53cafa737e 100644 --- a/src/axom/sidre/tests/sidre_buffer_unit.cpp +++ b/src/axom/sidre/tests/sidre_buffer_unit.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_class.cpp b/src/axom/sidre/tests/sidre_class.cpp index a8671ce1cb..16bd9022d9 100644 --- a/src/axom/sidre/tests/sidre_class.cpp +++ b/src/axom/sidre/tests/sidre_class.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_collections.cpp b/src/axom/sidre/tests/sidre_collections.cpp index 6bf33a870c..c819292e17 100644 --- a/src/axom/sidre/tests/sidre_collections.cpp +++ b/src/axom/sidre/tests/sidre_collections.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_datastore.cpp b/src/axom/sidre/tests/sidre_datastore.cpp index 64139e0b6c..a668557e60 100644 --- a/src/axom/sidre/tests/sidre_datastore.cpp +++ b/src/axom/sidre/tests/sidre_datastore.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_datastore_unit.cpp b/src/axom/sidre/tests/sidre_datastore_unit.cpp index a112ee8aa6..8d1b00a1c0 100644 --- a/src/axom/sidre/tests/sidre_datastore_unit.cpp +++ b/src/axom/sidre/tests/sidre_datastore_unit.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_external.cpp b/src/axom/sidre/tests/sidre_external.cpp index 1f81785a52..889e6ed094 100644 --- a/src/axom/sidre/tests/sidre_external.cpp +++ b/src/axom/sidre/tests/sidre_external.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_external_C.cpp b/src/axom/sidre/tests/sidre_external_C.cpp index c51245ea2f..bcf765e30b 100644 --- a/src/axom/sidre/tests/sidre_external_C.cpp +++ b/src/axom/sidre/tests/sidre_external_C.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_external_F.f b/src/axom/sidre/tests/sidre_external_F.f index 89cda4ba9c..572f77d6bb 100644 --- a/src/axom/sidre/tests/sidre_external_F.f +++ b/src/axom/sidre/tests/sidre_external_F.f @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_group.cpp b/src/axom/sidre/tests/sidre_group.cpp index 936c89d937..ab76b955c7 100644 --- a/src/axom/sidre/tests/sidre_group.cpp +++ b/src/axom/sidre/tests/sidre_group.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_group_C.cpp b/src/axom/sidre/tests/sidre_group_C.cpp index e9c42a225c..abf138540d 100644 --- a/src/axom/sidre/tests/sidre_group_C.cpp +++ b/src/axom/sidre/tests/sidre_group_C.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_group_F.F b/src/axom/sidre/tests/sidre_group_F.F index e86e4c63fc..5a403ef8c8 100644 --- a/src/axom/sidre/tests/sidre_group_F.F +++ b/src/axom/sidre/tests/sidre_group_F.F @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_mcarray.cpp b/src/axom/sidre/tests/sidre_mcarray.cpp index 7ddc0b518d..eb9e714d78 100644 --- a/src/axom/sidre/tests/sidre_mcarray.cpp +++ b/src/axom/sidre/tests/sidre_mcarray.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_mfem_datacollection.cpp b/src/axom/sidre/tests/sidre_mfem_datacollection.cpp index fa59055db8..e490944e17 100644 --- a/src/axom/sidre/tests/sidre_mfem_datacollection.cpp +++ b/src/axom/sidre/tests/sidre_mfem_datacollection.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_native_layout.cpp b/src/axom/sidre/tests/sidre_native_layout.cpp index b4bd1f76b1..a3ae78d52e 100644 --- a/src/axom/sidre/tests/sidre_native_layout.cpp +++ b/src/axom/sidre/tests/sidre_native_layout.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_opaque.cpp b/src/axom/sidre/tests/sidre_opaque.cpp index 48cb41ad8b..537e3fbd8b 100644 --- a/src/axom/sidre/tests/sidre_opaque.cpp +++ b/src/axom/sidre/tests/sidre_opaque.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_opaque_C.cpp b/src/axom/sidre/tests/sidre_opaque_C.cpp index cd7a68660f..260d7485bc 100644 --- a/src/axom/sidre/tests/sidre_opaque_C.cpp +++ b/src/axom/sidre/tests/sidre_opaque_C.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_opaque_F.f b/src/axom/sidre/tests/sidre_opaque_F.f index e72c911e57..0e4b9ff61d 100644 --- a/src/axom/sidre/tests/sidre_opaque_F.f +++ b/src/axom/sidre/tests/sidre_opaque_F.f @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_smoke.cpp b/src/axom/sidre/tests/sidre_smoke.cpp index 9941acb1e3..e5dda5098d 100644 --- a/src/axom/sidre/tests/sidre_smoke.cpp +++ b/src/axom/sidre/tests/sidre_smoke.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_smoke_C.cpp b/src/axom/sidre/tests/sidre_smoke_C.cpp index 6007bc7b01..7002625766 100644 --- a/src/axom/sidre/tests/sidre_smoke_C.cpp +++ b/src/axom/sidre/tests/sidre_smoke_C.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_smoke_F.f b/src/axom/sidre/tests/sidre_smoke_F.f index 14f2edfab7..f8e2411ee7 100644 --- a/src/axom/sidre/tests/sidre_smoke_F.f +++ b/src/axom/sidre/tests/sidre_smoke_F.f @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_types_C.cpp b/src/axom/sidre/tests/sidre_types_C.cpp index 550e8c04bf..2c8c90ce2b 100644 --- a/src/axom/sidre/tests/sidre_types_C.cpp +++ b/src/axom/sidre/tests/sidre_types_C.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_view.cpp b/src/axom/sidre/tests/sidre_view.cpp index f2ee48532f..2e77f02d89 100644 --- a/src/axom/sidre/tests/sidre_view.cpp +++ b/src/axom/sidre/tests/sidre_view.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_view_C.cpp b/src/axom/sidre/tests/sidre_view_C.cpp index eff3a5853d..d45a09f031 100644 --- a/src/axom/sidre/tests/sidre_view_C.cpp +++ b/src/axom/sidre/tests/sidre_view_C.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/sidre_view_F.f b/src/axom/sidre/tests/sidre_view_F.f index 2046e19214..144c254a1c 100644 --- a/src/axom/sidre/tests/sidre_view_F.f +++ b/src/axom/sidre/tests/sidre_view_F.f @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/spio/CMakeLists.txt b/src/axom/sidre/tests/spio/CMakeLists.txt index 792f44d758..0c15866f63 100644 --- a/src/axom/sidre/tests/spio/CMakeLists.txt +++ b/src/axom/sidre/tests/spio/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/spio/F_spio_basicWriteRead.F b/src/axom/sidre/tests/spio/F_spio_basicWriteRead.F index ffcbb5712b..1efd72cd3c 100644 --- a/src/axom/sidre/tests/spio/F_spio_basicWriteRead.F +++ b/src/axom/sidre/tests/spio/F_spio_basicWriteRead.F @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/spio/F_spio_blueprintIndex.F b/src/axom/sidre/tests/spio/F_spio_blueprintIndex.F index 93862d9d51..6955f52029 100644 --- a/src/axom/sidre/tests/spio/F_spio_blueprintIndex.F +++ b/src/axom/sidre/tests/spio/F_spio_blueprintIndex.F @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/spio/F_spio_externalWriteRead.F b/src/axom/sidre/tests/spio/F_spio_externalWriteRead.F index a6c7e24c9c..0793088be0 100644 --- a/src/axom/sidre/tests/spio/F_spio_externalWriteRead.F +++ b/src/axom/sidre/tests/spio/F_spio_externalWriteRead.F @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/spio/F_spio_irregularWriteRead.F b/src/axom/sidre/tests/spio/F_spio_irregularWriteRead.F index db3345940f..29fa54dc5f 100644 --- a/src/axom/sidre/tests/spio/F_spio_irregularWriteRead.F +++ b/src/axom/sidre/tests/spio/F_spio_irregularWriteRead.F @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/spio/F_spio_parallelWriteRead.F b/src/axom/sidre/tests/spio/F_spio_parallelWriteRead.F index eff1c066cb..34abd37d09 100644 --- a/src/axom/sidre/tests/spio/F_spio_parallelWriteRead.F +++ b/src/axom/sidre/tests/spio/F_spio_parallelWriteRead.F @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/spio/F_spio_preserveWriteRead.F b/src/axom/sidre/tests/spio/F_spio_preserveWriteRead.F index 59751ee5e1..170a2e9b1a 100644 --- a/src/axom/sidre/tests/spio/F_spio_preserveWriteRead.F +++ b/src/axom/sidre/tests/spio/F_spio_preserveWriteRead.F @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/spio/spio_basic.hpp b/src/axom/sidre/tests/spio/spio_basic.hpp index d874c9d0fe..0020172de6 100644 --- a/src/axom/sidre/tests/spio/spio_basic.hpp +++ b/src/axom/sidre/tests/spio/spio_basic.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/spio/spio_main.cpp b/src/axom/sidre/tests/spio/spio_main.cpp index 11444951b6..8f9bf1bed0 100644 --- a/src/axom/sidre/tests/spio/spio_main.cpp +++ b/src/axom/sidre/tests/spio/spio_main.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/spio/spio_parallel.hpp b/src/axom/sidre/tests/spio/spio_parallel.hpp index 888ad4029b..d90f91eddc 100644 --- a/src/axom/sidre/tests/spio/spio_parallel.hpp +++ b/src/axom/sidre/tests/spio/spio_parallel.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/sidre/tests/spio/spio_serial.hpp b/src/axom/sidre/tests/spio/spio_serial.hpp index 34b60d82ce..81ee8a6354 100644 --- a/src/axom/sidre/tests/spio/spio_serial.hpp +++ b/src/axom/sidre/tests/spio/spio_serial.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/BitSet.cpp b/src/axom/slam/BitSet.cpp index 4c83f01b95..f1e8a173b6 100644 --- a/src/axom/slam/BitSet.cpp +++ b/src/axom/slam/BitSet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/BitSet.hpp b/src/axom/slam/BitSet.hpp index 1c1a1d085b..0d8af38d03 100644 --- a/src/axom/slam/BitSet.hpp +++ b/src/axom/slam/BitSet.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/BivariateMap.hpp b/src/axom/slam/BivariateMap.hpp index a5d899d0d7..6afe7cd6fd 100644 --- a/src/axom/slam/BivariateMap.hpp +++ b/src/axom/slam/BivariateMap.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/BivariateSet.hpp b/src/axom/slam/BivariateSet.hpp index 72d2804ad4..0156928fd8 100644 --- a/src/axom/slam/BivariateSet.hpp +++ b/src/axom/slam/BivariateSet.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/CMakeLists.txt b/src/axom/slam/CMakeLists.txt index 79df250ca7..f25056ae2e 100644 --- a/src/axom/slam/CMakeLists.txt +++ b/src/axom/slam/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/DynamicConstantRelation.hpp b/src/axom/slam/DynamicConstantRelation.hpp index a5a3f0779e..7b78dcab25 100644 --- a/src/axom/slam/DynamicConstantRelation.hpp +++ b/src/axom/slam/DynamicConstantRelation.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/DynamicMap.hpp b/src/axom/slam/DynamicMap.hpp index 9cbc9846a4..ee8d6b4e51 100644 --- a/src/axom/slam/DynamicMap.hpp +++ b/src/axom/slam/DynamicMap.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/DynamicSet.hpp b/src/axom/slam/DynamicSet.hpp index 20ae79cbb9..c63c592ce5 100644 --- a/src/axom/slam/DynamicSet.hpp +++ b/src/axom/slam/DynamicSet.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/DynamicVariableRelation.cpp b/src/axom/slam/DynamicVariableRelation.cpp index f97c26daff..a6485fa026 100644 --- a/src/axom/slam/DynamicVariableRelation.cpp +++ b/src/axom/slam/DynamicVariableRelation.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/DynamicVariableRelation.hpp b/src/axom/slam/DynamicVariableRelation.hpp index 3c82bf2bd4..d10f02bdfe 100644 --- a/src/axom/slam/DynamicVariableRelation.hpp +++ b/src/axom/slam/DynamicVariableRelation.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/FieldRegistry.hpp b/src/axom/slam/FieldRegistry.hpp index f8c7b24a0f..048c01a7e2 100644 --- a/src/axom/slam/FieldRegistry.hpp +++ b/src/axom/slam/FieldRegistry.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/IndirectionSet.hpp b/src/axom/slam/IndirectionSet.hpp index 2d5858e4df..190f5e8385 100644 --- a/src/axom/slam/IndirectionSet.hpp +++ b/src/axom/slam/IndirectionSet.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/Map.hpp b/src/axom/slam/Map.hpp index 58a3de1bcc..2d4c56b356 100644 --- a/src/axom/slam/Map.hpp +++ b/src/axom/slam/Map.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/MapBase.hpp b/src/axom/slam/MapBase.hpp index b65be121b6..603f742fed 100644 --- a/src/axom/slam/MapBase.hpp +++ b/src/axom/slam/MapBase.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/ModularInt.hpp b/src/axom/slam/ModularInt.hpp index 32092283ff..cf93a69790 100644 --- a/src/axom/slam/ModularInt.hpp +++ b/src/axom/slam/ModularInt.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/NullSet.hpp b/src/axom/slam/NullSet.hpp index d357fe423f..afcf29e68d 100644 --- a/src/axom/slam/NullSet.hpp +++ b/src/axom/slam/NullSet.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/OrderedSet.cpp b/src/axom/slam/OrderedSet.cpp index 061d07a4fd..22168e1c0e 100644 --- a/src/axom/slam/OrderedSet.cpp +++ b/src/axom/slam/OrderedSet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/OrderedSet.hpp b/src/axom/slam/OrderedSet.hpp index 9d2c940b8f..267b0b9c9b 100644 --- a/src/axom/slam/OrderedSet.hpp +++ b/src/axom/slam/OrderedSet.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/ProductSet.hpp b/src/axom/slam/ProductSet.hpp index 18b35f0c63..36d2ba995a 100644 --- a/src/axom/slam/ProductSet.hpp +++ b/src/axom/slam/ProductSet.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/RangeSet.hpp b/src/axom/slam/RangeSet.hpp index ea067b450c..fb9252e8d8 100644 --- a/src/axom/slam/RangeSet.hpp +++ b/src/axom/slam/RangeSet.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/Relation.hpp b/src/axom/slam/Relation.hpp index 913761f749..7300f7493d 100644 --- a/src/axom/slam/Relation.hpp +++ b/src/axom/slam/Relation.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/RelationSet.hpp b/src/axom/slam/RelationSet.hpp index 4afe95398e..4dc35e8b30 100644 --- a/src/axom/slam/RelationSet.hpp +++ b/src/axom/slam/RelationSet.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/Set.hpp b/src/axom/slam/Set.hpp index b7af6a72b6..a2f8c7dc35 100644 --- a/src/axom/slam/Set.hpp +++ b/src/axom/slam/Set.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/StaticRelation.hpp b/src/axom/slam/StaticRelation.hpp index 98688992a0..a3ba2fb62d 100644 --- a/src/axom/slam/StaticRelation.hpp +++ b/src/axom/slam/StaticRelation.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/SubMap.hpp b/src/axom/slam/SubMap.hpp index 2ebe1c575e..60a711dd85 100644 --- a/src/axom/slam/SubMap.hpp +++ b/src/axom/slam/SubMap.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/Utilities.hpp b/src/axom/slam/Utilities.hpp index df82733fa5..aa92235e8a 100644 --- a/src/axom/slam/Utilities.hpp +++ b/src/axom/slam/Utilities.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/benchmarks/CMakeLists.txt b/src/axom/slam/benchmarks/CMakeLists.txt index 6cf19a9af3..cbf3b4084a 100644 --- a/src/axom/slam/benchmarks/CMakeLists.txt +++ b/src/axom/slam/benchmarks/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/benchmarks/slam_array.cpp b/src/axom/slam/benchmarks/slam_array.cpp index 1c848e732d..106c1bb24c 100644 --- a/src/axom/slam/benchmarks/slam_array.cpp +++ b/src/axom/slam/benchmarks/slam_array.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/benchmarks/slam_sets.cpp b/src/axom/slam/benchmarks/slam_sets.cpp index 42a6f8b1ca..9306fed52a 100644 --- a/src/axom/slam/benchmarks/slam_sets.cpp +++ b/src/axom/slam/benchmarks/slam_sets.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/docs/sphinx/core_concepts.rst b/src/axom/slam/docs/sphinx/core_concepts.rst index f0bd70c219..8354fc9b2d 100644 --- a/src/axom/slam/docs/sphinx/core_concepts.rst +++ b/src/axom/slam/docs/sphinx/core_concepts.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/docs/sphinx/examples.rst b/src/axom/slam/docs/sphinx/examples.rst index 15429fda7b..cf980c8485 100644 --- a/src/axom/slam/docs/sphinx/examples.rst +++ b/src/axom/slam/docs/sphinx/examples.rst @@ -1,6 +1,6 @@ :orphan: -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/docs/sphinx/first_example.rst b/src/axom/slam/docs/sphinx/first_example.rst index 2fc34bbdeb..412e4d7f43 100644 --- a/src/axom/slam/docs/sphinx/first_example.rst +++ b/src/axom/slam/docs/sphinx/first_example.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/docs/sphinx/implementation_details.rst b/src/axom/slam/docs/sphinx/implementation_details.rst index dbc838df1c..7257156291 100644 --- a/src/axom/slam/docs/sphinx/implementation_details.rst +++ b/src/axom/slam/docs/sphinx/implementation_details.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/docs/sphinx/index.rst b/src/axom/slam/docs/sphinx/index.rst index e34bcbee3b..f6b26c4c85 100644 --- a/src/axom/slam/docs/sphinx/index.rst +++ b/src/axom/slam/docs/sphinx/index.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/docs/sphinx/more.rst b/src/axom/slam/docs/sphinx/more.rst index 278f5c5455..a64e278cf4 100644 --- a/src/axom/slam/docs/sphinx/more.rst +++ b/src/axom/slam/docs/sphinx/more.rst @@ -1,6 +1,6 @@ :orphan: -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/CMakeLists.txt b/src/axom/slam/examples/CMakeLists.txt index 5050676050..67099a9fa7 100644 --- a/src/axom/slam/examples/CMakeLists.txt +++ b/src/axom/slam/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/HandleMesh.cpp b/src/axom/slam/examples/HandleMesh.cpp index d3384c7ab0..7a3da8eed1 100644 --- a/src/axom/slam/examples/HandleMesh.cpp +++ b/src/axom/slam/examples/HandleMesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/PolicyPrototype.cpp b/src/axom/slam/examples/PolicyPrototype.cpp index 5e5c93f035..ebf615e857 100644 --- a/src/axom/slam/examples/PolicyPrototype.cpp +++ b/src/axom/slam/examples/PolicyPrototype.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/ShockTube.cpp b/src/axom/slam/examples/ShockTube.cpp index da3d78a3d3..3a40d99a41 100644 --- a/src/axom/slam/examples/ShockTube.cpp +++ b/src/axom/slam/examples/ShockTube.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/UnstructMeshField.cpp b/src/axom/slam/examples/UnstructMeshField.cpp index 3ac3646ec3..6e4962c006 100644 --- a/src/axom/slam/examples/UnstructMeshField.cpp +++ b/src/axom/slam/examples/UnstructMeshField.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/UserDocs.cpp b/src/axom/slam/examples/UserDocs.cpp index bc6e6e126d..50664862de 100644 --- a/src/axom/slam/examples/UserDocs.cpp +++ b/src/axom/slam/examples/UserDocs.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt b/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt index fb160701f0..7197612318 100644 --- a/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt +++ b/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/lulesh2.0.3/lulesh-comm.cpp b/src/axom/slam/examples/lulesh2.0.3/lulesh-comm.cpp index 2720675e1c..e329a79de1 100644 --- a/src/axom/slam/examples/lulesh2.0.3/lulesh-comm.cpp +++ b/src/axom/slam/examples/lulesh2.0.3/lulesh-comm.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/lulesh2.0.3/lulesh-init.cpp b/src/axom/slam/examples/lulesh2.0.3/lulesh-init.cpp index 6d9572dd03..0e964002a4 100644 --- a/src/axom/slam/examples/lulesh2.0.3/lulesh-init.cpp +++ b/src/axom/slam/examples/lulesh2.0.3/lulesh-init.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/lulesh2.0.3/lulesh-util.cpp b/src/axom/slam/examples/lulesh2.0.3/lulesh-util.cpp index cd48b48c6b..045ab25e29 100644 --- a/src/axom/slam/examples/lulesh2.0.3/lulesh-util.cpp +++ b/src/axom/slam/examples/lulesh2.0.3/lulesh-util.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/lulesh2.0.3/lulesh-viz.cpp b/src/axom/slam/examples/lulesh2.0.3/lulesh-viz.cpp index a7e4e3d4ff..ac80488332 100644 --- a/src/axom/slam/examples/lulesh2.0.3/lulesh-viz.cpp +++ b/src/axom/slam/examples/lulesh2.0.3/lulesh-viz.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/lulesh2.0.3/lulesh.cpp b/src/axom/slam/examples/lulesh2.0.3/lulesh.cpp index 198d145279..b97f108fa1 100644 --- a/src/axom/slam/examples/lulesh2.0.3/lulesh.cpp +++ b/src/axom/slam/examples/lulesh2.0.3/lulesh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/lulesh2.0.3/lulesh.hpp b/src/axom/slam/examples/lulesh2.0.3/lulesh.hpp index 61741c5de6..369b55031d 100644 --- a/src/axom/slam/examples/lulesh2.0.3/lulesh.hpp +++ b/src/axom/slam/examples/lulesh2.0.3/lulesh.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/lulesh2.0.3/lulesh_tuple.hpp b/src/axom/slam/examples/lulesh2.0.3/lulesh_tuple.hpp index 8e83dbc052..e48294e718 100644 --- a/src/axom/slam/examples/lulesh2.0.3/lulesh_tuple.hpp +++ b/src/axom/slam/examples/lulesh2.0.3/lulesh_tuple.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/lulesh2.0.3_orig/CMakeLists.txt b/src/axom/slam/examples/lulesh2.0.3_orig/CMakeLists.txt index 75e5d14b0d..72f7f9f76c 100644 --- a/src/axom/slam/examples/lulesh2.0.3_orig/CMakeLists.txt +++ b/src/axom/slam/examples/lulesh2.0.3_orig/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/CMakeLists.txt b/src/axom/slam/examples/tinyHydro/CMakeLists.txt index b5e2d0e295..4a60d721f1 100644 --- a/src/axom/slam/examples/tinyHydro/CMakeLists.txt +++ b/src/axom/slam/examples/tinyHydro/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/HydroC.cpp b/src/axom/slam/examples/tinyHydro/HydroC.cpp index c0b813c9e8..ecb85f5fb8 100644 --- a/src/axom/slam/examples/tinyHydro/HydroC.cpp +++ b/src/axom/slam/examples/tinyHydro/HydroC.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/HydroC.hpp b/src/axom/slam/examples/tinyHydro/HydroC.hpp index c0ae6ce330..7d0f369ce3 100644 --- a/src/axom/slam/examples/tinyHydro/HydroC.hpp +++ b/src/axom/slam/examples/tinyHydro/HydroC.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/Part.cpp b/src/axom/slam/examples/tinyHydro/Part.cpp index add0c83119..5e7d5d1764 100644 --- a/src/axom/slam/examples/tinyHydro/Part.cpp +++ b/src/axom/slam/examples/tinyHydro/Part.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/Part.hpp b/src/axom/slam/examples/tinyHydro/Part.hpp index 847060def2..e8a2a7c6ae 100644 --- a/src/axom/slam/examples/tinyHydro/Part.hpp +++ b/src/axom/slam/examples/tinyHydro/Part.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/PolygonMeshXY.cpp b/src/axom/slam/examples/tinyHydro/PolygonMeshXY.cpp index fa843789af..4a27837a37 100644 --- a/src/axom/slam/examples/tinyHydro/PolygonMeshXY.cpp +++ b/src/axom/slam/examples/tinyHydro/PolygonMeshXY.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/PolygonMeshXY.hpp b/src/axom/slam/examples/tinyHydro/PolygonMeshXY.hpp index f13386ca53..69cc62fccf 100644 --- a/src/axom/slam/examples/tinyHydro/PolygonMeshXY.hpp +++ b/src/axom/slam/examples/tinyHydro/PolygonMeshXY.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/State.cpp b/src/axom/slam/examples/tinyHydro/State.cpp index 5db3b41dea..d6182ea060 100644 --- a/src/axom/slam/examples/tinyHydro/State.cpp +++ b/src/axom/slam/examples/tinyHydro/State.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/State.hpp b/src/axom/slam/examples/tinyHydro/State.hpp index 9ca89a7159..a9e4dc3324 100644 --- a/src/axom/slam/examples/tinyHydro/State.hpp +++ b/src/axom/slam/examples/tinyHydro/State.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/TinyHydroTypes.cpp b/src/axom/slam/examples/tinyHydro/TinyHydroTypes.cpp index fad7baada7..cff8896119 100644 --- a/src/axom/slam/examples/tinyHydro/TinyHydroTypes.cpp +++ b/src/axom/slam/examples/tinyHydro/TinyHydroTypes.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/TinyHydroTypes.hpp b/src/axom/slam/examples/tinyHydro/TinyHydroTypes.hpp index 28a23d27ba..128c23480c 100644 --- a/src/axom/slam/examples/tinyHydro/TinyHydroTypes.hpp +++ b/src/axom/slam/examples/tinyHydro/TinyHydroTypes.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/VectorXY.hpp b/src/axom/slam/examples/tinyHydro/VectorXY.hpp index 5250798ac8..cbaed8abfb 100644 --- a/src/axom/slam/examples/tinyHydro/VectorXY.hpp +++ b/src/axom/slam/examples/tinyHydro/VectorXY.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/tests/slam_tinyHydro_sedovTwoPart.cpp b/src/axom/slam/examples/tinyHydro/tests/slam_tinyHydro_sedovTwoPart.cpp index 52c92ba323..092aa0f452 100644 --- a/src/axom/slam/examples/tinyHydro/tests/slam_tinyHydro_sedovTwoPart.cpp +++ b/src/axom/slam/examples/tinyHydro/tests/slam_tinyHydro_sedovTwoPart.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/tests/slam_tinyHydro_sod1DTwoPart.cpp b/src/axom/slam/examples/tinyHydro/tests/slam_tinyHydro_sod1DTwoPart.cpp index 7015ba340f..ed6b8592c2 100644 --- a/src/axom/slam/examples/tinyHydro/tests/slam_tinyHydro_sod1DTwoPart.cpp +++ b/src/axom/slam/examples/tinyHydro/tests/slam_tinyHydro_sod1DTwoPart.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/examples/tinyHydro/tests/slam_tinyHydro_unitTests.cpp b/src/axom/slam/examples/tinyHydro/tests/slam_tinyHydro_unitTests.cpp index 2607bc11f3..63763d050e 100644 --- a/src/axom/slam/examples/tinyHydro/tests/slam_tinyHydro_unitTests.cpp +++ b/src/axom/slam/examples/tinyHydro/tests/slam_tinyHydro_unitTests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/mesh_struct/IA.hpp b/src/axom/slam/mesh_struct/IA.hpp index 7781cf8f60..ac6be95bd8 100644 --- a/src/axom/slam/mesh_struct/IA.hpp +++ b/src/axom/slam/mesh_struct/IA.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/mesh_struct/IA_impl.hpp b/src/axom/slam/mesh_struct/IA_impl.hpp index 7c7fb782c2..661d55f53f 100644 --- a/src/axom/slam/mesh_struct/IA_impl.hpp +++ b/src/axom/slam/mesh_struct/IA_impl.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/policies/BivariateSetInterfacePolicies.hpp b/src/axom/slam/policies/BivariateSetInterfacePolicies.hpp index 4c39f9125b..e96083beea 100644 --- a/src/axom/slam/policies/BivariateSetInterfacePolicies.hpp +++ b/src/axom/slam/policies/BivariateSetInterfacePolicies.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/policies/CardinalityPolicies.hpp b/src/axom/slam/policies/CardinalityPolicies.hpp index 54d07ec0cc..f63fd23661 100644 --- a/src/axom/slam/policies/CardinalityPolicies.hpp +++ b/src/axom/slam/policies/CardinalityPolicies.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/policies/IndirectionPolicies.hpp b/src/axom/slam/policies/IndirectionPolicies.hpp index bf843d3a8e..4ab9c87d3b 100644 --- a/src/axom/slam/policies/IndirectionPolicies.hpp +++ b/src/axom/slam/policies/IndirectionPolicies.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/policies/InterfacePolicies.hpp b/src/axom/slam/policies/InterfacePolicies.hpp index fc88318764..626aea75e7 100644 --- a/src/axom/slam/policies/InterfacePolicies.hpp +++ b/src/axom/slam/policies/InterfacePolicies.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/policies/MapInterfacePolicies.hpp b/src/axom/slam/policies/MapInterfacePolicies.hpp index 75b231b2f3..de89c2bae1 100644 --- a/src/axom/slam/policies/MapInterfacePolicies.hpp +++ b/src/axom/slam/policies/MapInterfacePolicies.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/policies/OffsetPolicies.hpp b/src/axom/slam/policies/OffsetPolicies.hpp index 09ac3d0a15..949df3bef6 100644 --- a/src/axom/slam/policies/OffsetPolicies.hpp +++ b/src/axom/slam/policies/OffsetPolicies.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/policies/PolicyTraits.hpp b/src/axom/slam/policies/PolicyTraits.hpp index e372d0388f..9e790c1f7f 100644 --- a/src/axom/slam/policies/PolicyTraits.hpp +++ b/src/axom/slam/policies/PolicyTraits.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/policies/SetInterfacePolicies.hpp b/src/axom/slam/policies/SetInterfacePolicies.hpp index 6b3d48a6fe..05fce845db 100644 --- a/src/axom/slam/policies/SetInterfacePolicies.hpp +++ b/src/axom/slam/policies/SetInterfacePolicies.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/policies/SizePolicies.hpp b/src/axom/slam/policies/SizePolicies.hpp index bd88416f59..e9ea27399a 100644 --- a/src/axom/slam/policies/SizePolicies.hpp +++ b/src/axom/slam/policies/SizePolicies.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/policies/StridePolicies.hpp b/src/axom/slam/policies/StridePolicies.hpp index fc0615c1a9..d023303448 100644 --- a/src/axom/slam/policies/StridePolicies.hpp +++ b/src/axom/slam/policies/StridePolicies.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/policies/SubsettingPolicies.hpp b/src/axom/slam/policies/SubsettingPolicies.hpp index fd6e44d31c..3418c33da0 100644 --- a/src/axom/slam/policies/SubsettingPolicies.hpp +++ b/src/axom/slam/policies/SubsettingPolicies.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/CMakeLists.txt b/src/axom/slam/tests/CMakeLists.txt index b8304738f9..8b1b46637c 100644 --- a/src/axom/slam/tests/CMakeLists.txt +++ b/src/axom/slam/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_AccessingRelationDataInMap.cpp b/src/axom/slam/tests/slam_AccessingRelationDataInMap.cpp index 025bdd1c78..c5a2104b62 100644 --- a/src/axom/slam/tests/slam_AccessingRelationDataInMap.cpp +++ b/src/axom/slam/tests/slam_AccessingRelationDataInMap.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_IA.cpp b/src/axom/slam/tests/slam_IA.cpp index c03d2322a0..668420cdda 100644 --- a/src/axom/slam/tests/slam_IA.cpp +++ b/src/axom/slam/tests/slam_IA.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_ModularInt.cpp b/src/axom/slam/tests/slam_ModularInt.cpp index 969e87f5f1..ab8fdfd593 100644 --- a/src/axom/slam/tests/slam_ModularInt.cpp +++ b/src/axom/slam/tests/slam_ModularInt.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_map_BivariateMap.cpp b/src/axom/slam/tests/slam_map_BivariateMap.cpp index fe38bc1cda..fb4b398fad 100644 --- a/src/axom/slam/tests/slam_map_BivariateMap.cpp +++ b/src/axom/slam/tests/slam_map_BivariateMap.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_map_DynamicMap.cpp b/src/axom/slam/tests/slam_map_DynamicMap.cpp index 4c9615fb43..ecb1840801 100644 --- a/src/axom/slam/tests/slam_map_DynamicMap.cpp +++ b/src/axom/slam/tests/slam_map_DynamicMap.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_map_Map.cpp b/src/axom/slam/tests/slam_map_Map.cpp index 12380e9147..2a76edb221 100644 --- a/src/axom/slam/tests/slam_map_Map.cpp +++ b/src/axom/slam/tests/slam_map_Map.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_map_SubMap.cpp b/src/axom/slam/tests/slam_map_SubMap.cpp index e6e99f0f4c..7770bc44c8 100644 --- a/src/axom/slam/tests/slam_map_SubMap.cpp +++ b/src/axom/slam/tests/slam_map_SubMap.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_relation_DynamicConstant.cpp b/src/axom/slam/tests/slam_relation_DynamicConstant.cpp index 8413208af8..fe9157d694 100644 --- a/src/axom/slam/tests/slam_relation_DynamicConstant.cpp +++ b/src/axom/slam/tests/slam_relation_DynamicConstant.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_relation_DynamicVariable.cpp b/src/axom/slam/tests/slam_relation_DynamicVariable.cpp index 1c2a76f9fd..11c74f46f9 100644 --- a/src/axom/slam/tests/slam_relation_DynamicVariable.cpp +++ b/src/axom/slam/tests/slam_relation_DynamicVariable.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_relation_StaticConstant.cpp b/src/axom/slam/tests/slam_relation_StaticConstant.cpp index 9329c4e116..441ce4dae2 100644 --- a/src/axom/slam/tests/slam_relation_StaticConstant.cpp +++ b/src/axom/slam/tests/slam_relation_StaticConstant.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_relation_StaticVariable.cpp b/src/axom/slam/tests/slam_relation_StaticVariable.cpp index 0f7d318f33..8056d4d41b 100644 --- a/src/axom/slam/tests/slam_relation_StaticVariable.cpp +++ b/src/axom/slam/tests/slam_relation_StaticVariable.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_set_BitSet.cpp b/src/axom/slam/tests/slam_set_BitSet.cpp index 0281465a60..e5a8250823 100644 --- a/src/axom/slam/tests/slam_set_BitSet.cpp +++ b/src/axom/slam/tests/slam_set_BitSet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_set_BivariateSet.cpp b/src/axom/slam/tests/slam_set_BivariateSet.cpp index 898abcdb5f..1169e086c3 100644 --- a/src/axom/slam/tests/slam_set_BivariateSet.cpp +++ b/src/axom/slam/tests/slam_set_BivariateSet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_set_DynamicSet.cpp b/src/axom/slam/tests/slam_set_DynamicSet.cpp index 577b6d6ccf..6e279748ce 100644 --- a/src/axom/slam/tests/slam_set_DynamicSet.cpp +++ b/src/axom/slam/tests/slam_set_DynamicSet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_set_IndirectionSet.cpp b/src/axom/slam/tests/slam_set_IndirectionSet.cpp index 6d17182a16..a3b7f1b32d 100644 --- a/src/axom/slam/tests/slam_set_IndirectionSet.cpp +++ b/src/axom/slam/tests/slam_set_IndirectionSet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_set_Iterator.cpp b/src/axom/slam/tests/slam_set_Iterator.cpp index 7a820416f9..9c38e96a9d 100644 --- a/src/axom/slam/tests/slam_set_Iterator.cpp +++ b/src/axom/slam/tests/slam_set_Iterator.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_set_NullSet.cpp b/src/axom/slam/tests/slam_set_NullSet.cpp index 935f19863e..8f7e1ad95d 100644 --- a/src/axom/slam/tests/slam_set_NullSet.cpp +++ b/src/axom/slam/tests/slam_set_NullSet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_set_PositionSet.cpp b/src/axom/slam/tests/slam_set_PositionSet.cpp index a72fe11b0a..34d85d0c24 100644 --- a/src/axom/slam/tests/slam_set_PositionSet.cpp +++ b/src/axom/slam/tests/slam_set_PositionSet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_set_RangeSet.cpp b/src/axom/slam/tests/slam_set_RangeSet.cpp index bd3138493b..bfa4c768d3 100644 --- a/src/axom/slam/tests/slam_set_RangeSet.cpp +++ b/src/axom/slam/tests/slam_set_RangeSet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slam/tests/slam_set_Set.cpp b/src/axom/slam/tests/slam_set_Set.cpp index 7db0d33c03..bcbe6fa912 100644 --- a/src/axom/slam/tests/slam_set_Set.cpp +++ b/src/axom/slam/tests/slam_set_Set.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/CMakeLists.txt b/src/axom/slic/CMakeLists.txt index e1829a67e1..31a7d8f598 100644 --- a/src/axom/slic/CMakeLists.txt +++ b/src/axom/slic/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/core/LogStream.cpp b/src/axom/slic/core/LogStream.cpp index 87fbc70959..17e2efb5c0 100644 --- a/src/axom/slic/core/LogStream.cpp +++ b/src/axom/slic/core/LogStream.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/core/LogStream.hpp b/src/axom/slic/core/LogStream.hpp index 8bc809ffe6..045617af5b 100644 --- a/src/axom/slic/core/LogStream.hpp +++ b/src/axom/slic/core/LogStream.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/core/Logger.cpp b/src/axom/slic/core/Logger.cpp index 3daafc09d9..ab7cf7388b 100644 --- a/src/axom/slic/core/Logger.cpp +++ b/src/axom/slic/core/Logger.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/core/Logger.hpp b/src/axom/slic/core/Logger.hpp index 87c3ff8a06..355f1f2095 100644 --- a/src/axom/slic/core/Logger.hpp +++ b/src/axom/slic/core/Logger.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/core/MessageLevel.hpp b/src/axom/slic/core/MessageLevel.hpp index 08fffaca53..1896722e7c 100644 --- a/src/axom/slic/core/MessageLevel.hpp +++ b/src/axom/slic/core/MessageLevel.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/core/SimpleLogger.hpp b/src/axom/slic/core/SimpleLogger.hpp index fe9bd709f1..71ec480f40 100644 --- a/src/axom/slic/core/SimpleLogger.hpp +++ b/src/axom/slic/core/SimpleLogger.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/docs/sphinx/index.rst b/src/axom/slic/docs/sphinx/index.rst index c307ef579f..ac87ce210a 100644 --- a/src/axom/slic/docs/sphinx/index.rst +++ b/src/axom/slic/docs/sphinx/index.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/docs/sphinx/sections/appendix.rst b/src/axom/slic/docs/sphinx/sections/appendix.rst index 0670519325..d0aff452ff 100644 --- a/src/axom/slic/docs/sphinx/sections/appendix.rst +++ b/src/axom/slic/docs/sphinx/sections/appendix.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/docs/sphinx/sections/architecture.rst b/src/axom/slic/docs/sphinx/sections/architecture.rst index 8686823162..7b044f2be6 100644 --- a/src/axom/slic/docs/sphinx/sections/architecture.rst +++ b/src/axom/slic/docs/sphinx/sections/architecture.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/docs/sphinx/sections/citations.rst b/src/axom/slic/docs/sphinx/sections/citations.rst index c37111968a..fda2c87c92 100644 --- a/src/axom/slic/docs/sphinx/sections/citations.rst +++ b/src/axom/slic/docs/sphinx/sections/citations.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/docs/sphinx/sections/getting_started.rst b/src/axom/slic/docs/sphinx/sections/getting_started.rst index 4bac29708c..14bd1cc46e 100644 --- a/src/axom/slic/docs/sphinx/sections/getting_started.rst +++ b/src/axom/slic/docs/sphinx/sections/getting_started.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/docs/sphinx/sections/wrapping_slic_in_macros.rst b/src/axom/slic/docs/sphinx/sections/wrapping_slic_in_macros.rst index 7813d19c61..4efab0bd59 100644 --- a/src/axom/slic/docs/sphinx/sections/wrapping_slic_in_macros.rst +++ b/src/axom/slic/docs/sphinx/sections/wrapping_slic_in_macros.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/examples/CMakeLists.txt b/src/axom/slic/examples/CMakeLists.txt index ca4ee2eb60..fa3c8d6cc2 100644 --- a/src/axom/slic/examples/CMakeLists.txt +++ b/src/axom/slic/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/examples/basic/cpplogger.cpp b/src/axom/slic/examples/basic/cpplogger.cpp index b8627d3004..62b3570b7f 100644 --- a/src/axom/slic/examples/basic/cpplogger.cpp +++ b/src/axom/slic/examples/basic/cpplogger.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/examples/basic/custom_abort_logger.cpp b/src/axom/slic/examples/basic/custom_abort_logger.cpp index 107360f910..ad4484133f 100644 --- a/src/axom/slic/examples/basic/custom_abort_logger.cpp +++ b/src/axom/slic/examples/basic/custom_abort_logger.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/examples/basic/flogger.f b/src/axom/slic/examples/basic/flogger.f index e7c5a9a922..11ebeac549 100644 --- a/src/axom/slic/examples/basic/flogger.f +++ b/src/axom/slic/examples/basic/flogger.f @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/examples/basic/logging.cpp b/src/axom/slic/examples/basic/logging.cpp index b887e99d88..507161f000 100644 --- a/src/axom/slic/examples/basic/logging.cpp +++ b/src/axom/slic/examples/basic/logging.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/examples/basic/logging_F.f b/src/axom/slic/examples/basic/logging_F.f index 99180f23ed..17a3f920dc 100644 --- a/src/axom/slic/examples/basic/logging_F.f +++ b/src/axom/slic/examples/basic/logging_F.f @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/examples/basic/lumberjack_logging.cpp b/src/axom/slic/examples/basic/lumberjack_logging.cpp index 7348ea8227..1d0b8f5a02 100644 --- a/src/axom/slic/examples/basic/lumberjack_logging.cpp +++ b/src/axom/slic/examples/basic/lumberjack_logging.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/examples/basic/parallel_logging.cpp b/src/axom/slic/examples/basic/parallel_logging.cpp index 120613c87a..a400779ca0 100644 --- a/src/axom/slic/examples/basic/parallel_logging.cpp +++ b/src/axom/slic/examples/basic/parallel_logging.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/examples/basic/separate_file_per_rank.cpp b/src/axom/slic/examples/basic/separate_file_per_rank.cpp index 19c30269ed..8da342bfed 100644 --- a/src/axom/slic/examples/basic/separate_file_per_rank.cpp +++ b/src/axom/slic/examples/basic/separate_file_per_rank.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/examples/multicode/driver.cpp b/src/axom/slic/examples/multicode/driver.cpp index 51ca248b2d..6a65422a33 100644 --- a/src/axom/slic/examples/multicode/driver.cpp +++ b/src/axom/slic/examples/multicode/driver.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/examples/multicode/physicsA.hpp b/src/axom/slic/examples/multicode/physicsA.hpp index 3548abd5f1..bb695a23ea 100644 --- a/src/axom/slic/examples/multicode/physicsA.hpp +++ b/src/axom/slic/examples/multicode/physicsA.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/examples/multicode/physicsB.hpp b/src/axom/slic/examples/multicode/physicsB.hpp index f1cda1de6a..da04bca567 100644 --- a/src/axom/slic/examples/multicode/physicsB.hpp +++ b/src/axom/slic/examples/multicode/physicsB.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/interface/CMakeLists.txt b/src/axom/slic/interface/CMakeLists.txt index 3cbe9f21a7..ac90fd1048 100644 --- a/src/axom/slic/interface/CMakeLists.txt +++ b/src/axom/slic/interface/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/interface/c_fortran/typesSLIC.h b/src/axom/slic/interface/c_fortran/typesSLIC.h index e82bf1b52c..6e04d20430 100644 --- a/src/axom/slic/interface/c_fortran/typesSLIC.h +++ b/src/axom/slic/interface/c_fortran/typesSLIC.h @@ -1,7 +1,7 @@ // typesSLIC.h // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.cpp b/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.cpp index 556c93d829..200dc0c454 100644 --- a/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.cpp +++ b/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.cpp @@ -1,7 +1,7 @@ // wrapGenericOutputStream.cpp // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.h b/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.h index d80e0534d9..025286d21f 100644 --- a/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.h +++ b/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.h @@ -1,7 +1,7 @@ // wrapGenericOutputStream.h // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/interface/c_fortran/wrapSLIC.cpp b/src/axom/slic/interface/c_fortran/wrapSLIC.cpp index 81e413562b..e0270df4fd 100644 --- a/src/axom/slic/interface/c_fortran/wrapSLIC.cpp +++ b/src/axom/slic/interface/c_fortran/wrapSLIC.cpp @@ -1,7 +1,7 @@ // wrapSLIC.cpp // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/interface/c_fortran/wrapSLIC.h b/src/axom/slic/interface/c_fortran/wrapSLIC.h index e6a90afdcb..36b0ce6697 100644 --- a/src/axom/slic/interface/c_fortran/wrapSLIC.h +++ b/src/axom/slic/interface/c_fortran/wrapSLIC.h @@ -1,7 +1,7 @@ // wrapSLIC.h // This file is generated by Shroud 0.12.2. Do not edit. // -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/interface/c_fortran/wrapfslic.f b/src/axom/slic/interface/c_fortran/wrapfslic.f index 82a580ed8f..936dbae4c0 100644 --- a/src/axom/slic/interface/c_fortran/wrapfslic.f +++ b/src/axom/slic/interface/c_fortran/wrapfslic.f @@ -1,7 +1,7 @@ ! wrapfslic.f ! This file is generated by Shroud 0.12.2. Do not edit. ! -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/interface/slic.cpp b/src/axom/slic/interface/slic.cpp index 5f7b3bfff8..d32a36fd18 100644 --- a/src/axom/slic/interface/slic.cpp +++ b/src/axom/slic/interface/slic.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/interface/slic.hpp b/src/axom/slic/interface/slic.hpp index 97e274b40b..274de7e8d1 100644 --- a/src/axom/slic/interface/slic.hpp +++ b/src/axom/slic/interface/slic.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/interface/slic_macros.hpp b/src/axom/slic/interface/slic_macros.hpp index 62db4b72ab..02896d0e2d 100644 --- a/src/axom/slic/interface/slic_macros.hpp +++ b/src/axom/slic/interface/slic_macros.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/interface/slic_shroud.yaml b/src/axom/slic/interface/slic_shroud.yaml index 55b51d0a78..5c269c9769 100644 --- a/src/axom/slic/interface/slic_shroud.yaml +++ b/src/axom/slic/interface/slic_shroud.yaml @@ -3,7 +3,7 @@ # copyright: - - - Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and + - Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and - other Axom Project Developers. See the top-level LICENSE file for details. - - "SPDX-License-Identifier: (BSD-3-Clause)" diff --git a/src/axom/slic/interface/slic_types.yaml b/src/axom/slic/interface/slic_types.yaml index 2a15f6f573..22fda023c3 100644 --- a/src/axom/slic/interface/slic_types.yaml +++ b/src/axom/slic/interface/slic_types.yaml @@ -1,7 +1,7 @@ # slic_types.yaml # This file is generated by Shroud 0.12.2. Do not edit. # -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/internal/stacktrace.cpp b/src/axom/slic/internal/stacktrace.cpp index 357617898e..6f267df353 100644 --- a/src/axom/slic/internal/stacktrace.cpp +++ b/src/axom/slic/internal/stacktrace.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/internal/stacktrace.hpp b/src/axom/slic/internal/stacktrace.hpp index 6eb078441c..7a7aaed379 100644 --- a/src/axom/slic/internal/stacktrace.hpp +++ b/src/axom/slic/internal/stacktrace.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/streams/GenericOutputStream.cpp b/src/axom/slic/streams/GenericOutputStream.cpp index 7e7d679dce..69a6dcc825 100644 --- a/src/axom/slic/streams/GenericOutputStream.cpp +++ b/src/axom/slic/streams/GenericOutputStream.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/streams/GenericOutputStream.hpp b/src/axom/slic/streams/GenericOutputStream.hpp index 1edbdf03a7..1bcf1893b1 100644 --- a/src/axom/slic/streams/GenericOutputStream.hpp +++ b/src/axom/slic/streams/GenericOutputStream.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/streams/LumberjackStream.cpp b/src/axom/slic/streams/LumberjackStream.cpp index 96a75ac27a..14eabd8816 100644 --- a/src/axom/slic/streams/LumberjackStream.cpp +++ b/src/axom/slic/streams/LumberjackStream.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/streams/LumberjackStream.hpp b/src/axom/slic/streams/LumberjackStream.hpp index 77e00c9ee5..ab5110c299 100644 --- a/src/axom/slic/streams/LumberjackStream.hpp +++ b/src/axom/slic/streams/LumberjackStream.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/streams/SynchronizedStream.cpp b/src/axom/slic/streams/SynchronizedStream.cpp index 3d19c4635e..8f719ca9ef 100644 --- a/src/axom/slic/streams/SynchronizedStream.cpp +++ b/src/axom/slic/streams/SynchronizedStream.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/streams/SynchronizedStream.hpp b/src/axom/slic/streams/SynchronizedStream.hpp index 2e81c9b877..675e1d0b05 100644 --- a/src/axom/slic/streams/SynchronizedStream.hpp +++ b/src/axom/slic/streams/SynchronizedStream.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/tests/CMakeLists.txt b/src/axom/slic/tests/CMakeLists.txt index fc1a39ff4d..3851d90f38 100644 --- a/src/axom/slic/tests/CMakeLists.txt +++ b/src/axom/slic/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/tests/slic_asserts.cpp b/src/axom/slic/tests/slic_asserts.cpp index f6e4f2de10..0f13b38c0b 100644 --- a/src/axom/slic/tests/slic_asserts.cpp +++ b/src/axom/slic/tests/slic_asserts.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/tests/slic_benchmark_asserts.cpp b/src/axom/slic/tests/slic_benchmark_asserts.cpp index 5f9ea48ce5..f9f80924dc 100644 --- a/src/axom/slic/tests/slic_benchmark_asserts.cpp +++ b/src/axom/slic/tests/slic_benchmark_asserts.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/tests/slic_fmt.cpp b/src/axom/slic/tests/slic_fmt.cpp index 4293ebe88b..b9fb54a615 100644 --- a/src/axom/slic/tests/slic_fmt.cpp +++ b/src/axom/slic/tests/slic_fmt.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/tests/slic_interface.cpp b/src/axom/slic/tests/slic_interface.cpp index 9a5c5b8af4..f603753482 100644 --- a/src/axom/slic/tests/slic_interface.cpp +++ b/src/axom/slic/tests/slic_interface.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/tests/slic_interface_F.f b/src/axom/slic/tests/slic_interface_F.f index f43484d192..83324c43e8 100644 --- a/src/axom/slic/tests/slic_interface_F.f +++ b/src/axom/slic/tests/slic_interface_F.f @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/tests/slic_macros.cpp b/src/axom/slic/tests/slic_macros.cpp index 66d929c134..449f574895 100644 --- a/src/axom/slic/tests/slic_macros.cpp +++ b/src/axom/slic/tests/slic_macros.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/tests/slic_macros_parallel.cpp b/src/axom/slic/tests/slic_macros_parallel.cpp index ef2a68de4e..5ab5ce6232 100644 --- a/src/axom/slic/tests/slic_macros_parallel.cpp +++ b/src/axom/slic/tests/slic_macros_parallel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/slic/tests/slic_uninit.cpp b/src/axom/slic/tests/slic_uninit.cpp index cce67f56d0..e95f2c9fb2 100644 --- a/src/axom/slic/tests/slic_uninit.cpp +++ b/src/axom/slic/tests/slic_uninit.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/BVH.hpp b/src/axom/spin/BVH.hpp index 33fae12814..d5eec63ae7 100644 --- a/src/axom/spin/BVH.hpp +++ b/src/axom/spin/BVH.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/Brood.hpp b/src/axom/spin/Brood.hpp index 44afcffcf0..5d0263689a 100644 --- a/src/axom/spin/Brood.hpp +++ b/src/axom/spin/Brood.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/CMakeLists.txt b/src/axom/spin/CMakeLists.txt index e5b1b1df45..2eafefbcbc 100644 --- a/src/axom/spin/CMakeLists.txt +++ b/src/axom/spin/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/DenseOctreeLevel.hpp b/src/axom/spin/DenseOctreeLevel.hpp index 88f55550d9..c77614cc4c 100644 --- a/src/axom/spin/DenseOctreeLevel.hpp +++ b/src/axom/spin/DenseOctreeLevel.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/ImplicitGrid.hpp b/src/axom/spin/ImplicitGrid.hpp index c53cc793d0..7cc4fffddc 100644 --- a/src/axom/spin/ImplicitGrid.hpp +++ b/src/axom/spin/ImplicitGrid.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/MortonIndex.hpp b/src/axom/spin/MortonIndex.hpp index 4034e06c01..ce9d8ad5ef 100644 --- a/src/axom/spin/MortonIndex.hpp +++ b/src/axom/spin/MortonIndex.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/OctreeBase.hpp b/src/axom/spin/OctreeBase.hpp index c5470443d9..3bf0e6ac16 100644 --- a/src/axom/spin/OctreeBase.hpp +++ b/src/axom/spin/OctreeBase.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/OctreeLevel.hpp b/src/axom/spin/OctreeLevel.hpp index a79ad1f8bc..9cf43e79d3 100644 --- a/src/axom/spin/OctreeLevel.hpp +++ b/src/axom/spin/OctreeLevel.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/RectangularLattice.hpp b/src/axom/spin/RectangularLattice.hpp index 18f2eff82d..3d7313becb 100644 --- a/src/axom/spin/RectangularLattice.hpp +++ b/src/axom/spin/RectangularLattice.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/SparseOctreeLevel.hpp b/src/axom/spin/SparseOctreeLevel.hpp index 9572cf7e59..b6f0731448 100644 --- a/src/axom/spin/SparseOctreeLevel.hpp +++ b/src/axom/spin/SparseOctreeLevel.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/SpatialOctree.hpp b/src/axom/spin/SpatialOctree.hpp index e13a013901..deecfe44e6 100644 --- a/src/axom/spin/SpatialOctree.hpp +++ b/src/axom/spin/SpatialOctree.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/UniformGrid.hpp b/src/axom/spin/UniformGrid.hpp index b104bc2d7f..d4469789cd 100644 --- a/src/axom/spin/UniformGrid.hpp +++ b/src/axom/spin/UniformGrid.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/docs/sphinx/index.rst b/src/axom/spin/docs/sphinx/index.rst index b4d16189f3..5ec0057958 100644 --- a/src/axom/spin/docs/sphinx/index.rst +++ b/src/axom/spin/docs/sphinx/index.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/examples/CMakeLists.txt b/src/axom/spin/examples/CMakeLists.txt index daae914a84..88e399a3aa 100644 --- a/src/axom/spin/examples/CMakeLists.txt +++ b/src/axom/spin/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/examples/spin_introduction.cpp b/src/axom/spin/examples/spin_introduction.cpp index dde580dcd3..d023bcf8e3 100644 --- a/src/axom/spin/examples/spin_introduction.cpp +++ b/src/axom/spin/examples/spin_introduction.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/internal/linear_bvh/RadixTree.hpp b/src/axom/spin/internal/linear_bvh/RadixTree.hpp index bd72c7b2aa..ac5e7b4613 100644 --- a/src/axom/spin/internal/linear_bvh/RadixTree.hpp +++ b/src/axom/spin/internal/linear_bvh/RadixTree.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/internal/linear_bvh/build_radix_tree.hpp b/src/axom/spin/internal/linear_bvh/build_radix_tree.hpp index c98b4fbe0f..b4728f94fa 100644 --- a/src/axom/spin/internal/linear_bvh/build_radix_tree.hpp +++ b/src/axom/spin/internal/linear_bvh/build_radix_tree.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/internal/linear_bvh/bvh_traverse.hpp b/src/axom/spin/internal/linear_bvh/bvh_traverse.hpp index d5dec4e280..1723a5d0bf 100644 --- a/src/axom/spin/internal/linear_bvh/bvh_traverse.hpp +++ b/src/axom/spin/internal/linear_bvh/bvh_traverse.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/internal/linear_bvh/bvh_vtkio.hpp b/src/axom/spin/internal/linear_bvh/bvh_vtkio.hpp index 27571de1a3..0c594cc1b8 100644 --- a/src/axom/spin/internal/linear_bvh/bvh_vtkio.hpp +++ b/src/axom/spin/internal/linear_bvh/bvh_vtkio.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/policy/LinearBVH.hpp b/src/axom/spin/policy/LinearBVH.hpp index 78a4003acc..62a51f2656 100644 --- a/src/axom/spin/policy/LinearBVH.hpp +++ b/src/axom/spin/policy/LinearBVH.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/policy/UniformGridStorage.hpp b/src/axom/spin/policy/UniformGridStorage.hpp index 3d54854053..db94b2b136 100644 --- a/src/axom/spin/policy/UniformGridStorage.hpp +++ b/src/axom/spin/policy/UniformGridStorage.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/tests/CMakeLists.txt b/src/axom/spin/tests/CMakeLists.txt index eca572c37b..20a6d7c6e5 100644 --- a/src/axom/spin/tests/CMakeLists.txt +++ b/src/axom/spin/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/tests/spin_bvh.cpp b/src/axom/spin/tests/spin_bvh.cpp index ac709c9dc5..d48f29d9bd 100644 --- a/src/axom/spin/tests/spin_bvh.cpp +++ b/src/axom/spin/tests/spin_bvh.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/tests/spin_implicit_grid.cpp b/src/axom/spin/tests/spin_implicit_grid.cpp index 5c44a7cd91..d1c0c706b6 100644 --- a/src/axom/spin/tests/spin_implicit_grid.cpp +++ b/src/axom/spin/tests/spin_implicit_grid.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/tests/spin_morton.cpp b/src/axom/spin/tests/spin_morton.cpp index 0bb26a072d..1f1ed34d98 100644 --- a/src/axom/spin/tests/spin_morton.cpp +++ b/src/axom/spin/tests/spin_morton.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/tests/spin_octree.cpp b/src/axom/spin/tests/spin_octree.cpp index 58d6d2b370..34625e5818 100644 --- a/src/axom/spin/tests/spin_octree.cpp +++ b/src/axom/spin/tests/spin_octree.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/tests/spin_rectangular_lattice.cpp b/src/axom/spin/tests/spin_rectangular_lattice.cpp index f3c1b8e98f..7431c064d1 100644 --- a/src/axom/spin/tests/spin_rectangular_lattice.cpp +++ b/src/axom/spin/tests/spin_rectangular_lattice.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/tests/spin_spatial_octree.cpp b/src/axom/spin/tests/spin_spatial_octree.cpp index 80848633f6..c68c54b1c7 100644 --- a/src/axom/spin/tests/spin_spatial_octree.cpp +++ b/src/axom/spin/tests/spin_spatial_octree.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/spin/tests/spin_uniform_grid.cpp b/src/axom/spin/tests/spin_uniform_grid.cpp index 563d2e258a..f90a2827d8 100644 --- a/src/axom/spin/tests/spin_uniform_grid.cpp +++ b/src/axom/spin/tests/spin_uniform_grid.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/AxomConfig.cmake b/src/cmake/AxomConfig.cmake index e887e06d46..9a2b7db90c 100644 --- a/src/cmake/AxomConfig.cmake +++ b/src/cmake/AxomConfig.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/AxomMacros.cmake b/src/cmake/AxomMacros.cmake index 0fddf186e5..dffdcbe415 100644 --- a/src/cmake/AxomMacros.cmake +++ b/src/cmake/AxomMacros.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) @@ -444,7 +444,7 @@ macro(axom_write_unified_header) set(_header ${PROJECT_BINARY_DIR}/include/axom/${_lcname}.hpp) set(_tmp_header ${_header}.tmp) - file(WRITE ${_tmp_header} "\/\/ Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and + file(WRITE ${_tmp_header} "\/\/ Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and \/\/ other Axom Project Developers. See the top-level LICENSE file for details. \/\/ \/\/ SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/AxomOptions.cmake b/src/cmake/AxomOptions.cmake index c3cf37b1cd..9340ae4075 100644 --- a/src/cmake/AxomOptions.cmake +++ b/src/cmake/AxomOptions.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/AxomVersion.cmake b/src/cmake/AxomVersion.cmake index 9b69ecef0c..2e1db64172 100644 --- a/src/cmake/AxomVersion.cmake +++ b/src/cmake/AxomVersion.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/CMakeBasics.cmake b/src/cmake/CMakeBasics.cmake index eeb79c4242..ff60181902 100644 --- a/src/cmake/CMakeBasics.cmake +++ b/src/cmake/CMakeBasics.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/Dashboard.cmake.in b/src/cmake/Dashboard.cmake.in index 8dc22ab982..5630bcee17 100644 --- a/src/cmake/Dashboard.cmake.in +++ b/src/cmake/Dashboard.cmake.in @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/axom-config.cmake.in b/src/cmake/axom-config.cmake.in index 5466393b16..46e2e2204c 100644 --- a/src/cmake/axom-config.cmake.in +++ b/src/cmake/axom-config.cmake.in @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/thirdparty/FindC2C.cmake b/src/cmake/thirdparty/FindC2C.cmake index 66b536f386..3a05a79fea 100644 --- a/src/cmake/thirdparty/FindC2C.cmake +++ b/src/cmake/thirdparty/FindC2C.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/thirdparty/FindConduit.cmake b/src/cmake/thirdparty/FindConduit.cmake index b460067fc3..0e85402cf5 100644 --- a/src/cmake/thirdparty/FindConduit.cmake +++ b/src/cmake/thirdparty/FindConduit.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/thirdparty/FindLUA.cmake b/src/cmake/thirdparty/FindLUA.cmake index 7028614b29..bab40fcbab 100644 --- a/src/cmake/thirdparty/FindLUA.cmake +++ b/src/cmake/thirdparty/FindLUA.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/thirdparty/FindMFEM.cmake b/src/cmake/thirdparty/FindMFEM.cmake index 33ec2e5b6d..311aa8ae9b 100644 --- a/src/cmake/thirdparty/FindMFEM.cmake +++ b/src/cmake/thirdparty/FindMFEM.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/thirdparty/FindROCTracer.cmake b/src/cmake/thirdparty/FindROCTracer.cmake index 30c969579e..5894e5ae00 100644 --- a/src/cmake/thirdparty/FindROCTracer.cmake +++ b/src/cmake/thirdparty/FindROCTracer.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/thirdparty/FindSCR.cmake b/src/cmake/thirdparty/FindSCR.cmake index 1ee48aaf88..2bf4f57cfb 100644 --- a/src/cmake/thirdparty/FindSCR.cmake +++ b/src/cmake/thirdparty/FindSCR.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/thirdparty/SetupAxomThirdParty.cmake b/src/cmake/thirdparty/SetupAxomThirdParty.cmake index 2aba11e611..71194edde9 100644 --- a/src/cmake/thirdparty/SetupAxomThirdParty.cmake +++ b/src/cmake/thirdparty/SetupAxomThirdParty.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/cmake/thirdparty/SetupHDF5.cmake b/src/cmake/thirdparty/SetupHDF5.cmake index 2417790072..864a23657d 100644 --- a/src/cmake/thirdparty/SetupHDF5.cmake +++ b/src/cmake/thirdparty/SetupHDF5.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/conf.py b/src/conf.py index e227c224eb..f662a92b0d 100644 --- a/src/conf.py +++ b/src/conf.py @@ -78,7 +78,7 @@ # General information about the project. project = u'Axom' -copyright = u'2017-2023, Lawrence Livermore National Security, LLNS' +copyright = u'2017-2024, Lawrence Livermore National Security, LLNS' # -- Option for numbering figures/tables/etc.----------------------------------- # Note: numfig requires Sphinx (1.3+) diff --git a/src/docs/CMakeLists.txt b/src/docs/CMakeLists.txt index f22195a3b9..e8eff3bbbc 100644 --- a/src/docs/CMakeLists.txt +++ b/src/docs/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/doxygen/CMakeLists.txt b/src/docs/doxygen/CMakeLists.txt index 1a3f035304..728d9c1f19 100644 --- a/src/docs/doxygen/CMakeLists.txt +++ b/src/docs/doxygen/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/licenses.rst b/src/docs/licenses.rst index f00c81d2e4..60eb4e415d 100644 --- a/src/docs/licenses.rst +++ b/src/docs/licenses.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/coding_guide/index.rst b/src/docs/sphinx/coding_guide/index.rst index 3a5df4938d..e2f1222db9 100644 --- a/src/docs/sphinx/coding_guide/index.rst +++ b/src/docs/sphinx/coding_guide/index.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/coding_guide/references.rst b/src/docs/sphinx/coding_guide/references.rst index 0def332fec..6324b5ad4c 100644 --- a/src/docs/sphinx/coding_guide/references.rst +++ b/src/docs/sphinx/coding_guide/references.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/coding_guide/sec01_changing_code.rst b/src/docs/sphinx/coding_guide/sec01_changing_code.rst index 1b2b40bf43..7b04a66d45 100644 --- a/src/docs/sphinx/coding_guide/sec01_changing_code.rst +++ b/src/docs/sphinx/coding_guide/sec01_changing_code.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/coding_guide/sec02_names.rst b/src/docs/sphinx/coding_guide/sec02_names.rst index 7b88f0f7c8..9a74330940 100644 --- a/src/docs/sphinx/coding_guide/sec02_names.rst +++ b/src/docs/sphinx/coding_guide/sec02_names.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/coding_guide/sec03_dir_org.rst b/src/docs/sphinx/coding_guide/sec03_dir_org.rst index d5a639c94d..db1cb268ff 100644 --- a/src/docs/sphinx/coding_guide/sec03_dir_org.rst +++ b/src/docs/sphinx/coding_guide/sec03_dir_org.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/coding_guide/sec04_header_org.rst b/src/docs/sphinx/coding_guide/sec04_header_org.rst index 77082a339e..1db08ae897 100644 --- a/src/docs/sphinx/coding_guide/sec04_header_org.rst +++ b/src/docs/sphinx/coding_guide/sec04_header_org.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/coding_guide/sec05_source_org.rst b/src/docs/sphinx/coding_guide/sec05_source_org.rst index 5590eb2b02..46743d9792 100644 --- a/src/docs/sphinx/coding_guide/sec05_source_org.rst +++ b/src/docs/sphinx/coding_guide/sec05_source_org.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/coding_guide/sec06_scope.rst b/src/docs/sphinx/coding_guide/sec06_scope.rst index df91e12801..ec3979827c 100644 --- a/src/docs/sphinx/coding_guide/sec06_scope.rst +++ b/src/docs/sphinx/coding_guide/sec06_scope.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/coding_guide/sec07_documentation.rst b/src/docs/sphinx/coding_guide/sec07_documentation.rst index c197ca3c5e..671ef063e6 100644 --- a/src/docs/sphinx/coding_guide/sec07_documentation.rst +++ b/src/docs/sphinx/coding_guide/sec07_documentation.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) @@ -215,7 +215,7 @@ files. .. code-block:: cpp /* - * Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC. + * Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC. * Produced at the Lawrence Livermore National Laboratory. * * All rights reserved. diff --git a/src/docs/sphinx/coding_guide/sec08_design_implement.rst b/src/docs/sphinx/coding_guide/sec08_design_implement.rst index 9e2d2de1ed..a8886896c8 100644 --- a/src/docs/sphinx/coding_guide/sec08_design_implement.rst +++ b/src/docs/sphinx/coding_guide/sec08_design_implement.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/coding_guide/sec09_format.rst b/src/docs/sphinx/coding_guide/sec09_format.rst index 9765d35bf7..a79b5f68b3 100644 --- a/src/docs/sphinx/coding_guide/sec09_format.rst +++ b/src/docs/sphinx/coding_guide/sec09_format.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/coding_guide/sec10_dev_macros.rst b/src/docs/sphinx/coding_guide/sec10_dev_macros.rst index 095de25658..cf92fd2956 100644 --- a/src/docs/sphinx/coding_guide/sec10_dev_macros.rst +++ b/src/docs/sphinx/coding_guide/sec10_dev_macros.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/coding_guide/sec11_portability.rst b/src/docs/sphinx/coding_guide/sec11_portability.rst index e131633bde..bd913b599f 100644 --- a/src/docs/sphinx/coding_guide/sec11_portability.rst +++ b/src/docs/sphinx/coding_guide/sec11_portability.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/dev_guide/component_org.rst b/src/docs/sphinx/dev_guide/component_org.rst index cb30b79f36..b5bfeec236 100644 --- a/src/docs/sphinx/dev_guide/component_org.rst +++ b/src/docs/sphinx/dev_guide/component_org.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/dev_guide/continuous_integration.rst b/src/docs/sphinx/dev_guide/continuous_integration.rst index 57e48cfa8e..a003f8b314 100644 --- a/src/docs/sphinx/dev_guide/continuous_integration.rst +++ b/src/docs/sphinx/dev_guide/continuous_integration.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/dev_guide/dev_summary.rst b/src/docs/sphinx/dev_guide/dev_summary.rst index ce723a6aaf..7185a659a9 100644 --- a/src/docs/sphinx/dev_guide/dev_summary.rst +++ b/src/docs/sphinx/dev_guide/dev_summary.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/dev_guide/gitflow_branching.rst b/src/docs/sphinx/dev_guide/gitflow_branching.rst index 236ae8b1d8..411a1c9592 100644 --- a/src/docs/sphinx/dev_guide/gitflow_branching.rst +++ b/src/docs/sphinx/dev_guide/gitflow_branching.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/dev_guide/github.rst b/src/docs/sphinx/dev_guide/github.rst index 6f75e94863..b7cbc37d98 100644 --- a/src/docs/sphinx/dev_guide/github.rst +++ b/src/docs/sphinx/dev_guide/github.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/dev_guide/gpu_porting.rst b/src/docs/sphinx/dev_guide/gpu_porting.rst index f9eaa22957..cf0ffaca9f 100644 --- a/src/docs/sphinx/dev_guide/gpu_porting.rst +++ b/src/docs/sphinx/dev_guide/gpu_porting.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/dev_guide/index.rst b/src/docs/sphinx/dev_guide/index.rst index 5ede84dad1..80f8b6a96d 100644 --- a/src/docs/sphinx/dev_guide/index.rst +++ b/src/docs/sphinx/dev_guide/index.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/dev_guide/misc_tasks.rst b/src/docs/sphinx/dev_guide/misc_tasks.rst index cde8160614..753376ca7d 100644 --- a/src/docs/sphinx/dev_guide/misc_tasks.rst +++ b/src/docs/sphinx/dev_guide/misc_tasks.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/dev_guide/pull_requests.rst b/src/docs/sphinx/dev_guide/pull_requests.rst index 57c94d6d75..e26ca82d2d 100644 --- a/src/docs/sphinx/dev_guide/pull_requests.rst +++ b/src/docs/sphinx/dev_guide/pull_requests.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/dev_guide/release.rst b/src/docs/sphinx/dev_guide/release.rst index d803898f1d..d4cc93bca6 100644 --- a/src/docs/sphinx/dev_guide/release.rst +++ b/src/docs/sphinx/dev_guide/release.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/dev_guide/semantic_versioning.rst b/src/docs/sphinx/dev_guide/semantic_versioning.rst index ac614caab1..d0f98c1655 100644 --- a/src/docs/sphinx/dev_guide/semantic_versioning.rst +++ b/src/docs/sphinx/dev_guide/semantic_versioning.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/dev_guide/testing.rst b/src/docs/sphinx/dev_guide/testing.rst index 34564cea85..c9e22d7c87 100644 --- a/src/docs/sphinx/dev_guide/testing.rst +++ b/src/docs/sphinx/dev_guide/testing.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/dev_guide/updating_tpls.rst b/src/docs/sphinx/dev_guide/updating_tpls.rst index a546f03f05..82536f4159 100644 --- a/src/docs/sphinx/dev_guide/updating_tpls.rst +++ b/src/docs/sphinx/dev_guide/updating_tpls.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/quickstart_guide/config_build.rst b/src/docs/sphinx/quickstart_guide/config_build.rst index 167216e178..2629bb834e 100644 --- a/src/docs/sphinx/quickstart_guide/config_build.rst +++ b/src/docs/sphinx/quickstart_guide/config_build.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/quickstart_guide/index.rst b/src/docs/sphinx/quickstart_guide/index.rst index 00448f076f..393092af7e 100644 --- a/src/docs/sphinx/quickstart_guide/index.rst +++ b/src/docs/sphinx/quickstart_guide/index.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/quickstart_guide/the_code.rst b/src/docs/sphinx/quickstart_guide/the_code.rst index 953d8c6cbb..c8d3878a9d 100644 --- a/src/docs/sphinx/quickstart_guide/the_code.rst +++ b/src/docs/sphinx/quickstart_guide/the_code.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/docs/sphinx/quickstart_guide/zero_to_axom.rst b/src/docs/sphinx/quickstart_guide/zero_to_axom.rst index 29dd1794d5..a37e337619 100644 --- a/src/docs/sphinx/quickstart_guide/zero_to_axom.rst +++ b/src/docs/sphinx/quickstart_guide/zero_to_axom.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt index faa87bb5ab..9deb328ee9 100644 --- a/src/examples/CMakeLists.txt +++ b/src/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/examples/using-with-blt/CMakeLists.txt b/src/examples/using-with-blt/CMakeLists.txt index bd0630cf94..8a1846f203 100644 --- a/src/examples/using-with-blt/CMakeLists.txt +++ b/src/examples/using-with-blt/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/examples/using-with-blt/example.cpp b/src/examples/using-with-blt/example.cpp index 3cac54a58b..816ddbf984 100644 --- a/src/examples/using-with-blt/example.cpp +++ b/src/examples/using-with-blt/example.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/examples/using-with-blt/host-config.cmake.in b/src/examples/using-with-blt/host-config.cmake.in index fe6e9620f0..e039d671e2 100644 --- a/src/examples/using-with-blt/host-config.cmake.in +++ b/src/examples/using-with-blt/host-config.cmake.in @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/examples/using-with-cmake/CMakeLists.txt b/src/examples/using-with-cmake/CMakeLists.txt index e127e9bdfc..14142882f0 100644 --- a/src/examples/using-with-cmake/CMakeLists.txt +++ b/src/examples/using-with-cmake/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/examples/using-with-cmake/example.cpp b/src/examples/using-with-cmake/example.cpp index 3cac54a58b..816ddbf984 100644 --- a/src/examples/using-with-cmake/example.cpp +++ b/src/examples/using-with-cmake/example.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/examples/using-with-cmake/host-config.cmake.in b/src/examples/using-with-cmake/host-config.cmake.in index 30b62805ae..527b4a8e48 100644 --- a/src/examples/using-with-cmake/host-config.cmake.in +++ b/src/examples/using-with-cmake/host-config.cmake.in @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/examples/using-with-make/Makefile.in b/src/examples/using-with-make/Makefile.in index c323f49090..dc754c6281 100644 --- a/src/examples/using-with-make/Makefile.in +++ b/src/examples/using-with-make/Makefile.in @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/examples/using-with-make/example.cpp b/src/examples/using-with-make/example.cpp index 45de7da081..e2186c1a0c 100644 --- a/src/examples/using-with-make/example.cpp +++ b/src/examples/using-with-make/example.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/index.rst b/src/index.rst index b3421c8fcf..091ee817bd 100644 --- a/src/index.rst +++ b/src/index.rst @@ -1,4 +1,4 @@ -.. ## Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +.. ## Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and .. ## other Axom Project Developers. See the top-level LICENSE file for details. .. ## .. ## SPDX-License-Identifier: (BSD-3-Clause) @@ -181,7 +181,7 @@ Axom Copyright and License Information Please see the :ref:`axom-license`. -Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC. +Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory. LLNL-CODE-741217 diff --git a/src/thirdparty/CMakeLists.txt b/src/thirdparty/CMakeLists.txt index 545f2b3204..1b9e6ae643 100644 --- a/src/thirdparty/CMakeLists.txt +++ b/src/thirdparty/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/axom/fmt.hpp b/src/thirdparty/axom/fmt.hpp index 0e70bd00bf..2ee5e54eee 100644 --- a/src/thirdparty/axom/fmt.hpp +++ b/src/thirdparty/axom/fmt.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/CMakeLists.txt b/src/thirdparty/tests/CMakeLists.txt index be84e1e291..174e17e13a 100644 --- a/src/thirdparty/tests/CMakeLists.txt +++ b/src/thirdparty/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/c2c_smoke.cpp b/src/thirdparty/tests/c2c_smoke.cpp index 89b2b5770d..6faca3298f 100644 --- a/src/thirdparty/tests/c2c_smoke.cpp +++ b/src/thirdparty/tests/c2c_smoke.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/cli11_smoke.cpp b/src/thirdparty/tests/cli11_smoke.cpp index 38aebcb38f..7c8f05d1b2 100644 --- a/src/thirdparty/tests/cli11_smoke.cpp +++ b/src/thirdparty/tests/cli11_smoke.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/compiler_flag_fortran_preprocessor.F b/src/thirdparty/tests/compiler_flag_fortran_preprocessor.F index d6db89a045..9e70af5f64 100644 --- a/src/thirdparty/tests/compiler_flag_fortran_preprocessor.F +++ b/src/thirdparty/tests/compiler_flag_fortran_preprocessor.F @@ -1,4 +1,4 @@ -! Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. ! ! SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/compiler_flag_omp_pragma.cpp b/src/thirdparty/tests/compiler_flag_omp_pragma.cpp index 5b2a42b3b0..58fa14087b 100644 --- a/src/thirdparty/tests/compiler_flag_omp_pragma.cpp +++ b/src/thirdparty/tests/compiler_flag_omp_pragma.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/compiler_flag_strict_aliasing.cpp b/src/thirdparty/tests/compiler_flag_strict_aliasing.cpp index 10ad0a5987..2a467d6897 100644 --- a/src/thirdparty/tests/compiler_flag_strict_aliasing.cpp +++ b/src/thirdparty/tests/compiler_flag_strict_aliasing.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/compiler_flag_uninitialized.cpp b/src/thirdparty/tests/compiler_flag_uninitialized.cpp index 8dc3bc4eca..9a897a51d0 100644 --- a/src/thirdparty/tests/compiler_flag_uninitialized.cpp +++ b/src/thirdparty/tests/compiler_flag_uninitialized.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp b/src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp index 68d15d90b7..1799d6b5f6 100644 --- a/src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp +++ b/src/thirdparty/tests/compiler_flag_unused_local_typedef.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/compiler_flag_unused_param.cpp b/src/thirdparty/tests/compiler_flag_unused_param.cpp index a23b5b3f3b..2304b2a971 100644 --- a/src/thirdparty/tests/compiler_flag_unused_param.cpp +++ b/src/thirdparty/tests/compiler_flag_unused_param.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/compiler_flag_unused_var.cpp b/src/thirdparty/tests/compiler_flag_unused_var.cpp index 59775bf628..b566e8be73 100644 --- a/src/thirdparty/tests/compiler_flag_unused_var.cpp +++ b/src/thirdparty/tests/compiler_flag_unused_var.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/conduit_smoke.cpp b/src/thirdparty/tests/conduit_smoke.cpp index e991d9529e..5505f5db7d 100644 --- a/src/thirdparty/tests/conduit_smoke.cpp +++ b/src/thirdparty/tests/conduit_smoke.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/fmt_smoke.cpp b/src/thirdparty/tests/fmt_smoke.cpp index ca796b56d8..a7ffeaa920 100644 --- a/src/thirdparty/tests/fmt_smoke.cpp +++ b/src/thirdparty/tests/fmt_smoke.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/hdf5_smoke.cpp b/src/thirdparty/tests/hdf5_smoke.cpp index 5b907f61dd..5ccafe291e 100644 --- a/src/thirdparty/tests/hdf5_smoke.cpp +++ b/src/thirdparty/tests/hdf5_smoke.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/mfem_smoke.cpp b/src/thirdparty/tests/mfem_smoke.cpp index 82d9bd27b1..3208b9d450 100644 --- a/src/thirdparty/tests/mfem_smoke.cpp +++ b/src/thirdparty/tests/mfem_smoke.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/raja_smoke.cpp b/src/thirdparty/tests/raja_smoke.cpp index 7a6acbf44c..0bd39b4b96 100644 --- a/src/thirdparty/tests/raja_smoke.cpp +++ b/src/thirdparty/tests/raja_smoke.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/sol_smoke.cpp b/src/thirdparty/tests/sol_smoke.cpp index 4e35561074..3f0c7b52b7 100644 --- a/src/thirdparty/tests/sol_smoke.cpp +++ b/src/thirdparty/tests/sol_smoke.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/sparsehash_smoke.cpp b/src/thirdparty/tests/sparsehash_smoke.cpp index 4252169295..bb1ed3255a 100644 --- a/src/thirdparty/tests/sparsehash_smoke.cpp +++ b/src/thirdparty/tests/sparsehash_smoke.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/thirdparty/tests/umpire_smoke.cpp b/src/thirdparty/tests/umpire_smoke.cpp index 94fac6c19f..f83e30b084 100644 --- a/src/thirdparty/tests/umpire_smoke.cpp +++ b/src/thirdparty/tests/umpire_smoke.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index ec7fafc25d..448f653d53 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/tools/convert_sidre_protocol.cpp b/src/tools/convert_sidre_protocol.cpp index 244597e069..c9de60aec5 100644 --- a/src/tools/convert_sidre_protocol.cpp +++ b/src/tools/convert_sidre_protocol.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/tools/data_collection_util.cpp b/src/tools/data_collection_util.cpp index fbdee7fd9f..7e9716dfda 100644 --- a/src/tools/data_collection_util.cpp +++ b/src/tools/data_collection_util.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/tools/mesh_tester.cpp b/src/tools/mesh_tester.cpp index eea2c6ecad..c045a27645 100644 --- a/src/tools/mesh_tester.cpp +++ b/src/tools/mesh_tester.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) From 51366323b2ad4456e0eb96964e470565f728016c Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 1 Feb 2024 12:00:31 -0800 Subject: [PATCH 427/639] Upgrades copyrightPrepender script to python3 --- scripts/copyrightPrepender.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/copyrightPrepender.py b/scripts/copyrightPrepender.py index f1a421064e..8362a02014 100755 --- a/scripts/copyrightPrepender.py +++ b/scripts/copyrightPrepender.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. @@ -9,8 +9,6 @@ # # The script takes a directory and checks all files in the directory. # If the second line in the file does not match the copyright string, we add it. -# -# Modified from an initial script by P. Sinha import os import sys @@ -30,11 +28,11 @@ def checkAndAddCopyrightHeader(filename, testOnly=False): first_line = f.readline() # First line might be a c-style comment opener second_line = f.readline() # So, we also check the second line - print " Processing file:", filename, + print(" Processing file:", filename, end=' ') if not axom_copyright_begin_str in first_line and not axom_copyright_begin_str in second_line: if testOnly: - print "\t missing copyright statement." + print("\t missing copyright statement.") else: lines = f.readlines() f.seek(0) @@ -42,9 +40,9 @@ def checkAndAddCopyrightHeader(filename, testOnly=False): f.write(first_line) f.write(second_line) f.writelines(lines) - print "\t prepended copyright statement." + print("\t prepended copyright statement.") else: - print "\t already has copyright statement." + print("\t already has copyright statement.") def fileNameGenerator(rootDir, validExtensions, isRecursive=False): @@ -85,7 +83,7 @@ def fileNameGenerator(rootDir, validExtensions, isRecursive=False): args = parser.parse_args() ## Iterate through files, check for and add copyright notice - print "Looking at directory {}".format( args.dir ) + print("Looking at directory {}".format( args.dir )) for fullFileName in fileNameGenerator(args.dir, valid_extensions, args.isRecursive): checkAndAddCopyrightHeader(fullFileName, args.test) From 7faa147983954626df5072ae2f1dc5487cc137ff Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 1 Feb 2024 17:51:23 -0800 Subject: [PATCH 428/639] Refactor closest point test code for extending to 3D. --- src/axom/quest/examples/CMakeLists.txt | 2 +- ...est_distributed_distance_query_example.cpp | 592 ++++++++++-------- 2 files changed, 315 insertions(+), 279 deletions(-) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index d518f59084..d851b5dfca 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -194,7 +194,7 @@ if(AXOM_ENABLE_MPI AND AXOM_ENABLE_SIDRE AND HDF5_FOUND) NAME ${_test} COMMAND quest_distributed_distance_query_ex --mesh-file ${quest_data_dir}/${_mesh}.root - --num-samples 500 + --equator-resolution 500 --center 1.2 1.5 --radius 0.75 --obj-domain-count-range 0 2 diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index 43f6d232fd..fc34d819cd 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -51,6 +51,9 @@ namespace numerics = axom::numerics; using RuntimePolicy = axom::runtime_policy::Policy; +// MPI stuff, initialized in main() +int my_rank = -1, num_ranks = -1; + // converts the input string into an 80 character string // padded on both sides with '=' symbols std::string banner(const std::string& str) @@ -67,9 +70,13 @@ struct Input std::string objectFile {"object_mesh"}; double circleRadius {1.0}; - std::vector circleCenter {0.0, 0.0}; // TODO: Ensure that circleCenter size matches dimensionality. + std::vector circleCenter {0.0, 0.0}; int circlePoints {100}; + + double polarSpread {0.0}; + int polarResolution {20}; + RuntimePolicy policy {RuntimePolicy::seq}; double distThreshold {std::numeric_limits::max()}; @@ -138,22 +145,34 @@ struct Input ->capture_default_str(); app.add_option("-r,--radius", circleRadius) - ->description("Radius for circle") + ->description("Radius for sphere") ->capture_default_str(); - auto* circle_options = - app.add_option_group("circle", - "Options for setting up the circle of points"); - circle_options->add_option("--center", circleCenter) + auto* object_options = + app.add_option_group("sphere", + "Options for setting up object points on the sphere"); + object_options->add_option("--center", circleCenter) ->description("Center for object (x,y[,z])") ->expected(2, 3); - circle_options->add_option("--obj-domain-count-range", objDomainCountRange) - ->description("Range of object domain counts/rank (min, max)") + object_options->add_option("--obj-domain-count-range", objDomainCountRange) + ->description("Range of object domain counts per rank (min, max)") ->expected(2); - app.add_flag("--random-spacing,!--no-random-spacing", randomSpacing) - ->description("Enable/disable random spacing of circle points") + object_options->add_flag("--random-spacing,!--no-random-spacing", randomSpacing) + ->description("Enable/disable random spacing of object points") + ->capture_default_str(); + + object_options->add_option("-n,--equator-resolution", circlePoints) + ->description("Number of points around the equatorial direction") + ->capture_default_str(); + + object_options->add_option("--polar-spread", polarSpread) + ->description("Object range away from equator, in degrees") + ->capture_default_str(); + + object_options->add_option("--polar-resolution", polarResolution) + ->description("Number of points in the polar direction") ->capture_default_str(); app.add_option("-d,--dist-threshold", distThreshold) @@ -161,10 +180,6 @@ struct Input ->description("Distance threshold to search") ->capture_default_str(); - app.add_option("-n,--num-samples", circlePoints) - ->description("Number of points for circle") - ->capture_default_str(); - app.add_option("-p, --policy", policy) ->description("Set runtime policy for point query method") ->capture_default_str() @@ -186,19 +201,19 @@ struct Input } }; +// Input params set in main() +Input params; + /** * \brief Simple wrapper to a blueprint particle mesh * * Given a sidre Group, creates the stubs for a mesh blueptint particle mesh + * + * BlueprintParticleMesh is used by both the object mesh and the uery mesh. */ struct BlueprintParticleMesh { public: - using Point2D = primal::Point; - using Point3D = primal::Point; - using PointArray2D = axom::Array; - using PointArray3D = axom::Array; - explicit BlueprintParticleMesh(sidre::Group* group, const std::string& topology, const std::string& coordset) @@ -460,6 +475,45 @@ struct BlueprintParticleMesh return pts; } + void printMeshSizeStats(const std::string& meshLabel) const + { + SLIC_INFO( + axom::fmt::format("{} has {} points in {} domains locally", + meshLabel, + numPoints(), + domain_count())); + + auto getIntMinMax = [](int inVal, int& minVal, int& maxVal, int& sumVal) { + MPI_Allreduce(&inVal, &minVal, 1, MPI_INT, MPI_MIN, MPI_COMM_WORLD); + MPI_Allreduce(&inVal, &maxVal, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD); + MPI_Allreduce(&inVal, &sumVal, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); + }; + + // Output some global mesh size stats + { + int mn, mx, sum; + getIntMinMax(numPoints(), mn, mx, sum); + SLIC_INFO(axom::fmt::format( + "{} has {{min:{}, max:{}, sum:{}, avg:{}}} points", + meshLabel, + mn, + mx, + sum, + (double)sum / num_ranks)); + } + { + int mn, mx, sum; + getIntMinMax(domain_count(), mn, mx, sum); + SLIC_INFO(axom::fmt::format( + "{} has {{min:{}, max:{}, sum:{}, avg:{}}} domains", + meshLabel, + mn, + mx, + sum, + (double)sum / num_ranks)); + } + } + template void registerNodalScalarField(const std::string& fieldName) { @@ -587,6 +641,34 @@ struct BlueprintParticleMesh return axom::ArrayView(data, npts); } + /// Returns an array containing the positions of the mesh vertices + template + axom::Array> getVertexPositions(axom::IndexType domainIdx) + { + // SLIC_ERROR("TODO: get a PointArray from a sidre coordset/values group."); + sidre::Group* cvg = getDomain(domainIdx)->getGroup( + axom::fmt::format("coordsets/{}/values", getCoordsetName())); + int ndim = cvg->getNumViews(); + sidre::View* xv = cvg->getView("x"); + sidre::View* yv = cvg->getView("y"); + sidre::View* zv = ndim == 3 ? cvg->getView("z") : nullptr; + axom::IndexType npts = xv->getNumElements(); + double* xp = xv->getData(); + double* yp = yv->getData(); + double* zp = zv ? (double*)(zv->getData()) : nullptr; + double* xyzs[3] {xp, yp, zp}; + axom::Array> rval(npts, npts); + for(int d = 0; d < ndim; ++d) + { + double* vs = xyzs[d]; + for(int i = 0; i < npts; ++i) + { + rval[i][d] = vs[i]; + } + } + return rval; + } + sidre::Group* getDomain(axom::IndexType domain) { return m_group->getGroup(domain); @@ -680,8 +762,6 @@ struct BlueprintParticleMesh class ObjectMeshWrapper { public: - using Circle = primal::Sphere; - ObjectMeshWrapper(sidre::Group* group) : m_objectMesh(group, "mesh", "coords") { SLIC_ASSERT(group != nullptr); @@ -697,97 +777,6 @@ class ObjectMeshWrapper void setVerbosity(bool verbose) { m_verbose = verbose; } - /** - * Generates a collection of \a numPoints points along a circle. - * Point spacing can be random (default) or uniform. - */ - void generateCircleMesh(const Circle& circle, - int totalNumPoints, - int localDomainCount, - bool randomSpacing = true) - { - using axom::utilities::random_real; - - constexpr int DIM = 2; - using PointType = primal::Point; - using PointArray = axom::Array; - - int rank = m_objectMesh.getRank(); - int nranks = m_objectMesh.getNumRanks(); - - // perform scan on ranks to compute totalNumPoints, thetaStart and thetaEnd - axom::Array sums(nranks, nranks); - { - axom::Array indivDomainCounts(nranks, nranks); - indivDomainCounts.fill(-1); - MPI_Allgather(&localDomainCount, - 1, - MPI_INT, - indivDomainCounts.data(), - 1, - MPI_INT, - MPI_COMM_WORLD); - - SLIC_DEBUG_IF(m_verbose, - axom::fmt::format("After all gather: [{}]", - axom::fmt::join(indivDomainCounts, ","))); - - sums[0] = indivDomainCounts[0]; - for(int i = 1; i < nranks; ++i) - { - sums[i] = sums[i - 1] + indivDomainCounts[i]; - } - // If no rank has any domains, force last one to 1 domain. - if(sums[nranks - 1] == 0) - { - sums[nranks - 1] = 1; - if(rank == nranks - 1) - { - localDomainCount = 1; - } - } - } - - SLIC_DEBUG_IF( - m_verbose, - axom::fmt::format("After scan: [{}]", axom::fmt::join(sums, ","))); - - int globalDomainCount = sums[nranks - 1]; - totalNumPoints = std::max(totalNumPoints, globalDomainCount); - int ptsPerDomain = totalNumPoints / globalDomainCount; - int domainsWithExtraPt = totalNumPoints % globalDomainCount; - - int myDomainBegin = rank == 0 ? 0 : sums[rank - 1]; - int myDomainEnd = sums[rank]; - assert(myDomainEnd - myDomainBegin == localDomainCount); - - double radius = circle.getRadius(); - const auto& center = circle.getCenter(); - const double avgAng = 2. * M_PI / totalNumPoints; - - for(int di = myDomainBegin; di < myDomainEnd; ++di) - { - int pBegin = di * ptsPerDomain + std::min(di, domainsWithExtraPt); - int pEnd = (di + 1) * ptsPerDomain + std::min((di + 1), domainsWithExtraPt); - int domainPointCount = pEnd - pBegin; - PointArray pts(0, domainPointCount); - - for(int pi = pBegin; pi < pEnd; ++pi) - { - const double ang = randomSpacing - ? random_real(avgAng * pBegin, avgAng * pEnd) - : pi * avgAng; - const double rsinT = center[1] + radius * std::sin(ang); - const double rcosT = center[0] + radius * std::cos(ang); - pts.push_back(PointType {rcosT, rsinT}); - } - m_objectMesh.setPoints(di, pts); - } - - axom::slic::flushStreams(); - SLIC_ASSERT(m_objectMesh.isValid()); - } - /// Outputs the object mesh to disk void saveMesh(const std::string& filename = "object_mesh") { @@ -805,8 +794,6 @@ class ObjectMeshWrapper class QueryMeshWrapper { public: - using Circle = primal::Sphere; - //!@brief Construct with blueprint mesh. QueryMeshWrapper(sidre::Group* group, const std::string& meshFilename) : m_queryMesh(group) @@ -823,36 +810,6 @@ class QueryMeshWrapper std::string getTopologyName() const { return m_queryMesh.getTopologyName(); } std::string getCoordsetName() const { return m_queryMesh.getCoordsetName(); } - /// Returns an array containing the positions of the mesh vertices - template - PointArray getVertexPositions(int domainIdx) - { - // SLIC_ERROR("TODO: get a PointArray from a sidre coordset/values group."); - sidre::Group* cvg = m_queryMesh.domain_group(domainIdx)->getGroup( - axom::fmt::format("coordsets/{}/values", m_queryMesh.getCoordsetName())); - int ndim = cvg->getNumViews(); - sidre::View* xv = cvg->getView("x"); - sidre::View* yv = cvg->getView("y"); - sidre::View* zv = ndim == 3 ? cvg->getView("z") : nullptr; - axom::IndexType npts = xv->getNumElements(); - double* xp = xv->getData(); - double* yp = yv->getData(); - double* zp = zv ? (double*)(zv->getData()) : nullptr; - double* xyzs[3] {xp, yp, zp}; - PointArray rval(npts, npts); - for(int d = 0; d < ndim; ++d) - { - double* vs = xyzs[d]; - for(int i = 0; i < npts; ++i) - { - rval[i][d] = vs[i]; - } - } - typename PointArray::value_type pt; - axom::primal::Point pt1; - return rval; - } - /// Saves the mesh to disk void saveMesh(const std::string& filename) { @@ -963,21 +920,20 @@ class QueryMeshWrapper * - check that points within threshold have a closest point * on the object. * - check that found closest-point is near its corresponding - * closest point on the circle (within tolerance) + * closest point on the sphere (within tolerance) * * Return number of errors found on the local mesh partition. * Populate "error_flag" field with the number of errors, for * visualization. * - * Randomized circle points (--random-spacing switch) can cause + * Randomized object points (--random-spacing switch) can cause * false positives, so when it's on, distance inaccuracy is a warning * (not an error) for the purpose of checking. */ - template - int checkClosestPoints(const Circle& circle, const Input& params) + template + int checkClosestPoints(const axom::primal::Sphere& sphere, const Input& params) { - using PointType = Circle::PointType; - using PointArray = axom::Array; + using PointType = axom::primal::Point; m_queryMesh.registerNodalScalarField("error_flag"); @@ -985,7 +941,7 @@ class QueryMeshWrapper int sumWarningCount = 0; for(axom::IndexType dIdx = 0; dIdx < m_queryMesh.domain_count(); ++dIdx) { - PointArray queryPts = m_queryMesh.getPoints(dIdx); + auto queryPts = m_queryMesh.getPoints(dIdx); axom::ArrayView cpCoords = m_queryMesh.getNodalVectorField("cp_coords", dIdx); @@ -1006,8 +962,8 @@ class QueryMeshWrapper } /* - Allowable slack is half the arclength between 2 adjacent circle - points. A query point on the circle can correctly have that + Allowable slack is half the arclength between 2 adjacent object + points. A query point on the object can correctly have that closest-distance, even though the analytical distance is zero. If spacing is random, distance between adjacent points is not predictable, leading to false positives. We don't claim errors @@ -1024,7 +980,7 @@ class QueryMeshWrapper const auto& qPt = queryPts[i]; const auto& cpCoord = cpCoords[i]; - double analyticalDist = std::fabs(circle.computeSignedDistance(qPt)); + double analyticalDist = std::fabs(sphere.computeSignedDistance(qPt)); const bool closestPointFound = (cpIndices[i] == -1); if(closestPointFound) { @@ -1053,12 +1009,12 @@ class QueryMeshWrapper cpCoord)); } - if(!axom::utilities::isNearlyEqual(circle.computeSignedDistance(cpCoord), + if(!axom::utilities::isNearlyEqual(sphere.computeSignedDistance(cpCoord), 0.0)) { errf = true; SLIC_INFO(axom::fmt::format( - "***Error: Closest point ({}) for index {} is not on the circle.", + "***Error: Closest point ({}) for index {} is not on the sphere.", cpCoords[i], i)); } @@ -1104,6 +1060,145 @@ class QueryMeshWrapper BlueprintParticleMesh m_queryMesh; }; +/** + * Generates a collection of \a numPoints points on a sphere. + * Point spacing can be random (default) or uniform. + */ +template +void generateObjectPoints(BlueprintParticleMesh& particleMesh, + const primal::Sphere& sphere, + int totalNumPoints, + int localDomainCount, + bool randomSpacing = true) +{ + using axom::utilities::random_real; + + using PointType = primal::Point; + using PointArray = axom::Array; + + int rank = particleMesh.getRank(); + int nranks = particleMesh.getNumRanks(); + + // perform scan on ranks to compute totalNumPoints, thetaStart and thetaEnd + axom::Array sums(nranks, nranks); + { + axom::Array indivDomainCounts(nranks, nranks); + indivDomainCounts.fill(-1); + MPI_Allgather(&localDomainCount, + 1, + MPI_INT, + indivDomainCounts.data(), + 1, + MPI_INT, + MPI_COMM_WORLD); + + SLIC_DEBUG_IF(params.isVerbose(), + axom::fmt::format("After all gather: [{}]", + axom::fmt::join(indivDomainCounts, ","))); + + sums[0] = indivDomainCounts[0]; + for(int i = 1; i < nranks; ++i) + { + sums[i] = sums[i - 1] + indivDomainCounts[i]; + } + // If no rank has any domains, force last one to 1 domain. + if(sums[nranks - 1] == 0) + { + sums[nranks - 1] = 1; + if(rank == nranks - 1) + { + localDomainCount = 1; + } + } + } + + SLIC_DEBUG_IF( + params.isVerbose(), + axom::fmt::format("After scan: [{}]", axom::fmt::join(sums, ","))); + + int globalDomainCount = sums[nranks - 1]; + totalNumPoints = std::max(totalNumPoints, globalDomainCount); + int ptsPerDomain = totalNumPoints / globalDomainCount; + int domainsWithExtraPt = totalNumPoints % globalDomainCount; + + int myDomainBegin = rank == 0 ? 0 : sums[rank - 1]; + int myDomainEnd = sums[rank]; + assert(myDomainEnd - myDomainBegin == localDomainCount); + + double radius = sphere.getRadius(); + const auto& center = sphere.getCenter(); + const double avgAng = 2. * M_PI / totalNumPoints; + + for(int di = myDomainBegin; di < myDomainEnd; ++di) + { + int pBegin = di * ptsPerDomain + std::min(di, domainsWithExtraPt); + int pEnd = (di + 1) * ptsPerDomain + std::min((di + 1), domainsWithExtraPt); + int domainPointCount = pEnd - pBegin; + PointArray pts(0, domainPointCount); + + for(int pi = pBegin; pi < pEnd; ++pi) + { + const double ang = randomSpacing + ? random_real(avgAng * pBegin, avgAng * pEnd) + : pi * avgAng; + const double rsinT = center[1] + radius * std::sin(ang); + const double rcosT = center[0] + radius * std::cos(ang); + pts.push_back(PointType {rcosT, rsinT}); + } + particleMesh.setPoints(di, pts); + } + + axom::slic::flushStreams(); + SLIC_ASSERT(particleMesh.isValid()); +} + +//--------------------------------------------------------------------------- +// Transform closest points to distances and directions +//--------------------------------------------------------------------------- +template +void computeDistancesAndDirections(BlueprintParticleMesh &queryMesh, + const std::string& cpCoordsField, + const std::string& cpIndexField, + const std::string& distanceField, + const std::string& directionField) +{ + SLIC_ASSERT(queryMesh.dimension() == DIM); + + using primal::squared_distance; + using PointType = primal::Point; + using PointArray = axom::Array; + using IndexSet = slam::PositionSet<>; + + PointType nowhere(std::numeric_limits::signaling_NaN()); + const double nodist = std::numeric_limits::signaling_NaN(); + + queryMesh.registerNodalScalarField(distanceField); + queryMesh.registerNodalVectorField(directionField); + for(axom::IndexType di = 0; di < queryMesh.domain_count(); ++di) + { + auto cpCoords = queryMesh.getNodalVectorField(cpCoordsField, di); + + auto cpIndices = + queryMesh.getNodalScalarField(cpIndexField, di); + + PointArray qPts = queryMesh.getVertexPositions(di); + axom::ArrayView distances = + queryMesh.getNodalScalarField("distance", di); + axom::ArrayView directions = + queryMesh.getNodalVectorField("direction", di); + axom::IndexType ptCount = queryMesh.numPoints(di); + for(auto ptIdx : IndexSet(ptCount)) + { + const bool has_cp = cpIndices[ptIdx] >= 0; + const PointType& cp = has_cp ? cpCoords[ptIdx] : nowhere; + distances[ptIdx] = + has_cp ? sqrt(squared_distance(qPts[ptIdx], cp)) : nodist; + directions[ptIdx] = + PointType(has_cp ? (cp - qPts[ptIdx]).array() : nowhere.array()); + } + } +} + void make_coords_contiguous(conduit::Node& coordValues) { bool isInterleaved = conduit::blueprint::mcarray::is_interleaved(coordValues); @@ -1163,7 +1258,6 @@ void finalizeLogger() int main(int argc, char** argv) { MPI_Init(&argc, &argv); - int my_rank, num_ranks; MPI_Comm_rank(MPI_COMM_WORLD, &my_rank); MPI_Comm_size(MPI_COMM_WORLD, &num_ranks); @@ -1173,7 +1267,6 @@ int main(int argc, char** argv) //--------------------------------------------------------------------------- // Set up and parse command line arguments //--------------------------------------------------------------------------- - Input params; axom::CLI::App app {"Driver for distributed distance query"}; try @@ -1199,17 +1292,10 @@ int main(int argc, char** argv) { SLIC_INFO(axom::fmt::format( "***Warning: Result-checking may yield false positive (warnings) when " - "circle points have random spacing. High resolution helps limit this." + "sphere points have random spacing. High resolution helps limit this." "We recommend at least 500 points for each radius length unit.")); } - constexpr int DIM = 2; - - using PointType = primal::Point; - using PointArray = axom::Array; - using IndexSet = slam::PositionSet<>; - using Circle = primal::Sphere; - #if defined(AXOM_USE_UMPIRE) //--------------------------------------------------------------------------- // Memory resource. For testing, choose device memory if appropriate. @@ -1234,14 +1320,27 @@ int main(int argc, char** argv) umpire::Allocator umpireAllocator = rm.getAllocator(umpireResourceName); #endif + // Storage for meshes. + sidre::DataStore dataStore; + //--------------------------------------------------------------------------- - // Load/generate object mesh + // Load computational mesh and generate a particle mesh over its nodes + // These will be used to query the closest points on the object mesh(es) //--------------------------------------------------------------------------- - const Circle circle( - PointType(params.circleCenter.data(), params.circleCenter.size()), - params.circleRadius); + QueryMeshWrapper queryMeshWrapper( + dataStore.getRoot()->createGroup("queryMesh", true), + params.meshFile); + // queryMeshWrapper.print_mesh_info(); - sidre::DataStore dataStore; + if(params.isVerbose()) { queryMeshWrapper.getParticleMesh().printMeshSizeStats("Query mesh"); } + slic::flushStreams(); + + const size_t spatialDim = queryMeshWrapper.getParticleMesh().dimension(); + SLIC_ASSERT(params.circleCenter.size() == spatialDim); + + //--------------------------------------------------------------------------- + // Generate object mesh + //--------------------------------------------------------------------------- ObjectMeshWrapper objectMeshWrapper( dataStore.getRoot()->createGroup("object_mesh", true)); @@ -1253,85 +1352,32 @@ int main(int argc, char** argv) const unsigned int omax = params.objDomainCountRange[1]; const double prob = axom::utilities::random_real(0., 1.); int localDomainCount = omin + int(0.5 + prob * (omax - omin)); - objectMeshWrapper.generateCircleMesh(circle, - params.circlePoints, - localDomainCount, - params.randomSpacing); + if(spatialDim == 2) + { + primal::Point center(params.circleCenter.data()); + primal::Sphere sphere(center, params.circleRadius); + generateObjectPoints(objectMeshWrapper.getParticleMesh(), + sphere, + params.circlePoints, + localDomainCount, + params.randomSpacing); + } + else if(spatialDim == 3) + { + primal::Point center(params.circleCenter.data()); + primal::Sphere sphere(center, params.circleRadius); + generateObjectPoints(objectMeshWrapper.getParticleMesh(), + sphere, + params.circlePoints, + localDomainCount, + params.randomSpacing); + } } - SLIC_INFO_IF( - params.isVerbose(), - axom::fmt::format("Object mesh has {} points in {} domains locally", - objectMeshWrapper.getParticleMesh().numPoints(), - objectMeshWrapper.getParticleMesh().domain_count())); - - objectMeshWrapper.saveMesh(params.objectFile); - slic::flushStreams(); - - //--------------------------------------------------------------------------- - // Load computational mesh and generate a particle mesh over its nodes - // These will be used to query the closest points on the object mesh(es) - //--------------------------------------------------------------------------- - QueryMeshWrapper queryMeshWrapper( - dataStore.getRoot()->createGroup("queryMesh", true), - params.meshFile); - // queryMeshWrapper.print_mesh_info(); - - SLIC_INFO_IF( - params.isVerbose(), - axom::fmt::format("Query mesh has {} points in {} domains locally", - queryMeshWrapper.getParticleMesh().numPoints(), - queryMeshWrapper.getParticleMesh().domain_count())); + if(params.isVerbose()) { objectMeshWrapper.getParticleMesh().printMeshSizeStats("Object mesh"); } slic::flushStreams(); - auto getIntMinMax = [](int inVal, int& minVal, int& maxVal, int& sumVal) { - MPI_Allreduce(&inVal, &minVal, 1, MPI_INT, MPI_MIN, MPI_COMM_WORLD); - MPI_Allreduce(&inVal, &maxVal, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD); - MPI_Allreduce(&inVal, &sumVal, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); - }; - - // Output some global mesh size stats - { - int mn, mx, sum; - getIntMinMax(objectMeshWrapper.getParticleMesh().numPoints(), mn, mx, sum); - SLIC_INFO(axom::fmt::format( - "Object mesh has {{min:{}, max:{}, sum:{}, avg:{}}} points", - mn, - mx, - sum, - (double)sum / num_ranks)); - } - { - int mn, mx, sum; - getIntMinMax(objectMeshWrapper.getParticleMesh().domain_count(), mn, mx, sum); - SLIC_INFO(axom::fmt::format( - "Object mesh has {{min:{}, max:{}, sum:{}, avg:{}}} domains", - mn, - mx, - sum, - (double)sum / num_ranks)); - } - { - int mn, mx, sum; - getIntMinMax(queryMeshWrapper.getParticleMesh().numPoints(), mn, mx, sum); - SLIC_INFO(axom::fmt::format( - "Query mesh has {{min:{}, max:{}, sum:{}, avg:{}}} points", - mn, - mx, - sum, - (double)sum / num_ranks)); - } - { - int mn, mx, sum; - getIntMinMax(queryMeshWrapper.getParticleMesh().domain_count(), mn, mx, sum); - SLIC_INFO(axom::fmt::format( - "Query mesh has {{min:{}, max:{}, sum:{}, avg:{}}} domains", - mn, - mx, - sum, - (double)sum / num_ranks)); - } - + objectMeshWrapper.saveMesh(params.objectFile); slic::flushStreams(); //--------------------------------------------------------------------------- @@ -1440,42 +1486,32 @@ int main(int argc, char** argv) int localErrCount = 0; if(params.checkResults) { - localErrCount = queryMeshWrapper.checkClosestPoints(circle, params); + if(spatialDim == 2) + { + primal::Point center(params.circleCenter.data()); + primal::Sphere sphere(center, params.circleRadius); + localErrCount = queryMeshWrapper.checkClosestPoints(sphere, params); + } + else if(spatialDim == 3) + { + primal::Point center(params.circleCenter.data()); + primal::Sphere sphere(center, params.circleRadius); + localErrCount = queryMeshWrapper.checkClosestPoints(sphere, params); + } } MPI_Allreduce(&localErrCount, &errCount, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); - //--------------------------------------------------------------------------- - // Transform closest points to distances and directions - //--------------------------------------------------------------------------- - using primal::squared_distance; - - auto& queryMesh = queryMeshWrapper.getParticleMesh(); - PointType nowhere(std::numeric_limits::signaling_NaN()); - const double nodist = std::numeric_limits::signaling_NaN(); - queryMesh.registerNodalScalarField("distance"); - queryMesh.registerNodalVectorField("direction"); - for(axom::IndexType di = 0; di < queryMesh.domain_count(); ++di) + if(spatialDim == 2) { - auto cpCoords = queryMesh.getNodalVectorField("cp_coords", di); - - auto cpIndices = - queryMesh.getNodalScalarField("cp_index", di); - - PointArray qPts = queryMeshWrapper.getVertexPositions(di); - axom::ArrayView distances = - queryMesh.getNodalScalarField("distance", di); - axom::ArrayView directions = - queryMesh.getNodalVectorField("direction", di); - axom::IndexType ptCount = queryMeshWrapper.getParticleMesh().numPoints(di); - for(auto ptIdx : IndexSet(ptCount)) - { - const bool has_cp = cpIndices[ptIdx] >= 0; - const PointType& cp = has_cp ? cpCoords[ptIdx] : nowhere; - distances[ptIdx] = - has_cp ? sqrt(squared_distance(qPts[ptIdx], cp)) : nodist; - directions[ptIdx] = - PointType(has_cp ? (cp - qPts[ptIdx]).array() : nowhere.array()); - } + computeDistancesAndDirections<2>(queryMeshWrapper.getParticleMesh(), + "cp_coords", "cp_index", + "distance", "direction"); + } + else if(spatialDim == 3) + { + computeDistancesAndDirections<3>(queryMeshWrapper.getParticleMesh(), + "cp_coords", "cp_index", + "distance", "direction"); } // queryMeshNode.print(); From 2cf16ea091c69f4399dae937704ac4c4f8fc034c Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 2 Feb 2024 17:43:15 -0800 Subject: [PATCH 429/639] Extend distributed closest point search test to 3D. --- src/axom/quest/DistributedClosestPoint.cpp | 2 +- src/axom/quest/examples/CMakeLists.txt | 25 +- ...est_distributed_distance_query_example.cpp | 283 ++++++++++-------- 3 files changed, 176 insertions(+), 134 deletions(-) diff --git a/src/axom/quest/DistributedClosestPoint.cpp b/src/axom/quest/DistributedClosestPoint.cpp index 7429aa286d..e7b27b4041 100644 --- a/src/axom/quest/DistributedClosestPoint.cpp +++ b/src/axom/quest/DistributedClosestPoint.cpp @@ -258,7 +258,7 @@ void DistributedClosestPoint::computeClosestPoints(conduit::Node& query_node, case 3: m_dcp_3->setSquaredDistanceThreshold(m_sqDistanceThreshold); m_dcp_3->setMpiCommunicator(m_mpiComm); - m_dcp_2->setOutputSwitches(m_outputRank, + m_dcp_3->setOutputSwitches(m_outputRank, m_outputIndex, m_outputDistance, m_outputCoords, diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index d851b5dfca..8b68d2ac70 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -182,21 +182,34 @@ if(AXOM_ENABLE_MPI AND AXOM_ENABLE_SIDRE AND HDF5_FOUND) endif() # Non-zero empty-rank probability tests domain underloading case - set(_meshes "mdmesh.2x1" "mdmesh.2x3") + set(_meshes "mdmesh.2x1" "mdmesh.2x3" "mdmesh.2x2x1" "mdmeshg.2x2x1") # The mdmesh.* files were generated by these commands: # src/tools/gen-multidom-structured-mesh.py -ml=0,0 -mu=2,2 -ms=100,100 -dc=2,1 -o mdmesh.2x1 # src/tools/gen-multidom-structured-mesh.py -ml=0,0 -mu=2,2 -ms=100,100 -dc=2,3 -o mdmesh.2x3 + # src/tools/gen-multidom-structured-mesh.py -ml=0,0,0 -mu=2,2,2 -ms=20,20,15 -dc=2,2,1 -o mdmeshg.2x2x1 --strided foreach(_pol ${_policies}) foreach(_mesh ${_meshes}) - # Add test with data on all ranks - set(_test "quest_distributed_closest_point_run_2D_${_pol}_${_mesh}") + # Determine problem dimension by mesh filename. + # and set dimension-dependent arguments. + string(REGEX MATCH "\\.[0-9]+(x[0-9]+)+$" _sizes "${_mesh}") + string(REGEX MATCHALL "[0-9]+" _sizes ${_sizes}) + list(LENGTH _sizes _ndim) + + if(_ndim EQUAL 2) + set(_center 0.7 0.9) + elseif(_ndim EQUAL 3) + set(_center 0.7 0.9 0.5) + endif() + + set(_test "quest_distributed_closest_point_run_${_ndim}D_${_pol}_${_mesh}") axom_add_test( NAME ${_test} COMMAND quest_distributed_distance_query_ex --mesh-file ${quest_data_dir}/${_mesh}.root - --equator-resolution 500 - --center 1.2 1.5 - --radius 0.75 + --equator-resolution 60 + --center ${_center} + --radius 0.9 + --lat-point-count 30 --obj-domain-count-range 0 2 --dist-threshold .3 --no-random-spacing diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index fc34d819cd..1748ed306b 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -74,8 +74,8 @@ struct Input std::vector circleCenter {0.0, 0.0}; int circlePoints {100}; - double polarSpread {0.0}; - int polarResolution {20}; + std::vector latRange {-90.0, 90.0}; + int latPointCount {20}; RuntimePolicy policy {RuntimePolicy::seq}; @@ -89,11 +89,9 @@ struct Input private: bool m_verboseOutput {false}; - double m_emptyRankProbability {0.}; public: bool isVerbose() const { return m_verboseOutput; } - double percentEmptyRanks() const { return m_emptyRankProbability; } std::string getDCMeshName() const { @@ -137,20 +135,13 @@ struct Input ->description("Enable/disable verbose output") ->capture_default_str(); - app.add_option("--empty-rank-probability", m_emptyRankProbability) - ->description( - "Probability that a rank's data is empty " - "(tests code's ability to handle empty ranks)") - ->check(axom::CLI::Range(0., 1.)) - ->capture_default_str(); - app.add_option("-r,--radius", circleRadius) ->description("Radius for sphere") ->capture_default_str(); - auto* object_options = - app.add_option_group("sphere", - "Options for setting up object points on the sphere"); + auto* object_options = app.add_option_group( + "sphere", + "Options for setting up object points on the sphere"); object_options->add_option("--center", circleCenter) ->description("Center for object (x,y[,z])") ->expected(2, 3); @@ -159,7 +150,8 @@ struct Input ->description("Range of object domain counts per rank (min, max)") ->expected(2); - object_options->add_flag("--random-spacing,!--no-random-spacing", randomSpacing) + object_options + ->add_flag("--random-spacing,!--no-random-spacing", randomSpacing) ->description("Enable/disable random spacing of object points") ->capture_default_str(); @@ -167,12 +159,12 @@ struct Input ->description("Number of points around the equatorial direction") ->capture_default_str(); - object_options->add_option("--polar-spread", polarSpread) - ->description("Object range away from equator, in degrees") - ->capture_default_str(); + object_options->add_option("--lat-range", latRange) + ->description("Latitude range in degrees from the equator (3D only)") + ->expected(2); - object_options->add_option("--polar-resolution", polarResolution) - ->description("Number of points in the polar direction") + object_options->add_option("--lat-point-count", latPointCount) + ->description("Number of points in the latitudinal direction (3D only)") ->capture_default_str(); app.add_option("-d,--dist-threshold", distThreshold) @@ -368,24 +360,22 @@ struct BlueprintParticleMesh This method is for manually creating the mesh. Don't use it if the mesh is read in. */ - template - void setPoints(axom::IndexType domainId, - const axom::Array>& pts) + void setPoints(axom::IndexType domainId, const axom::Array& pts) { axom::IndexType localIdx = createBlueprintStubs(); SLIC_ASSERT(domain_group(localIdx) != nullptr); domain_group(localIdx)->createViewScalar("state/domain_id", domainId); - const int SZ = pts.size(); + const int SZ = pts.shape()[0]; if(m_dimension == -1) { - m_dimension = NDIMS; + m_dimension = pts.shape()[1]; } else { - SLIC_ASSERT(NDIMS == m_dimension); + SLIC_ASSERT(pts.shape()[1] == m_dimension); } // lambda to create a strided view into the buffer @@ -397,7 +387,7 @@ struct BlueprintParticleMesh int sz) { if(sz > 0) { - grp->createView(path)->attachBuffer(buf)->apply(sz, dim, NDIMS); + grp->createView(path)->attachBuffer(buf)->apply(sz, dim, m_dimension); } else { @@ -405,25 +395,25 @@ struct BlueprintParticleMesh } }; - // create views into a shared buffer for the coordinates, with stride NDIMS + // create views into a shared buffer for the coordinates, with stride m_dimension { auto* buf = domain_group(localIdx) ->getDataStore() - ->createBuffer(sidre::DOUBLE_ID, NDIMS * SZ) + ->createBuffer(sidre::DOUBLE_ID, m_dimension * SZ) ->allocate(); createAndApplyView(coords_group(localIdx), "values/x", buf, 0, SZ); - if(NDIMS > 1) + if(m_dimension > 1) { createAndApplyView(coords_group(localIdx), "values/y", buf, 1, SZ); } - if(NDIMS > 2) + if(m_dimension > 2) { createAndApplyView(coords_group(localIdx), "values/z", buf, 2, SZ); } // copy coordinate data into the buffer - const std::size_t nbytes = sizeof(double) * SZ * NDIMS; + const std::size_t nbytes = sizeof(double) * SZ * m_dimension; axom::copy(buf->getVoidPtr(), pts.data(), nbytes); } @@ -439,13 +429,13 @@ struct BlueprintParticleMesh } } - template - axom::Array> getPoints(int domainIdx) + template + axom::Array> getPoints(int domainIdx) { auto* cGroup = coords_group(domainIdx); auto* xView = cGroup->getView("values/x"); auto* yView = cGroup->getView("values/y"); - auto* zView = NDIMS >= 3 ? cGroup->getView("values/z") : nullptr; + auto* zView = DIM >= 3 ? cGroup->getView("values/z") : nullptr; const auto ptCount = xView->getNumElements(); assert(xView->getStride() == 1); assert(yView->getStride() == 1); @@ -454,7 +444,7 @@ struct BlueprintParticleMesh double* ys = yView->getArray(); double* zs = zView ? (double*)(zView->getArray()) : nullptr; - using PointType = primal::Point; + using PointType = primal::Point; axom::Array pts; pts.resize(ptCount); for(int i = 0; i < ptCount; ++i) @@ -465,11 +455,11 @@ struct BlueprintParticleMesh { pts[i][1] = ys[i]; } - if(NDIMS == 3) + if(DIM == 3) { for(int i = 0; i < ptCount; ++i) { - pts[i][0] = zs[i]; + pts[i][2] = zs[i]; } } return pts; @@ -477,40 +467,39 @@ struct BlueprintParticleMesh void printMeshSizeStats(const std::string& meshLabel) const { - SLIC_INFO( - axom::fmt::format("{} has {} points in {} domains locally", - meshLabel, - numPoints(), - domain_count())); + SLIC_INFO(axom::fmt::format("{} has {} points in {} domains locally", + meshLabel, + numPoints(), + domain_count())); auto getIntMinMax = [](int inVal, int& minVal, int& maxVal, int& sumVal) { - MPI_Allreduce(&inVal, &minVal, 1, MPI_INT, MPI_MIN, MPI_COMM_WORLD); - MPI_Allreduce(&inVal, &maxVal, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD); - MPI_Allreduce(&inVal, &sumVal, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); - }; + MPI_Allreduce(&inVal, &minVal, 1, MPI_INT, MPI_MIN, MPI_COMM_WORLD); + MPI_Allreduce(&inVal, &maxVal, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD); + MPI_Allreduce(&inVal, &sumVal, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); + }; // Output some global mesh size stats { int mn, mx, sum; getIntMinMax(numPoints(), mn, mx, sum); - SLIC_INFO(axom::fmt::format( - "{} has {{min:{}, max:{}, sum:{}, avg:{}}} points", - meshLabel, - mn, - mx, - sum, - (double)sum / num_ranks)); + SLIC_INFO( + axom::fmt::format("{} has {{min:{}, max:{}, sum:{}, avg:{}}} points", + meshLabel, + mn, + mx, + sum, + (double)sum / num_ranks)); } { int mn, mx, sum; getIntMinMax(domain_count(), mn, mx, sum); - SLIC_INFO(axom::fmt::format( - "{} has {{min:{}, max:{}, sum:{}, avg:{}}} domains", - meshLabel, - mn, - mx, - sum, - (double)sum / num_ranks)); + SLIC_INFO( + axom::fmt::format("{} has {{min:{}, max:{}, sum:{}, avg:{}}} domains", + meshLabel, + mn, + mx, + sum, + (double)sum / num_ranks)); } } @@ -931,7 +920,8 @@ class QueryMeshWrapper * (not an error) for the purpose of checking. */ template - int checkClosestPoints(const axom::primal::Sphere& sphere, const Input& params) + int checkClosestPoints(const axom::primal::Sphere& sphere, + const Input& params) { using PointType = axom::primal::Point; @@ -969,8 +959,13 @@ class QueryMeshWrapper predictable, leading to false positives. We don't claim errors for this in when using random. */ - const double avgObjectRes = + const double longSpacing = 2 * M_PI * params.circleRadius / params.circlePoints; + const double latSpacing = params.circleRadius * M_PI / 180 * + (params.latRange[1] - params.latRange[0]) / params.latPointCount; + const double avgObjectRes = DIM == 2 + ? longSpacing + : std::sqrt(longSpacing * longSpacing + latSpacing * latSpacing); const double allowableSlack = avgObjectRes / 2; using IndexSet = slam::PositionSet<>; @@ -1013,10 +1008,12 @@ class QueryMeshWrapper 0.0)) { errf = true; - SLIC_INFO(axom::fmt::format( - "***Error: Closest point ({}) for index {} is not on the sphere.", - cpCoords[i], - i)); + SLIC_INFO( + axom::fmt::format("***Error: Closest point ({}) for index {} " + "({}) is not on the sphere.", + cpCoords[i], + i, + qPt)); } double dist = sqrt(primal::squared_distance(qPt, cpCoord)); @@ -1025,19 +1022,24 @@ class QueryMeshWrapper if(params.randomSpacing) { ++sumWarningCount; - SLIC_INFO(axom::fmt::format( - "***Warning: Closest distance for index {} is {}, off by {}.", - i, - dist, - dist - analyticalDist)); + SLIC_INFO( + axom::fmt::format("***Warning: Closest distance for {} (index " + "{}, cp {}) is {}, off by {}.", + qPt, + i, + cpCoords[i], + dist, + dist - analyticalDist)); } else { errf = true; SLIC_INFO( - axom::fmt::format("***Error: Closest distance for index {} is " - "{}, off by {}.", + axom::fmt::format("***Warning: Closest distance for {} (index " + "{}, cp {}) is {}, off by {}.", + qPt, i, + cpCoords[i], dist, dist - analyticalDist)); } @@ -1061,25 +1063,28 @@ class QueryMeshWrapper }; /** - * Generates a collection of \a numPoints points on a sphere. - * Point spacing can be random (default) or uniform. + * Generates a collection of \a numPoints points on a sphere, + * partitioned into multiple domains. + * Point spacing around equator can be random (default) or uniform. + * 3D points cover the given latitude range. */ -template void generateObjectPoints(BlueprintParticleMesh& particleMesh, - const primal::Sphere& sphere, - int totalNumPoints, + int spatialDimension, + const std::vector& center, + double radius, + int equatorialPointCount, int localDomainCount, - bool randomSpacing = true) + bool randomSpacing = true, + double minLatitude = 0.0, + double maxLatitude = 0.0, + int latPointCount = 1) { using axom::utilities::random_real; - using PointType = primal::Point; - using PointArray = axom::Array; - int rank = particleMesh.getRank(); int nranks = particleMesh.getNumRanks(); - // perform scan on ranks to compute totalNumPoints, thetaStart and thetaEnd + // scan on ranks to compute equatorialPointCount, thetaStart and thetaEnd axom::Array sums(nranks, nranks); { axom::Array indivDomainCounts(nranks, nranks); @@ -1101,7 +1106,7 @@ void generateObjectPoints(BlueprintParticleMesh& particleMesh, { sums[i] = sums[i - 1] + indivDomainCounts[i]; } - // If no rank has any domains, force last one to 1 domain. + // If no rank has any domains, force last one to have 1 domain. if(sums[nranks - 1] == 0) { sums[nranks - 1] = 1; @@ -1117,33 +1122,57 @@ void generateObjectPoints(BlueprintParticleMesh& particleMesh, axom::fmt::format("After scan: [{}]", axom::fmt::join(sums, ","))); int globalDomainCount = sums[nranks - 1]; - totalNumPoints = std::max(totalNumPoints, globalDomainCount); - int ptsPerDomain = totalNumPoints / globalDomainCount; - int domainsWithExtraPt = totalNumPoints % globalDomainCount; + equatorialPointCount = std::max(equatorialPointCount, globalDomainCount); + int ptsPerDomain = equatorialPointCount / globalDomainCount; + int domainsWithExtraPt = equatorialPointCount % globalDomainCount; int myDomainBegin = rank == 0 ? 0 : sums[rank - 1]; int myDomainEnd = sums[rank]; assert(myDomainEnd - myDomainBegin == localDomainCount); - double radius = sphere.getRadius(); - const auto& center = sphere.getCenter(); - const double avgAng = 2. * M_PI / totalNumPoints; + if(spatialDimension == 2) + { + minLatitude = 0.0; + maxLatitude = 0.0; + latPointCount = 1; + } + minLatitude *= M_PI / 180; + maxLatitude *= M_PI / 180; + const double longSpacing = 2. * M_PI / equatorialPointCount; + const double latSpacing = latPointCount < 2 || latPointCount == 1 + ? 0 + : (maxLatitude - minLatitude) / (latPointCount - 1); for(int di = myDomainBegin; di < myDomainEnd; ++di) { int pBegin = di * ptsPerDomain + std::min(di, domainsWithExtraPt); int pEnd = (di + 1) * ptsPerDomain + std::min((di + 1), domainsWithExtraPt); int domainPointCount = pEnd - pBegin; - PointArray pts(0, domainPointCount); + domainPointCount *= latPointCount; + axom::Array pts(domainPointCount, spatialDimension); + axom::IndexType iPts = 0; - for(int pi = pBegin; pi < pEnd; ++pi) + for(int li = 0; li < latPointCount; ++li) { - const double ang = randomSpacing - ? random_real(avgAng * pBegin, avgAng * pEnd) - : pi * avgAng; - const double rsinT = center[1] + radius * std::sin(ang); - const double rcosT = center[0] + radius * std::cos(ang); - pts.push_back(PointType {rcosT, rsinT}); + double latAngle = minLatitude + li * latSpacing; + double xyRadius = radius * std::cos(latAngle); + double z = + spatialDimension == 2 ? 0 : center[2] + radius * std::sin(latAngle); + for(int pi = pBegin; pi < pEnd; ++pi) + { + const double ang = randomSpacing + ? random_real(longSpacing * pBegin, longSpacing * pEnd) + : pi * longSpacing; + const double rsinT = center[1] + xyRadius * std::sin(ang); + const double rcosT = center[0] + xyRadius * std::cos(ang); + pts[iPts][0] = rcosT; + pts[iPts][1] = rsinT; + if(spatialDimension > 2) + { + pts[iPts][2] = z; + } + ++iPts; + } } particleMesh.setPoints(di, pts); } @@ -1155,8 +1184,8 @@ void generateObjectPoints(BlueprintParticleMesh& particleMesh, //--------------------------------------------------------------------------- // Transform closest points to distances and directions //--------------------------------------------------------------------------- -template -void computeDistancesAndDirections(BlueprintParticleMesh &queryMesh, +template +void computeDistancesAndDirections(BlueprintParticleMesh& queryMesh, const std::string& cpCoordsField, const std::string& cpIndexField, const std::string& distanceField, @@ -1332,7 +1361,10 @@ int main(int argc, char** argv) params.meshFile); // queryMeshWrapper.print_mesh_info(); - if(params.isVerbose()) { queryMeshWrapper.getParticleMesh().printMeshSizeStats("Query mesh"); } + if(params.isVerbose()) + { + queryMeshWrapper.getParticleMesh().printMeshSizeStats("Query mesh"); + } slic::flushStreams(); const size_t spatialDim = queryMeshWrapper.getParticleMesh().dimension(); @@ -1352,29 +1384,22 @@ int main(int argc, char** argv) const unsigned int omax = params.objDomainCountRange[1]; const double prob = axom::utilities::random_real(0., 1.); int localDomainCount = omin + int(0.5 + prob * (omax - omin)); - if(spatialDim == 2) - { - primal::Point center(params.circleCenter.data()); - primal::Sphere sphere(center, params.circleRadius); - generateObjectPoints(objectMeshWrapper.getParticleMesh(), - sphere, - params.circlePoints, - localDomainCount, - params.randomSpacing); - } - else if(spatialDim == 3) - { - primal::Point center(params.circleCenter.data()); - primal::Sphere sphere(center, params.circleRadius); - generateObjectPoints(objectMeshWrapper.getParticleMesh(), - sphere, - params.circlePoints, - localDomainCount, - params.randomSpacing); - } + generateObjectPoints(objectMeshWrapper.getParticleMesh(), + spatialDim, + params.circleCenter, + params.circleRadius, + params.circlePoints, + localDomainCount, + params.randomSpacing, + params.latRange.size() > 0 ? params.latRange[0] : 0.0, + params.latRange.size() > 1 ? params.latRange[1] : 0.0, + params.latPointCount); } - if(params.isVerbose()) { objectMeshWrapper.getParticleMesh().printMeshSizeStats("Object mesh"); } + if(params.isVerbose()) + { + objectMeshWrapper.getParticleMesh().printMeshSizeStats("Object mesh"); + } slic::flushStreams(); objectMeshWrapper.saveMesh(params.objectFile); @@ -1504,14 +1529,18 @@ int main(int argc, char** argv) if(spatialDim == 2) { computeDistancesAndDirections<2>(queryMeshWrapper.getParticleMesh(), - "cp_coords", "cp_index", - "distance", "direction"); + "cp_coords", + "cp_index", + "distance", + "direction"); } else if(spatialDim == 3) { computeDistancesAndDirections<3>(queryMeshWrapper.getParticleMesh(), - "cp_coords", "cp_index", - "distance", "direction"); + "cp_coords", + "cp_index", + "distance", + "direction"); } // queryMeshNode.print(); From cff922a57026d331b15414fa8f0885f404f09e17 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 5 Feb 2024 11:00:57 -0800 Subject: [PATCH 430/639] Clean up and auto-format. --- src/axom/quest/examples/CMakeLists.txt | 2 +- ...est_distributed_distance_query_example.cpp | 70 +++++++++---------- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index 8b68d2ac70..732d9dd5bc 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -206,7 +206,7 @@ if(AXOM_ENABLE_MPI AND AXOM_ENABLE_SIDRE AND HDF5_FOUND) NAME ${_test} COMMAND quest_distributed_distance_query_ex --mesh-file ${quest_data_dir}/${_mesh}.root - --equator-resolution 60 + --long-point-count 60 --center ${_center} --radius 0.9 --lat-point-count 30 diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index 1748ed306b..23dc458ae9 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -70,10 +70,10 @@ struct Input std::string objectFile {"object_mesh"}; double circleRadius {1.0}; - // TODO: Ensure that circleCenter size matches dimensionality. std::vector circleCenter {0.0, 0.0}; - int circlePoints {100}; + int longPointCount {100}; + // Latitudinal direction of object mesh std::vector latRange {-90.0, 90.0}; int latPointCount {20}; @@ -155,8 +155,8 @@ struct Input ->description("Enable/disable random spacing of object points") ->capture_default_str(); - object_options->add_option("-n,--equator-resolution", circlePoints) - ->description("Number of points around the equatorial direction") + object_options->add_option("-n,--long-point-count", longPointCount) + ->description("Number of points around the longitudinal direction") ->capture_default_str(); object_options->add_option("--lat-range", latRange) @@ -631,10 +631,8 @@ struct BlueprintParticleMesh } /// Returns an array containing the positions of the mesh vertices - template - axom::Array> getVertexPositions(axom::IndexType domainIdx) + axom::Array getVertexPositions(axom::IndexType domainIdx) { - // SLIC_ERROR("TODO: get a PointArray from a sidre coordset/values group."); sidre::Group* cvg = getDomain(domainIdx)->getGroup( axom::fmt::format("coordsets/{}/values", getCoordsetName())); int ndim = cvg->getNumViews(); @@ -646,13 +644,12 @@ struct BlueprintParticleMesh double* yp = yv->getData(); double* zp = zv ? (double*)(zv->getData()) : nullptr; double* xyzs[3] {xp, yp, zp}; - axom::Array> rval(npts, npts); - for(int d = 0; d < ndim; ++d) + axom::Array rval(npts, ndim); + for(int i = 0; i < npts; ++i) { - double* vs = xyzs[d]; - for(int i = 0; i < npts; ++i) + for(int d = 0; d < ndim; ++d) { - rval[i][d] = vs[i]; + rval[i][d] = xyzs[d][i]; } } return rval; @@ -960,7 +957,7 @@ class QueryMeshWrapper for this in when using random. */ const double longSpacing = - 2 * M_PI * params.circleRadius / params.circlePoints; + 2 * M_PI * params.circleRadius / params.longPointCount; const double latSpacing = params.circleRadius * M_PI / 180 * (params.latRange[1] - params.latRange[0]) / params.latPointCount; const double avgObjectRes = DIM == 2 @@ -1063,16 +1060,15 @@ class QueryMeshWrapper }; /** - * Generates a collection of \a numPoints points on a sphere, - * partitioned into multiple domains. - * Point spacing around equator can be random (default) or uniform. + * Generates points on a sphere, partitioned into multiple domains. + * Point spacing in the longitudinal direction can be random (default) or uniform. * 3D points cover the given latitude range. */ void generateObjectPoints(BlueprintParticleMesh& particleMesh, int spatialDimension, const std::vector& center, double radius, - int equatorialPointCount, + int longPointCount, int localDomainCount, bool randomSpacing = true, double minLatitude = 0.0, @@ -1084,7 +1080,7 @@ void generateObjectPoints(BlueprintParticleMesh& particleMesh, int rank = particleMesh.getRank(); int nranks = particleMesh.getNumRanks(); - // scan on ranks to compute equatorialPointCount, thetaStart and thetaEnd + // rank scan to sum longPointCount and determine local range of longitudinal angles. axom::Array sums(nranks, nranks); { axom::Array indivDomainCounts(nranks, nranks); @@ -1122,13 +1118,13 @@ void generateObjectPoints(BlueprintParticleMesh& particleMesh, axom::fmt::format("After scan: [{}]", axom::fmt::join(sums, ","))); int globalDomainCount = sums[nranks - 1]; - equatorialPointCount = std::max(equatorialPointCount, globalDomainCount); - int ptsPerDomain = equatorialPointCount / globalDomainCount; - int domainsWithExtraPt = equatorialPointCount % globalDomainCount; + longPointCount = std::max(longPointCount, globalDomainCount); + int longPtsPerDomain = longPointCount / globalDomainCount; + int domainsWithExtraPt = longPointCount % globalDomainCount; int myDomainBegin = rank == 0 ? 0 : sums[rank - 1]; int myDomainEnd = sums[rank]; - assert(myDomainEnd - myDomainBegin == localDomainCount); + SLIC_ASSERT(myDomainEnd - myDomainBegin == localDomainCount); if(spatialDimension == 2) { @@ -1138,15 +1134,16 @@ void generateObjectPoints(BlueprintParticleMesh& particleMesh, } minLatitude *= M_PI / 180; maxLatitude *= M_PI / 180; - const double longSpacing = 2. * M_PI / equatorialPointCount; + const double longSpacing = 2. * M_PI / longPointCount; const double latSpacing = latPointCount < 2 || latPointCount == 1 ? 0 : (maxLatitude - minLatitude) / (latPointCount - 1); for(int di = myDomainBegin; di < myDomainEnd; ++di) { - int pBegin = di * ptsPerDomain + std::min(di, domainsWithExtraPt); - int pEnd = (di + 1) * ptsPerDomain + std::min((di + 1), domainsWithExtraPt); + int pBegin = di * longPtsPerDomain + std::min(di, domainsWithExtraPt); + int pEnd = + (di + 1) * longPtsPerDomain + std::min((di + 1), domainsWithExtraPt); int domainPointCount = pEnd - pBegin; domainPointCount *= latPointCount; axom::Array pts(domainPointCount, spatialDimension); @@ -1155,7 +1152,8 @@ void generateObjectPoints(BlueprintParticleMesh& particleMesh, for(int li = 0; li < latPointCount; ++li) { double latAngle = minLatitude + li * latSpacing; - double xyRadius = radius * std::cos(latAngle); + double xyRadius = + radius * std::cos(latAngle); // Project radius onto x-y plane. double z = spatialDimension == 2 ? 0 : center[2] + radius * std::sin(latAngle); for(int pi = pBegin; pi < pEnd; ++pi) @@ -1195,7 +1193,6 @@ void computeDistancesAndDirections(BlueprintParticleMesh& queryMesh, using primal::squared_distance; using PointType = primal::Point; - using PointArray = axom::Array; using IndexSet = slam::PositionSet<>; PointType nowhere(std::numeric_limits::signaling_NaN()); @@ -1210,7 +1207,7 @@ void computeDistancesAndDirections(BlueprintParticleMesh& queryMesh, auto cpIndices = queryMesh.getNodalScalarField(cpIndexField, di); - PointArray qPts = queryMesh.getVertexPositions(di); + axom::Array qPts = queryMesh.getVertexPositions(di); axom::ArrayView distances = queryMesh.getNodalScalarField("distance", di); axom::ArrayView directions = @@ -1220,10 +1217,10 @@ void computeDistancesAndDirections(BlueprintParticleMesh& queryMesh, { const bool has_cp = cpIndices[ptIdx] >= 0; const PointType& cp = has_cp ? cpCoords[ptIdx] : nowhere; - distances[ptIdx] = - has_cp ? sqrt(squared_distance(qPts[ptIdx], cp)) : nodist; + const PointType& qPt = has_cp ? PointType(&qPts[ptIdx][0]) : nowhere; + distances[ptIdx] = has_cp ? sqrt(squared_distance(qPt, cp)) : nodist; directions[ptIdx] = - PointType(has_cp ? (cp - qPts[ptIdx]).array() : nowhere.array()); + PointType(has_cp ? (cp - qPt).array() : nowhere.array()); } } } @@ -1291,7 +1288,6 @@ int main(int argc, char** argv) MPI_Comm_size(MPI_COMM_WORLD, &num_ranks); initializeLogger(); - //slic::setAbortOnWarning(true); //--------------------------------------------------------------------------- // Set up and parse command line arguments @@ -1353,13 +1349,13 @@ int main(int argc, char** argv) sidre::DataStore dataStore; //--------------------------------------------------------------------------- - // Load computational mesh and generate a particle mesh over its nodes + // Load query mesh and generate a particle mesh over its nodes // These will be used to query the closest points on the object mesh(es) //--------------------------------------------------------------------------- + QueryMeshWrapper queryMeshWrapper( dataStore.getRoot()->createGroup("queryMesh", true), params.meshFile); - // queryMeshWrapper.print_mesh_info(); if(params.isVerbose()) { @@ -1388,7 +1384,7 @@ int main(int argc, char** argv) spatialDim, params.circleCenter, params.circleRadius, - params.circlePoints, + params.longPointCount, localDomainCount, params.randomSpacing, params.latRange.size() > 0 ? params.latRange[0] : 0.0, @@ -1406,12 +1402,12 @@ int main(int argc, char** argv) slic::flushStreams(); //--------------------------------------------------------------------------- - // Initialize spatial index for querying points, and run query + // Initialize spatial index for object points, and run query //--------------------------------------------------------------------------- auto init_str = banner(axom::fmt::format("Initializing BVH tree over {} points", - params.circlePoints)); + params.longPointCount)); axom::utilities::Timer initTimer(false); axom::utilities::Timer queryTimer(false); From 8617ed17ec329973bebf31ca7baa3a4c7b657130 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 5 Feb 2024 20:15:07 -0800 Subject: [PATCH 431/639] Minor comment corrections. --- .../examples/quest_distributed_distance_query_example.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp index 667cd4ca70..6a02cb258a 100644 --- a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp +++ b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp @@ -201,7 +201,7 @@ Input params; * * Given a sidre Group, creates the stubs for a mesh blueptint particle mesh * - * BlueprintParticleMesh is used by both the object mesh and the uery mesh. + * BlueprintParticleMesh is used by both the object mesh and the query mesh. */ struct BlueprintParticleMesh { @@ -912,9 +912,9 @@ class QueryMeshWrapper * Populate "error_flag" field with the number of errors, for * visualization. * - * Randomized object points (--random-spacing switch) can cause - * false positives, so when it's on, distance inaccuracy is a warning - * (not an error) for the purpose of checking. + * Randomizing points (--random-spacing switch) can cause false + * positives, so when it's on, distance inaccuracy is a warning (not + * an error) for the purpose of checking. */ template int checkClosestPoints(const axom::primal::Sphere& sphere, From 6a56a1d935af2e112d325111b087d809f1ff1098 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 6 Feb 2024 09:16:57 -0800 Subject: [PATCH 432/639] guard install --- src/cmake/thirdparty/SetupAxomThirdParty.cmake | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/cmake/thirdparty/SetupAxomThirdParty.cmake b/src/cmake/thirdparty/SetupAxomThirdParty.cmake index 71194edde9..44b38e733f 100644 --- a/src/cmake/thirdparty/SetupAxomThirdParty.cmake +++ b/src/cmake/thirdparty/SetupAxomThirdParty.cmake @@ -148,10 +148,16 @@ if (TARGET mfem) # Note - white238: I can't seem to get this to pass install testing due to mfem being included # in multiple export sets message(STATUS "MFEM support is ON, using existing mfem target") + # Add it to this export set but don't prefix it with axom:: - install(TARGETS mfem - EXPORT axom-targets - DESTINATION lib) + # NOTE: imported targets cannot be part of an export set + get_target_property(_is_imported mfem IMPORTED) + if(NOT "${_is_imported}") + install(TARGETS mfem + EXPORT axom-targets + DESTINATION lib) + endif() + set(MFEM_FOUND TRUE CACHE BOOL "" FORCE) elseif (MFEM_DIR) include(cmake/thirdparty/FindMFEM.cmake) From ac980baaf2c7f478a5bb02b7943b21132900af4c Mon Sep 17 00:00:00 2001 From: Alex Tyler Chapman Date: Wed, 7 Feb 2024 17:43:10 -0800 Subject: [PATCH 433/639] Include cstdint --- src/axom/core/utilities/nvtx/interface.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/axom/core/utilities/nvtx/interface.hpp b/src/axom/core/utilities/nvtx/interface.hpp index ac8f6a5f67..0dacb6e136 100644 --- a/src/axom/core/utilities/nvtx/interface.hpp +++ b/src/axom/core/utilities/nvtx/interface.hpp @@ -7,6 +7,7 @@ #define AXOM_NVTX_INTERFACE_HPP_ #include "axom/core/utilities/nvtx/Macros.hpp" +#include // For uint32_t namespace axom { From 1d3bec3d8f1b2ced2ff86c60862e61bfbfc892df Mon Sep 17 00:00:00 2001 From: Alex Tyler Chapman Date: Wed, 7 Feb 2024 17:47:44 -0800 Subject: [PATCH 434/639] add cstdint fix to release notes --- RELEASE-NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 14f18208e2..36f4dbd425 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -61,6 +61,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - Fixed a bug in the bounds checks for `primal::clip(Triangle, BoundingBox)` - Fixed a bug when loading Sidre groups with attributes that already exist - Fixed `std::locale` error when when compiling `src/axom/core/utilities/System.cpp` using nvcc +- Include `cstdint` for higher gcc version support (e.g. gcc-13) ## [Version 0.8.1] - Release date 2023-08-16 From f8afc34cc32df478ccdbe904d5e608bc9933af3f Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 8 Feb 2024 09:54:35 -0800 Subject: [PATCH 435/639] style --- src/axom/core/utilities/nvtx/interface.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/core/utilities/nvtx/interface.hpp b/src/axom/core/utilities/nvtx/interface.hpp index 1f1a8a9ff3..ecec933106 100644 --- a/src/axom/core/utilities/nvtx/interface.hpp +++ b/src/axom/core/utilities/nvtx/interface.hpp @@ -7,7 +7,7 @@ #define AXOM_NVTX_INTERFACE_HPP_ #include "axom/core/utilities/nvtx/Macros.hpp" -#include // For uint32_t +#include // For uint32_t namespace axom { From d111a4e0b9c22a0d6c4fe109f95d7308925eaa3f Mon Sep 17 00:00:00 2001 From: Lee Taylor Date: Thu, 8 Feb 2024 10:47:55 -0800 Subject: [PATCH 436/639] Update to Shroud 0.13.0 Changed to use a public install of Shroud in /collab/usr/gapps/shroud/public/$SYS_TYPE. Edited the host-configs files to use this version. I added a new spack/packages/py-shroud/package.py file which includes version 0.13.0 and tested that it builds properly. It should be upstreamed into spack. The Fortran and C wrappers have not been regenerated with this version yet. #1258 --- ...lueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake | 2 +- ..._3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake | 2 +- ...n-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake | 2 +- ...eos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake | 2 +- ...n-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake | 2 +- ...eos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake | 2 +- ...quartz-toss_4_x86_64_ib-clang@14.0.6.cmake | 2 +- .../quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake | 2 +- ...artz-toss_4_x86_64_ib-intel@2022.1.0.cmake | 2 +- ...lueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake | 2 +- ..._3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake | 2 +- ...l-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake | 2 +- ...eos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake | 2 +- ...l-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake | 2 +- ...eos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake | 2 +- ...zgenie-toss_4_x86_64_ib-clang@14.0.6.cmake | 2 +- .../rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake | 2 +- ...enie-toss_4_x86_64_ib-intel@2022.1.0.cmake | 2 +- ...hippet-toss_4_x86_64_ib-clang@14.0.6.cmake | 2 +- ...zwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake | 2 +- ...ppet-toss_4_x86_64_ib-intel@2022.1.0.cmake | 2 +- .../configs/blueos_3_ppc64le_ib_p9/spack.yaml | 6 ++-- .../spack/configs/toss_4_x86_64_ib/spack.yaml | 6 ++-- .../configs/toss_4_x86_64_ib_cray/spack.yaml | 7 +++++ scripts/spack/packages/py-shroud/package.py | 29 +++++++++++++++++++ 25 files changed, 63 insertions(+), 27 deletions(-) create mode 100644 scripts/spack/packages/py-shroud/package.py diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake index 76e222b901..a7661ee71b 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake @@ -113,7 +113,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake index e8884a9003..5d7b349e27 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake @@ -141,7 +141,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake index 8894fb7c27..49a08e57f0 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake @@ -105,7 +105,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake index beb1b7219e..5ee8b381e9 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake @@ -133,7 +133,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake index 6f4180275e..db8b81fd69 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake @@ -117,7 +117,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake index 9f7d4c893a..0c56ae97a2 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake @@ -145,7 +145,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake index cdef17bde7..756d66b5d0 100644 --- a/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake +++ b/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake @@ -123,7 +123,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake b/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake index 2b6a9ab43c..c3db9218f3 100644 --- a/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake +++ b/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake @@ -121,7 +121,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake index 18071e9fc8..25164529ca 100644 --- a/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake +++ b/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake @@ -101,7 +101,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake index a052c969be..f217ca7625 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake @@ -113,7 +113,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake index 8066a97eda..4edf450acb 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake @@ -141,7 +141,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake index 54e1d3cbf5..1800c5111b 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake @@ -105,7 +105,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake index c28aa612f3..5667068ed6 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake @@ -133,7 +133,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake index 56f561a0af..3e746045dc 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake @@ -117,7 +117,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake index 90f4231d4a..da2ae66dea 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake @@ -145,7 +145,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake index 5de9fdf653..477f33f7dc 100644 --- a/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake +++ b/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake @@ -123,7 +123,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake index f88cf9eaeb..716c6c99ea 100644 --- a/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake +++ b/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake @@ -121,7 +121,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake index 653e160d35..dc1b0324fc 100644 --- a/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake +++ b/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake @@ -101,7 +101,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/rzwhippet-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/rzwhippet-toss_4_x86_64_ib-clang@14.0.6.cmake index 6f74d8f18d..fe5c49492b 100644 --- a/host-configs/rzwhippet-toss_4_x86_64_ib-clang@14.0.6.cmake +++ b/host-configs/rzwhippet-toss_4_x86_64_ib-clang@14.0.6.cmake @@ -123,7 +123,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/rzwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake b/host-configs/rzwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake index 6fb273f7d8..9a90dd375b 100644 --- a/host-configs/rzwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake +++ b/host-configs/rzwhippet-toss_4_x86_64_ib-gcc@10.3.1.cmake @@ -121,7 +121,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake index a85085a337..c492e852d9 100644 --- a/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake +++ b/host-configs/rzwhippet-toss_4_x86_64_ib-intel@2022.1.0.cmake @@ -101,7 +101,7 @@ set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") -set(SHROUD_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/shroud" CACHE PATH "") +set(SHROUD_EXECUTABLE "/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0/bin/shroud" CACHE PATH "") set(CPPCHECK_EXECUTABLE "${DEVTOOLS_ROOT}/cppcheck-2.9/bin/cppcheck" CACHE PATH "") diff --git a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml index 674b34a7c8..afb2b5fe6a 100644 --- a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -358,11 +358,11 @@ spack: - spec: python@3.10.10 prefix: /collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10 py-shroud: - version: [0.12.2] + version: [0.13.0] buildable: false externals: - - spec: py-shroud@0.12.2 - prefix: /collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10 + - spec: py-shroud@0.13.0 + prefix: /collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0 py-sphinx: version: [6.1.3] buildable: false diff --git a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml index 0f489afec8..9045d48165 100644 --- a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml @@ -311,11 +311,11 @@ spack: - spec: llvm+clang@10.0.0 prefix: /collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0 py-shroud: - version: [0.12.2] + version: [0.13.0] buildable: false externals: - - spec: py-shroud@0.12.2 - prefix: /collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10 + - spec: py-shroud@0.13.0 + prefix: /collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0 py-sphinx: version: [4.4.0] buildable: false diff --git a/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml b/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml index b1f1ed7ca0..808000b709 100644 --- a/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml +++ b/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml @@ -352,3 +352,10 @@ spack: require: "@3.0.1~shared~tests~examples" umpire: require: "@2023.06.0~shared~examples" + + py-shroud: + version: [0.13.0] + buildable: false + externals: + - spec: py-shroud@0.13.0 + prefix: /collab/usr/gapps/shroud/public/toss_4_x86_64_ib_cray/shroud-0.13.0 diff --git a/scripts/spack/packages/py-shroud/package.py b/scripts/spack/packages/py-shroud/package.py new file mode 100644 index 0000000000..1416aee3d7 --- /dev/null +++ b/scripts/spack/packages/py-shroud/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyShroud(PythonPackage): + """Create Fortran wrappers for a C++ library.""" + + homepage = "https://github.com/LLNL/shroud" + git = "https://github.com/LLNL/shroud.git" + tags = ["radiuss"] + + license("BSD-3-Clause") + + version("develop", branch="develop") + version("master", branch="master") + version("0.13.0", tag="v0.13.0", commit="4388ff1b689bbe450ba7d1b9bc4e1fe2563a4101") + version("0.12.2", tag="v0.12.2", commit="939ba0a3e8b5a885da3ddaebb92bf93cb12b0401") + version("0.12.1", tag="v0.12.1", commit="c09344655371885a42783f8c0ac8a31f2bbffc9f") + version("0.11.0", tag="v0.11.0", commit="503b852796d549199c5ab94b14e59ebd62988870") + version("0.10.1", tag="v0.10.1", commit="13a3c70bc5190e0e8531e17925928fbd7154acb5") + version("0.9.0", tag="v0.9.0", commit="94aa2831290d10b604df16cb87ee17aa722fb998") + version("0.8.0", tag="v0.8.0", commit="b58ac35f41514428d08849a578c45ad444bfddc9") + + depends_on("py-setuptools", type=("build", "run")) + depends_on("py-pyyaml@4.2:", type=("build", "run")) From cc9e0b58118403a0c1138786f5be85caada8fe17 Mon Sep 17 00:00:00 2001 From: Lee Taylor Date: Thu, 8 Feb 2024 11:12:31 -0800 Subject: [PATCH 437/639] Do not build Shroud as part of devtools --- scripts/spack/devtools_configs/toss_4_x86_64_ib/spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spack/devtools_configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack/devtools_configs/toss_4_x86_64_ib/spack.yaml index c328cd3f79..111e90d628 100644 --- a/scripts/spack/devtools_configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack/devtools_configs/toss_4_x86_64_ib/spack.yaml @@ -17,7 +17,7 @@ spack: view: default: root: ../view - select: [llvm, cppcheck, doxygen, py-shroud, py-sphinx, python, ^python] + select: [llvm, cppcheck, doxygen, py-sphinx, python, ^python] projections: all: '{name}-{version}' From 5f466d24d50ba7d7338f237c42a3a595c3611876 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 8 Feb 2024 15:32:10 -0800 Subject: [PATCH 438/639] turn off all ROCM pre-5.6.0 --- .gitlab/build_tioga.yml | 13 -- ...toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake | 133 ------------------ scripts/spack/specs.json | 5 +- 3 files changed, 1 insertion(+), 150 deletions(-) delete mode 100644 host-configs/tioga-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake diff --git a/.gitlab/build_tioga.yml b/.gitlab/build_tioga.yml index 4e0c9bde20..d1ec502610 100644 --- a/.gitlab/build_tioga.yml +++ b/.gitlab/build_tioga.yml @@ -40,12 +40,6 @@ tioga-clang_16_0_0_hip_5_6_0-src: HOST_CONFIG: "tioga-toss_4_x86_64_ib_cray-${COMPILER}.cmake" extends: .src_build_on_tioga -tioga-cce_15_0_1_hip_5_4_3-src: - variables: - COMPILER: "cce@15.0.1_hip" - HOST_CONFIG: "tioga-toss_4_x86_64_ib_cray-${COMPILER}.cmake" - extends: .src_build_on_tioga - #### # Full Build jobs tioga-clang_16_0_0_hip_5_6_0-full: @@ -54,10 +48,3 @@ tioga-clang_16_0_0_hip_5_6_0-full: SPEC: "%${COMPILER}~openmp+rocm+mfem+c2c" EXTRASPEC: "amdgpu_target=gfx90a ^hip@5.6.0 ^hsa-rocr-dev@5.6.0 ^llvm-amdgpu@5.6.0 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion" extends: .full_build_on_tioga - -tioga-cce_15_0_1_hip_5_4_3-full: - variables: - COMPILER: "cce@15.0.1_hip" - SPEC: "%${COMPILER}~openmp+rocm+mfem+c2c" - EXTRASPEC: "amdgpu_target=gfx90a ^hip@5.4.3 ^hsa-rocr-dev@5.4.3 ^llvm-amdgpu@5.4.3 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion" - extends: .full_build_on_tioga diff --git a/host-configs/tioga-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake b/host-configs/tioga-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake deleted file mode 100644 index 64935539de..0000000000 --- a/host-configs/tioga-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake +++ /dev/null @@ -1,133 +0,0 @@ -#------------------------------------------------------------------------------ -# !!!! This is a generated file, edit at own risk !!!! -#------------------------------------------------------------------------------ -# CMake executable path: /usr/tce/bin/cmake -#------------------------------------------------------------------------------ - -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1/umpire-2023.06.0-znpux7jjwwb3gb2hr4vi6nbhyrkfo5mo;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1/raja-2023.06.0-ovzqujoxykloaaitzbtkg6egqp6qjr2v;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1/camp-2023.06.0-nsepimnez7uuv3dxqiji2twih3swa6cr;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1/mfem-4.5.2-7rrla6up5iou2fic4riu776n4isvt4wf;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1/hypre-2.24.0-ci2qpkdifjovd7ki22dscgl6goyjefai;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1/lua-5.4.4-gduannh2dcxphs7odrtkrpnmabgcikom;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1/ncurses-6.4-cnq7lljngizvsdryq3csevc3tbh4k7vh;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1/conduit-0.8.8-w5ybmdn2qvfbkooexazuzxnmvyc4zfyl;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1/parmetis-4.0.3-u2udk5n4552zcftdccg5ol33mtulfq2i;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1/metis-5.1.0-lssxpp454fp6c4fbcl2d6rwugzcrpgvm;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1/hdf5-1.8.22-uvl6nsaahk6vl3mvoq6a432lontoo6zv;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1/c2c-1.8.0-drh2lcdrfn627tcfkocetim7snaakicw;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1/blt-0.5.3-xxkf276amm4zj5wm5dx44clspivj42vx;/opt/rocm-5.4.3;/opt/rocm-5.4.3/llvm;/opt/rocm-5.4.3;/opt/rocm-5.4.3/hip;/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.4.3-cce-15.0.1;/usr/tce" CACHE PATH "") - -set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") - -#------------------------------------------------------------------------------ -# Compilers -#------------------------------------------------------------------------------ -# Compiler Spec: cce@=15.0.1 -#------------------------------------------------------------------------------ -if(DEFINED ENV{SPACK_CC}) - - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/spack/lib/spack/env/cce/craycc" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/spack/lib/spack/env/cce/case-insensitive/crayCC" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/spack/lib/spack/env/cce/crayftn" CACHE PATH "") - -else() - - set(CMAKE_C_COMPILER "/usr/tce/packages/cce-tce/cce-15.0.1/bin/craycc" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/tce/packages/cce-tce/cce-15.0.1/bin/crayCC" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/usr/tce/packages/cce-tce/cce-15.0.1/bin/crayftn" CACHE PATH "") - -endif() - -set(CMAKE_Fortran_FLAGS "-ef" CACHE STRING "") - -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - -set(ENABLE_FORTRAN ON CACHE BOOL "") - -set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -DNDEBUG" CACHE STRING "") - -#------------------------------------------------------------------------------ -# MPI -#------------------------------------------------------------------------------ - -set(MPI_C_COMPILER "/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.4.3-cce-15.0.1/bin/mpicc" CACHE PATH "") - -set(MPI_CXX_COMPILER "/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.4.3-cce-15.0.1/bin/mpicxx" CACHE PATH "") - -set(MPI_Fortran_COMPILER "/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.4.3-cce-15.0.1/bin/mpif90" CACHE PATH "") - -set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") - -set(ENABLE_MPI ON CACHE BOOL "") - -set(MPIEXEC_EXECUTABLE "/usr/global/tools/flux_wrappers/bin/srun" CACHE PATH "") - -#------------------------------------------------------------------------------ -# Hardware -#------------------------------------------------------------------------------ - -#------------------------------------------------ -# ROCm -#------------------------------------------------ - -set(HIP_ROOT_DIR "/opt/rocm-5.4.3/hip" CACHE PATH "") - -set(HIP_CXX_COMPILER "/opt/rocm-5.4.3/hip/bin/hipcc" CACHE PATH "") - -set(CMAKE_HIP_ARCHITECTURES "gfx90a" CACHE STRING "") - -set(AMDGPU_TARGETS "gfx90a" CACHE STRING "") - -set(GPU_TARGETS "gfx90a" CACHE STRING "") - -#------------------------------------------------------------------------------ - -# Axom ROCm specifics - -#------------------------------------------------------------------------------ - - -set(ENABLE_HIP ON CACHE BOOL "") - -set(HIP_CLANG_INCLUDE_PATH "/opt/rocm-5.4.3/hip/../llvm/lib/clang/15.0.0/include" CACHE PATH "") - -set(BLT_CMAKE_IMPLICIT_LINK_LIBRARIES_EXCLUDE "unwind" CACHE STRING "") - -set(CMAKE_EXE_LINKER_FLAGS " -L/opt/rocm-5.4.3/hip/../lib64 -Wl,-rpath,/opt/rocm-5.4.3/hip/../lib64 -L/opt/rocm-5.4.3/hip/../lib -Wl,-rpath,/opt/rocm-5.4.3/hip/../lib -lamd_comgr -lhsa-runtime64 " CACHE STRING "") - -#------------------------------------------------ -# Hardware Specifics -#------------------------------------------------ - -set(ENABLE_OPENMP OFF CACHE BOOL "") - -set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# TPLs -#------------------------------------------------------------------------------ - -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/cce-15.0.1" CACHE PATH "") - -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-w5ybmdn2qvfbkooexazuzxnmvyc4zfyl" CACHE PATH "") - -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-drh2lcdrfn627tcfkocetim7snaakicw" CACHE PATH "") - -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-7rrla6up5iou2fic4riu776n4isvt4wf" CACHE PATH "") - -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-uvl6nsaahk6vl3mvoq6a432lontoo6zv" CACHE PATH "") - -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-gduannh2dcxphs7odrtkrpnmabgcikom" CACHE PATH "") - -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-ovzqujoxykloaaitzbtkg6egqp6qjr2v" CACHE PATH "") - -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-znpux7jjwwb3gb2hr4vi6nbhyrkfo5mo" CACHE PATH "") - -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-nsepimnez7uuv3dxqiji2twih3swa6cr" CACHE PATH "") - -# scr not built - -#------------------------------------------------------------------------------ -# Devtools -#------------------------------------------------------------------------------ - -# ClangFormat disabled due to llvm and devtools not in spec - -set(ENABLE_CLANGFORMAT OFF CACHE BOOL "") - -set(ENABLE_DOCS OFF CACHE BOOL "") - - diff --git a/scripts/spack/specs.json b/scripts/spack/specs.json index dfd374d837..40175a8b42 100644 --- a/scripts/spack/specs.json +++ b/scripts/spack/specs.json @@ -28,10 +28,7 @@ "__comment__":"# Use amdgpu_target=gfx90a for tioga/rzvernal; and gfx908 for rznevada", "__comment__":"# -Wno-int-conversion flag needed for building HDF5", "toss_4_x86_64_ib_cray": - [ "clang@14.0.0~openmp+rocm+mfem+c2c amdgpu_target=gfx90a ^hip@5.2.3 ^rocprim@5.2.3 ^hsa-rocr-dev@5.2.3 ^llvm-amdgpu@5.2.3 ^raja~openmp+rocm ^umpire~openmp+rocm", - "clang@15.0.0~openmp+rocm+mfem+c2c amdgpu_target=gfx90a ^hip@5.4.3 ^hsa-rocr-dev@5.4.3 ^llvm-amdgpu@5.4.3 ^rocprim@5.4.3 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion", - "cce@15.0.1~openmp+rocm+mfem+c2c amdgpu_target=gfx90a ^hip@5.4.3 ^hsa-rocr-dev@5.4.3 ^llvm-amdgpu@5.4.3 ^rocprim@5.4.3 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion", - "clang@16.0.0~openmp+rocm+mfem+c2c amdgpu_target=gfx90a ^hip@5.6.0 ^hsa-rocr-dev@5.6.0 ^llvm-amdgpu@5.6.0 ^rocprim@5.6.0 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion" ], + [ "clang@16.0.0~openmp+rocm+mfem+c2c amdgpu_target=gfx90a ^hip@5.6.0 ^hsa-rocr-dev@5.6.0 ^llvm-amdgpu@5.6.0 ^rocprim@5.6.0 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion" ], "__comment__":"# Note: clang-ibm + raja+openmp causes runtime failures, turning it off until there is an alternative", "blueos_3_ppc64le_ib_p9": From 574bb73d35e2956fc79d28a13bba5a8776624cc3 Mon Sep 17 00:00:00 2001 From: Lee Taylor Date: Fri, 9 Feb 2024 12:45:41 -0800 Subject: [PATCH 439/639] Changes for Shroud-0.13.0 There were some changes of how names are generated. Changed some YAML files to perserve the current API names. Some changes to how SIDRE_IndexType is inserted into wrappers. --- src/axom/quest/interface/quest_shroud.yaml | 4 +- .../sidre/interface/c_fortran/csidresplicer.c | 17 ++++++++ .../sidre/interface/c_fortran/fsidresplicer.f | 40 ++++++++----------- .../interface/c_fortran/genfsidresplicer.py | 10 ++--- src/axom/sidre/interface/sidre_shroud.yaml | 16 ++++++++ .../sidre/spio/interface/spio_shroud.yaml | 7 +++- src/axom/slic/interface/slic_shroud.yaml | 2 +- 7 files changed, 63 insertions(+), 33 deletions(-) diff --git a/src/axom/quest/interface/quest_shroud.yaml b/src/axom/quest/interface/quest_shroud.yaml index 5a3820d344..9550bc0bbf 100644 --- a/src/axom/quest/interface/quest_shroud.yaml +++ b/src/axom/quest/interface/quest_shroud.yaml @@ -19,8 +19,8 @@ options: F_module_name_library_template: axom_{library_lower} # F_module_per_class: False # Change the default template for Fortran functions to include the library name. - F_name_impl_template: "{library_lower}_{C_name_scope}{underscore_name}{function_suffix}" - F_name_generic_template: "{library_lower}_{underscore_name}" + F_name_impl_template: "{library_lower}_{C_name_scope}{F_name_api}{function_suffix}" + F_name_generic_template: "{library_lower}_{F_name_api}" wrap_python: True format: diff --git a/src/axom/sidre/interface/c_fortran/csidresplicer.c b/src/axom/sidre/interface/c_fortran/csidresplicer.c index 15f8d91606..e3fe98db35 100644 --- a/src/axom/sidre/interface/c_fortran/csidresplicer.c +++ b/src/axom/sidre/interface/c_fortran/csidresplicer.c @@ -13,6 +13,23 @@ ****************************************************************************** */ +// Into typesSidre.h +// splicer begin types.C_declarations +#include +// splicer end types.C_declarations + +// splicer begin C_declarations +#if 0 + #ifndef __cplusplus + #if defined(USE_64BIT_INDEXTYPE) +typedef int64_t IndexType; + #else +typedef int32_t IndexType; + #endif + #endif +#endif +// splicer end C_declarations + // splicer begin C_definitions // equivalent to C_LOC // called from Fortran diff --git a/src/axom/sidre/interface/c_fortran/fsidresplicer.f b/src/axom/sidre/interface/c_fortran/fsidresplicer.f index c2eeabbab8..dbc8109c59 100644 --- a/src/axom/sidre/interface/c_fortran/fsidresplicer.f +++ b/src/axom/sidre/interface/c_fortran/fsidresplicer.f @@ -35,12 +35,6 @@ ! splicer begin module_top integer, parameter :: MAXNAMESIZE = 128 -#if defined(AXOM_USE_64BIT_INDEXTYPE) && !defined(AXOM_NO_INT64_T) -integer, parameter :: SIDRE_IndexType = C_INT64_T -#else -integer, parameter :: SIDRE_IndexType = C_INT32_T -#endif - integer, parameter :: TypeID = C_SHORT integer, parameter :: TypeIDint = C_INT @@ -63,26 +57,26 @@ SIDRE_ULONG_ID = CONDUIT_ULONG_ID, & SIDRE_FLOAT_ID = CONDUIT_FLOAT_ID, & SIDRE_DOUBLE_ID = CONDUIT_DOUBLE_ID - -integer, parameter :: invalid_index = -1_SIDRE_IndexType ! splicer end module_top # SIDRE_create_fortran_allocatable_view is not in api.yaml since it is not in src/core and # only required for the fortran interface. -! splicer begin additional_interfaces -function SIDRE_create_array_view(group, name, lname, addr, type, rank, extents) & - result(rv) bind(C,name="SIDRE_create_array_view") - use iso_c_binding - import SIDRE_IndexType - type(C_PTR), value, intent(IN) :: group - character(kind=C_CHAR), intent(IN) :: name(*) - integer(C_INT), value, intent(IN) :: lname - type(C_PTR), value, intent(IN) :: addr - integer(C_INT), value, intent(IN) :: type - integer(C_INT), value, intent(IN) :: rank - integer(SIDRE_IndexType), intent(IN) :: extents(*) - type(C_PTR) rv -end function SIDRE_create_array_view -! splicer end additional_interfaces +! splicer begin additional_declarations +interface + function SIDRE_create_array_view(group, name, lname, addr, type, rank, extents) & + result(rv) bind(C,name="SIDRE_create_array_view") + use iso_c_binding + import SIDRE_IndexType + type(C_PTR), value, intent(IN) :: group + character(kind=C_CHAR), intent(IN) :: name(*) + integer(C_INT), value, intent(IN) :: lname + type(C_PTR), value, intent(IN) :: addr + integer(C_INT), value, intent(IN) :: type + integer(C_INT), value, intent(IN) :: rank + integer(SIDRE_IndexType), intent(IN) :: extents(*) + type(C_PTR) rv + end function SIDRE_create_array_view +end interface +! splicer end additional_declarations diff --git a/src/axom/sidre/interface/c_fortran/genfsidresplicer.py b/src/axom/sidre/interface/c_fortran/genfsidresplicer.py index 6d0912652f..40f0c66c55 100644 --- a/src/axom/sidre/interface/c_fortran/genfsidresplicer.py +++ b/src/axom/sidre/interface/c_fortran/genfsidresplicer.py @@ -37,7 +37,7 @@ def group_get_scalar(d): character(*), intent(IN) :: name {f_type}, intent(OUT) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) @@ -56,7 +56,7 @@ def group_set_scalar(d): character(*), intent(IN) :: name {f_type}, intent(IN) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) @@ -133,7 +133,7 @@ def group_set_array_data_ptr(d): character(len=*), intent(IN) :: name {f_type}, target, intent(IN) :: value{shape} integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: {extents_decl} ! integer(C_INT), parameter :: type = {sidre_type} type(C_PTR) addr, viewptr @@ -368,7 +368,7 @@ def group_string(): character(*), intent(IN) :: name character(*), intent(OUT) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) @@ -382,7 +382,7 @@ def group_string(): character(*), intent(IN) :: name character(*), intent(IN) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) diff --git a/src/axom/sidre/interface/sidre_shroud.yaml b/src/axom/sidre/interface/sidre_shroud.yaml index deb18ac077..28f2af33c6 100644 --- a/src/axom/sidre/interface/sidre_shroud.yaml +++ b/src/axom/sidre/interface/sidre_shroud.yaml @@ -14,6 +14,7 @@ namespace: axom sidre options: # debug: True + C_API_case: underscore C_line_length: 1000 F_module_per_class: False F_module_name_library_template: axom_{library_lower} @@ -46,6 +47,16 @@ declarations: f_c_module: "--import--": - SIDRE_IndexType + splicer: + f: | + #if defined(AXOM_USE_64BIT_INDEXTYPE) && !defined(AXOM_NO_INT64_T) + integer, parameter :: SIDRE_IndexType = C_INT64_T + #else + integer, parameter :: SIDRE_IndexType = C_INT32_T + #endif + integer, parameter :: invalid_index = -1_SIDRE_IndexType + c: + - // See SidreTypes.h - decl: typedef short TypeID fields: @@ -91,22 +102,27 @@ declarations: cxx_header: axom/sidre/core/Buffer.hpp format: F_derived_name: SidreBuffer + C_name_api: Buffer - decl: class Group # SidreTypes.h is required for C_invalid_name pattern. cxx_header: axom/sidre/core/Group.hpp format: F_derived_name: SidreGroup + C_name_api: Group - decl: class View cxx_header: axom/sidre/core/View.hpp format: F_derived_name: SidreView + C_name_api: View #################################################################### - decl: class DataStore cxx_header: axom/sidre/core/DataStore.hpp format: + C_name_api: DataStore + F_name_api: datastore F_derived_name: SidreDataStore declarations: diff --git a/src/axom/sidre/spio/interface/spio_shroud.yaml b/src/axom/sidre/spio/interface/spio_shroud.yaml index e0a7e67e63..b819621357 100644 --- a/src/axom/sidre/spio/interface/spio_shroud.yaml +++ b/src/axom/sidre/spio/interface/spio_shroud.yaml @@ -32,7 +32,7 @@ typemap: c_type: SIDRE_DataStore f_module_name: axom_sidre f_derived_type: SidreDataStore - f_capsule_data_type: SIDRE_SHROUD_datastore_capsule + f_capsule_data_type: SIDRE_SHROUD_capsule_data f_to_c: '{f_var}%cxxmem' - type: axom::sidre::Group @@ -42,12 +42,15 @@ typemap: c_type: SIDRE_Group f_module_name: axom_sidre f_derived_type: SidreGroup - f_capsule_data_type: SIDRE_SHROUD_group_capsule + f_capsule_data_type: SIDRE_SHROUD_capsule_data f_to_c: '{f_var}%cxxmem' declarations: - decl: class IOManager cxx_header: axom/sidre/spio/IOManager.hpp + format: + F_derived_name: iomanager + C_name_scope: IOManager_ declarations: - decl: IOManager(MPI_Comm com, bool use_scr = false) default_arg_suffix: diff --git a/src/axom/slic/interface/slic_shroud.yaml b/src/axom/slic/interface/slic_shroud.yaml index 5c269c9769..70d56204fb 100644 --- a/src/axom/slic/interface/slic_shroud.yaml +++ b/src/axom/slic/interface/slic_shroud.yaml @@ -17,7 +17,7 @@ options: C_line_length: 1000 F_module_name_library_template: axom_{library_lower} # Change the default template for Fortran functions to include the library name. - F_name_impl_template: "{library_lower}_{F_name_scope}{underscore_name}{function_suffix}" + F_name_impl_template: "{library_lower}_{F_name_scope}{F_name_api}{function_suffix}" format: C_prefix: SLIC_ From 8fc2e0000ee2fab9f4257c6f405028b530ed05de Mon Sep 17 00:00:00 2001 From: shroud-robot Date: Fri, 9 Feb 2024 13:45:33 -0800 Subject: [PATCH 440/639] generate Shroud wrappers with 0.13.0 make generate make clangformat_style --- .../quest/interface/c_fortran/typesQUEST.h | 8 +- .../quest/interface/c_fortran/wrapQUEST.cpp | 56 +- .../quest/interface/c_fortran/wrapQUEST.h | 44 +- .../quest/interface/c_fortran/wrapfquest.F | 46 +- .../quest/interface/python/pyQUESTmodule.cpp | 2 +- .../quest/interface/python/pyQUESTmodule.hpp | 5 +- .../quest/interface/yaml/quest_types.yaml | 2 +- .../sidre/interface/c_fortran/typesSidre.h | 9 +- .../sidre/interface/c_fortran/wrapBuffer.cpp | 33 +- .../sidre/interface/c_fortran/wrapBuffer.h | 5 +- .../interface/c_fortran/wrapDataStore.cpp | 207 +- .../sidre/interface/c_fortran/wrapDataStore.h | 101 +- .../sidre/interface/c_fortran/wrapGroup.cpp | 892 +++--- .../sidre/interface/c_fortran/wrapGroup.h | 658 +++-- .../sidre/interface/c_fortran/wrapSidre.cpp | 41 +- .../sidre/interface/c_fortran/wrapSidre.h | 28 +- .../sidre/interface/c_fortran/wrapView.cpp | 304 +- src/axom/sidre/interface/c_fortran/wrapView.h | 181 +- .../sidre/interface/c_fortran/wrapfsidre.F | 2494 ++++++++++------- .../sidre/interface/yaml/sidre_types.yaml | 10 +- .../spio/interface/c_fortran/typesSPIO.h | 14 +- .../interface/c_fortran/wrapIOManager.cpp | 201 +- .../spio/interface/c_fortran/wrapIOManager.h | 198 +- .../spio/interface/c_fortran/wrapfspio.f | 544 ++-- .../sidre/spio/interface/yaml/spio_types.yaml | 4 +- src/axom/slic/interface/c_fortran/typesSLIC.h | 8 +- .../c_fortran/wrapGenericOutputStream.cpp | 45 +- .../c_fortran/wrapGenericOutputStream.h | 38 +- .../slic/interface/c_fortran/wrapSLIC.cpp | 297 +- src/axom/slic/interface/c_fortran/wrapSLIC.h | 102 +- src/axom/slic/interface/c_fortran/wrapfslic.f | 300 +- src/axom/slic/interface/slic_types.yaml | 4 +- 32 files changed, 4035 insertions(+), 2846 deletions(-) diff --git a/src/axom/quest/interface/c_fortran/typesQUEST.h b/src/axom/quest/interface/c_fortran/typesQUEST.h index 5ed643de49..d4e830a695 100644 --- a/src/axom/quest/interface/c_fortran/typesQUEST.h +++ b/src/axom/quest/interface/c_fortran/typesQUEST.h @@ -1,5 +1,5 @@ // typesQUEST.h -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -10,10 +10,16 @@ #ifndef TYPESQUEST_H #define TYPESQUEST_H +// splicer begin types.CXX_declarations +// splicer end types.CXX_declarations + #ifdef __cplusplus extern "C" { #endif +// splicer begin types.C_declarations +// splicer end types.C_declarations + // helper capsule_data_helper struct s_QUEST_SHROUD_capsule_data { diff --git a/src/axom/quest/interface/c_fortran/wrapQUEST.cpp b/src/axom/quest/interface/c_fortran/wrapQUEST.cpp index 040caa8294..6a742d41bb 100644 --- a/src/axom/quest/interface/c_fortran/wrapQUEST.cpp +++ b/src/axom/quest/interface/c_fortran/wrapQUEST.cpp @@ -1,22 +1,39 @@ // wrapQUEST.cpp -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) -#include "wrapQUEST.h" -#include -#include + #include "axom/quest/interface/inout.hpp" #include "axom/quest/interface/signed_distance.hpp" -#include "typesQUEST.h" +#include +#include "wrapQUEST.h" // splicer begin CXX_definitions // splicer end CXX_definitions extern "C" { +// helper ShroudLenTrim +// Returns the length of character string src with length nsrc, +// ignoring any trailing blanks. +static int ShroudLenTrim(const char *src, int nsrc) +{ + int i; + + for(i = nsrc - 1; i >= 0; i--) + { + if(src[i] != ' ') + { + break; + } + } + + return i + 1; +} + // splicer begin C_definitions // splicer end C_definitions @@ -33,12 +50,13 @@ int QUEST_inout_init_mpi(const char *fileName, MPI_Fint comm) #endif // ifdef AXOM_USE_MPI #ifdef AXOM_USE_MPI -int QUEST_inout_init_mpi_bufferify(const char *fileName, - int LfileName, +int QUEST_inout_init_mpi_bufferify(char *fileName, + int SHT_fileName_len, MPI_Fint comm) { // splicer begin function.inout_init_mpi_bufferify - const std::string SHCXX_fileName(fileName, LfileName); + const std::string SHCXX_fileName(fileName, + ShroudLenTrim(fileName, SHT_fileName_len)); MPI_Comm SHCXX_comm = MPI_Comm_f2c(comm); int SHC_rv = axom::quest::inout_init(SHCXX_fileName, SHCXX_comm); return SHC_rv; @@ -58,10 +76,11 @@ int QUEST_inout_init_serial(const char *fileName) #endif // ifndef AXOM_USE_MPI #ifndef AXOM_USE_MPI -int QUEST_inout_init_serial_bufferify(const char *fileName, int LfileName) +int QUEST_inout_init_serial_bufferify(char *fileName, int SHT_fileName_len) { // splicer begin function.inout_init_serial_bufferify - const std::string SHCXX_fileName(fileName, LfileName); + const std::string SHCXX_fileName(fileName, + ShroudLenTrim(fileName, SHT_fileName_len)); int SHC_rv = axom::quest::inout_init(SHCXX_fileName); return SHC_rv; // splicer end function.inout_init_serial_bufferify @@ -177,12 +196,12 @@ int QUEST_signed_distance_init_mpi(const char *file, MPI_Fint comm) #endif // ifdef AXOM_USE_MPI #ifdef AXOM_USE_MPI -int QUEST_signed_distance_init_mpi_bufferify(const char *file, - int Lfile, +int QUEST_signed_distance_init_mpi_bufferify(char *file, + int SHT_file_len, MPI_Fint comm) { // splicer begin function.signed_distance_init_mpi_bufferify - const std::string SHCXX_file(file, Lfile); + const std::string SHCXX_file(file, ShroudLenTrim(file, SHT_file_len)); MPI_Comm SHCXX_comm = MPI_Comm_f2c(comm); int SHC_rv = axom::quest::signed_distance_init(SHCXX_file, SHCXX_comm); return SHC_rv; @@ -202,10 +221,10 @@ int QUEST_signed_distance_init_serial(const char *file) #endif // ifndef AXOM_USE_MPI #ifndef AXOM_USE_MPI -int QUEST_signed_distance_init_serial_bufferify(const char *file, int Lfile) +int QUEST_signed_distance_init_serial_bufferify(char *file, int SHT_file_len) { // splicer begin function.signed_distance_init_serial_bufferify - const std::string SHCXX_file(file, Lfile); + const std::string SHCXX_file(file, ShroudLenTrim(file, SHT_file_len)); int SHC_rv = axom::quest::signed_distance_init(SHCXX_file); return SHC_rv; // splicer end function.signed_distance_init_serial_bufferify @@ -317,11 +336,4 @@ void QUEST_signed_distance_finalize(void) // splicer end function.signed_distance_finalize } -// Release library allocated memory. -void QUEST_SHROUD_memory_destructor(QUEST_SHROUD_capsule_data *cap) -{ - cap->addr = nullptr; - cap->idtor = 0; // avoid deleting again -} - } // extern "C" diff --git a/src/axom/quest/interface/c_fortran/wrapQUEST.h b/src/axom/quest/interface/c_fortran/wrapQUEST.h index 88b2919aa2..734dbf7355 100644 --- a/src/axom/quest/interface/c_fortran/wrapQUEST.h +++ b/src/axom/quest/interface/c_fortran/wrapQUEST.h @@ -1,5 +1,5 @@ // wrapQUEST.h -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -17,10 +17,10 @@ #ifdef AXOM_USE_MPI #include "mpi.h" #endif -#include "typesQUEST.h" #ifndef __cplusplus #include #endif +#include "typesQUEST.h" // splicer begin CXX_declarations // splicer end CXX_declarations @@ -41,21 +41,21 @@ enum QUEST_SignedDistExec // splicer end C_declarations #ifdef AXOM_USE_MPI -int QUEST_inout_init_mpi(const char* fileName, MPI_Fint comm); +int QUEST_inout_init_mpi(const char *fileName, MPI_Fint comm); #endif #ifdef AXOM_USE_MPI -int QUEST_inout_init_mpi_bufferify(const char* fileName, - int LfileName, +int QUEST_inout_init_mpi_bufferify(char *fileName, + int SHT_fileName_len, MPI_Fint comm); #endif #ifndef AXOM_USE_MPI -int QUEST_inout_init_serial(const char* fileName); +int QUEST_inout_init_serial(const char *fileName); #endif #ifndef AXOM_USE_MPI -int QUEST_inout_init_serial_bufferify(const char* fileName, int LfileName); +int QUEST_inout_init_serial_bufferify(char *fileName, int SHT_fileName_len); #endif bool QUEST_inout_initialized(void); @@ -72,37 +72,37 @@ bool QUEST_inout_evaluate_0(double x, double y); bool QUEST_inout_evaluate_1(double x, double y, double z); -int QUEST_inout_mesh_min_bounds(double* coords); +int QUEST_inout_mesh_min_bounds(double *coords); -int QUEST_inout_mesh_max_bounds(double* coords); +int QUEST_inout_mesh_max_bounds(double *coords); -int QUEST_inout_mesh_center_of_mass(double* coords); +int QUEST_inout_mesh_center_of_mass(double *coords); int QUEST_inout_get_dimension(void); int QUEST_inout_finalize(void); #ifdef AXOM_USE_MPI -int QUEST_signed_distance_init_mpi(const char* file, MPI_Fint comm); +int QUEST_signed_distance_init_mpi(const char *file, MPI_Fint comm); #endif #ifdef AXOM_USE_MPI -int QUEST_signed_distance_init_mpi_bufferify(const char* file, - int Lfile, +int QUEST_signed_distance_init_mpi_bufferify(char *file, + int SHT_file_len, MPI_Fint comm); #endif #ifndef AXOM_USE_MPI -int QUEST_signed_distance_init_serial(const char* file); +int QUEST_signed_distance_init_serial(const char *file); #endif #ifndef AXOM_USE_MPI -int QUEST_signed_distance_init_serial_bufferify(const char* file, int Lfile); +int QUEST_signed_distance_init_serial_bufferify(char *file, int SHT_file_len); #endif bool QUEST_signed_distance_initialized(void); -void QUEST_signed_distance_get_mesh_bounds(double* lo, double* hi); +void QUEST_signed_distance_get_mesh_bounds(double *lo, double *hi); void QUEST_signed_distance_set_dimension(int dim); @@ -123,12 +123,12 @@ double QUEST_signed_distance_evaluate_0(double x, double y, double z); double QUEST_signed_distance_evaluate_1(double x, double y, double z, - double* cp_x, - double* cp_y, - double* cp_z, - double* n_x, - double* n_y, - double* n_z); + double *cp_x, + double *cp_y, + double *cp_z, + double *n_x, + double *n_y, + double *n_z); void QUEST_signed_distance_finalize(void); diff --git a/src/axom/quest/interface/c_fortran/wrapfquest.F b/src/axom/quest/interface/c_fortran/wrapfquest.F index f5cf00e2a8..e93bd21b24 100644 --- a/src/axom/quest/interface/c_fortran/wrapfquest.F +++ b/src/axom/quest/interface/c_fortran/wrapfquest.F @@ -1,5 +1,5 @@ ! wrapfquest.F -! This file is generated by Shroud 0.12.2. Do not edit. +! This file is generated by Shroud 0.13.0. Do not edit. ! ! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. @@ -41,13 +41,14 @@ end function c_inout_init_mpi #endif #ifdef AXOM_USE_MPI - function c_inout_init_mpi_bufferify(fileName, LfileName, comm) & + function c_inout_init_mpi_bufferify(fileName, SHT_fileName_len, & + comm) & result(SHT_rv) & bind(C, name="QUEST_inout_init_mpi_bufferify") use iso_c_binding, only : C_CHAR, C_INT implicit none character(kind=C_CHAR), intent(IN) :: fileName(*) - integer(C_INT), value, intent(IN) :: LfileName + integer(C_INT), value, intent(IN) :: SHT_fileName_len integer(C_INT), value, intent(IN) :: comm integer(C_INT) :: SHT_rv end function c_inout_init_mpi_bufferify @@ -65,13 +66,14 @@ end function c_inout_init_serial #endif #ifndef AXOM_USE_MPI - function c_inout_init_serial_bufferify(fileName, LfileName) & + function c_inout_init_serial_bufferify(fileName, & + SHT_fileName_len) & result(SHT_rv) & bind(C, name="QUEST_inout_init_serial_bufferify") use iso_c_binding, only : C_CHAR, C_INT implicit none character(kind=C_CHAR), intent(IN) :: fileName(*) - integer(C_INT), value, intent(IN) :: LfileName + integer(C_INT), value, intent(IN) :: SHT_fileName_len integer(C_INT) :: SHT_rv end function c_inout_init_serial_bufferify #endif @@ -198,13 +200,14 @@ end function c_signed_distance_init_mpi #endif #ifdef AXOM_USE_MPI - function c_signed_distance_init_mpi_bufferify(file, Lfile, comm) & + function c_signed_distance_init_mpi_bufferify(file, & + SHT_file_len, comm) & result(SHT_rv) & bind(C, name="QUEST_signed_distance_init_mpi_bufferify") use iso_c_binding, only : C_CHAR, C_INT implicit none character(kind=C_CHAR), intent(IN) :: file(*) - integer(C_INT), value, intent(IN) :: Lfile + integer(C_INT), value, intent(IN) :: SHT_file_len integer(C_INT), value, intent(IN) :: comm integer(C_INT) :: SHT_rv end function c_signed_distance_init_mpi_bufferify @@ -222,13 +225,14 @@ end function c_signed_distance_init_serial #endif #ifndef AXOM_USE_MPI - function c_signed_distance_init_serial_bufferify(file, Lfile) & + function c_signed_distance_init_serial_bufferify(file, & + SHT_file_len) & result(SHT_rv) & bind(C, name="QUEST_signed_distance_init_serial_bufferify") use iso_c_binding, only : C_CHAR, C_INT implicit none character(kind=C_CHAR), intent(IN) :: file(*) - integer(C_INT), value, intent(IN) :: Lfile + integer(C_INT), value, intent(IN) :: SHT_file_len integer(C_INT) :: SHT_rv end function c_signed_distance_init_serial_bufferify #endif @@ -331,9 +335,6 @@ subroutine quest_signed_distance_finalize() & bind(C, name="QUEST_signed_distance_finalize") implicit none end subroutine quest_signed_distance_finalize - - ! splicer begin additional_interfaces - ! splicer end additional_interfaces end interface interface quest_inout_evaluate @@ -364,6 +365,9 @@ end subroutine quest_signed_distance_finalize #endif end interface quest_signed_distance_init + ! splicer begin additional_declarations + ! splicer end additional_declarations + contains #ifdef AXOM_USE_MPI @@ -374,8 +378,10 @@ function quest_inout_init_mpi(fileName, comm) & integer, value, intent(IN) :: comm integer(C_INT) :: SHT_rv ! splicer begin function.inout_init_mpi - SHT_rv = c_inout_init_mpi_bufferify(fileName, & - len_trim(fileName, kind=C_INT), comm) + integer(C_INT) SHT_fileName_len + SHT_fileName_len = len(fileName, kind=C_INT) + SHT_rv = c_inout_init_mpi_bufferify(fileName, SHT_fileName_len, & + comm) ! splicer end function.inout_init_mpi end function quest_inout_init_mpi #endif @@ -387,8 +393,10 @@ function quest_inout_init_serial(fileName) & character(len=*), intent(IN) :: fileName integer(C_INT) :: SHT_rv ! splicer begin function.inout_init_serial + integer(C_INT) SHT_fileName_len + SHT_fileName_len = len(fileName, kind=C_INT) SHT_rv = c_inout_init_serial_bufferify(fileName, & - len_trim(fileName, kind=C_INT)) + SHT_fileName_len) ! splicer end function.inout_init_serial end function quest_inout_init_serial #endif @@ -445,8 +453,10 @@ function quest_signed_distance_init_mpi(file, comm) & integer, value, intent(IN) :: comm integer(C_INT) :: SHT_rv ! splicer begin function.signed_distance_init_mpi + integer(C_INT) SHT_file_len + SHT_file_len = len(file, kind=C_INT) SHT_rv = c_signed_distance_init_mpi_bufferify(file, & - len_trim(file, kind=C_INT), comm) + SHT_file_len, comm) ! splicer end function.signed_distance_init_mpi end function quest_signed_distance_init_mpi #endif @@ -458,8 +468,10 @@ function quest_signed_distance_init_serial(file) & character(len=*), intent(IN) :: file integer(C_INT) :: SHT_rv ! splicer begin function.signed_distance_init_serial + integer(C_INT) SHT_file_len + SHT_file_len = len(file, kind=C_INT) SHT_rv = c_signed_distance_init_serial_bufferify(file, & - len_trim(file, kind=C_INT)) + SHT_file_len) ! splicer end function.signed_distance_init_serial end function quest_signed_distance_init_serial #endif diff --git a/src/axom/quest/interface/python/pyQUESTmodule.cpp b/src/axom/quest/interface/python/pyQUESTmodule.cpp index 1d10085cca..981b88f5bb 100644 --- a/src/axom/quest/interface/python/pyQUESTmodule.cpp +++ b/src/axom/quest/interface/python/pyQUESTmodule.cpp @@ -1,5 +1,5 @@ // pyQUESTmodule.cpp -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. diff --git a/src/axom/quest/interface/python/pyQUESTmodule.hpp b/src/axom/quest/interface/python/pyQUESTmodule.hpp index 7c2e82152a..c162fadba6 100644 --- a/src/axom/quest/interface/python/pyQUESTmodule.hpp +++ b/src/axom/quest/interface/python/pyQUESTmodule.hpp @@ -1,5 +1,5 @@ // pyQUESTmodule.hpp -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -7,9 +7,12 @@ // SPDX-License-Identifier: (BSD-3-Clause) #ifndef PYQUESTMODULE_HPP #define PYQUESTMODULE_HPP + #include + #include "axom/quest/interface/inout.hpp" #include "axom/quest/interface/signed_distance.hpp" + // splicer begin header.include // splicer end header.include diff --git a/src/axom/quest/interface/yaml/quest_types.yaml b/src/axom/quest/interface/yaml/quest_types.yaml index 45f8279e2a..525c4fed8b 100644 --- a/src/axom/quest/interface/yaml/quest_types.yaml +++ b/src/axom/quest/interface/yaml/quest_types.yaml @@ -1,5 +1,5 @@ # quest_types.yaml -# This file is generated by Shroud 0.12.2. Do not edit. +# This file is generated by Shroud 0.13.0. Do not edit. # # Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. diff --git a/src/axom/sidre/interface/c_fortran/typesSidre.h b/src/axom/sidre/interface/c_fortran/typesSidre.h index e9b0fefbe9..20e56a9fbd 100644 --- a/src/axom/sidre/interface/c_fortran/typesSidre.h +++ b/src/axom/sidre/interface/c_fortran/typesSidre.h @@ -1,5 +1,5 @@ // typesSidre.h -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -10,10 +10,17 @@ #ifndef TYPESSIDRE_H #define TYPESSIDRE_H +// splicer begin types.CXX_declarations +// splicer end types.CXX_declarations + #ifdef __cplusplus extern "C" { #endif +// splicer begin types.C_declarations +#include +// splicer end types.C_declarations + // helper capsule_SIDRE_Buffer struct s_SIDRE_Buffer { diff --git a/src/axom/sidre/interface/c_fortran/wrapBuffer.cpp b/src/axom/sidre/interface/c_fortran/wrapBuffer.cpp index 8618e8b30c..07dc93a9f1 100644 --- a/src/axom/sidre/interface/c_fortran/wrapBuffer.cpp +++ b/src/axom/sidre/interface/c_fortran/wrapBuffer.cpp @@ -1,12 +1,13 @@ // wrapBuffer.cpp -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) -#include "wrapBuffer.h" + #include "axom/sidre/core/Buffer.hpp" +#include "wrapBuffer.h" // splicer begin class.Buffer.CXX_definitions // splicer end class.Buffer.CXX_definitions @@ -20,70 +21,70 @@ SIDRE_IndexType SIDRE_Buffer_get_index(const SIDRE_Buffer *self) { const axom::sidre::Buffer *SH_this = static_cast(self->addr); - // splicer begin class.Buffer.method.get_index + // splicer begin class.Buffer.method.getIndex axom::sidre::IndexType SHC_rv = SH_this->getIndex(); return SHC_rv; - // splicer end class.Buffer.method.get_index + // splicer end class.Buffer.method.getIndex } size_t SIDRE_Buffer_get_num_views(const SIDRE_Buffer *self) { const axom::sidre::Buffer *SH_this = static_cast(self->addr); - // splicer begin class.Buffer.method.get_num_views + // splicer begin class.Buffer.method.getNumViews size_t SHC_rv = SH_this->getNumViews(); return SHC_rv; - // splicer end class.Buffer.method.get_num_views + // splicer end class.Buffer.method.getNumViews } void *SIDRE_Buffer_get_void_ptr(SIDRE_Buffer *self) { axom::sidre::Buffer *SH_this = static_cast(self->addr); - // splicer begin class.Buffer.method.get_void_ptr + // splicer begin class.Buffer.method.getVoidPtr void *SHC_rv = SH_this->getVoidPtr(); return SHC_rv; - // splicer end class.Buffer.method.get_void_ptr + // splicer end class.Buffer.method.getVoidPtr } SIDRE_TypeIDint SIDRE_Buffer_get_type_id(const SIDRE_Buffer *self) { const axom::sidre::Buffer *SH_this = static_cast(self->addr); - // splicer begin class.Buffer.method.get_type_id + // splicer begin class.Buffer.method.getTypeID axom::sidre::TypeID SHCXX_rv = SH_this->getTypeID(); SIDRE_TypeIDint SHC_rv = static_cast(SHCXX_rv); return SHC_rv; - // splicer end class.Buffer.method.get_type_id + // splicer end class.Buffer.method.getTypeID } size_t SIDRE_Buffer_get_num_elements(const SIDRE_Buffer *self) { const axom::sidre::Buffer *SH_this = static_cast(self->addr); - // splicer begin class.Buffer.method.get_num_elements + // splicer begin class.Buffer.method.getNumElements size_t SHC_rv = SH_this->getNumElements(); return SHC_rv; - // splicer end class.Buffer.method.get_num_elements + // splicer end class.Buffer.method.getNumElements } size_t SIDRE_Buffer_get_total_bytes(const SIDRE_Buffer *self) { const axom::sidre::Buffer *SH_this = static_cast(self->addr); - // splicer begin class.Buffer.method.get_total_bytes + // splicer begin class.Buffer.method.getTotalBytes size_t SHC_rv = SH_this->getTotalBytes(); return SHC_rv; - // splicer end class.Buffer.method.get_total_bytes + // splicer end class.Buffer.method.getTotalBytes } size_t SIDRE_Buffer_get_bytes_per_element(const SIDRE_Buffer *self) { const axom::sidre::Buffer *SH_this = static_cast(self->addr); - // splicer begin class.Buffer.method.get_bytes_per_element + // splicer begin class.Buffer.method.getBytesPerElement size_t SHC_rv = SH_this->getBytesPerElement(); return SHC_rv; - // splicer end class.Buffer.method.get_bytes_per_element + // splicer end class.Buffer.method.getBytesPerElement } void SIDRE_Buffer_describe(SIDRE_Buffer *self, diff --git a/src/axom/sidre/interface/c_fortran/wrapBuffer.h b/src/axom/sidre/interface/c_fortran/wrapBuffer.h index 0aff9585e6..83c841881d 100644 --- a/src/axom/sidre/interface/c_fortran/wrapBuffer.h +++ b/src/axom/sidre/interface/c_fortran/wrapBuffer.h @@ -1,5 +1,5 @@ // wrapBuffer.h -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -14,14 +14,15 @@ #ifndef WRAPBUFFER_H #define WRAPBUFFER_H +#include "wrapSidre.h" #include "axom/sidre/interface/SidreTypes.h" -#include "typesSidre.h" #ifdef __cplusplus #include #include "axom/sidre/core/SidreTypes.hpp" #else #include #endif +#include "typesSidre.h" // splicer begin class.Buffer.CXX_declarations // splicer end class.Buffer.CXX_declarations diff --git a/src/axom/sidre/interface/c_fortran/wrapDataStore.cpp b/src/axom/sidre/interface/c_fortran/wrapDataStore.cpp index e59d22d320..ba5ffd88de 100644 --- a/src/axom/sidre/interface/c_fortran/wrapDataStore.cpp +++ b/src/axom/sidre/interface/c_fortran/wrapDataStore.cpp @@ -1,22 +1,41 @@ // wrapDataStore.cpp -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) -#include "wrapDataStore.h" -#include -#include -#include "axom/sidre/core/Buffer.hpp" + #include "axom/sidre/core/DataStore.hpp" #include "axom/sidre/core/Group.hpp" +#include "axom/sidre/core/Buffer.hpp" +#include +#include +#include "wrapDataStore.h" // splicer begin class.DataStore.CXX_definitions // splicer end class.DataStore.CXX_definitions extern "C" { +// helper ShroudLenTrim +// Returns the length of character string src with length nsrc, +// ignoring any trailing blanks. +static int ShroudLenTrim(const char *src, int nsrc) +{ + int i; + + for(i = nsrc - 1; i >= 0; i--) + { + if(src[i] != ' ') + { + break; + } + } + + return i + 1; +} + // splicer begin class.DataStore.C_definitions // splicer end class.DataStore.C_definitions @@ -44,22 +63,22 @@ SIDRE_Group *SIDRE_DataStore_get_root(SIDRE_DataStore *self, SIDRE_Group *SHC_rv { axom::sidre::DataStore *SH_this = static_cast(self->addr); - // splicer begin class.DataStore.method.get_root + // splicer begin class.DataStore.method.getRoot axom::sidre::Group *SHCXX_rv = SH_this->getRoot(); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.DataStore.method.get_root + // splicer end class.DataStore.method.getRoot } size_t SIDRE_DataStore_get_num_buffers(const SIDRE_DataStore *self) { const axom::sidre::DataStore *SH_this = static_cast(self->addr); - // splicer begin class.DataStore.method.get_num_buffers + // splicer begin class.DataStore.method.getNumBuffers size_t SHC_rv = SH_this->getNumBuffers(); return SHC_rv; - // splicer end class.DataStore.method.get_num_buffers + // splicer end class.DataStore.method.getNumBuffers } SIDRE_Buffer *SIDRE_DataStore_get_buffer(SIDRE_DataStore *self, @@ -68,7 +87,51 @@ SIDRE_Buffer *SIDRE_DataStore_get_buffer(SIDRE_DataStore *self, { axom::sidre::DataStore *SH_this = static_cast(self->addr); - // splicer begin class.DataStore.method.get_buffer + // splicer begin class.DataStore.method.getBuffer + axom::sidre::Buffer *SHCXX_rv = SH_this->getBuffer(idx); + // C_error_pattern + if(SHCXX_rv == nullptr) + { + SHC_rv->addr = NULL; + SHC_rv->idtor = 0; + return NULL; + } + + SHC_rv->addr = SHCXX_rv; + SHC_rv->idtor = 0; + return SHC_rv; + // splicer end class.DataStore.method.getBuffer +} + +SIDRE_Buffer *SIDRE_DataStore_get_buffer_int32_t(SIDRE_DataStore *self, + int32_t idx, + SIDRE_Buffer *SHC_rv) +{ + axom::sidre::DataStore *SH_this = + static_cast(self->addr); + // splicer begin class.DataStore.method.getBuffer_int32_t + axom::sidre::Buffer *SHCXX_rv = SH_this->getBuffer(idx); + // C_error_pattern + if(SHCXX_rv == nullptr) + { + SHC_rv->addr = NULL; + SHC_rv->idtor = 0; + return NULL; + } + + SHC_rv->addr = SHCXX_rv; + SHC_rv->idtor = 0; + return SHC_rv; + // splicer end class.DataStore.method.getBuffer_int32_t +} + +SIDRE_Buffer *SIDRE_DataStore_get_buffer_int64_t(SIDRE_DataStore *self, + int64_t idx, + SIDRE_Buffer *SHC_rv) +{ + axom::sidre::DataStore *SH_this = + static_cast(self->addr); + // splicer begin class.DataStore.method.getBuffer_int64_t axom::sidre::Buffer *SHCXX_rv = SH_this->getBuffer(idx); // C_error_pattern if(SHCXX_rv == nullptr) @@ -81,7 +144,7 @@ SIDRE_Buffer *SIDRE_DataStore_get_buffer(SIDRE_DataStore *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.DataStore.method.get_buffer + // splicer end class.DataStore.method.getBuffer_int64_t } SIDRE_Buffer *SIDRE_DataStore_create_buffer_empty(SIDRE_DataStore *self, @@ -89,12 +152,12 @@ SIDRE_Buffer *SIDRE_DataStore_create_buffer_empty(SIDRE_DataStore *self, { axom::sidre::DataStore *SH_this = static_cast(self->addr); - // splicer begin class.DataStore.method.create_buffer_empty + // splicer begin class.DataStore.method.createBuffer_empty axom::sidre::Buffer *SHCXX_rv = SH_this->createBuffer(); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.DataStore.method.create_buffer_empty + // splicer end class.DataStore.method.createBuffer_empty } SIDRE_Buffer *SIDRE_DataStore_create_buffer_from_type(SIDRE_DataStore *self, @@ -104,7 +167,55 @@ SIDRE_Buffer *SIDRE_DataStore_create_buffer_from_type(SIDRE_DataStore *self, { axom::sidre::DataStore *SH_this = static_cast(self->addr); - // splicer begin class.DataStore.method.create_buffer_from_type + // splicer begin class.DataStore.method.createBuffer_from_type + axom::sidre::TypeID SHCXX_type = static_cast(type); + axom::sidre::Buffer *SHCXX_rv = SH_this->createBuffer(SHCXX_type, num_elems); + // C_error_pattern + if(SHCXX_rv == nullptr) + { + SHC_rv->addr = NULL; + SHC_rv->idtor = 0; + return NULL; + } + + SHC_rv->addr = SHCXX_rv; + SHC_rv->idtor = 0; + return SHC_rv; + // splicer end class.DataStore.method.createBuffer_from_type +} + +SIDRE_Buffer *SIDRE_DataStore_create_buffer_from_type_int32_t(SIDRE_DataStore *self, + SIDRE_TypeID type, + int32_t num_elems, + SIDRE_Buffer *SHC_rv) +{ + axom::sidre::DataStore *SH_this = + static_cast(self->addr); + // splicer begin class.DataStore.method.createBuffer_from_type_int32_t + axom::sidre::TypeID SHCXX_type = static_cast(type); + axom::sidre::Buffer *SHCXX_rv = SH_this->createBuffer(SHCXX_type, num_elems); + // C_error_pattern + if(SHCXX_rv == nullptr) + { + SHC_rv->addr = NULL; + SHC_rv->idtor = 0; + return NULL; + } + + SHC_rv->addr = SHCXX_rv; + SHC_rv->idtor = 0; + return SHC_rv; + // splicer end class.DataStore.method.createBuffer_from_type_int32_t +} + +SIDRE_Buffer *SIDRE_DataStore_create_buffer_from_type_int64_t(SIDRE_DataStore *self, + SIDRE_TypeID type, + int64_t num_elems, + SIDRE_Buffer *SHC_rv) +{ + axom::sidre::DataStore *SH_this = + static_cast(self->addr); + // splicer begin class.DataStore.method.createBuffer_from_type_int64_t axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::Buffer *SHCXX_rv = SH_this->createBuffer(SHCXX_type, num_elems); // C_error_pattern @@ -118,16 +229,16 @@ SIDRE_Buffer *SIDRE_DataStore_create_buffer_from_type(SIDRE_DataStore *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.DataStore.method.create_buffer_from_type + // splicer end class.DataStore.method.createBuffer_from_type_int64_t } void SIDRE_DataStore_destroy_buffer(SIDRE_DataStore *self, SIDRE_IndexType id) { axom::sidre::DataStore *SH_this = static_cast(self->addr); - // splicer begin class.DataStore.method.destroy_buffer + // splicer begin class.DataStore.method.destroyBuffer SH_this->destroyBuffer(id); - // splicer end class.DataStore.method.destroy_buffer + // splicer end class.DataStore.method.destroyBuffer } bool SIDRE_DataStore_generate_blueprint_index_0(SIDRE_DataStore *self, @@ -138,7 +249,7 @@ bool SIDRE_DataStore_generate_blueprint_index_0(SIDRE_DataStore *self, { axom::sidre::DataStore *SH_this = static_cast(self->addr); - // splicer begin class.DataStore.method.generate_blueprint_index_0 + // splicer begin class.DataStore.method.generateBlueprintIndex_0 const std::string SHCXX_domain_path(domain_path); const std::string SHCXX_mesh_name(mesh_name); const std::string SHCXX_index_path(index_path); @@ -147,30 +258,35 @@ bool SIDRE_DataStore_generate_blueprint_index_0(SIDRE_DataStore *self, SHCXX_index_path, num_domains); return SHC_rv; - // splicer end class.DataStore.method.generate_blueprint_index_0 + // splicer end class.DataStore.method.generateBlueprintIndex_0 } bool SIDRE_DataStore_generate_blueprint_index_0_bufferify(SIDRE_DataStore *self, - const char *domain_path, - int Ldomain_path, - const char *mesh_name, - int Lmesh_name, - const char *index_path, - int Lindex_path, + char *domain_path, + int SHT_domain_path_len, + char *mesh_name, + int SHT_mesh_name_len, + char *index_path, + int SHT_index_path_len, int num_domains) { axom::sidre::DataStore *SH_this = static_cast(self->addr); - // splicer begin class.DataStore.method.generate_blueprint_index_0_bufferify - const std::string SHCXX_domain_path(domain_path, Ldomain_path); - const std::string SHCXX_mesh_name(mesh_name, Lmesh_name); - const std::string SHCXX_index_path(index_path, Lindex_path); + // splicer begin class.DataStore.method.generateBlueprintIndex_0_bufferify + const std::string SHCXX_domain_path( + domain_path, + ShroudLenTrim(domain_path, SHT_domain_path_len)); + const std::string SHCXX_mesh_name(mesh_name, + ShroudLenTrim(mesh_name, SHT_mesh_name_len)); + const std::string SHCXX_index_path( + index_path, + ShroudLenTrim(index_path, SHT_index_path_len)); bool SHC_rv = SH_this->generateBlueprintIndex(SHCXX_domain_path, SHCXX_mesh_name, SHCXX_index_path, num_domains); return SHC_rv; - // splicer end class.DataStore.method.generate_blueprint_index_0_bufferify + // splicer end class.DataStore.method.generateBlueprintIndex_0_bufferify } #ifdef AXOM_USE_MPI @@ -182,7 +298,7 @@ bool SIDRE_DataStore_generate_blueprint_index_1(SIDRE_DataStore *self, { axom::sidre::DataStore *SH_this = static_cast(self->addr); - // splicer begin class.DataStore.method.generate_blueprint_index_1 + // splicer begin class.DataStore.method.generateBlueprintIndex_1 MPI_Comm SHCXX_comm = MPI_Comm_f2c(comm); const std::string SHCXX_domain_path(domain_path); const std::string SHCXX_mesh_name(mesh_name); @@ -192,33 +308,38 @@ bool SIDRE_DataStore_generate_blueprint_index_1(SIDRE_DataStore *self, SHCXX_mesh_name, SHCXX_index_path); return SHC_rv; - // splicer end class.DataStore.method.generate_blueprint_index_1 + // splicer end class.DataStore.method.generateBlueprintIndex_1 } #endif // ifdef AXOM_USE_MPI #ifdef AXOM_USE_MPI bool SIDRE_DataStore_generate_blueprint_index_1_bufferify(SIDRE_DataStore *self, MPI_Fint comm, - const char *domain_path, - int Ldomain_path, - const char *mesh_name, - int Lmesh_name, - const char *index_path, - int Lindex_path) + char *domain_path, + int SHT_domain_path_len, + char *mesh_name, + int SHT_mesh_name_len, + char *index_path, + int SHT_index_path_len) { axom::sidre::DataStore *SH_this = static_cast(self->addr); - // splicer begin class.DataStore.method.generate_blueprint_index_1_bufferify + // splicer begin class.DataStore.method.generateBlueprintIndex_1_bufferify MPI_Comm SHCXX_comm = MPI_Comm_f2c(comm); - const std::string SHCXX_domain_path(domain_path, Ldomain_path); - const std::string SHCXX_mesh_name(mesh_name, Lmesh_name); - const std::string SHCXX_index_path(index_path, Lindex_path); + const std::string SHCXX_domain_path( + domain_path, + ShroudLenTrim(domain_path, SHT_domain_path_len)); + const std::string SHCXX_mesh_name(mesh_name, + ShroudLenTrim(mesh_name, SHT_mesh_name_len)); + const std::string SHCXX_index_path( + index_path, + ShroudLenTrim(index_path, SHT_index_path_len)); bool SHC_rv = SH_this->generateBlueprintIndex(SHCXX_comm, SHCXX_domain_path, SHCXX_mesh_name, SHCXX_index_path); return SHC_rv; - // splicer end class.DataStore.method.generate_blueprint_index_1_bufferify + // splicer end class.DataStore.method.generateBlueprintIndex_1_bufferify } #endif // ifdef AXOM_USE_MPI diff --git a/src/axom/sidre/interface/c_fortran/wrapDataStore.h b/src/axom/sidre/interface/c_fortran/wrapDataStore.h index 9b933dbdcc..0334e4acfd 100644 --- a/src/axom/sidre/interface/c_fortran/wrapDataStore.h +++ b/src/axom/sidre/interface/c_fortran/wrapDataStore.h @@ -1,5 +1,5 @@ // wrapDataStore.h -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -14,18 +14,21 @@ #ifndef WRAPDATASTORE_H #define WRAPDATASTORE_H +#include "wrapSidre.h" #include "axom/sidre/interface/SidreTypes.h" #ifdef AXOM_USE_MPI #include "mpi.h" #endif -#include "typesSidre.h" #ifdef __cplusplus #include + #include #include "axom/sidre/core/SidreTypes.hpp" #else - #include #include + #include + #include #endif +#include "typesSidre.h" // splicer begin class.DataStore.CXX_declarations // splicer end class.DataStore.CXX_declarations @@ -37,63 +40,83 @@ extern "C" { // splicer begin class.DataStore.C_declarations // splicer end class.DataStore.C_declarations -SIDRE_DataStore* SIDRE_DataStore_new(SIDRE_DataStore* SHC_rv); +SIDRE_DataStore *SIDRE_DataStore_new(SIDRE_DataStore *SHC_rv); -void SIDRE_DataStore_delete(SIDRE_DataStore* self); +void SIDRE_DataStore_delete(SIDRE_DataStore *self); -SIDRE_Group* SIDRE_DataStore_get_root(SIDRE_DataStore* self, SIDRE_Group* SHC_rv); +SIDRE_Group *SIDRE_DataStore_get_root(SIDRE_DataStore *self, SIDRE_Group *SHC_rv); -size_t SIDRE_DataStore_get_num_buffers(const SIDRE_DataStore* self); +size_t SIDRE_DataStore_get_num_buffers(const SIDRE_DataStore *self); -SIDRE_Buffer* SIDRE_DataStore_get_buffer(SIDRE_DataStore* self, +SIDRE_Buffer *SIDRE_DataStore_get_buffer(SIDRE_DataStore *self, SIDRE_IndexType idx, - SIDRE_Buffer* SHC_rv); + SIDRE_Buffer *SHC_rv); -SIDRE_Buffer* SIDRE_DataStore_create_buffer_empty(SIDRE_DataStore* self, - SIDRE_Buffer* SHC_rv); +SIDRE_Buffer *SIDRE_DataStore_get_buffer_int32_t(SIDRE_DataStore *self, + int32_t idx, + SIDRE_Buffer *SHC_rv); -SIDRE_Buffer* SIDRE_DataStore_create_buffer_from_type(SIDRE_DataStore* self, - SIDRE_TypeID type, - SIDRE_IndexType num_elems, - SIDRE_Buffer* SHC_rv); +SIDRE_Buffer *SIDRE_DataStore_get_buffer_int64_t(SIDRE_DataStore *self, + int64_t idx, + SIDRE_Buffer *SHC_rv); -void SIDRE_DataStore_destroy_buffer(SIDRE_DataStore* self, SIDRE_IndexType id); +SIDRE_Buffer *SIDRE_DataStore_create_buffer_empty(SIDRE_DataStore *self, + SIDRE_Buffer *SHC_rv); -bool SIDRE_DataStore_generate_blueprint_index_0(SIDRE_DataStore* self, - const char* domain_path, - const char* mesh_name, - const char* index_path, +SIDRE_Buffer *SIDRE_DataStore_create_buffer_from_type(SIDRE_DataStore *self, + SIDRE_TypeID type, + SIDRE_IndexType num_elems, + SIDRE_Buffer *SHC_rv); + +SIDRE_Buffer *SIDRE_DataStore_create_buffer_from_type_int32_t( + SIDRE_DataStore *self, + SIDRE_TypeID type, + int32_t num_elems, + SIDRE_Buffer *SHC_rv); + +SIDRE_Buffer *SIDRE_DataStore_create_buffer_from_type_int64_t( + SIDRE_DataStore *self, + SIDRE_TypeID type, + int64_t num_elems, + SIDRE_Buffer *SHC_rv); + +void SIDRE_DataStore_destroy_buffer(SIDRE_DataStore *self, SIDRE_IndexType id); + +bool SIDRE_DataStore_generate_blueprint_index_0(SIDRE_DataStore *self, + const char *domain_path, + const char *mesh_name, + const char *index_path, int num_domains); -bool SIDRE_DataStore_generate_blueprint_index_0_bufferify(SIDRE_DataStore* self, - const char* domain_path, - int Ldomain_path, - const char* mesh_name, - int Lmesh_name, - const char* index_path, - int Lindex_path, +bool SIDRE_DataStore_generate_blueprint_index_0_bufferify(SIDRE_DataStore *self, + char *domain_path, + int SHT_domain_path_len, + char *mesh_name, + int SHT_mesh_name_len, + char *index_path, + int SHT_index_path_len, int num_domains); #ifdef AXOM_USE_MPI -bool SIDRE_DataStore_generate_blueprint_index_1(SIDRE_DataStore* self, +bool SIDRE_DataStore_generate_blueprint_index_1(SIDRE_DataStore *self, MPI_Fint comm, - const char* domain_path, - const char* mesh_name, - const char* index_path); + const char *domain_path, + const char *mesh_name, + const char *index_path); #endif #ifdef AXOM_USE_MPI -bool SIDRE_DataStore_generate_blueprint_index_1_bufferify(SIDRE_DataStore* self, +bool SIDRE_DataStore_generate_blueprint_index_1_bufferify(SIDRE_DataStore *self, MPI_Fint comm, - const char* domain_path, - int Ldomain_path, - const char* mesh_name, - int Lmesh_name, - const char* index_path, - int Lindex_path); + char *domain_path, + int SHT_domain_path_len, + char *mesh_name, + int SHT_mesh_name_len, + char *index_path, + int SHT_index_path_len); #endif -void SIDRE_DataStore_print(const SIDRE_DataStore* self); +void SIDRE_DataStore_print(const SIDRE_DataStore *self); #ifdef __cplusplus } diff --git a/src/axom/sidre/interface/c_fortran/wrapGroup.cpp b/src/axom/sidre/interface/c_fortran/wrapGroup.cpp index ce2d3ef8ee..fdaca43484 100644 --- a/src/axom/sidre/interface/c_fortran/wrapGroup.cpp +++ b/src/axom/sidre/interface/c_fortran/wrapGroup.cpp @@ -1,23 +1,42 @@ // wrapGroup.cpp -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) -#include "wrapGroup.h" -#include + +#include "axom/sidre/core/Group.hpp" #include -#include "axom/sidre/core/Buffer.hpp" #include "axom/sidre/core/DataStore.hpp" -#include "axom/sidre/core/Group.hpp" #include "axom/sidre/core/View.hpp" +#include "axom/sidre/core/Buffer.hpp" +#include +#include "wrapGroup.h" // splicer begin class.Group.CXX_definitions // splicer end class.Group.CXX_definitions extern "C" { +// helper ShroudLenTrim +// Returns the length of character string src with length nsrc, +// ignoring any trailing blanks. +static int ShroudLenTrim(const char *src, int nsrc) +{ + int i; + + for(i = nsrc - 1; i >= 0; i--) + { + if(src[i] != ' ') + { + break; + } + } + + return i + 1; +} + // helper ShroudStrCopy // Copy src into dest, blank fill to ndest characters // Truncate if dest is too short. @@ -30,16 +49,10 @@ static void ShroudStrCopy(char *dest, int ndest, const char *src, int nsrc) } else { - if(nsrc < 0) - { - nsrc = std::strlen(src); - } + if(nsrc < 0) nsrc = std::strlen(src); int nm = nsrc < ndest ? nsrc : ndest; std::memcpy(dest, src, nm); - if(ndest > nm) - { - std::memset(dest + nm, ' ', ndest - nm); // blank fill - } + if(ndest > nm) std::memset(dest + nm, ' ', ndest - nm); // blank fill } } // splicer begin class.Group.C_definitions @@ -48,110 +61,110 @@ static void ShroudStrCopy(char *dest, int ndest, const char *src, int nsrc) SIDRE_IndexType SIDRE_Group_get_index(SIDRE_Group *self) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_index + // splicer begin class.Group.method.getIndex axom::sidre::IndexType SHC_rv = SH_this->getIndex(); return SHC_rv; - // splicer end class.Group.method.get_index + // splicer end class.Group.method.getIndex } const char *SIDRE_Group_get_name(const SIDRE_Group *self) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_name + // splicer begin class.Group.method.getName const std::string &SHCXX_rv = SH_this->getName(); const char *SHC_rv = SHCXX_rv.c_str(); return SHC_rv; - // splicer end class.Group.method.get_name + // splicer end class.Group.method.getName } void SIDRE_Group_get_name_bufferify(const SIDRE_Group *self, - char *SHF_rv, - int NSHF_rv) + char *SHC_rv, + int SHT_rv_len) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_name_bufferify + // splicer begin class.Group.method.getName_bufferify const std::string &SHCXX_rv = SH_this->getName(); if(SHCXX_rv.empty()) { - ShroudStrCopy(SHF_rv, NSHF_rv, nullptr, 0); + ShroudStrCopy(SHC_rv, SHT_rv_len, nullptr, 0); } else { - ShroudStrCopy(SHF_rv, NSHF_rv, SHCXX_rv.data(), SHCXX_rv.size()); + ShroudStrCopy(SHC_rv, SHT_rv_len, SHCXX_rv.data(), SHCXX_rv.size()); } - // splicer end class.Group.method.get_name_bufferify + // splicer end class.Group.method.getName_bufferify } void SIDRE_Group_get_path_bufferify(const SIDRE_Group *self, - char *SHF_rv, - int NSHF_rv) + char *SHC_rv, + int SHT_rv_len) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_path_bufferify + // splicer begin class.Group.method.getPath_bufferify std::string SHCXX_rv = SH_this->getPath(); if(SHCXX_rv.empty()) { - ShroudStrCopy(SHF_rv, NSHF_rv, nullptr, 0); + ShroudStrCopy(SHC_rv, SHT_rv_len, nullptr, 0); } else { - ShroudStrCopy(SHF_rv, NSHF_rv, SHCXX_rv.data(), SHCXX_rv.size()); + ShroudStrCopy(SHC_rv, SHT_rv_len, SHCXX_rv.data(), SHCXX_rv.size()); } - // splicer end class.Group.method.get_path_bufferify + // splicer end class.Group.method.getPath_bufferify } void SIDRE_Group_get_path_name_bufferify(const SIDRE_Group *self, - char *SHF_rv, - int NSHF_rv) + char *SHC_rv, + int SHT_rv_len) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_path_name_bufferify + // splicer begin class.Group.method.getPathName_bufferify std::string SHCXX_rv = SH_this->getPathName(); if(SHCXX_rv.empty()) { - ShroudStrCopy(SHF_rv, NSHF_rv, nullptr, 0); + ShroudStrCopy(SHC_rv, SHT_rv_len, nullptr, 0); } else { - ShroudStrCopy(SHF_rv, NSHF_rv, SHCXX_rv.data(), SHCXX_rv.size()); + ShroudStrCopy(SHC_rv, SHT_rv_len, SHCXX_rv.data(), SHCXX_rv.size()); } - // splicer end class.Group.method.get_path_name_bufferify + // splicer end class.Group.method.getPathName_bufferify } SIDRE_Group *SIDRE_Group_get_parent(const SIDRE_Group *self, SIDRE_Group *SHC_rv) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_parent + // splicer begin class.Group.method.getParent const axom::sidre::Group *SHCXX_rv = SH_this->getParent(); SHC_rv->addr = const_cast(SHCXX_rv); SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.get_parent + // splicer end class.Group.method.getParent } size_t SIDRE_Group_get_num_groups(const SIDRE_Group *self) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_num_groups + // splicer begin class.Group.method.getNumGroups size_t SHC_rv = SH_this->getNumGroups(); return SHC_rv; - // splicer end class.Group.method.get_num_groups + // splicer end class.Group.method.getNumGroups } size_t SIDRE_Group_get_num_views(const SIDRE_Group *self) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_num_views + // splicer begin class.Group.method.getNumViews size_t SHC_rv = SH_this->getNumViews(); return SHC_rv; - // splicer end class.Group.method.get_num_views + // splicer end class.Group.method.getNumViews } SIDRE_DataStore *SIDRE_Group_get_data_store(const SIDRE_Group *self, @@ -159,60 +172,60 @@ SIDRE_DataStore *SIDRE_Group_get_data_store(const SIDRE_Group *self, { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_data_store + // splicer begin class.Group.method.getDataStore const axom::sidre::DataStore *SHCXX_rv = SH_this->getDataStore(); SHC_rv->addr = const_cast(SHCXX_rv); SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.get_data_store + // splicer end class.Group.method.getDataStore } bool SIDRE_Group_has_view(const SIDRE_Group *self, const char *path) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.has_view + // splicer begin class.Group.method.hasView const std::string SHCXX_path(path); bool SHC_rv = SH_this->hasView(SHCXX_path); return SHC_rv; - // splicer end class.Group.method.has_view + // splicer end class.Group.method.hasView } bool SIDRE_Group_has_view_bufferify(const SIDRE_Group *self, - const char *path, - int Lpath) + char *path, + int SHT_path_len) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.has_view_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.hasView_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); bool SHC_rv = SH_this->hasView(SHCXX_path); return SHC_rv; - // splicer end class.Group.method.has_view_bufferify + // splicer end class.Group.method.hasView_bufferify } bool SIDRE_Group_has_child_view(const SIDRE_Group *self, const char *name) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.has_child_view + // splicer begin class.Group.method.hasChildView const std::string SHCXX_name(name); bool SHC_rv = SH_this->hasChildView(SHCXX_name); return SHC_rv; - // splicer end class.Group.method.has_child_view + // splicer end class.Group.method.hasChildView } bool SIDRE_Group_has_child_view_bufferify(const SIDRE_Group *self, - const char *name, - int Lname) + char *name, + int SHT_name_len) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.has_child_view_bufferify - const std::string SHCXX_name(name, Lname); + // splicer begin class.Group.method.hasChildView_bufferify + const std::string SHCXX_name(name, ShroudLenTrim(name, SHT_name_len)); bool SHC_rv = SH_this->hasChildView(SHCXX_name); return SHC_rv; - // splicer end class.Group.method.has_child_view_bufferify + // splicer end class.Group.method.hasChildView_bufferify } SIDRE_IndexType SIDRE_Group_get_view_index(const SIDRE_Group *self, @@ -220,31 +233,31 @@ SIDRE_IndexType SIDRE_Group_get_view_index(const SIDRE_Group *self, { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_view_index + // splicer begin class.Group.method.getViewIndex const std::string SHCXX_name(name); axom::sidre::IndexType SHC_rv = SH_this->getViewIndex(SHCXX_name); return SHC_rv; - // splicer end class.Group.method.get_view_index + // splicer end class.Group.method.getViewIndex } SIDRE_IndexType SIDRE_Group_get_view_index_bufferify(const SIDRE_Group *self, - const char *name, - int Lname) + char *name, + int SHT_name_len) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_view_index_bufferify - const std::string SHCXX_name(name, Lname); + // splicer begin class.Group.method.getViewIndex_bufferify + const std::string SHCXX_name(name, ShroudLenTrim(name, SHT_name_len)); axom::sidre::IndexType SHC_rv = SH_this->getViewIndex(SHCXX_name); return SHC_rv; - // splicer end class.Group.method.get_view_index_bufferify + // splicer end class.Group.method.getViewIndex_bufferify } const char *SIDRE_Group_get_view_name(const SIDRE_Group *self, SIDRE_IndexType idx) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_view_name + // splicer begin class.Group.method.getViewName const std::string &SHCXX_rv = SH_this->getViewName(idx); // C_error_pattern if(!axom::sidre::nameIsValid(SHCXX_rv)) @@ -254,34 +267,61 @@ const char *SIDRE_Group_get_view_name(const SIDRE_Group *self, SIDRE_IndexType i const char *SHC_rv = SHCXX_rv.c_str(); return SHC_rv; - // splicer end class.Group.method.get_view_name + // splicer end class.Group.method.getViewName } -void SIDRE_Group_get_view_name_bufferify(const SIDRE_Group *self, - SIDRE_IndexType idx, - char *SHF_rv, - int NSHF_rv) +void SIDRE_Group_get_view_name_int32_t_bufferify(const SIDRE_Group *self, + int32_t idx, + char *SHC_rv, + int SHT_rv_len) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_view_name_bufferify + // splicer begin class.Group.method.getViewName_int32_t_bufferify const std::string &SHCXX_rv = SH_this->getViewName(idx); // C_error_pattern if(!axom::sidre::nameIsValid(SHCXX_rv)) { - std::memset(SHF_rv, ' ', NSHF_rv); + std::memset(SHC_rv, ' ', SHT_rv_len); return; } if(SHCXX_rv.empty()) { - ShroudStrCopy(SHF_rv, NSHF_rv, nullptr, 0); + ShroudStrCopy(SHC_rv, SHT_rv_len, nullptr, 0); } else { - ShroudStrCopy(SHF_rv, NSHF_rv, SHCXX_rv.data(), SHCXX_rv.size()); + ShroudStrCopy(SHC_rv, SHT_rv_len, SHCXX_rv.data(), SHCXX_rv.size()); } - // splicer end class.Group.method.get_view_name_bufferify + // splicer end class.Group.method.getViewName_int32_t_bufferify +} + +void SIDRE_Group_get_view_name_int64_t_bufferify(const SIDRE_Group *self, + int64_t idx, + char *SHC_rv, + int SHT_rv_len) +{ + const axom::sidre::Group *SH_this = + static_cast(self->addr); + // splicer begin class.Group.method.getViewName_int64_t_bufferify + const std::string &SHCXX_rv = SH_this->getViewName(idx); + // C_error_pattern + if(!axom::sidre::nameIsValid(SHCXX_rv)) + { + std::memset(SHC_rv, ' ', SHT_rv_len); + return; + } + + if(SHCXX_rv.empty()) + { + ShroudStrCopy(SHC_rv, SHT_rv_len, nullptr, 0); + } + else + { + ShroudStrCopy(SHC_rv, SHT_rv_len, SHCXX_rv.data(), SHCXX_rv.size()); + } + // splicer end class.Group.method.getViewName_int64_t_bufferify } SIDRE_View *SIDRE_Group_get_view_from_name(SIDRE_Group *self, @@ -289,7 +329,7 @@ SIDRE_View *SIDRE_Group_get_view_from_name(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_view_from_name + // splicer begin class.Group.method.getView_from_name const std::string SHCXX_path(path); axom::sidre::View *SHCXX_rv = SH_this->getView(SHCXX_path); // C_error_pattern @@ -303,22 +343,22 @@ SIDRE_View *SIDRE_Group_get_view_from_name(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.get_view_from_name + // splicer end class.Group.method.getView_from_name } SIDRE_View *SIDRE_Group_get_view_from_name_bufferify(SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_view_from_name_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.getView_from_name_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::View *SHCXX_rv = SH_this->getView(SHCXX_path); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.get_view_from_name_bufferify + // splicer end class.Group.method.getView_from_name_bufferify } SIDRE_View *SIDRE_Group_get_view_from_index(SIDRE_Group *self, @@ -326,7 +366,49 @@ SIDRE_View *SIDRE_Group_get_view_from_index(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_view_from_index + // splicer begin class.Group.method.getView_from_index + axom::sidre::View *SHCXX_rv = SH_this->getView(idx); + // C_error_pattern + if(SHCXX_rv == nullptr) + { + SHC_rv->addr = NULL; + SHC_rv->idtor = 0; + return NULL; + } + + SHC_rv->addr = SHCXX_rv; + SHC_rv->idtor = 0; + return SHC_rv; + // splicer end class.Group.method.getView_from_index +} + +SIDRE_View *SIDRE_Group_get_view_from_index_int32_t(SIDRE_Group *self, + int32_t idx, + SIDRE_View *SHC_rv) +{ + axom::sidre::Group *SH_this = static_cast(self->addr); + // splicer begin class.Group.method.getView_from_index_int32_t + axom::sidre::View *SHCXX_rv = SH_this->getView(idx); + // C_error_pattern + if(SHCXX_rv == nullptr) + { + SHC_rv->addr = NULL; + SHC_rv->idtor = 0; + return NULL; + } + + SHC_rv->addr = SHCXX_rv; + SHC_rv->idtor = 0; + return SHC_rv; + // splicer end class.Group.method.getView_from_index_int32_t +} + +SIDRE_View *SIDRE_Group_get_view_from_index_int64_t(SIDRE_Group *self, + int64_t idx, + SIDRE_View *SHC_rv) +{ + axom::sidre::Group *SH_this = static_cast(self->addr); + // splicer begin class.Group.method.getView_from_index_int64_t axom::sidre::View *SHCXX_rv = SH_this->getView(idx); // C_error_pattern if(SHCXX_rv == nullptr) @@ -339,17 +421,17 @@ SIDRE_View *SIDRE_Group_get_view_from_index(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.get_view_from_index + // splicer end class.Group.method.getView_from_index_int64_t } SIDRE_IndexType SIDRE_Group_get_first_valid_view_index(const SIDRE_Group *self) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_first_valid_view_index + // splicer begin class.Group.method.getFirstValidViewIndex axom::sidre::IndexType SHC_rv = SH_this->getFirstValidViewIndex(); return SHC_rv; - // splicer end class.Group.method.get_first_valid_view_index + // splicer end class.Group.method.getFirstValidViewIndex } SIDRE_IndexType SIDRE_Group_get_next_valid_view_index(const SIDRE_Group *self, @@ -357,10 +439,10 @@ SIDRE_IndexType SIDRE_Group_get_next_valid_view_index(const SIDRE_Group *self, { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_next_valid_view_index + // splicer begin class.Group.method.getNextValidViewIndex axom::sidre::IndexType SHC_rv = SH_this->getNextValidViewIndex(idx); return SHC_rv; - // splicer end class.Group.method.get_next_valid_view_index + // splicer end class.Group.method.getNextValidViewIndex } SIDRE_View *SIDRE_Group_create_view_empty(SIDRE_Group *self, @@ -368,7 +450,7 @@ SIDRE_View *SIDRE_Group_create_view_empty(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_empty + // splicer begin class.Group.method.createView_empty const std::string SHCXX_path(path); axom::sidre::View *SHCXX_rv = SH_this->createView(SHCXX_path); // C_error_pattern @@ -382,22 +464,22 @@ SIDRE_View *SIDRE_Group_create_view_empty(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_empty + // splicer end class.Group.method.createView_empty } SIDRE_View *SIDRE_Group_create_view_empty_bufferify(SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_empty_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createView_empty_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::View *SHCXX_rv = SH_this->createView(SHCXX_path); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_empty_bufferify + // splicer end class.Group.method.createView_empty_bufferify } SIDRE_View *SIDRE_Group_create_view_from_type(SIDRE_Group *self, @@ -407,7 +489,7 @@ SIDRE_View *SIDRE_Group_create_view_from_type(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_from_type + // splicer begin class.Group.method.createView_from_type const std::string SHCXX_path(path); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::View *SHCXX_rv = @@ -423,26 +505,45 @@ SIDRE_View *SIDRE_Group_create_view_from_type(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_from_type + // splicer end class.Group.method.createView_from_type } -SIDRE_View *SIDRE_Group_create_view_from_type_bufferify(SIDRE_Group *self, - const char *path, - int Lpath, - SIDRE_TypeID type, - SIDRE_IndexType num_elems, - SIDRE_View *SHC_rv) +SIDRE_View *SIDRE_Group_create_view_from_type_int32_t_bufferify(SIDRE_Group *self, + char *path, + int SHT_path_len, + SIDRE_TypeID type, + int32_t num_elems, + SIDRE_View *SHC_rv) +{ + axom::sidre::Group *SH_this = static_cast(self->addr); + // splicer begin class.Group.method.createView_from_type_int32_t_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); + axom::sidre::TypeID SHCXX_type = static_cast(type); + axom::sidre::View *SHCXX_rv = + SH_this->createView(SHCXX_path, SHCXX_type, num_elems); + SHC_rv->addr = SHCXX_rv; + SHC_rv->idtor = 0; + return SHC_rv; + // splicer end class.Group.method.createView_from_type_int32_t_bufferify +} + +SIDRE_View *SIDRE_Group_create_view_from_type_int64_t_bufferify(SIDRE_Group *self, + char *path, + int SHT_path_len, + SIDRE_TypeID type, + int64_t num_elems, + SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_from_type_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createView_from_type_int64_t_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::View *SHCXX_rv = SH_this->createView(SHCXX_path, SHCXX_type, num_elems); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_from_type_bufferify + // splicer end class.Group.method.createView_from_type_int64_t_bufferify } SIDRE_View *SIDRE_Group_create_view_with_shape_base(SIDRE_Group *self, @@ -453,7 +554,7 @@ SIDRE_View *SIDRE_Group_create_view_with_shape_base(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_with_shape_base + // splicer begin class.Group.method.createViewWithShape_base const std::string SHCXX_path(path); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::View *SHCXX_rv = @@ -469,28 +570,28 @@ SIDRE_View *SIDRE_Group_create_view_with_shape_base(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_with_shape_base + // splicer end class.Group.method.createViewWithShape_base } SIDRE_View *SIDRE_Group_create_view_with_shape_base_bufferify( SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, SIDRE_TypeID type, int ndims, const SIDRE_IndexType *shape, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_with_shape_base_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createViewWithShape_base_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::View *SHCXX_rv = SH_this->createViewWithShape(SHCXX_path, SHCXX_type, ndims, shape); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_with_shape_base_bufferify + // splicer end class.Group.method.createViewWithShape_base_bufferify } SIDRE_View *SIDRE_Group_create_view_into_buffer(SIDRE_Group *self, @@ -499,7 +600,7 @@ SIDRE_View *SIDRE_Group_create_view_into_buffer(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_into_buffer + // splicer begin class.Group.method.createView_into_buffer const std::string SHCXX_path(path); axom::sidre::Buffer *SHCXX_buff = static_cast(buff->addr); @@ -515,25 +616,25 @@ SIDRE_View *SIDRE_Group_create_view_into_buffer(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_into_buffer + // splicer end class.Group.method.createView_into_buffer } SIDRE_View *SIDRE_Group_create_view_into_buffer_bufferify(SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, SIDRE_Buffer *buff, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_into_buffer_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createView_into_buffer_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::Buffer *SHCXX_buff = static_cast(buff->addr); axom::sidre::View *SHCXX_rv = SH_this->createView(SHCXX_path, SHCXX_buff); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_into_buffer_bufferify + // splicer end class.Group.method.createView_into_buffer_bufferify } SIDRE_View *SIDRE_Group_create_view_from_type_and_buffer(SIDRE_Group *self, @@ -544,7 +645,7 @@ SIDRE_View *SIDRE_Group_create_view_from_type_and_buffer(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_from_type_and_buffer + // splicer begin class.Group.method.createView_from_type_and_buffer const std::string SHCXX_path(path); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::Buffer *SHCXX_buff = @@ -562,21 +663,44 @@ SIDRE_View *SIDRE_Group_create_view_from_type_and_buffer(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_from_type_and_buffer + // splicer end class.Group.method.createView_from_type_and_buffer } -SIDRE_View *SIDRE_Group_create_view_from_type_and_buffer_bufferify( +SIDRE_View *SIDRE_Group_create_view_from_type_and_buffer_int32_t_bufferify( SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, + SIDRE_TypeID type, + int32_t num_elems, + SIDRE_Buffer *buff, + SIDRE_View *SHC_rv) +{ + axom::sidre::Group *SH_this = static_cast(self->addr); + // splicer begin class.Group.method.createView_from_type_and_buffer_int32_t_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); + axom::sidre::TypeID SHCXX_type = static_cast(type); + axom::sidre::Buffer *SHCXX_buff = + static_cast(buff->addr); + axom::sidre::View *SHCXX_rv = + SH_this->createView(SHCXX_path, SHCXX_type, num_elems, SHCXX_buff); + SHC_rv->addr = SHCXX_rv; + SHC_rv->idtor = 0; + return SHC_rv; + // splicer end class.Group.method.createView_from_type_and_buffer_int32_t_bufferify +} + +SIDRE_View *SIDRE_Group_create_view_from_type_and_buffer_int64_t_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, SIDRE_TypeID type, - SIDRE_IndexType num_elems, + int64_t num_elems, SIDRE_Buffer *buff, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_from_type_and_buffer_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createView_from_type_and_buffer_int64_t_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::Buffer *SHCXX_buff = static_cast(buff->addr); @@ -585,7 +709,7 @@ SIDRE_View *SIDRE_Group_create_view_from_type_and_buffer_bufferify( SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_from_type_and_buffer_bufferify + // splicer end class.Group.method.createView_from_type_and_buffer_int64_t_bufferify } SIDRE_View *SIDRE_Group_create_view_with_shape_and_buffer(SIDRE_Group *self, @@ -597,7 +721,7 @@ SIDRE_View *SIDRE_Group_create_view_with_shape_and_buffer(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_with_shape_and_buffer + // splicer begin class.Group.method.createViewWithShape_and_buffer const std::string SHCXX_path(path); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::Buffer *SHCXX_buff = @@ -615,13 +739,13 @@ SIDRE_View *SIDRE_Group_create_view_with_shape_and_buffer(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_with_shape_and_buffer + // splicer end class.Group.method.createViewWithShape_and_buffer } SIDRE_View *SIDRE_Group_create_view_with_shape_and_buffer_bufferify( SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, SIDRE_TypeID type, int ndims, const SIDRE_IndexType *shape, @@ -629,8 +753,8 @@ SIDRE_View *SIDRE_Group_create_view_with_shape_and_buffer_bufferify( SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_with_shape_and_buffer_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createViewWithShape_and_buffer_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::Buffer *SHCXX_buff = static_cast(buff->addr); @@ -639,7 +763,7 @@ SIDRE_View *SIDRE_Group_create_view_with_shape_and_buffer_bufferify( SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_with_shape_and_buffer_bufferify + // splicer end class.Group.method.createViewWithShape_and_buffer_bufferify } SIDRE_View *SIDRE_Group_create_view_external(SIDRE_Group *self, @@ -648,7 +772,7 @@ SIDRE_View *SIDRE_Group_create_view_external(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_external + // splicer begin class.Group.method.createView_external const std::string SHCXX_path(path); axom::sidre::View *SHCXX_rv = SH_this->createView(SHCXX_path, external_ptr); // C_error_pattern @@ -662,23 +786,23 @@ SIDRE_View *SIDRE_Group_create_view_external(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_external + // splicer end class.Group.method.createView_external } SIDRE_View *SIDRE_Group_create_view_external_bufferify(SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, void *external_ptr, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_external_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createView_external_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::View *SHCXX_rv = SH_this->createView(SHCXX_path, external_ptr); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_external_bufferify + // splicer end class.Group.method.createView_external_bufferify } SIDRE_View *SIDRE_Group_create_view_from_type_external(SIDRE_Group *self, @@ -689,7 +813,7 @@ SIDRE_View *SIDRE_Group_create_view_from_type_external(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_from_type_external + // splicer begin class.Group.method.createView_from_type_external const std::string SHCXX_path(path); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::View *SHCXX_rv = @@ -705,28 +829,49 @@ SIDRE_View *SIDRE_Group_create_view_from_type_external(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_from_type_external + // splicer end class.Group.method.createView_from_type_external } -SIDRE_View *SIDRE_Group_create_view_from_type_external_bufferify( +SIDRE_View *SIDRE_Group_create_view_from_type_external_int32_t_bufferify( SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, SIDRE_TypeID type, - SIDRE_IndexType num_elems, + int32_t num_elems, void *external_ptr, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_from_type_external_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createView_from_type_external_int32_t_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::View *SHCXX_rv = SH_this->createView(SHCXX_path, SHCXX_type, num_elems, external_ptr); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_from_type_external_bufferify + // splicer end class.Group.method.createView_from_type_external_int32_t_bufferify +} + +SIDRE_View *SIDRE_Group_create_view_from_type_external_int64_t_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, + SIDRE_TypeID type, + int64_t num_elems, + void *external_ptr, + SIDRE_View *SHC_rv) +{ + axom::sidre::Group *SH_this = static_cast(self->addr); + // splicer begin class.Group.method.createView_from_type_external_int64_t_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); + axom::sidre::TypeID SHCXX_type = static_cast(type); + axom::sidre::View *SHCXX_rv = + SH_this->createView(SHCXX_path, SHCXX_type, num_elems, external_ptr); + SHC_rv->addr = SHCXX_rv; + SHC_rv->idtor = 0; + return SHC_rv; + // splicer end class.Group.method.createView_from_type_external_int64_t_bufferify } SIDRE_View *SIDRE_Group_create_view_with_shape_external(SIDRE_Group *self, @@ -738,7 +883,7 @@ SIDRE_View *SIDRE_Group_create_view_with_shape_external(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_with_shape_external + // splicer begin class.Group.method.createViewWithShape_external const std::string SHCXX_path(path); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::View *SHCXX_rv = @@ -754,13 +899,13 @@ SIDRE_View *SIDRE_Group_create_view_with_shape_external(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_with_shape_external + // splicer end class.Group.method.createViewWithShape_external } SIDRE_View *SIDRE_Group_create_view_with_shape_external_bufferify( SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, SIDRE_TypeID type, int ndims, const SIDRE_IndexType *shape, @@ -768,15 +913,15 @@ SIDRE_View *SIDRE_Group_create_view_with_shape_external_bufferify( SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_with_shape_external_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createViewWithShape_external_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::View *SHCXX_rv = SH_this->createViewWithShape(SHCXX_path, SHCXX_type, ndims, shape, external_ptr); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_with_shape_external_bufferify + // splicer end class.Group.method.createViewWithShape_external_bufferify } SIDRE_View *SIDRE_Group_create_view_and_allocate_nelems(SIDRE_Group *self, @@ -786,7 +931,7 @@ SIDRE_View *SIDRE_Group_create_view_and_allocate_nelems(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_and_allocate_nelems + // splicer begin class.Group.method.createViewAndAllocate_nelems const std::string SHCXX_path(path); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::View *SHCXX_rv = @@ -802,27 +947,47 @@ SIDRE_View *SIDRE_Group_create_view_and_allocate_nelems(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_and_allocate_nelems + // splicer end class.Group.method.createViewAndAllocate_nelems } -SIDRE_View *SIDRE_Group_create_view_and_allocate_nelems_bufferify( +SIDRE_View *SIDRE_Group_create_view_and_allocate_nelems_int32_t_bufferify( SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, + SIDRE_TypeID type, + int32_t num_elems, + SIDRE_View *SHC_rv) +{ + axom::sidre::Group *SH_this = static_cast(self->addr); + // splicer begin class.Group.method.createViewAndAllocate_nelems_int32_t_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); + axom::sidre::TypeID SHCXX_type = static_cast(type); + axom::sidre::View *SHCXX_rv = + SH_this->createViewAndAllocate(SHCXX_path, SHCXX_type, num_elems); + SHC_rv->addr = SHCXX_rv; + SHC_rv->idtor = 0; + return SHC_rv; + // splicer end class.Group.method.createViewAndAllocate_nelems_int32_t_bufferify +} + +SIDRE_View *SIDRE_Group_create_view_and_allocate_nelems_int64_t_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, SIDRE_TypeID type, - SIDRE_IndexType num_elems, + int64_t num_elems, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_and_allocate_nelems_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createViewAndAllocate_nelems_int64_t_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::View *SHCXX_rv = SH_this->createViewAndAllocate(SHCXX_path, SHCXX_type, num_elems); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_and_allocate_nelems_bufferify + // splicer end class.Group.method.createViewAndAllocate_nelems_int64_t_bufferify } SIDRE_View *SIDRE_Group_create_view_with_shape_and_allocate( @@ -834,7 +999,7 @@ SIDRE_View *SIDRE_Group_create_view_with_shape_and_allocate( SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_with_shape_and_allocate + // splicer begin class.Group.method.createViewWithShapeAndAllocate const std::string SHCXX_path(path); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::View *SHCXX_rv = @@ -850,28 +1015,28 @@ SIDRE_View *SIDRE_Group_create_view_with_shape_and_allocate( SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_with_shape_and_allocate + // splicer end class.Group.method.createViewWithShapeAndAllocate } SIDRE_View *SIDRE_Group_create_view_with_shape_and_allocate_bufferify( SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, SIDRE_TypeID type, int ndims, const SIDRE_IndexType *shape, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_with_shape_and_allocate_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createViewWithShapeAndAllocate_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::View *SHCXX_rv = SH_this->createViewWithShapeAndAllocate(SHCXX_path, SHCXX_type, ndims, shape); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_with_shape_and_allocate_bufferify + // splicer end class.Group.method.createViewWithShapeAndAllocate_bufferify } SIDRE_View *SIDRE_Group_create_view_scalar_int(SIDRE_Group *self, @@ -880,7 +1045,7 @@ SIDRE_View *SIDRE_Group_create_view_scalar_int(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_scalar_int + // splicer begin class.Group.method.createViewScalar_int const std::string SHCXX_path(path); axom::sidre::View *SHCXX_rv = SH_this->createViewScalar(SHCXX_path, value); // C_error_pattern @@ -894,23 +1059,23 @@ SIDRE_View *SIDRE_Group_create_view_scalar_int(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_scalar_int + // splicer end class.Group.method.createViewScalar_int } SIDRE_View *SIDRE_Group_create_view_scalar_bufferify_int(SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, int value, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_scalar_bufferify_int - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createViewScalar_bufferify_int + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::View *SHCXX_rv = SH_this->createViewScalar(SHCXX_path, value); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_scalar_bufferify_int + // splicer end class.Group.method.createViewScalar_bufferify_int } SIDRE_View *SIDRE_Group_create_view_scalar_long(SIDRE_Group *self, @@ -919,7 +1084,7 @@ SIDRE_View *SIDRE_Group_create_view_scalar_long(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_scalar_long + // splicer begin class.Group.method.createViewScalar_long const std::string SHCXX_path(path); axom::sidre::View *SHCXX_rv = SH_this->createViewScalar(SHCXX_path, value); @@ -934,24 +1099,24 @@ SIDRE_View *SIDRE_Group_create_view_scalar_long(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_scalar_long + // splicer end class.Group.method.createViewScalar_long } SIDRE_View *SIDRE_Group_create_view_scalar_bufferify_long(SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, long value, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_scalar_bufferify_long - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createViewScalar_bufferify_long + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::View *SHCXX_rv = SH_this->createViewScalar(SHCXX_path, value); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_scalar_bufferify_long + // splicer end class.Group.method.createViewScalar_bufferify_long } SIDRE_View *SIDRE_Group_create_view_scalar_float(SIDRE_Group *self, @@ -960,7 +1125,7 @@ SIDRE_View *SIDRE_Group_create_view_scalar_float(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_scalar_float + // splicer begin class.Group.method.createViewScalar_float const std::string SHCXX_path(path); axom::sidre::View *SHCXX_rv = SH_this->createViewScalar(SHCXX_path, value); @@ -975,24 +1140,24 @@ SIDRE_View *SIDRE_Group_create_view_scalar_float(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_scalar_float + // splicer end class.Group.method.createViewScalar_float } SIDRE_View *SIDRE_Group_create_view_scalar_bufferify_float(SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, float value, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_scalar_bufferify_float - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createViewScalar_bufferify_float + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::View *SHCXX_rv = SH_this->createViewScalar(SHCXX_path, value); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_scalar_bufferify_float + // splicer end class.Group.method.createViewScalar_bufferify_float } SIDRE_View *SIDRE_Group_create_view_scalar_double(SIDRE_Group *self, @@ -1001,7 +1166,7 @@ SIDRE_View *SIDRE_Group_create_view_scalar_double(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_scalar_double + // splicer begin class.Group.method.createViewScalar_double const std::string SHCXX_path(path); axom::sidre::View *SHCXX_rv = SH_this->createViewScalar(SHCXX_path, value); @@ -1016,24 +1181,24 @@ SIDRE_View *SIDRE_Group_create_view_scalar_double(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_scalar_double + // splicer end class.Group.method.createViewScalar_double } SIDRE_View *SIDRE_Group_create_view_scalar_bufferify_double(SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, double value, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_scalar_bufferify_double - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createViewScalar_bufferify_double + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::View *SHCXX_rv = SH_this->createViewScalar(SHCXX_path, value); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_scalar_bufferify_double + // splicer end class.Group.method.createViewScalar_bufferify_double } SIDRE_View *SIDRE_Group_create_view_string(SIDRE_Group *self, @@ -1042,7 +1207,7 @@ SIDRE_View *SIDRE_Group_create_view_string(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_string + // splicer begin class.Group.method.createViewString const std::string SHCXX_path(path); const std::string SHCXX_value(value); axom::sidre::View *SHCXX_rv = @@ -1058,75 +1223,75 @@ SIDRE_View *SIDRE_Group_create_view_string(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_string + // splicer end class.Group.method.createViewString } SIDRE_View *SIDRE_Group_create_view_string_bufferify(SIDRE_Group *self, - const char *path, - int Lpath, - const char *value, - int Lvalue, + char *path, + int SHT_path_len, + char *value, + int SHT_value_len, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_view_string_bufferify - const std::string SHCXX_path(path, Lpath); - const std::string SHCXX_value(value, Lvalue); + // splicer begin class.Group.method.createViewString_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); + const std::string SHCXX_value(value, ShroudLenTrim(value, SHT_value_len)); axom::sidre::View *SHCXX_rv = SH_this->createViewString(SHCXX_path, SHCXX_value); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_view_string_bufferify + // splicer end class.Group.method.createViewString_bufferify } void SIDRE_Group_destroy_view(SIDRE_Group *self, const char *path) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.destroy_view + // splicer begin class.Group.method.destroyView const std::string SHCXX_path(path); SH_this->destroyView(SHCXX_path); - // splicer end class.Group.method.destroy_view + // splicer end class.Group.method.destroyView } void SIDRE_Group_destroy_view_bufferify(SIDRE_Group *self, - const char *path, - int Lpath) + char *path, + int SHT_path_len) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.destroy_view_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.destroyView_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); SH_this->destroyView(SHCXX_path); - // splicer end class.Group.method.destroy_view_bufferify + // splicer end class.Group.method.destroyView_bufferify } void SIDRE_Group_destroy_view_and_data_name(SIDRE_Group *self, const char *path) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.destroy_view_and_data_name + // splicer begin class.Group.method.destroyViewAndData_name const std::string SHCXX_path(path); SH_this->destroyViewAndData(SHCXX_path); - // splicer end class.Group.method.destroy_view_and_data_name + // splicer end class.Group.method.destroyViewAndData_name } void SIDRE_Group_destroy_view_and_data_name_bufferify(SIDRE_Group *self, - const char *path, - int Lpath) + char *path, + int SHT_path_len) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.destroy_view_and_data_name_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.destroyViewAndData_name_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); SH_this->destroyViewAndData(SHCXX_path); - // splicer end class.Group.method.destroy_view_and_data_name_bufferify + // splicer end class.Group.method.destroyViewAndData_name_bufferify } void SIDRE_Group_destroy_view_and_data_index(SIDRE_Group *self, SIDRE_IndexType idx) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.destroy_view_and_data_index + // splicer begin class.Group.method.destroyViewAndData_index SH_this->destroyViewAndData(idx); - // splicer end class.Group.method.destroy_view_and_data_index + // splicer end class.Group.method.destroyViewAndData_index } SIDRE_View *SIDRE_Group_move_view(SIDRE_Group *self, @@ -1134,13 +1299,13 @@ SIDRE_View *SIDRE_Group_move_view(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.move_view + // splicer begin class.Group.method.moveView axom::sidre::View *SHCXX_view = static_cast(view->addr); axom::sidre::View *SHCXX_rv = SH_this->moveView(SHCXX_view); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.move_view + // splicer end class.Group.method.moveView } SIDRE_View *SIDRE_Group_copy_view(SIDRE_Group *self, @@ -1148,55 +1313,55 @@ SIDRE_View *SIDRE_Group_copy_view(SIDRE_Group *self, SIDRE_View *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.copy_view + // splicer begin class.Group.method.copyView axom::sidre::View *SHCXX_view = static_cast(view->addr); axom::sidre::View *SHCXX_rv = SH_this->copyView(SHCXX_view); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.copy_view + // splicer end class.Group.method.copyView } bool SIDRE_Group_has_group(SIDRE_Group *self, const char *path) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.has_group + // splicer begin class.Group.method.hasGroup const std::string SHCXX_path(path); bool SHC_rv = SH_this->hasGroup(SHCXX_path); return SHC_rv; - // splicer end class.Group.method.has_group + // splicer end class.Group.method.hasGroup } -bool SIDRE_Group_has_group_bufferify(SIDRE_Group *self, const char *path, int Lpath) +bool SIDRE_Group_has_group_bufferify(SIDRE_Group *self, char *path, int SHT_path_len) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.has_group_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.hasGroup_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); bool SHC_rv = SH_this->hasGroup(SHCXX_path); return SHC_rv; - // splicer end class.Group.method.has_group_bufferify + // splicer end class.Group.method.hasGroup_bufferify } bool SIDRE_Group_has_child_group(SIDRE_Group *self, const char *name) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.has_child_group + // splicer begin class.Group.method.hasChildGroup const std::string SHCXX_name(name); bool SHC_rv = SH_this->hasChildGroup(SHCXX_name); return SHC_rv; - // splicer end class.Group.method.has_child_group + // splicer end class.Group.method.hasChildGroup } bool SIDRE_Group_has_child_group_bufferify(SIDRE_Group *self, - const char *name, - int Lname) + char *name, + int SHT_name_len) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.has_child_group_bufferify - const std::string SHCXX_name(name, Lname); + // splicer begin class.Group.method.hasChildGroup_bufferify + const std::string SHCXX_name(name, ShroudLenTrim(name, SHT_name_len)); bool SHC_rv = SH_this->hasChildGroup(SHCXX_name); return SHC_rv; - // splicer end class.Group.method.has_child_group_bufferify + // splicer end class.Group.method.hasChildGroup_bufferify } SIDRE_IndexType SIDRE_Group_get_group_index(const SIDRE_Group *self, @@ -1204,24 +1369,24 @@ SIDRE_IndexType SIDRE_Group_get_group_index(const SIDRE_Group *self, { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_group_index + // splicer begin class.Group.method.getGroupIndex const std::string SHCXX_name(name); axom::sidre::IndexType SHC_rv = SH_this->getGroupIndex(SHCXX_name); return SHC_rv; - // splicer end class.Group.method.get_group_index + // splicer end class.Group.method.getGroupIndex } SIDRE_IndexType SIDRE_Group_get_group_index_bufferify(const SIDRE_Group *self, - const char *name, - int Lname) + char *name, + int SHT_name_len) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_group_index_bufferify - const std::string SHCXX_name(name, Lname); + // splicer begin class.Group.method.getGroupIndex_bufferify + const std::string SHCXX_name(name, ShroudLenTrim(name, SHT_name_len)); axom::sidre::IndexType SHC_rv = SH_this->getGroupIndex(SHCXX_name); return SHC_rv; - // splicer end class.Group.method.get_group_index_bufferify + // splicer end class.Group.method.getGroupIndex_bufferify } const char *SIDRE_Group_get_group_name(const SIDRE_Group *self, @@ -1229,7 +1394,7 @@ const char *SIDRE_Group_get_group_name(const SIDRE_Group *self, { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_group_name + // splicer begin class.Group.method.getGroupName const std::string &SHCXX_rv = SH_this->getGroupName(idx); // C_error_pattern if(!axom::sidre::nameIsValid(SHCXX_rv)) @@ -1239,34 +1404,61 @@ const char *SIDRE_Group_get_group_name(const SIDRE_Group *self, const char *SHC_rv = SHCXX_rv.c_str(); return SHC_rv; - // splicer end class.Group.method.get_group_name + // splicer end class.Group.method.getGroupName +} + +void SIDRE_Group_get_group_name_int32_t_bufferify(const SIDRE_Group *self, + int32_t idx, + char *SHC_rv, + int SHT_rv_len) +{ + const axom::sidre::Group *SH_this = + static_cast(self->addr); + // splicer begin class.Group.method.getGroupName_int32_t_bufferify + const std::string &SHCXX_rv = SH_this->getGroupName(idx); + // C_error_pattern + if(!axom::sidre::nameIsValid(SHCXX_rv)) + { + std::memset(SHC_rv, ' ', SHT_rv_len); + return; + } + + if(SHCXX_rv.empty()) + { + ShroudStrCopy(SHC_rv, SHT_rv_len, nullptr, 0); + } + else + { + ShroudStrCopy(SHC_rv, SHT_rv_len, SHCXX_rv.data(), SHCXX_rv.size()); + } + // splicer end class.Group.method.getGroupName_int32_t_bufferify } -void SIDRE_Group_get_group_name_bufferify(const SIDRE_Group *self, - SIDRE_IndexType idx, - char *SHF_rv, - int NSHF_rv) +void SIDRE_Group_get_group_name_int64_t_bufferify(const SIDRE_Group *self, + int64_t idx, + char *SHC_rv, + int SHT_rv_len) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_group_name_bufferify + // splicer begin class.Group.method.getGroupName_int64_t_bufferify const std::string &SHCXX_rv = SH_this->getGroupName(idx); // C_error_pattern if(!axom::sidre::nameIsValid(SHCXX_rv)) { - std::memset(SHF_rv, ' ', NSHF_rv); + std::memset(SHC_rv, ' ', SHT_rv_len); return; } if(SHCXX_rv.empty()) { - ShroudStrCopy(SHF_rv, NSHF_rv, nullptr, 0); + ShroudStrCopy(SHC_rv, SHT_rv_len, nullptr, 0); } else { - ShroudStrCopy(SHF_rv, NSHF_rv, SHCXX_rv.data(), SHCXX_rv.size()); + ShroudStrCopy(SHC_rv, SHT_rv_len, SHCXX_rv.data(), SHCXX_rv.size()); } - // splicer end class.Group.method.get_group_name_bufferify + // splicer end class.Group.method.getGroupName_int64_t_bufferify } SIDRE_Group *SIDRE_Group_get_group_from_name(SIDRE_Group *self, @@ -1274,7 +1466,7 @@ SIDRE_Group *SIDRE_Group_get_group_from_name(SIDRE_Group *self, SIDRE_Group *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_group_from_name + // splicer begin class.Group.method.getGroup_from_name const std::string SHCXX_path(path); axom::sidre::Group *SHCXX_rv = SH_this->getGroup(SHCXX_path); // C_error_pattern @@ -1288,22 +1480,22 @@ SIDRE_Group *SIDRE_Group_get_group_from_name(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.get_group_from_name + // splicer end class.Group.method.getGroup_from_name } SIDRE_Group *SIDRE_Group_get_group_from_name_bufferify(SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, SIDRE_Group *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_group_from_name_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.getGroup_from_name_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::Group *SHCXX_rv = SH_this->getGroup(SHCXX_path); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.get_group_from_name_bufferify + // splicer end class.Group.method.getGroup_from_name_bufferify } SIDRE_Group *SIDRE_Group_get_group_from_index(SIDRE_Group *self, @@ -1311,7 +1503,7 @@ SIDRE_Group *SIDRE_Group_get_group_from_index(SIDRE_Group *self, SIDRE_Group *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_group_from_index + // splicer begin class.Group.method.getGroup_from_index axom::sidre::Group *SHCXX_rv = SH_this->getGroup(idx); // C_error_pattern if(SHCXX_rv == nullptr) @@ -1324,17 +1516,59 @@ SIDRE_Group *SIDRE_Group_get_group_from_index(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.get_group_from_index + // splicer end class.Group.method.getGroup_from_index +} + +SIDRE_Group *SIDRE_Group_get_group_from_index_int32_t(SIDRE_Group *self, + int32_t idx, + SIDRE_Group *SHC_rv) +{ + axom::sidre::Group *SH_this = static_cast(self->addr); + // splicer begin class.Group.method.getGroup_from_index_int32_t + axom::sidre::Group *SHCXX_rv = SH_this->getGroup(idx); + // C_error_pattern + if(SHCXX_rv == nullptr) + { + SHC_rv->addr = NULL; + SHC_rv->idtor = 0; + return NULL; + } + + SHC_rv->addr = SHCXX_rv; + SHC_rv->idtor = 0; + return SHC_rv; + // splicer end class.Group.method.getGroup_from_index_int32_t +} + +SIDRE_Group *SIDRE_Group_get_group_from_index_int64_t(SIDRE_Group *self, + int64_t idx, + SIDRE_Group *SHC_rv) +{ + axom::sidre::Group *SH_this = static_cast(self->addr); + // splicer begin class.Group.method.getGroup_from_index_int64_t + axom::sidre::Group *SHCXX_rv = SH_this->getGroup(idx); + // C_error_pattern + if(SHCXX_rv == nullptr) + { + SHC_rv->addr = NULL; + SHC_rv->idtor = 0; + return NULL; + } + + SHC_rv->addr = SHCXX_rv; + SHC_rv->idtor = 0; + return SHC_rv; + // splicer end class.Group.method.getGroup_from_index_int64_t } SIDRE_IndexType SIDRE_Group_get_first_valid_group_index(const SIDRE_Group *self) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_first_valid_group_index + // splicer begin class.Group.method.getFirstValidGroupIndex axom::sidre::IndexType SHC_rv = SH_this->getFirstValidGroupIndex(); return SHC_rv; - // splicer end class.Group.method.get_first_valid_group_index + // splicer end class.Group.method.getFirstValidGroupIndex } SIDRE_IndexType SIDRE_Group_get_next_valid_group_index(const SIDRE_Group *self, @@ -1342,10 +1576,10 @@ SIDRE_IndexType SIDRE_Group_get_next_valid_group_index(const SIDRE_Group *self, { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.get_next_valid_group_index + // splicer begin class.Group.method.getNextValidGroupIndex axom::sidre::IndexType SHC_rv = SH_this->getNextValidGroupIndex(idx); return SHC_rv; - // splicer end class.Group.method.get_next_valid_group_index + // splicer end class.Group.method.getNextValidGroupIndex } SIDRE_Group *SIDRE_Group_create_group(SIDRE_Group *self, @@ -1353,7 +1587,7 @@ SIDRE_Group *SIDRE_Group_create_group(SIDRE_Group *self, SIDRE_Group *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_group + // splicer begin class.Group.method.createGroup const std::string SHCXX_path(path); axom::sidre::Group *SHCXX_rv = SH_this->createGroup(SHCXX_path); // C_error_pattern @@ -1367,50 +1601,50 @@ SIDRE_Group *SIDRE_Group_create_group(SIDRE_Group *self, SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_group + // splicer end class.Group.method.createGroup } SIDRE_Group *SIDRE_Group_create_group_bufferify(SIDRE_Group *self, - const char *path, - int Lpath, + char *path, + int SHT_path_len, SIDRE_Group *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.create_group_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.createGroup_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); axom::sidre::Group *SHCXX_rv = SH_this->createGroup(SHCXX_path); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.create_group_bufferify + // splicer end class.Group.method.createGroup_bufferify } void SIDRE_Group_destroy_group_name(SIDRE_Group *self, const char *path) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.destroy_group_name + // splicer begin class.Group.method.destroyGroup_name const std::string SHCXX_path(path); SH_this->destroyGroup(SHCXX_path); - // splicer end class.Group.method.destroy_group_name + // splicer end class.Group.method.destroyGroup_name } void SIDRE_Group_destroy_group_name_bufferify(SIDRE_Group *self, - const char *path, - int Lpath) + char *path, + int SHT_path_len) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.destroy_group_name_bufferify - const std::string SHCXX_path(path, Lpath); + // splicer begin class.Group.method.destroyGroup_name_bufferify + const std::string SHCXX_path(path, ShroudLenTrim(path, SHT_path_len)); SH_this->destroyGroup(SHCXX_path); - // splicer end class.Group.method.destroy_group_name_bufferify + // splicer end class.Group.method.destroyGroup_name_bufferify } void SIDRE_Group_destroy_group_index(SIDRE_Group *self, SIDRE_IndexType idx) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.destroy_group_index + // splicer begin class.Group.method.destroyGroup_index SH_this->destroyGroup(idx); - // splicer end class.Group.method.destroy_group_index + // splicer end class.Group.method.destroyGroup_index } SIDRE_Group *SIDRE_Group_move_group(SIDRE_Group *self, @@ -1418,13 +1652,13 @@ SIDRE_Group *SIDRE_Group_move_group(SIDRE_Group *self, SIDRE_Group *SHC_rv) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.move_group + // splicer begin class.Group.method.moveGroup axom::sidre::Group *SHCXX_grp = static_cast(grp->addr); axom::sidre::Group *SHCXX_rv = SH_this->moveGroup(SHCXX_grp); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.Group.method.move_group + // splicer end class.Group.method.moveGroup } void SIDRE_Group_print(const SIDRE_Group *self) @@ -1440,12 +1674,12 @@ bool SIDRE_Group_is_equivalent_to(const SIDRE_Group *self, SIDRE_Group *other) { const axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.is_equivalent_to + // splicer begin class.Group.method.isEquivalentTo const axom::sidre::Group *SHCXX_other = static_cast(other->addr); bool SHC_rv = SH_this->isEquivalentTo(SHCXX_other); return SHC_rv; - // splicer end class.Group.method.is_equivalent_to + // splicer end class.Group.method.isEquivalentTo } void SIDRE_Group_save(const SIDRE_Group *self, @@ -1462,16 +1696,18 @@ void SIDRE_Group_save(const SIDRE_Group *self, } void SIDRE_Group_save_bufferify(const SIDRE_Group *self, - const char *file_path, - int Lfile_path, - const char *protocol, - int Lprotocol) + char *file_path, + int SHT_file_path_len, + char *protocol, + int SHT_protocol_len) { const axom::sidre::Group *SH_this = static_cast(self->addr); // splicer begin class.Group.method.save_bufferify - const std::string SHCXX_file_path(file_path, Lfile_path); - const std::string SHCXX_protocol(protocol, Lprotocol); + const std::string SHCXX_file_path(file_path, + ShroudLenTrim(file_path, SHT_file_path_len)); + const std::string SHCXX_protocol(protocol, + ShroudLenTrim(protocol, SHT_protocol_len)); SH_this->save(SHCXX_file_path, SHCXX_protocol); // splicer end class.Group.method.save_bufferify } @@ -1489,15 +1725,17 @@ void SIDRE_Group_load_0(SIDRE_Group *self, } void SIDRE_Group_load_0_bufferify(SIDRE_Group *self, - const char *file_path, - int Lfile_path, - const char *protocol, - int Lprotocol) + char *file_path, + int SHT_file_path_len, + char *protocol, + int SHT_protocol_len) { axom::sidre::Group *SH_this = static_cast(self->addr); // splicer begin class.Group.method.load_0_bufferify - const std::string SHCXX_file_path(file_path, Lfile_path); - const std::string SHCXX_protocol(protocol, Lprotocol); + const std::string SHCXX_file_path(file_path, + ShroudLenTrim(file_path, SHT_file_path_len)); + const std::string SHCXX_protocol(protocol, + ShroudLenTrim(protocol, SHT_protocol_len)); SH_this->load(SHCXX_file_path, SHCXX_protocol); // splicer end class.Group.method.load_0_bufferify } @@ -1516,16 +1754,18 @@ void SIDRE_Group_load_1(SIDRE_Group *self, } void SIDRE_Group_load_1_bufferify(SIDRE_Group *self, - const char *file_path, - int Lfile_path, - const char *protocol, - int Lprotocol, + char *file_path, + int SHT_file_path_len, + char *protocol, + int SHT_protocol_len, bool preserve_contents) { axom::sidre::Group *SH_this = static_cast(self->addr); // splicer begin class.Group.method.load_1_bufferify - const std::string SHCXX_file_path(file_path, Lfile_path); - const std::string SHCXX_protocol(protocol, Lprotocol); + const std::string SHCXX_file_path(file_path, + ShroudLenTrim(file_path, SHT_file_path_len)); + const std::string SHCXX_protocol(protocol, + ShroudLenTrim(protocol, SHT_protocol_len)); SH_this->load(SHCXX_file_path, SHCXX_protocol, preserve_contents); // splicer end class.Group.method.load_1_bufferify } @@ -1533,21 +1773,22 @@ void SIDRE_Group_load_1_bufferify(SIDRE_Group *self, void SIDRE_Group_load_external_data(SIDRE_Group *self, const char *file_path) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.load_external_data + // splicer begin class.Group.method.loadExternalData const std::string SHCXX_file_path(file_path); SH_this->loadExternalData(SHCXX_file_path); - // splicer end class.Group.method.load_external_data + // splicer end class.Group.method.loadExternalData } void SIDRE_Group_load_external_data_bufferify(SIDRE_Group *self, - const char *file_path, - int Lfile_path) + char *file_path, + int SHT_file_path_len) { axom::sidre::Group *SH_this = static_cast(self->addr); - // splicer begin class.Group.method.load_external_data_bufferify - const std::string SHCXX_file_path(file_path, Lfile_path); + // splicer begin class.Group.method.loadExternalData_bufferify + const std::string SHCXX_file_path(file_path, + ShroudLenTrim(file_path, SHT_file_path_len)); SH_this->loadExternalData(SHCXX_file_path); - // splicer end class.Group.method.load_external_data_bufferify + // splicer end class.Group.method.loadExternalData_bufferify } bool SIDRE_Group_rename(SIDRE_Group *self, const char *new_name) @@ -1561,12 +1802,13 @@ bool SIDRE_Group_rename(SIDRE_Group *self, const char *new_name) } bool SIDRE_Group_rename_bufferify(SIDRE_Group *self, - const char *new_name, - int Lnew_name) + char *new_name, + int SHT_new_name_len) { axom::sidre::Group *SH_this = static_cast(self->addr); // splicer begin class.Group.method.rename_bufferify - const std::string SHCXX_new_name(new_name, Lnew_name); + const std::string SHCXX_new_name(new_name, + ShroudLenTrim(new_name, SHT_new_name_len)); bool SHC_rv = SH_this->rename(SHCXX_new_name); return SHC_rv; // splicer end class.Group.method.rename_bufferify diff --git a/src/axom/sidre/interface/c_fortran/wrapGroup.h b/src/axom/sidre/interface/c_fortran/wrapGroup.h index f246e1a132..63e5024e2c 100644 --- a/src/axom/sidre/interface/c_fortran/wrapGroup.h +++ b/src/axom/sidre/interface/c_fortran/wrapGroup.h @@ -1,5 +1,5 @@ // wrapGroup.h -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -14,15 +14,18 @@ #ifndef WRAPGROUP_H #define WRAPGROUP_H +#include "wrapSidre.h" #include "axom/sidre/interface/SidreTypes.h" -#include "typesSidre.h" #ifdef __cplusplus #include + #include #include "axom/sidre/core/SidreTypes.hpp" #else - #include #include + #include + #include #endif +#include "typesSidre.h" // splicer begin class.Group.CXX_declarations // splicer end class.Group.CXX_declarations @@ -34,427 +37,488 @@ extern "C" { // splicer begin class.Group.C_declarations // splicer end class.Group.C_declarations -SIDRE_IndexType SIDRE_Group_get_index(SIDRE_Group* self); +SIDRE_IndexType SIDRE_Group_get_index(SIDRE_Group *self); -const char* SIDRE_Group_get_name(const SIDRE_Group* self); +const char *SIDRE_Group_get_name(const SIDRE_Group *self); -void SIDRE_Group_get_name_bufferify(const SIDRE_Group* self, - char* SHF_rv, - int NSHF_rv); +void SIDRE_Group_get_name_bufferify(const SIDRE_Group *self, + char *SHC_rv, + int SHT_rv_len); -void SIDRE_Group_get_path_bufferify(const SIDRE_Group* self, - char* SHF_rv, - int NSHF_rv); +void SIDRE_Group_get_path_bufferify(const SIDRE_Group *self, + char *SHC_rv, + int SHT_rv_len); -void SIDRE_Group_get_path_name_bufferify(const SIDRE_Group* self, - char* SHF_rv, - int NSHF_rv); +void SIDRE_Group_get_path_name_bufferify(const SIDRE_Group *self, + char *SHC_rv, + int SHT_rv_len); -SIDRE_Group* SIDRE_Group_get_parent(const SIDRE_Group* self, SIDRE_Group* SHC_rv); +SIDRE_Group *SIDRE_Group_get_parent(const SIDRE_Group *self, SIDRE_Group *SHC_rv); -size_t SIDRE_Group_get_num_groups(const SIDRE_Group* self); +size_t SIDRE_Group_get_num_groups(const SIDRE_Group *self); -size_t SIDRE_Group_get_num_views(const SIDRE_Group* self); +size_t SIDRE_Group_get_num_views(const SIDRE_Group *self); -SIDRE_DataStore* SIDRE_Group_get_data_store(const SIDRE_Group* self, - SIDRE_DataStore* SHC_rv); +SIDRE_DataStore *SIDRE_Group_get_data_store(const SIDRE_Group *self, + SIDRE_DataStore *SHC_rv); -bool SIDRE_Group_has_view(const SIDRE_Group* self, const char* path); +bool SIDRE_Group_has_view(const SIDRE_Group *self, const char *path); -bool SIDRE_Group_has_view_bufferify(const SIDRE_Group* self, - const char* path, - int Lpath); +bool SIDRE_Group_has_view_bufferify(const SIDRE_Group *self, + char *path, + int SHT_path_len); -bool SIDRE_Group_has_child_view(const SIDRE_Group* self, const char* name); +bool SIDRE_Group_has_child_view(const SIDRE_Group *self, const char *name); -bool SIDRE_Group_has_child_view_bufferify(const SIDRE_Group* self, - const char* name, - int Lname); +bool SIDRE_Group_has_child_view_bufferify(const SIDRE_Group *self, + char *name, + int SHT_name_len); -SIDRE_IndexType SIDRE_Group_get_view_index(const SIDRE_Group* self, - const char* name); +SIDRE_IndexType SIDRE_Group_get_view_index(const SIDRE_Group *self, + const char *name); -SIDRE_IndexType SIDRE_Group_get_view_index_bufferify(const SIDRE_Group* self, - const char* name, - int Lname); +SIDRE_IndexType SIDRE_Group_get_view_index_bufferify(const SIDRE_Group *self, + char *name, + int SHT_name_len); -const char* SIDRE_Group_get_view_name(const SIDRE_Group* self, +const char *SIDRE_Group_get_view_name(const SIDRE_Group *self, SIDRE_IndexType idx); -void SIDRE_Group_get_view_name_bufferify(const SIDRE_Group* self, - SIDRE_IndexType idx, - char* SHF_rv, - int NSHF_rv); +void SIDRE_Group_get_view_name_int32_t_bufferify(const SIDRE_Group *self, + int32_t idx, + char *SHC_rv, + int SHT_rv_len); + +void SIDRE_Group_get_view_name_int64_t_bufferify(const SIDRE_Group *self, + int64_t idx, + char *SHC_rv, + int SHT_rv_len); -SIDRE_View* SIDRE_Group_get_view_from_name(SIDRE_Group* self, - const char* path, - SIDRE_View* SHC_rv); +SIDRE_View *SIDRE_Group_get_view_from_name(SIDRE_Group *self, + const char *path, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_get_view_from_name_bufferify(SIDRE_Group* self, - const char* path, - int Lpath, - SIDRE_View* SHC_rv); +SIDRE_View *SIDRE_Group_get_view_from_name_bufferify(SIDRE_Group *self, + char *path, + int SHT_path_len, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_get_view_from_index(SIDRE_Group* self, +SIDRE_View *SIDRE_Group_get_view_from_index(SIDRE_Group *self, const SIDRE_IndexType idx, - SIDRE_View* SHC_rv); + SIDRE_View *SHC_rv); -SIDRE_IndexType SIDRE_Group_get_first_valid_view_index(const SIDRE_Group* self); +SIDRE_View *SIDRE_Group_get_view_from_index_int32_t(SIDRE_Group *self, + int32_t idx, + SIDRE_View *SHC_rv); -SIDRE_IndexType SIDRE_Group_get_next_valid_view_index(const SIDRE_Group* self, +SIDRE_View *SIDRE_Group_get_view_from_index_int64_t(SIDRE_Group *self, + int64_t idx, + SIDRE_View *SHC_rv); + +SIDRE_IndexType SIDRE_Group_get_first_valid_view_index(const SIDRE_Group *self); + +SIDRE_IndexType SIDRE_Group_get_next_valid_view_index(const SIDRE_Group *self, SIDRE_IndexType idx); -SIDRE_View* SIDRE_Group_create_view_empty(SIDRE_Group* self, - const char* path, - SIDRE_View* SHC_rv); +SIDRE_View *SIDRE_Group_create_view_empty(SIDRE_Group *self, + const char *path, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_empty_bufferify(SIDRE_Group* self, - const char* path, - int Lpath, - SIDRE_View* SHC_rv); +SIDRE_View *SIDRE_Group_create_view_empty_bufferify(SIDRE_Group *self, + char *path, + int SHT_path_len, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_from_type(SIDRE_Group* self, - const char* path, +SIDRE_View *SIDRE_Group_create_view_from_type(SIDRE_Group *self, + const char *path, SIDRE_TypeID type, SIDRE_IndexType num_elems, - SIDRE_View* SHC_rv); + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_from_type_bufferify(SIDRE_Group* self, - const char* path, - int Lpath, - SIDRE_TypeID type, - SIDRE_IndexType num_elems, - SIDRE_View* SHC_rv); +SIDRE_View *SIDRE_Group_create_view_from_type_int32_t_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, + SIDRE_TypeID type, + int32_t num_elems, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_with_shape_base(SIDRE_Group* self, - const char* path, +SIDRE_View *SIDRE_Group_create_view_from_type_int64_t_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, + SIDRE_TypeID type, + int64_t num_elems, + SIDRE_View *SHC_rv); + +SIDRE_View *SIDRE_Group_create_view_with_shape_base(SIDRE_Group *self, + const char *path, SIDRE_TypeID type, int ndims, - const SIDRE_IndexType* shape, - SIDRE_View* SHC_rv); + const SIDRE_IndexType *shape, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_with_shape_base_bufferify( - SIDRE_Group* self, - const char* path, - int Lpath, +SIDRE_View *SIDRE_Group_create_view_with_shape_base_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, SIDRE_TypeID type, int ndims, - const SIDRE_IndexType* shape, - SIDRE_View* SHC_rv); - -SIDRE_View* SIDRE_Group_create_view_into_buffer(SIDRE_Group* self, - const char* path, - SIDRE_Buffer* buff, - SIDRE_View* SHC_rv); - -SIDRE_View* SIDRE_Group_create_view_into_buffer_bufferify(SIDRE_Group* self, - const char* path, - int Lpath, - SIDRE_Buffer* buff, - SIDRE_View* SHC_rv); - -SIDRE_View* SIDRE_Group_create_view_from_type_and_buffer(SIDRE_Group* self, - const char* path, + const SIDRE_IndexType *shape, + SIDRE_View *SHC_rv); + +SIDRE_View *SIDRE_Group_create_view_into_buffer(SIDRE_Group *self, + const char *path, + SIDRE_Buffer *buff, + SIDRE_View *SHC_rv); + +SIDRE_View *SIDRE_Group_create_view_into_buffer_bufferify(SIDRE_Group *self, + char *path, + int SHT_path_len, + SIDRE_Buffer *buff, + SIDRE_View *SHC_rv); + +SIDRE_View *SIDRE_Group_create_view_from_type_and_buffer(SIDRE_Group *self, + const char *path, SIDRE_TypeID type, SIDRE_IndexType num_elems, - SIDRE_Buffer* buff, - SIDRE_View* SHC_rv); + SIDRE_Buffer *buff, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_from_type_and_buffer_bufferify( - SIDRE_Group* self, - const char* path, - int Lpath, +SIDRE_View *SIDRE_Group_create_view_from_type_and_buffer_int32_t_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, + SIDRE_TypeID type, + int32_t num_elems, + SIDRE_Buffer *buff, + SIDRE_View *SHC_rv); + +SIDRE_View *SIDRE_Group_create_view_from_type_and_buffer_int64_t_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, SIDRE_TypeID type, - SIDRE_IndexType num_elems, - SIDRE_Buffer* buff, - SIDRE_View* SHC_rv); + int64_t num_elems, + SIDRE_Buffer *buff, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_with_shape_and_buffer(SIDRE_Group* self, - const char* path, +SIDRE_View *SIDRE_Group_create_view_with_shape_and_buffer(SIDRE_Group *self, + const char *path, SIDRE_TypeID type, int ndims, - const SIDRE_IndexType* shape, - SIDRE_Buffer* buff, - SIDRE_View* SHC_rv); - -SIDRE_View* SIDRE_Group_create_view_with_shape_and_buffer_bufferify( - SIDRE_Group* self, - const char* path, - int Lpath, + const SIDRE_IndexType *shape, + SIDRE_Buffer *buff, + SIDRE_View *SHC_rv); + +SIDRE_View *SIDRE_Group_create_view_with_shape_and_buffer_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, SIDRE_TypeID type, int ndims, - const SIDRE_IndexType* shape, - SIDRE_Buffer* buff, - SIDRE_View* SHC_rv); - -SIDRE_View* SIDRE_Group_create_view_external(SIDRE_Group* self, - const char* path, - void* external_ptr, - SIDRE_View* SHC_rv); - -SIDRE_View* SIDRE_Group_create_view_external_bufferify(SIDRE_Group* self, - const char* path, - int Lpath, - void* external_ptr, - SIDRE_View* SHC_rv); - -SIDRE_View* SIDRE_Group_create_view_from_type_external(SIDRE_Group* self, - const char* path, + const SIDRE_IndexType *shape, + SIDRE_Buffer *buff, + SIDRE_View *SHC_rv); + +SIDRE_View *SIDRE_Group_create_view_external(SIDRE_Group *self, + const char *path, + void *external_ptr, + SIDRE_View *SHC_rv); + +SIDRE_View *SIDRE_Group_create_view_external_bufferify(SIDRE_Group *self, + char *path, + int SHT_path_len, + void *external_ptr, + SIDRE_View *SHC_rv); + +SIDRE_View *SIDRE_Group_create_view_from_type_external(SIDRE_Group *self, + const char *path, SIDRE_TypeID type, SIDRE_IndexType num_elems, - void* external_ptr, - SIDRE_View* SHC_rv); + void *external_ptr, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_from_type_external_bufferify( - SIDRE_Group* self, - const char* path, - int Lpath, +SIDRE_View *SIDRE_Group_create_view_from_type_external_int32_t_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, SIDRE_TypeID type, - SIDRE_IndexType num_elems, - void* external_ptr, - SIDRE_View* SHC_rv); + int32_t num_elems, + void *external_ptr, + SIDRE_View *SHC_rv); + +SIDRE_View *SIDRE_Group_create_view_from_type_external_int64_t_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, + SIDRE_TypeID type, + int64_t num_elems, + void *external_ptr, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_with_shape_external(SIDRE_Group* self, - const char* path, +SIDRE_View *SIDRE_Group_create_view_with_shape_external(SIDRE_Group *self, + const char *path, SIDRE_TypeID type, int ndims, - const SIDRE_IndexType* shape, - void* external_ptr, - SIDRE_View* SHC_rv); - -SIDRE_View* SIDRE_Group_create_view_with_shape_external_bufferify( - SIDRE_Group* self, - const char* path, - int Lpath, + const SIDRE_IndexType *shape, + void *external_ptr, + SIDRE_View *SHC_rv); + +SIDRE_View *SIDRE_Group_create_view_with_shape_external_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, SIDRE_TypeID type, int ndims, - const SIDRE_IndexType* shape, - void* external_ptr, - SIDRE_View* SHC_rv); + const SIDRE_IndexType *shape, + void *external_ptr, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_and_allocate_nelems(SIDRE_Group* self, - const char* path, +SIDRE_View *SIDRE_Group_create_view_and_allocate_nelems(SIDRE_Group *self, + const char *path, SIDRE_TypeID type, SIDRE_IndexType num_elems, - SIDRE_View* SHC_rv); + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_and_allocate_nelems_bufferify( - SIDRE_Group* self, - const char* path, - int Lpath, +SIDRE_View *SIDRE_Group_create_view_and_allocate_nelems_int32_t_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, SIDRE_TypeID type, - SIDRE_IndexType num_elems, - SIDRE_View* SHC_rv); + int32_t num_elems, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_with_shape_and_allocate( - SIDRE_Group* self, - const char* path, +SIDRE_View *SIDRE_Group_create_view_and_allocate_nelems_int64_t_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, + SIDRE_TypeID type, + int64_t num_elems, + SIDRE_View *SHC_rv); + +SIDRE_View *SIDRE_Group_create_view_with_shape_and_allocate( + SIDRE_Group *self, + const char *path, SIDRE_TypeID type, int ndims, - const SIDRE_IndexType* shape, - SIDRE_View* SHC_rv); + const SIDRE_IndexType *shape, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_with_shape_and_allocate_bufferify( - SIDRE_Group* self, - const char* path, - int Lpath, +SIDRE_View *SIDRE_Group_create_view_with_shape_and_allocate_bufferify( + SIDRE_Group *self, + char *path, + int SHT_path_len, SIDRE_TypeID type, int ndims, - const SIDRE_IndexType* shape, - SIDRE_View* SHC_rv); + const SIDRE_IndexType *shape, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_scalar_int(SIDRE_Group* self, - const char* path, +SIDRE_View *SIDRE_Group_create_view_scalar_int(SIDRE_Group *self, + const char *path, int value, - SIDRE_View* SHC_rv); + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_scalar_bufferify_int(SIDRE_Group* self, - const char* path, - int Lpath, +SIDRE_View *SIDRE_Group_create_view_scalar_bufferify_int(SIDRE_Group *self, + char *path, + int SHT_path_len, int value, - SIDRE_View* SHC_rv); + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_scalar_long(SIDRE_Group* self, - const char* path, +SIDRE_View *SIDRE_Group_create_view_scalar_long(SIDRE_Group *self, + const char *path, long value, - SIDRE_View* SHC_rv); + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_scalar_bufferify_long(SIDRE_Group* self, - const char* path, - int Lpath, +SIDRE_View *SIDRE_Group_create_view_scalar_bufferify_long(SIDRE_Group *self, + char *path, + int SHT_path_len, long value, - SIDRE_View* SHC_rv); + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_scalar_float(SIDRE_Group* self, - const char* path, +SIDRE_View *SIDRE_Group_create_view_scalar_float(SIDRE_Group *self, + const char *path, float value, - SIDRE_View* SHC_rv); + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_scalar_bufferify_float(SIDRE_Group* self, - const char* path, - int Lpath, +SIDRE_View *SIDRE_Group_create_view_scalar_bufferify_float(SIDRE_Group *self, + char *path, + int SHT_path_len, float value, - SIDRE_View* SHC_rv); + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_scalar_double(SIDRE_Group* self, - const char* path, +SIDRE_View *SIDRE_Group_create_view_scalar_double(SIDRE_Group *self, + const char *path, double value, - SIDRE_View* SHC_rv); + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_scalar_bufferify_double(SIDRE_Group* self, - const char* path, - int Lpath, +SIDRE_View *SIDRE_Group_create_view_scalar_bufferify_double(SIDRE_Group *self, + char *path, + int SHT_path_len, double value, - SIDRE_View* SHC_rv); + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_string(SIDRE_Group* self, - const char* path, - const char* value, - SIDRE_View* SHC_rv); +SIDRE_View *SIDRE_Group_create_view_string(SIDRE_Group *self, + const char *path, + const char *value, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_create_view_string_bufferify(SIDRE_Group* self, - const char* path, - int Lpath, - const char* value, - int Lvalue, - SIDRE_View* SHC_rv); +SIDRE_View *SIDRE_Group_create_view_string_bufferify(SIDRE_Group *self, + char *path, + int SHT_path_len, + char *value, + int SHT_value_len, + SIDRE_View *SHC_rv); -void SIDRE_Group_destroy_view(SIDRE_Group* self, const char* path); +void SIDRE_Group_destroy_view(SIDRE_Group *self, const char *path); -void SIDRE_Group_destroy_view_bufferify(SIDRE_Group* self, - const char* path, - int Lpath); +void SIDRE_Group_destroy_view_bufferify(SIDRE_Group *self, + char *path, + int SHT_path_len); -void SIDRE_Group_destroy_view_and_data_name(SIDRE_Group* self, const char* path); +void SIDRE_Group_destroy_view_and_data_name(SIDRE_Group *self, const char *path); -void SIDRE_Group_destroy_view_and_data_name_bufferify(SIDRE_Group* self, - const char* path, - int Lpath); +void SIDRE_Group_destroy_view_and_data_name_bufferify(SIDRE_Group *self, + char *path, + int SHT_path_len); -void SIDRE_Group_destroy_view_and_data_index(SIDRE_Group* self, +void SIDRE_Group_destroy_view_and_data_index(SIDRE_Group *self, SIDRE_IndexType idx); -SIDRE_View* SIDRE_Group_move_view(SIDRE_Group* self, - SIDRE_View* view, - SIDRE_View* SHC_rv); +SIDRE_View *SIDRE_Group_move_view(SIDRE_Group *self, + SIDRE_View *view, + SIDRE_View *SHC_rv); -SIDRE_View* SIDRE_Group_copy_view(SIDRE_Group* self, - SIDRE_View* view, - SIDRE_View* SHC_rv); +SIDRE_View *SIDRE_Group_copy_view(SIDRE_Group *self, + SIDRE_View *view, + SIDRE_View *SHC_rv); -bool SIDRE_Group_has_group(SIDRE_Group* self, const char* path); +bool SIDRE_Group_has_group(SIDRE_Group *self, const char *path); -bool SIDRE_Group_has_group_bufferify(SIDRE_Group* self, - const char* path, - int Lpath); +bool SIDRE_Group_has_group_bufferify(SIDRE_Group *self, + char *path, + int SHT_path_len); -bool SIDRE_Group_has_child_group(SIDRE_Group* self, const char* name); +bool SIDRE_Group_has_child_group(SIDRE_Group *self, const char *name); -bool SIDRE_Group_has_child_group_bufferify(SIDRE_Group* self, - const char* name, - int Lname); +bool SIDRE_Group_has_child_group_bufferify(SIDRE_Group *self, + char *name, + int SHT_name_len); -SIDRE_IndexType SIDRE_Group_get_group_index(const SIDRE_Group* self, - const char* name); +SIDRE_IndexType SIDRE_Group_get_group_index(const SIDRE_Group *self, + const char *name); -SIDRE_IndexType SIDRE_Group_get_group_index_bufferify(const SIDRE_Group* self, - const char* name, - int Lname); +SIDRE_IndexType SIDRE_Group_get_group_index_bufferify(const SIDRE_Group *self, + char *name, + int SHT_name_len); -const char* SIDRE_Group_get_group_name(const SIDRE_Group* self, +const char *SIDRE_Group_get_group_name(const SIDRE_Group *self, SIDRE_IndexType idx); -void SIDRE_Group_get_group_name_bufferify(const SIDRE_Group* self, - SIDRE_IndexType idx, - char* SHF_rv, - int NSHF_rv); +void SIDRE_Group_get_group_name_int32_t_bufferify(const SIDRE_Group *self, + int32_t idx, + char *SHC_rv, + int SHT_rv_len); + +void SIDRE_Group_get_group_name_int64_t_bufferify(const SIDRE_Group *self, + int64_t idx, + char *SHC_rv, + int SHT_rv_len); -SIDRE_Group* SIDRE_Group_get_group_from_name(SIDRE_Group* self, - const char* path, - SIDRE_Group* SHC_rv); +SIDRE_Group *SIDRE_Group_get_group_from_name(SIDRE_Group *self, + const char *path, + SIDRE_Group *SHC_rv); -SIDRE_Group* SIDRE_Group_get_group_from_name_bufferify(SIDRE_Group* self, - const char* path, - int Lpath, - SIDRE_Group* SHC_rv); +SIDRE_Group *SIDRE_Group_get_group_from_name_bufferify(SIDRE_Group *self, + char *path, + int SHT_path_len, + SIDRE_Group *SHC_rv); -SIDRE_Group* SIDRE_Group_get_group_from_index(SIDRE_Group* self, +SIDRE_Group *SIDRE_Group_get_group_from_index(SIDRE_Group *self, SIDRE_IndexType idx, - SIDRE_Group* SHC_rv); + SIDRE_Group *SHC_rv); + +SIDRE_Group *SIDRE_Group_get_group_from_index_int32_t(SIDRE_Group *self, + int32_t idx, + SIDRE_Group *SHC_rv); + +SIDRE_Group *SIDRE_Group_get_group_from_index_int64_t(SIDRE_Group *self, + int64_t idx, + SIDRE_Group *SHC_rv); -SIDRE_IndexType SIDRE_Group_get_first_valid_group_index(const SIDRE_Group* self); +SIDRE_IndexType SIDRE_Group_get_first_valid_group_index(const SIDRE_Group *self); -SIDRE_IndexType SIDRE_Group_get_next_valid_group_index(const SIDRE_Group* self, +SIDRE_IndexType SIDRE_Group_get_next_valid_group_index(const SIDRE_Group *self, SIDRE_IndexType idx); -SIDRE_Group* SIDRE_Group_create_group(SIDRE_Group* self, - const char* path, - SIDRE_Group* SHC_rv); +SIDRE_Group *SIDRE_Group_create_group(SIDRE_Group *self, + const char *path, + SIDRE_Group *SHC_rv); -SIDRE_Group* SIDRE_Group_create_group_bufferify(SIDRE_Group* self, - const char* path, - int Lpath, - SIDRE_Group* SHC_rv); +SIDRE_Group *SIDRE_Group_create_group_bufferify(SIDRE_Group *self, + char *path, + int SHT_path_len, + SIDRE_Group *SHC_rv); -void SIDRE_Group_destroy_group_name(SIDRE_Group* self, const char* path); +void SIDRE_Group_destroy_group_name(SIDRE_Group *self, const char *path); -void SIDRE_Group_destroy_group_name_bufferify(SIDRE_Group* self, - const char* path, - int Lpath); +void SIDRE_Group_destroy_group_name_bufferify(SIDRE_Group *self, + char *path, + int SHT_path_len); -void SIDRE_Group_destroy_group_index(SIDRE_Group* self, SIDRE_IndexType idx); +void SIDRE_Group_destroy_group_index(SIDRE_Group *self, SIDRE_IndexType idx); -SIDRE_Group* SIDRE_Group_move_group(SIDRE_Group* self, - SIDRE_Group* grp, - SIDRE_Group* SHC_rv); +SIDRE_Group *SIDRE_Group_move_group(SIDRE_Group *self, + SIDRE_Group *grp, + SIDRE_Group *SHC_rv); -void SIDRE_Group_print(const SIDRE_Group* self); +void SIDRE_Group_print(const SIDRE_Group *self); -bool SIDRE_Group_is_equivalent_to(const SIDRE_Group* self, SIDRE_Group* other); +bool SIDRE_Group_is_equivalent_to(const SIDRE_Group *self, SIDRE_Group *other); -void SIDRE_Group_save(const SIDRE_Group* self, - const char* file_path, - const char* protocol); +void SIDRE_Group_save(const SIDRE_Group *self, + const char *file_path, + const char *protocol); -void SIDRE_Group_save_bufferify(const SIDRE_Group* self, - const char* file_path, - int Lfile_path, - const char* protocol, - int Lprotocol); +void SIDRE_Group_save_bufferify(const SIDRE_Group *self, + char *file_path, + int SHT_file_path_len, + char *protocol, + int SHT_protocol_len); -void SIDRE_Group_load_0(SIDRE_Group* self, - const char* file_path, - const char* protocol); +void SIDRE_Group_load_0(SIDRE_Group *self, + const char *file_path, + const char *protocol); -void SIDRE_Group_load_0_bufferify(SIDRE_Group* self, - const char* file_path, - int Lfile_path, - const char* protocol, - int Lprotocol); +void SIDRE_Group_load_0_bufferify(SIDRE_Group *self, + char *file_path, + int SHT_file_path_len, + char *protocol, + int SHT_protocol_len); -void SIDRE_Group_load_1(SIDRE_Group* self, - const char* file_path, - const char* protocol, +void SIDRE_Group_load_1(SIDRE_Group *self, + const char *file_path, + const char *protocol, bool preserve_contents); -void SIDRE_Group_load_1_bufferify(SIDRE_Group* self, - const char* file_path, - int Lfile_path, - const char* protocol, - int Lprotocol, +void SIDRE_Group_load_1_bufferify(SIDRE_Group *self, + char *file_path, + int SHT_file_path_len, + char *protocol, + int SHT_protocol_len, bool preserve_contents); -void SIDRE_Group_load_external_data(SIDRE_Group* self, const char* file_path); +void SIDRE_Group_load_external_data(SIDRE_Group *self, const char *file_path); -void SIDRE_Group_load_external_data_bufferify(SIDRE_Group* self, - const char* file_path, - int Lfile_path); +void SIDRE_Group_load_external_data_bufferify(SIDRE_Group *self, + char *file_path, + int SHT_file_path_len); -bool SIDRE_Group_rename(SIDRE_Group* self, const char* new_name); +bool SIDRE_Group_rename(SIDRE_Group *self, const char *new_name); -bool SIDRE_Group_rename_bufferify(SIDRE_Group* self, - const char* new_name, - int Lnew_name); +bool SIDRE_Group_rename_bufferify(SIDRE_Group *self, + char *new_name, + int SHT_new_name_len); #ifdef __cplusplus } diff --git a/src/axom/sidre/interface/c_fortran/wrapSidre.cpp b/src/axom/sidre/interface/c_fortran/wrapSidre.cpp index 3bbedda102..a1d1ba5910 100644 --- a/src/axom/sidre/interface/c_fortran/wrapSidre.cpp +++ b/src/axom/sidre/interface/c_fortran/wrapSidre.cpp @@ -1,16 +1,13 @@ // wrapSidre.cpp -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) -#include "wrapSidre.h" -#include -#include -#include "typesSidre.h" -#include "axom/sidre/core/DataStore.hpp" +#include +#include "wrapSidre.h" // splicer begin CXX_definitions // splicer end CXX_definitions @@ -38,37 +35,9 @@ void sidre_c_loc_(void* addr, void** out) { *out = addr; } bool SIDRE_name_is_valid(const char* name) { - // splicer begin function.name_is_valid + // splicer begin function.nameIsValid return name != NULL; - // splicer end function.name_is_valid -} - -// Release library allocated memory. -void SIDRE_SHROUD_memory_destructor(SIDRE_SHROUD_capsule_data* cap) -{ - void* ptr = cap->addr; - switch(cap->idtor) - { - case 0: // --none-- - { - // Nothing to delete - break; - } - case 1: // axom::sidre::DataStore - { - axom::sidre::DataStore* cxx_ptr = - reinterpret_cast(ptr); - delete cxx_ptr; - break; - } - default: - { - // Unexpected case in destructor - break; - } - } - cap->addr = nullptr; - cap->idtor = 0; // avoid deleting again + // splicer end function.nameIsValid } } // extern "C" diff --git a/src/axom/sidre/interface/c_fortran/wrapSidre.h b/src/axom/sidre/interface/c_fortran/wrapSidre.h index 062ee46ab0..005c67323b 100644 --- a/src/axom/sidre/interface/c_fortran/wrapSidre.h +++ b/src/axom/sidre/interface/c_fortran/wrapSidre.h @@ -1,5 +1,5 @@ // wrapSidre.h -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -14,10 +14,10 @@ #ifndef WRAPSIDRE_H #define WRAPSIDRE_H -#include "typesSidre.h" #ifndef __cplusplus #include #endif +#include "typesSidre.h" // splicer begin CXX_declarations // splicer end CXX_declarations @@ -26,7 +26,31 @@ extern "C" { #endif +// typedef axom::sidre::IndexType +// splicer begin typedef.IndexType +// See SidreTypes.h +// splicer end typedef.IndexType + +// typedef axom::sidre::TypeID +// splicer begin typedef.TypeID +typedef short SIDRE_TypeID; +// splicer end typedef.TypeID + +// typedef axom::sidre::TypeIDint +// splicer begin typedef.TypeIDint +typedef int SIDRE_TypeIDint; +// splicer end typedef.TypeIDint + // splicer begin C_declarations +#if 0 + #ifndef __cplusplus + #if defined(USE_64BIT_INDEXTYPE) +typedef int64_t IndexType; + #else +typedef int32_t IndexType; + #endif + #endif +#endif // splicer end C_declarations bool SIDRE_name_is_valid(const char* name); diff --git a/src/axom/sidre/interface/c_fortran/wrapView.cpp b/src/axom/sidre/interface/c_fortran/wrapView.cpp index 86d6f368a2..fe8e62dee9 100644 --- a/src/axom/sidre/interface/c_fortran/wrapView.cpp +++ b/src/axom/sidre/interface/c_fortran/wrapView.cpp @@ -1,22 +1,41 @@ // wrapView.cpp -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) -#include "wrapView.h" -#include + +#include "axom/sidre/core/View.hpp" #include -#include "axom/sidre/core/Buffer.hpp" #include "axom/sidre/core/Group.hpp" -#include "axom/sidre/core/View.hpp" +#include "axom/sidre/core/Buffer.hpp" +#include +#include "wrapView.h" // splicer begin class.View.CXX_definitions // splicer end class.View.CXX_definitions extern "C" { +// helper ShroudLenTrim +// Returns the length of character string src with length nsrc, +// ignoring any trailing blanks. +static int ShroudLenTrim(const char *src, int nsrc) +{ + int i; + + for(i = nsrc - 1; i >= 0; i--) + { + if(src[i] != ' ') + { + break; + } + } + + return i + 1; +} + // helper ShroudStrCopy // Copy src into dest, blank fill to ndest characters // Truncate if dest is too short. @@ -29,16 +48,10 @@ static void ShroudStrCopy(char *dest, int ndest, const char *src, int nsrc) } else { - if(nsrc < 0) - { - nsrc = std::strlen(src); - } + if(nsrc < 0) nsrc = std::strlen(src); int nm = nsrc < ndest ? nsrc : ndest; std::memcpy(dest, src, nm); - if(ndest > nm) - { - std::memset(dest + nm, ' ', ndest - nm); // blank fill - } + if(ndest > nm) std::memset(dest + nm, ' ', ndest - nm); // blank fill } } // splicer begin class.View.C_definitions @@ -47,266 +60,270 @@ static void ShroudStrCopy(char *dest, int ndest, const char *src, int nsrc) SIDRE_IndexType SIDRE_View_get_index(SIDRE_View *self) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_index + // splicer begin class.View.method.getIndex axom::sidre::IndexType SHC_rv = SH_this->getIndex(); return SHC_rv; - // splicer end class.View.method.get_index + // splicer end class.View.method.getIndex } const char *SIDRE_View_get_name(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_name + // splicer begin class.View.method.getName const std::string &SHCXX_rv = SH_this->getName(); const char *SHC_rv = SHCXX_rv.c_str(); return SHC_rv; - // splicer end class.View.method.get_name + // splicer end class.View.method.getName } -void SIDRE_View_get_name_bufferify(const SIDRE_View *self, char *SHF_rv, int NSHF_rv) +void SIDRE_View_get_name_bufferify(const SIDRE_View *self, + char *SHC_rv, + int SHT_rv_len) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_name_bufferify + // splicer begin class.View.method.getName_bufferify const std::string &SHCXX_rv = SH_this->getName(); if(SHCXX_rv.empty()) { - ShroudStrCopy(SHF_rv, NSHF_rv, nullptr, 0); + ShroudStrCopy(SHC_rv, SHT_rv_len, nullptr, 0); } else { - ShroudStrCopy(SHF_rv, NSHF_rv, SHCXX_rv.data(), SHCXX_rv.size()); + ShroudStrCopy(SHC_rv, SHT_rv_len, SHCXX_rv.data(), SHCXX_rv.size()); } - // splicer end class.View.method.get_name_bufferify + // splicer end class.View.method.getName_bufferify } -void SIDRE_View_get_path_bufferify(const SIDRE_View *self, char *SHF_rv, int NSHF_rv) +void SIDRE_View_get_path_bufferify(const SIDRE_View *self, + char *SHC_rv, + int SHT_rv_len) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_path_bufferify + // splicer begin class.View.method.getPath_bufferify std::string SHCXX_rv = SH_this->getPath(); if(SHCXX_rv.empty()) { - ShroudStrCopy(SHF_rv, NSHF_rv, nullptr, 0); + ShroudStrCopy(SHC_rv, SHT_rv_len, nullptr, 0); } else { - ShroudStrCopy(SHF_rv, NSHF_rv, SHCXX_rv.data(), SHCXX_rv.size()); + ShroudStrCopy(SHC_rv, SHT_rv_len, SHCXX_rv.data(), SHCXX_rv.size()); } - // splicer end class.View.method.get_path_bufferify + // splicer end class.View.method.getPath_bufferify } void SIDRE_View_get_path_name_bufferify(const SIDRE_View *self, - char *SHF_rv, - int NSHF_rv) + char *SHC_rv, + int SHT_rv_len) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_path_name_bufferify + // splicer begin class.View.method.getPathName_bufferify std::string SHCXX_rv = SH_this->getPathName(); if(SHCXX_rv.empty()) { - ShroudStrCopy(SHF_rv, NSHF_rv, nullptr, 0); + ShroudStrCopy(SHC_rv, SHT_rv_len, nullptr, 0); } else { - ShroudStrCopy(SHF_rv, NSHF_rv, SHCXX_rv.data(), SHCXX_rv.size()); + ShroudStrCopy(SHC_rv, SHT_rv_len, SHCXX_rv.data(), SHCXX_rv.size()); } - // splicer end class.View.method.get_path_name_bufferify + // splicer end class.View.method.getPathName_bufferify } SIDRE_Group *SIDRE_View_get_owning_group(SIDRE_View *self, SIDRE_Group *SHC_rv) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_owning_group + // splicer begin class.View.method.getOwningGroup axom::sidre::Group *SHCXX_rv = SH_this->getOwningGroup(); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.View.method.get_owning_group + // splicer end class.View.method.getOwningGroup } bool SIDRE_View_has_buffer(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.has_buffer + // splicer begin class.View.method.hasBuffer bool SHC_rv = SH_this->hasBuffer(); return SHC_rv; - // splicer end class.View.method.has_buffer + // splicer end class.View.method.hasBuffer } SIDRE_Buffer *SIDRE_View_get_buffer(SIDRE_View *self, SIDRE_Buffer *SHC_rv) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_buffer + // splicer begin class.View.method.getBuffer axom::sidre::Buffer *SHCXX_rv = SH_this->getBuffer(); SHC_rv->addr = SHCXX_rv; SHC_rv->idtor = 0; return SHC_rv; - // splicer end class.View.method.get_buffer + // splicer end class.View.method.getBuffer } bool SIDRE_View_is_external(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.is_external + // splicer begin class.View.method.isExternal bool SHC_rv = SH_this->isExternal(); return SHC_rv; - // splicer end class.View.method.is_external + // splicer end class.View.method.isExternal } bool SIDRE_View_is_allocated(SIDRE_View *self) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.is_allocated + // splicer begin class.View.method.isAllocated bool SHC_rv = SH_this->isAllocated(); return SHC_rv; - // splicer end class.View.method.is_allocated + // splicer end class.View.method.isAllocated } bool SIDRE_View_is_applied(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.is_applied + // splicer begin class.View.method.isApplied bool SHC_rv = SH_this->isApplied(); return SHC_rv; - // splicer end class.View.method.is_applied + // splicer end class.View.method.isApplied } bool SIDRE_View_is_described(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.is_described + // splicer begin class.View.method.isDescribed bool SHC_rv = SH_this->isDescribed(); return SHC_rv; - // splicer end class.View.method.is_described + // splicer end class.View.method.isDescribed } bool SIDRE_View_is_empty(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.is_empty + // splicer begin class.View.method.isEmpty bool SHC_rv = SH_this->isEmpty(); return SHC_rv; - // splicer end class.View.method.is_empty + // splicer end class.View.method.isEmpty } bool SIDRE_View_is_opaque(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.is_opaque + // splicer begin class.View.method.isOpaque bool SHC_rv = SH_this->isOpaque(); return SHC_rv; - // splicer end class.View.method.is_opaque + // splicer end class.View.method.isOpaque } bool SIDRE_View_is_scalar(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.is_scalar + // splicer begin class.View.method.isScalar bool SHC_rv = SH_this->isScalar(); return SHC_rv; - // splicer end class.View.method.is_scalar + // splicer end class.View.method.isScalar } bool SIDRE_View_is_string(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.is_string + // splicer begin class.View.method.isString bool SHC_rv = SH_this->isString(); return SHC_rv; - // splicer end class.View.method.is_string + // splicer end class.View.method.isString } SIDRE_TypeIDint SIDRE_View_get_type_id(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_type_id + // splicer begin class.View.method.getTypeID axom::sidre::TypeID SHCXX_rv = SH_this->getTypeID(); SIDRE_TypeIDint SHC_rv = static_cast(SHCXX_rv); return SHC_rv; - // splicer end class.View.method.get_type_id + // splicer end class.View.method.getTypeID } size_t SIDRE_View_get_total_bytes(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_total_bytes + // splicer begin class.View.method.getTotalBytes size_t SHC_rv = SH_this->getTotalBytes(); return SHC_rv; - // splicer end class.View.method.get_total_bytes + // splicer end class.View.method.getTotalBytes } size_t SIDRE_View_get_num_elements(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_num_elements + // splicer begin class.View.method.getNumElements size_t SHC_rv = SH_this->getNumElements(); return SHC_rv; - // splicer end class.View.method.get_num_elements + // splicer end class.View.method.getNumElements } size_t SIDRE_View_get_bytes_per_element(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_bytes_per_element + // splicer begin class.View.method.getBytesPerElement size_t SHC_rv = SH_this->getBytesPerElement(); return SHC_rv; - // splicer end class.View.method.get_bytes_per_element + // splicer end class.View.method.getBytesPerElement } size_t SIDRE_View_get_offset(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_offset + // splicer begin class.View.method.getOffset size_t SHC_rv = SH_this->getOffset(); return SHC_rv; - // splicer end class.View.method.get_offset + // splicer end class.View.method.getOffset } size_t SIDRE_View_get_stride(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_stride + // splicer begin class.View.method.getStride size_t SHC_rv = SH_this->getStride(); return SHC_rv; - // splicer end class.View.method.get_stride + // splicer end class.View.method.getStride } int SIDRE_View_get_num_dimensions(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_num_dimensions + // splicer begin class.View.method.getNumDimensions int SHC_rv = SH_this->getNumDimensions(); return SHC_rv; - // splicer end class.View.method.get_num_dimensions + // splicer end class.View.method.getNumDimensions } int SIDRE_View_get_shape(const SIDRE_View *self, int ndims, SIDRE_IndexType *shape) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_shape + // splicer begin class.View.method.getShape int SHC_rv = SH_this->getShape(ndims, shape); return SHC_rv; - // splicer end class.View.method.get_shape + // splicer end class.View.method.getShape } void SIDRE_View_allocate_simple(SIDRE_View *self) @@ -339,11 +356,11 @@ void SIDRE_View_reallocate(SIDRE_View *self, SIDRE_IndexType num_elems) void SIDRE_View_attach_buffer_only(SIDRE_View *self, SIDRE_Buffer *buff) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.attach_buffer_only + // splicer begin class.View.method.attachBuffer_only axom::sidre::Buffer *SHCXX_buff = static_cast(buff->addr); SH_this->attachBuffer(SHCXX_buff); - // splicer end class.View.method.attach_buffer_only + // splicer end class.View.method.attachBuffer_only } void SIDRE_View_attach_buffer_type(SIDRE_View *self, @@ -352,12 +369,40 @@ void SIDRE_View_attach_buffer_type(SIDRE_View *self, SIDRE_Buffer *buff) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.attach_buffer_type + // splicer begin class.View.method.attachBuffer_type + axom::sidre::TypeID SHCXX_type = static_cast(type); + axom::sidre::Buffer *SHCXX_buff = + static_cast(buff->addr); + SH_this->attachBuffer(SHCXX_type, num_elems, SHCXX_buff); + // splicer end class.View.method.attachBuffer_type +} + +void SIDRE_View_attach_buffer_type_int32_t(SIDRE_View *self, + SIDRE_TypeID type, + int32_t num_elems, + SIDRE_Buffer *buff) +{ + axom::sidre::View *SH_this = static_cast(self->addr); + // splicer begin class.View.method.attachBuffer_type_int32_t + axom::sidre::TypeID SHCXX_type = static_cast(type); + axom::sidre::Buffer *SHCXX_buff = + static_cast(buff->addr); + SH_this->attachBuffer(SHCXX_type, num_elems, SHCXX_buff); + // splicer end class.View.method.attachBuffer_type_int32_t +} + +void SIDRE_View_attach_buffer_type_int64_t(SIDRE_View *self, + SIDRE_TypeID type, + int64_t num_elems, + SIDRE_Buffer *buff) +{ + axom::sidre::View *SH_this = static_cast(self->addr); + // splicer begin class.View.method.attachBuffer_type_int64_t axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::Buffer *SHCXX_buff = static_cast(buff->addr); SH_this->attachBuffer(SHCXX_type, num_elems, SHCXX_buff); - // splicer end class.View.method.attach_buffer_type + // splicer end class.View.method.attachBuffer_type_int64_t } void SIDRE_View_attach_buffer_shape(SIDRE_View *self, @@ -367,12 +412,12 @@ void SIDRE_View_attach_buffer_shape(SIDRE_View *self, SIDRE_Buffer *buff) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.attach_buffer_shape + // splicer begin class.View.method.attachBuffer_shape axom::sidre::TypeID SHCXX_type = static_cast(type); axom::sidre::Buffer *SHCXX_buff = static_cast(buff->addr); SH_this->attachBuffer(SHCXX_type, ndims, shape, SHCXX_buff); - // splicer end class.View.method.attach_buffer_shape + // splicer end class.View.method.attachBuffer_shape } void SIDRE_View_clear(SIDRE_View *self) @@ -471,59 +516,61 @@ void SIDRE_View_apply_type_shape(SIDRE_View *self, void SIDRE_View_set_scalar_int(SIDRE_View *self, int value) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.set_scalar_int + // splicer begin class.View.method.setScalar_int SH_this->setScalar(value); - // splicer end class.View.method.set_scalar_int + // splicer end class.View.method.setScalar_int } void SIDRE_View_set_scalar_long(SIDRE_View *self, long value) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.set_scalar_long + // splicer begin class.View.method.setScalar_long SH_this->setScalar(value); - // splicer end class.View.method.set_scalar_long + // splicer end class.View.method.setScalar_long } void SIDRE_View_set_scalar_float(SIDRE_View *self, float value) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.set_scalar_float + // splicer begin class.View.method.setScalar_float SH_this->setScalar(value); - // splicer end class.View.method.set_scalar_float + // splicer end class.View.method.setScalar_float } void SIDRE_View_set_scalar_double(SIDRE_View *self, double value) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.set_scalar_double + // splicer begin class.View.method.setScalar_double SH_this->setScalar(value); - // splicer end class.View.method.set_scalar_double + // splicer end class.View.method.setScalar_double } void SIDRE_View_set_string(SIDRE_View *self, const char *value) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.set_string + // splicer begin class.View.method.setString const std::string SHCXX_value(value); SH_this->setString(SHCXX_value); - // splicer end class.View.method.set_string + // splicer end class.View.method.setString } -void SIDRE_View_set_string_bufferify(SIDRE_View *self, const char *value, int Lvalue) +void SIDRE_View_set_string_bufferify(SIDRE_View *self, + char *value, + int SHT_value_len) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.set_string_bufferify - const std::string SHCXX_value(value, Lvalue); + // splicer begin class.View.method.setString_bufferify + const std::string SHCXX_value(value, ShroudLenTrim(value, SHT_value_len)); SH_this->setString(SHCXX_value); - // splicer end class.View.method.set_string_bufferify + // splicer end class.View.method.setString_bufferify } void SIDRE_View_set_external_data_ptr_only(SIDRE_View *self, void *external_ptr) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.set_external_data_ptr_only + // splicer begin class.View.method.setExternalDataPtr_only SH_this->setExternalDataPtr(external_ptr); - // splicer end class.View.method.set_external_data_ptr_only + // splicer end class.View.method.setExternalDataPtr_only } void SIDRE_View_set_external_data_ptr_type(SIDRE_View *self, @@ -532,10 +579,34 @@ void SIDRE_View_set_external_data_ptr_type(SIDRE_View *self, void *external_ptr) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.set_external_data_ptr_type + // splicer begin class.View.method.setExternalDataPtr_type + axom::sidre::TypeID SHCXX_type = static_cast(type); + SH_this->setExternalDataPtr(SHCXX_type, num_elems, external_ptr); + // splicer end class.View.method.setExternalDataPtr_type +} + +void SIDRE_View_set_external_data_ptr_type_int32_t(SIDRE_View *self, + SIDRE_TypeID type, + int32_t num_elems, + void *external_ptr) +{ + axom::sidre::View *SH_this = static_cast(self->addr); + // splicer begin class.View.method.setExternalDataPtr_type_int32_t + axom::sidre::TypeID SHCXX_type = static_cast(type); + SH_this->setExternalDataPtr(SHCXX_type, num_elems, external_ptr); + // splicer end class.View.method.setExternalDataPtr_type_int32_t +} + +void SIDRE_View_set_external_data_ptr_type_int64_t(SIDRE_View *self, + SIDRE_TypeID type, + int64_t num_elems, + void *external_ptr) +{ + axom::sidre::View *SH_this = static_cast(self->addr); + // splicer begin class.View.method.setExternalDataPtr_type_int64_t axom::sidre::TypeID SHCXX_type = static_cast(type); SH_this->setExternalDataPtr(SHCXX_type, num_elems, external_ptr); - // splicer end class.View.method.set_external_data_ptr_type + // splicer end class.View.method.setExternalDataPtr_type_int64_t } void SIDRE_View_set_external_data_ptr_shape(SIDRE_View *self, @@ -545,74 +616,74 @@ void SIDRE_View_set_external_data_ptr_shape(SIDRE_View *self, void *external_ptr) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.set_external_data_ptr_shape + // splicer begin class.View.method.setExternalDataPtr_shape axom::sidre::TypeID SHCXX_type = static_cast(type); SH_this->setExternalDataPtr(SHCXX_type, ndims, shape, external_ptr); - // splicer end class.View.method.set_external_data_ptr_shape + // splicer end class.View.method.setExternalDataPtr_shape } const char *SIDRE_View_get_string(SIDRE_View *self) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_string + // splicer begin class.View.method.getString const char *SHC_rv = SH_this->getString(); return SHC_rv; - // splicer end class.View.method.get_string + // splicer end class.View.method.getString } -void SIDRE_View_get_string_bufferify(SIDRE_View *self, char *name, int Nname) +void SIDRE_View_get_string_bufferify(SIDRE_View *self, char *name, int SHT_name_len) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_string_bufferify + // splicer begin class.View.method.getString_bufferify const char *SHC_rv = SH_this->getString(); - ShroudStrCopy(name, Nname, SHC_rv, -1); - // splicer end class.View.method.get_string_bufferify + ShroudStrCopy(name, SHT_name_len, SHC_rv, -1); + // splicer end class.View.method.getString_bufferify } int SIDRE_View_get_data_int(SIDRE_View *self) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_data_int + // splicer begin class.View.method.getData_int int SHC_rv = SH_this->getData(); return SHC_rv; - // splicer end class.View.method.get_data_int + // splicer end class.View.method.getData_int } long SIDRE_View_get_data_long(SIDRE_View *self) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_data_long + // splicer begin class.View.method.getData_long long SHC_rv = SH_this->getData(); return SHC_rv; - // splicer end class.View.method.get_data_long + // splicer end class.View.method.getData_long } float SIDRE_View_get_data_float(SIDRE_View *self) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_data_float + // splicer begin class.View.method.getData_float float SHC_rv = SH_this->getData(); return SHC_rv; - // splicer end class.View.method.get_data_float + // splicer end class.View.method.getData_float } double SIDRE_View_get_data_double(SIDRE_View *self) { axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_data_double + // splicer begin class.View.method.getData_double double SHC_rv = SH_this->getData(); return SHC_rv; - // splicer end class.View.method.get_data_double + // splicer end class.View.method.getData_double } void *SIDRE_View_get_void_ptr(const SIDRE_View *self) { const axom::sidre::View *SH_this = static_cast(self->addr); - // splicer begin class.View.method.get_void_ptr + // splicer begin class.View.method.getVoidPtr void *SHC_rv = SH_this->getVoidPtr(); return SHC_rv; - // splicer end class.View.method.get_void_ptr + // splicer end class.View.method.getVoidPtr } void SIDRE_View_print(const SIDRE_View *self) @@ -635,12 +706,13 @@ bool SIDRE_View_rename(SIDRE_View *self, const char *new_name) } bool SIDRE_View_rename_bufferify(SIDRE_View *self, - const char *new_name, - int Lnew_name) + char *new_name, + int SHT_new_name_len) { axom::sidre::View *SH_this = static_cast(self->addr); // splicer begin class.View.method.rename_bufferify - const std::string SHCXX_new_name(new_name, Lnew_name); + const std::string SHCXX_new_name(new_name, + ShroudLenTrim(new_name, SHT_new_name_len)); bool SHC_rv = SH_this->rename(SHCXX_new_name); return SHC_rv; // splicer end class.View.method.rename_bufferify diff --git a/src/axom/sidre/interface/c_fortran/wrapView.h b/src/axom/sidre/interface/c_fortran/wrapView.h index 30834d2b11..8e8227a1ec 100644 --- a/src/axom/sidre/interface/c_fortran/wrapView.h +++ b/src/axom/sidre/interface/c_fortran/wrapView.h @@ -1,5 +1,5 @@ // wrapView.h -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -14,15 +14,18 @@ #ifndef WRAPVIEW_H #define WRAPVIEW_H +#include "wrapSidre.h" #include "axom/sidre/interface/SidreTypes.h" -#include "typesSidre.h" #ifdef __cplusplus - #include #include "axom/sidre/core/SidreTypes.hpp" + #include + #include #else #include #include + #include #endif +#include "typesSidre.h" // splicer begin class.View.CXX_declarations // splicer end class.View.CXX_declarations @@ -34,164 +37,186 @@ extern "C" { // splicer begin class.View.C_declarations // splicer end class.View.C_declarations -SIDRE_IndexType SIDRE_View_get_index(SIDRE_View* self); +SIDRE_IndexType SIDRE_View_get_index(SIDRE_View *self); -const char* SIDRE_View_get_name(const SIDRE_View* self); +const char *SIDRE_View_get_name(const SIDRE_View *self); -void SIDRE_View_get_name_bufferify(const SIDRE_View* self, - char* SHF_rv, - int NSHF_rv); +void SIDRE_View_get_name_bufferify(const SIDRE_View *self, + char *SHC_rv, + int SHT_rv_len); -void SIDRE_View_get_path_bufferify(const SIDRE_View* self, - char* SHF_rv, - int NSHF_rv); +void SIDRE_View_get_path_bufferify(const SIDRE_View *self, + char *SHC_rv, + int SHT_rv_len); -void SIDRE_View_get_path_name_bufferify(const SIDRE_View* self, - char* SHF_rv, - int NSHF_rv); +void SIDRE_View_get_path_name_bufferify(const SIDRE_View *self, + char *SHC_rv, + int SHT_rv_len); -SIDRE_Group* SIDRE_View_get_owning_group(SIDRE_View* self, SIDRE_Group* SHC_rv); +SIDRE_Group *SIDRE_View_get_owning_group(SIDRE_View *self, SIDRE_Group *SHC_rv); -bool SIDRE_View_has_buffer(const SIDRE_View* self); +bool SIDRE_View_has_buffer(const SIDRE_View *self); -SIDRE_Buffer* SIDRE_View_get_buffer(SIDRE_View* self, SIDRE_Buffer* SHC_rv); +SIDRE_Buffer *SIDRE_View_get_buffer(SIDRE_View *self, SIDRE_Buffer *SHC_rv); -bool SIDRE_View_is_external(const SIDRE_View* self); +bool SIDRE_View_is_external(const SIDRE_View *self); -bool SIDRE_View_is_allocated(SIDRE_View* self); +bool SIDRE_View_is_allocated(SIDRE_View *self); -bool SIDRE_View_is_applied(const SIDRE_View* self); +bool SIDRE_View_is_applied(const SIDRE_View *self); -bool SIDRE_View_is_described(const SIDRE_View* self); +bool SIDRE_View_is_described(const SIDRE_View *self); -bool SIDRE_View_is_empty(const SIDRE_View* self); +bool SIDRE_View_is_empty(const SIDRE_View *self); -bool SIDRE_View_is_opaque(const SIDRE_View* self); +bool SIDRE_View_is_opaque(const SIDRE_View *self); -bool SIDRE_View_is_scalar(const SIDRE_View* self); +bool SIDRE_View_is_scalar(const SIDRE_View *self); -bool SIDRE_View_is_string(const SIDRE_View* self); +bool SIDRE_View_is_string(const SIDRE_View *self); -SIDRE_TypeIDint SIDRE_View_get_type_id(const SIDRE_View* self); +SIDRE_TypeIDint SIDRE_View_get_type_id(const SIDRE_View *self); -size_t SIDRE_View_get_total_bytes(const SIDRE_View* self); +size_t SIDRE_View_get_total_bytes(const SIDRE_View *self); -size_t SIDRE_View_get_num_elements(const SIDRE_View* self); +size_t SIDRE_View_get_num_elements(const SIDRE_View *self); -size_t SIDRE_View_get_bytes_per_element(const SIDRE_View* self); +size_t SIDRE_View_get_bytes_per_element(const SIDRE_View *self); -size_t SIDRE_View_get_offset(const SIDRE_View* self); +size_t SIDRE_View_get_offset(const SIDRE_View *self); -size_t SIDRE_View_get_stride(const SIDRE_View* self); +size_t SIDRE_View_get_stride(const SIDRE_View *self); -int SIDRE_View_get_num_dimensions(const SIDRE_View* self); +int SIDRE_View_get_num_dimensions(const SIDRE_View *self); -int SIDRE_View_get_shape(const SIDRE_View* self, int ndims, SIDRE_IndexType* shape); +int SIDRE_View_get_shape(const SIDRE_View *self, int ndims, SIDRE_IndexType *shape); -void SIDRE_View_allocate_simple(SIDRE_View* self); +void SIDRE_View_allocate_simple(SIDRE_View *self); -void SIDRE_View_allocate_from_type(SIDRE_View* self, +void SIDRE_View_allocate_from_type(SIDRE_View *self, SIDRE_TypeID type, SIDRE_IndexType num_elems); -void SIDRE_View_reallocate(SIDRE_View* self, SIDRE_IndexType num_elems); +void SIDRE_View_reallocate(SIDRE_View *self, SIDRE_IndexType num_elems); -void SIDRE_View_attach_buffer_only(SIDRE_View* self, SIDRE_Buffer* buff); +void SIDRE_View_attach_buffer_only(SIDRE_View *self, SIDRE_Buffer *buff); -void SIDRE_View_attach_buffer_type(SIDRE_View* self, +void SIDRE_View_attach_buffer_type(SIDRE_View *self, SIDRE_TypeID type, SIDRE_IndexType num_elems, - SIDRE_Buffer* buff); + SIDRE_Buffer *buff); + +void SIDRE_View_attach_buffer_type_int32_t(SIDRE_View *self, + SIDRE_TypeID type, + int32_t num_elems, + SIDRE_Buffer *buff); + +void SIDRE_View_attach_buffer_type_int64_t(SIDRE_View *self, + SIDRE_TypeID type, + int64_t num_elems, + SIDRE_Buffer *buff); -void SIDRE_View_attach_buffer_shape(SIDRE_View* self, +void SIDRE_View_attach_buffer_shape(SIDRE_View *self, SIDRE_TypeID type, int ndims, - const SIDRE_IndexType* shape, - SIDRE_Buffer* buff); + const SIDRE_IndexType *shape, + SIDRE_Buffer *buff); -void SIDRE_View_clear(SIDRE_View* self); +void SIDRE_View_clear(SIDRE_View *self); -void SIDRE_View_apply_0(SIDRE_View* self); +void SIDRE_View_apply_0(SIDRE_View *self); -void SIDRE_View_apply_nelems(SIDRE_View* self, SIDRE_IndexType num_elems); +void SIDRE_View_apply_nelems(SIDRE_View *self, SIDRE_IndexType num_elems); -void SIDRE_View_apply_nelems_offset(SIDRE_View* self, +void SIDRE_View_apply_nelems_offset(SIDRE_View *self, SIDRE_IndexType num_elems, SIDRE_IndexType offset); -void SIDRE_View_apply_nelems_offset_stride(SIDRE_View* self, +void SIDRE_View_apply_nelems_offset_stride(SIDRE_View *self, SIDRE_IndexType num_elems, SIDRE_IndexType offset, SIDRE_IndexType stride); -void SIDRE_View_apply_type_nelems(SIDRE_View* self, +void SIDRE_View_apply_type_nelems(SIDRE_View *self, SIDRE_TypeID type, SIDRE_IndexType num_elems); -void SIDRE_View_apply_type_nelems_offset(SIDRE_View* self, +void SIDRE_View_apply_type_nelems_offset(SIDRE_View *self, SIDRE_TypeID type, SIDRE_IndexType num_elems, SIDRE_IndexType offset); -void SIDRE_View_apply_type_nelems_offset_stride(SIDRE_View* self, +void SIDRE_View_apply_type_nelems_offset_stride(SIDRE_View *self, SIDRE_TypeID type, SIDRE_IndexType num_elems, SIDRE_IndexType offset, SIDRE_IndexType stride); -void SIDRE_View_apply_type_shape(SIDRE_View* self, +void SIDRE_View_apply_type_shape(SIDRE_View *self, SIDRE_TypeID type, int ndims, - const SIDRE_IndexType* shape); + const SIDRE_IndexType *shape); -void SIDRE_View_set_scalar_int(SIDRE_View* self, int value); +void SIDRE_View_set_scalar_int(SIDRE_View *self, int value); -void SIDRE_View_set_scalar_long(SIDRE_View* self, long value); +void SIDRE_View_set_scalar_long(SIDRE_View *self, long value); -void SIDRE_View_set_scalar_float(SIDRE_View* self, float value); +void SIDRE_View_set_scalar_float(SIDRE_View *self, float value); -void SIDRE_View_set_scalar_double(SIDRE_View* self, double value); +void SIDRE_View_set_scalar_double(SIDRE_View *self, double value); -void SIDRE_View_set_string(SIDRE_View* self, const char* value); +void SIDRE_View_set_string(SIDRE_View *self, const char *value); -void SIDRE_View_set_string_bufferify(SIDRE_View* self, - const char* value, - int Lvalue); +void SIDRE_View_set_string_bufferify(SIDRE_View *self, + char *value, + int SHT_value_len); -void SIDRE_View_set_external_data_ptr_only(SIDRE_View* self, void* external_ptr); +void SIDRE_View_set_external_data_ptr_only(SIDRE_View *self, void *external_ptr); -void SIDRE_View_set_external_data_ptr_type(SIDRE_View* self, +void SIDRE_View_set_external_data_ptr_type(SIDRE_View *self, SIDRE_TypeID type, SIDRE_IndexType num_elems, - void* external_ptr); + void *external_ptr); + +void SIDRE_View_set_external_data_ptr_type_int32_t(SIDRE_View *self, + SIDRE_TypeID type, + int32_t num_elems, + void *external_ptr); + +void SIDRE_View_set_external_data_ptr_type_int64_t(SIDRE_View *self, + SIDRE_TypeID type, + int64_t num_elems, + void *external_ptr); -void SIDRE_View_set_external_data_ptr_shape(SIDRE_View* self, +void SIDRE_View_set_external_data_ptr_shape(SIDRE_View *self, SIDRE_TypeID type, int ndims, - const SIDRE_IndexType* shape, - void* external_ptr); + const SIDRE_IndexType *shape, + void *external_ptr); -const char* SIDRE_View_get_string(SIDRE_View* self); +const char *SIDRE_View_get_string(SIDRE_View *self); -void SIDRE_View_get_string_bufferify(SIDRE_View* self, char* name, int Nname); +void SIDRE_View_get_string_bufferify(SIDRE_View *self, + char *name, + int SHT_name_len); -int SIDRE_View_get_data_int(SIDRE_View* self); +int SIDRE_View_get_data_int(SIDRE_View *self); -long SIDRE_View_get_data_long(SIDRE_View* self); +long SIDRE_View_get_data_long(SIDRE_View *self); -float SIDRE_View_get_data_float(SIDRE_View* self); +float SIDRE_View_get_data_float(SIDRE_View *self); -double SIDRE_View_get_data_double(SIDRE_View* self); +double SIDRE_View_get_data_double(SIDRE_View *self); -void* SIDRE_View_get_void_ptr(const SIDRE_View* self); +void *SIDRE_View_get_void_ptr(const SIDRE_View *self); -void SIDRE_View_print(const SIDRE_View* self); +void SIDRE_View_print(const SIDRE_View *self); -bool SIDRE_View_rename(SIDRE_View* self, const char* new_name); +bool SIDRE_View_rename(SIDRE_View *self, const char *new_name); -bool SIDRE_View_rename_bufferify(SIDRE_View* self, - const char* new_name, - int Lnew_name); +bool SIDRE_View_rename_bufferify(SIDRE_View *self, + char *new_name, + int SHT_new_name_len); #ifdef __cplusplus } diff --git a/src/axom/sidre/interface/c_fortran/wrapfsidre.F b/src/axom/sidre/interface/c_fortran/wrapfsidre.F index ea7b1aa2af..e360720ea4 100644 --- a/src/axom/sidre/interface/c_fortran/wrapfsidre.F +++ b/src/axom/sidre/interface/c_fortran/wrapfsidre.F @@ -1,5 +1,5 @@ ! wrapfsidre.F -! This file is generated by Shroud 0.12.2. Do not edit. +! This file is generated by Shroud 0.13.0. Do not edit. ! ! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. @@ -13,7 +13,7 @@ #include "axom/config.hpp" ! splicer end file_top module axom_sidre - use iso_c_binding, only : C_INT, C_NULL_PTR, C_PTR + use iso_c_binding, only : C_INT, C_INT64_T, C_NULL_PTR, C_PTR, C_SHORT ! splicer begin module_use use conduit, only : & CONDUIT_EMPTY_ID, & @@ -41,12 +41,6 @@ module axom_sidre ! splicer begin module_top integer, parameter :: MAXNAMESIZE = 128 -#if defined(AXOM_USE_64BIT_INDEXTYPE) && !defined(AXOM_NO_INT64_T) - integer, parameter :: SIDRE_IndexType = C_INT64_T -#else - integer, parameter :: SIDRE_IndexType = C_INT32_T -#endif - integer, parameter :: TypeID = C_SHORT integer, parameter :: TypeIDint = C_INT @@ -69,17 +63,36 @@ module axom_sidre SIDRE_ULONG_ID = CONDUIT_ULONG_ID, & SIDRE_FLOAT_ID = CONDUIT_FLOAT_ID, & SIDRE_DOUBLE_ID = CONDUIT_DOUBLE_ID - - integer, parameter :: invalid_index = -1_SIDRE_IndexType ! splicer end module_top - type, bind(C) :: SIDRE_SHROUD_buffer_capsule + ! helper capsule_data_helper + type, bind(C) :: SIDRE_SHROUD_capsule_data type(C_PTR) :: addr = C_NULL_PTR ! address of C++ memory integer(C_INT) :: idtor = 0 ! index of destructor - end type SIDRE_SHROUD_buffer_capsule + end type SIDRE_SHROUD_capsule_data + + ! typedef axom::sidre::IndexType + ! splicer begin typedef.IndexType +#if defined(AXOM_USE_64BIT_INDEXTYPE) && !defined(AXOM_NO_INT64_T) + integer, parameter :: SIDRE_IndexType = C_INT64_T +#else + integer, parameter :: SIDRE_IndexType = C_INT32_T +#endif + integer, parameter :: invalid_index = -1_SIDRE_IndexType + ! splicer end typedef.IndexType + + ! typedef axom::sidre::TypeID + ! splicer begin typedef.TypeID + integer, parameter :: type_id = C_SHORT + ! splicer end typedef.TypeID + + ! typedef axom::sidre::TypeIDint + ! splicer begin typedef.TypeIDint + integer, parameter :: type_i_dint = C_INT + ! splicer end typedef.TypeIDint type SidreBuffer - type(SIDRE_SHROUD_buffer_capsule) :: cxxmem + type(SIDRE_SHROUD_capsule_data) :: cxxmem ! splicer begin class.Buffer.component_part ! splicer end class.Buffer.component_part contains @@ -109,13 +122,8 @@ module axom_sidre ! splicer end class.Buffer.type_bound_procedure_part end type SidreBuffer - type, bind(C) :: SIDRE_SHROUD_group_capsule - type(C_PTR) :: addr = C_NULL_PTR ! address of C++ memory - integer(C_INT) :: idtor = 0 ! index of destructor - end type SIDRE_SHROUD_group_capsule - type SidreGroup - type(SIDRE_SHROUD_group_capsule) :: cxxmem + type(SIDRE_SHROUD_capsule_data) :: cxxmem ! splicer begin class.Group.component_part ! splicer end class.Group.component_part contains @@ -332,13 +340,8 @@ module axom_sidre ! splicer end class.Group.type_bound_procedure_part end type SidreGroup - type, bind(C) :: SIDRE_SHROUD_view_capsule - type(C_PTR) :: addr = C_NULL_PTR ! address of C++ memory - integer(C_INT) :: idtor = 0 ! index of destructor - end type SIDRE_SHROUD_view_capsule - type SidreView - type(SIDRE_SHROUD_view_capsule) :: cxxmem + type(SIDRE_SHROUD_capsule_data) :: cxxmem ! splicer begin class.View.component_part ! splicer end class.View.component_part contains @@ -505,13 +508,8 @@ module axom_sidre ! splicer end class.View.type_bound_procedure_part end type SidreView - type, bind(C) :: SIDRE_SHROUD_datastore_capsule - type(C_PTR) :: addr = C_NULL_PTR ! address of C++ memory - integer(C_INT) :: idtor = 0 ! index of destructor - end type SIDRE_SHROUD_datastore_capsule - type SidreDataStore - type(SIDRE_SHROUD_datastore_capsule) :: cxxmem + type(SIDRE_SHROUD_capsule_data) :: cxxmem ! splicer begin class.DataStore.component_part ! splicer end class.DataStore.component_part contains @@ -566,9 +564,9 @@ module axom_sidre pure function c_buffer_get_index(self) & result(SHT_rv) & bind(C, name="SIDRE_Buffer_get_index") - import :: SIDRE_IndexType, SIDRE_SHROUD_buffer_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_buffer_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType) :: SHT_rv end function c_buffer_get_index @@ -576,9 +574,9 @@ pure function c_buffer_get_num_views(self) & result(SHT_rv) & bind(C, name="SIDRE_Buffer_get_num_views") use iso_c_binding, only : C_SIZE_T - import :: SIDRE_SHROUD_buffer_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_buffer_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_SIZE_T) :: SHT_rv end function c_buffer_get_num_views @@ -586,18 +584,18 @@ function c_buffer_get_void_ptr(self) & result(SHT_rv) & bind(C, name="SIDRE_Buffer_get_void_ptr") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_buffer_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_buffer_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self type(C_PTR) :: SHT_rv end function c_buffer_get_void_ptr pure function c_buffer_get_type_id(self) & result(SHT_rv) & bind(C, name="SIDRE_Buffer_get_type_id") - import :: SIDRE_SHROUD_buffer_capsule, TypeIDint + import :: SIDRE_SHROUD_capsule_data, TypeIDint implicit none - type(SIDRE_SHROUD_buffer_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeIDint) :: SHT_rv end function c_buffer_get_type_id @@ -605,9 +603,9 @@ pure function c_buffer_get_num_elements(self) & result(SHT_rv) & bind(C, name="SIDRE_Buffer_get_num_elements") use iso_c_binding, only : C_SIZE_T - import :: SIDRE_SHROUD_buffer_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_buffer_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_SIZE_T) :: SHT_rv end function c_buffer_get_num_elements @@ -615,9 +613,9 @@ pure function c_buffer_get_total_bytes(self) & result(SHT_rv) & bind(C, name="SIDRE_Buffer_get_total_bytes") use iso_c_binding, only : C_SIZE_T - import :: SIDRE_SHROUD_buffer_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_buffer_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_SIZE_T) :: SHT_rv end function c_buffer_get_total_bytes @@ -625,61 +623,58 @@ pure function c_buffer_get_bytes_per_element(self) & result(SHT_rv) & bind(C, name="SIDRE_Buffer_get_bytes_per_element") use iso_c_binding, only : C_SIZE_T - import :: SIDRE_SHROUD_buffer_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_buffer_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_SIZE_T) :: SHT_rv end function c_buffer_get_bytes_per_element subroutine c_buffer_describe(self, type, num_elems) & bind(C, name="SIDRE_Buffer_describe") - import :: SIDRE_IndexType, SIDRE_SHROUD_buffer_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_buffer_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems end subroutine c_buffer_describe subroutine c_buffer_allocate_existing(self) & bind(C, name="SIDRE_Buffer_allocate_existing") - import :: SIDRE_SHROUD_buffer_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_buffer_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self end subroutine c_buffer_allocate_existing subroutine c_buffer_allocate_from_type(self, type, num_elems) & bind(C, name="SIDRE_Buffer_allocate_from_type") - import :: SIDRE_IndexType, SIDRE_SHROUD_buffer_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_buffer_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems end subroutine c_buffer_allocate_from_type subroutine c_buffer_reallocate(self, num_elems) & bind(C, name="SIDRE_Buffer_reallocate") - import :: SIDRE_IndexType, SIDRE_SHROUD_buffer_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_buffer_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: num_elems end subroutine c_buffer_reallocate subroutine c_buffer_print(self) & bind(C, name="SIDRE_Buffer_print") - import :: SIDRE_SHROUD_buffer_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_buffer_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self end subroutine c_buffer_print - ! splicer begin class.Buffer.additional_interfaces - ! splicer end class.Buffer.additional_interfaces - function c_group_get_index(self) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_index") - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType) :: SHT_rv end function c_group_get_index @@ -687,61 +682,61 @@ pure function c_group_get_name(self) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_name") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self type(C_PTR) SHT_rv end function c_group_get_name - subroutine c_group_get_name_bufferify(self, SHF_rv, NSHF_rv) & + subroutine c_group_get_name_bufferify(self, SHT_rv, SHT_rv_len) & bind(C, name="SIDRE_Group_get_name_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self - character(kind=C_CHAR), intent(OUT) :: SHF_rv(*) - integer(C_INT), value, intent(IN) :: NSHF_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + character(kind=C_CHAR), intent(OUT) :: SHT_rv(*) + integer(C_INT), value, intent(IN) :: SHT_rv_len end subroutine c_group_get_name_bufferify - subroutine c_group_get_path_bufferify(self, SHF_rv, NSHF_rv) & + subroutine c_group_get_path_bufferify(self, SHT_rv, SHT_rv_len) & bind(C, name="SIDRE_Group_get_path_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self - character(kind=C_CHAR), intent(OUT) :: SHF_rv(*) - integer(C_INT), value, intent(IN) :: NSHF_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + character(kind=C_CHAR), intent(OUT) :: SHT_rv(*) + integer(C_INT), value, intent(IN) :: SHT_rv_len end subroutine c_group_get_path_bufferify - subroutine c_group_get_path_name_bufferify(self, SHF_rv, & - NSHF_rv) & + subroutine c_group_get_path_name_bufferify(self, SHT_rv, & + SHT_rv_len) & bind(C, name="SIDRE_Group_get_path_name_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self - character(kind=C_CHAR), intent(OUT) :: SHF_rv(*) - integer(C_INT), value, intent(IN) :: NSHF_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + character(kind=C_CHAR), intent(OUT) :: SHT_rv(*) + integer(C_INT), value, intent(IN) :: SHT_rv_len end subroutine c_group_get_path_name_bufferify - function c_group_get_parent(self, SHT_crv) & - result(SHT_rv) & + function c_group_get_parent(self, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_get_parent") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_get_parent pure function c_group_get_num_groups(self) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_num_groups") use iso_c_binding, only : C_SIZE_T - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_SIZE_T) :: SHT_rv end function c_group_get_num_groups @@ -749,43 +744,44 @@ pure function c_group_get_num_views(self) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_num_views") use iso_c_binding, only : C_SIZE_T - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_SIZE_T) :: SHT_rv end function c_group_get_num_views - function c_group_get_data_store(self, SHT_crv) & - result(SHT_rv) & + function c_group_get_data_store(self, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_get_data_store") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_datastore_capsule, SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self - type(SIDRE_SHROUD_datastore_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_get_data_store pure function c_group_has_view(self, path) & result(SHT_rv) & bind(C, name="SIDRE_Group_has_view") use iso_c_binding, only : C_BOOL, C_CHAR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) logical(C_BOOL) :: SHT_rv end function c_group_has_view - pure function c_group_has_view_bufferify(self, path, Lpath) & + pure function c_group_has_view_bufferify(self, path, & + SHT_path_len) & result(SHT_rv) & bind(C, name="SIDRE_Group_has_view_bufferify") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len logical(C_BOOL) :: SHT_rv end function c_group_has_view_bufferify @@ -793,23 +789,23 @@ pure function c_group_has_child_view(self, name) & result(SHT_rv) & bind(C, name="SIDRE_Group_has_child_view") use iso_c_binding, only : C_BOOL, C_CHAR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: name(*) logical(C_BOOL) :: SHT_rv end function c_group_has_child_view pure function c_group_has_child_view_bufferify(self, name, & - Lname) & + SHT_name_len) & result(SHT_rv) & bind(C, name="SIDRE_Group_has_child_view_bufferify") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: name(*) - integer(C_INT), value, intent(IN) :: Lname + integer(C_INT), value, intent(IN) :: SHT_name_len logical(C_BOOL) :: SHT_rv end function c_group_has_child_view_bufferify @@ -817,23 +813,23 @@ pure function c_group_get_view_index(self, name) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_view_index") use iso_c_binding, only : C_CHAR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: name(*) integer(SIDRE_IndexType) :: SHT_rv end function c_group_get_view_index pure function c_group_get_view_index_bufferify(self, name, & - Lname) & + SHT_name_len) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_view_index_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: name(*) - integer(C_INT), value, intent(IN) :: Lname + integer(C_INT), value, intent(IN) :: SHT_name_len integer(SIDRE_IndexType) :: SHT_rv end function c_group_get_view_index_bufferify @@ -841,666 +837,773 @@ pure function c_group_get_view_name(self, idx) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_view_name") use iso_c_binding, only : C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: idx type(C_PTR) SHT_rv end function c_group_get_view_name - subroutine c_group_get_view_name_bufferify(self, idx, SHF_rv, & - NSHF_rv) & - bind(C, name="SIDRE_Group_get_view_name_bufferify") - use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule - implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self - integer(SIDRE_IndexType), value, intent(IN) :: idx - character(kind=C_CHAR), intent(OUT) :: SHF_rv(*) - integer(C_INT), value, intent(IN) :: NSHF_rv - end subroutine c_group_get_view_name_bufferify - - function c_group_get_view_from_name(self, path, SHT_crv) & - result(SHT_rv) & + subroutine c_group_get_view_name_int32_t_bufferify(self, idx, & + SHT_rv, SHT_rv_len) & + bind(C, name="SIDRE_Group_get_view_name_int32_t_bufferify") + use iso_c_binding, only : C_CHAR, C_INT, C_INT32_T + import :: SIDRE_SHROUD_capsule_data + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(C_INT32_T), value, intent(IN) :: idx + character(kind=C_CHAR), intent(OUT) :: SHT_rv(*) + integer(C_INT), value, intent(IN) :: SHT_rv_len + end subroutine c_group_get_view_name_int32_t_bufferify + + subroutine c_group_get_view_name_int64_t_bufferify(self, idx, & + SHT_rv, SHT_rv_len) & + bind(C, name="SIDRE_Group_get_view_name_int64_t_bufferify") + use iso_c_binding, only : C_CHAR, C_INT, C_INT64_T + import :: SIDRE_SHROUD_capsule_data + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(C_INT64_T), value, intent(IN) :: idx + character(kind=C_CHAR), intent(OUT) :: SHT_rv(*) + integer(C_INT), value, intent(IN) :: SHT_rv_len + end subroutine c_group_get_view_name_int64_t_bufferify + + function c_group_get_view_from_name(self, path, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_get_view_from_name") use iso_c_binding, only : C_CHAR, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_get_view_from_name - function c_group_get_view_from_name_bufferify(self, path, Lpath, & - SHT_crv) & - result(SHT_rv) & + function c_group_get_view_from_name_bufferify(self, path, & + SHT_path_len, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_get_view_from_name_bufferify") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + integer(C_INT), value, intent(IN) :: SHT_path_len + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_get_view_from_name_bufferify - function c_group_get_view_from_index(self, idx, SHT_crv) & - result(SHT_rv) & + function c_group_get_view_from_index(self, idx, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_get_view_from_index") use iso_c_binding, only : C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: idx - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_get_view_from_index + function c_group_get_view_from_index_int32_t(self, idx, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_Group_get_view_from_index_int32_t") + use iso_c_binding, only : C_INT32_T, C_PTR + import :: SIDRE_SHROUD_capsule_data + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(C_INT32_T), value, intent(IN) :: idx + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_group_get_view_from_index_int32_t + + function c_group_get_view_from_index_int64_t(self, idx, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_Group_get_view_from_index_int64_t") + use iso_c_binding, only : C_INT64_T, C_PTR + import :: SIDRE_SHROUD_capsule_data + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(C_INT64_T), value, intent(IN) :: idx + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_group_get_view_from_index_int64_t + pure function c_group_get_first_valid_view_index(self) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_first_valid_view_index") - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType) :: SHT_rv end function c_group_get_first_valid_view_index pure function c_group_get_next_valid_view_index(self, idx) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_next_valid_view_index") - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: idx integer(SIDRE_IndexType) :: SHT_rv end function c_group_get_next_valid_view_index - function c_group_create_view_empty(self, path, SHT_crv) & - result(SHT_rv) & + function c_group_create_view_empty(self, path, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_empty") use iso_c_binding, only : C_CHAR, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_empty - function c_group_create_view_empty_bufferify(self, path, Lpath, & - SHT_crv) & - result(SHT_rv) & + function c_group_create_view_empty_bufferify(self, path, & + SHT_path_len, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_empty_bufferify") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + integer(C_INT), value, intent(IN) :: SHT_path_len + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_empty_bufferify function c_group_create_view_from_type(self, path, type, & - num_elems, SHT_crv) & - result(SHT_rv) & + num_elems, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_from_type") use iso_c_binding, only : C_CHAR, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_from_type - function c_group_create_view_from_type_bufferify(self, path, & - Lpath, type, num_elems, SHT_crv) & - result(SHT_rv) & - bind(C, name="SIDRE_Group_create_view_from_type_bufferify") - use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + function c_group_create_view_from_type_int32_t_bufferify(self, & + path, SHT_path_len, type, num_elems, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_Group_create_view_from_type_int32_t_bufferify") + use iso_c_binding, only : C_CHAR, C_INT, C_INT32_T, C_PTR + import :: SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len integer(TypeID), value, intent(IN) :: type - integer(SIDRE_IndexType), value, intent(IN) :: num_elems - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv - end function c_group_create_view_from_type_bufferify + integer(C_INT32_T), value, intent(IN) :: num_elems + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_group_create_view_from_type_int32_t_bufferify + + function c_group_create_view_from_type_int64_t_bufferify(self, & + path, SHT_path_len, type, num_elems, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_Group_create_view_from_type_int64_t_bufferify") + use iso_c_binding, only : C_CHAR, C_INT, C_INT64_T, C_PTR + import :: SIDRE_SHROUD_capsule_data, TypeID + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + character(kind=C_CHAR), intent(IN) :: path(*) + integer(C_INT), value, intent(IN) :: SHT_path_len + integer(TypeID), value, intent(IN) :: type + integer(C_INT64_T), value, intent(IN) :: num_elems + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_group_create_view_from_type_int64_t_bufferify function c_group_create_view_with_shape_base(self, path, type, & - ndims, shape, SHT_crv) & - result(SHT_rv) & + ndims, shape, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_with_shape_base") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(IN) :: shape(*) - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_with_shape_base function c_group_create_view_with_shape_base_bufferify(self, & - path, Lpath, type, ndims, shape, SHT_crv) & - result(SHT_rv) & + path, SHT_path_len, type, ndims, shape, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_with_shape_base_bufferify") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(IN) :: shape(*) - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_with_shape_base_bufferify function c_group_create_view_into_buffer(self, path, buff, & - SHT_crv) & - result(SHT_rv) & + SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_into_buffer") use iso_c_binding, only : C_CHAR, C_PTR - import :: SIDRE_SHROUD_buffer_capsule, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - type(SIDRE_SHROUD_buffer_capsule), intent(INOUT) :: buff - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: buff + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_into_buffer function c_group_create_view_into_buffer_bufferify(self, path, & - Lpath, buff, SHT_crv) & - result(SHT_rv) & + SHT_path_len, buff, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_into_buffer_bufferify") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_SHROUD_buffer_capsule, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath - type(SIDRE_SHROUD_buffer_capsule), intent(INOUT) :: buff - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + integer(C_INT), value, intent(IN) :: SHT_path_len + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: buff + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_into_buffer_bufferify function c_group_create_view_from_type_and_buffer(self, path, & - type, num_elems, buff, SHT_crv) & - result(SHT_rv) & + type, num_elems, buff, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_from_type_and_buffer") use iso_c_binding, only : C_CHAR, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_buffer_capsule, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems - type(SIDRE_SHROUD_buffer_capsule), intent(INOUT) :: buff - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: buff + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_from_type_and_buffer - function c_group_create_view_from_type_and_buffer_bufferify( & - self, path, Lpath, type, num_elems, buff, SHT_crv) & - result(SHT_rv) & - bind(C, name="SIDRE_Group_create_view_from_type_and_buffer_bufferify") - use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_buffer_capsule, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + function c_group_create_view_from_type_and_buffer_int32_t_bufferify( & + self, path, SHT_path_len, type, num_elems, buff, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_Group_create_view_from_type_and_buffer_int32_t_bufferify") + use iso_c_binding, only : C_CHAR, C_INT, C_INT32_T, C_PTR + import :: SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len integer(TypeID), value, intent(IN) :: type - integer(SIDRE_IndexType), value, intent(IN) :: num_elems - type(SIDRE_SHROUD_buffer_capsule), intent(INOUT) :: buff - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv - end function c_group_create_view_from_type_and_buffer_bufferify + integer(C_INT32_T), value, intent(IN) :: num_elems + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: buff + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_group_create_view_from_type_and_buffer_int32_t_bufferify + + function c_group_create_view_from_type_and_buffer_int64_t_bufferify( & + self, path, SHT_path_len, type, num_elems, buff, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_Group_create_view_from_type_and_buffer_int64_t_bufferify") + use iso_c_binding, only : C_CHAR, C_INT, C_INT64_T, C_PTR + import :: SIDRE_SHROUD_capsule_data, TypeID + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + character(kind=C_CHAR), intent(IN) :: path(*) + integer(C_INT), value, intent(IN) :: SHT_path_len + integer(TypeID), value, intent(IN) :: type + integer(C_INT64_T), value, intent(IN) :: num_elems + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: buff + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_group_create_view_from_type_and_buffer_int64_t_bufferify function c_group_create_view_with_shape_and_buffer(self, path, & - type, ndims, shape, buff, SHT_crv) & - result(SHT_rv) & + type, ndims, shape, buff, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_with_shape_and_buffer") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_buffer_capsule, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(IN) :: shape(*) - type(SIDRE_SHROUD_buffer_capsule), intent(INOUT) :: buff - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: buff + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_with_shape_and_buffer function c_group_create_view_with_shape_and_buffer_bufferify( & - self, path, Lpath, type, ndims, shape, buff, SHT_crv) & - result(SHT_rv) & + self, path, SHT_path_len, type, ndims, shape, buff, & + SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_with_shape_and_buffer_bufferify") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_buffer_capsule, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(IN) :: shape(*) - type(SIDRE_SHROUD_buffer_capsule), intent(INOUT) :: buff - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: buff + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_with_shape_and_buffer_bufferify function c_group_create_view_external(self, path, external_ptr, & - SHT_crv) & - result(SHT_rv) & + SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_external") use iso_c_binding, only : C_CHAR, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) type(C_PTR), value, intent(IN) :: external_ptr - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_external function c_group_create_view_external_bufferify(self, path, & - Lpath, external_ptr, SHT_crv) & - result(SHT_rv) & + SHT_path_len, external_ptr, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_external_bufferify") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len type(C_PTR), value, intent(IN) :: external_ptr - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_external_bufferify function c_group_create_view_from_type_external(self, path, & - type, num_elems, external_ptr, SHT_crv) & - result(SHT_rv) & + type, num_elems, external_ptr, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_from_type_external") use iso_c_binding, only : C_CHAR, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems type(C_PTR), value, intent(IN) :: external_ptr - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_from_type_external - function c_group_create_view_from_type_external_bufferify(self, & - path, Lpath, type, num_elems, external_ptr, SHT_crv) & - result(SHT_rv) & - bind(C, name="SIDRE_Group_create_view_from_type_external_bufferify") - use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + function c_group_create_view_from_type_external_int32_t_bufferify( & + self, path, SHT_path_len, type, num_elems, external_ptr, & + SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_Group_create_view_from_type_external_int32_t_bufferify") + use iso_c_binding, only : C_CHAR, C_INT, C_INT32_T, C_PTR + import :: SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len integer(TypeID), value, intent(IN) :: type - integer(SIDRE_IndexType), value, intent(IN) :: num_elems + integer(C_INT32_T), value, intent(IN) :: num_elems type(C_PTR), value, intent(IN) :: external_ptr - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv - end function c_group_create_view_from_type_external_bufferify + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_group_create_view_from_type_external_int32_t_bufferify + + function c_group_create_view_from_type_external_int64_t_bufferify( & + self, path, SHT_path_len, type, num_elems, external_ptr, & + SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_Group_create_view_from_type_external_int64_t_bufferify") + use iso_c_binding, only : C_CHAR, C_INT, C_INT64_T, C_PTR + import :: SIDRE_SHROUD_capsule_data, TypeID + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + character(kind=C_CHAR), intent(IN) :: path(*) + integer(C_INT), value, intent(IN) :: SHT_path_len + integer(TypeID), value, intent(IN) :: type + integer(C_INT64_T), value, intent(IN) :: num_elems + type(C_PTR), value, intent(IN) :: external_ptr + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_group_create_view_from_type_external_int64_t_bufferify function c_group_create_view_with_shape_external(self, path, & - type, ndims, shape, external_ptr, SHT_crv) & - result(SHT_rv) & + type, ndims, shape, external_ptr, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_with_shape_external") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(IN) :: shape(*) type(C_PTR), value, intent(IN) :: external_ptr - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_with_shape_external function c_group_create_view_with_shape_external_bufferify(self, & - path, Lpath, type, ndims, shape, external_ptr, SHT_crv) & - result(SHT_rv) & + path, SHT_path_len, type, ndims, shape, external_ptr, & + SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_with_shape_external_bufferify") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(IN) :: shape(*) type(C_PTR), value, intent(IN) :: external_ptr - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_with_shape_external_bufferify function c_group_create_view_and_allocate_nelems(self, path, & - type, num_elems, SHT_crv) & - result(SHT_rv) & + type, num_elems, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_and_allocate_nelems") use iso_c_binding, only : C_CHAR, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_and_allocate_nelems - function c_group_create_view_and_allocate_nelems_bufferify(self, & - path, Lpath, type, num_elems, SHT_crv) & - result(SHT_rv) & - bind(C, name="SIDRE_Group_create_view_and_allocate_nelems_bufferify") - use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + function c_group_create_view_and_allocate_nelems_int32_t_bufferify( & + self, path, SHT_path_len, type, num_elems, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_Group_create_view_and_allocate_nelems_int32_t_bufferify") + use iso_c_binding, only : C_CHAR, C_INT, C_INT32_T, C_PTR + import :: SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len integer(TypeID), value, intent(IN) :: type - integer(SIDRE_IndexType), value, intent(IN) :: num_elems - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv - end function c_group_create_view_and_allocate_nelems_bufferify + integer(C_INT32_T), value, intent(IN) :: num_elems + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_group_create_view_and_allocate_nelems_int32_t_bufferify + + function c_group_create_view_and_allocate_nelems_int64_t_bufferify( & + self, path, SHT_path_len, type, num_elems, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_Group_create_view_and_allocate_nelems_int64_t_bufferify") + use iso_c_binding, only : C_CHAR, C_INT, C_INT64_T, C_PTR + import :: SIDRE_SHROUD_capsule_data, TypeID + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + character(kind=C_CHAR), intent(IN) :: path(*) + integer(C_INT), value, intent(IN) :: SHT_path_len + integer(TypeID), value, intent(IN) :: type + integer(C_INT64_T), value, intent(IN) :: num_elems + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_group_create_view_and_allocate_nelems_int64_t_bufferify function c_group_create_view_with_shape_and_allocate(self, path, & - type, ndims, shape, SHT_crv) & - result(SHT_rv) & + type, ndims, shape, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_with_shape_and_allocate") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(IN) :: shape(*) - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_with_shape_and_allocate function c_group_create_view_with_shape_and_allocate_bufferify( & - self, path, Lpath, type, ndims, shape, SHT_crv) & - result(SHT_rv) & + self, path, SHT_path_len, type, ndims, shape, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_with_shape_and_allocate_bufferify") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(IN) :: shape(*) - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_with_shape_and_allocate_bufferify function c_group_create_view_scalar_int(self, path, value, & - SHT_crv) & - result(SHT_rv) & + SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_scalar_int") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) integer(C_INT), value, intent(IN) :: value - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_scalar_int function c_group_create_view_scalar_bufferify_int(self, path, & - Lpath, value, SHT_crv) & - result(SHT_rv) & + SHT_path_len, value, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_scalar_bufferify_int") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len integer(C_INT), value, intent(IN) :: value - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_scalar_bufferify_int function c_group_create_view_scalar_long(self, path, value, & - SHT_crv) & - result(SHT_rv) & + SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_scalar_long") use iso_c_binding, only : C_CHAR, C_LONG, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) integer(C_LONG), value, intent(IN) :: value - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_scalar_long function c_group_create_view_scalar_bufferify_long(self, path, & - Lpath, value, SHT_crv) & - result(SHT_rv) & + SHT_path_len, value, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_scalar_bufferify_long") use iso_c_binding, only : C_CHAR, C_INT, C_LONG, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len integer(C_LONG), value, intent(IN) :: value - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_scalar_bufferify_long function c_group_create_view_scalar_float(self, path, value, & - SHT_crv) & - result(SHT_rv) & + SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_scalar_float") use iso_c_binding, only : C_CHAR, C_FLOAT, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) real(C_FLOAT), value, intent(IN) :: value - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_scalar_float function c_group_create_view_scalar_bufferify_float(self, path, & - Lpath, value, SHT_crv) & - result(SHT_rv) & + SHT_path_len, value, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_scalar_bufferify_float") use iso_c_binding, only : C_CHAR, C_FLOAT, C_INT, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len real(C_FLOAT), value, intent(IN) :: value - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_scalar_bufferify_float function c_group_create_view_scalar_double(self, path, value, & - SHT_crv) & - result(SHT_rv) & + SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_scalar_double") use iso_c_binding, only : C_CHAR, C_DOUBLE, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) real(C_DOUBLE), value, intent(IN) :: value - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_scalar_double function c_group_create_view_scalar_bufferify_double(self, path, & - Lpath, value, SHT_crv) & - result(SHT_rv) & + SHT_path_len, value, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_scalar_bufferify_double") use iso_c_binding, only : C_CHAR, C_DOUBLE, C_INT, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len real(C_DOUBLE), value, intent(IN) :: value - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_scalar_bufferify_double - function c_group_create_view_string(self, path, value, SHT_crv) & - result(SHT_rv) & + function c_group_create_view_string(self, path, value, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_string") use iso_c_binding, only : C_CHAR, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) character(kind=C_CHAR), intent(IN) :: value(*) - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_string - function c_group_create_view_string_bufferify(self, path, Lpath, & - value, Lvalue, SHT_crv) & - result(SHT_rv) & + function c_group_create_view_string_bufferify(self, path, & + SHT_path_len, value, SHT_value_len, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_view_string_bufferify") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len character(kind=C_CHAR), intent(IN) :: value(*) - integer(C_INT), value, intent(IN) :: Lvalue - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + integer(C_INT), value, intent(IN) :: SHT_value_len + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_view_string_bufferify subroutine c_group_destroy_view(self, path) & bind(C, name="SIDRE_Group_destroy_view") use iso_c_binding, only : C_CHAR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) end subroutine c_group_destroy_view - subroutine c_group_destroy_view_bufferify(self, path, Lpath) & + subroutine c_group_destroy_view_bufferify(self, path, & + SHT_path_len) & bind(C, name="SIDRE_Group_destroy_view_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len end subroutine c_group_destroy_view_bufferify subroutine c_group_destroy_view_and_data_name(self, path) & bind(C, name="SIDRE_Group_destroy_view_and_data_name") use iso_c_binding, only : C_CHAR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) end subroutine c_group_destroy_view_and_data_name subroutine c_group_destroy_view_and_data_name_bufferify(self, & - path, Lpath) & + path, SHT_path_len) & bind(C, name="SIDRE_Group_destroy_view_and_data_name_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len end subroutine c_group_destroy_view_and_data_name_bufferify subroutine c_group_destroy_view_and_data_index(self, idx) & bind(C, name="SIDRE_Group_destroy_view_and_data_index") - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: idx end subroutine c_group_destroy_view_and_data_index - function c_group_move_view(self, view, SHT_crv) & - result(SHT_rv) & + function c_group_move_view(self, view, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_move_view") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self - type(SIDRE_SHROUD_view_capsule), intent(INOUT) :: view - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: view + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_move_view - function c_group_copy_view(self, view, SHT_crv) & - result(SHT_rv) & + function c_group_copy_view(self, view, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_copy_view") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self - type(SIDRE_SHROUD_view_capsule), intent(INOUT) :: view - type(SIDRE_SHROUD_view_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: view + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_copy_view function c_group_has_group(self, path) & result(SHT_rv) & bind(C, name="SIDRE_Group_has_group") use iso_c_binding, only : C_BOOL, C_CHAR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) logical(C_BOOL) :: SHT_rv end function c_group_has_group - function c_group_has_group_bufferify(self, path, Lpath) & + function c_group_has_group_bufferify(self, path, SHT_path_len) & result(SHT_rv) & bind(C, name="SIDRE_Group_has_group_bufferify") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len logical(C_BOOL) :: SHT_rv end function c_group_has_group_bufferify @@ -1508,22 +1611,23 @@ function c_group_has_child_group(self, name) & result(SHT_rv) & bind(C, name="SIDRE_Group_has_child_group") use iso_c_binding, only : C_BOOL, C_CHAR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: name(*) logical(C_BOOL) :: SHT_rv end function c_group_has_child_group - function c_group_has_child_group_bufferify(self, name, Lname) & + function c_group_has_child_group_bufferify(self, name, & + SHT_name_len) & result(SHT_rv) & bind(C, name="SIDRE_Group_has_child_group_bufferify") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: name(*) - integer(C_INT), value, intent(IN) :: Lname + integer(C_INT), value, intent(IN) :: SHT_name_len logical(C_BOOL) :: SHT_rv end function c_group_has_child_group_bufferify @@ -1531,23 +1635,23 @@ pure function c_group_get_group_index(self, name) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_group_index") use iso_c_binding, only : C_CHAR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: name(*) integer(SIDRE_IndexType) :: SHT_rv end function c_group_get_group_index pure function c_group_get_group_index_bufferify(self, name, & - Lname) & + SHT_name_len) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_group_index_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: name(*) - integer(C_INT), value, intent(IN) :: Lname + integer(C_INT), value, intent(IN) :: SHT_name_len integer(SIDRE_IndexType) :: SHT_rv end function c_group_get_group_index_bufferify @@ -1555,290 +1659,325 @@ pure function c_group_get_group_name(self, idx) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_group_name") use iso_c_binding, only : C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: idx type(C_PTR) SHT_rv end function c_group_get_group_name - subroutine c_group_get_group_name_bufferify(self, idx, SHF_rv, & - NSHF_rv) & - bind(C, name="SIDRE_Group_get_group_name_bufferify") - use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule - implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self - integer(SIDRE_IndexType), value, intent(IN) :: idx - character(kind=C_CHAR), intent(OUT) :: SHF_rv(*) - integer(C_INT), value, intent(IN) :: NSHF_rv - end subroutine c_group_get_group_name_bufferify - - function c_group_get_group_from_name(self, path, SHT_crv) & - result(SHT_rv) & + subroutine c_group_get_group_name_int32_t_bufferify(self, idx, & + SHT_rv, SHT_rv_len) & + bind(C, name="SIDRE_Group_get_group_name_int32_t_bufferify") + use iso_c_binding, only : C_CHAR, C_INT, C_INT32_T + import :: SIDRE_SHROUD_capsule_data + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(C_INT32_T), value, intent(IN) :: idx + character(kind=C_CHAR), intent(OUT) :: SHT_rv(*) + integer(C_INT), value, intent(IN) :: SHT_rv_len + end subroutine c_group_get_group_name_int32_t_bufferify + + subroutine c_group_get_group_name_int64_t_bufferify(self, idx, & + SHT_rv, SHT_rv_len) & + bind(C, name="SIDRE_Group_get_group_name_int64_t_bufferify") + use iso_c_binding, only : C_CHAR, C_INT, C_INT64_T + import :: SIDRE_SHROUD_capsule_data + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(C_INT64_T), value, intent(IN) :: idx + character(kind=C_CHAR), intent(OUT) :: SHT_rv(*) + integer(C_INT), value, intent(IN) :: SHT_rv_len + end subroutine c_group_get_group_name_int64_t_bufferify + + function c_group_get_group_from_name(self, path, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_get_group_from_name") use iso_c_binding, only : C_CHAR, C_PTR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - type(SIDRE_SHROUD_group_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_get_group_from_name function c_group_get_group_from_name_bufferify(self, path, & - Lpath, SHT_crv) & - result(SHT_rv) & + SHT_path_len, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_get_group_from_name_bufferify") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath - type(SIDRE_SHROUD_group_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + integer(C_INT), value, intent(IN) :: SHT_path_len + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_get_group_from_name_bufferify - function c_group_get_group_from_index(self, idx, SHT_crv) & - result(SHT_rv) & + function c_group_get_group_from_index(self, idx, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_get_group_from_index") use iso_c_binding, only : C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: idx - type(SIDRE_SHROUD_group_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_get_group_from_index + function c_group_get_group_from_index_int32_t(self, idx, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_Group_get_group_from_index_int32_t") + use iso_c_binding, only : C_INT32_T, C_PTR + import :: SIDRE_SHROUD_capsule_data + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(C_INT32_T), value, intent(IN) :: idx + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_group_get_group_from_index_int32_t + + function c_group_get_group_from_index_int64_t(self, idx, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_Group_get_group_from_index_int64_t") + use iso_c_binding, only : C_INT64_T, C_PTR + import :: SIDRE_SHROUD_capsule_data + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(C_INT64_T), value, intent(IN) :: idx + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_group_get_group_from_index_int64_t + pure function c_group_get_first_valid_group_index(self) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_first_valid_group_index") - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType) :: SHT_rv end function c_group_get_first_valid_group_index pure function c_group_get_next_valid_group_index(self, idx) & result(SHT_rv) & bind(C, name="SIDRE_Group_get_next_valid_group_index") - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: idx integer(SIDRE_IndexType) :: SHT_rv end function c_group_get_next_valid_group_index - function c_group_create_group(self, path, SHT_crv) & - result(SHT_rv) & + function c_group_create_group(self, path, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_group") use iso_c_binding, only : C_CHAR, C_PTR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - type(SIDRE_SHROUD_group_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_group - function c_group_create_group_bufferify(self, path, Lpath, & - SHT_crv) & - result(SHT_rv) & + function c_group_create_group_bufferify(self, path, & + SHT_path_len, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_create_group_bufferify") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath - type(SIDRE_SHROUD_group_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + integer(C_INT), value, intent(IN) :: SHT_path_len + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_create_group_bufferify subroutine c_group_destroy_group_name(self, path) & bind(C, name="SIDRE_Group_destroy_group_name") use iso_c_binding, only : C_CHAR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) end subroutine c_group_destroy_group_name subroutine c_group_destroy_group_name_bufferify(self, path, & - Lpath) & + SHT_path_len) & bind(C, name="SIDRE_Group_destroy_group_name_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: path(*) - integer(C_INT), value, intent(IN) :: Lpath + integer(C_INT), value, intent(IN) :: SHT_path_len end subroutine c_group_destroy_group_name_bufferify subroutine c_group_destroy_group_index(self, idx) & bind(C, name="SIDRE_Group_destroy_group_index") - import :: SIDRE_IndexType, SIDRE_SHROUD_group_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: idx end subroutine c_group_destroy_group_index - function c_group_move_group(self, grp, SHT_crv) & - result(SHT_rv) & + function c_group_move_group(self, grp, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_Group_move_group") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: grp - type(SIDRE_SHROUD_group_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: grp + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_group_move_group subroutine c_group_print(self) & bind(C, name="SIDRE_Group_print") - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self end subroutine c_group_print pure function c_group_is_equivalent_to(self, other) & result(SHT_rv) & bind(C, name="SIDRE_Group_is_equivalent_to") use iso_c_binding, only : C_BOOL - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(IN) :: other + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: other logical(C_BOOL) :: SHT_rv end function c_group_is_equivalent_to subroutine c_group_save(self, file_path, protocol) & bind(C, name="SIDRE_Group_save") use iso_c_binding, only : C_CHAR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: file_path(*) character(kind=C_CHAR), intent(IN) :: protocol(*) end subroutine c_group_save - subroutine c_group_save_bufferify(self, file_path, Lfile_path, & - protocol, Lprotocol) & + subroutine c_group_save_bufferify(self, file_path, & + SHT_file_path_len, protocol, SHT_protocol_len) & bind(C, name="SIDRE_Group_save_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: file_path(*) - integer(C_INT), value, intent(IN) :: Lfile_path + integer(C_INT), value, intent(IN) :: SHT_file_path_len character(kind=C_CHAR), intent(IN) :: protocol(*) - integer(C_INT), value, intent(IN) :: Lprotocol + integer(C_INT), value, intent(IN) :: SHT_protocol_len end subroutine c_group_save_bufferify subroutine c_group_load_0(self, file_path, protocol) & bind(C, name="SIDRE_Group_load_0") use iso_c_binding, only : C_CHAR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: file_path(*) character(kind=C_CHAR), intent(IN) :: protocol(*) end subroutine c_group_load_0 - subroutine c_group_load_0_bufferify(self, file_path, Lfile_path, & - protocol, Lprotocol) & + subroutine c_group_load_0_bufferify(self, file_path, & + SHT_file_path_len, protocol, SHT_protocol_len) & bind(C, name="SIDRE_Group_load_0_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: file_path(*) - integer(C_INT), value, intent(IN) :: Lfile_path + integer(C_INT), value, intent(IN) :: SHT_file_path_len character(kind=C_CHAR), intent(IN) :: protocol(*) - integer(C_INT), value, intent(IN) :: Lprotocol + integer(C_INT), value, intent(IN) :: SHT_protocol_len end subroutine c_group_load_0_bufferify subroutine c_group_load_1(self, file_path, protocol, & preserve_contents) & bind(C, name="SIDRE_Group_load_1") use iso_c_binding, only : C_BOOL, C_CHAR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: file_path(*) character(kind=C_CHAR), intent(IN) :: protocol(*) logical(C_BOOL), value, intent(IN) :: preserve_contents end subroutine c_group_load_1 - subroutine c_group_load_1_bufferify(self, file_path, Lfile_path, & - protocol, Lprotocol, preserve_contents) & + subroutine c_group_load_1_bufferify(self, file_path, & + SHT_file_path_len, protocol, SHT_protocol_len, & + preserve_contents) & bind(C, name="SIDRE_Group_load_1_bufferify") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: file_path(*) - integer(C_INT), value, intent(IN) :: Lfile_path + integer(C_INT), value, intent(IN) :: SHT_file_path_len character(kind=C_CHAR), intent(IN) :: protocol(*) - integer(C_INT), value, intent(IN) :: Lprotocol + integer(C_INT), value, intent(IN) :: SHT_protocol_len logical(C_BOOL), value, intent(IN) :: preserve_contents end subroutine c_group_load_1_bufferify subroutine c_group_load_external_data(self, file_path) & bind(C, name="SIDRE_Group_load_external_data") use iso_c_binding, only : C_CHAR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: file_path(*) end subroutine c_group_load_external_data subroutine c_group_load_external_data_bufferify(self, file_path, & - Lfile_path) & + SHT_file_path_len) & bind(C, name="SIDRE_Group_load_external_data_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: file_path(*) - integer(C_INT), value, intent(IN) :: Lfile_path + integer(C_INT), value, intent(IN) :: SHT_file_path_len end subroutine c_group_load_external_data_bufferify function c_group_rename(self, new_name) & result(SHT_rv) & bind(C, name="SIDRE_Group_rename") use iso_c_binding, only : C_BOOL, C_CHAR - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: new_name(*) logical(C_BOOL) :: SHT_rv end function c_group_rename - function c_group_rename_bufferify(self, new_name, Lnew_name) & + function c_group_rename_bufferify(self, new_name, & + SHT_new_name_len) & result(SHT_rv) & bind(C, name="SIDRE_Group_rename_bufferify") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT - import :: SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_group_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: new_name(*) - integer(C_INT), value, intent(IN) :: Lnew_name + integer(C_INT), value, intent(IN) :: SHT_new_name_len logical(C_BOOL) :: SHT_rv end function c_group_rename_bufferify - ! splicer begin class.Group.additional_interfaces - ! splicer end class.Group.additional_interfaces - function c_view_get_index(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_index") - import :: SIDRE_IndexType, SIDRE_SHROUD_view_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType) :: SHT_rv end function c_view_get_index @@ -1846,81 +1985,82 @@ pure function c_view_get_name(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_name") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self type(C_PTR) SHT_rv end function c_view_get_name - subroutine c_view_get_name_bufferify(self, SHF_rv, NSHF_rv) & + subroutine c_view_get_name_bufferify(self, SHT_rv, SHT_rv_len) & bind(C, name="SIDRE_View_get_name_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self - character(kind=C_CHAR), intent(OUT) :: SHF_rv(*) - integer(C_INT), value, intent(IN) :: NSHF_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + character(kind=C_CHAR), intent(OUT) :: SHT_rv(*) + integer(C_INT), value, intent(IN) :: SHT_rv_len end subroutine c_view_get_name_bufferify - subroutine c_view_get_path_bufferify(self, SHF_rv, NSHF_rv) & + subroutine c_view_get_path_bufferify(self, SHT_rv, SHT_rv_len) & bind(C, name="SIDRE_View_get_path_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self - character(kind=C_CHAR), intent(OUT) :: SHF_rv(*) - integer(C_INT), value, intent(IN) :: NSHF_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + character(kind=C_CHAR), intent(OUT) :: SHT_rv(*) + integer(C_INT), value, intent(IN) :: SHT_rv_len end subroutine c_view_get_path_bufferify - subroutine c_view_get_path_name_bufferify(self, SHF_rv, NSHF_rv) & + subroutine c_view_get_path_name_bufferify(self, SHT_rv, & + SHT_rv_len) & bind(C, name="SIDRE_View_get_path_name_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self - character(kind=C_CHAR), intent(OUT) :: SHF_rv(*) - integer(C_INT), value, intent(IN) :: NSHF_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + character(kind=C_CHAR), intent(OUT) :: SHT_rv(*) + integer(C_INT), value, intent(IN) :: SHT_rv_len end subroutine c_view_get_path_name_bufferify - function c_view_get_owning_group(self, SHT_crv) & - result(SHT_rv) & + function c_view_get_owning_group(self, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_View_get_owning_group") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_group_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_view_get_owning_group pure function c_view_has_buffer(self) & result(SHT_rv) & bind(C, name="SIDRE_View_has_buffer") use iso_c_binding, only : C_BOOL - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self logical(C_BOOL) :: SHT_rv end function c_view_has_buffer - function c_view_get_buffer(self, SHT_crv) & - result(SHT_rv) & + function c_view_get_buffer(self, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_View_get_buffer") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_buffer_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self - type(SIDRE_SHROUD_buffer_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_view_get_buffer pure function c_view_is_external(self) & result(SHT_rv) & bind(C, name="SIDRE_View_is_external") use iso_c_binding, only : C_BOOL - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self logical(C_BOOL) :: SHT_rv end function c_view_is_external @@ -1928,9 +2068,9 @@ function c_view_is_allocated(self) & result(SHT_rv) & bind(C, name="SIDRE_View_is_allocated") use iso_c_binding, only : C_BOOL - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self logical(C_BOOL) :: SHT_rv end function c_view_is_allocated @@ -1938,9 +2078,9 @@ pure function c_view_is_applied(self) & result(SHT_rv) & bind(C, name="SIDRE_View_is_applied") use iso_c_binding, only : C_BOOL - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self logical(C_BOOL) :: SHT_rv end function c_view_is_applied @@ -1948,9 +2088,9 @@ pure function c_view_is_described(self) & result(SHT_rv) & bind(C, name="SIDRE_View_is_described") use iso_c_binding, only : C_BOOL - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self logical(C_BOOL) :: SHT_rv end function c_view_is_described @@ -1958,9 +2098,9 @@ pure function c_view_is_empty(self) & result(SHT_rv) & bind(C, name="SIDRE_View_is_empty") use iso_c_binding, only : C_BOOL - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self logical(C_BOOL) :: SHT_rv end function c_view_is_empty @@ -1968,9 +2108,9 @@ pure function c_view_is_opaque(self) & result(SHT_rv) & bind(C, name="SIDRE_View_is_opaque") use iso_c_binding, only : C_BOOL - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self logical(C_BOOL) :: SHT_rv end function c_view_is_opaque @@ -1978,9 +2118,9 @@ pure function c_view_is_scalar(self) & result(SHT_rv) & bind(C, name="SIDRE_View_is_scalar") use iso_c_binding, only : C_BOOL - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self logical(C_BOOL) :: SHT_rv end function c_view_is_scalar @@ -1988,18 +2128,18 @@ pure function c_view_is_string(self) & result(SHT_rv) & bind(C, name="SIDRE_View_is_string") use iso_c_binding, only : C_BOOL - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self logical(C_BOOL) :: SHT_rv end function c_view_is_string pure function c_view_get_type_id(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_type_id") - import :: SIDRE_SHROUD_view_capsule, TypeIDint + import :: SIDRE_SHROUD_capsule_data, TypeIDint implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeIDint) :: SHT_rv end function c_view_get_type_id @@ -2007,9 +2147,9 @@ pure function c_view_get_total_bytes(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_total_bytes") use iso_c_binding, only : C_SIZE_T - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_SIZE_T) :: SHT_rv end function c_view_get_total_bytes @@ -2017,9 +2157,9 @@ pure function c_view_get_num_elements(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_num_elements") use iso_c_binding, only : C_SIZE_T - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_SIZE_T) :: SHT_rv end function c_view_get_num_elements @@ -2027,9 +2167,9 @@ pure function c_view_get_bytes_per_element(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_bytes_per_element") use iso_c_binding, only : C_SIZE_T - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_SIZE_T) :: SHT_rv end function c_view_get_bytes_per_element @@ -2037,9 +2177,9 @@ pure function c_view_get_offset(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_offset") use iso_c_binding, only : C_SIZE_T - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_SIZE_T) :: SHT_rv end function c_view_get_offset @@ -2047,9 +2187,9 @@ pure function c_view_get_stride(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_stride") use iso_c_binding, only : C_SIZE_T - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_SIZE_T) :: SHT_rv end function c_view_get_stride @@ -2057,9 +2197,9 @@ pure function c_view_get_num_dimensions(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_num_dimensions") use iso_c_binding, only : C_INT - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_INT) :: SHT_rv end function c_view_get_num_dimensions @@ -2067,9 +2207,9 @@ function c_view_get_shape(self, ndims, shape) & result(SHT_rv) & bind(C, name="SIDRE_View_get_shape") use iso_c_binding, only : C_INT - import :: SIDRE_IndexType, SIDRE_SHROUD_view_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(OUT) :: shape(*) integer(C_INT) :: SHT_rv @@ -2077,87 +2217,111 @@ end function c_view_get_shape subroutine c_view_allocate_simple(self) & bind(C, name="SIDRE_View_allocate_simple") - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self end subroutine c_view_allocate_simple subroutine c_view_allocate_from_type(self, type, num_elems) & bind(C, name="SIDRE_View_allocate_from_type") - import :: SIDRE_IndexType, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems end subroutine c_view_allocate_from_type subroutine c_view_reallocate(self, num_elems) & bind(C, name="SIDRE_View_reallocate") - import :: SIDRE_IndexType, SIDRE_SHROUD_view_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: num_elems end subroutine c_view_reallocate subroutine c_view_attach_buffer_only(self, buff) & bind(C, name="SIDRE_View_attach_buffer_only") - import :: SIDRE_SHROUD_buffer_capsule, SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self - type(SIDRE_SHROUD_buffer_capsule), intent(INOUT) :: buff + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: buff end subroutine c_view_attach_buffer_only subroutine c_view_attach_buffer_type(self, type, num_elems, & buff) & bind(C, name="SIDRE_View_attach_buffer_type") - import :: SIDRE_IndexType, SIDRE_SHROUD_buffer_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems - type(SIDRE_SHROUD_buffer_capsule), intent(INOUT) :: buff + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: buff end subroutine c_view_attach_buffer_type + subroutine c_view_attach_buffer_type_int32_t(self, type, & + num_elems, buff) & + bind(C, name="SIDRE_View_attach_buffer_type_int32_t") + use iso_c_binding, only : C_INT32_T + import :: SIDRE_SHROUD_capsule_data, TypeID + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(TypeID), value, intent(IN) :: type + integer(C_INT32_T), value, intent(IN) :: num_elems + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: buff + end subroutine c_view_attach_buffer_type_int32_t + + subroutine c_view_attach_buffer_type_int64_t(self, type, & + num_elems, buff) & + bind(C, name="SIDRE_View_attach_buffer_type_int64_t") + use iso_c_binding, only : C_INT64_T + import :: SIDRE_SHROUD_capsule_data, TypeID + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(TypeID), value, intent(IN) :: type + integer(C_INT64_T), value, intent(IN) :: num_elems + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: buff + end subroutine c_view_attach_buffer_type_int64_t + subroutine c_view_attach_buffer_shape(self, type, ndims, shape, & buff) & bind(C, name="SIDRE_View_attach_buffer_shape") use iso_c_binding, only : C_INT - import :: SIDRE_IndexType, SIDRE_SHROUD_buffer_capsule, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(IN) :: shape(*) - type(SIDRE_SHROUD_buffer_capsule), intent(INOUT) :: buff + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: buff end subroutine c_view_attach_buffer_shape subroutine c_view_clear(self) & bind(C, name="SIDRE_View_clear") - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self end subroutine c_view_clear subroutine c_view_apply_0(self) & bind(C, name="SIDRE_View_apply_0") - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self end subroutine c_view_apply_0 subroutine c_view_apply_nelems(self, num_elems) & bind(C, name="SIDRE_View_apply_nelems") - import :: SIDRE_IndexType, SIDRE_SHROUD_view_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: num_elems end subroutine c_view_apply_nelems subroutine c_view_apply_nelems_offset(self, num_elems, offset) & bind(C, name="SIDRE_View_apply_nelems_offset") - import :: SIDRE_IndexType, SIDRE_SHROUD_view_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: num_elems integer(SIDRE_IndexType), value, intent(IN) :: offset end subroutine c_view_apply_nelems_offset @@ -2165,9 +2329,9 @@ end subroutine c_view_apply_nelems_offset subroutine c_view_apply_nelems_offset_stride(self, num_elems, & offset, stride) & bind(C, name="SIDRE_View_apply_nelems_offset_stride") - import :: SIDRE_IndexType, SIDRE_SHROUD_view_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: num_elems integer(SIDRE_IndexType), value, intent(IN) :: offset integer(SIDRE_IndexType), value, intent(IN) :: stride @@ -2175,9 +2339,9 @@ end subroutine c_view_apply_nelems_offset_stride subroutine c_view_apply_type_nelems(self, type, num_elems) & bind(C, name="SIDRE_View_apply_type_nelems") - import :: SIDRE_IndexType, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems end subroutine c_view_apply_type_nelems @@ -2185,9 +2349,9 @@ end subroutine c_view_apply_type_nelems subroutine c_view_apply_type_nelems_offset(self, type, & num_elems, offset) & bind(C, name="SIDRE_View_apply_type_nelems_offset") - import :: SIDRE_IndexType, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems integer(SIDRE_IndexType), value, intent(IN) :: offset @@ -2196,9 +2360,9 @@ end subroutine c_view_apply_type_nelems_offset subroutine c_view_apply_type_nelems_offset_stride(self, type, & num_elems, offset, stride) & bind(C, name="SIDRE_View_apply_type_nelems_offset_stride") - import :: SIDRE_IndexType, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems integer(SIDRE_IndexType), value, intent(IN) :: offset @@ -2208,9 +2372,9 @@ end subroutine c_view_apply_type_nelems_offset_stride subroutine c_view_apply_type_shape(self, type, ndims, shape) & bind(C, name="SIDRE_View_apply_type_shape") use iso_c_binding, only : C_INT - import :: SIDRE_IndexType, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(IN) :: shape(*) @@ -2219,64 +2383,65 @@ end subroutine c_view_apply_type_shape subroutine c_view_set_scalar_int(self, value) & bind(C, name="SIDRE_View_set_scalar_int") use iso_c_binding, only : C_INT - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_INT), value, intent(IN) :: value end subroutine c_view_set_scalar_int subroutine c_view_set_scalar_long(self, value) & bind(C, name="SIDRE_View_set_scalar_long") use iso_c_binding, only : C_LONG - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_LONG), value, intent(IN) :: value end subroutine c_view_set_scalar_long subroutine c_view_set_scalar_float(self, value) & bind(C, name="SIDRE_View_set_scalar_float") use iso_c_binding, only : C_FLOAT - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self real(C_FLOAT), value, intent(IN) :: value end subroutine c_view_set_scalar_float subroutine c_view_set_scalar_double(self, value) & bind(C, name="SIDRE_View_set_scalar_double") use iso_c_binding, only : C_DOUBLE - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self real(C_DOUBLE), value, intent(IN) :: value end subroutine c_view_set_scalar_double subroutine c_view_set_string(self, value) & bind(C, name="SIDRE_View_set_string") use iso_c_binding, only : C_CHAR - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: value(*) end subroutine c_view_set_string - subroutine c_view_set_string_bufferify(self, value, Lvalue) & + subroutine c_view_set_string_bufferify(self, value, & + SHT_value_len) & bind(C, name="SIDRE_View_set_string_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: value(*) - integer(C_INT), value, intent(IN) :: Lvalue + integer(C_INT), value, intent(IN) :: SHT_value_len end subroutine c_view_set_string_bufferify subroutine c_view_set_external_data_ptr_only(self, external_ptr) & bind(C, name="SIDRE_View_set_external_data_ptr_only") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self type(C_PTR), value, intent(IN) :: external_ptr end subroutine c_view_set_external_data_ptr_only @@ -2284,21 +2449,45 @@ subroutine c_view_set_external_data_ptr_type(self, type, & num_elems, external_ptr) & bind(C, name="SIDRE_View_set_external_data_ptr_type") use iso_c_binding, only : C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems type(C_PTR), value, intent(IN) :: external_ptr end subroutine c_view_set_external_data_ptr_type + subroutine c_view_set_external_data_ptr_type_int32_t(self, type, & + num_elems, external_ptr) & + bind(C, name="SIDRE_View_set_external_data_ptr_type_int32_t") + use iso_c_binding, only : C_INT32_T, C_PTR + import :: SIDRE_SHROUD_capsule_data, TypeID + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(TypeID), value, intent(IN) :: type + integer(C_INT32_T), value, intent(IN) :: num_elems + type(C_PTR), value, intent(IN) :: external_ptr + end subroutine c_view_set_external_data_ptr_type_int32_t + + subroutine c_view_set_external_data_ptr_type_int64_t(self, type, & + num_elems, external_ptr) & + bind(C, name="SIDRE_View_set_external_data_ptr_type_int64_t") + use iso_c_binding, only : C_INT64_T, C_PTR + import :: SIDRE_SHROUD_capsule_data, TypeID + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(TypeID), value, intent(IN) :: type + integer(C_INT64_T), value, intent(IN) :: num_elems + type(C_PTR), value, intent(IN) :: external_ptr + end subroutine c_view_set_external_data_ptr_type_int64_t + subroutine c_view_set_external_data_ptr_shape(self, type, ndims, & shape, external_ptr) & bind(C, name="SIDRE_View_set_external_data_ptr_shape") use iso_c_binding, only : C_INT, C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_view_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(IN) :: shape(*) @@ -2309,29 +2498,29 @@ function c_view_get_string(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_string") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self type(C_PTR) SHT_rv end function c_view_get_string - subroutine c_view_get_string_bufferify(self, name, Nname) & + subroutine c_view_get_string_bufferify(self, name, SHT_name_len) & bind(C, name="SIDRE_View_get_string_bufferify") use iso_c_binding, only : C_CHAR, C_INT - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(OUT) :: name(*) - integer(C_INT), value, intent(IN) :: Nname + integer(C_INT), value, intent(IN) :: SHT_name_len end subroutine c_view_get_string_bufferify function c_view_get_data_int(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_data_int") use iso_c_binding, only : C_INT - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_INT) :: SHT_rv end function c_view_get_data_int @@ -2339,9 +2528,9 @@ function c_view_get_data_long(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_data_long") use iso_c_binding, only : C_LONG - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_LONG) :: SHT_rv end function c_view_get_data_long @@ -2349,9 +2538,9 @@ function c_view_get_data_float(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_data_float") use iso_c_binding, only : C_FLOAT - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self real(C_FLOAT) :: SHT_rv end function c_view_get_data_float @@ -2359,9 +2548,9 @@ function c_view_get_data_double(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_data_double") use iso_c_binding, only : C_DOUBLE - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self real(C_DOUBLE) :: SHT_rv end function c_view_get_data_double @@ -2369,125 +2558,175 @@ pure function c_view_get_void_ptr(self) & result(SHT_rv) & bind(C, name="SIDRE_View_get_void_ptr") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self type(C_PTR) :: SHT_rv end function c_view_get_void_ptr subroutine c_view_print(self) & bind(C, name="SIDRE_View_print") - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self end subroutine c_view_print function c_view_rename(self, new_name) & result(SHT_rv) & bind(C, name="SIDRE_View_rename") use iso_c_binding, only : C_BOOL, C_CHAR - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: new_name(*) logical(C_BOOL) :: SHT_rv end function c_view_rename - function c_view_rename_bufferify(self, new_name, Lnew_name) & + function c_view_rename_bufferify(self, new_name, & + SHT_new_name_len) & result(SHT_rv) & bind(C, name="SIDRE_View_rename_bufferify") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT - import :: SIDRE_SHROUD_view_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_view_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: new_name(*) - integer(C_INT), value, intent(IN) :: Lnew_name + integer(C_INT), value, intent(IN) :: SHT_new_name_len logical(C_BOOL) :: SHT_rv end function c_view_rename_bufferify - ! splicer begin class.View.additional_interfaces - ! splicer end class.View.additional_interfaces - - function c_datastore_new(SHT_crv) & - result(SHT_rv) & + function c_datastore_new(SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_DataStore_new") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_datastore_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_datastore_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) SHT_prv end function c_datastore_new subroutine c_datastore_delete(self) & bind(C, name="SIDRE_DataStore_delete") - import :: SIDRE_SHROUD_datastore_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_datastore_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: self end subroutine c_datastore_delete - function c_datastore_get_root(self, SHT_crv) & - result(SHT_rv) & + function c_datastore_get_root(self, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_DataStore_get_root") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_datastore_capsule, SIDRE_SHROUD_group_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_datastore_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_datastore_get_root pure function c_datastore_get_num_buffers(self) & result(SHT_rv) & bind(C, name="SIDRE_DataStore_get_num_buffers") use iso_c_binding, only : C_SIZE_T - import :: SIDRE_SHROUD_datastore_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_datastore_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_SIZE_T) :: SHT_rv end function c_datastore_get_num_buffers - function c_datastore_get_buffer(self, idx, SHT_crv) & - result(SHT_rv) & + function c_datastore_get_buffer(self, idx, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_DataStore_get_buffer") use iso_c_binding, only : C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_buffer_capsule, SIDRE_SHROUD_datastore_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_datastore_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: idx - type(SIDRE_SHROUD_buffer_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_datastore_get_buffer - function c_datastore_create_buffer_empty(self, SHT_crv) & - result(SHT_rv) & + function c_datastore_get_buffer_int32_t(self, idx, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_DataStore_get_buffer_int32_t") + use iso_c_binding, only : C_INT32_T, C_PTR + import :: SIDRE_SHROUD_capsule_data + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(C_INT32_T), value, intent(IN) :: idx + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_datastore_get_buffer_int32_t + + function c_datastore_get_buffer_int64_t(self, idx, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_DataStore_get_buffer_int64_t") + use iso_c_binding, only : C_INT64_T, C_PTR + import :: SIDRE_SHROUD_capsule_data + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(C_INT64_T), value, intent(IN) :: idx + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_datastore_get_buffer_int64_t + + function c_datastore_create_buffer_empty(self, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_DataStore_create_buffer_empty") use iso_c_binding, only : C_PTR - import :: SIDRE_SHROUD_buffer_capsule, SIDRE_SHROUD_datastore_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_datastore_capsule), intent(IN) :: self - type(SIDRE_SHROUD_buffer_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_datastore_create_buffer_empty function c_datastore_create_buffer_from_type(self, type, & - num_elems, SHT_crv) & - result(SHT_rv) & + num_elems, SHT_rv) & + result(SHT_prv) & bind(C, name="SIDRE_DataStore_create_buffer_from_type") use iso_c_binding, only : C_PTR - import :: SIDRE_IndexType, SIDRE_SHROUD_buffer_capsule, SIDRE_SHROUD_datastore_capsule, TypeID + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data, TypeID implicit none - type(SIDRE_SHROUD_datastore_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems - type(SIDRE_SHROUD_buffer_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv end function c_datastore_create_buffer_from_type + function c_datastore_create_buffer_from_type_int32_t(self, type, & + num_elems, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_DataStore_create_buffer_from_type_int32_t") + use iso_c_binding, only : C_INT32_T, C_PTR + import :: SIDRE_SHROUD_capsule_data, TypeID + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(TypeID), value, intent(IN) :: type + integer(C_INT32_T), value, intent(IN) :: num_elems + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_datastore_create_buffer_from_type_int32_t + + function c_datastore_create_buffer_from_type_int64_t(self, type, & + num_elems, SHT_rv) & + result(SHT_prv) & + bind(C, name="SIDRE_DataStore_create_buffer_from_type_int64_t") + use iso_c_binding, only : C_INT64_T, C_PTR + import :: SIDRE_SHROUD_capsule_data, TypeID + implicit none + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self + integer(TypeID), value, intent(IN) :: type + integer(C_INT64_T), value, intent(IN) :: num_elems + type(SIDRE_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) :: SHT_prv + end function c_datastore_create_buffer_from_type_int64_t + subroutine c_datastore_destroy_buffer(self, id) & bind(C, name="SIDRE_DataStore_destroy_buffer") - import :: SIDRE_IndexType, SIDRE_SHROUD_datastore_capsule + import :: SIDRE_IndexType, SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_datastore_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(SIDRE_IndexType), value, intent(IN) :: id end subroutine c_datastore_destroy_buffer @@ -2496,9 +2735,9 @@ function c_datastore_generate_blueprint_index_0(self, & result(SHT_rv) & bind(C, name="SIDRE_DataStore_generate_blueprint_index_0") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT - import :: SIDRE_SHROUD_datastore_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_datastore_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: domain_path(*) character(kind=C_CHAR), intent(IN) :: mesh_name(*) character(kind=C_CHAR), intent(IN) :: index_path(*) @@ -2507,20 +2746,21 @@ function c_datastore_generate_blueprint_index_0(self, & end function c_datastore_generate_blueprint_index_0 function c_datastore_generate_blueprint_index_0_bufferify(self, & - domain_path, Ldomain_path, mesh_name, Lmesh_name, & - index_path, Lindex_path, num_domains) & + domain_path, SHT_domain_path_len, mesh_name, & + SHT_mesh_name_len, index_path, SHT_index_path_len, & + num_domains) & result(SHT_rv) & bind(C, name="SIDRE_DataStore_generate_blueprint_index_0_bufferify") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT - import :: SIDRE_SHROUD_datastore_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_datastore_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self character(kind=C_CHAR), intent(IN) :: domain_path(*) - integer(C_INT), value, intent(IN) :: Ldomain_path + integer(C_INT), value, intent(IN) :: SHT_domain_path_len character(kind=C_CHAR), intent(IN) :: mesh_name(*) - integer(C_INT), value, intent(IN) :: Lmesh_name + integer(C_INT), value, intent(IN) :: SHT_mesh_name_len character(kind=C_CHAR), intent(IN) :: index_path(*) - integer(C_INT), value, intent(IN) :: Lindex_path + integer(C_INT), value, intent(IN) :: SHT_index_path_len integer(C_INT), value, intent(IN) :: num_domains logical(C_BOOL) :: SHT_rv end function c_datastore_generate_blueprint_index_0_bufferify @@ -2531,9 +2771,9 @@ function c_datastore_generate_blueprint_index_1(self, comm, & result(SHT_rv) & bind(C, name="SIDRE_DataStore_generate_blueprint_index_1") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT - import :: SIDRE_SHROUD_datastore_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_datastore_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_INT), value, intent(IN) :: comm character(kind=C_CHAR), intent(IN) :: domain_path(*) character(kind=C_CHAR), intent(IN) :: mesh_name(*) @@ -2544,35 +2784,32 @@ end function c_datastore_generate_blueprint_index_1 #ifdef AXOM_USE_MPI function c_datastore_generate_blueprint_index_1_bufferify(self, & - comm, domain_path, Ldomain_path, mesh_name, Lmesh_name, & - index_path, Lindex_path) & + comm, domain_path, SHT_domain_path_len, mesh_name, & + SHT_mesh_name_len, index_path, SHT_index_path_len) & result(SHT_rv) & bind(C, name="SIDRE_DataStore_generate_blueprint_index_1_bufferify") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT - import :: SIDRE_SHROUD_datastore_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_datastore_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self integer(C_INT), value, intent(IN) :: comm character(kind=C_CHAR), intent(IN) :: domain_path(*) - integer(C_INT), value, intent(IN) :: Ldomain_path + integer(C_INT), value, intent(IN) :: SHT_domain_path_len character(kind=C_CHAR), intent(IN) :: mesh_name(*) - integer(C_INT), value, intent(IN) :: Lmesh_name + integer(C_INT), value, intent(IN) :: SHT_mesh_name_len character(kind=C_CHAR), intent(IN) :: index_path(*) - integer(C_INT), value, intent(IN) :: Lindex_path + integer(C_INT), value, intent(IN) :: SHT_index_path_len logical(C_BOOL) :: SHT_rv end function c_datastore_generate_blueprint_index_1_bufferify #endif subroutine c_datastore_print(self) & bind(C, name="SIDRE_DataStore_print") - import :: SIDRE_SHROUD_datastore_capsule + import :: SIDRE_SHROUD_capsule_data implicit none - type(SIDRE_SHROUD_datastore_capsule), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(IN) :: self end subroutine c_datastore_print - ! splicer begin class.DataStore.additional_interfaces - ! splicer end class.DataStore.additional_interfaces - function c_name_is_valid(name) & result(SHT_rv) & bind(C, name="SIDRE_name_is_valid") @@ -2581,33 +2818,195 @@ function c_name_is_valid(name) & character(kind=C_CHAR), intent(IN) :: name(*) logical(C_BOOL) :: SHT_rv end function c_name_is_valid - - ! splicer begin additional_interfaces - function SIDRE_create_array_view(group, name, lname, addr, type, rank, extents) & - result(rv) bind(C,name="SIDRE_create_array_view") - use iso_c_binding - import SIDRE_IndexType - type(C_PTR), value, intent(IN) :: group - character(kind=C_CHAR), intent(IN) :: name(*) - integer(C_INT), value, intent(IN) :: lname - type(C_PTR), value, intent(IN) :: addr - integer(C_INT), value, intent(IN) :: type - integer(C_INT), value, intent(IN) :: rank - integer(SIDRE_IndexType), intent(IN) :: extents(*) - type(C_PTR) rv - end function SIDRE_create_array_view - ! splicer end additional_interfaces end interface interface SidreDataStore module procedure datastore_new end interface SidreDataStore + interface buffer_allocate + module procedure buffer_allocate_existing + module procedure buffer_allocate_from_type_int32_t + module procedure buffer_allocate_from_type_int64_t + end interface buffer_allocate + + interface buffer_describe + module procedure buffer_describe_int32_t + module procedure buffer_describe_int64_t + end interface buffer_describe + + interface buffer_reallocate + module procedure buffer_reallocate_int32_t + module procedure buffer_reallocate_int64_t + end interface buffer_reallocate + + interface datastore_create_buffer + module procedure datastore_create_buffer_empty + module procedure datastore_create_buffer_from_type_int32_t + module procedure datastore_create_buffer_from_type_int64_t + end interface datastore_create_buffer + + interface datastore_destroy_buffer + module procedure datastore_destroy_buffer_int32_t + module procedure datastore_destroy_buffer_int64_t + end interface datastore_destroy_buffer + + interface datastore_generate_blueprint_index + module procedure datastore_generate_blueprint_index_0 +#ifdef AXOM_USE_MPI + module procedure datastore_generate_blueprint_index_1 +#endif + end interface datastore_generate_blueprint_index + + interface datastore_get_buffer + module procedure datastore_get_buffer_int32_t + module procedure datastore_get_buffer_int64_t + end interface datastore_get_buffer + + interface group_create_view + module procedure group_create_view_empty + module procedure group_create_view_from_type_int32_t + module procedure group_create_view_from_type_int64_t + module procedure group_create_view_into_buffer + module procedure group_create_view_from_type_and_buffer_int32_t + module procedure group_create_view_from_type_and_buffer_int64_t + module procedure group_create_view_external + module procedure group_create_view_from_type_external_int32_t + module procedure group_create_view_from_type_external_int64_t + end interface group_create_view + + interface group_create_view_and_allocate + module procedure group_create_view_and_allocate_nelems_int32_t + module procedure group_create_view_and_allocate_nelems_int64_t + end interface group_create_view_and_allocate + + interface group_create_view_scalar + module procedure group_create_view_scalar_int + module procedure group_create_view_scalar_long + module procedure group_create_view_scalar_float + module procedure group_create_view_scalar_double + end interface group_create_view_scalar + + interface group_create_view_with_shape + module procedure group_create_view_with_shape_base + module procedure group_create_view_with_shape_and_buffer + module procedure group_create_view_with_shape_external + end interface group_create_view_with_shape + + interface group_destroy_group + module procedure group_destroy_group_name + module procedure group_destroy_group_index_int32_t + module procedure group_destroy_group_index_int64_t + end interface group_destroy_group + + interface group_destroy_view_and_data + module procedure group_destroy_view_and_data_name + module procedure group_destroy_view_and_data_index_int32_t + module procedure group_destroy_view_and_data_index_int64_t + end interface group_destroy_view_and_data + + interface group_get_group + module procedure group_get_group_from_name + module procedure group_get_group_from_index_int32_t + module procedure group_get_group_from_index_int64_t + end interface group_get_group + + interface group_get_group_name + module procedure group_get_group_name_int32_t + module procedure group_get_group_name_int64_t + end interface group_get_group_name + + interface group_get_next_valid_group_index + module procedure group_get_next_valid_group_index_int32_t + module procedure group_get_next_valid_group_index_int64_t + end interface group_get_next_valid_group_index + + interface group_get_next_valid_view_index + module procedure group_get_next_valid_view_index_int32_t + module procedure group_get_next_valid_view_index_int64_t + end interface group_get_next_valid_view_index + + interface group_get_view + module procedure group_get_view_from_name + module procedure group_get_view_from_index_int32_t + module procedure group_get_view_from_index_int64_t + end interface group_get_view + + interface group_get_view_name + module procedure group_get_view_name_int32_t + module procedure group_get_view_name_int64_t + end interface group_get_view_name + + interface group_load + module procedure group_load_0 + module procedure group_load_1 + end interface group_load + + interface view_allocate + module procedure view_allocate_simple + module procedure view_allocate_from_type_int32_t + module procedure view_allocate_from_type_int64_t + end interface view_allocate + + interface view_apply + module procedure view_apply_0 + module procedure view_apply_nelems + module procedure view_apply_nelems_offset + module procedure view_apply_nelems_offset_stride + module procedure view_apply_type_nelems + module procedure view_apply_type_nelems_offset + module procedure view_apply_type_nelems_offset_stride + module procedure view_apply_type_shape + end interface view_apply + + interface view_attach_buffer + module procedure view_attach_buffer_only + module procedure view_attach_buffer_type_int32_t + module procedure view_attach_buffer_type_int64_t + module procedure view_attach_buffer_shape + end interface view_attach_buffer + + interface view_reallocate + module procedure view_reallocate_int32_t + module procedure view_reallocate_int64_t + end interface view_reallocate + + interface view_set_external_data_ptr + module procedure view_set_external_data_ptr_only + module procedure view_set_external_data_ptr_type_int32_t + module procedure view_set_external_data_ptr_type_int64_t + module procedure view_set_external_data_ptr_shape + end interface view_set_external_data_ptr + + interface view_set_scalar + module procedure view_set_scalar_int + module procedure view_set_scalar_long + module procedure view_set_scalar_float + module procedure view_set_scalar_double + end interface view_set_scalar + + ! splicer begin additional_declarations + interface + function SIDRE_create_array_view(group, name, lname, addr, type, rank, extents) & + result(rv) bind(C,name="SIDRE_create_array_view") + use iso_c_binding + import SIDRE_IndexType + type(C_PTR), value, intent(IN) :: group + character(kind=C_CHAR), intent(IN) :: name(*) + integer(C_INT), value, intent(IN) :: lname + type(C_PTR), value, intent(IN) :: addr + integer(C_INT), value, intent(IN) :: type + integer(C_INT), value, intent(IN) :: rank + integer(SIDRE_IndexType), intent(IN) :: extents(*) + type(C_PTR) rv + end function SIDRE_create_array_view + end interface + ! splicer end additional_declarations + contains function buffer_get_index(obj) & result(SHT_rv) - use iso_c_binding, only : C_INT64_T class(SidreBuffer) :: obj integer(SIDRE_IndexType) :: SHT_rv ! splicer begin class.Buffer.method.get_index @@ -2637,7 +3036,6 @@ end function buffer_get_void_ptr function buffer_get_type_id(obj) & result(SHT_rv) - use iso_c_binding, only : C_INT class(SidreBuffer) :: obj integer(TypeIDint) :: SHT_rv ! splicer begin class.Buffer.method.get_type_id @@ -2676,7 +3074,7 @@ function buffer_get_bytes_per_element(obj) & end function buffer_get_bytes_per_element subroutine buffer_describe_int32_t(obj, type, num_elems) - use iso_c_binding, only : C_INT32_T, C_INT64_T, C_SHORT + use iso_c_binding, only : C_INT32_T class(SidreBuffer) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT32_T), value, intent(IN) :: num_elems @@ -2687,7 +3085,7 @@ subroutine buffer_describe_int32_t(obj, type, num_elems) end subroutine buffer_describe_int32_t subroutine buffer_describe_int64_t(obj, type, num_elems) - use iso_c_binding, only : C_INT64_T, C_SHORT + use iso_c_binding, only : C_INT64_T class(SidreBuffer) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT64_T), value, intent(IN) :: num_elems @@ -2705,7 +3103,7 @@ subroutine buffer_allocate_existing(obj) end subroutine buffer_allocate_existing subroutine buffer_allocate_from_type_int32_t(obj, type, num_elems) - use iso_c_binding, only : C_INT32_T, C_INT64_T, C_SHORT + use iso_c_binding, only : C_INT32_T class(SidreBuffer) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT32_T), value, intent(IN) :: num_elems @@ -2716,7 +3114,7 @@ subroutine buffer_allocate_from_type_int32_t(obj, type, num_elems) end subroutine buffer_allocate_from_type_int32_t subroutine buffer_allocate_from_type_int64_t(obj, type, num_elems) - use iso_c_binding, only : C_INT64_T, C_SHORT + use iso_c_binding, only : C_INT64_T class(SidreBuffer) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT64_T), value, intent(IN) :: num_elems @@ -2727,7 +3125,7 @@ subroutine buffer_allocate_from_type_int64_t(obj, type, num_elems) end subroutine buffer_allocate_from_type_int64_t subroutine buffer_reallocate_int32_t(obj, num_elems) - use iso_c_binding, only : C_INT32_T, C_INT64_T + use iso_c_binding, only : C_INT32_T class(SidreBuffer) :: obj integer(C_INT32_T), value, intent(IN) :: num_elems ! splicer begin class.Buffer.method.reallocate_int32_t @@ -2781,7 +3179,6 @@ end function buffer_associated function group_get_index(obj) & result(SHT_rv) - use iso_c_binding, only : C_INT64_T class(SidreGroup) :: obj integer(SIDRE_IndexType) :: SHT_rv ! splicer begin class.Group.method.get_index @@ -2795,8 +3192,9 @@ function group_get_name(obj) & class(SidreGroup) :: obj character(len=MAXNAMESIZE) :: SHT_rv ! splicer begin class.Group.method.get_name - call c_group_get_name_bufferify(obj%cxxmem, SHT_rv, & - len(SHT_rv, kind=C_INT)) + integer(C_INT) SHT_rv_len + SHT_rv_len = len(SHT_rv, kind=C_INT) + call c_group_get_name_bufferify(obj%cxxmem, SHT_rv, SHT_rv_len) ! splicer end class.Group.method.get_name end function group_get_name @@ -2806,8 +3204,9 @@ function group_get_path(obj) & class(SidreGroup) :: obj character(len=MAXNAMESIZE) :: SHT_rv ! splicer begin class.Group.method.get_path - call c_group_get_path_bufferify(obj%cxxmem, SHT_rv, & - len(SHT_rv, kind=C_INT)) + integer(C_INT) SHT_rv_len + SHT_rv_len = len(SHT_rv, kind=C_INT) + call c_group_get_path_bufferify(obj%cxxmem, SHT_rv, SHT_rv_len) ! splicer end class.Group.method.get_path end function group_get_path @@ -2817,8 +3216,10 @@ function group_get_path_name(obj) & class(SidreGroup) :: obj character(len=MAXNAMESIZE) :: SHT_rv ! splicer begin class.Group.method.get_path_name + integer(C_INT) SHT_rv_len + SHT_rv_len = len(SHT_rv, kind=C_INT) call c_group_get_path_name_bufferify(obj%cxxmem, SHT_rv, & - len(SHT_rv, kind=C_INT)) + SHT_rv_len) ! splicer end class.Group.method.get_path_name end function group_get_path_name @@ -2827,8 +3228,8 @@ function group_get_parent(obj) & use iso_c_binding, only : C_PTR class(SidreGroup) :: obj type(SidreGroup) :: SHT_rv - ! splicer begin class.Group.method.get_parent type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.get_parent SHT_prv = c_group_get_parent(obj%cxxmem, SHT_rv%cxxmem) ! splicer end class.Group.method.get_parent end function group_get_parent @@ -2858,8 +3259,8 @@ function group_get_data_store(obj) & use iso_c_binding, only : C_PTR class(SidreGroup) :: obj type(SidreDataStore) :: SHT_rv - ! splicer begin class.Group.method.get_data_store type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.get_data_store SHT_prv = c_group_get_data_store(obj%cxxmem, SHT_rv%cxxmem) ! splicer end class.Group.method.get_data_store end function group_get_data_store @@ -2871,8 +3272,10 @@ function group_has_view(obj, path) & character(len=*), intent(IN) :: path logical :: SHT_rv ! splicer begin class.Group.method.has_view + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_rv = c_group_has_view_bufferify(obj%cxxmem, path, & - len_trim(path, kind=C_INT)) + SHT_path_len) ! splicer end class.Group.method.has_view end function group_has_view @@ -2883,32 +3286,38 @@ function group_has_child_view(obj, name) & character(len=*), intent(IN) :: name logical :: SHT_rv ! splicer begin class.Group.method.has_child_view + integer(C_INT) SHT_name_len + SHT_name_len = len(name, kind=C_INT) SHT_rv = c_group_has_child_view_bufferify(obj%cxxmem, name, & - len_trim(name, kind=C_INT)) + SHT_name_len) ! splicer end class.Group.method.has_child_view end function group_has_child_view function group_get_view_index(obj, name) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT64_T + use iso_c_binding, only : C_INT class(SidreGroup) :: obj character(len=*), intent(IN) :: name integer(SIDRE_IndexType) :: SHT_rv ! splicer begin class.Group.method.get_view_index + integer(C_INT) SHT_name_len + SHT_name_len = len(name, kind=C_INT) SHT_rv = c_group_get_view_index_bufferify(obj%cxxmem, name, & - len_trim(name, kind=C_INT)) + SHT_name_len) ! splicer end class.Group.method.get_view_index end function group_get_view_index function group_get_view_name_int32_t(obj, idx) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT32_T, C_INT64_T + use iso_c_binding, only : C_INT, C_INT32_T class(SidreGroup) :: obj integer(C_INT32_T), value, intent(IN) :: idx character(len=MAXNAMESIZE) :: SHT_rv ! splicer begin class.Group.method.get_view_name_int32_t - call c_group_get_view_name_bufferify(obj%cxxmem, & - int(idx, SIDRE_IndexType), SHT_rv, len(SHT_rv, kind=C_INT)) + integer(C_INT) SHT_rv_len + SHT_rv_len = len(SHT_rv, kind=C_INT) + call c_group_get_view_name_int32_t_bufferify(obj%cxxmem, idx, & + SHT_rv, SHT_rv_len) ! splicer end class.Group.method.get_view_name_int32_t end function group_get_view_name_int32_t @@ -2919,8 +3328,10 @@ function group_get_view_name_int64_t(obj, idx) & integer(C_INT64_T), value, intent(IN) :: idx character(len=MAXNAMESIZE) :: SHT_rv ! splicer begin class.Group.method.get_view_name_int64_t - call c_group_get_view_name_bufferify(obj%cxxmem, & - int(idx, SIDRE_IndexType), SHT_rv, len(SHT_rv, kind=C_INT)) + integer(C_INT) SHT_rv_len + SHT_rv_len = len(SHT_rv, kind=C_INT) + call c_group_get_view_name_int64_t_bufferify(obj%cxxmem, idx, & + SHT_rv, SHT_rv_len) ! splicer end class.Group.method.get_view_name_int64_t end function group_get_view_name_int64_t @@ -2930,23 +3341,25 @@ function group_get_view_from_name(obj, path) & class(SidreGroup) :: obj character(len=*), intent(IN) :: path type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.get_view_from_name type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.get_view_from_name + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_get_view_from_name_bufferify(obj%cxxmem, path, & - len_trim(path, kind=C_INT), SHT_rv%cxxmem) + SHT_path_len, SHT_rv%cxxmem) ! splicer end class.Group.method.get_view_from_name end function group_get_view_from_name function group_get_view_from_index_int32_t(obj, idx) & result(SHT_rv) - use iso_c_binding, only : C_INT32_T, C_INT64_T, C_PTR + use iso_c_binding, only : C_INT32_T, C_PTR class(SidreGroup) :: obj integer(C_INT32_T), value, intent(IN) :: idx type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.get_view_from_index_int32_t type(C_PTR) :: SHT_prv - SHT_prv = c_group_get_view_from_index(obj%cxxmem, & - int(idx, SIDRE_IndexType), SHT_rv%cxxmem) + ! splicer begin class.Group.method.get_view_from_index_int32_t + SHT_prv = c_group_get_view_from_index_int32_t(obj%cxxmem, idx, & + SHT_rv%cxxmem) ! splicer end class.Group.method.get_view_from_index_int32_t end function group_get_view_from_index_int32_t @@ -2956,16 +3369,15 @@ function group_get_view_from_index_int64_t(obj, idx) & class(SidreGroup) :: obj integer(C_INT64_T), value, intent(IN) :: idx type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.get_view_from_index_int64_t type(C_PTR) :: SHT_prv - SHT_prv = c_group_get_view_from_index(obj%cxxmem, & - int(idx, SIDRE_IndexType), SHT_rv%cxxmem) + ! splicer begin class.Group.method.get_view_from_index_int64_t + SHT_prv = c_group_get_view_from_index_int64_t(obj%cxxmem, idx, & + SHT_rv%cxxmem) ! splicer end class.Group.method.get_view_from_index_int64_t end function group_get_view_from_index_int64_t function group_get_first_valid_view_index(obj) & result(SHT_rv) - use iso_c_binding, only : C_INT64_T class(SidreGroup) :: obj integer(SIDRE_IndexType) :: SHT_rv ! splicer begin class.Group.method.get_first_valid_view_index @@ -2975,7 +3387,7 @@ end function group_get_first_valid_view_index function group_get_next_valid_view_index_int32_t(obj, idx) & result(SHT_rv) - use iso_c_binding, only : C_INT32_T, C_INT64_T + use iso_c_binding, only : C_INT32_T class(SidreGroup) :: obj integer(C_INT32_T), value, intent(IN) :: idx integer(SIDRE_IndexType) :: SHT_rv @@ -3003,62 +3415,67 @@ function group_create_view_empty(obj, path) & class(SidreGroup) :: obj character(len=*), intent(IN) :: path type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_empty type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.create_view_empty + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_create_view_empty_bufferify(obj%cxxmem, path, & - len_trim(path, kind=C_INT), SHT_rv%cxxmem) + SHT_path_len, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_empty end function group_create_view_empty function group_create_view_from_type_int32_t(obj, path, type, & num_elems) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT32_T, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT, C_INT32_T, C_PTR class(SidreGroup) :: obj character(len=*), intent(IN) :: path integer(TypeID), value, intent(IN) :: type integer(C_INT32_T), value, intent(IN) :: num_elems type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_from_type_int32_t type(C_PTR) :: SHT_prv - SHT_prv = c_group_create_view_from_type_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), type, & - int(num_elems, SIDRE_IndexType), SHT_rv%cxxmem) + ! splicer begin class.Group.method.create_view_from_type_int32_t + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) + SHT_prv = c_group_create_view_from_type_int32_t_bufferify(obj%cxxmem, & + path, SHT_path_len, type, num_elems, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_from_type_int32_t end function group_create_view_from_type_int32_t function group_create_view_from_type_int64_t(obj, path, type, & num_elems) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT, C_INT64_T, C_PTR class(SidreGroup) :: obj character(len=*), intent(IN) :: path integer(TypeID), value, intent(IN) :: type integer(C_INT64_T), value, intent(IN) :: num_elems type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_from_type_int64_t type(C_PTR) :: SHT_prv - SHT_prv = c_group_create_view_from_type_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), type, & - int(num_elems, SIDRE_IndexType), SHT_rv%cxxmem) + ! splicer begin class.Group.method.create_view_from_type_int64_t + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) + SHT_prv = c_group_create_view_from_type_int64_t_bufferify(obj%cxxmem, & + path, SHT_path_len, type, num_elems, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_from_type_int64_t end function group_create_view_from_type_int64_t function group_create_view_with_shape_base(obj, path, type, ndims, & shape) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT, C_PTR class(SidreGroup) :: obj character(len=*), intent(IN) :: path integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(IN) :: shape(:) type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_with_shape_base type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.create_view_with_shape_base + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_create_view_with_shape_base_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), type, ndims, shape, & - SHT_rv%cxxmem) + path, SHT_path_len, type, ndims, shape, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_with_shape_base end function group_create_view_with_shape_base @@ -3069,54 +3486,59 @@ function group_create_view_into_buffer(obj, path, buff) & character(len=*), intent(IN) :: path type(SidreBuffer), intent(INOUT) :: buff type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_into_buffer type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.create_view_into_buffer + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_create_view_into_buffer_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), buff%cxxmem, & - SHT_rv%cxxmem) + path, SHT_path_len, buff%cxxmem, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_into_buffer end function group_create_view_into_buffer function group_create_view_from_type_and_buffer_int32_t(obj, path, & type, num_elems, buff) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT32_T, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT, C_INT32_T, C_PTR class(SidreGroup) :: obj character(len=*), intent(IN) :: path integer(TypeID), value, intent(IN) :: type integer(C_INT32_T), value, intent(IN) :: num_elems type(SidreBuffer), intent(INOUT) :: buff type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_from_type_and_buffer_int32_t type(C_PTR) :: SHT_prv - SHT_prv = c_group_create_view_from_type_and_buffer_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), type, & - int(num_elems, SIDRE_IndexType), buff%cxxmem, SHT_rv%cxxmem) + ! splicer begin class.Group.method.create_view_from_type_and_buffer_int32_t + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) + SHT_prv = c_group_create_view_from_type_and_buffer_int32_t_bufferify(obj%cxxmem, & + path, SHT_path_len, type, num_elems, buff%cxxmem, & + SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_from_type_and_buffer_int32_t end function group_create_view_from_type_and_buffer_int32_t function group_create_view_from_type_and_buffer_int64_t(obj, path, & type, num_elems, buff) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT, C_INT64_T, C_PTR class(SidreGroup) :: obj character(len=*), intent(IN) :: path integer(TypeID), value, intent(IN) :: type integer(C_INT64_T), value, intent(IN) :: num_elems type(SidreBuffer), intent(INOUT) :: buff type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_from_type_and_buffer_int64_t type(C_PTR) :: SHT_prv - SHT_prv = c_group_create_view_from_type_and_buffer_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), type, & - int(num_elems, SIDRE_IndexType), buff%cxxmem, SHT_rv%cxxmem) + ! splicer begin class.Group.method.create_view_from_type_and_buffer_int64_t + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) + SHT_prv = c_group_create_view_from_type_and_buffer_int64_t_bufferify(obj%cxxmem, & + path, SHT_path_len, type, num_elems, buff%cxxmem, & + SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_from_type_and_buffer_int64_t end function group_create_view_from_type_and_buffer_int64_t function group_create_view_with_shape_and_buffer(obj, path, type, & ndims, shape, buff) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT, C_PTR class(SidreGroup) :: obj character(len=*), intent(IN) :: path integer(TypeID), value, intent(IN) :: type @@ -3124,11 +3546,13 @@ function group_create_view_with_shape_and_buffer(obj, path, type, & integer(SIDRE_IndexType), intent(IN) :: shape(:) type(SidreBuffer), intent(INOUT) :: buff type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_with_shape_and_buffer type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.create_view_with_shape_and_buffer + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_create_view_with_shape_and_buffer_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), type, ndims, shape, & - buff%cxxmem, SHT_rv%cxxmem) + path, SHT_path_len, type, ndims, shape, buff%cxxmem, & + SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_with_shape_and_buffer end function group_create_view_with_shape_and_buffer @@ -3139,29 +3563,31 @@ function group_create_view_external(obj, path, external_ptr) & character(len=*), intent(IN) :: path type(C_PTR), intent(IN) :: external_ptr type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_external type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.create_view_external + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_create_view_external_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), external_ptr, & - SHT_rv%cxxmem) + path, SHT_path_len, external_ptr, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_external end function group_create_view_external function group_create_view_from_type_external_int32_t(obj, path, & type, num_elems, external_ptr) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT32_T, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT, C_INT32_T, C_PTR class(SidreGroup) :: obj character(len=*), intent(IN) :: path integer(TypeID), value, intent(IN) :: type integer(C_INT32_T), value, intent(IN) :: num_elems type(C_PTR), intent(IN) :: external_ptr type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_from_type_external_int32_t type(C_PTR) :: SHT_prv - SHT_prv = c_group_create_view_from_type_external_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), type, & - int(num_elems, SIDRE_IndexType), external_ptr, & + ! splicer begin class.Group.method.create_view_from_type_external_int32_t + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) + SHT_prv = c_group_create_view_from_type_external_int32_t_bufferify(obj%cxxmem, & + path, SHT_path_len, type, num_elems, external_ptr, & SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_from_type_external_int32_t end function group_create_view_from_type_external_int32_t @@ -3169,18 +3595,19 @@ end function group_create_view_from_type_external_int32_t function group_create_view_from_type_external_int64_t(obj, path, & type, num_elems, external_ptr) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT, C_INT64_T, C_PTR class(SidreGroup) :: obj character(len=*), intent(IN) :: path integer(TypeID), value, intent(IN) :: type integer(C_INT64_T), value, intent(IN) :: num_elems type(C_PTR), intent(IN) :: external_ptr type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_from_type_external_int64_t type(C_PTR) :: SHT_prv - SHT_prv = c_group_create_view_from_type_external_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), type, & - int(num_elems, SIDRE_IndexType), external_ptr, & + ! splicer begin class.Group.method.create_view_from_type_external_int64_t + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) + SHT_prv = c_group_create_view_from_type_external_int64_t_bufferify(obj%cxxmem, & + path, SHT_path_len, type, num_elems, external_ptr, & SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_from_type_external_int64_t end function group_create_view_from_type_external_int64_t @@ -3188,7 +3615,7 @@ end function group_create_view_from_type_external_int64_t function group_create_view_with_shape_external(obj, path, type, & ndims, shape, external_ptr) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT, C_PTR class(SidreGroup) :: obj character(len=*), intent(IN) :: path integer(TypeID), value, intent(IN) :: type @@ -3196,63 +3623,68 @@ function group_create_view_with_shape_external(obj, path, type, & integer(SIDRE_IndexType), intent(IN) :: shape(:) type(C_PTR), intent(IN) :: external_ptr type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_with_shape_external type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.create_view_with_shape_external + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_create_view_with_shape_external_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), type, ndims, shape, & - external_ptr, SHT_rv%cxxmem) + path, SHT_path_len, type, ndims, shape, external_ptr, & + SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_with_shape_external end function group_create_view_with_shape_external function group_create_view_and_allocate_nelems_int32_t(obj, path, & type, num_elems) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT32_T, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT, C_INT32_T, C_PTR class(SidreGroup) :: obj character(len=*), intent(IN) :: path integer(TypeID), value, intent(IN) :: type integer(C_INT32_T), value, intent(IN) :: num_elems type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_and_allocate_nelems_int32_t type(C_PTR) :: SHT_prv - SHT_prv = c_group_create_view_and_allocate_nelems_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), type, & - int(num_elems, SIDRE_IndexType), SHT_rv%cxxmem) + ! splicer begin class.Group.method.create_view_and_allocate_nelems_int32_t + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) + SHT_prv = c_group_create_view_and_allocate_nelems_int32_t_bufferify(obj%cxxmem, & + path, SHT_path_len, type, num_elems, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_and_allocate_nelems_int32_t end function group_create_view_and_allocate_nelems_int32_t function group_create_view_and_allocate_nelems_int64_t(obj, path, & type, num_elems) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT, C_INT64_T, C_PTR class(SidreGroup) :: obj character(len=*), intent(IN) :: path integer(TypeID), value, intent(IN) :: type integer(C_INT64_T), value, intent(IN) :: num_elems type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_and_allocate_nelems_int64_t type(C_PTR) :: SHT_prv - SHT_prv = c_group_create_view_and_allocate_nelems_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), type, & - int(num_elems, SIDRE_IndexType), SHT_rv%cxxmem) + ! splicer begin class.Group.method.create_view_and_allocate_nelems_int64_t + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) + SHT_prv = c_group_create_view_and_allocate_nelems_int64_t_bufferify(obj%cxxmem, & + path, SHT_path_len, type, num_elems, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_and_allocate_nelems_int64_t end function group_create_view_and_allocate_nelems_int64_t function group_create_view_with_shape_and_allocate(obj, path, type, & ndims, shape) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT, C_PTR class(SidreGroup) :: obj character(len=*), intent(IN) :: path integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(IN) :: shape(:) type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_with_shape_and_allocate type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.create_view_with_shape_and_allocate + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_create_view_with_shape_and_allocate_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), type, ndims, shape, & - SHT_rv%cxxmem) + path, SHT_path_len, type, ndims, shape, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_with_shape_and_allocate end function group_create_view_with_shape_and_allocate @@ -3263,10 +3695,12 @@ function group_create_view_scalar_int(obj, path, value) & character(len=*), intent(IN) :: path integer(C_INT), value, intent(IN) :: value type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_scalar_int type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.create_view_scalar_int + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_create_view_scalar_bufferify_int(obj%cxxmem, & - path, len_trim(path, kind=C_INT), value, SHT_rv%cxxmem) + path, SHT_path_len, value, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_scalar_int end function group_create_view_scalar_int @@ -3277,10 +3711,12 @@ function group_create_view_scalar_long(obj, path, value) & character(len=*), intent(IN) :: path integer(C_LONG), value, intent(IN) :: value type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_scalar_long type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.create_view_scalar_long + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_create_view_scalar_bufferify_long(obj%cxxmem, & - path, len_trim(path, kind=C_INT), value, SHT_rv%cxxmem) + path, SHT_path_len, value, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_scalar_long end function group_create_view_scalar_long @@ -3291,10 +3727,12 @@ function group_create_view_scalar_float(obj, path, value) & character(len=*), intent(IN) :: path real(C_FLOAT), value, intent(IN) :: value type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_scalar_float type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.create_view_scalar_float + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_create_view_scalar_bufferify_float(obj%cxxmem, & - path, len_trim(path, kind=C_INT), value, SHT_rv%cxxmem) + path, SHT_path_len, value, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_scalar_float end function group_create_view_scalar_float @@ -3305,10 +3743,12 @@ function group_create_view_scalar_double(obj, path, value) & character(len=*), intent(IN) :: path real(C_DOUBLE), value, intent(IN) :: value type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_scalar_double type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.create_view_scalar_double + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_create_view_scalar_bufferify_double(obj%cxxmem, & - path, len_trim(path, kind=C_INT), value, SHT_rv%cxxmem) + path, SHT_path_len, value, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_scalar_double end function group_create_view_scalar_double @@ -3319,11 +3759,14 @@ function group_create_view_string(obj, path, value) & character(len=*), intent(IN) :: path character(len=*), intent(IN) :: value type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.create_view_string type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.create_view_string + integer(C_INT) SHT_path_len + integer(C_INT) SHT_value_len + SHT_path_len = len(path, kind=C_INT) + SHT_value_len = len(value, kind=C_INT) SHT_prv = c_group_create_view_string_bufferify(obj%cxxmem, path, & - len_trim(path, kind=C_INT), value, & - len_trim(value, kind=C_INT), SHT_rv%cxxmem) + SHT_path_len, value, SHT_value_len, SHT_rv%cxxmem) ! splicer end class.Group.method.create_view_string end function group_create_view_string @@ -3332,8 +3775,10 @@ subroutine group_destroy_view(obj, path) class(SidreGroup) :: obj character(len=*), intent(IN) :: path ! splicer begin class.Group.method.destroy_view + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) call c_group_destroy_view_bufferify(obj%cxxmem, path, & - len_trim(path, kind=C_INT)) + SHT_path_len) ! splicer end class.Group.method.destroy_view end subroutine group_destroy_view @@ -3342,13 +3787,15 @@ subroutine group_destroy_view_and_data_name(obj, path) class(SidreGroup) :: obj character(len=*), intent(IN) :: path ! splicer begin class.Group.method.destroy_view_and_data_name + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) call c_group_destroy_view_and_data_name_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT)) + path, SHT_path_len) ! splicer end class.Group.method.destroy_view_and_data_name end subroutine group_destroy_view_and_data_name subroutine group_destroy_view_and_data_index_int32_t(obj, idx) - use iso_c_binding, only : C_INT32_T, C_INT64_T + use iso_c_binding, only : C_INT32_T class(SidreGroup) :: obj integer(C_INT32_T), value, intent(IN) :: idx ! splicer begin class.Group.method.destroy_view_and_data_index_int32_t @@ -3373,8 +3820,8 @@ function group_move_view(obj, view) & class(SidreGroup) :: obj type(SidreView), intent(INOUT) :: view type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.move_view type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.move_view SHT_prv = c_group_move_view(obj%cxxmem, view%cxxmem, & SHT_rv%cxxmem) ! splicer end class.Group.method.move_view @@ -3386,8 +3833,8 @@ function group_copy_view(obj, view) & class(SidreGroup) :: obj type(SidreView), intent(INOUT) :: view type(SidreView) :: SHT_rv - ! splicer begin class.Group.method.copy_view type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.copy_view SHT_prv = c_group_copy_view(obj%cxxmem, view%cxxmem, & SHT_rv%cxxmem) ! splicer end class.Group.method.copy_view @@ -3400,8 +3847,10 @@ function group_has_group(obj, path) & character(len=*), intent(IN) :: path logical :: SHT_rv ! splicer begin class.Group.method.has_group + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_rv = c_group_has_group_bufferify(obj%cxxmem, path, & - len_trim(path, kind=C_INT)) + SHT_path_len) ! splicer end class.Group.method.has_group end function group_has_group @@ -3412,32 +3861,38 @@ function group_has_child_group(obj, name) & character(len=*), intent(IN) :: name logical :: SHT_rv ! splicer begin class.Group.method.has_child_group + integer(C_INT) SHT_name_len + SHT_name_len = len(name, kind=C_INT) SHT_rv = c_group_has_child_group_bufferify(obj%cxxmem, name, & - len_trim(name, kind=C_INT)) + SHT_name_len) ! splicer end class.Group.method.has_child_group end function group_has_child_group function group_get_group_index(obj, name) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT64_T + use iso_c_binding, only : C_INT class(SidreGroup) :: obj character(len=*), intent(IN) :: name integer(SIDRE_IndexType) :: SHT_rv ! splicer begin class.Group.method.get_group_index + integer(C_INT) SHT_name_len + SHT_name_len = len(name, kind=C_INT) SHT_rv = c_group_get_group_index_bufferify(obj%cxxmem, name, & - len_trim(name, kind=C_INT)) + SHT_name_len) ! splicer end class.Group.method.get_group_index end function group_get_group_index function group_get_group_name_int32_t(obj, idx) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT32_T, C_INT64_T + use iso_c_binding, only : C_INT, C_INT32_T class(SidreGroup) :: obj integer(C_INT32_T), value, intent(IN) :: idx character(len=MAXNAMESIZE) :: SHT_rv ! splicer begin class.Group.method.get_group_name_int32_t - call c_group_get_group_name_bufferify(obj%cxxmem, & - int(idx, SIDRE_IndexType), SHT_rv, len(SHT_rv, kind=C_INT)) + integer(C_INT) SHT_rv_len + SHT_rv_len = len(SHT_rv, kind=C_INT) + call c_group_get_group_name_int32_t_bufferify(obj%cxxmem, idx, & + SHT_rv, SHT_rv_len) ! splicer end class.Group.method.get_group_name_int32_t end function group_get_group_name_int32_t @@ -3448,8 +3903,10 @@ function group_get_group_name_int64_t(obj, idx) & integer(C_INT64_T), value, intent(IN) :: idx character(len=MAXNAMESIZE) :: SHT_rv ! splicer begin class.Group.method.get_group_name_int64_t - call c_group_get_group_name_bufferify(obj%cxxmem, & - int(idx, SIDRE_IndexType), SHT_rv, len(SHT_rv, kind=C_INT)) + integer(C_INT) SHT_rv_len + SHT_rv_len = len(SHT_rv, kind=C_INT) + call c_group_get_group_name_int64_t_bufferify(obj%cxxmem, idx, & + SHT_rv, SHT_rv_len) ! splicer end class.Group.method.get_group_name_int64_t end function group_get_group_name_int64_t @@ -3459,23 +3916,25 @@ function group_get_group_from_name(obj, path) & class(SidreGroup) :: obj character(len=*), intent(IN) :: path type(SidreGroup) :: SHT_rv - ! splicer begin class.Group.method.get_group_from_name type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.get_group_from_name + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_get_group_from_name_bufferify(obj%cxxmem, & - path, len_trim(path, kind=C_INT), SHT_rv%cxxmem) + path, SHT_path_len, SHT_rv%cxxmem) ! splicer end class.Group.method.get_group_from_name end function group_get_group_from_name function group_get_group_from_index_int32_t(obj, idx) & result(SHT_rv) - use iso_c_binding, only : C_INT32_T, C_INT64_T, C_PTR + use iso_c_binding, only : C_INT32_T, C_PTR class(SidreGroup) :: obj integer(C_INT32_T), value, intent(IN) :: idx type(SidreGroup) :: SHT_rv - ! splicer begin class.Group.method.get_group_from_index_int32_t type(C_PTR) :: SHT_prv - SHT_prv = c_group_get_group_from_index(obj%cxxmem, & - int(idx, SIDRE_IndexType), SHT_rv%cxxmem) + ! splicer begin class.Group.method.get_group_from_index_int32_t + SHT_prv = c_group_get_group_from_index_int32_t(obj%cxxmem, idx, & + SHT_rv%cxxmem) ! splicer end class.Group.method.get_group_from_index_int32_t end function group_get_group_from_index_int32_t @@ -3485,16 +3944,15 @@ function group_get_group_from_index_int64_t(obj, idx) & class(SidreGroup) :: obj integer(C_INT64_T), value, intent(IN) :: idx type(SidreGroup) :: SHT_rv - ! splicer begin class.Group.method.get_group_from_index_int64_t type(C_PTR) :: SHT_prv - SHT_prv = c_group_get_group_from_index(obj%cxxmem, & - int(idx, SIDRE_IndexType), SHT_rv%cxxmem) + ! splicer begin class.Group.method.get_group_from_index_int64_t + SHT_prv = c_group_get_group_from_index_int64_t(obj%cxxmem, idx, & + SHT_rv%cxxmem) ! splicer end class.Group.method.get_group_from_index_int64_t end function group_get_group_from_index_int64_t function group_get_first_valid_group_index(obj) & result(SHT_rv) - use iso_c_binding, only : C_INT64_T class(SidreGroup) :: obj integer(SIDRE_IndexType) :: SHT_rv ! splicer begin class.Group.method.get_first_valid_group_index @@ -3504,7 +3962,7 @@ end function group_get_first_valid_group_index function group_get_next_valid_group_index_int32_t(obj, idx) & result(SHT_rv) - use iso_c_binding, only : C_INT32_T, C_INT64_T + use iso_c_binding, only : C_INT32_T class(SidreGroup) :: obj integer(C_INT32_T), value, intent(IN) :: idx integer(SIDRE_IndexType) :: SHT_rv @@ -3532,10 +3990,12 @@ function group_create_group(obj, path) & class(SidreGroup) :: obj character(len=*), intent(IN) :: path type(SidreGroup) :: SHT_rv - ! splicer begin class.Group.method.create_group type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.create_group + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) SHT_prv = c_group_create_group_bufferify(obj%cxxmem, path, & - len_trim(path, kind=C_INT), SHT_rv%cxxmem) + SHT_path_len, SHT_rv%cxxmem) ! splicer end class.Group.method.create_group end function group_create_group @@ -3544,13 +4004,15 @@ subroutine group_destroy_group_name(obj, path) class(SidreGroup) :: obj character(len=*), intent(IN) :: path ! splicer begin class.Group.method.destroy_group_name + integer(C_INT) SHT_path_len + SHT_path_len = len(path, kind=C_INT) call c_group_destroy_group_name_bufferify(obj%cxxmem, path, & - len_trim(path, kind=C_INT)) + SHT_path_len) ! splicer end class.Group.method.destroy_group_name end subroutine group_destroy_group_name subroutine group_destroy_group_index_int32_t(obj, idx) - use iso_c_binding, only : C_INT32_T, C_INT64_T + use iso_c_binding, only : C_INT32_T class(SidreGroup) :: obj integer(C_INT32_T), value, intent(IN) :: idx ! splicer begin class.Group.method.destroy_group_index_int32_t @@ -3575,8 +4037,8 @@ function group_move_group(obj, grp) & class(SidreGroup) :: obj type(SidreGroup), intent(INOUT) :: grp type(SidreGroup) :: SHT_rv - ! splicer begin class.Group.method.move_group type(C_PTR) :: SHT_prv + ! splicer begin class.Group.method.move_group SHT_prv = c_group_move_group(obj%cxxmem, grp%cxxmem, & SHT_rv%cxxmem) ! splicer end class.Group.method.move_group @@ -3606,9 +4068,12 @@ subroutine group_save(obj, file_path, protocol) character(len=*), intent(IN) :: file_path character(len=*), intent(IN) :: protocol ! splicer begin class.Group.method.save + integer(C_INT) SHT_file_path_len + integer(C_INT) SHT_protocol_len + SHT_file_path_len = len(file_path, kind=C_INT) + SHT_protocol_len = len(protocol, kind=C_INT) call c_group_save_bufferify(obj%cxxmem, file_path, & - len_trim(file_path, kind=C_INT), protocol, & - len_trim(protocol, kind=C_INT)) + SHT_file_path_len, protocol, SHT_protocol_len) ! splicer end class.Group.method.save end subroutine group_save @@ -3618,9 +4083,12 @@ subroutine group_load_0(obj, file_path, protocol) character(len=*), intent(IN) :: file_path character(len=*), intent(IN) :: protocol ! splicer begin class.Group.method.load_0 + integer(C_INT) SHT_file_path_len + integer(C_INT) SHT_protocol_len + SHT_file_path_len = len(file_path, kind=C_INT) + SHT_protocol_len = len(protocol, kind=C_INT) call c_group_load_0_bufferify(obj%cxxmem, file_path, & - len_trim(file_path, kind=C_INT), protocol, & - len_trim(protocol, kind=C_INT)) + SHT_file_path_len, protocol, SHT_protocol_len) ! splicer end class.Group.method.load_0 end subroutine group_load_0 @@ -3631,11 +4099,15 @@ subroutine group_load_1(obj, file_path, protocol, preserve_contents) character(len=*), intent(IN) :: protocol logical, value, intent(IN) :: preserve_contents ! splicer begin class.Group.method.load_1 + integer(C_INT) SHT_file_path_len + integer(C_INT) SHT_protocol_len logical(C_BOOL) SH_preserve_contents + SHT_file_path_len = len(file_path, kind=C_INT) + SHT_protocol_len = len(protocol, kind=C_INT) SH_preserve_contents = preserve_contents ! coerce to C_BOOL call c_group_load_1_bufferify(obj%cxxmem, file_path, & - len_trim(file_path, kind=C_INT), protocol, & - len_trim(protocol, kind=C_INT), SH_preserve_contents) + SHT_file_path_len, protocol, SHT_protocol_len, & + SH_preserve_contents) ! splicer end class.Group.method.load_1 end subroutine group_load_1 @@ -3644,8 +4116,10 @@ subroutine group_load_external_data(obj, file_path) class(SidreGroup) :: obj character(len=*), intent(IN) :: file_path ! splicer begin class.Group.method.load_external_data + integer(C_INT) SHT_file_path_len + SHT_file_path_len = len(file_path, kind=C_INT) call c_group_load_external_data_bufferify(obj%cxxmem, file_path, & - len_trim(file_path, kind=C_INT)) + SHT_file_path_len) ! splicer end class.Group.method.load_external_data end subroutine group_load_external_data @@ -3656,8 +4130,10 @@ function group_rename(obj, new_name) & character(len=*), intent(IN) :: new_name logical :: SHT_rv ! splicer begin class.Group.method.rename + integer(C_INT) SHT_new_name_len + SHT_new_name_len = len(new_name, kind=C_INT) SHT_rv = c_group_rename_bufferify(obj%cxxmem, new_name, & - len_trim(new_name, kind=C_INT)) + SHT_new_name_len) ! splicer end class.Group.method.rename end function group_rename @@ -3693,7 +4169,7 @@ subroutine group_get_scalar_int(grp, name, value) character(*), intent(IN) :: name integer(C_INT), intent(OUT) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) @@ -3708,7 +4184,7 @@ subroutine group_get_scalar_long(grp, name, value) character(*), intent(IN) :: name integer(C_LONG), intent(OUT) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) @@ -3723,7 +4199,7 @@ subroutine group_get_scalar_float(grp, name, value) character(*), intent(IN) :: name real(C_FLOAT), intent(OUT) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) @@ -3738,7 +4214,7 @@ subroutine group_get_scalar_double(grp, name, value) character(*), intent(IN) :: name real(C_DOUBLE), intent(OUT) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) @@ -3753,7 +4229,7 @@ subroutine group_set_scalar_int(grp, name, value) character(*), intent(IN) :: name integer(C_INT), intent(IN) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) @@ -3768,7 +4244,7 @@ subroutine group_set_scalar_long(grp, name, value) character(*), intent(IN) :: name integer(C_LONG), intent(IN) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) @@ -3783,7 +4259,7 @@ subroutine group_set_scalar_float(grp, name, value) character(*), intent(IN) :: name real(C_FLOAT), intent(IN) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) @@ -3798,7 +4274,7 @@ subroutine group_set_scalar_double(grp, name, value) character(*), intent(IN) :: name real(C_DOUBLE), intent(IN) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) @@ -4336,7 +4812,7 @@ subroutine group_set_array_data_ptr_int_scalar(grp, name, value) character(len=*), intent(IN) :: name integer(C_INT), target, intent(IN) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(1) ! integer(C_INT), parameter :: type = SIDRE_INT_ID type(C_PTR) addr, viewptr @@ -4365,7 +4841,7 @@ subroutine group_set_array_data_ptr_int_1d(grp, name, value) character(len=*), intent(IN) :: name integer(C_INT), target, intent(IN) :: value(:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(1) ! integer(C_INT), parameter :: type = SIDRE_INT_ID type(C_PTR) addr, viewptr @@ -4394,7 +4870,7 @@ subroutine group_set_array_data_ptr_int_2d(grp, name, value) character(len=*), intent(IN) :: name integer(C_INT), target, intent(IN) :: value(:,:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(2) ! integer(C_INT), parameter :: type = SIDRE_INT_ID type(C_PTR) addr, viewptr @@ -4423,7 +4899,7 @@ subroutine group_set_array_data_ptr_int_3d(grp, name, value) character(len=*), intent(IN) :: name integer(C_INT), target, intent(IN) :: value(:,:,:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(3) ! integer(C_INT), parameter :: type = SIDRE_INT_ID type(C_PTR) addr, viewptr @@ -4452,7 +4928,7 @@ subroutine group_set_array_data_ptr_int_4d(grp, name, value) character(len=*), intent(IN) :: name integer(C_INT), target, intent(IN) :: value(:,:,:,:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(4) ! integer(C_INT), parameter :: type = SIDRE_INT_ID type(C_PTR) addr, viewptr @@ -4481,7 +4957,7 @@ subroutine group_set_array_data_ptr_long_scalar(grp, name, value) character(len=*), intent(IN) :: name integer(C_LONG), target, intent(IN) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(1) ! integer(C_INT), parameter :: type = SIDRE_LONG_ID type(C_PTR) addr, viewptr @@ -4510,7 +4986,7 @@ subroutine group_set_array_data_ptr_long_1d(grp, name, value) character(len=*), intent(IN) :: name integer(C_LONG), target, intent(IN) :: value(:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(1) ! integer(C_INT), parameter :: type = SIDRE_LONG_ID type(C_PTR) addr, viewptr @@ -4539,7 +5015,7 @@ subroutine group_set_array_data_ptr_long_2d(grp, name, value) character(len=*), intent(IN) :: name integer(C_LONG), target, intent(IN) :: value(:,:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(2) ! integer(C_INT), parameter :: type = SIDRE_LONG_ID type(C_PTR) addr, viewptr @@ -4568,7 +5044,7 @@ subroutine group_set_array_data_ptr_long_3d(grp, name, value) character(len=*), intent(IN) :: name integer(C_LONG), target, intent(IN) :: value(:,:,:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(3) ! integer(C_INT), parameter :: type = SIDRE_LONG_ID type(C_PTR) addr, viewptr @@ -4597,7 +5073,7 @@ subroutine group_set_array_data_ptr_long_4d(grp, name, value) character(len=*), intent(IN) :: name integer(C_LONG), target, intent(IN) :: value(:,:,:,:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(4) ! integer(C_INT), parameter :: type = SIDRE_LONG_ID type(C_PTR) addr, viewptr @@ -4626,7 +5102,7 @@ subroutine group_set_array_data_ptr_float_scalar(grp, name, value) character(len=*), intent(IN) :: name real(C_FLOAT), target, intent(IN) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(1) ! integer(C_INT), parameter :: type = SIDRE_FLOAT_ID type(C_PTR) addr, viewptr @@ -4655,7 +5131,7 @@ subroutine group_set_array_data_ptr_float_1d(grp, name, value) character(len=*), intent(IN) :: name real(C_FLOAT), target, intent(IN) :: value(:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(1) ! integer(C_INT), parameter :: type = SIDRE_FLOAT_ID type(C_PTR) addr, viewptr @@ -4684,7 +5160,7 @@ subroutine group_set_array_data_ptr_float_2d(grp, name, value) character(len=*), intent(IN) :: name real(C_FLOAT), target, intent(IN) :: value(:,:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(2) ! integer(C_INT), parameter :: type = SIDRE_FLOAT_ID type(C_PTR) addr, viewptr @@ -4713,7 +5189,7 @@ subroutine group_set_array_data_ptr_float_3d(grp, name, value) character(len=*), intent(IN) :: name real(C_FLOAT), target, intent(IN) :: value(:,:,:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(3) ! integer(C_INT), parameter :: type = SIDRE_FLOAT_ID type(C_PTR) addr, viewptr @@ -4742,7 +5218,7 @@ subroutine group_set_array_data_ptr_float_4d(grp, name, value) character(len=*), intent(IN) :: name real(C_FLOAT), target, intent(IN) :: value(:,:,:,:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(4) ! integer(C_INT), parameter :: type = SIDRE_FLOAT_ID type(C_PTR) addr, viewptr @@ -4771,7 +5247,7 @@ subroutine group_set_array_data_ptr_double_scalar(grp, name, value) character(len=*), intent(IN) :: name real(C_DOUBLE), target, intent(IN) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(1) ! integer(C_INT), parameter :: type = SIDRE_DOUBLE_ID type(C_PTR) addr, viewptr @@ -4800,7 +5276,7 @@ subroutine group_set_array_data_ptr_double_1d(grp, name, value) character(len=*), intent(IN) :: name real(C_DOUBLE), target, intent(IN) :: value(:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(1) ! integer(C_INT), parameter :: type = SIDRE_DOUBLE_ID type(C_PTR) addr, viewptr @@ -4829,7 +5305,7 @@ subroutine group_set_array_data_ptr_double_2d(grp, name, value) character(len=*), intent(IN) :: name real(C_DOUBLE), target, intent(IN) :: value(:,:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(2) ! integer(C_INT), parameter :: type = SIDRE_DOUBLE_ID type(C_PTR) addr, viewptr @@ -4858,7 +5334,7 @@ subroutine group_set_array_data_ptr_double_3d(grp, name, value) character(len=*), intent(IN) :: name real(C_DOUBLE), target, intent(IN) :: value(:,:,:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(3) ! integer(C_INT), parameter :: type = SIDRE_DOUBLE_ID type(C_PTR) addr, viewptr @@ -4887,7 +5363,7 @@ subroutine group_set_array_data_ptr_double_4d(grp, name, value) character(len=*), intent(IN) :: name real(C_DOUBLE), target, intent(IN) :: value(:,:,:,:) integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view ! integer(SIDRE_IndexType) :: extents(4) ! integer(C_INT), parameter :: type = SIDRE_DOUBLE_ID type(C_PTR) addr, viewptr @@ -4912,7 +5388,7 @@ subroutine group_get_string(grp, name, value) character(*), intent(IN) :: name character(*), intent(OUT) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) @@ -4926,7 +5402,7 @@ subroutine group_set_string(grp, name, value) character(*), intent(IN) :: name character(*), intent(IN) :: value integer(C_INT) :: lname - type(SIDRE_SHROUD_view_capsule) view + type(SIDRE_SHROUD_capsule_data) view type(C_PTR) viewptr lname = len_trim(name) @@ -4938,7 +5414,6 @@ end subroutine group_set_string function view_get_index(obj) & result(SHT_rv) - use iso_c_binding, only : C_INT64_T class(SidreView) :: obj integer(SIDRE_IndexType) :: SHT_rv ! splicer begin class.View.method.get_index @@ -4952,8 +5427,9 @@ function view_get_name(obj) & class(SidreView) :: obj character(len=MAXNAMESIZE) :: SHT_rv ! splicer begin class.View.method.get_name - call c_view_get_name_bufferify(obj%cxxmem, SHT_rv, & - len(SHT_rv, kind=C_INT)) + integer(C_INT) SHT_rv_len + SHT_rv_len = len(SHT_rv, kind=C_INT) + call c_view_get_name_bufferify(obj%cxxmem, SHT_rv, SHT_rv_len) ! splicer end class.View.method.get_name end function view_get_name @@ -4963,8 +5439,9 @@ function view_get_path(obj) & class(SidreView) :: obj character(len=MAXNAMESIZE) :: SHT_rv ! splicer begin class.View.method.get_path - call c_view_get_path_bufferify(obj%cxxmem, SHT_rv, & - len(SHT_rv, kind=C_INT)) + integer(C_INT) SHT_rv_len + SHT_rv_len = len(SHT_rv, kind=C_INT) + call c_view_get_path_bufferify(obj%cxxmem, SHT_rv, SHT_rv_len) ! splicer end class.View.method.get_path end function view_get_path @@ -4974,8 +5451,10 @@ function view_get_path_name(obj) & class(SidreView) :: obj character(len=MAXNAMESIZE) :: SHT_rv ! splicer begin class.View.method.get_path_name + integer(C_INT) SHT_rv_len + SHT_rv_len = len(SHT_rv, kind=C_INT) call c_view_get_path_name_bufferify(obj%cxxmem, SHT_rv, & - len(SHT_rv, kind=C_INT)) + SHT_rv_len) ! splicer end class.View.method.get_path_name end function view_get_path_name @@ -4984,8 +5463,8 @@ function view_get_owning_group(obj) & use iso_c_binding, only : C_PTR class(SidreView) :: obj type(SidreGroup) :: SHT_rv - ! splicer begin class.View.method.get_owning_group type(C_PTR) :: SHT_prv + ! splicer begin class.View.method.get_owning_group SHT_prv = c_view_get_owning_group(obj%cxxmem, SHT_rv%cxxmem) ! splicer end class.View.method.get_owning_group end function view_get_owning_group @@ -5005,8 +5484,8 @@ function view_get_buffer(obj) & use iso_c_binding, only : C_PTR class(SidreView) :: obj type(SidreBuffer) :: SHT_rv - ! splicer begin class.View.method.get_buffer type(C_PTR) :: SHT_prv + ! splicer begin class.View.method.get_buffer SHT_prv = c_view_get_buffer(obj%cxxmem, SHT_rv%cxxmem) ! splicer end class.View.method.get_buffer end function view_get_buffer @@ -5093,7 +5572,6 @@ end function view_is_string function view_get_type_id(obj) & result(SHT_rv) - use iso_c_binding, only : C_INT class(SidreView) :: obj integer(TypeIDint) :: SHT_rv ! splicer begin class.View.method.get_type_id @@ -5163,7 +5641,7 @@ end function view_get_num_dimensions function view_get_shape(obj, ndims, shape) & result(SHT_rv) - use iso_c_binding, only : C_INT, C_INT64_T + use iso_c_binding, only : C_INT class(SidreView) :: obj integer(C_INT), value, intent(IN) :: ndims integer(SIDRE_IndexType), intent(OUT) :: shape(:) @@ -5181,7 +5659,7 @@ subroutine view_allocate_simple(obj) end subroutine view_allocate_simple subroutine view_allocate_from_type_int32_t(obj, type, num_elems) - use iso_c_binding, only : C_INT32_T, C_INT64_T, C_SHORT + use iso_c_binding, only : C_INT32_T class(SidreView) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT32_T), value, intent(IN) :: num_elems @@ -5192,7 +5670,7 @@ subroutine view_allocate_from_type_int32_t(obj, type, num_elems) end subroutine view_allocate_from_type_int32_t subroutine view_allocate_from_type_int64_t(obj, type, num_elems) - use iso_c_binding, only : C_INT64_T, C_SHORT + use iso_c_binding, only : C_INT64_T class(SidreView) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT64_T), value, intent(IN) :: num_elems @@ -5203,7 +5681,7 @@ subroutine view_allocate_from_type_int64_t(obj, type, num_elems) end subroutine view_allocate_from_type_int64_t subroutine view_reallocate_int32_t(obj, num_elems) - use iso_c_binding, only : C_INT32_T, C_INT64_T + use iso_c_binding, only : C_INT32_T class(SidreView) :: obj integer(C_INT32_T), value, intent(IN) :: num_elems ! splicer begin class.View.method.reallocate_int32_t @@ -5232,32 +5710,32 @@ end subroutine view_attach_buffer_only subroutine view_attach_buffer_type_int32_t(obj, type, num_elems, & buff) - use iso_c_binding, only : C_INT32_T, C_INT64_T, C_SHORT + use iso_c_binding, only : C_INT32_T class(SidreView) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT32_T), value, intent(IN) :: num_elems type(SidreBuffer), intent(INOUT) :: buff ! splicer begin class.View.method.attach_buffer_type_int32_t - call c_view_attach_buffer_type(obj%cxxmem, type, & - int(num_elems, SIDRE_IndexType), buff%cxxmem) + call c_view_attach_buffer_type_int32_t(obj%cxxmem, type, & + num_elems, buff%cxxmem) ! splicer end class.View.method.attach_buffer_type_int32_t end subroutine view_attach_buffer_type_int32_t subroutine view_attach_buffer_type_int64_t(obj, type, num_elems, & buff) - use iso_c_binding, only : C_INT64_T, C_SHORT + use iso_c_binding, only : C_INT64_T class(SidreView) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT64_T), value, intent(IN) :: num_elems type(SidreBuffer), intent(INOUT) :: buff ! splicer begin class.View.method.attach_buffer_type_int64_t - call c_view_attach_buffer_type(obj%cxxmem, type, & - int(num_elems, SIDRE_IndexType), buff%cxxmem) + call c_view_attach_buffer_type_int64_t(obj%cxxmem, type, & + num_elems, buff%cxxmem) ! splicer end class.View.method.attach_buffer_type_int64_t end subroutine view_attach_buffer_type_int64_t subroutine view_attach_buffer_shape(obj, type, ndims, shape, buff) - use iso_c_binding, only : C_INT, C_INT64_T, C_SHORT + use iso_c_binding, only : C_INT class(SidreView) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims @@ -5284,7 +5762,6 @@ subroutine view_apply_0(obj) end subroutine view_apply_0 subroutine view_apply_nelems(obj, num_elems) - use iso_c_binding, only : C_INT64_T class(SidreView) :: obj integer(SIDRE_IndexType), value, intent(IN) :: num_elems ! splicer begin class.View.method.apply_nelems @@ -5293,7 +5770,6 @@ subroutine view_apply_nelems(obj, num_elems) end subroutine view_apply_nelems subroutine view_apply_nelems_offset(obj, num_elems, offset) - use iso_c_binding, only : C_INT64_T class(SidreView) :: obj integer(SIDRE_IndexType), value, intent(IN) :: num_elems integer(SIDRE_IndexType), value, intent(IN) :: offset @@ -5304,7 +5780,6 @@ end subroutine view_apply_nelems_offset subroutine view_apply_nelems_offset_stride(obj, num_elems, offset, & stride) - use iso_c_binding, only : C_INT64_T class(SidreView) :: obj integer(SIDRE_IndexType), value, intent(IN) :: num_elems integer(SIDRE_IndexType), value, intent(IN) :: offset @@ -5316,7 +5791,6 @@ subroutine view_apply_nelems_offset_stride(obj, num_elems, offset, & end subroutine view_apply_nelems_offset_stride subroutine view_apply_type_nelems(obj, type, num_elems) - use iso_c_binding, only : C_INT64_T, C_SHORT class(SidreView) :: obj integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems @@ -5327,7 +5801,6 @@ end subroutine view_apply_type_nelems subroutine view_apply_type_nelems_offset(obj, type, num_elems, & offset) - use iso_c_binding, only : C_INT64_T, C_SHORT class(SidreView) :: obj integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems @@ -5340,7 +5813,6 @@ end subroutine view_apply_type_nelems_offset subroutine view_apply_type_nelems_offset_stride(obj, type, & num_elems, offset, stride) - use iso_c_binding, only : C_INT64_T, C_SHORT class(SidreView) :: obj integer(TypeID), value, intent(IN) :: type integer(SIDRE_IndexType), value, intent(IN) :: num_elems @@ -5353,7 +5825,7 @@ subroutine view_apply_type_nelems_offset_stride(obj, type, & end subroutine view_apply_type_nelems_offset_stride subroutine view_apply_type_shape(obj, type, ndims, shape) - use iso_c_binding, only : C_INT, C_INT64_T, C_SHORT + use iso_c_binding, only : C_INT class(SidreView) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims @@ -5404,8 +5876,10 @@ subroutine view_set_string(obj, value) class(SidreView) :: obj character(len=*), intent(IN) :: value ! splicer begin class.View.method.set_string + integer(C_INT) SHT_value_len + SHT_value_len = len(value, kind=C_INT) call c_view_set_string_bufferify(obj%cxxmem, value, & - len_trim(value, kind=C_INT)) + SHT_value_len) ! splicer end class.View.method.set_string end subroutine view_set_string @@ -5420,33 +5894,33 @@ end subroutine view_set_external_data_ptr_only subroutine view_set_external_data_ptr_type_int32_t(obj, type, & num_elems, external_ptr) - use iso_c_binding, only : C_INT32_T, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT32_T, C_PTR class(SidreView) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT32_T), value, intent(IN) :: num_elems type(C_PTR), intent(IN) :: external_ptr ! splicer begin class.View.method.set_external_data_ptr_type_int32_t - call c_view_set_external_data_ptr_type(obj%cxxmem, type, & - int(num_elems, SIDRE_IndexType), external_ptr) + call c_view_set_external_data_ptr_type_int32_t(obj%cxxmem, type, & + num_elems, external_ptr) ! splicer end class.View.method.set_external_data_ptr_type_int32_t end subroutine view_set_external_data_ptr_type_int32_t subroutine view_set_external_data_ptr_type_int64_t(obj, type, & num_elems, external_ptr) - use iso_c_binding, only : C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT64_T, C_PTR class(SidreView) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT64_T), value, intent(IN) :: num_elems type(C_PTR), intent(IN) :: external_ptr ! splicer begin class.View.method.set_external_data_ptr_type_int64_t - call c_view_set_external_data_ptr_type(obj%cxxmem, type, & - int(num_elems, SIDRE_IndexType), external_ptr) + call c_view_set_external_data_ptr_type_int64_t(obj%cxxmem, type, & + num_elems, external_ptr) ! splicer end class.View.method.set_external_data_ptr_type_int64_t end subroutine view_set_external_data_ptr_type_int64_t subroutine view_set_external_data_ptr_shape(obj, type, ndims, shape, & external_ptr) - use iso_c_binding, only : C_INT, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT, C_PTR class(SidreView) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT), value, intent(IN) :: ndims @@ -5463,8 +5937,9 @@ subroutine view_get_string(obj, name) class(SidreView) :: obj character(len=*), intent(OUT) :: name ! splicer begin class.View.method.get_string - call c_view_get_string_bufferify(obj%cxxmem, name, & - len(name, kind=C_INT)) + integer(C_INT) SHT_name_len + SHT_name_len = len(name, kind=C_INT) + call c_view_get_string_bufferify(obj%cxxmem, name, SHT_name_len) ! splicer end class.View.method.get_string end subroutine view_get_string @@ -5532,8 +6007,10 @@ function view_rename(obj, new_name) & character(len=*), intent(IN) :: new_name logical :: SHT_rv ! splicer begin class.View.method.rename + integer(C_INT) SHT_new_name_len + SHT_new_name_len = len(new_name, kind=C_INT) SHT_rv = c_view_rename_bufferify(obj%cxxmem, new_name, & - len_trim(new_name, kind=C_INT)) + SHT_new_name_len) ! splicer end class.View.method.rename end function view_rename @@ -6535,8 +7012,8 @@ function datastore_new() & result(SHT_rv) use iso_c_binding, only : C_PTR type(SidreDataStore) :: SHT_rv - ! splicer begin class.DataStore.method.new type(C_PTR) :: SHT_prv + ! splicer begin class.DataStore.method.new SHT_prv = c_datastore_new(SHT_rv%cxxmem) ! splicer end class.DataStore.method.new end function datastore_new @@ -6553,8 +7030,8 @@ function datastore_get_root(obj) & use iso_c_binding, only : C_PTR class(SidreDataStore) :: obj type(SidreGroup) :: SHT_rv - ! splicer begin class.DataStore.method.get_root type(C_PTR) :: SHT_prv + ! splicer begin class.DataStore.method.get_root SHT_prv = c_datastore_get_root(obj%cxxmem, SHT_rv%cxxmem) ! splicer end class.DataStore.method.get_root end function datastore_get_root @@ -6571,14 +7048,14 @@ end function datastore_get_num_buffers function datastore_get_buffer_int32_t(obj, idx) & result(SHT_rv) - use iso_c_binding, only : C_INT32_T, C_INT64_T, C_PTR + use iso_c_binding, only : C_INT32_T, C_PTR class(SidreDataStore) :: obj integer(C_INT32_T), value, intent(IN) :: idx type(SidreBuffer) :: SHT_rv - ! splicer begin class.DataStore.method.get_buffer_int32_t type(C_PTR) :: SHT_prv - SHT_prv = c_datastore_get_buffer(obj%cxxmem, & - int(idx, SIDRE_IndexType), SHT_rv%cxxmem) + ! splicer begin class.DataStore.method.get_buffer_int32_t + SHT_prv = c_datastore_get_buffer_int32_t(obj%cxxmem, idx, & + SHT_rv%cxxmem) ! splicer end class.DataStore.method.get_buffer_int32_t end function datastore_get_buffer_int32_t @@ -6588,10 +7065,10 @@ function datastore_get_buffer_int64_t(obj, idx) & class(SidreDataStore) :: obj integer(C_INT64_T), value, intent(IN) :: idx type(SidreBuffer) :: SHT_rv - ! splicer begin class.DataStore.method.get_buffer_int64_t type(C_PTR) :: SHT_prv - SHT_prv = c_datastore_get_buffer(obj%cxxmem, & - int(idx, SIDRE_IndexType), SHT_rv%cxxmem) + ! splicer begin class.DataStore.method.get_buffer_int64_t + SHT_prv = c_datastore_get_buffer_int64_t(obj%cxxmem, idx, & + SHT_rv%cxxmem) ! splicer end class.DataStore.method.get_buffer_int64_t end function datastore_get_buffer_int64_t @@ -6600,8 +7077,8 @@ function datastore_create_buffer_empty(obj) & use iso_c_binding, only : C_PTR class(SidreDataStore) :: obj type(SidreBuffer) :: SHT_rv - ! splicer begin class.DataStore.method.create_buffer_empty type(C_PTR) :: SHT_prv + ! splicer begin class.DataStore.method.create_buffer_empty SHT_prv = c_datastore_create_buffer_empty(obj%cxxmem, & SHT_rv%cxxmem) ! splicer end class.DataStore.method.create_buffer_empty @@ -6610,35 +7087,35 @@ end function datastore_create_buffer_empty function datastore_create_buffer_from_type_int32_t(obj, type, & num_elems) & result(SHT_rv) - use iso_c_binding, only : C_INT32_T, C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT32_T, C_PTR class(SidreDataStore) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT32_T), value, intent(IN) :: num_elems type(SidreBuffer) :: SHT_rv - ! splicer begin class.DataStore.method.create_buffer_from_type_int32_t type(C_PTR) :: SHT_prv - SHT_prv = c_datastore_create_buffer_from_type(obj%cxxmem, type, & - int(num_elems, SIDRE_IndexType), SHT_rv%cxxmem) + ! splicer begin class.DataStore.method.create_buffer_from_type_int32_t + SHT_prv = c_datastore_create_buffer_from_type_int32_t(obj%cxxmem, & + type, num_elems, SHT_rv%cxxmem) ! splicer end class.DataStore.method.create_buffer_from_type_int32_t end function datastore_create_buffer_from_type_int32_t function datastore_create_buffer_from_type_int64_t(obj, type, & num_elems) & result(SHT_rv) - use iso_c_binding, only : C_INT64_T, C_PTR, C_SHORT + use iso_c_binding, only : C_INT64_T, C_PTR class(SidreDataStore) :: obj integer(TypeID), value, intent(IN) :: type integer(C_INT64_T), value, intent(IN) :: num_elems type(SidreBuffer) :: SHT_rv - ! splicer begin class.DataStore.method.create_buffer_from_type_int64_t type(C_PTR) :: SHT_prv - SHT_prv = c_datastore_create_buffer_from_type(obj%cxxmem, type, & - int(num_elems, SIDRE_IndexType), SHT_rv%cxxmem) + ! splicer begin class.DataStore.method.create_buffer_from_type_int64_t + SHT_prv = c_datastore_create_buffer_from_type_int64_t(obj%cxxmem, & + type, num_elems, SHT_rv%cxxmem) ! splicer end class.DataStore.method.create_buffer_from_type_int64_t end function datastore_create_buffer_from_type_int64_t subroutine datastore_destroy_buffer_int32_t(obj, id) - use iso_c_binding, only : C_INT32_T, C_INT64_T + use iso_c_binding, only : C_INT32_T class(SidreDataStore) :: obj integer(C_INT32_T), value, intent(IN) :: id ! splicer begin class.DataStore.method.destroy_buffer_int32_t @@ -6668,10 +7145,16 @@ function datastore_generate_blueprint_index_0(obj, domain_path, & integer(C_INT), value, intent(IN) :: num_domains logical :: SHT_rv ! splicer begin class.DataStore.method.generate_blueprint_index_0 + integer(C_INT) SHT_domain_path_len + integer(C_INT) SHT_mesh_name_len + integer(C_INT) SHT_index_path_len + SHT_domain_path_len = len(domain_path, kind=C_INT) + SHT_mesh_name_len = len(mesh_name, kind=C_INT) + SHT_index_path_len = len(index_path, kind=C_INT) SHT_rv = c_datastore_generate_blueprint_index_0_bufferify(obj%cxxmem, & - domain_path, len_trim(domain_path, kind=C_INT), mesh_name, & - len_trim(mesh_name, kind=C_INT), index_path, & - len_trim(index_path, kind=C_INT), num_domains) + domain_path, SHT_domain_path_len, mesh_name, & + SHT_mesh_name_len, index_path, SHT_index_path_len, & + num_domains) ! splicer end class.DataStore.method.generate_blueprint_index_0 end function datastore_generate_blueprint_index_0 @@ -6687,10 +7170,15 @@ function datastore_generate_blueprint_index_1(obj, comm, & character(len=*), intent(IN) :: index_path logical :: SHT_rv ! splicer begin class.DataStore.method.generate_blueprint_index_1 + integer(C_INT) SHT_domain_path_len + integer(C_INT) SHT_mesh_name_len + integer(C_INT) SHT_index_path_len + SHT_domain_path_len = len(domain_path, kind=C_INT) + SHT_mesh_name_len = len(mesh_name, kind=C_INT) + SHT_index_path_len = len(index_path, kind=C_INT) SHT_rv = c_datastore_generate_blueprint_index_1_bufferify(obj%cxxmem, & - comm, domain_path, len_trim(domain_path, kind=C_INT), & - mesh_name, len_trim(mesh_name, kind=C_INT), index_path, & - len_trim(index_path, kind=C_INT)) + comm, domain_path, SHT_domain_path_len, mesh_name, & + SHT_mesh_name_len, index_path, SHT_index_path_len) ! splicer end class.DataStore.method.generate_blueprint_index_1 end function datastore_generate_blueprint_index_1 #endif diff --git a/src/axom/sidre/interface/yaml/sidre_types.yaml b/src/axom/sidre/interface/yaml/sidre_types.yaml index 88f07abb4a..fe29d8e60a 100644 --- a/src/axom/sidre/interface/yaml/sidre_types.yaml +++ b/src/axom/sidre/interface/yaml/sidre_types.yaml @@ -1,5 +1,5 @@ # sidre_types.yaml -# This file is generated by Shroud 0.12.2. Do not edit. +# This file is generated by Shroud 0.13.0. Do not edit. # # Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. @@ -19,7 +19,7 @@ typemap: c_type: SIDRE_Buffer f_module_name: axom_sidre f_derived_type: SidreBuffer - f_capsule_data_type: SIDRE_SHROUD_buffer_capsule + f_capsule_data_type: SIDRE_SHROUD_capsule_data f_to_c: "{f_var}%cxxmem" - type: DataStore fields: @@ -29,7 +29,7 @@ typemap: c_type: SIDRE_DataStore f_module_name: axom_sidre f_derived_type: SidreDataStore - f_capsule_data_type: SIDRE_SHROUD_datastore_capsule + f_capsule_data_type: SIDRE_SHROUD_capsule_data f_to_c: "{f_var}%cxxmem" - type: Group fields: @@ -39,7 +39,7 @@ typemap: c_type: SIDRE_Group f_module_name: axom_sidre f_derived_type: SidreGroup - f_capsule_data_type: SIDRE_SHROUD_group_capsule + f_capsule_data_type: SIDRE_SHROUD_capsule_data f_to_c: "{f_var}%cxxmem" - type: View fields: @@ -49,5 +49,5 @@ typemap: c_type: SIDRE_View f_module_name: axom_sidre f_derived_type: SidreView - f_capsule_data_type: SIDRE_SHROUD_view_capsule + f_capsule_data_type: SIDRE_SHROUD_capsule_data f_to_c: "{f_var}%cxxmem" diff --git a/src/axom/sidre/spio/interface/c_fortran/typesSPIO.h b/src/axom/sidre/spio/interface/c_fortran/typesSPIO.h index 205518a7af..0ee164a32c 100644 --- a/src/axom/sidre/spio/interface/c_fortran/typesSPIO.h +++ b/src/axom/sidre/spio/interface/c_fortran/typesSPIO.h @@ -1,5 +1,5 @@ // typesSPIO.h -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -10,14 +10,20 @@ #ifndef TYPESSPIO_H #define TYPESSPIO_H +// splicer begin types.CXX_declarations +// splicer end types.CXX_declarations + #ifdef __cplusplus extern "C" { #endif +// splicer begin types.C_declarations +// splicer end types.C_declarations + // helper capsule_SPIO_IOManager struct s_SPIO_IOManager { - void* addr; /* address of C++ memory */ + void *addr; /* address of C++ memory */ int idtor; /* index of destructor */ }; typedef struct s_SPIO_IOManager SPIO_IOManager; @@ -25,12 +31,12 @@ typedef struct s_SPIO_IOManager SPIO_IOManager; // helper capsule_data_helper struct s_SPIO_SHROUD_capsule_data { - void* addr; /* address of C++ memory */ + void *addr; /* address of C++ memory */ int idtor; /* index of destructor */ }; typedef struct s_SPIO_SHROUD_capsule_data SPIO_SHROUD_capsule_data; -void SPIO_SHROUD_memory_destructor(SPIO_SHROUD_capsule_data* cap); +void SPIO_SHROUD_memory_destructor(SPIO_SHROUD_capsule_data *cap); #ifdef __cplusplus } diff --git a/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.cpp b/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.cpp index 5a8e0cd9ac..a87101c6a9 100644 --- a/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.cpp +++ b/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.cpp @@ -1,20 +1,39 @@ // wrapIOManager.cpp -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) -#include "wrapIOManager.h" -#include -#include + #include "axom/sidre/spio/IOManager.hpp" +#include +#include +#include "wrapIOManager.h" // splicer begin class.IOManager.CXX_definitions // splicer end class.IOManager.CXX_definitions extern "C" { +// helper ShroudLenTrim +// Returns the length of character string src with length nsrc, +// ignoring any trailing blanks. +static int ShroudLenTrim(const char *src, int nsrc) +{ + int i; + + for(i = nsrc - 1; i >= 0; i--) + { + if(src[i] != ' ') + { + break; + } + } + + return i + 1; +} + // splicer begin class.IOManager.C_definitions // splicer end class.IOManager.C_definitions @@ -73,18 +92,21 @@ void SPIO_IOManager_write_0(SPIO_IOManager *self, void SPIO_IOManager_write_0_bufferify(SPIO_IOManager *self, SIDRE_Group *group, int num_files, - const char *file_string, - int Lfile_string, - const char *protocol, - int Lprotocol) + char *file_string, + int SHT_file_string_len, + char *protocol, + int SHT_protocol_len) { axom::sidre::IOManager *SH_this = static_cast(self->addr); // splicer begin class.IOManager.method.write_0_bufferify axom::sidre::Group *SHCXX_group = static_cast(group->addr); - const std::string SHCXX_file_string(file_string, Lfile_string); - const std::string SHCXX_protocol(protocol, Lprotocol); + const std::string SHCXX_file_string( + file_string, + ShroudLenTrim(file_string, SHT_file_string_len)); + const std::string SHCXX_protocol(protocol, + ShroudLenTrim(protocol, SHT_protocol_len)); SH_this->write(SHCXX_group, num_files, SHCXX_file_string, SHCXX_protocol); // splicer end class.IOManager.method.write_0_bufferify } @@ -115,21 +137,26 @@ void SPIO_IOManager_write_1(SPIO_IOManager *self, void SPIO_IOManager_write_1_bufferify(SPIO_IOManager *self, SIDRE_Group *group, int num_files, - const char *file_string, - int Lfile_string, - const char *protocol, - int Lprotocol, - const char *tree_pattern, - int Ltree_pattern) + char *file_string, + int SHT_file_string_len, + char *protocol, + int SHT_protocol_len, + char *tree_pattern, + int SHT_tree_pattern_len) { axom::sidre::IOManager *SH_this = static_cast(self->addr); // splicer begin class.IOManager.method.write_1_bufferify axom::sidre::Group *SHCXX_group = static_cast(group->addr); - const std::string SHCXX_file_string(file_string, Lfile_string); - const std::string SHCXX_protocol(protocol, Lprotocol); - const std::string SHCXX_tree_pattern(tree_pattern, Ltree_pattern); + const std::string SHCXX_file_string( + file_string, + ShroudLenTrim(file_string, SHT_file_string_len)); + const std::string SHCXX_protocol(protocol, + ShroudLenTrim(protocol, SHT_protocol_len)); + const std::string SHCXX_tree_pattern( + tree_pattern, + ShroudLenTrim(tree_pattern, SHT_tree_pattern_len)); SH_this->write(SHCXX_group, num_files, SHCXX_file_string, @@ -138,44 +165,45 @@ void SPIO_IOManager_write_1_bufferify(SPIO_IOManager *self, // splicer end class.IOManager.method.write_1_bufferify } -void SPIO_IOManager_write_group_to_root_file(SPIO_IOManager *self, - SIDRE_Group *group, - const char *file_name) +void SPIO_IOManager_writeGroupToRootFile(SPIO_IOManager *self, + SIDRE_Group *group, + const char *file_name) { axom::sidre::IOManager *SH_this = static_cast(self->addr); - // splicer begin class.IOManager.method.write_group_to_root_file + // splicer begin class.IOManager.method.writeGroupToRootFile axom::sidre::Group *SHCXX_group = static_cast(group->addr); const std::string SHCXX_file_name(file_name); SH_this->writeGroupToRootFile(SHCXX_group, SHCXX_file_name); - // splicer end class.IOManager.method.write_group_to_root_file + // splicer end class.IOManager.method.writeGroupToRootFile } -void SPIO_IOManager_write_group_to_root_file_bufferify(SPIO_IOManager *self, - SIDRE_Group *group, - const char *file_name, - int Lfile_name) +void SPIO_IOManager_writeGroupToRootFile_bufferify(SPIO_IOManager *self, + SIDRE_Group *group, + char *file_name, + int SHT_file_name_len) { axom::sidre::IOManager *SH_this = static_cast(self->addr); - // splicer begin class.IOManager.method.write_group_to_root_file_bufferify + // splicer begin class.IOManager.method.writeGroupToRootFile_bufferify axom::sidre::Group *SHCXX_group = static_cast(group->addr); - const std::string SHCXX_file_name(file_name, Lfile_name); + const std::string SHCXX_file_name(file_name, + ShroudLenTrim(file_name, SHT_file_name_len)); SH_this->writeGroupToRootFile(SHCXX_group, SHCXX_file_name); - // splicer end class.IOManager.method.write_group_to_root_file_bufferify + // splicer end class.IOManager.method.writeGroupToRootFile_bufferify } -void SPIO_IOManager_write_blueprint_index_to_root_file(SPIO_IOManager *self, - SIDRE_DataStore *datastore, - const char *domain_path, - const char *file_name, - const char *mesh_path) +void SPIO_IOManager_writeBlueprintIndexToRootFile(SPIO_IOManager *self, + SIDRE_DataStore *datastore, + const char *domain_path, + const char *file_name, + const char *mesh_path) { axom::sidre::IOManager *SH_this = static_cast(self->addr); - // splicer begin class.IOManager.method.write_blueprint_index_to_root_file + // splicer begin class.IOManager.method.writeBlueprintIndexToRootFile axom::sidre::DataStore *SHCXX_datastore = static_cast(datastore->addr); const std::string SHCXX_domain_path(domain_path); @@ -185,32 +213,36 @@ void SPIO_IOManager_write_blueprint_index_to_root_file(SPIO_IOManager *self, SHCXX_domain_path, SHCXX_file_name, SHCXX_mesh_path); - // splicer end class.IOManager.method.write_blueprint_index_to_root_file + // splicer end class.IOManager.method.writeBlueprintIndexToRootFile } -void SPIO_IOManager_write_blueprint_index_to_root_file_bufferify( +void SPIO_IOManager_writeBlueprintIndexToRootFile_bufferify( SPIO_IOManager *self, SIDRE_DataStore *datastore, - const char *domain_path, - int Ldomain_path, - const char *file_name, - int Lfile_name, - const char *mesh_path, - int Lmesh_path) + char *domain_path, + int SHT_domain_path_len, + char *file_name, + int SHT_file_name_len, + char *mesh_path, + int SHT_mesh_path_len) { axom::sidre::IOManager *SH_this = static_cast(self->addr); - // splicer begin class.IOManager.method.write_blueprint_index_to_root_file_bufferify + // splicer begin class.IOManager.method.writeBlueprintIndexToRootFile_bufferify axom::sidre::DataStore *SHCXX_datastore = static_cast(datastore->addr); - const std::string SHCXX_domain_path(domain_path, Ldomain_path); - const std::string SHCXX_file_name(file_name, Lfile_name); - const std::string SHCXX_mesh_path(mesh_path, Lmesh_path); + const std::string SHCXX_domain_path( + domain_path, + ShroudLenTrim(domain_path, SHT_domain_path_len)); + const std::string SHCXX_file_name(file_name, + ShroudLenTrim(file_name, SHT_file_name_len)); + const std::string SHCXX_mesh_path(mesh_path, + ShroudLenTrim(mesh_path, SHT_mesh_path_len)); SH_this->writeBlueprintIndexToRootFile(SHCXX_datastore, SHCXX_domain_path, SHCXX_file_name, SHCXX_mesh_path); - // splicer end class.IOManager.method.write_blueprint_index_to_root_file_bufferify + // splicer end class.IOManager.method.writeBlueprintIndexToRootFile_bufferify } void SPIO_IOManager_read_0(SPIO_IOManager *self, @@ -231,18 +263,21 @@ void SPIO_IOManager_read_0(SPIO_IOManager *self, void SPIO_IOManager_read_0_bufferify(SPIO_IOManager *self, SIDRE_Group *group, - const char *file_string, - int Lfile_string, - const char *protocol, - int Lprotocol) + char *file_string, + int SHT_file_string_len, + char *protocol, + int SHT_protocol_len) { axom::sidre::IOManager *SH_this = static_cast(self->addr); // splicer begin class.IOManager.method.read_0_bufferify axom::sidre::Group *SHCXX_group = static_cast(group->addr); - const std::string SHCXX_file_string(file_string, Lfile_string); - const std::string SHCXX_protocol(protocol, Lprotocol); + const std::string SHCXX_file_string( + file_string, + ShroudLenTrim(file_string, SHT_file_string_len)); + const std::string SHCXX_protocol(protocol, + ShroudLenTrim(protocol, SHT_protocol_len)); SH_this->read(SHCXX_group, SHCXX_file_string, SHCXX_protocol); // splicer end class.IOManager.method.read_0_bufferify } @@ -266,10 +301,10 @@ void SPIO_IOManager_read_1(SPIO_IOManager *self, void SPIO_IOManager_read_1_bufferify(SPIO_IOManager *self, SIDRE_Group *group, - const char *file_string, - int Lfile_string, - const char *protocol, - int Lprotocol, + char *file_string, + int SHT_file_string_len, + char *protocol, + int SHT_protocol_len, bool preserve_contents) { axom::sidre::IOManager *SH_this = @@ -277,8 +312,11 @@ void SPIO_IOManager_read_1_bufferify(SPIO_IOManager *self, // splicer begin class.IOManager.method.read_1_bufferify axom::sidre::Group *SHCXX_group = static_cast(group->addr); - const std::string SHCXX_file_string(file_string, Lfile_string); - const std::string SHCXX_protocol(protocol, Lprotocol); + const std::string SHCXX_file_string( + file_string, + ShroudLenTrim(file_string, SHT_file_string_len)); + const std::string SHCXX_protocol(protocol, + ShroudLenTrim(protocol, SHT_protocol_len)); SH_this->read(SHCXX_group, SHCXX_file_string, SHCXX_protocol, preserve_contents); // splicer end class.IOManager.method.read_1_bufferify } @@ -299,15 +337,16 @@ void SPIO_IOManager_read_2(SPIO_IOManager *self, void SPIO_IOManager_read_2_bufferify(SPIO_IOManager *self, SIDRE_Group *group, - const char *root_file, - int Lroot_file) + char *root_file, + int SHT_root_file_len) { axom::sidre::IOManager *SH_this = static_cast(self->addr); // splicer begin class.IOManager.method.read_2_bufferify axom::sidre::Group *SHCXX_group = static_cast(group->addr); - const std::string SHCXX_root_file(root_file, Lroot_file); + const std::string SHCXX_root_file(root_file, + ShroudLenTrim(root_file, SHT_root_file_len)); SH_this->read(SHCXX_group, SHCXX_root_file); // splicer end class.IOManager.method.read_2_bufferify } @@ -329,8 +368,8 @@ void SPIO_IOManager_read_3(SPIO_IOManager *self, void SPIO_IOManager_read_3_bufferify(SPIO_IOManager *self, SIDRE_Group *group, - const char *root_file, - int Lroot_file, + char *root_file, + int SHT_root_file_len, bool preserve_contents) { axom::sidre::IOManager *SH_this = @@ -338,38 +377,40 @@ void SPIO_IOManager_read_3_bufferify(SPIO_IOManager *self, // splicer begin class.IOManager.method.read_3_bufferify axom::sidre::Group *SHCXX_group = static_cast(group->addr); - const std::string SHCXX_root_file(root_file, Lroot_file); + const std::string SHCXX_root_file(root_file, + ShroudLenTrim(root_file, SHT_root_file_len)); SH_this->read(SHCXX_group, SHCXX_root_file, preserve_contents); // splicer end class.IOManager.method.read_3_bufferify } -void SPIO_IOManager_load_external_data(SPIO_IOManager *self, - SIDRE_Group *group, - const char *root_file) +void SPIO_IOManager_loadExternalData(SPIO_IOManager *self, + SIDRE_Group *group, + const char *root_file) { axom::sidre::IOManager *SH_this = static_cast(self->addr); - // splicer begin class.IOManager.method.load_external_data + // splicer begin class.IOManager.method.loadExternalData axom::sidre::Group *SHCXX_group = static_cast(group->addr); const std::string SHCXX_root_file(root_file); SH_this->loadExternalData(SHCXX_group, SHCXX_root_file); - // splicer end class.IOManager.method.load_external_data + // splicer end class.IOManager.method.loadExternalData } -void SPIO_IOManager_load_external_data_bufferify(SPIO_IOManager *self, - SIDRE_Group *group, - const char *root_file, - int Lroot_file) +void SPIO_IOManager_loadExternalData_bufferify(SPIO_IOManager *self, + SIDRE_Group *group, + char *root_file, + int SHT_root_file_len) { axom::sidre::IOManager *SH_this = static_cast(self->addr); - // splicer begin class.IOManager.method.load_external_data_bufferify + // splicer begin class.IOManager.method.loadExternalData_bufferify axom::sidre::Group *SHCXX_group = static_cast(group->addr); - const std::string SHCXX_root_file(root_file, Lroot_file); + const std::string SHCXX_root_file(root_file, + ShroudLenTrim(root_file, SHT_root_file_len)); SH_this->loadExternalData(SHCXX_group, SHCXX_root_file); - // splicer end class.IOManager.method.load_external_data_bufferify + // splicer end class.IOManager.method.loadExternalData_bufferify } } // extern "C" diff --git a/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.h b/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.h index 3f6c5b9518..ede7785883 100644 --- a/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.h +++ b/src/axom/sidre/spio/interface/c_fortran/wrapIOManager.h @@ -1,5 +1,5 @@ // wrapIOManager.h -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -14,13 +14,13 @@ #ifndef WRAPIOMANAGER_H #define WRAPIOMANAGER_H -#include "axom/sidre/interface/c_fortran/wrapDataStore.h" #include "axom/sidre/interface/c_fortran/wrapGroup.h" +#include "axom/sidre/interface/c_fortran/wrapDataStore.h" #include "mpi.h" -#include "typesSPIO.h" #ifndef __cplusplus #include #endif +#include "typesSPIO.h" // splicer begin class.IOManager.CXX_declarations // splicer end class.IOManager.CXX_declarations @@ -32,124 +32,124 @@ extern "C" { // splicer begin class.IOManager.C_declarations // splicer end class.IOManager.C_declarations -SPIO_IOManager* SPIO_IOManager_ctor_default(MPI_Fint com, SPIO_IOManager* SHC_rv); +SPIO_IOManager *SPIO_IOManager_ctor_default(MPI_Fint com, SPIO_IOManager *SHC_rv); -SPIO_IOManager* SPIO_IOManager_ctor_usescr(MPI_Fint com, +SPIO_IOManager *SPIO_IOManager_ctor_usescr(MPI_Fint com, bool use_scr, - SPIO_IOManager* SHC_rv); + SPIO_IOManager *SHC_rv); -void SPIO_IOManager_delete(SPIO_IOManager* self); +void SPIO_IOManager_delete(SPIO_IOManager *self); -void SPIO_IOManager_write_0(SPIO_IOManager* self, - SIDRE_Group* group, +void SPIO_IOManager_write_0(SPIO_IOManager *self, + SIDRE_Group *group, int num_files, - const char* file_string, - const char* protocol); + const char *file_string, + const char *protocol); -void SPIO_IOManager_write_0_bufferify(SPIO_IOManager* self, - SIDRE_Group* group, +void SPIO_IOManager_write_0_bufferify(SPIO_IOManager *self, + SIDRE_Group *group, int num_files, - const char* file_string, - int Lfile_string, - const char* protocol, - int Lprotocol); + char *file_string, + int SHT_file_string_len, + char *protocol, + int SHT_protocol_len); -void SPIO_IOManager_write_1(SPIO_IOManager* self, - SIDRE_Group* group, +void SPIO_IOManager_write_1(SPIO_IOManager *self, + SIDRE_Group *group, int num_files, - const char* file_string, - const char* protocol, - const char* tree_pattern); + const char *file_string, + const char *protocol, + const char *tree_pattern); -void SPIO_IOManager_write_1_bufferify(SPIO_IOManager* self, - SIDRE_Group* group, +void SPIO_IOManager_write_1_bufferify(SPIO_IOManager *self, + SIDRE_Group *group, int num_files, - const char* file_string, - int Lfile_string, - const char* protocol, - int Lprotocol, - const char* tree_pattern, - int Ltree_pattern); - -void SPIO_IOManager_write_group_to_root_file(SPIO_IOManager* self, - SIDRE_Group* group, - const char* file_name); - -void SPIO_IOManager_write_group_to_root_file_bufferify(SPIO_IOManager* self, - SIDRE_Group* group, - const char* file_name, - int Lfile_name); - -void SPIO_IOManager_write_blueprint_index_to_root_file(SPIO_IOManager* self, - SIDRE_DataStore* datastore, - const char* domain_path, - const char* file_name, - const char* mesh_path); - -void SPIO_IOManager_write_blueprint_index_to_root_file_bufferify( - SPIO_IOManager* self, - SIDRE_DataStore* datastore, - const char* domain_path, - int Ldomain_path, - const char* file_name, - int Lfile_name, - const char* mesh_path, - int Lmesh_path); - -void SPIO_IOManager_read_0(SPIO_IOManager* self, - SIDRE_Group* group, - const char* file_string, - const char* protocol); - -void SPIO_IOManager_read_0_bufferify(SPIO_IOManager* self, - SIDRE_Group* group, - const char* file_string, - int Lfile_string, - const char* protocol, - int Lprotocol); - -void SPIO_IOManager_read_1(SPIO_IOManager* self, - SIDRE_Group* group, - const char* file_string, - const char* protocol, + char *file_string, + int SHT_file_string_len, + char *protocol, + int SHT_protocol_len, + char *tree_pattern, + int SHT_tree_pattern_len); + +void SPIO_IOManager_writeGroupToRootFile(SPIO_IOManager *self, + SIDRE_Group *group, + const char *file_name); + +void SPIO_IOManager_writeGroupToRootFile_bufferify(SPIO_IOManager *self, + SIDRE_Group *group, + char *file_name, + int SHT_file_name_len); + +void SPIO_IOManager_writeBlueprintIndexToRootFile(SPIO_IOManager *self, + SIDRE_DataStore *datastore, + const char *domain_path, + const char *file_name, + const char *mesh_path); + +void SPIO_IOManager_writeBlueprintIndexToRootFile_bufferify( + SPIO_IOManager *self, + SIDRE_DataStore *datastore, + char *domain_path, + int SHT_domain_path_len, + char *file_name, + int SHT_file_name_len, + char *mesh_path, + int SHT_mesh_path_len); + +void SPIO_IOManager_read_0(SPIO_IOManager *self, + SIDRE_Group *group, + const char *file_string, + const char *protocol); + +void SPIO_IOManager_read_0_bufferify(SPIO_IOManager *self, + SIDRE_Group *group, + char *file_string, + int SHT_file_string_len, + char *protocol, + int SHT_protocol_len); + +void SPIO_IOManager_read_1(SPIO_IOManager *self, + SIDRE_Group *group, + const char *file_string, + const char *protocol, bool preserve_contents); -void SPIO_IOManager_read_1_bufferify(SPIO_IOManager* self, - SIDRE_Group* group, - const char* file_string, - int Lfile_string, - const char* protocol, - int Lprotocol, +void SPIO_IOManager_read_1_bufferify(SPIO_IOManager *self, + SIDRE_Group *group, + char *file_string, + int SHT_file_string_len, + char *protocol, + int SHT_protocol_len, bool preserve_contents); -void SPIO_IOManager_read_2(SPIO_IOManager* self, - SIDRE_Group* group, - const char* root_file); +void SPIO_IOManager_read_2(SPIO_IOManager *self, + SIDRE_Group *group, + const char *root_file); -void SPIO_IOManager_read_2_bufferify(SPIO_IOManager* self, - SIDRE_Group* group, - const char* root_file, - int Lroot_file); +void SPIO_IOManager_read_2_bufferify(SPIO_IOManager *self, + SIDRE_Group *group, + char *root_file, + int SHT_root_file_len); -void SPIO_IOManager_read_3(SPIO_IOManager* self, - SIDRE_Group* group, - const char* root_file, +void SPIO_IOManager_read_3(SPIO_IOManager *self, + SIDRE_Group *group, + const char *root_file, bool preserve_contents); -void SPIO_IOManager_read_3_bufferify(SPIO_IOManager* self, - SIDRE_Group* group, - const char* root_file, - int Lroot_file, +void SPIO_IOManager_read_3_bufferify(SPIO_IOManager *self, + SIDRE_Group *group, + char *root_file, + int SHT_root_file_len, bool preserve_contents); -void SPIO_IOManager_load_external_data(SPIO_IOManager* self, - SIDRE_Group* group, - const char* root_file); +void SPIO_IOManager_loadExternalData(SPIO_IOManager *self, + SIDRE_Group *group, + const char *root_file); -void SPIO_IOManager_load_external_data_bufferify(SPIO_IOManager* self, - SIDRE_Group* group, - const char* root_file, - int Lroot_file); +void SPIO_IOManager_loadExternalData_bufferify(SPIO_IOManager *self, + SIDRE_Group *group, + char *root_file, + int SHT_root_file_len); #ifdef __cplusplus } diff --git a/src/axom/sidre/spio/interface/c_fortran/wrapfspio.f b/src/axom/sidre/spio/interface/c_fortran/wrapfspio.f index 63815f3c4b..8ce06a09a0 100644 --- a/src/axom/sidre/spio/interface/c_fortran/wrapfspio.f +++ b/src/axom/sidre/spio/interface/c_fortran/wrapfspio.f @@ -1,5 +1,5 @@ ! wrapfspio.f -! This file is generated by Shroud 0.12.2. Do not edit. +! This file is generated by Shroud 0.13.0. Do not edit. ! ! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. @@ -20,29 +20,30 @@ module axom_spio ! splicer begin module_top ! splicer end module_top - type, bind(C) :: SPIO_SHROUD_iomanager_capsule + ! helper capsule_data_helper + type, bind(C) :: SPIO_SHROUD_capsule_data type(C_PTR) :: addr = C_NULL_PTR ! address of C++ memory integer(C_INT) :: idtor = 0 ! index of destructor - end type SPIO_SHROUD_iomanager_capsule + end type SPIO_SHROUD_capsule_data type iomanager - type(SPIO_SHROUD_iomanager_capsule) :: cxxmem + type(SPIO_SHROUD_capsule_data) :: cxxmem ! splicer begin class.IOManager.component_part ! splicer end class.IOManager.component_part contains - procedure :: delete => iomanager_delete - procedure :: write_0 => iomanager_write_0 - procedure :: write_1 => iomanager_write_1 - procedure :: write_group_to_root_file => iomanager_write_group_to_root_file - procedure :: write_blueprint_index_to_root_file => iomanager_write_blueprint_index_to_root_file - procedure :: read_0 => iomanager_read_0 - procedure :: read_1 => iomanager_read_1 - procedure :: read_2 => iomanager_read_2 - procedure :: read_3 => iomanager_read_3 - procedure :: load_external_data => iomanager_load_external_data - procedure :: get_instance => iomanager_get_instance - procedure :: set_instance => iomanager_set_instance - procedure :: associated => iomanager_associated + procedure :: delete => io_manager_delete + procedure :: write_0 => io_manager_write_0 + procedure :: write_1 => io_manager_write_1 + procedure :: write_group_to_root_file => io_manager_write_group_to_root_file + procedure :: write_blueprint_index_to_root_file => io_manager_write_blueprint_index_to_root_file + procedure :: read_0 => io_manager_read_0 + procedure :: read_1 => io_manager_read_1 + procedure :: read_2 => io_manager_read_2 + procedure :: read_3 => io_manager_read_3 + procedure :: load_external_data => io_manager_load_external_data + procedure :: get_instance => io_manager_get_instance + procedure :: set_instance => io_manager_set_instance + procedure :: associated => io_manager_associated generic :: read => read_0, read_1, read_2, read_3 generic :: write => write_0, write_1 ! splicer begin class.IOManager.type_bound_procedure_part @@ -50,349 +51,361 @@ module axom_spio end type iomanager interface operator (.eq.) - module procedure iomanager_eq + module procedure io_manager_eq end interface interface operator (.ne.) - module procedure iomanager_ne + module procedure io_manager_ne end interface interface - function c_iomanager_ctor_default(com, SHT_crv) & - result(SHT_rv) & + function c_io_manager_ctor_default(com, SHT_rv) & + result(SHT_prv) & bind(C, name="SPIO_IOManager_ctor_default") use iso_c_binding, only : C_INT, C_PTR - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none integer(C_INT), value, intent(IN) :: com - type(SPIO_SHROUD_iomanager_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv - end function c_iomanager_ctor_default + type(SPIO_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) SHT_prv + end function c_io_manager_ctor_default - function c_iomanager_ctor_usescr(com, use_scr, SHT_crv) & - result(SHT_rv) & + function c_io_manager_ctor_usescr(com, use_scr, SHT_rv) & + result(SHT_prv) & bind(C, name="SPIO_IOManager_ctor_usescr") use iso_c_binding, only : C_BOOL, C_INT, C_PTR - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none integer(C_INT), value, intent(IN) :: com logical(C_BOOL), value, intent(IN) :: use_scr - type(SPIO_SHROUD_iomanager_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv - end function c_iomanager_ctor_usescr + type(SPIO_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) SHT_prv + end function c_io_manager_ctor_usescr - subroutine c_iomanager_delete(self) & + subroutine c_io_manager_delete(self) & bind(C, name="SPIO_IOManager_delete") - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - end subroutine c_iomanager_delete + type(SPIO_SHROUD_capsule_data), intent(INOUT) :: self + end subroutine c_io_manager_delete - subroutine c_iomanager_write_0(self, group, num_files, & + subroutine c_io_manager_write_0(self, group, num_files, & file_string, protocol) & bind(C, name="SPIO_IOManager_write_0") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR, C_INT - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group integer(C_INT), value, intent(IN) :: num_files character(kind=C_CHAR), intent(IN) :: file_string(*) character(kind=C_CHAR), intent(IN) :: protocol(*) - end subroutine c_iomanager_write_0 + end subroutine c_io_manager_write_0 - subroutine c_iomanager_write_0_bufferify(self, group, num_files, & - file_string, Lfile_string, protocol, Lprotocol) & + subroutine c_io_manager_write_0_bufferify(self, group, & + num_files, file_string, SHT_file_string_len, protocol, & + SHT_protocol_len) & bind(C, name="SPIO_IOManager_write_0_bufferify") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR, C_INT - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group integer(C_INT), value, intent(IN) :: num_files character(kind=C_CHAR), intent(IN) :: file_string(*) - integer(C_INT), value, intent(IN) :: Lfile_string + integer(C_INT), value, intent(IN) :: SHT_file_string_len character(kind=C_CHAR), intent(IN) :: protocol(*) - integer(C_INT), value, intent(IN) :: Lprotocol - end subroutine c_iomanager_write_0_bufferify + integer(C_INT), value, intent(IN) :: SHT_protocol_len + end subroutine c_io_manager_write_0_bufferify - subroutine c_iomanager_write_1(self, group, num_files, & + subroutine c_io_manager_write_1(self, group, num_files, & file_string, protocol, tree_pattern) & bind(C, name="SPIO_IOManager_write_1") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR, C_INT - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group integer(C_INT), value, intent(IN) :: num_files character(kind=C_CHAR), intent(IN) :: file_string(*) character(kind=C_CHAR), intent(IN) :: protocol(*) character(kind=C_CHAR), intent(IN) :: tree_pattern(*) - end subroutine c_iomanager_write_1 + end subroutine c_io_manager_write_1 - subroutine c_iomanager_write_1_bufferify(self, group, num_files, & - file_string, Lfile_string, protocol, Lprotocol, & - tree_pattern, Ltree_pattern) & + subroutine c_io_manager_write_1_bufferify(self, group, & + num_files, file_string, SHT_file_string_len, protocol, & + SHT_protocol_len, tree_pattern, SHT_tree_pattern_len) & bind(C, name="SPIO_IOManager_write_1_bufferify") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR, C_INT - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group integer(C_INT), value, intent(IN) :: num_files character(kind=C_CHAR), intent(IN) :: file_string(*) - integer(C_INT), value, intent(IN) :: Lfile_string + integer(C_INT), value, intent(IN) :: SHT_file_string_len character(kind=C_CHAR), intent(IN) :: protocol(*) - integer(C_INT), value, intent(IN) :: Lprotocol + integer(C_INT), value, intent(IN) :: SHT_protocol_len character(kind=C_CHAR), intent(IN) :: tree_pattern(*) - integer(C_INT), value, intent(IN) :: Ltree_pattern - end subroutine c_iomanager_write_1_bufferify + integer(C_INT), value, intent(IN) :: SHT_tree_pattern_len + end subroutine c_io_manager_write_1_bufferify - subroutine c_iomanager_write_group_to_root_file(self, group, & + subroutine c_io_manager_write_group_to_root_file(self, group, & file_name) & - bind(C, name="SPIO_IOManager_write_group_to_root_file") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + bind(C, name="SPIO_IOManager_writeGroupToRootFile") + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group character(kind=C_CHAR), intent(IN) :: file_name(*) - end subroutine c_iomanager_write_group_to_root_file + end subroutine c_io_manager_write_group_to_root_file - subroutine c_iomanager_write_group_to_root_file_bufferify(self, & - group, file_name, Lfile_name) & - bind(C, name="SPIO_IOManager_write_group_to_root_file_bufferify") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + subroutine c_io_manager_write_group_to_root_file_bufferify(self, & + group, file_name, SHT_file_name_len) & + bind(C, name="SPIO_IOManager_writeGroupToRootFile_bufferify") + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR, C_INT - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group character(kind=C_CHAR), intent(IN) :: file_name(*) - integer(C_INT), value, intent(IN) :: Lfile_name - end subroutine c_iomanager_write_group_to_root_file_bufferify + integer(C_INT), value, intent(IN) :: SHT_file_name_len + end subroutine c_io_manager_write_group_to_root_file_bufferify - subroutine c_iomanager_write_blueprint_index_to_root_file(self, & + subroutine c_io_manager_write_blueprint_index_to_root_file(self, & datastore, domain_path, file_name, mesh_path) & - bind(C, name="SPIO_IOManager_write_blueprint_index_to_root_file") - use axom_sidre, only : SIDRE_SHROUD_datastore_capsule + bind(C, name="SPIO_IOManager_writeBlueprintIndexToRootFile") + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_datastore_capsule), intent(INOUT) :: datastore + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: datastore character(kind=C_CHAR), intent(IN) :: domain_path(*) character(kind=C_CHAR), intent(IN) :: file_name(*) character(kind=C_CHAR), intent(IN) :: mesh_path(*) - end subroutine c_iomanager_write_blueprint_index_to_root_file - - subroutine c_iomanager_write_blueprint_index_to_root_file_bufferify( & - self, datastore, domain_path, Ldomain_path, file_name, & - Lfile_name, mesh_path, Lmesh_path) & - bind(C, name="SPIO_IOManager_write_blueprint_index_to_root_file_bufferify") - use axom_sidre, only : SIDRE_SHROUD_datastore_capsule + end subroutine c_io_manager_write_blueprint_index_to_root_file + + subroutine c_io_manager_write_blueprint_index_to_root_file_bufferify( & + self, datastore, domain_path, SHT_domain_path_len, & + file_name, SHT_file_name_len, mesh_path, & + SHT_mesh_path_len) & + bind(C, name="SPIO_IOManager_writeBlueprintIndexToRootFile_bufferify") + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR, C_INT - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_datastore_capsule), intent(INOUT) :: datastore + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: datastore character(kind=C_CHAR), intent(IN) :: domain_path(*) - integer(C_INT), value, intent(IN) :: Ldomain_path + integer(C_INT), value, intent(IN) :: SHT_domain_path_len character(kind=C_CHAR), intent(IN) :: file_name(*) - integer(C_INT), value, intent(IN) :: Lfile_name + integer(C_INT), value, intent(IN) :: SHT_file_name_len character(kind=C_CHAR), intent(IN) :: mesh_path(*) - integer(C_INT), value, intent(IN) :: Lmesh_path - end subroutine c_iomanager_write_blueprint_index_to_root_file_bufferify + integer(C_INT), value, intent(IN) :: SHT_mesh_path_len + end subroutine c_io_manager_write_blueprint_index_to_root_file_bufferify - subroutine c_iomanager_read_0(self, group, file_string, & + subroutine c_io_manager_read_0(self, group, file_string, & protocol) & bind(C, name="SPIO_IOManager_read_0") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group character(kind=C_CHAR), intent(IN) :: file_string(*) character(kind=C_CHAR), intent(IN) :: protocol(*) - end subroutine c_iomanager_read_0 + end subroutine c_io_manager_read_0 - subroutine c_iomanager_read_0_bufferify(self, group, & - file_string, Lfile_string, protocol, Lprotocol) & + subroutine c_io_manager_read_0_bufferify(self, group, & + file_string, SHT_file_string_len, protocol, & + SHT_protocol_len) & bind(C, name="SPIO_IOManager_read_0_bufferify") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR, C_INT - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group character(kind=C_CHAR), intent(IN) :: file_string(*) - integer(C_INT), value, intent(IN) :: Lfile_string + integer(C_INT), value, intent(IN) :: SHT_file_string_len character(kind=C_CHAR), intent(IN) :: protocol(*) - integer(C_INT), value, intent(IN) :: Lprotocol - end subroutine c_iomanager_read_0_bufferify + integer(C_INT), value, intent(IN) :: SHT_protocol_len + end subroutine c_io_manager_read_0_bufferify - subroutine c_iomanager_read_1(self, group, file_string, & + subroutine c_io_manager_read_1(self, group, file_string, & protocol, preserve_contents) & bind(C, name="SPIO_IOManager_read_1") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_BOOL, C_CHAR - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group character(kind=C_CHAR), intent(IN) :: file_string(*) character(kind=C_CHAR), intent(IN) :: protocol(*) logical(C_BOOL), value, intent(IN) :: preserve_contents - end subroutine c_iomanager_read_1 + end subroutine c_io_manager_read_1 - subroutine c_iomanager_read_1_bufferify(self, group, & - file_string, Lfile_string, protocol, Lprotocol, & - preserve_contents) & + subroutine c_io_manager_read_1_bufferify(self, group, & + file_string, SHT_file_string_len, protocol, & + SHT_protocol_len, preserve_contents) & bind(C, name="SPIO_IOManager_read_1_bufferify") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_BOOL, C_CHAR, C_INT - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group character(kind=C_CHAR), intent(IN) :: file_string(*) - integer(C_INT), value, intent(IN) :: Lfile_string + integer(C_INT), value, intent(IN) :: SHT_file_string_len character(kind=C_CHAR), intent(IN) :: protocol(*) - integer(C_INT), value, intent(IN) :: Lprotocol + integer(C_INT), value, intent(IN) :: SHT_protocol_len logical(C_BOOL), value, intent(IN) :: preserve_contents - end subroutine c_iomanager_read_1_bufferify + end subroutine c_io_manager_read_1_bufferify - subroutine c_iomanager_read_2(self, group, root_file) & + subroutine c_io_manager_read_2(self, group, root_file) & bind(C, name="SPIO_IOManager_read_2") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group character(kind=C_CHAR), intent(IN) :: root_file(*) - end subroutine c_iomanager_read_2 + end subroutine c_io_manager_read_2 - subroutine c_iomanager_read_2_bufferify(self, group, root_file, & - Lroot_file) & + subroutine c_io_manager_read_2_bufferify(self, group, root_file, & + SHT_root_file_len) & bind(C, name="SPIO_IOManager_read_2_bufferify") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR, C_INT - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group character(kind=C_CHAR), intent(IN) :: root_file(*) - integer(C_INT), value, intent(IN) :: Lroot_file - end subroutine c_iomanager_read_2_bufferify + integer(C_INT), value, intent(IN) :: SHT_root_file_len + end subroutine c_io_manager_read_2_bufferify - subroutine c_iomanager_read_3(self, group, root_file, & + subroutine c_io_manager_read_3(self, group, root_file, & preserve_contents) & bind(C, name="SPIO_IOManager_read_3") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_BOOL, C_CHAR - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group character(kind=C_CHAR), intent(IN) :: root_file(*) logical(C_BOOL), value, intent(IN) :: preserve_contents - end subroutine c_iomanager_read_3 + end subroutine c_io_manager_read_3 - subroutine c_iomanager_read_3_bufferify(self, group, root_file, & - Lroot_file, preserve_contents) & + subroutine c_io_manager_read_3_bufferify(self, group, root_file, & + SHT_root_file_len, preserve_contents) & bind(C, name="SPIO_IOManager_read_3_bufferify") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_BOOL, C_CHAR, C_INT - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group character(kind=C_CHAR), intent(IN) :: root_file(*) - integer(C_INT), value, intent(IN) :: Lroot_file + integer(C_INT), value, intent(IN) :: SHT_root_file_len logical(C_BOOL), value, intent(IN) :: preserve_contents - end subroutine c_iomanager_read_3_bufferify + end subroutine c_io_manager_read_3_bufferify - subroutine c_iomanager_load_external_data(self, group, & + subroutine c_io_manager_load_external_data(self, group, & root_file) & - bind(C, name="SPIO_IOManager_load_external_data") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + bind(C, name="SPIO_IOManager_loadExternalData") + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group character(kind=C_CHAR), intent(IN) :: root_file(*) - end subroutine c_iomanager_load_external_data + end subroutine c_io_manager_load_external_data - subroutine c_iomanager_load_external_data_bufferify(self, group, & - root_file, Lroot_file) & - bind(C, name="SPIO_IOManager_load_external_data_bufferify") - use axom_sidre, only : SIDRE_SHROUD_group_capsule + subroutine c_io_manager_load_external_data_bufferify(self, & + group, root_file, SHT_root_file_len) & + bind(C, name="SPIO_IOManager_loadExternalData_bufferify") + use axom_sidre, only : SIDRE_SHROUD_capsule_data use iso_c_binding, only : C_CHAR, C_INT - import :: SPIO_SHROUD_iomanager_capsule + import :: SPIO_SHROUD_capsule_data implicit none - type(SPIO_SHROUD_iomanager_capsule), intent(IN) :: self - type(SIDRE_SHROUD_group_capsule), intent(INOUT) :: group + type(SPIO_SHROUD_capsule_data), intent(IN) :: self + type(SIDRE_SHROUD_capsule_data), intent(INOUT) :: group character(kind=C_CHAR), intent(IN) :: root_file(*) - integer(C_INT), value, intent(IN) :: Lroot_file - end subroutine c_iomanager_load_external_data_bufferify + integer(C_INT), value, intent(IN) :: SHT_root_file_len + end subroutine c_io_manager_load_external_data_bufferify + end interface - ! splicer begin class.IOManager.additional_interfaces - ! splicer end class.IOManager.additional_interfaces + interface io_manager_read + module procedure io_manager_read_0 + module procedure io_manager_read_1 + module procedure io_manager_read_2 + module procedure io_manager_read_3 + end interface io_manager_read - ! splicer begin additional_interfaces - ! splicer end additional_interfaces - end interface + interface io_manager_write + module procedure io_manager_write_0 + module procedure io_manager_write_1 + end interface io_manager_write interface iomanager - module procedure iomanager_ctor_default - module procedure iomanager_ctor_usescr + module procedure io_manager_ctor_default + module procedure io_manager_ctor_usescr end interface iomanager + ! splicer begin additional_declarations + ! splicer end additional_declarations + contains - function iomanager_ctor_default(com) & + function io_manager_ctor_default(com) & result(SHT_rv) use iso_c_binding, only : C_PTR integer, value, intent(IN) :: com type(iomanager) :: SHT_rv - ! splicer begin class.IOManager.method.ctor_default type(C_PTR) :: SHT_prv - SHT_prv = c_iomanager_ctor_default(com, SHT_rv%cxxmem) + ! splicer begin class.IOManager.method.ctor_default + SHT_prv = c_io_manager_ctor_default(com, SHT_rv%cxxmem) ! splicer end class.IOManager.method.ctor_default - end function iomanager_ctor_default + end function io_manager_ctor_default - function iomanager_ctor_usescr(com, use_scr) & + function io_manager_ctor_usescr(com, use_scr) & result(SHT_rv) use iso_c_binding, only : C_BOOL, C_PTR integer, value, intent(IN) :: com logical, value, intent(IN) :: use_scr type(iomanager) :: SHT_rv + type(C_PTR) :: SHT_prv ! splicer begin class.IOManager.method.ctor_usescr logical(C_BOOL) SH_use_scr - type(C_PTR) :: SHT_prv SH_use_scr = use_scr ! coerce to C_BOOL - SHT_prv = c_iomanager_ctor_usescr(com, SH_use_scr, & + SHT_prv = c_io_manager_ctor_usescr(com, SH_use_scr, & SHT_rv%cxxmem) ! splicer end class.IOManager.method.ctor_usescr - end function iomanager_ctor_usescr + end function io_manager_ctor_usescr - subroutine iomanager_delete(obj) + subroutine io_manager_delete(obj) class(iomanager) :: obj ! splicer begin class.IOManager.method.delete - call c_iomanager_delete(obj%cxxmem) + call c_io_manager_delete(obj%cxxmem) ! splicer end class.IOManager.method.delete - end subroutine iomanager_delete + end subroutine io_manager_delete - subroutine iomanager_write_0(obj, group, num_files, file_string, & + subroutine io_manager_write_0(obj, group, num_files, file_string, & protocol) use axom_sidre, only : SidreGroup use iso_c_binding, only : C_INT @@ -402,13 +415,17 @@ subroutine iomanager_write_0(obj, group, num_files, file_string, & character(len=*), intent(IN) :: file_string character(len=*), intent(IN) :: protocol ! splicer begin class.IOManager.method.write_0 - call c_iomanager_write_0_bufferify(obj%cxxmem, group%cxxmem, & - num_files, file_string, len_trim(file_string, kind=C_INT), & - protocol, len_trim(protocol, kind=C_INT)) + integer(C_INT) SHT_file_string_len + integer(C_INT) SHT_protocol_len + SHT_file_string_len = len(file_string, kind=C_INT) + SHT_protocol_len = len(protocol, kind=C_INT) + call c_io_manager_write_0_bufferify(obj%cxxmem, group%cxxmem, & + num_files, file_string, SHT_file_string_len, protocol, & + SHT_protocol_len) ! splicer end class.IOManager.method.write_0 - end subroutine iomanager_write_0 + end subroutine io_manager_write_0 - subroutine iomanager_write_1(obj, group, num_files, file_string, & + subroutine io_manager_write_1(obj, group, num_files, file_string, & protocol, tree_pattern) use axom_sidre, only : SidreGroup use iso_c_binding, only : C_INT @@ -419,26 +436,34 @@ subroutine iomanager_write_1(obj, group, num_files, file_string, & character(len=*), intent(IN) :: protocol character(len=*), intent(IN) :: tree_pattern ! splicer begin class.IOManager.method.write_1 - call c_iomanager_write_1_bufferify(obj%cxxmem, group%cxxmem, & - num_files, file_string, len_trim(file_string, kind=C_INT), & - protocol, len_trim(protocol, kind=C_INT), tree_pattern, & - len_trim(tree_pattern, kind=C_INT)) + integer(C_INT) SHT_file_string_len + integer(C_INT) SHT_protocol_len + integer(C_INT) SHT_tree_pattern_len + SHT_file_string_len = len(file_string, kind=C_INT) + SHT_protocol_len = len(protocol, kind=C_INT) + SHT_tree_pattern_len = len(tree_pattern, kind=C_INT) + call c_io_manager_write_1_bufferify(obj%cxxmem, group%cxxmem, & + num_files, file_string, SHT_file_string_len, protocol, & + SHT_protocol_len, tree_pattern, SHT_tree_pattern_len) ! splicer end class.IOManager.method.write_1 - end subroutine iomanager_write_1 + end subroutine io_manager_write_1 - subroutine iomanager_write_group_to_root_file(obj, group, file_name) + subroutine io_manager_write_group_to_root_file(obj, group, & + file_name) use axom_sidre, only : SidreGroup use iso_c_binding, only : C_INT class(iomanager) :: obj type(SidreGroup), intent(INOUT) :: group character(len=*), intent(IN) :: file_name ! splicer begin class.IOManager.method.write_group_to_root_file - call c_iomanager_write_group_to_root_file_bufferify(obj%cxxmem, & - group%cxxmem, file_name, len_trim(file_name, kind=C_INT)) + integer(C_INT) SHT_file_name_len + SHT_file_name_len = len(file_name, kind=C_INT) + call c_io_manager_write_group_to_root_file_bufferify(obj%cxxmem, & + group%cxxmem, file_name, SHT_file_name_len) ! splicer end class.IOManager.method.write_group_to_root_file - end subroutine iomanager_write_group_to_root_file + end subroutine io_manager_write_group_to_root_file - subroutine iomanager_write_blueprint_index_to_root_file(obj, & + subroutine io_manager_write_blueprint_index_to_root_file(obj, & datastore, domain_path, file_name, mesh_path) use axom_sidre, only : SidreDataStore use iso_c_binding, only : C_INT @@ -448,15 +473,19 @@ subroutine iomanager_write_blueprint_index_to_root_file(obj, & character(len=*), intent(IN) :: file_name character(len=*), intent(IN) :: mesh_path ! splicer begin class.IOManager.method.write_blueprint_index_to_root_file - call c_iomanager_write_blueprint_index_to_root_file_bufferify(obj%cxxmem, & - datastore%cxxmem, domain_path, & - len_trim(domain_path, kind=C_INT), file_name, & - len_trim(file_name, kind=C_INT), mesh_path, & - len_trim(mesh_path, kind=C_INT)) + integer(C_INT) SHT_domain_path_len + integer(C_INT) SHT_file_name_len + integer(C_INT) SHT_mesh_path_len + SHT_domain_path_len = len(domain_path, kind=C_INT) + SHT_file_name_len = len(file_name, kind=C_INT) + SHT_mesh_path_len = len(mesh_path, kind=C_INT) + call c_io_manager_write_blueprint_index_to_root_file_bufferify(obj%cxxmem, & + datastore%cxxmem, domain_path, SHT_domain_path_len, & + file_name, SHT_file_name_len, mesh_path, SHT_mesh_path_len) ! splicer end class.IOManager.method.write_blueprint_index_to_root_file - end subroutine iomanager_write_blueprint_index_to_root_file + end subroutine io_manager_write_blueprint_index_to_root_file - subroutine iomanager_read_0(obj, group, file_string, protocol) + subroutine io_manager_read_0(obj, group, file_string, protocol) use axom_sidre, only : SidreGroup use iso_c_binding, only : C_INT class(iomanager) :: obj @@ -464,13 +493,17 @@ subroutine iomanager_read_0(obj, group, file_string, protocol) character(len=*), intent(IN) :: file_string character(len=*), intent(IN) :: protocol ! splicer begin class.IOManager.method.read_0 - call c_iomanager_read_0_bufferify(obj%cxxmem, group%cxxmem, & - file_string, len_trim(file_string, kind=C_INT), protocol, & - len_trim(protocol, kind=C_INT)) + integer(C_INT) SHT_file_string_len + integer(C_INT) SHT_protocol_len + SHT_file_string_len = len(file_string, kind=C_INT) + SHT_protocol_len = len(protocol, kind=C_INT) + call c_io_manager_read_0_bufferify(obj%cxxmem, group%cxxmem, & + file_string, SHT_file_string_len, protocol, & + SHT_protocol_len) ! splicer end class.IOManager.method.read_0 - end subroutine iomanager_read_0 + end subroutine io_manager_read_0 - subroutine iomanager_read_1(obj, group, file_string, protocol, & + subroutine io_manager_read_1(obj, group, file_string, protocol, & preserve_contents) use axom_sidre, only : SidreGroup use iso_c_binding, only : C_BOOL, C_INT @@ -480,27 +513,33 @@ subroutine iomanager_read_1(obj, group, file_string, protocol, & character(len=*), intent(IN) :: protocol logical, value, intent(IN) :: preserve_contents ! splicer begin class.IOManager.method.read_1 + integer(C_INT) SHT_file_string_len + integer(C_INT) SHT_protocol_len logical(C_BOOL) SH_preserve_contents + SHT_file_string_len = len(file_string, kind=C_INT) + SHT_protocol_len = len(protocol, kind=C_INT) SH_preserve_contents = preserve_contents ! coerce to C_BOOL - call c_iomanager_read_1_bufferify(obj%cxxmem, group%cxxmem, & - file_string, len_trim(file_string, kind=C_INT), protocol, & - len_trim(protocol, kind=C_INT), SH_preserve_contents) + call c_io_manager_read_1_bufferify(obj%cxxmem, group%cxxmem, & + file_string, SHT_file_string_len, protocol, & + SHT_protocol_len, SH_preserve_contents) ! splicer end class.IOManager.method.read_1 - end subroutine iomanager_read_1 + end subroutine io_manager_read_1 - subroutine iomanager_read_2(obj, group, root_file) + subroutine io_manager_read_2(obj, group, root_file) use axom_sidre, only : SidreGroup use iso_c_binding, only : C_INT class(iomanager) :: obj type(SidreGroup), intent(INOUT) :: group character(len=*), intent(IN) :: root_file ! splicer begin class.IOManager.method.read_2 - call c_iomanager_read_2_bufferify(obj%cxxmem, group%cxxmem, & - root_file, len_trim(root_file, kind=C_INT)) + integer(C_INT) SHT_root_file_len + SHT_root_file_len = len(root_file, kind=C_INT) + call c_io_manager_read_2_bufferify(obj%cxxmem, group%cxxmem, & + root_file, SHT_root_file_len) ! splicer end class.IOManager.method.read_2 - end subroutine iomanager_read_2 + end subroutine io_manager_read_2 - subroutine iomanager_read_3(obj, group, root_file, & + subroutine io_manager_read_3(obj, group, root_file, & preserve_contents) use axom_sidre, only : SidreGroup use iso_c_binding, only : C_BOOL, C_INT @@ -509,48 +548,51 @@ subroutine iomanager_read_3(obj, group, root_file, & character(len=*), intent(IN) :: root_file logical, value, intent(IN) :: preserve_contents ! splicer begin class.IOManager.method.read_3 + integer(C_INT) SHT_root_file_len logical(C_BOOL) SH_preserve_contents + SHT_root_file_len = len(root_file, kind=C_INT) SH_preserve_contents = preserve_contents ! coerce to C_BOOL - call c_iomanager_read_3_bufferify(obj%cxxmem, group%cxxmem, & - root_file, len_trim(root_file, kind=C_INT), & - SH_preserve_contents) + call c_io_manager_read_3_bufferify(obj%cxxmem, group%cxxmem, & + root_file, SHT_root_file_len, SH_preserve_contents) ! splicer end class.IOManager.method.read_3 - end subroutine iomanager_read_3 + end subroutine io_manager_read_3 - subroutine iomanager_load_external_data(obj, group, root_file) + subroutine io_manager_load_external_data(obj, group, root_file) use axom_sidre, only : SidreGroup use iso_c_binding, only : C_INT class(iomanager) :: obj type(SidreGroup), intent(INOUT) :: group character(len=*), intent(IN) :: root_file ! splicer begin class.IOManager.method.load_external_data - call c_iomanager_load_external_data_bufferify(obj%cxxmem, & - group%cxxmem, root_file, len_trim(root_file, kind=C_INT)) + integer(C_INT) SHT_root_file_len + SHT_root_file_len = len(root_file, kind=C_INT) + call c_io_manager_load_external_data_bufferify(obj%cxxmem, & + group%cxxmem, root_file, SHT_root_file_len) ! splicer end class.IOManager.method.load_external_data - end subroutine iomanager_load_external_data + end subroutine io_manager_load_external_data ! Return pointer to C++ memory. - function iomanager_get_instance(obj) result (cxxptr) + function io_manager_get_instance(obj) result (cxxptr) use iso_c_binding, only: C_PTR class(iomanager), intent(IN) :: obj type(C_PTR) :: cxxptr cxxptr = obj%cxxmem%addr - end function iomanager_get_instance + end function io_manager_get_instance - subroutine iomanager_set_instance(obj, cxxmem) + subroutine io_manager_set_instance(obj, cxxmem) use iso_c_binding, only: C_PTR class(iomanager), intent(INOUT) :: obj type(C_PTR), intent(IN) :: cxxmem obj%cxxmem%addr = cxxmem obj%cxxmem%idtor = 0 - end subroutine iomanager_set_instance + end subroutine io_manager_set_instance - function iomanager_associated(obj) result (rv) + function io_manager_associated(obj) result (rv) use iso_c_binding, only: c_associated class(iomanager), intent(IN) :: obj logical rv rv = c_associated(obj%cxxmem%addr) - end function iomanager_associated + end function io_manager_associated ! splicer begin class.IOManager.additional_functions ! splicer end class.IOManager.additional_functions @@ -558,7 +600,7 @@ end function iomanager_associated ! splicer begin additional_functions ! splicer end additional_functions - function iomanager_eq(a,b) result (rv) + function io_manager_eq(a,b) result (rv) use iso_c_binding, only: c_associated type(iomanager), intent(IN) ::a,b logical :: rv @@ -567,9 +609,9 @@ function iomanager_eq(a,b) result (rv) else rv = .false. endif - end function iomanager_eq + end function io_manager_eq - function iomanager_ne(a,b) result (rv) + function io_manager_ne(a,b) result (rv) use iso_c_binding, only: c_associated type(iomanager), intent(IN) ::a,b logical :: rv @@ -578,6 +620,6 @@ function iomanager_ne(a,b) result (rv) else rv = .false. endif - end function iomanager_ne + end function io_manager_ne end module axom_spio diff --git a/src/axom/sidre/spio/interface/yaml/spio_types.yaml b/src/axom/sidre/spio/interface/yaml/spio_types.yaml index f7fa07fa1f..3fe8b866f1 100644 --- a/src/axom/sidre/spio/interface/yaml/spio_types.yaml +++ b/src/axom/sidre/spio/interface/yaml/spio_types.yaml @@ -1,5 +1,5 @@ # spio_types.yaml -# This file is generated by Shroud 0.12.2. Do not edit. +# This file is generated by Shroud 0.13.0. Do not edit. # # Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. @@ -19,5 +19,5 @@ typemap: c_type: SPIO_IOManager f_module_name: axom_spio f_derived_type: iomanager - f_capsule_data_type: SPIO_SHROUD_iomanager_capsule + f_capsule_data_type: SPIO_SHROUD_capsule_data f_to_c: "{f_var}%cxxmem" diff --git a/src/axom/slic/interface/c_fortran/typesSLIC.h b/src/axom/slic/interface/c_fortran/typesSLIC.h index 6e04d20430..bc85a0655e 100644 --- a/src/axom/slic/interface/c_fortran/typesSLIC.h +++ b/src/axom/slic/interface/c_fortran/typesSLIC.h @@ -1,5 +1,5 @@ // typesSLIC.h -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -10,10 +10,16 @@ #ifndef TYPESSLIC_H #define TYPESSLIC_H +// splicer begin types.CXX_declarations +// splicer end types.CXX_declarations + #ifdef __cplusplus extern "C" { #endif +// splicer begin types.C_declarations +// splicer end types.C_declarations + // helper capsule_SLIC_GenericOutputStream struct s_SLIC_GenericOutputStream { diff --git a/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.cpp b/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.cpp index 200dc0c454..a17ab4c743 100644 --- a/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.cpp +++ b/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.cpp @@ -1,20 +1,39 @@ // wrapGenericOutputStream.cpp -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) -#include "wrapGenericOutputStream.h" -#include -#include + #include "axom/slic/streams/GenericOutputStream.hpp" +#include +#include +#include "wrapGenericOutputStream.h" // splicer begin class.GenericOutputStream.CXX_definitions // splicer end class.GenericOutputStream.CXX_definitions extern "C" { +// helper ShroudLenTrim +// Returns the length of character string src with length nsrc, +// ignoring any trailing blanks. +static int ShroudLenTrim(const char *src, int nsrc) +{ + int i; + + for(i = nsrc - 1; i >= 0; i--) + { + if(src[i] != ' ') + { + break; + } + } + + return i + 1; +} + // splicer begin class.GenericOutputStream.C_definitions // splicer end class.GenericOutputStream.C_definitions @@ -33,12 +52,12 @@ SLIC_GenericOutputStream *SLIC_GenericOutputStream_ctor_default( } SLIC_GenericOutputStream *SLIC_GenericOutputStream_ctor_default_bufferify( - const char *stream, - int Lstream, + char *stream, + int SHT_stream_len, SLIC_GenericOutputStream *SHC_rv) { // splicer begin class.GenericOutputStream.method.ctor_default_bufferify - const std::string SHCXX_stream(stream, Lstream); + const std::string SHCXX_stream(stream, ShroudLenTrim(stream, SHT_stream_len)); axom::slic::GenericOutputStream *SHCXX_rv = new axom::slic::GenericOutputStream(SHCXX_stream); SHC_rv->addr = static_cast(SHCXX_rv); @@ -64,15 +83,15 @@ SLIC_GenericOutputStream *SLIC_GenericOutputStream_ctor_format( } SLIC_GenericOutputStream *SLIC_GenericOutputStream_ctor_format_bufferify( - const char *stream, - int Lstream, - const char *format, - int Lformat, + char *stream, + int SHT_stream_len, + char *format, + int SHT_format_len, SLIC_GenericOutputStream *SHC_rv) { // splicer begin class.GenericOutputStream.method.ctor_format_bufferify - const std::string SHCXX_stream(stream, Lstream); - const std::string SHCXX_format(format, Lformat); + const std::string SHCXX_stream(stream, ShroudLenTrim(stream, SHT_stream_len)); + const std::string SHCXX_format(format, ShroudLenTrim(format, SHT_format_len)); axom::slic::GenericOutputStream *SHCXX_rv = new axom::slic::GenericOutputStream(SHCXX_stream, SHCXX_format); SHC_rv->addr = static_cast(SHCXX_rv); diff --git a/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.h b/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.h index 025286d21f..2cadb7be78 100644 --- a/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.h +++ b/src/axom/slic/interface/c_fortran/wrapGenericOutputStream.h @@ -1,5 +1,5 @@ // wrapGenericOutputStream.h -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -26,28 +26,28 @@ extern "C" { // splicer begin class.GenericOutputStream.C_declarations // splicer end class.GenericOutputStream.C_declarations -SLIC_GenericOutputStream* SLIC_GenericOutputStream_ctor_default( - const char* stream, - SLIC_GenericOutputStream* SHC_rv); +SLIC_GenericOutputStream *SLIC_GenericOutputStream_ctor_default( + const char *stream, + SLIC_GenericOutputStream *SHC_rv); -SLIC_GenericOutputStream* SLIC_GenericOutputStream_ctor_default_bufferify( - const char* stream, - int Lstream, - SLIC_GenericOutputStream* SHC_rv); +SLIC_GenericOutputStream *SLIC_GenericOutputStream_ctor_default_bufferify( + char *stream, + int SHT_stream_len, + SLIC_GenericOutputStream *SHC_rv); -SLIC_GenericOutputStream* SLIC_GenericOutputStream_ctor_format( - const char* stream, - const char* format, - SLIC_GenericOutputStream* SHC_rv); +SLIC_GenericOutputStream *SLIC_GenericOutputStream_ctor_format( + const char *stream, + const char *format, + SLIC_GenericOutputStream *SHC_rv); -SLIC_GenericOutputStream* SLIC_GenericOutputStream_ctor_format_bufferify( - const char* stream, - int Lstream, - const char* format, - int Lformat, - SLIC_GenericOutputStream* SHC_rv); +SLIC_GenericOutputStream *SLIC_GenericOutputStream_ctor_format_bufferify( + char *stream, + int SHT_stream_len, + char *format, + int SHT_format_len, + SLIC_GenericOutputStream *SHC_rv); -void SLIC_GenericOutputStream_delete(SLIC_GenericOutputStream* self); +void SLIC_GenericOutputStream_delete(SLIC_GenericOutputStream *self); #ifdef __cplusplus } diff --git a/src/axom/slic/interface/c_fortran/wrapSLIC.cpp b/src/axom/slic/interface/c_fortran/wrapSLIC.cpp index e0270df4fd..41109bc5fe 100644 --- a/src/axom/slic/interface/c_fortran/wrapSLIC.cpp +++ b/src/axom/slic/interface/c_fortran/wrapSLIC.cpp @@ -1,23 +1,40 @@ // wrapSLIC.cpp -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) -#include "wrapSLIC.h" -#include -#include -#include + #include "axom/slic/interface/slic.hpp" +#include #include "axom/slic/streams/GenericOutputStream.hpp" -#include "typesSLIC.h" +#include +#include "wrapSLIC.h" // splicer begin CXX_definitions // splicer end CXX_definitions extern "C" { +// helper ShroudLenTrim +// Returns the length of character string src with length nsrc, +// ignoring any trailing blanks. +static int ShroudLenTrim(const char *src, int nsrc) +{ + int i; + + for(i = nsrc - 1; i >= 0; i--) + { + if(src[i] != ' ') + { + break; + } + } + + return i + 1; +} + // helper ShroudStrCopy // Copy src into dest, blank fill to ndest characters // Truncate if dest is too short. @@ -30,16 +47,10 @@ static void ShroudStrCopy(char *dest, int ndest, const char *src, int nsrc) } else { - if(nsrc < 0) - { - nsrc = std::strlen(src); - } + if(nsrc < 0) nsrc = std::strlen(src); int nm = nsrc < ndest ? nsrc : ndest; std::memcpy(dest, src, nm); - if(ndest > nm) - { - std::memset(dest + nm, ' ', ndest - nm); // blank fill - } + if(ndest > nm) std::memset(dest + nm, ' ', ndest - nm); // blank fill } } // splicer begin C_definitions @@ -52,196 +63,198 @@ void SLIC_initialize(void) // splicer end function.initialize } -bool SLIC_is_initialized(void) +bool SLIC_isInitialized(void) { - // splicer begin function.is_initialized + // splicer begin function.isInitialized bool SHC_rv = axom::slic::isInitialized(); return SHC_rv; - // splicer end function.is_initialized + // splicer end function.isInitialized } -void SLIC_create_logger(const char *name, char imask) +void SLIC_createLogger(const char *name, char imask) { - // splicer begin function.create_logger + // splicer begin function.createLogger const std::string SHCXX_name(name); axom::slic::createLogger(SHCXX_name, imask); - // splicer end function.create_logger + // splicer end function.createLogger } -void SLIC_create_logger_bufferify(const char *name, int Lname, char imask) +void SLIC_createLogger_bufferify(char *name, int SHT_name_len, char imask) { - // splicer begin function.create_logger_bufferify - const std::string SHCXX_name(name, Lname); + // splicer begin function.createLogger_bufferify + const std::string SHCXX_name(name, ShroudLenTrim(name, SHT_name_len)); axom::slic::createLogger(SHCXX_name, imask); - // splicer end function.create_logger_bufferify + // splicer end function.createLogger_bufferify } -bool SLIC_activate_logger(const char *name) +bool SLIC_activateLogger(const char *name) { - // splicer begin function.activate_logger + // splicer begin function.activateLogger const std::string SHCXX_name(name); bool SHC_rv = axom::slic::activateLogger(SHCXX_name); return SHC_rv; - // splicer end function.activate_logger + // splicer end function.activateLogger } -bool SLIC_activate_logger_bufferify(const char *name, int Lname) +bool SLIC_activateLogger_bufferify(char *name, int SHT_name_len) { - // splicer begin function.activate_logger_bufferify - const std::string SHCXX_name(name, Lname); + // splicer begin function.activateLogger_bufferify + const std::string SHCXX_name(name, ShroudLenTrim(name, SHT_name_len)); bool SHC_rv = axom::slic::activateLogger(SHCXX_name); return SHC_rv; - // splicer end function.activate_logger_bufferify + // splicer end function.activateLogger_bufferify } -void SLIC_get_active_logger_name_bufferify(char *name, int Nname) +void SLIC_getActiveLoggerName_bufferify(char *name, int SHT_name_len) { - // splicer begin function.get_active_logger_name_bufferify + // splicer begin function.getActiveLoggerName_bufferify std::string SHCXX_rv = axom::slic::getActiveLoggerName(); if(SHCXX_rv.empty()) { - ShroudStrCopy(name, Nname, nullptr, 0); + ShroudStrCopy(name, SHT_name_len, nullptr, 0); } else { - ShroudStrCopy(name, Nname, SHCXX_rv.data(), SHCXX_rv.size()); + ShroudStrCopy(name, SHT_name_len, SHCXX_rv.data(), SHCXX_rv.size()); } - // splicer end function.get_active_logger_name_bufferify + // splicer end function.getActiveLoggerName_bufferify } -int SLIC_get_logging_msg_level(void) +int SLIC_getLoggingMsgLevel(void) { - // splicer begin function.get_logging_msg_level + // splicer begin function.getLoggingMsgLevel axom::slic::message::Level SHCXX_rv = axom::slic::getLoggingMsgLevel(); int SHC_rv = static_cast(SHCXX_rv); return SHC_rv; - // splicer end function.get_logging_msg_level + // splicer end function.getLoggingMsgLevel } -void SLIC_set_logging_msg_level(int level) +void SLIC_setLoggingMsgLevel(int level) { - // splicer begin function.set_logging_msg_level + // splicer begin function.setLoggingMsgLevel axom::slic::message::Level SHCXX_level = static_cast(level); axom::slic::setLoggingMsgLevel(SHCXX_level); - // splicer end function.set_logging_msg_level + // splicer end function.setLoggingMsgLevel } -void SLIC_add_stream_to_msg_level(SLIC_GenericOutputStream *ls, int level) +void SLIC_addStreamToMsgLevel(SLIC_GenericOutputStream *ls, int level) { - // splicer begin function.add_stream_to_msg_level + // splicer begin function.addStreamToMsgLevel axom::slic::GenericOutputStream *SHCXX_ls = static_cast(ls->addr); axom::slic::message::Level SHCXX_level = static_cast(level); axom::slic::addStreamToMsgLevel(SHCXX_ls, SHCXX_level); - // splicer end function.add_stream_to_msg_level + // splicer end function.addStreamToMsgLevel } -void SLIC_add_stream_to_all_msg_levels(SLIC_GenericOutputStream *ls) +void SLIC_addStreamToAllMsgLevels(SLIC_GenericOutputStream *ls) { - // splicer begin function.add_stream_to_all_msg_levels + // splicer begin function.addStreamToAllMsgLevels axom::slic::GenericOutputStream *SHCXX_ls = static_cast(ls->addr); axom::slic::addStreamToAllMsgLevels(SHCXX_ls); - // splicer end function.add_stream_to_all_msg_levels + // splicer end function.addStreamToAllMsgLevels } -void SLIC_set_abort_on_error(bool status) +void SLIC_setAbortOnError(bool status) { - // splicer begin function.set_abort_on_error + // splicer begin function.setAbortOnError axom::slic::setAbortOnError(status); - // splicer end function.set_abort_on_error + // splicer end function.setAbortOnError } -void SLIC_enable_abort_on_error(void) +void SLIC_enableAbortOnError(void) { - // splicer begin function.enable_abort_on_error + // splicer begin function.enableAbortOnError axom::slic::enableAbortOnError(); - // splicer end function.enable_abort_on_error + // splicer end function.enableAbortOnError } -void SLIC_disable_abort_on_error(void) +void SLIC_disableAbortOnError(void) { - // splicer begin function.disable_abort_on_error + // splicer begin function.disableAbortOnError axom::slic::disableAbortOnError(); - // splicer end function.disable_abort_on_error + // splicer end function.disableAbortOnError } -bool SLIC_is_abort_on_errors_enabled(void) +bool SLIC_isAbortOnErrorsEnabled(void) { - // splicer begin function.is_abort_on_errors_enabled + // splicer begin function.isAbortOnErrorsEnabled bool SHC_rv = axom::slic::isAbortOnErrorsEnabled(); return SHC_rv; - // splicer end function.is_abort_on_errors_enabled + // splicer end function.isAbortOnErrorsEnabled } -void SLIC_set_abort_on_warning(bool status) +void SLIC_setAbortOnWarning(bool status) { - // splicer begin function.set_abort_on_warning + // splicer begin function.setAbortOnWarning axom::slic::setAbortOnWarning(status); - // splicer end function.set_abort_on_warning + // splicer end function.setAbortOnWarning } -void SLIC_enable_abort_on_warning(void) +void SLIC_enableAbortOnWarning(void) { - // splicer begin function.enable_abort_on_warning + // splicer begin function.enableAbortOnWarning axom::slic::enableAbortOnWarning(); - // splicer end function.enable_abort_on_warning + // splicer end function.enableAbortOnWarning } -void SLIC_disable_abort_on_warning(void) +void SLIC_disableAbortOnWarning(void) { - // splicer begin function.disable_abort_on_warning + // splicer begin function.disableAbortOnWarning axom::slic::disableAbortOnWarning(); - // splicer end function.disable_abort_on_warning + // splicer end function.disableAbortOnWarning } -bool SLIC_is_abort_on_warnings_enabled(void) +bool SLIC_isAbortOnWarningsEnabled(void) { - // splicer begin function.is_abort_on_warnings_enabled + // splicer begin function.isAbortOnWarningsEnabled bool SHC_rv = axom::slic::isAbortOnWarningsEnabled(); return SHC_rv; - // splicer end function.is_abort_on_warnings_enabled + // splicer end function.isAbortOnWarningsEnabled } -void SLIC_log_message_file_line(int level, - const char *message, - const char *fileName, - int line) +void SLIC_logMessage_file_line(int level, + const char *message, + const char *fileName, + int line) { - // splicer begin function.log_message_file_line + // splicer begin function.logMessage_file_line axom::slic::message::Level SHCXX_level = static_cast(level); const std::string SHCXX_message(message); const std::string SHCXX_fileName(fileName); axom::slic::logMessage(SHCXX_level, SHCXX_message, SHCXX_fileName, line); - // splicer end function.log_message_file_line + // splicer end function.logMessage_file_line } -void SLIC_log_message_file_line_bufferify(int level, - const char *message, - int Lmessage, - const char *fileName, - int LfileName, - int line) +void SLIC_logMessage_file_line_bufferify(int level, + char *message, + int SHT_message_len, + char *fileName, + int SHT_fileName_len, + int line) { - // splicer begin function.log_message_file_line_bufferify + // splicer begin function.logMessage_file_line_bufferify axom::slic::message::Level SHCXX_level = static_cast(level); - const std::string SHCXX_message(message, Lmessage); - const std::string SHCXX_fileName(fileName, LfileName); + const std::string SHCXX_message(message, + ShroudLenTrim(message, SHT_message_len)); + const std::string SHCXX_fileName(fileName, + ShroudLenTrim(fileName, SHT_fileName_len)); axom::slic::logMessage(SHCXX_level, SHCXX_message, SHCXX_fileName, line); - // splicer end function.log_message_file_line_bufferify + // splicer end function.logMessage_file_line_bufferify } -void SLIC_log_message_file_line_filter(int level, - const char *message, - const char *fileName, - int line, - bool filter_duplicates) +void SLIC_logMessage_file_line_filter(int level, + const char *message, + const char *fileName, + int line, + bool filter_duplicates) { - // splicer begin function.log_message_file_line_filter + // splicer begin function.logMessage_file_line_filter axom::slic::message::Level SHCXX_level = static_cast(level); const std::string SHCXX_message(message); @@ -251,78 +264,82 @@ void SLIC_log_message_file_line_filter(int level, SHCXX_fileName, line, filter_duplicates); - // splicer end function.log_message_file_line_filter + // splicer end function.logMessage_file_line_filter } -void SLIC_log_message_file_line_filter_bufferify(int level, - const char *message, - int Lmessage, - const char *fileName, - int LfileName, - int line, - bool filter_duplicates) +void SLIC_logMessage_file_line_filter_bufferify(int level, + char *message, + int SHT_message_len, + char *fileName, + int SHT_fileName_len, + int line, + bool filter_duplicates) { - // splicer begin function.log_message_file_line_filter_bufferify + // splicer begin function.logMessage_file_line_filter_bufferify axom::slic::message::Level SHCXX_level = static_cast(level); - const std::string SHCXX_message(message, Lmessage); - const std::string SHCXX_fileName(fileName, LfileName); + const std::string SHCXX_message(message, + ShroudLenTrim(message, SHT_message_len)); + const std::string SHCXX_fileName(fileName, + ShroudLenTrim(fileName, SHT_fileName_len)); axom::slic::logMessage(SHCXX_level, SHCXX_message, SHCXX_fileName, line, filter_duplicates); - // splicer end function.log_message_file_line_filter_bufferify + // splicer end function.logMessage_file_line_filter_bufferify } -void SLIC_log_message(int level, const char *message) +void SLIC_logMessage(int level, const char *message) { - // splicer begin function.log_message + // splicer begin function.logMessage axom::slic::message::Level SHCXX_level = static_cast(level); const std::string SHCXX_message(message); axom::slic::logMessage(SHCXX_level, SHCXX_message); - // splicer end function.log_message + // splicer end function.logMessage } -void SLIC_log_message_bufferify(int level, const char *message, int Lmessage) +void SLIC_logMessage_bufferify(int level, char *message, int SHT_message_len) { - // splicer begin function.log_message_bufferify + // splicer begin function.logMessage_bufferify axom::slic::message::Level SHCXX_level = static_cast(level); - const std::string SHCXX_message(message, Lmessage); + const std::string SHCXX_message(message, + ShroudLenTrim(message, SHT_message_len)); axom::slic::logMessage(SHCXX_level, SHCXX_message); - // splicer end function.log_message_bufferify + // splicer end function.logMessage_bufferify } -void SLIC_log_message_filter(int level, const char *message, bool filter_duplicates) +void SLIC_logMessage_filter(int level, const char *message, bool filter_duplicates) { - // splicer begin function.log_message_filter + // splicer begin function.logMessage_filter axom::slic::message::Level SHCXX_level = static_cast(level); const std::string SHCXX_message(message); axom::slic::logMessage(SHCXX_level, SHCXX_message, filter_duplicates); - // splicer end function.log_message_filter + // splicer end function.logMessage_filter } -void SLIC_log_message_filter_bufferify(int level, - const char *message, - int Lmessage, - bool filter_duplicates) +void SLIC_logMessage_filter_bufferify(int level, + char *message, + int SHT_message_len, + bool filter_duplicates) { - // splicer begin function.log_message_filter_bufferify + // splicer begin function.logMessage_filter_bufferify axom::slic::message::Level SHCXX_level = static_cast(level); - const std::string SHCXX_message(message, Lmessage); + const std::string SHCXX_message(message, + ShroudLenTrim(message, SHT_message_len)); axom::slic::logMessage(SHCXX_level, SHCXX_message, filter_duplicates); - // splicer end function.log_message_filter_bufferify + // splicer end function.logMessage_filter_bufferify } -void SLIC_flush_streams(void) +void SLIC_flushStreams(void) { - // splicer begin function.flush_streams + // splicer begin function.flushStreams axom::slic::flushStreams(); - // splicer end function.flush_streams + // splicer end function.flushStreams } void SLIC_finalize(void) @@ -332,32 +349,4 @@ void SLIC_finalize(void) // splicer end function.finalize } -// Release library allocated memory. -void SLIC_SHROUD_memory_destructor(SLIC_SHROUD_capsule_data *cap) -{ - void *ptr = cap->addr; - switch(cap->idtor) - { - case 0: // --none-- - { - // Nothing to delete - break; - } - case 1: // axom::slic::GenericOutputStream - { - axom::slic::GenericOutputStream *cxx_ptr = - reinterpret_cast(ptr); - delete cxx_ptr; - break; - } - default: - { - // Unexpected case in destructor - break; - } - } - cap->addr = nullptr; - cap->idtor = 0; // avoid deleting again -} - } // extern "C" diff --git a/src/axom/slic/interface/c_fortran/wrapSLIC.h b/src/axom/slic/interface/c_fortran/wrapSLIC.h index 36b0ce6697..d5a98179ce 100644 --- a/src/axom/slic/interface/c_fortran/wrapSLIC.h +++ b/src/axom/slic/interface/c_fortran/wrapSLIC.h @@ -1,5 +1,5 @@ // wrapSLIC.h -// This file is generated by Shroud 0.12.2. Do not edit. +// This file is generated by Shroud 0.13.0. Do not edit. // // Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. @@ -14,10 +14,10 @@ #ifndef WRAPSLIC_H #define WRAPSLIC_H -#include "typesSLIC.h" #ifndef __cplusplus #include #endif +#include "typesSLIC.h" // splicer begin CXX_declarations // splicer end CXX_declarations @@ -41,82 +41,80 @@ enum SLIC_message_Level void SLIC_initialize(void); -bool SLIC_is_initialized(void); +bool SLIC_isInitialized(void); -void SLIC_create_logger(const char* name, char imask); +void SLIC_createLogger(const char *name, char imask); -void SLIC_create_logger_bufferify(const char* name, int Lname, char imask); +void SLIC_createLogger_bufferify(char *name, int SHT_name_len, char imask); -bool SLIC_activate_logger(const char* name); +bool SLIC_activateLogger(const char *name); -bool SLIC_activate_logger_bufferify(const char* name, int Lname); +bool SLIC_activateLogger_bufferify(char *name, int SHT_name_len); -void SLIC_get_active_logger_name_bufferify(char* name, int Nname); +void SLIC_getActiveLoggerName_bufferify(char *name, int SHT_name_len); -int SLIC_get_logging_msg_level(void); +int SLIC_getLoggingMsgLevel(void); -void SLIC_set_logging_msg_level(int level); +void SLIC_setLoggingMsgLevel(int level); -void SLIC_add_stream_to_msg_level(SLIC_GenericOutputStream* ls, int level); +void SLIC_addStreamToMsgLevel(SLIC_GenericOutputStream *ls, int level); -void SLIC_add_stream_to_all_msg_levels(SLIC_GenericOutputStream* ls); +void SLIC_addStreamToAllMsgLevels(SLIC_GenericOutputStream *ls); -void SLIC_set_abort_on_error(bool status); +void SLIC_setAbortOnError(bool status); -void SLIC_enable_abort_on_error(void); +void SLIC_enableAbortOnError(void); -void SLIC_disable_abort_on_error(void); +void SLIC_disableAbortOnError(void); -bool SLIC_is_abort_on_errors_enabled(void); +bool SLIC_isAbortOnErrorsEnabled(void); -void SLIC_set_abort_on_warning(bool status); +void SLIC_setAbortOnWarning(bool status); -void SLIC_enable_abort_on_warning(void); +void SLIC_enableAbortOnWarning(void); -void SLIC_disable_abort_on_warning(void); +void SLIC_disableAbortOnWarning(void); -bool SLIC_is_abort_on_warnings_enabled(void); +bool SLIC_isAbortOnWarningsEnabled(void); -void SLIC_log_message_file_line(int level, - const char* message, - const char* fileName, - int line); +void SLIC_logMessage_file_line(int level, + const char *message, + const char *fileName, + int line); -void SLIC_log_message_file_line_bufferify(int level, - const char* message, - int Lmessage, - const char* fileName, - int LfileName, - int line); +void SLIC_logMessage_file_line_bufferify(int level, + char *message, + int SHT_message_len, + char *fileName, + int SHT_fileName_len, + int line); -void SLIC_log_message_file_line_filter(int level, - const char* message, - const char* fileName, - int line, - bool filter_duplicates); +void SLIC_logMessage_file_line_filter(int level, + const char *message, + const char *fileName, + int line, + bool filter_duplicates); -void SLIC_log_message_file_line_filter_bufferify(int level, - const char* message, - int Lmessage, - const char* fileName, - int LfileName, - int line, - bool filter_duplicates); +void SLIC_logMessage_file_line_filter_bufferify(int level, + char *message, + int SHT_message_len, + char *fileName, + int SHT_fileName_len, + int line, + bool filter_duplicates); -void SLIC_log_message(int level, const char* message); +void SLIC_logMessage(int level, const char *message); -void SLIC_log_message_bufferify(int level, const char* message, int Lmessage); +void SLIC_logMessage_bufferify(int level, char *message, int SHT_message_len); -void SLIC_log_message_filter(int level, - const char* message, - bool filter_duplicates); +void SLIC_logMessage_filter(int level, const char *message, bool filter_duplicates); -void SLIC_log_message_filter_bufferify(int level, - const char* message, - int Lmessage, - bool filter_duplicates); +void SLIC_logMessage_filter_bufferify(int level, + char *message, + int SHT_message_len, + bool filter_duplicates); -void SLIC_flush_streams(void); +void SLIC_flushStreams(void); void SLIC_finalize(void); diff --git a/src/axom/slic/interface/c_fortran/wrapfslic.f b/src/axom/slic/interface/c_fortran/wrapfslic.f index 936dbae4c0..94fddd1762 100644 --- a/src/axom/slic/interface/c_fortran/wrapfslic.f +++ b/src/axom/slic/interface/c_fortran/wrapfslic.f @@ -1,5 +1,5 @@ ! wrapfslic.f -! This file is generated by Shroud 0.12.2. Do not edit. +! This file is generated by Shroud 0.13.0. Do not edit. ! ! Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and ! other Axom Project Developers. See the top-level LICENSE file for details. @@ -20,6 +20,12 @@ module axom_slic ! splicer begin module_top ! splicer end module_top + ! helper capsule_data_helper + type, bind(C) :: SLIC_SHROUD_capsule_data + type(C_PTR) :: addr = C_NULL_PTR ! address of C++ memory + integer(C_INT) :: idtor = 0 ! index of destructor + end type SLIC_SHROUD_capsule_data + ! enum axom::slic::message::Level integer(C_INT), parameter :: message_error = 0 integer(C_INT), parameter :: message_warning = 1 @@ -27,95 +33,87 @@ module axom_slic integer(C_INT), parameter :: message_debug = 3 integer(C_INT), parameter :: message_num_levels = 4 - type, bind(C) :: SLIC_SHROUD_genericoutputstream_capsule - type(C_PTR) :: addr = C_NULL_PTR ! address of C++ memory - integer(C_INT) :: idtor = 0 ! index of destructor - end type SLIC_SHROUD_genericoutputstream_capsule - type SlicGenericOutputStream - type(SLIC_SHROUD_genericoutputstream_capsule) :: cxxmem + type(SLIC_SHROUD_capsule_data) :: cxxmem ! splicer begin class.GenericOutputStream.component_part ! splicer end class.GenericOutputStream.component_part contains - procedure :: delete => slic_genericoutputstream_delete - procedure :: get_instance => slic_genericoutputstream_get_instance - procedure :: set_instance => slic_genericoutputstream_set_instance - procedure :: associated => slic_genericoutputstream_associated + procedure :: delete => slic_generic_output_stream_delete + procedure :: get_instance => slic_generic_output_stream_get_instance + procedure :: set_instance => slic_generic_output_stream_set_instance + procedure :: associated => slic_generic_output_stream_associated ! splicer begin class.GenericOutputStream.type_bound_procedure_part ! splicer end class.GenericOutputStream.type_bound_procedure_part end type SlicGenericOutputStream interface operator (.eq.) - module procedure genericoutputstream_eq + module procedure generic_output_stream_eq end interface interface operator (.ne.) - module procedure genericoutputstream_ne + module procedure generic_output_stream_ne end interface interface - function c_genericoutputstream_ctor_default(stream, SHT_crv) & - result(SHT_rv) & + function c_generic_output_stream_ctor_default(stream, SHT_rv) & + result(SHT_prv) & bind(C, name="SLIC_GenericOutputStream_ctor_default") use iso_c_binding, only : C_CHAR, C_PTR - import :: SLIC_SHROUD_genericoutputstream_capsule + import :: SLIC_SHROUD_capsule_data implicit none character(kind=C_CHAR), intent(IN) :: stream(*) - type(SLIC_SHROUD_genericoutputstream_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv - end function c_genericoutputstream_ctor_default + type(SLIC_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) SHT_prv + end function c_generic_output_stream_ctor_default - function c_genericoutputstream_ctor_default_bufferify(stream, & - Lstream, SHT_crv) & - result(SHT_rv) & + function c_generic_output_stream_ctor_default_bufferify(stream, & + SHT_stream_len, SHT_rv) & + result(SHT_prv) & bind(C, name="SLIC_GenericOutputStream_ctor_default_bufferify") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SLIC_SHROUD_genericoutputstream_capsule + import :: SLIC_SHROUD_capsule_data implicit none character(kind=C_CHAR), intent(IN) :: stream(*) - integer(C_INT), value, intent(IN) :: Lstream - type(SLIC_SHROUD_genericoutputstream_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv - end function c_genericoutputstream_ctor_default_bufferify - - function c_genericoutputstream_ctor_format(stream, format, & - SHT_crv) & - result(SHT_rv) & + integer(C_INT), value, intent(IN) :: SHT_stream_len + type(SLIC_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) SHT_prv + end function c_generic_output_stream_ctor_default_bufferify + + function c_generic_output_stream_ctor_format(stream, format, & + SHT_rv) & + result(SHT_prv) & bind(C, name="SLIC_GenericOutputStream_ctor_format") use iso_c_binding, only : C_CHAR, C_PTR - import :: SLIC_SHROUD_genericoutputstream_capsule + import :: SLIC_SHROUD_capsule_data implicit none character(kind=C_CHAR), intent(IN) :: stream(*) character(kind=C_CHAR), intent(IN) :: format(*) - type(SLIC_SHROUD_genericoutputstream_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv - end function c_genericoutputstream_ctor_format + type(SLIC_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) SHT_prv + end function c_generic_output_stream_ctor_format - function c_genericoutputstream_ctor_format_bufferify(stream, & - Lstream, format, Lformat, SHT_crv) & - result(SHT_rv) & + function c_generic_output_stream_ctor_format_bufferify(stream, & + SHT_stream_len, format, SHT_format_len, SHT_rv) & + result(SHT_prv) & bind(C, name="SLIC_GenericOutputStream_ctor_format_bufferify") use iso_c_binding, only : C_CHAR, C_INT, C_PTR - import :: SLIC_SHROUD_genericoutputstream_capsule + import :: SLIC_SHROUD_capsule_data implicit none character(kind=C_CHAR), intent(IN) :: stream(*) - integer(C_INT), value, intent(IN) :: Lstream + integer(C_INT), value, intent(IN) :: SHT_stream_len character(kind=C_CHAR), intent(IN) :: format(*) - integer(C_INT), value, intent(IN) :: Lformat - type(SLIC_SHROUD_genericoutputstream_capsule), intent(OUT) :: SHT_crv - type(C_PTR) SHT_rv - end function c_genericoutputstream_ctor_format_bufferify + integer(C_INT), value, intent(IN) :: SHT_format_len + type(SLIC_SHROUD_capsule_data), intent(OUT) :: SHT_rv + type(C_PTR) SHT_prv + end function c_generic_output_stream_ctor_format_bufferify - subroutine c_genericoutputstream_delete(self) & + subroutine c_generic_output_stream_delete(self) & bind(C, name="SLIC_GenericOutputStream_delete") - import :: SLIC_SHROUD_genericoutputstream_capsule + import :: SLIC_SHROUD_capsule_data implicit none - type(SLIC_SHROUD_genericoutputstream_capsule), intent(IN) :: self - end subroutine c_genericoutputstream_delete - - ! splicer begin class.GenericOutputStream.additional_interfaces - ! splicer end class.GenericOutputStream.additional_interfaces + type(SLIC_SHROUD_capsule_data), intent(INOUT) :: self + end subroutine c_generic_output_stream_delete subroutine slic_initialize() & bind(C, name="SLIC_initialize") @@ -124,132 +122,133 @@ end subroutine slic_initialize function c_is_initialized() & result(SHT_rv) & - bind(C, name="SLIC_is_initialized") + bind(C, name="SLIC_isInitialized") use iso_c_binding, only : C_BOOL implicit none logical(C_BOOL) :: SHT_rv end function c_is_initialized subroutine c_create_logger(name, imask) & - bind(C, name="SLIC_create_logger") + bind(C, name="SLIC_createLogger") use iso_c_binding, only : C_CHAR implicit none character(kind=C_CHAR), intent(IN) :: name(*) character(kind=C_CHAR), value, intent(IN) :: imask end subroutine c_create_logger - subroutine c_create_logger_bufferify(name, Lname, imask) & - bind(C, name="SLIC_create_logger_bufferify") + subroutine c_create_logger_bufferify(name, SHT_name_len, imask) & + bind(C, name="SLIC_createLogger_bufferify") use iso_c_binding, only : C_CHAR, C_INT implicit none character(kind=C_CHAR), intent(IN) :: name(*) - integer(C_INT), value, intent(IN) :: Lname + integer(C_INT), value, intent(IN) :: SHT_name_len character(kind=C_CHAR), value, intent(IN) :: imask end subroutine c_create_logger_bufferify function c_activate_logger(name) & result(SHT_rv) & - bind(C, name="SLIC_activate_logger") + bind(C, name="SLIC_activateLogger") use iso_c_binding, only : C_BOOL, C_CHAR implicit none character(kind=C_CHAR), intent(IN) :: name(*) logical(C_BOOL) :: SHT_rv end function c_activate_logger - function c_activate_logger_bufferify(name, Lname) & + function c_activate_logger_bufferify(name, SHT_name_len) & result(SHT_rv) & - bind(C, name="SLIC_activate_logger_bufferify") + bind(C, name="SLIC_activateLogger_bufferify") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT implicit none character(kind=C_CHAR), intent(IN) :: name(*) - integer(C_INT), value, intent(IN) :: Lname + integer(C_INT), value, intent(IN) :: SHT_name_len logical(C_BOOL) :: SHT_rv end function c_activate_logger_bufferify - subroutine c_get_active_logger_name_bufferify(name, Nname) & - bind(C, name="SLIC_get_active_logger_name_bufferify") + subroutine c_get_active_logger_name_bufferify(name, & + SHT_name_len) & + bind(C, name="SLIC_getActiveLoggerName_bufferify") use iso_c_binding, only : C_CHAR, C_INT implicit none character(kind=C_CHAR), intent(OUT) :: name(*) - integer(C_INT), value, intent(IN) :: Nname + integer(C_INT), value, intent(IN) :: SHT_name_len end subroutine c_get_active_logger_name_bufferify function slic_get_logging_msg_level() & result(SHT_rv) & - bind(C, name="SLIC_get_logging_msg_level") + bind(C, name="SLIC_getLoggingMsgLevel") use iso_c_binding, only : C_INT implicit none integer(C_INT) :: SHT_rv end function slic_get_logging_msg_level subroutine slic_set_logging_msg_level(level) & - bind(C, name="SLIC_set_logging_msg_level") + bind(C, name="SLIC_setLoggingMsgLevel") use iso_c_binding, only : C_INT implicit none integer(C_INT), value, intent(IN) :: level end subroutine slic_set_logging_msg_level subroutine c_add_stream_to_msg_level(ls, level) & - bind(C, name="SLIC_add_stream_to_msg_level") + bind(C, name="SLIC_addStreamToMsgLevel") use iso_c_binding, only : C_INT - import :: SLIC_SHROUD_genericoutputstream_capsule + import :: SLIC_SHROUD_capsule_data implicit none - type(SLIC_SHROUD_genericoutputstream_capsule), intent(INOUT) :: ls + type(SLIC_SHROUD_capsule_data), intent(INOUT) :: ls integer(C_INT), value, intent(IN) :: level end subroutine c_add_stream_to_msg_level subroutine c_add_stream_to_all_msg_levels(ls) & - bind(C, name="SLIC_add_stream_to_all_msg_levels") - import :: SLIC_SHROUD_genericoutputstream_capsule + bind(C, name="SLIC_addStreamToAllMsgLevels") + import :: SLIC_SHROUD_capsule_data implicit none - type(SLIC_SHROUD_genericoutputstream_capsule), intent(INOUT) :: ls + type(SLIC_SHROUD_capsule_data), intent(INOUT) :: ls end subroutine c_add_stream_to_all_msg_levels subroutine c_set_abort_on_error(status) & - bind(C, name="SLIC_set_abort_on_error") + bind(C, name="SLIC_setAbortOnError") use iso_c_binding, only : C_BOOL implicit none logical(C_BOOL), value, intent(IN) :: status end subroutine c_set_abort_on_error subroutine slic_enable_abort_on_error() & - bind(C, name="SLIC_enable_abort_on_error") + bind(C, name="SLIC_enableAbortOnError") implicit none end subroutine slic_enable_abort_on_error subroutine slic_disable_abort_on_error() & - bind(C, name="SLIC_disable_abort_on_error") + bind(C, name="SLIC_disableAbortOnError") implicit none end subroutine slic_disable_abort_on_error function c_is_abort_on_errors_enabled() & result(SHT_rv) & - bind(C, name="SLIC_is_abort_on_errors_enabled") + bind(C, name="SLIC_isAbortOnErrorsEnabled") use iso_c_binding, only : C_BOOL implicit none logical(C_BOOL) :: SHT_rv end function c_is_abort_on_errors_enabled subroutine c_set_abort_on_warning(status) & - bind(C, name="SLIC_set_abort_on_warning") + bind(C, name="SLIC_setAbortOnWarning") use iso_c_binding, only : C_BOOL implicit none logical(C_BOOL), value, intent(IN) :: status end subroutine c_set_abort_on_warning subroutine slic_enable_abort_on_warning() & - bind(C, name="SLIC_enable_abort_on_warning") + bind(C, name="SLIC_enableAbortOnWarning") implicit none end subroutine slic_enable_abort_on_warning subroutine slic_disable_abort_on_warning() & - bind(C, name="SLIC_disable_abort_on_warning") + bind(C, name="SLIC_disableAbortOnWarning") implicit none end subroutine slic_disable_abort_on_warning function c_is_abort_on_warnings_enabled() & result(SHT_rv) & - bind(C, name="SLIC_is_abort_on_warnings_enabled") + bind(C, name="SLIC_isAbortOnWarningsEnabled") use iso_c_binding, only : C_BOOL implicit none logical(C_BOOL) :: SHT_rv @@ -257,7 +256,7 @@ end function c_is_abort_on_warnings_enabled subroutine c_log_message_file_line(level, message, fileName, & line) & - bind(C, name="SLIC_log_message_file_line") + bind(C, name="SLIC_logMessage_file_line") use iso_c_binding, only : C_CHAR, C_INT implicit none integer(C_INT), value, intent(IN) :: level @@ -267,21 +266,21 @@ subroutine c_log_message_file_line(level, message, fileName, & end subroutine c_log_message_file_line subroutine c_log_message_file_line_bufferify(level, message, & - Lmessage, fileName, LfileName, line) & - bind(C, name="SLIC_log_message_file_line_bufferify") + SHT_message_len, fileName, SHT_fileName_len, line) & + bind(C, name="SLIC_logMessage_file_line_bufferify") use iso_c_binding, only : C_CHAR, C_INT implicit none integer(C_INT), value, intent(IN) :: level character(kind=C_CHAR), intent(IN) :: message(*) - integer(C_INT), value, intent(IN) :: Lmessage + integer(C_INT), value, intent(IN) :: SHT_message_len character(kind=C_CHAR), intent(IN) :: fileName(*) - integer(C_INT), value, intent(IN) :: LfileName + integer(C_INT), value, intent(IN) :: SHT_fileName_len integer(C_INT), value, intent(IN) :: line end subroutine c_log_message_file_line_bufferify subroutine c_log_message_file_line_filter(level, message, & fileName, line, filter_duplicates) & - bind(C, name="SLIC_log_message_file_line_filter") + bind(C, name="SLIC_logMessage_file_line_filter") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT implicit none integer(C_INT), value, intent(IN) :: level @@ -292,40 +291,41 @@ subroutine c_log_message_file_line_filter(level, message, & end subroutine c_log_message_file_line_filter subroutine c_log_message_file_line_filter_bufferify(level, & - message, Lmessage, fileName, LfileName, line, & - filter_duplicates) & - bind(C, name="SLIC_log_message_file_line_filter_bufferify") + message, SHT_message_len, fileName, SHT_fileName_len, & + line, filter_duplicates) & + bind(C, name="SLIC_logMessage_file_line_filter_bufferify") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT implicit none integer(C_INT), value, intent(IN) :: level character(kind=C_CHAR), intent(IN) :: message(*) - integer(C_INT), value, intent(IN) :: Lmessage + integer(C_INT), value, intent(IN) :: SHT_message_len character(kind=C_CHAR), intent(IN) :: fileName(*) - integer(C_INT), value, intent(IN) :: LfileName + integer(C_INT), value, intent(IN) :: SHT_fileName_len integer(C_INT), value, intent(IN) :: line logical(C_BOOL), value, intent(IN) :: filter_duplicates end subroutine c_log_message_file_line_filter_bufferify subroutine c_log_message(level, message) & - bind(C, name="SLIC_log_message") + bind(C, name="SLIC_logMessage") use iso_c_binding, only : C_CHAR, C_INT implicit none integer(C_INT), value, intent(IN) :: level character(kind=C_CHAR), intent(IN) :: message(*) end subroutine c_log_message - subroutine c_log_message_bufferify(level, message, Lmessage) & - bind(C, name="SLIC_log_message_bufferify") + subroutine c_log_message_bufferify(level, message, & + SHT_message_len) & + bind(C, name="SLIC_logMessage_bufferify") use iso_c_binding, only : C_CHAR, C_INT implicit none integer(C_INT), value, intent(IN) :: level character(kind=C_CHAR), intent(IN) :: message(*) - integer(C_INT), value, intent(IN) :: Lmessage + integer(C_INT), value, intent(IN) :: SHT_message_len end subroutine c_log_message_bufferify subroutine c_log_message_filter(level, message, & filter_duplicates) & - bind(C, name="SLIC_log_message_filter") + bind(C, name="SLIC_logMessage_filter") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT implicit none integer(C_INT), value, intent(IN) :: level @@ -334,18 +334,18 @@ subroutine c_log_message_filter(level, message, & end subroutine c_log_message_filter subroutine c_log_message_filter_bufferify(level, message, & - Lmessage, filter_duplicates) & - bind(C, name="SLIC_log_message_filter_bufferify") + SHT_message_len, filter_duplicates) & + bind(C, name="SLIC_logMessage_filter_bufferify") use iso_c_binding, only : C_BOOL, C_CHAR, C_INT implicit none integer(C_INT), value, intent(IN) :: level character(kind=C_CHAR), intent(IN) :: message(*) - integer(C_INT), value, intent(IN) :: Lmessage + integer(C_INT), value, intent(IN) :: SHT_message_len logical(C_BOOL), value, intent(IN) :: filter_duplicates end subroutine c_log_message_filter_bufferify subroutine slic_flush_streams() & - bind(C, name="SLIC_flush_streams") + bind(C, name="SLIC_flushStreams") implicit none end subroutine slic_flush_streams @@ -353,14 +353,11 @@ subroutine slic_finalize() & bind(C, name="SLIC_finalize") implicit none end subroutine slic_finalize - - ! splicer begin additional_interfaces - ! splicer end additional_interfaces end interface interface SlicGenericOutputStream - module procedure slic_genericoutputstream_ctor_default - module procedure slic_genericoutputstream_ctor_format + module procedure slic_generic_output_stream_ctor_default + module procedure slic_generic_output_stream_ctor_format end interface SlicGenericOutputStream interface log_message @@ -370,63 +367,71 @@ end subroutine slic_finalize module procedure slic_log_message_filter end interface log_message + ! splicer begin additional_declarations + ! splicer end additional_declarations + contains - function slic_genericoutputstream_ctor_default(stream) & + function slic_generic_output_stream_ctor_default(stream) & result(SHT_rv) use iso_c_binding, only : C_INT, C_PTR character(len=*), intent(IN) :: stream type(SlicGenericOutputStream) :: SHT_rv - ! splicer begin class.GenericOutputStream.method.ctor_default type(C_PTR) :: SHT_prv - SHT_prv = c_genericoutputstream_ctor_default_bufferify(stream, & - len_trim(stream, kind=C_INT), SHT_rv%cxxmem) + ! splicer begin class.GenericOutputStream.method.ctor_default + integer(C_INT) SHT_stream_len + SHT_stream_len = len(stream, kind=C_INT) + SHT_prv = c_generic_output_stream_ctor_default_bufferify(stream, & + SHT_stream_len, SHT_rv%cxxmem) ! splicer end class.GenericOutputStream.method.ctor_default - end function slic_genericoutputstream_ctor_default + end function slic_generic_output_stream_ctor_default - function slic_genericoutputstream_ctor_format(stream, format) & + function slic_generic_output_stream_ctor_format(stream, format) & result(SHT_rv) use iso_c_binding, only : C_INT, C_PTR character(len=*), intent(IN) :: stream character(len=*), intent(IN) :: format type(SlicGenericOutputStream) :: SHT_rv - ! splicer begin class.GenericOutputStream.method.ctor_format type(C_PTR) :: SHT_prv - SHT_prv = c_genericoutputstream_ctor_format_bufferify(stream, & - len_trim(stream, kind=C_INT), format, & - len_trim(format, kind=C_INT), SHT_rv%cxxmem) + ! splicer begin class.GenericOutputStream.method.ctor_format + integer(C_INT) SHT_stream_len + integer(C_INT) SHT_format_len + SHT_stream_len = len(stream, kind=C_INT) + SHT_format_len = len(format, kind=C_INT) + SHT_prv = c_generic_output_stream_ctor_format_bufferify(stream, & + SHT_stream_len, format, SHT_format_len, SHT_rv%cxxmem) ! splicer end class.GenericOutputStream.method.ctor_format - end function slic_genericoutputstream_ctor_format + end function slic_generic_output_stream_ctor_format - subroutine slic_genericoutputstream_delete(obj) + subroutine slic_generic_output_stream_delete(obj) class(SlicGenericOutputStream) :: obj ! splicer begin class.GenericOutputStream.method.delete - call c_genericoutputstream_delete(obj%cxxmem) + call c_generic_output_stream_delete(obj%cxxmem) ! splicer end class.GenericOutputStream.method.delete - end subroutine slic_genericoutputstream_delete + end subroutine slic_generic_output_stream_delete ! Return pointer to C++ memory. - function slic_genericoutputstream_get_instance(obj) result (cxxptr) + function slic_generic_output_stream_get_instance(obj) result (cxxptr) use iso_c_binding, only: C_PTR class(SlicGenericOutputStream), intent(IN) :: obj type(C_PTR) :: cxxptr cxxptr = obj%cxxmem%addr - end function slic_genericoutputstream_get_instance + end function slic_generic_output_stream_get_instance - subroutine slic_genericoutputstream_set_instance(obj, cxxmem) + subroutine slic_generic_output_stream_set_instance(obj, cxxmem) use iso_c_binding, only: C_PTR class(SlicGenericOutputStream), intent(INOUT) :: obj type(C_PTR), intent(IN) :: cxxmem obj%cxxmem%addr = cxxmem obj%cxxmem%idtor = 0 - end subroutine slic_genericoutputstream_set_instance + end subroutine slic_generic_output_stream_set_instance - function slic_genericoutputstream_associated(obj) result (rv) + function slic_generic_output_stream_associated(obj) result (rv) use iso_c_binding, only: c_associated class(SlicGenericOutputStream), intent(IN) :: obj logical rv rv = c_associated(obj%cxxmem%addr) - end function slic_genericoutputstream_associated + end function slic_generic_output_stream_associated ! splicer begin class.GenericOutputStream.additional_functions ! splicer end class.GenericOutputStream.additional_functions @@ -445,8 +450,9 @@ subroutine slic_create_logger(name, imask) character(len=*), intent(IN) :: name character, value, intent(IN) :: imask ! splicer begin function.create_logger - call c_create_logger_bufferify(name, len_trim(name, kind=C_INT), & - imask) + integer(C_INT) SHT_name_len + SHT_name_len = len(name, kind=C_INT) + call c_create_logger_bufferify(name, SHT_name_len, imask) ! splicer end function.create_logger end subroutine slic_create_logger @@ -456,8 +462,9 @@ function slic_activate_logger(name) & character(len=*), intent(IN) :: name logical :: SHT_rv ! splicer begin function.activate_logger - SHT_rv = c_activate_logger_bufferify(name, & - len_trim(name, kind=C_INT)) + integer(C_INT) SHT_name_len + SHT_name_len = len(name, kind=C_INT) + SHT_rv = c_activate_logger_bufferify(name, SHT_name_len) ! splicer end function.activate_logger end function slic_activate_logger @@ -465,8 +472,9 @@ subroutine slic_get_active_logger_name(name) use iso_c_binding, only : C_INT character(len=*), intent(OUT) :: name ! splicer begin function.get_active_logger_name - call c_get_active_logger_name_bufferify(name, & - len(name, kind=C_INT)) + integer(C_INT) SHT_name_len + SHT_name_len = len(name, kind=C_INT) + call c_get_active_logger_name_bufferify(name, SHT_name_len) ! splicer end function.get_active_logger_name end subroutine slic_get_active_logger_name @@ -532,9 +540,12 @@ subroutine slic_log_message_file_line(level, message, fileName, & character(len=*), intent(IN) :: fileName integer(C_INT), value, intent(IN) :: line ! splicer begin function.log_message_file_line + integer(C_INT) SHT_message_len + integer(C_INT) SHT_fileName_len + SHT_message_len = len(message, kind=C_INT) + SHT_fileName_len = len(fileName, kind=C_INT) call c_log_message_file_line_bufferify(level, message, & - len_trim(message, kind=C_INT), fileName, & - len_trim(fileName, kind=C_INT), line) + SHT_message_len, fileName, SHT_fileName_len, line) ! splicer end function.log_message_file_line end subroutine slic_log_message_file_line @@ -547,11 +558,15 @@ subroutine slic_log_message_file_line_filter(level, message, & integer(C_INT), value, intent(IN) :: line logical, value, intent(IN) :: filter_duplicates ! splicer begin function.log_message_file_line_filter + integer(C_INT) SHT_message_len + integer(C_INT) SHT_fileName_len logical(C_BOOL) SH_filter_duplicates + SHT_message_len = len(message, kind=C_INT) + SHT_fileName_len = len(fileName, kind=C_INT) SH_filter_duplicates = filter_duplicates ! coerce to C_BOOL call c_log_message_file_line_filter_bufferify(level, message, & - len_trim(message, kind=C_INT), fileName, & - len_trim(fileName, kind=C_INT), line, SH_filter_duplicates) + SHT_message_len, fileName, SHT_fileName_len, line, & + SH_filter_duplicates) ! splicer end function.log_message_file_line_filter end subroutine slic_log_message_file_line_filter @@ -560,8 +575,9 @@ subroutine slic_log_message(level, message) integer(C_INT), value, intent(IN) :: level character(len=*), intent(IN) :: message ! splicer begin function.log_message - call c_log_message_bufferify(level, message, & - len_trim(message, kind=C_INT)) + integer(C_INT) SHT_message_len + SHT_message_len = len(message, kind=C_INT) + call c_log_message_bufferify(level, message, SHT_message_len) ! splicer end function.log_message end subroutine slic_log_message @@ -572,17 +588,19 @@ subroutine slic_log_message_filter(level, message, & character(len=*), intent(IN) :: message logical, value, intent(IN) :: filter_duplicates ! splicer begin function.log_message_filter + integer(C_INT) SHT_message_len logical(C_BOOL) SH_filter_duplicates + SHT_message_len = len(message, kind=C_INT) SH_filter_duplicates = filter_duplicates ! coerce to C_BOOL call c_log_message_filter_bufferify(level, message, & - len_trim(message, kind=C_INT), SH_filter_duplicates) + SHT_message_len, SH_filter_duplicates) ! splicer end function.log_message_filter end subroutine slic_log_message_filter ! splicer begin additional_functions ! splicer end additional_functions - function genericoutputstream_eq(a,b) result (rv) + function generic_output_stream_eq(a,b) result (rv) use iso_c_binding, only: c_associated type(SlicGenericOutputStream), intent(IN) ::a,b logical :: rv @@ -591,9 +609,9 @@ function genericoutputstream_eq(a,b) result (rv) else rv = .false. endif - end function genericoutputstream_eq + end function generic_output_stream_eq - function genericoutputstream_ne(a,b) result (rv) + function generic_output_stream_ne(a,b) result (rv) use iso_c_binding, only: c_associated type(SlicGenericOutputStream), intent(IN) ::a,b logical :: rv @@ -602,6 +620,6 @@ function genericoutputstream_ne(a,b) result (rv) else rv = .false. endif - end function genericoutputstream_ne + end function generic_output_stream_ne end module axom_slic diff --git a/src/axom/slic/interface/slic_types.yaml b/src/axom/slic/interface/slic_types.yaml index 22fda023c3..0466e68bd0 100644 --- a/src/axom/slic/interface/slic_types.yaml +++ b/src/axom/slic/interface/slic_types.yaml @@ -1,5 +1,5 @@ # slic_types.yaml -# This file is generated by Shroud 0.12.2. Do not edit. +# This file is generated by Shroud 0.13.0. Do not edit. # # Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and # other Axom Project Developers. See the top-level LICENSE file for details. @@ -19,5 +19,5 @@ typemap: c_type: SLIC_GenericOutputStream f_module_name: axom_slic f_derived_type: SlicGenericOutputStream - f_capsule_data_type: SLIC_SHROUD_genericoutputstream_capsule + f_capsule_data_type: SLIC_SHROUD_capsule_data f_to_c: "{f_var}%cxxmem" From 478df11480fd30940132132312cfafc53e8ed6d4 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 12 Feb 2024 17:39:28 -0800 Subject: [PATCH 441/639] Small comment and typo fixes. --- src/axom/quest/ArrayIndexer.hpp | 4 ++-- src/axom/quest/MarchingCubes.cpp | 10 ++++------ src/axom/quest/MarchingCubes.hpp | 13 +++++++------ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index f65bba5ee8..d8de41ba73 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -26,7 +26,7 @@ class ArrayIndexer public: /*! - @brief Constructor for row- or column major indexing. + @brief Constructor for row- or column-major indexing. @param [in] lengths Lengths of the array @param [in] order: c is column major; r is row major. */ @@ -42,7 +42,7 @@ class ArrayIndexer } /*! - @brief Initialize for row- or column major indexing. + @brief Initialize for row- or column-major indexing. @param [in] shape Shape of the array @param [in] order: c is column major; r is row major. */ diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index a459fda394..83952b838f 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -187,15 +187,13 @@ void MarchingCubes::populateContourMesh( hostAllocatorId); axom::Array tmpfacetNodeIds(m_facetNodeIds, hostAllocatorId); - mesh.appendNodes(tmpfacetNodeCoords.data(), - mesh.getDimension() * m_facetCount); - mesh.appendCells(tmpfacetNodeIds.data(), m_facetCount); + mesh.appendNodes(tmpfacetNodeCoords.data(), contourNodeCount); + mesh.appendCells(tmpfacetNodeIds.data(), contourCellCount); } else { - mesh.appendNodes(m_facetNodeCoords.data(), - mesh.getDimension() * m_facetCount); - mesh.appendCells(m_facetNodeIds.data(), m_facetCount); + mesh.appendNodes(m_facetNodeCoords.data(), contourNodeCount); + mesh.appendCells(m_facetNodeIds.data(), contourCellCount); } if(!cellIdField.empty()) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 491d6d4143..df977bc083 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -102,7 +102,7 @@ class MarchingCubesSingleDomain; * individual contour facets are provided. Blueprint allows users to * specify ids for the domains. If "state/domain_id" exists in the * domains, it is used as the domain id. Otherwise, the domain's - * interation index within the multidomain mesh is used. + * iteration index within the multidomain mesh is used. */ class MarchingCubes { @@ -172,10 +172,11 @@ class MarchingCubes @brief Put generated contour in a mint::UnstructuredMesh. @param mesh Output contour mesh @param cellIdField Name of field to store the array of - parent cells' multidimensional indices. + parent cells ids, numbered in column-major ordering. If empty, the data is not provided. - @param domainIdField Name of field to store the (axom::IndexType) - parent domain ids. If omitted, the data is not provided. + @param domainIdField Name of field to store the + parent domain ids. The type of this data is \c DomainIdType. + If omitted, the data is not provided. If the fields aren't in the mesh, they will be created. @@ -252,7 +253,7 @@ class MarchingCubes @pre isoContour() must have been called. @post outputs can no longer be accessed from object. */ - void relinguishContourData(axom::Array &facetNodeIds, + void relinquishContourData(axom::Array &facetNodeIds, axom::Array &facetNodeCoords, axom::Array &facetParentIds) { @@ -372,7 +373,7 @@ class MarchingCubesSingleDomain SLIC_ASSERT(m_dom->fetch_existing(m_fcnPath + "/association").as_string() == "vertex"); SLIC_ASSERT(m_dom->has_path(m_fcnPath + "/values")); - if(m_impl) m_impl->setFunctionField(fcnField); + m_impl->setFunctionField(fcnField); } void setContourValue(double contourVal) From 897bf1248e4cac50c4803fc01c2afc580e5541bb Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 12 Feb 2024 17:42:33 -0800 Subject: [PATCH 442/639] Fix uninitialized values in RAJA build. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 8a2dc55176..4fa7118770 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -323,14 +323,13 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::StackArray tmpShape1 {1 + parentCellCount}; axom::Array scannedFlags(tmpShape1); - auto scannedFlagsView = scannedFlags.view(); + scannedFlags.fill(0, 1, 0); #if defined(AXOM_USE_RAJA) RAJA::inclusive_scan( RAJA::make_span(crossingFlags.data(), parentCellCount), RAJA::make_span(scannedFlags.data() + 1, parentCellCount), RAJA::operators::plus {}); #else - scannedFlags[0] = 0; for(axom::IndexType n = 0; n < parentCellCount; ++n) { scannedFlags[n + 1] = scannedFlags[n] + crossingFlags[n]; @@ -351,6 +350,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase m_facetIncrs.resize(tmpShape2, 0); m_firstFacetIds.resize(tmpShape3, 0); + auto scannedFlagsView = scannedFlags.view(); auto crossingParentIdsView = m_crossingParentIds.view(); auto facetIncrsView = m_facetIncrs.view(); @@ -371,13 +371,13 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase // and the total number of facets. // + m_firstFacetIds.fill(0, 1, 0); #if defined(AXOM_USE_RAJA) RAJA::inclusive_scan( RAJA::make_span(m_facetIncrs.data(), m_crossingCount), RAJA::make_span(m_firstFacetIds.data() + 1, m_crossingCount), RAJA::operators::plus {}); #else - m_firstFacetIds[0] = 0; for(axom::IndexType n = 0; n < parentCellCount; ++n) { m_firstFacetIds[n + 1] = m_firstFacetIds[n] + m_facetIncrs[n]; @@ -465,9 +465,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::deallocate(crossingId); - // axom::Array prefixSum(m_crossingCount, m_crossingCount); - const auto firstFacetIdsView = m_firstFacetIds.view(); + m_firstFacetIds.fill(0, 1, 0); + const auto firstFacetIdsView = m_firstFacetIds.view(); #if defined(AXOM_USE_RAJA) // Intel oneAPI compiler segfaults with OpenMP RAJA scan #ifdef __INTEL_LLVM_COMPILER @@ -481,13 +481,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase RAJA::make_span(firstFacetIdsView.data() + 1, m_crossingCount), RAJA::operators::plus {}); #else - if(m_crossingCount > 0) + for(axom::IndexType i = 1; i < 1 + m_crossingCount; ++i) { - firstFacetIdsView[0] = 0; - for(axom::IndexType i = 1; i < 1 + m_crossingCount; ++i) - { - firstFacetIdsView[i] = firstFacetIdsView[i - 1] + facetIncrsView[i - 1]; - } + firstFacetIdsView[i] = firstFacetIdsView[i - 1] + facetIncrsView[i - 1]; } #endif axom::copy(&m_facetCount, From 6b810a48b622187c184f4a2d35e6b2d638f045fa Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 12 Feb 2024 22:07:15 -0800 Subject: [PATCH 443/639] Construct ArrayIndexer from order permutation. --- src/axom/quest/ArrayIndexer.hpp | 72 ++++++++++++++++++-- src/axom/quest/tests/quest_array_indexer.cpp | 8 ++- 2 files changed, 75 insertions(+), 5 deletions(-) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index d8de41ba73..62ffb29e37 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -27,12 +27,25 @@ class ArrayIndexer public: /*! @brief Constructor for row- or column-major indexing. - @param [in] lengths Lengths of the array + @param [in] shape Shape of the array @param [in] order: c is column major; r is row major. */ - ArrayIndexer(const axom::StackArray& lengths, char order) + ArrayIndexer(const axom::StackArray& Shape, char order) + { + initialize(Shape, order); + } + + /*! + @brief Constructor for a given order permutation. + @param [in] shape Shape of the array + @param [in] slowestDirs: permutation vector, where + slowestDirs[0] is the slowest direction and + slowestDirs[DIM-1] is the fastest. + */ + ArrayIndexer(const axom::StackArray& shape, + const axom::StackArray& slowestDirs) { - initialize(lengths, order); + initialize(shape, slowestDirs); } //!@brief Constructor for arbitrary-stride indexing. @@ -74,7 +87,29 @@ class ArrayIndexer m_strides[d] = m_strides[d + 1] * shape[d + 1]; } } - SLIC_ASSERT((DIM == 1 && getOrder() == ('r' | 's')) || (getOrder() == order)); + SLIC_ASSERT((DIM == 1 && getOrder() == ('r' | 'c')) || (getOrder() == order)); + } + + /*! + @brief Initialize for a given order permutation. + @param [in] shape Shape of the array + @param [in] slowestDirs: permutation vector, where + slowestDirs[0] is the slowest direction and + slowestDirs[DIM-1] is the fastest. + */ + inline AXOM_HOST_DEVICE void initialize( + const axom::StackArray& shape, + const axom::StackArray& slowestDirs) + { + SLIC_ASSERT(isPermutation(slowestDirs)); + m_slowestDirs = slowestDirs; + m_strides[m_slowestDirs[DIM - 1]] = 1; + for(int d = DIM - 2; d >= 0; --d) + { + int dir = m_slowestDirs[d]; + int fasterDir = m_slowestDirs[d + 1]; + m_strides[dir] = m_strides[fasterDir] * shape[fasterDir]; + } } //!@brief Initialize for arbitrary-stride indexing. @@ -100,6 +135,11 @@ class ArrayIndexer } } + bool operator==(const ArrayIndexer& other) const + { + return m_slowestDirs == other.m_slowestDirs && m_strides == other.m_strides; + } + //!@brief Index directions, ordered from slowest to fastest. inline AXOM_HOST_DEVICE const axom::StackArray& slowestDirs() const { @@ -112,6 +152,30 @@ class ArrayIndexer return m_strides; } + //!@brief Whether a vector is a permutation vector + bool isPermutation(const axom::StackArray& v) + { + // v is a permutation if all its values are unique and in [0, DIM). + axom::StackArray found; + for(int d = 0; d < DIM; ++d) + { + found[d] = false; + } + for(int d = 0; d < DIM; ++d) + { + if(v[d] < 0 || v[d] >= DIM) + { + return false; + } // Out of range. + if(found[v[d]] == true) + { + return false; + } // Repeated indices + found[v[d]] = true; + } + return true; + } + /*! @brief Get the stride order (row- or column-major, or something else). diff --git a/src/axom/quest/tests/quest_array_indexer.cpp b/src/axom/quest/tests/quest_array_indexer.cpp index 7702560b5d..f805574f50 100644 --- a/src/axom/quest/tests/quest_array_indexer.cpp +++ b/src/axom/quest/tests/quest_array_indexer.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" // Test strides and permutations. -TEST(quest_array_indexer, quest_strides_and_permutatations) +TEST(quest_array_indexer, quest_strides_and_permutations) { { // 1D @@ -28,6 +28,9 @@ TEST(quest_array_indexer, quest_strides_and_permutatations) EXPECT_EQ(colIndexer.slowestDirs()[d], colSlowestDirs[d]); EXPECT_EQ(colIndexer.strides()[d], colStrides[d]); } + EXPECT_TRUE( + colIndexer == + (axom::ArrayIndexer(lengths, colSlowestDirs))); axom::ArrayIndexer rowIndexer(lengths, 'r'); EXPECT_EQ(rowIndexer.getOrder(), 'c' | 'r'); @@ -38,6 +41,9 @@ TEST(quest_array_indexer, quest_strides_and_permutatations) EXPECT_EQ(rowIndexer.slowestDirs()[d], rowSlowestDirs[d]); EXPECT_EQ(rowIndexer.strides()[d], rowStrides[d]); } + EXPECT_TRUE( + rowIndexer == + (axom::ArrayIndexer(lengths, rowSlowestDirs))); } { // 2D From ba8746ddebbfefc02f5fc97279f3019160379197 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 23 Jan 2024 16:02:00 -0800 Subject: [PATCH 444/639] First pass at tagged streams draft --- src/axom/slic/core/LogStream.hpp | 5 +- src/axom/slic/core/Logger.cpp | 161 ++++++++++++++++-- src/axom/slic/core/Logger.hpp | 51 +++++- src/axom/slic/interface/slic.cpp | 6 +- src/axom/slic/interface/slic.hpp | 10 +- src/axom/slic/streams/GenericOutputStream.cpp | 3 +- src/axom/slic/streams/GenericOutputStream.hpp | 3 +- src/axom/slic/streams/LumberjackStream.cpp | 3 +- src/axom/slic/streams/LumberjackStream.hpp | 5 +- src/axom/slic/streams/SynchronizedStream.cpp | 3 +- src/axom/slic/streams/SynchronizedStream.hpp | 5 +- 11 files changed, 232 insertions(+), 23 deletions(-) diff --git a/src/axom/slic/core/LogStream.hpp b/src/axom/slic/core/LogStream.hpp index 045617af5b..f69eb4218e 100644 --- a/src/axom/slic/core/LogStream.hpp +++ b/src/axom/slic/core/LogStream.hpp @@ -88,6 +88,8 @@ class LogStream * \param [in] line the line within the file at which the message is appended. * \param [in] filter_duplicates optional parameter that indicates whether * duplicate messages resulting from running in parallel will be filtered out. + * /param [in] tag_stream_only optional parameter that indicates whether the + * message will go only to streams bound to tagName. * * \note The following wildcards may be used to ignore a particular field: *
    @@ -101,7 +103,8 @@ class LogStream const std::string& tagName, const std::string& fileName, int line, - bool filter_duplicates) = 0; + bool filter_duplicates, + bool tag_stream_only) = 0; /*! * \brief Outputs the log stream on the current rank to the console. diff --git a/src/axom/slic/core/Logger.cpp b/src/axom/slic/core/Logger.cpp index ab7cf7388b..03c83bf134 100644 --- a/src/axom/slic/core/Logger.cpp +++ b/src/axom/slic/core/Logger.cpp @@ -75,6 +75,8 @@ Logger::~Logger() m_logStreams[level].clear(); } // END for all levels + + m_taggedStreams.clear(); } //------------------------------------------------------------------------------ @@ -143,6 +145,33 @@ void Logger::addStreamToMsgLevel(LogStream* ls, } } +//------------------------------------------------------------------------------ +void Logger::addStreamToTag(LogStream* ls, + const std::string& tag, + bool pass_ownership) +{ + if(ls == nullptr) + { + std::cerr << "WARNING: supplied log stream is NULL!\n"; + return; + } + + if(m_taggedStreams.find(tag) == m_taggedStreams.end()) + { + m_taggedStreams[tag] = std::vector {ls}; + } + + else + { + m_taggedStreams[tag].push_back(ls); + } + + if(pass_ownership) + { + m_streamObjectsManager[ls] = ls; + } +} + //------------------------------------------------------------------------------ void Logger::addStreamToAllMsgLevels(LogStream* ls) { @@ -165,6 +194,17 @@ int Logger::getNumStreamsAtMsgLevel(message::Level level) return static_cast(m_logStreams[level].size()); } +//------------------------------------------------------------------------------ +int Logger::getNumStreamsAtTag(const std::string& tag) +{ + if(m_taggedStreams.find(tag) == m_taggedStreams.end()) + { + return 0; + } + + return static_cast(m_taggedStreams[tag].size()); +} + //------------------------------------------------------------------------------ LogStream* Logger::getStream(message::Level level, int i) { @@ -177,6 +217,24 @@ LogStream* Logger::getStream(message::Level level, int i) return m_logStreams[level][i]; } +//------------------------------------------------------------------------------ +LogStream* Logger::getStream(const std::string& tag, int i) +{ + if(m_taggedStreams.find(tag) == m_taggedStreams.end()) + { + std::cerr << "ERROR: tag does not exist!\n"; + return nullptr; + } + + if(i < 0 || i >= static_cast(m_taggedStreams[tag].size())) + { + std::cerr << "ERROR: stream index is out-of-bounds!\n"; + return nullptr; + } + + return m_taggedStreams[tag][i]; +} + //------------------------------------------------------------------------------ void Logger::logMessage(message::Level level, const std::string& message, @@ -187,21 +245,24 @@ void Logger::logMessage(message::Level level, MSG_IGNORE_TAG, MSG_IGNORE_FILE, MSG_IGNORE_LINE, - filter_duplicates); + filter_duplicates, + false); } //------------------------------------------------------------------------------ void Logger::logMessage(message::Level level, const std::string& message, const std::string& tagName, - bool filter_duplicates) + bool filter_duplicates, + bool tag_stream_only) { this->logMessage(level, message, tagName, MSG_IGNORE_FILE, MSG_IGNORE_LINE, - filter_duplicates); + filter_duplicates, + tag_stream_only); } //------------------------------------------------------------------------------ @@ -211,7 +272,13 @@ void Logger::logMessage(message::Level level, int line, bool filter_duplicates) { - this->logMessage(level, message, MSG_IGNORE_TAG, fileName, line, filter_duplicates); + this->logMessage(level, + message, + MSG_IGNORE_TAG, + fileName, + line, + filter_duplicates, + false); } //------------------------------------------------------------------------------ @@ -220,24 +287,63 @@ void Logger::logMessage(message::Level level, const std::string& tagName, const std::string& fileName, int line, - bool filter_duplicates) + bool filter_duplicates, + bool tag_stream_only) { - if(m_isEnabled[level] == false) + if(m_isEnabled[level] == false && tag_stream_only == false) + { + return; + } + + if(tag_stream_only == true && tagName == MSG_IGNORE_TAG) + { + std::cerr << "ERROR: message for tagged streams does not have a tag!\n"; + return; + } + + if(tag_stream_only == true && + m_taggedStreams.find(tagName) == m_taggedStreams.end()) { + std::cerr << "ERROR: tag does not exist!\n"; return; } - unsigned nstreams = static_cast(m_logStreams[level].size()); - for(unsigned istream = 0; istream < nstreams; ++istream) + // Message for message levels + if(tag_stream_only == false) + { + unsigned nstreams = static_cast(m_logStreams[level].size()); + for(unsigned istream = 0; istream < nstreams; ++istream) + { + m_logStreams[level][istream]->append(level, + message, + tagName, + fileName, + line, + filter_duplicates, + tag_stream_only); + } + } + + // Message for tagged streams + else { - m_logStreams[level][istream] - ->append(level, message, tagName, fileName, line, filter_duplicates); + for(unsigned int i = 0; i < m_taggedStreams[tagName].size(); i++) + { + m_taggedStreams[tagName][i]->append(level, + message, + tagName, + fileName, + line, + filter_duplicates, + tag_stream_only); + } } } //------------------------------------------------------------------------------ void Logger::outputLocalMessages() { + //Output for all message levels for(int level = message::Error; level < message::Num_Levels; ++level) { unsigned nstreams = static_cast(m_logStreams[level].size()); @@ -248,11 +354,23 @@ void Logger::outputLocalMessages() } // END for all streams } // END for all levels + + // Output for all tagged streams + std::map>::iterator it; + + for(it = m_taggedStreams.begin(); it != m_taggedStreams.end(); it++) + { + for(unsigned int i = 0; i < it->second.size(); i++) + { + it->second[i]->outputLocal(); + } + } } //------------------------------------------------------------------------------ void Logger::flushStreams() { + //Flush for all message levels for(int level = message::Error; level < message::Num_Levels; ++level) { unsigned nstreams = static_cast(m_logStreams[level].size()); @@ -263,11 +381,23 @@ void Logger::flushStreams() } // END for all streams } // END for all levels + + // Flush for all tagged streams + std::map>::iterator it; + + for(it = m_taggedStreams.begin(); it != m_taggedStreams.end(); it++) + { + for(unsigned int i = 0; i < it->second.size(); i++) + { + it->second[i]->flush(); + } + } } //------------------------------------------------------------------------------ void Logger::pushStreams() { + //Push for all message levels for(int level = message::Error; level < message::Num_Levels; ++level) { unsigned nstreams = static_cast(m_logStreams[level].size()); @@ -278,6 +408,17 @@ void Logger::pushStreams() } // END for all streams } // END for all levels + + // Push for all tagged streams + std::map>::iterator it; + + for(it = m_taggedStreams.begin(); it != m_taggedStreams.end(); it++) + { + for(unsigned int i = 0; i < it->second.size(); i++) + { + it->second[i]->push(); + } + } } //------------------------------------------------------------------------------ diff --git a/src/axom/slic/core/Logger.hpp b/src/axom/slic/core/Logger.hpp index 355f1f2095..5d8c6dce59 100644 --- a/src/axom/slic/core/Logger.hpp +++ b/src/axom/slic/core/Logger.hpp @@ -184,6 +184,45 @@ class Logger */ LogStream* getStream(message::Level level, int i); + /*! + * \brief Binds the given stream to the given tag for this Logger instance. + * + * \param [in] ls pointer to the user-supplied LogStream object. + * \param [in] tag the tag that this stream will be associated with. + * \param [in] pass_ownership flag that indicates whether the given logger + * instance owns the supplied LogStream object. This parameter is optional. + * Default is true. + * + * \note The Logger takes ownership of the LogStream object. + * \pre ls != NULL. + */ + void addStreamToTag(LogStream* ls, + const std::string& tag, + bool pass_ownership = true); + + /*! + * \brief Returns the number of streams for a given tag. + * Returns 0 if the tag does not exist. + * + * \param [in] tag the tag in query. + * + * \return N the number of streams at the given level. + * \post N >= 0 + */ + int getNumStreamsAtTag(const std::string& tag); + + /*! + * \brief Returns the ith stream at the given tag. + * + * \param [in] tag the tag in query. + * \param [in] i the index of the stream in query. + * + * \return stream_ptr pointer to the stream. + * \pre i >= 0 && i < this->getNumStreamsAtTag( tag ) + * \post stream_ptr != NULL. + */ + LogStream* getStream(const std::string& tag, int i); + /*! * \brief Logs the given message to all registered streams. * @@ -206,11 +245,14 @@ class Logger * \param [in] filter_duplicates optional parameter that indicates whether * duplicate messages resulting from running in parallel will be filtered out. * Default is false. + * /param [in] tag_stream_only optional parameter that indicates whether the + * message will go only to streams bound to tagName. Default is false. */ void logMessage(message::Level level, const std::string& message, const std::string& tagName, - bool filter_duplicates = false); + bool filter_duplicates = false, + bool tag_stream_only = false); /*! * \brief Logs the given message to all registered streams. @@ -240,13 +282,16 @@ class Logger * \param [in] filter_duplicates optional parameter that indicates whether * duplicate messages resulting from running in parallel will be filtered out. * Default is false. + * /param [in] tag_stream_only optional parameter that indicates whether the + * message will go only to streams bound to tagName. Default is false. */ void logMessage(message::Level level, const std::string& message, const std::string& tagName, const std::string& fileName, int line, - bool filter_duplicates = false); + bool filter_duplicates = false, + bool tag_stream_only = false); /*! * \brief For the current rank, outputs messages from all streams to the @@ -395,6 +440,8 @@ class Logger std::map m_streamObjectsManager; std::vector m_logStreams[message::Num_Levels]; + std::map> m_taggedStreams; + ///@} DISABLE_COPY_AND_ASSIGNMENT(Logger); diff --git a/src/axom/slic/interface/slic.cpp b/src/axom/slic/interface/slic.cpp index d32a36fd18..91f083b793 100644 --- a/src/axom/slic/interface/slic.cpp +++ b/src/axom/slic/interface/slic.cpp @@ -191,7 +191,8 @@ void logMessage(message::Level level, void logMessage(message::Level level, const std::string& message, const std::string& tag, - bool filter_duplicates) + bool filter_duplicates, + bool tag_stream_only) { ensureInitialized(); Logger::getActiveLogger()->logMessage(level, message, tag, filter_duplicates); @@ -218,7 +219,8 @@ void logMessage(message::Level level, const std::string& tag, const std::string& fileName, int line, - bool filter_duplicates) + bool filter_duplicates, + bool tag_stream_only) { ensureInitialized(); Logger::getActiveLogger() diff --git a/src/axom/slic/interface/slic.hpp b/src/axom/slic/interface/slic.hpp index 274de7e8d1..b5775068a8 100644 --- a/src/axom/slic/interface/slic.hpp +++ b/src/axom/slic/interface/slic.hpp @@ -248,11 +248,14 @@ void logMessage(message::Level level, * \param [in] filter_duplicates optional parameter that indicates whether * duplicate messages resulting from running in parallel will be filtered out. * Default is false. + * /param [in] tag_stream_only optional parameter that indicates whether the + * message will go only to streams bound to tagName. Default is false. */ void logMessage(message::Level level, const std::string& message, const std::string& tag, - bool filter_duplicates = false); + bool filter_duplicates = false, + bool tag_stream_only = false); /*! * \brief Logs the given message to all registered streams. @@ -282,13 +285,16 @@ void logMessage(message::Level level, * \param [in] filter_duplicates optional parameter that indicates whether * duplicate messages resulting from running in parallel will be filtered out. * Default is false. + * /param [in] tag_stream_only optional parameter that indicates whether the + * message will go only to streams bound to tagName. Default is false. */ void logMessage(message::Level level, const std::string& message, const std::string& tag, const std::string& fileName, int line, - bool filter_duplicates = false); + bool filter_duplicates = false, + bool tag_stream_only = false); /*! * \brief Convenience method to log an error message. diff --git a/src/axom/slic/streams/GenericOutputStream.cpp b/src/axom/slic/streams/GenericOutputStream.cpp index 69a6dcc825..39de7df769 100644 --- a/src/axom/slic/streams/GenericOutputStream.cpp +++ b/src/axom/slic/streams/GenericOutputStream.cpp @@ -61,7 +61,8 @@ void GenericOutputStream::append(message::Level msgLevel, const std::string& tagName, const std::string& fileName, int line, - bool AXOM_UNUSED_PARAM(filtered_duplicates)) + bool AXOM_UNUSED_PARAM(filtered_duplicates), + bool AXOM_UNUSED_PARAM(tag_stream_only)) { if(m_stream == nullptr) { diff --git a/src/axom/slic/streams/GenericOutputStream.hpp b/src/axom/slic/streams/GenericOutputStream.hpp index 1bcf1893b1..83ccf65fe7 100644 --- a/src/axom/slic/streams/GenericOutputStream.hpp +++ b/src/axom/slic/streams/GenericOutputStream.hpp @@ -85,7 +85,8 @@ class GenericOutputStream : public LogStream const std::string& tagName, const std::string& fileName, int line, - bool filter_duplicates); + bool filter_duplicates, + bool tag_stream_only); /*! * \brief Outputs the log stream to the console. diff --git a/src/axom/slic/streams/LumberjackStream.cpp b/src/axom/slic/streams/LumberjackStream.cpp index 14eabd8816..767f41efaf 100644 --- a/src/axom/slic/streams/LumberjackStream.cpp +++ b/src/axom/slic/streams/LumberjackStream.cpp @@ -72,7 +72,8 @@ void LumberjackStream::append(message::Level msgLevel, const std::string& tagName, const std::string& fileName, int line, - bool AXOM_UNUSED_PARAM(filter_duplicates)) + bool AXOM_UNUSED_PARAM(filter_duplicates), + bool AXOM_UNUSED_PARAM(tag_stream_only)) { if(m_lj == nullptr) { diff --git a/src/axom/slic/streams/LumberjackStream.hpp b/src/axom/slic/streams/LumberjackStream.hpp index ab5110c299..5bac899a46 100644 --- a/src/axom/slic/streams/LumberjackStream.hpp +++ b/src/axom/slic/streams/LumberjackStream.hpp @@ -68,6 +68,8 @@ class LumberjackStream : public LogStream * \param [in] line the line within the file at which the message is appended. * \param [in] filter_duplicates optional parameter that indicates whether * duplicate messages resulting from running in parallel will be filtered out. + * /param [in] tag_stream_only optional parameter that indicates whether the + * message will go only to streams bound to tagName. * * \note This method doesn't put anything to the console. Instead the * messages are cached locally to each ranks and are dumped to the console @@ -78,7 +80,8 @@ class LumberjackStream : public LogStream const std::string& tagName, const std::string& fileName, int line, - bool filter_duplicates); + bool filter_duplicates, + bool tag_stream_only); /*! * \brief Pushes the messages from the current rank directly to the diff --git a/src/axom/slic/streams/SynchronizedStream.cpp b/src/axom/slic/streams/SynchronizedStream.cpp index 8f719ca9ef..12d00ed33c 100644 --- a/src/axom/slic/streams/SynchronizedStream.cpp +++ b/src/axom/slic/streams/SynchronizedStream.cpp @@ -74,7 +74,8 @@ void SynchronizedStream::append(message::Level msgLevel, const std::string& tagName, const std::string& fileName, int line, - bool AXOM_UNUSED_PARAM(filter_duplicates)) + bool AXOM_UNUSED_PARAM(filter_duplicates), + bool AXOM_UNUSED_PARAM(tag_stream_only)) { if(m_cache == nullptr) { diff --git a/src/axom/slic/streams/SynchronizedStream.hpp b/src/axom/slic/streams/SynchronizedStream.hpp index 675e1d0b05..36a45b7750 100644 --- a/src/axom/slic/streams/SynchronizedStream.hpp +++ b/src/axom/slic/streams/SynchronizedStream.hpp @@ -60,6 +60,8 @@ class SynchronizedStream : public LogStream * \param [in] line the line within the file at which the message is appended. * \param [in] filter_duplicates optional parameter that indicates whether * duplicate messages resulting from running in parallel will be filtered out. + * /param [in] tag_stream_only optional parameter that indicates whether the + * message will go only to streams bound to tagName. * * \note This method doesn't put anything to the console. Instead the * messages are cached locally to each ranks and are dumped to the console @@ -70,7 +72,8 @@ class SynchronizedStream : public LogStream const std::string& tagName, const std::string& fileName, int line, - bool filter_duplicates); + bool filter_duplicates, + bool tag_stream_only); /*! * \brief Dumps the messages from the current rank directly to the From 35612284ad096e260d021771eeac5930780a1096 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 23 Jan 2024 16:54:26 -0800 Subject: [PATCH 445/639] Add addStreamToAllTags() function --- src/axom/slic/core/Logger.cpp | 23 +++++++++++++++++++++++ src/axom/slic/core/Logger.hpp | 10 ++++++++++ 2 files changed, 33 insertions(+) diff --git a/src/axom/slic/core/Logger.cpp b/src/axom/slic/core/Logger.cpp index 03c83bf134..40d6899b65 100644 --- a/src/axom/slic/core/Logger.cpp +++ b/src/axom/slic/core/Logger.cpp @@ -188,6 +188,29 @@ void Logger::addStreamToAllMsgLevels(LogStream* ls) } // END for all levels } +//------------------------------------------------------------------------------ +void Logger::addStreamToAllTags(LogStream* ls) +{ + if(ls == nullptr) + { + std::cerr << "WARNING: supplied log stream is NULL!\n"; + return; + } + + if(ls == nullptr) + { + std::cerr << "WARNING: no tags are available!\n"; + return; + } + + std::map>::iterator it; + + for(it = m_taggedStreams.begin(); it != m_taggedStreams.end(); it++) + { + this->addStreamToTag(ls, it->first); + } +} + //------------------------------------------------------------------------------ int Logger::getNumStreamsAtMsgLevel(message::Level level) { diff --git a/src/axom/slic/core/Logger.hpp b/src/axom/slic/core/Logger.hpp index 5d8c6dce59..281c3fb656 100644 --- a/src/axom/slic/core/Logger.hpp +++ b/src/axom/slic/core/Logger.hpp @@ -200,6 +200,16 @@ class Logger const std::string& tag, bool pass_ownership = true); + /*! + * \brief Binds the given stream to all the tags for this Logger instance. + * + * \param [in] ls pointer to the user-supplied LogStream object. + * + * \note The Logger takes ownership of the LogStream object. + * \pre ls != NULL. + */ + void addStreamToAllTags(LogStream* ls); + /*! * \brief Returns the number of streams for a given tag. * Returns 0 if the tag does not exist. From ad5d1b2cfbbd9e1111dda85908fb224497d09037 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 24 Jan 2024 08:51:27 -0800 Subject: [PATCH 446/639] Add new tag functions() to slic class --- src/axom/slic/core/Logger.hpp | 2 +- src/axom/slic/interface/slic.cpp | 50 ++++++++++++++++++++++++++++++-- src/axom/slic/interface/slic.hpp | 49 +++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 4 deletions(-) diff --git a/src/axom/slic/core/Logger.hpp b/src/axom/slic/core/Logger.hpp index 281c3fb656..4e9b27df32 100644 --- a/src/axom/slic/core/Logger.hpp +++ b/src/axom/slic/core/Logger.hpp @@ -216,7 +216,7 @@ class Logger * * \param [in] tag the tag in query. * - * \return N the number of streams at the given level. + * \return N the number of streams for the given tag. * \post N >= 0 */ int getNumStreamsAtTag(const std::string& tag); diff --git a/src/axom/slic/interface/slic.cpp b/src/axom/slic/interface/slic.cpp index 91f083b793..9f64b1c055 100644 --- a/src/axom/slic/interface/slic.cpp +++ b/src/axom/slic/interface/slic.cpp @@ -178,6 +178,41 @@ void addStreamToAllMsgLevels(GenericOutputStream* ls) Logger::getActiveLogger()->addStreamToAllMsgLevels(ls); } +//------------------------------------------------------------------------------ +void addStreamToTag(LogStream* ls, const std::string& tag) +{ + ensureInitialized(); + Logger::getActiveLogger()->addStreamToTag(ls, tag); +} + +//------------------------------------------------------------------------------ +void addStreamToTag(GenericOutputStream* ls, const std::string& tag) +{ + ensureInitialized(); + Logger::getActiveLogger()->addStreamToTag(ls, tag); +} + +//------------------------------------------------------------------------------ +void addStreamToAllTags(LogStream* ls) +{ + ensureInitialized(); + Logger::getActiveLogger()->addStreamToAllTags(ls); +} + +//------------------------------------------------------------------------------ +void addStreamToAllTags(GenericOutputStream* ls) +{ + ensureInitialized(); + Logger::getActiveLogger()->addStreamToAllTags(ls); +} + +//------------------------------------------------------------------------------ +int getNumStreamsAtTag(const std::string& tag) +{ + ensureInitialized(); + return Logger::getActiveLogger()->getNumStreamsAtTag(tag); +} + //------------------------------------------------------------------------------ void logMessage(message::Level level, const std::string& message, @@ -195,7 +230,11 @@ void logMessage(message::Level level, bool tag_stream_only) { ensureInitialized(); - Logger::getActiveLogger()->logMessage(level, message, tag, filter_duplicates); + Logger::getActiveLogger()->logMessage(level, + message, + tag, + filter_duplicates, + tag_stream_only); } //------------------------------------------------------------------------------ @@ -223,8 +262,13 @@ void logMessage(message::Level level, bool tag_stream_only) { ensureInitialized(); - Logger::getActiveLogger() - ->logMessage(level, message, tag, fileName, line, filter_duplicates); + Logger::getActiveLogger()->logMessage(level, + message, + tag, + fileName, + line, + filter_duplicates, + tag_stream_only); } //------------------------------------------------------------------------------ diff --git a/src/axom/slic/interface/slic.hpp b/src/axom/slic/interface/slic.hpp index b5775068a8..146435fc7c 100644 --- a/src/axom/slic/interface/slic.hpp +++ b/src/axom/slic/interface/slic.hpp @@ -226,6 +226,55 @@ void addStreamToAllMsgLevels(LogStream* ls); */ void addStreamToAllMsgLevels(GenericOutputStream* ls); +/*! +* \brief Binds the given stream to the given tag. +* +* \param [in] ls pointer to the user-supplied LogStream object. +* \param [in] tag the tag that this stream will be associated with. +* +* \pre ls != nullptr. +*/ +void addStreamToTag(LogStream* ls, const std::string& tag); + +/*! +* \brief Binds the given GenericOutputStream to the given tag. +* +* \param [in] ls pointer to the user-supplied GenericOutputStream. +* \param [in] tag the tag that this stream will be associated with. +* +* \pre ls != nullptr. +*/ +void addStreamToTag(GenericOutputStream* ls, const std::string& tag); + +/*! +* \brief Binds the given stream to all the tags. +* +* \param [in] ls pointer to the user-supplied LogStream object. +* +* \pre ls != nullptr. +*/ +void addStreamToAllTags(LogStream* ls); + +/*! +* \brief Binds the given GenericOutputStream to all the tags. +* +* \param [in] ls pointer to the user-supplied GenericOutputStream. +* +* \pre ls != nullptr. +*/ +void addStreamToAllTags(GenericOutputStream* ls); + +/*! +* \brief Returns the number of streams for a given tag. +* Returns 0 if the tag does not exist. +* +* \param [in] tag the tag in query. +* +* \return N the number of streams for the given tag. +* \post N >= 0 +*/ +int getNumStreamsAtTag(const std::string& tag); + /*! * \brief Logs the given message to all registered streams. * From c2f115a4069e60bfd6015c85db52e64740fed6f5 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 24 Jan 2024 09:33:10 -0800 Subject: [PATCH 447/639] Add SLIC_INFO_TAGGED(msg, tag) macro, and tests to slic_unit_test --- src/axom/slic/interface/slic_macros.hpp | 29 +++++++++++++++++++++++++ src/axom/slic/tests/slic_uninit.cpp | 21 ++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/src/axom/slic/interface/slic_macros.hpp b/src/axom/slic/interface/slic_macros.hpp index 02896d0e2d..6f5dd463b7 100644 --- a/src/axom/slic/interface/slic_macros.hpp +++ b/src/axom/slic/interface/slic_macros.hpp @@ -578,6 +578,35 @@ AXOM_HOST_DEVICE inline blackhole &operator<<(blackhole &bh, T) __LINE__); \ } while(axom::slic::detail::false_value) +/*! + * \def SLIC_INFO_TAGGED( tag, msg ) + * \brief Logs an Info message to a tagged stream + * + * \param [in] tag user-supplied tag + * \param [in] msg user-supplied message + * + * \note The SLIC_INFO macro is always active. + * + * Usage: + * \code + * SLIC_INFO( "tag","informative text goes here" ); + * \endcode + * + */ +#define SLIC_INFO_TAGGED(msg, tag) \ + do \ + { \ + std::ostringstream __oss; \ + __oss << msg; \ + axom::slic::logMessage(axom::slic::message::Info, \ + __oss.str(), \ + tag, \ + __FILE__, \ + __LINE__, \ + false, \ + true); \ + } while(axom::slic::detail::false_value) + /*! * \def SLIC_INFO_IF( EXP, msg ) * \brief Logs an Info message iff EXP is true diff --git a/src/axom/slic/tests/slic_uninit.cpp b/src/axom/slic/tests/slic_uninit.cpp index e95f2c9fb2..6709197d16 100644 --- a/src/axom/slic/tests/slic_uninit.cpp +++ b/src/axom/slic/tests/slic_uninit.cpp @@ -27,6 +27,8 @@ TEST(slic_uninit, log_macro) []() { SLIC_DEBUG_IF(true, "debug message should print"); }); #endif testInit("info message", []() { SLIC_INFO("test info message"); }); + testInit("tagged info message", + []() { SLIC_INFO_TAGGED("test info message", "test_tag"); }); testInit("info_if", []() { SLIC_INFO_IF(true, "info message should print"); }); testInit("warning message", []() { SLIC_WARNING("test warning message"); }); testInit("warning_if", []() { SLIC_WARNING_IF(true, "test warning message"); }); @@ -78,11 +80,24 @@ TEST(slic_uninit, manage_loggers) new axom::slic::GenericOutputStream(&std::cout, format), axom::slic::message::Info); }); + testInit("addStreamToTag", []() { + std::string format("[]: \n"); + axom::slic::addStreamToTag( + new axom::slic::GenericOutputStream(&std::cout, format), + "Test"); + }); testInit("addStreamToAllMsgLevels", []() { std::string format("[]: \n"); axom::slic::addStreamToAllMsgLevels( new axom::slic::GenericOutputStream(&std::cout, format)); }); + testInit("addStreamToAllTags", []() { + std::string format("[]: \n"); + axom::slic::addStreamToAllTags( + new axom::slic::GenericOutputStream(&std::cout, format)); + }); + testInit("getNumStreamsAtTag", + []() { axom::slic::getNumStreamsAtTag("Test"); }); } TEST(slic_uninit, log_methods) @@ -96,12 +111,18 @@ TEST(slic_uninit, log_methods) testInit("logMessage_B", [&]() { axom::slic::logMessage(lvl, "another info message", "tagB"); }); + testInit("logMessage_B_Tagged", [&]() { + axom::slic::logMessage(lvl, "another info message", "tagB", false, true); + }); testInit("logMessage_C", [&, fname]() { axom::slic::logMessage(lvl, "info msg", fname, line); }); testInit("logMessage_D", [&, fname]() { axom::slic::logMessage(lvl, "info msg", "tagD", fname, line); }); + testInit("logMessage_D_Tagged", [&, fname]() { + axom::slic::logMessage(lvl, "info msg", "tagD", fname, line, false, true); + }); testInit("logErrorMessage", [&, fname]() { axom::slic::logErrorMessage("an error message", fname, line); From eeb79e036ca9a6c1840caad8ffe2fd340169adfa Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 24 Jan 2024 10:28:57 -0800 Subject: [PATCH 448/639] Test SLIC_INFO_TAGGED in slic_macros_test --- src/axom/slic/tests/slic_macros.cpp | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/axom/slic/tests/slic_macros.cpp b/src/axom/slic/tests/slic_macros.cpp index 449f574895..ebdbd1d6b4 100644 --- a/src/axom/slic/tests/slic_macros.cpp +++ b/src/axom/slic/tests/slic_macros.cpp @@ -103,6 +103,17 @@ void check_line(const std::string& msg, int expected_line) EXPECT_EQ(line, expected_line); } +//------------------------------------------------------------------------------ +void check_tag(const std::string& msg, const std::string& expected_tag) +{ + EXPECT_FALSE(msg.empty()); + + // extract tag + size_t start = msg.rfind("##") + 2; + std::string tag = msg.substr(start, expected_tag.length()); + EXPECT_EQ(tag, expected_tag); +} + } // end anonymous namespace //------------------------------------------------------------------------------ @@ -381,6 +392,23 @@ TEST(slic_macros, test_check_macros) #endif } +//------------------------------------------------------------------------------ +TEST(slic_macros, test_tagged_macros) +{ + EXPECT_TRUE(slic::internal::is_stream_empty()); + SLIC_INFO_TAGGED("test tagged info message", "myTag"); + EXPECT_FALSE(slic::internal::is_stream_empty()); + check_level(slic::internal::test_stream.str(), "INFO"); + check_msg(slic::internal::test_stream.str(), "test tagged info message"); + check_file(slic::internal::test_stream.str()); + check_line(slic::internal::test_stream.str(), __LINE__ - 5); + check_tag(slic::internal::test_stream.str(), "myTag"); + slic::internal::clear(); + + SLIC_INFO_TAGGED("this message should not be logged!", "tag404"); + EXPECT_TRUE(slic::internal::is_stream_empty()); +} + //------------------------------------------------------------------------------ int main(int argc, char* argv[]) { @@ -398,6 +426,12 @@ int main(int argc, char* argv[]) slic::addStreamToAllMsgLevels( new slic::GenericOutputStream(&slic::internal::test_stream, msgfmt)); + std::string msgtagfmt = + "[]:;;;;\n##\n@@\n@@"; + slic::addStreamToTag( + new slic::GenericOutputStream(&slic::internal::test_stream, msgtagfmt), + "myTag"); + // finalized when exiting main scope result = RUN_ALL_TESTS(); From 41c62b8592c28272f6002564989dde04e39da3b6 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 24 Jan 2024 11:32:17 -0800 Subject: [PATCH 449/639] Make slic_macros_test a bit more descriptive --- src/axom/slic/tests/slic_macros.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/axom/slic/tests/slic_macros.cpp b/src/axom/slic/tests/slic_macros.cpp index ebdbd1d6b4..f5701c944f 100644 --- a/src/axom/slic/tests/slic_macros.cpp +++ b/src/axom/slic/tests/slic_macros.cpp @@ -405,7 +405,10 @@ TEST(slic_macros, test_tagged_macros) check_tag(slic::internal::test_stream.str(), "myTag"); slic::internal::clear(); - SLIC_INFO_TAGGED("this message should not be logged!", "tag404"); + SLIC_INFO_TAGGED("this message should not be logged (no tag given)!", ""); + EXPECT_TRUE(slic::internal::is_stream_empty()); + + SLIC_INFO_TAGGED("this message should not be logged (tag DNE)!", "tag404"); EXPECT_TRUE(slic::internal::is_stream_empty()); } From 38a1376dc31efae95107abdaf5737d1d57f8ff48 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 24 Jan 2024 11:32:58 -0800 Subject: [PATCH 450/639] Test SLIC_INFO_TAGGED in slic_macros_parallel_test --- src/axom/slic/tests/slic_macros_parallel.cpp | 47 ++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/src/axom/slic/tests/slic_macros_parallel.cpp b/src/axom/slic/tests/slic_macros_parallel.cpp index 5ab5ce6232..685ed33e4e 100644 --- a/src/axom/slic/tests/slic_macros_parallel.cpp +++ b/src/axom/slic/tests/slic_macros_parallel.cpp @@ -104,6 +104,17 @@ void check_line(const std::string& msg, int expected_line) EXPECT_EQ(line, expected_line); } +//------------------------------------------------------------------------------ +void check_tag(const std::string& msg, const std::string& expected_tag) +{ + EXPECT_FALSE(msg.empty()); + + // extract tag + size_t start = msg.rfind("##") + 2; + std::string tag = msg.substr(start, expected_tag.length()); + EXPECT_EQ(tag, expected_tag); +} + //------------------------------------------------------------------------------ bool has_aborted = false; void custom_abort_function() { has_aborted = true; } @@ -137,6 +148,9 @@ class SlicMacrosParallel : public ::testing::TestWithParam std::string msgfmt = "[]:;;;;\n@@\n@@"; + std::string msgtagfmt = + "[]:;;;;\n##\n@@\n@@"; + if(stream_type == "Lumberjack") { slic::addStreamToAllMsgLevels( @@ -144,6 +158,12 @@ class SlicMacrosParallel : public ::testing::TestWithParam MPI_COMM_WORLD, RLIMIT, msgfmt)); + + slic::addStreamToTag(new slic::LumberjackStream(&slic::internal::test_stream, + MPI_COMM_WORLD, + RLIMIT, + msgtagfmt), + "myTag"); } if(stream_type == "Synchronized") @@ -152,6 +172,12 @@ class SlicMacrosParallel : public ::testing::TestWithParam new slic::SynchronizedStream(&slic::internal::test_stream, MPI_COMM_WORLD, msgfmt)); + + slic::addStreamToTag( + new slic::SynchronizedStream(&slic::internal::test_stream, + MPI_COMM_WORLD, + msgtagfmt), + "myTag"); } } @@ -385,6 +411,27 @@ TEST_P(SlicMacrosParallel, test_info_macros) } slic::internal::clear_streams(); + SLIC_INFO_TAGGED("test tagged info message", "myTag"); + slic::flushStreams(); + if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) + { + EXPECT_FALSE(slic::internal::is_stream_empty()); + check_level(slic::internal::test_stream.str(), "INFO"); + check_msg(slic::internal::test_stream.str(), "test tagged info message"); + check_file(slic::internal::test_stream.str()); + check_line(slic::internal::test_stream.str(), __LINE__ - 8); + check_tag(slic::internal::test_stream.str(), "myTag"); + } + slic::internal::clear_streams(); + + SLIC_INFO_TAGGED("this message should not be logged (no tag given)!", ""); + slic::flushStreams(); + EXPECT_TRUE(slic::internal::is_stream_empty()); + + SLIC_INFO_TAGGED("this message should not be logged (tag DNE)!", "tag404"); + slic::flushStreams(); + EXPECT_TRUE(slic::internal::is_stream_empty()); + SLIC_INFO_IF(false, "this message should not be logged!"); slic::flushStreams(); EXPECT_TRUE(slic::internal::is_stream_empty()); From 0570d814603f2e56b4d5f6256f494f2715e32707 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 24 Jan 2024 15:34:45 -0800 Subject: [PATCH 451/639] Add a TextTagCombiner that combines based on text and tag --- src/axom/lumberjack/CMakeLists.txt | 1 + src/axom/lumberjack/TextTagCombiner.hpp | 102 ++++++++++++++++ src/axom/lumberjack/tests/CMakeLists.txt | 3 +- .../tests/lumberjack_TextTagCombiner.hpp | 110 ++++++++++++++++++ .../tests/lumberjack_serial_main.cpp | 1 + 5 files changed, 216 insertions(+), 1 deletion(-) create mode 100644 src/axom/lumberjack/TextTagCombiner.hpp create mode 100644 src/axom/lumberjack/tests/lumberjack_TextTagCombiner.hpp diff --git a/src/axom/lumberjack/CMakeLists.txt b/src/axom/lumberjack/CMakeLists.txt index 7545bb0322..97c2cdcbb1 100644 --- a/src/axom/lumberjack/CMakeLists.txt +++ b/src/axom/lumberjack/CMakeLists.txt @@ -18,6 +18,7 @@ set(lumberjack_headers MPIUtility.hpp RootCommunicator.hpp TextEqualityCombiner.hpp + TextTagCombiner.hpp ) set(lumberjack_sources diff --git a/src/axom/lumberjack/TextTagCombiner.hpp b/src/axom/lumberjack/TextTagCombiner.hpp new file mode 100644 index 0000000000..ab03230706 --- /dev/null +++ b/src/axom/lumberjack/TextTagCombiner.hpp @@ -0,0 +1,102 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +/*! + ******************************************************************************* + * \file TextTagCombiner.hpp + * + * \brief This file contains the class implementation of the + * TextTagCombiner. + ******************************************************************************* + */ + +#ifndef TEXTTAGCOMBINER_HPP +#define TEXTTAGCOMBINER_HPP + +#include "axom/lumberjack/Combiner.hpp" +#include "axom/lumberjack/Message.hpp" + +#include + +namespace axom +{ +namespace lumberjack +{ +/*! + ******************************************************************************* + * \class Tex + * + * \brief Combines Message classes if their Message::text and Message::tag + * are equal. + * + * This class instance is automatically added to Lumberjack's Lumberjack for + * you. If you want it removed call Lumberjack::removeCombiner with the string + * "TextTagCombiner" as it's parameter. + * + * \see Combiner Lumberjack + ******************************************************************************* + */ +class TextTagCombiner : public Combiner +{ +public: + TextTagCombiner() : m_id("TextTagCombiner") { } + + /*! + ***************************************************************************** + * \brief Returns the unique string identifier for this combiner. Used by + * Lumberjack to differentiate between other combiners. + ***************************************************************************** + */ + const std::string id() { return m_id; } + + /*! + ***************************************************************************** + * \brief Function used by Lumberjack to indicate whether two messages should + * be combined. + * + * They are not actually combined by this function. Message classes are + * triggered for combination if both Message::text and Message::tag are equal. + * + * \param [in] leftMessage One of the Messages to be compared. + * \param [in] rightMessage One of the Messages to be compared. + ***************************************************************************** + */ + bool shouldMessagesBeCombined(const Message& leftMessage, + const Message& rightMessage) + { + if(leftMessage.text().compare(rightMessage.text()) == 0 && + leftMessage.tag().compare(rightMessage.tag()) == 0) + { + return true; + } + return false; + } + + /*! + ***************************************************************************** + * \brief Combines the combinee into the combined Message. + * + * The only thing truly combined in this Combiner is the ranks from combinee + * to combined, since text is already equal. + * + * \param [in,out] combined the Message that will be modified. + * \param [in] combinee the Message that is combined into the other. + * \param [in] ranksLimit The limit on how many individual ranks are tracked + * in the combined Message. Message::rankCount is always incremented. + ***************************************************************************** + */ + void combine(Message& combined, const Message& combinee, const int ranksLimit) + { + combined.addRanks(combinee.ranks(), combinee.count(), ranksLimit); + } + +private: + std::string m_id; +}; + +} // end namespace lumberjack +} // end namespace axom + +#endif diff --git a/src/axom/lumberjack/tests/CMakeLists.txt b/src/axom/lumberjack/tests/CMakeLists.txt index 19acf997cf..7d95e8aff3 100644 --- a/src/axom/lumberjack/tests/CMakeLists.txt +++ b/src/axom/lumberjack/tests/CMakeLists.txt @@ -12,7 +12,8 @@ set(lumberjack_serial_tests lumberjack_Lumberjack.hpp lumberjack_Message.hpp - lumberjack_TextEqualityCombiner.hpp ) + lumberjack_TextEqualityCombiner.hpp + lumberjack_TextTagCombiner.hpp ) axom_add_executable(NAME lumberjack_serial_tests SOURCES lumberjack_serial_main.cpp diff --git a/src/axom/lumberjack/tests/lumberjack_TextTagCombiner.hpp b/src/axom/lumberjack/tests/lumberjack_TextTagCombiner.hpp new file mode 100644 index 0000000000..0769837a7f --- /dev/null +++ b/src/axom/lumberjack/tests/lumberjack_TextTagCombiner.hpp @@ -0,0 +1,110 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +#include "gtest/gtest.h" + +#include "axom/lumberjack/TextTagCombiner.hpp" + +TEST(lumberjack_TextTagCombiner, case01) +{ + //Test positive case: two equal texts and tags + std::string text = "I never wanted to do this job in the first place!"; + axom::lumberjack::Message m1; + m1.text(text); + m1.addRank(13, 5); + m1.fileName("foo.cpp"); + m1.lineNumber(154); + m1.tag("myTag"); + + axom::lumberjack::Message m2; + m2.text(text); + m2.addRank(14, 5); + m2.fileName("foo.cpp"); + m2.lineNumber(154); + m2.tag("myTag"); + + axom::lumberjack::TextTagCombiner c; + + bool shouldMessagesBeCombined = c.shouldMessagesBeCombined(m1, m2); + + c.combine(m1, m2, 5); + + EXPECT_EQ(shouldMessagesBeCombined, true); + EXPECT_EQ(m1.text().compare(text), 0); + EXPECT_EQ(m1.count(), 2); + EXPECT_EQ(m1.ranks()[0], 13); + EXPECT_EQ(m1.ranks()[1], 14); + EXPECT_EQ(m2.tag().compare("myTag"), 0); +} + +TEST(lumberjack_TextTagCombiner, case02) +{ + //Test negative case: two not-equal texts, but equal tags + std::string text1 = "I never wanted to do this job in the first place!"; + axom::lumberjack::Message m1; + m1.text(text1); + m1.addRank(13, 5); + m1.fileName("foo.cpp"); + m1.lineNumber(154); + m1.tag("myTag"); + + std::string text2 = "This text is not equal to the first."; + axom::lumberjack::Message m2; + m2.text(text2); + m2.addRank(14, 5); + m2.fileName("foo.cpp"); + m2.lineNumber(154); + m2.tag("myTag"); + + axom::lumberjack::TextTagCombiner c; + + bool shouldMessagesBeCombined = c.shouldMessagesBeCombined(m1, m2); + + EXPECT_EQ(shouldMessagesBeCombined, false); + EXPECT_EQ(m1.text().compare(text1), 0); + EXPECT_EQ(m1.count(), 1); + EXPECT_EQ(m1.ranks()[0], 13); + EXPECT_EQ(m1.tag().compare("myTag"), 0); + + EXPECT_EQ(m2.text().compare(text2), 0); + EXPECT_EQ(m2.count(), 1); + EXPECT_EQ(m2.ranks()[0], 14); + EXPECT_EQ(m2.tag().compare("myTag"), 0); +} + +TEST(lumberjack_TextTagCombiner, case03) +{ + //Test negative case: two equal texts, but not-equal tags + std::string text = "I never wanted to do this job in the first place!"; + + axom::lumberjack::Message m1; + m1.text(text); + m1.addRank(13, 5); + m1.fileName("foo.cpp"); + m1.lineNumber(154); + m1.tag("tag1"); + + axom::lumberjack::Message m2; + m2.text(text); + m2.addRank(14, 5); + m2.fileName("foo.cpp"); + m2.lineNumber(154); + m2.tag("tag2"); + + axom::lumberjack::TextTagCombiner c; + + bool shouldMessagesBeCombined = c.shouldMessagesBeCombined(m1, m2); + + EXPECT_EQ(shouldMessagesBeCombined, false); + EXPECT_EQ(m1.text().compare(text), 0); + EXPECT_EQ(m1.count(), 1); + EXPECT_EQ(m1.ranks()[0], 13); + EXPECT_EQ(m1.tag().compare("tag1"), 0); + + EXPECT_EQ(m2.text().compare(text), 0); + EXPECT_EQ(m2.count(), 1); + EXPECT_EQ(m2.ranks()[0], 14); + EXPECT_EQ(m2.tag().compare("tag2"), 0); +} diff --git a/src/axom/lumberjack/tests/lumberjack_serial_main.cpp b/src/axom/lumberjack/tests/lumberjack_serial_main.cpp index 449728ae97..aa4f418266 100644 --- a/src/axom/lumberjack/tests/lumberjack_serial_main.cpp +++ b/src/axom/lumberjack/tests/lumberjack_serial_main.cpp @@ -8,6 +8,7 @@ #include "lumberjack_Lumberjack.hpp" #include "lumberjack_Message.hpp" #include "lumberjack_TextEqualityCombiner.hpp" +#include "lumberjack_TextTagCombiner.hpp" int main(int argc, char** argv) { From 43494429ba668603e3e323eeb61d799bcb00bf3e Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 26 Jan 2024 09:55:13 -0800 Subject: [PATCH 452/639] (pray) rearrange member variables --- src/axom/slic/core/Logger.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/axom/slic/core/Logger.hpp b/src/axom/slic/core/Logger.hpp index 4e9b27df32..83e8aac725 100644 --- a/src/axom/slic/core/Logger.hpp +++ b/src/axom/slic/core/Logger.hpp @@ -443,6 +443,7 @@ class Logger std::string m_name; bool m_abortOnError; + std::map> m_taggedStreams; bool m_abortOnWarning; void (*m_abortFunction)(void); @@ -450,8 +451,6 @@ class Logger std::map m_streamObjectsManager; std::vector m_logStreams[message::Num_Levels]; - std::map> m_taggedStreams; - ///@} DISABLE_COPY_AND_ASSIGNMENT(Logger); From 5b933eb33c2961ac4e7b30ce8f33c3e3506ed374 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 26 Jan 2024 14:21:08 -0800 Subject: [PATCH 453/639] Add some documentation about tagged streams in Slic docs --- .../slic/docs/sphinx/sections/appendix.rst | 1 + .../docs/sphinx/sections/getting_started.rst | 18 ++++++++++++++++++ src/axom/slic/examples/basic/logging.cpp | 12 ++++++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/axom/slic/docs/sphinx/sections/appendix.rst b/src/axom/slic/docs/sphinx/sections/appendix.rst index d0aff452ff..81828a49dc 100644 --- a/src/axom/slic/docs/sphinx/sections/appendix.rst +++ b/src/axom/slic/docs/sphinx/sections/appendix.rst @@ -87,6 +87,7 @@ The table below details which SLIC macros are collective: | | ``SLIC_INFO_IF`` | | | | | ``SLIC_INFO_ROOT`` | | | | | ``SLIC_INFO_ROOT_IF`` | | | +| | ``SLIC_INFO_TAGGED`` | | | +----------------------------+----------------------------------------------------------------------------+ | | ``SLIC_ERROR`` | | Collective by default. | | | ``SLIC_ERROR_IF`` | | Collective after calling ``slic::enableAbortOnError()``. | diff --git a/src/axom/slic/docs/sphinx/sections/getting_started.rst b/src/axom/slic/docs/sphinx/sections/getting_started.rst index 14bd1cc46e..525c633e5c 100644 --- a/src/axom/slic/docs/sphinx/sections/getting_started.rst +++ b/src/axom/slic/docs/sphinx/sections/getting_started.rst @@ -167,6 +167,24 @@ The :ref:`GenericOutputStream`, takes two arguments in its constructor: Slic maintains ownership of all registered :ref:`LogStream` instances and will deallocate them when ``slic::finalize()`` is called. +Step 5.1: Tagged Log Streams +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Slic has limited support for tags, where users can bind streams +to user-defined tags. The bound streams only output messages with the +given tag, disregarding the message's :ref:`logMessageLevel`. The tagged +:ref:`LogStream` can be created by calling ``slic::addStreamToTag()``. + +The following code snippet uses the :ref:`GenericOutputStream` object to +specify ``std::cout`` as the output destination for messages tagged with +the custom tag ``myTag``. + +.. literalinclude:: ../../../examples/basic/logging.cpp + :start-after: SPHINX_SLIC_SET_TAGGED_STREAM_BEGIN + :end-before: SPHINX_SLIC_SET_TAGGED_STREAM_END + :language: C++ + :linenos: + Step 6: Log Messages ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/axom/slic/examples/basic/logging.cpp b/src/axom/slic/examples/basic/logging.cpp index 507161f000..c4149b427d 100644 --- a/src/axom/slic/examples/basic/logging.cpp +++ b/src/axom/slic/examples/basic/logging.cpp @@ -26,8 +26,8 @@ int main(int AXOM_UNUSED_PARAM(argc), char** AXOM_UNUSED_PARAM(argv)) // SPHINX_SLIC_FORMAT_MSG_BEGIN std::string format = std::string("\n") + - std::string("[]: \n") + std::string("FILE=\n") + - std::string("LINE=\n\n"); + std::string("[ ]: \n") + + std::string("FILE=\n") + std::string("LINE=\n\n"); // SPHINX_SLIC_FORMAT_MSG_END @@ -42,12 +42,20 @@ int main(int AXOM_UNUSED_PARAM(argc), char** AXOM_UNUSED_PARAM(argv)) // SPHINX_SLIC_SET_STREAM_END + // SPHINX_SLIC_SET_TAGGED_STREAM_BEGIN + slic::addStreamToTag(new slic::GenericOutputStream(&std::cout, format), + "myTag"); + + // SPHINX_SLIC_SET_TAGGED_STREAM_END + // SPHINX_SLIC_LOG_MESSAGES_BEGIN SLIC_DEBUG("Here is a debug message!"); SLIC_INFO("Here is an info mesage!"); SLIC_WARNING("Here is a warning!"); SLIC_ERROR("Here is an error message!"); + SLIC_INFO_TAGGED("Here is a message for tagged streams with tag 'myTag'!", + "myTag"); // SPHINX_SLIC_LOG_MESSAGES_END From 108cc00102414cd7d10aec4010f71d8472ac2c9d Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 29 Jan 2024 11:12:35 -0800 Subject: [PATCH 454/639] Fix some comments, add TextTagCombiner to Lumberjackstream --- src/axom/lumberjack/TextTagCombiner.hpp | 6 +++--- src/axom/slic/interface/slic_macros.hpp | 8 ++++---- src/axom/slic/streams/LumberjackStream.cpp | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/axom/lumberjack/TextTagCombiner.hpp b/src/axom/lumberjack/TextTagCombiner.hpp index ab03230706..e4ba3b13ef 100644 --- a/src/axom/lumberjack/TextTagCombiner.hpp +++ b/src/axom/lumberjack/TextTagCombiner.hpp @@ -31,9 +31,9 @@ namespace lumberjack * \brief Combines Message classes if their Message::text and Message::tag * are equal. * - * This class instance is automatically added to Lumberjack's Lumberjack for - * you. If you want it removed call Lumberjack::removeCombiner with the string - * "TextTagCombiner" as it's parameter. + * This class can be added to Lumberjack's Lumberjack by calling + * Lumberjack::addCombiner with a + * TextTagCombiner instance as its parameter. * * \see Combiner Lumberjack ******************************************************************************* diff --git a/src/axom/slic/interface/slic_macros.hpp b/src/axom/slic/interface/slic_macros.hpp index 6f5dd463b7..4086deae7c 100644 --- a/src/axom/slic/interface/slic_macros.hpp +++ b/src/axom/slic/interface/slic_macros.hpp @@ -579,17 +579,17 @@ AXOM_HOST_DEVICE inline blackhole &operator<<(blackhole &bh, T) } while(axom::slic::detail::false_value) /*! - * \def SLIC_INFO_TAGGED( tag, msg ) + * \def SLIC_INFO_TAGGED( msg, tag ) * \brief Logs an Info message to a tagged stream * - * \param [in] tag user-supplied tag * \param [in] msg user-supplied message + * \param [in] tag user-supplied tag * - * \note The SLIC_INFO macro is always active. + * \note The SLIC_INFO_TAGGED macro is always active. * * Usage: * \code - * SLIC_INFO( "tag","informative text goes here" ); + * SLIC_INFO_TAGGED("informative text goes here", "tag"); * \endcode * */ diff --git a/src/axom/slic/streams/LumberjackStream.cpp b/src/axom/slic/streams/LumberjackStream.cpp index 767f41efaf..6b5a347e80 100644 --- a/src/axom/slic/streams/LumberjackStream.cpp +++ b/src/axom/slic/streams/LumberjackStream.cpp @@ -11,6 +11,7 @@ #include "axom/lumberjack/BinaryTreeCommunicator.hpp" #include "axom/lumberjack/Lumberjack.hpp" +#include "axom/lumberjack/TextTagCombiner.hpp" namespace axom { @@ -168,6 +169,7 @@ void LumberjackStream::initializeLumberjack(MPI_Comm comm, int ranksLimit) m_ljComm->initialize(comm, ranksLimit); m_lj = new axom::lumberjack::Lumberjack; m_lj->initialize(m_ljComm, ranksLimit); + m_lj->addCombiner(new lumberjack::TextTagCombiner); m_isLJOwnedBySLIC = true; } From c5d9e1c554357dcf45ca04a4de0d5efdad1ae363 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 30 Jan 2024 09:17:08 -0800 Subject: [PATCH 455/639] Fix class comment --- src/axom/lumberjack/TextTagCombiner.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/lumberjack/TextTagCombiner.hpp b/src/axom/lumberjack/TextTagCombiner.hpp index e4ba3b13ef..5e2e336ba1 100644 --- a/src/axom/lumberjack/TextTagCombiner.hpp +++ b/src/axom/lumberjack/TextTagCombiner.hpp @@ -26,7 +26,7 @@ namespace lumberjack { /*! ******************************************************************************* - * \class Tex + * \class TextTagCombiner * * \brief Combines Message classes if their Message::text and Message::tag * are equal. From e6f138a56c8c0d470cc72f41237d6b9f1bc39db3 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 2 Feb 2024 11:07:25 -0800 Subject: [PATCH 456/639] Add test case to slic_macros_parallel_test of a tagged message and normal INFO message being logged and going to the right Log Streams --- src/axom/slic/tests/slic_macros_parallel.cpp | 223 +++++++++++-------- 1 file changed, 131 insertions(+), 92 deletions(-) diff --git a/src/axom/slic/tests/slic_macros_parallel.cpp b/src/axom/slic/tests/slic_macros_parallel.cpp index 685ed33e4e..01419f0d59 100644 --- a/src/axom/slic/tests/slic_macros_parallel.cpp +++ b/src/axom/slic/tests/slic_macros_parallel.cpp @@ -28,15 +28,30 @@ namespace slic { namespace internal { +// Stream for message levels std::ostringstream test_stream; +// Stream for tagged streams +std::ostringstream test_tag_stream; + bool is_stream_empty() { return test_stream.str().empty(); } +bool is_tag_stream_empty() { return test_tag_stream.str().empty(); } + +bool are_all_streams_empty() +{ + return (is_stream_empty() && is_tag_stream_empty()); +} + void clear_streams() { test_stream.clear(); test_stream.str(""); - EXPECT_TRUE(is_stream_empty()); + + test_tag_stream.clear(); + test_tag_stream.str(""); + + EXPECT_TRUE(are_all_streams_empty()); } } // namespace internal @@ -159,11 +174,12 @@ class SlicMacrosParallel : public ::testing::TestWithParam RLIMIT, msgfmt)); - slic::addStreamToTag(new slic::LumberjackStream(&slic::internal::test_stream, - MPI_COMM_WORLD, - RLIMIT, - msgtagfmt), - "myTag"); + slic::addStreamToTag( + new slic::LumberjackStream(&slic::internal::test_tag_stream, + MPI_COMM_WORLD, + RLIMIT, + msgtagfmt), + "myTag"); } if(stream_type == "Synchronized") @@ -174,7 +190,7 @@ class SlicMacrosParallel : public ::testing::TestWithParam msgfmt)); slic::addStreamToTag( - new slic::SynchronizedStream(&slic::internal::test_stream, + new slic::SynchronizedStream(&slic::internal::test_tag_stream, MPI_COMM_WORLD, msgtagfmt), "myTag"); @@ -194,12 +210,12 @@ class SlicMacrosParallel : public ::testing::TestWithParam //------------------------------------------------------------------------------ TEST_P(SlicMacrosParallel, test_error_macros) { - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); SLIC_ERROR("test error message"); slic::flushStreams(); if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "ERROR"); check_msg(slic::internal::test_stream.str(), "test error message"); check_file(slic::internal::test_stream.str()); @@ -209,13 +225,13 @@ TEST_P(SlicMacrosParallel, test_error_macros) SLIC_ERROR_IF(false, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); SLIC_ERROR_IF(true, "this message is logged!"); slic::flushStreams(); if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "ERROR"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -227,7 +243,7 @@ TEST_P(SlicMacrosParallel, test_error_macros) axom::slic::setIsRoot(false); SLIC_ERROR_ROOT_IF(false, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // Check selective filter based on root == true axom::slic::setIsRoot(true); @@ -235,7 +251,7 @@ TEST_P(SlicMacrosParallel, test_error_macros) slic::flushStreams(); if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "ERROR"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -247,13 +263,13 @@ TEST_P(SlicMacrosParallel, test_error_macros) axom::slic::setIsRoot(true); SLIC_ERROR_ROOT_IF(false, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // is not root, and conditional is true -> no message axom::slic::setIsRoot(false); SLIC_ERROR_ROOT_IF(true, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // Check for one rank being root axom::slic::setIsRoot(rank == 0); @@ -261,7 +277,7 @@ TEST_P(SlicMacrosParallel, test_error_macros) slic::flushStreams(); if(rank == 0) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "ERROR"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -269,7 +285,7 @@ TEST_P(SlicMacrosParallel, test_error_macros) } else { - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); } slic::internal::clear_streams(); @@ -280,7 +296,7 @@ TEST_P(SlicMacrosParallel, test_error_macros) if(((rank % 2) == 0 && GetParam() == "Synchronized") || (rank == 0 && GetParam() == "Lumberjack")) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "ERROR"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -288,7 +304,7 @@ TEST_P(SlicMacrosParallel, test_error_macros) } else { - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); } slic::internal::clear_streams(); } @@ -296,12 +312,12 @@ TEST_P(SlicMacrosParallel, test_error_macros) //------------------------------------------------------------------------------ TEST_P(SlicMacrosParallel, test_warning_macros) { - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); SLIC_WARNING("test warning message"); slic::flushStreams(); if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "WARNING"); check_msg(slic::internal::test_stream.str(), "test warning message"); check_file(slic::internal::test_stream.str()); @@ -311,13 +327,13 @@ TEST_P(SlicMacrosParallel, test_warning_macros) SLIC_WARNING_IF(false, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); SLIC_WARNING_IF(true, "this message is logged!"); slic::flushStreams(); if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "WARNING"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -329,7 +345,7 @@ TEST_P(SlicMacrosParallel, test_warning_macros) axom::slic::setIsRoot(false); SLIC_WARNING_ROOT_IF(false, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // Check selective filter based on root == true axom::slic::setIsRoot(true); @@ -337,7 +353,7 @@ TEST_P(SlicMacrosParallel, test_warning_macros) slic::flushStreams(); if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "WARNING"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -349,13 +365,13 @@ TEST_P(SlicMacrosParallel, test_warning_macros) axom::slic::setIsRoot(true); SLIC_WARNING_ROOT_IF(false, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // is not root, and conditional is true -> no message axom::slic::setIsRoot(false); SLIC_WARNING_ROOT_IF(true, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // Check for one rank being root axom::slic::setIsRoot(rank == 0); @@ -363,7 +379,7 @@ TEST_P(SlicMacrosParallel, test_warning_macros) slic::flushStreams(); if(rank == 0) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "WARNING"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -371,7 +387,7 @@ TEST_P(SlicMacrosParallel, test_warning_macros) } else { - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); } slic::internal::clear_streams(); @@ -382,7 +398,7 @@ TEST_P(SlicMacrosParallel, test_warning_macros) if(((rank % 2) == 0 && GetParam() == "Synchronized") || (rank == 0 && GetParam() == "Lumberjack")) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "WARNING"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -390,7 +406,7 @@ TEST_P(SlicMacrosParallel, test_warning_macros) } else { - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); } slic::internal::clear_streams(); } @@ -398,12 +414,12 @@ TEST_P(SlicMacrosParallel, test_warning_macros) //------------------------------------------------------------------------------ TEST_P(SlicMacrosParallel, test_info_macros) { - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); SLIC_INFO("test info message"); slic::flushStreams(); if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "INFO"); check_msg(slic::internal::test_stream.str(), "test info message"); check_file(slic::internal::test_stream.str()); @@ -414,33 +430,56 @@ TEST_P(SlicMacrosParallel, test_info_macros) SLIC_INFO_TAGGED("test tagged info message", "myTag"); slic::flushStreams(); if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) + { + EXPECT_FALSE(slic::internal::is_tag_stream_empty()); + check_level(slic::internal::test_tag_stream.str(), "INFO"); + check_msg(slic::internal::test_tag_stream.str(), "test tagged info message"); + check_file(slic::internal::test_tag_stream.str()); + check_line(slic::internal::test_tag_stream.str(), __LINE__ - 8); + check_tag(slic::internal::test_tag_stream.str(), "myTag"); + EXPECT_TRUE(slic::internal::is_stream_empty()); + } + slic::internal::clear_streams(); + + SLIC_INFO("test info message only for normal message-level stream"); + SLIC_INFO_TAGGED("test tagged info message only for tagged stream", "myTag"); + slic::flushStreams(); + if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { EXPECT_FALSE(slic::internal::is_stream_empty()); check_level(slic::internal::test_stream.str(), "INFO"); - check_msg(slic::internal::test_stream.str(), "test tagged info message"); + check_msg(slic::internal::test_stream.str(), + "test info message only for normal message-level stream"); check_file(slic::internal::test_stream.str()); - check_line(slic::internal::test_stream.str(), __LINE__ - 8); - check_tag(slic::internal::test_stream.str(), "myTag"); + check_line(slic::internal::test_stream.str(), __LINE__ - 10); + + EXPECT_FALSE(slic::internal::is_tag_stream_empty()); + check_level(slic::internal::test_tag_stream.str(), "INFO"); + check_msg(slic::internal::test_tag_stream.str(), + "test tagged info message only for tagged stream"); + check_file(slic::internal::test_tag_stream.str()); + check_line(slic::internal::test_tag_stream.str(), __LINE__ - 16); + check_tag(slic::internal::test_tag_stream.str(), "myTag"); } slic::internal::clear_streams(); SLIC_INFO_TAGGED("this message should not be logged (no tag given)!", ""); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); SLIC_INFO_TAGGED("this message should not be logged (tag DNE)!", "tag404"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); SLIC_INFO_IF(false, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); SLIC_INFO_IF(true, "this message is logged!"); slic::flushStreams(); if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "INFO"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -452,7 +491,7 @@ TEST_P(SlicMacrosParallel, test_info_macros) axom::slic::setIsRoot(false); SLIC_INFO_ROOT_IF(false, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // Check selective filter based on root == true axom::slic::setIsRoot(true); @@ -460,7 +499,7 @@ TEST_P(SlicMacrosParallel, test_info_macros) slic::flushStreams(); if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "INFO"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -472,13 +511,13 @@ TEST_P(SlicMacrosParallel, test_info_macros) axom::slic::setIsRoot(true); SLIC_INFO_ROOT_IF(false, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // is not root, and conditional is true -> no message axom::slic::setIsRoot(false); SLIC_INFO_ROOT_IF(true, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // Check for one rank being root axom::slic::setIsRoot(rank == 0); @@ -486,7 +525,7 @@ TEST_P(SlicMacrosParallel, test_info_macros) slic::flushStreams(); if(rank == 0) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "INFO"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -494,7 +533,7 @@ TEST_P(SlicMacrosParallel, test_info_macros) } else { - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); } slic::internal::clear_streams(); @@ -505,7 +544,7 @@ TEST_P(SlicMacrosParallel, test_info_macros) if(((rank % 2) == 0 && GetParam() == "Synchronized") || (rank == 0 && GetParam() == "Lumberjack")) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "INFO"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -513,7 +552,7 @@ TEST_P(SlicMacrosParallel, test_info_macros) } else { - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); } slic::internal::clear_streams(); } @@ -521,13 +560,13 @@ TEST_P(SlicMacrosParallel, test_info_macros) //------------------------------------------------------------------------------ TEST_P(SlicMacrosParallel, test_debug_macros) { - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); SLIC_DEBUG("test debug message"); slic::flushStreams(); #ifdef AXOM_DEBUG if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "DEBUG"); check_msg(slic::internal::test_stream.str(), "test debug message"); check_file(slic::internal::test_stream.str()); @@ -536,19 +575,19 @@ TEST_P(SlicMacrosParallel, test_debug_macros) slic::internal::clear_streams(); #else // SLIC_DEBUG macros only log messages when AXOM_DEBUG is defined - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); #endif SLIC_DEBUG_IF(false, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); SLIC_DEBUG_IF(true, "this message is logged!"); slic::flushStreams(); #ifdef AXOM_DEBUG if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "DEBUG"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -557,14 +596,14 @@ TEST_P(SlicMacrosParallel, test_debug_macros) slic::internal::clear_streams(); #else // SLIC_DEBUG macros only log messages when AXOM_DEBUG is defined - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); #endif // Check selective filtering based on root == false axom::slic::setIsRoot(false); SLIC_DEBUG_ROOT_IF(false, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // Check selective filter based on root == true axom::slic::setIsRoot(true); @@ -573,7 +612,7 @@ TEST_P(SlicMacrosParallel, test_debug_macros) #ifdef AXOM_DEBUG if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "DEBUG"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -582,20 +621,20 @@ TEST_P(SlicMacrosParallel, test_debug_macros) slic::internal::clear_streams(); #else // SLIC_DEBUG macros only log messages when AXOM_DEBUG is defined - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); #endif // is root, but conditional is false -> no message axom::slic::setIsRoot(true); SLIC_DEBUG_ROOT_IF(false, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // is not root, and conditional is true -> no message axom::slic::setIsRoot(false); SLIC_DEBUG_ROOT_IF(true, "this message should not be logged!"); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // Check for one rank being root axom::slic::setIsRoot(rank == 0); @@ -604,7 +643,7 @@ TEST_P(SlicMacrosParallel, test_debug_macros) #ifdef AXOM_DEBUG if(rank == 0) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "DEBUG"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -612,12 +651,12 @@ TEST_P(SlicMacrosParallel, test_debug_macros) } else { - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); } slic::internal::clear_streams(); #else // SLIC_DEBUG macros only log messages when AXOM_DEBUG is defined - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); #endif // Check for more than one rank being root @@ -628,7 +667,7 @@ TEST_P(SlicMacrosParallel, test_debug_macros) if(((rank % 2) == 0 && GetParam() == "Synchronized") || (rank == 0 && GetParam() == "Lumberjack")) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "DEBUG"); check_msg(slic::internal::test_stream.str(), "this message is logged!"); check_file(slic::internal::test_stream.str()); @@ -636,12 +675,12 @@ TEST_P(SlicMacrosParallel, test_debug_macros) } else { - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); } slic::internal::clear_streams(); #else // SLIC_DEBUG macros only log messages when AXOM_DEBUG is defined - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); #endif } @@ -652,7 +691,7 @@ TEST_P(SlicMacrosParallel, test_abort_error_macros) slic::enableAbortOnError(); /* enable abort for testing purposes */ slic::setAbortFunction(custom_abort_function); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // Test for each rank for(int i = 0; i < nranks; i++) @@ -691,7 +730,7 @@ TEST_P(SlicMacrosParallel, test_abort_error_macros) SLIC_ERROR_IF(val == 42, "SLIC_ERROR_IF message is logged!"); slic::outputLocalMessages(); EXPECT_EQ(has_aborted, abort_enabled); - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "ERROR"); check_msg(slic::internal::test_stream.str(), "SLIC_ERROR_IF message is logged!"); @@ -702,7 +741,7 @@ TEST_P(SlicMacrosParallel, test_abort_error_macros) SLIC_ERROR_ROOT("SLIC_ERROR_ROOT message is logged!"); slic::outputLocalMessages(); EXPECT_EQ(has_aborted, abort_enabled); - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "ERROR"); check_msg(slic::internal::test_stream.str(), "SLIC_ERROR_ROOT message is logged!"); @@ -713,7 +752,7 @@ TEST_P(SlicMacrosParallel, test_abort_error_macros) SLIC_ERROR_ROOT_IF(val == 42, "SLIC_ERROR_ROOT_IF message is logged!"); slic::outputLocalMessages(); EXPECT_EQ(has_aborted, abort_enabled); - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "ERROR"); check_msg(slic::internal::test_stream.str(), "SLIC_ERROR_ROOT_IF message is logged!"); @@ -724,7 +763,7 @@ TEST_P(SlicMacrosParallel, test_abort_error_macros) SLIC_ASSERT(val < 0); slic::outputLocalMessages(); EXPECT_EQ(has_aborted, abort_enabled); - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "ERROR"); check_msg(slic::internal::test_stream.str(), "Failed Assert: val < 0"); check_file(slic::internal::test_stream.str()); @@ -734,7 +773,7 @@ TEST_P(SlicMacrosParallel, test_abort_error_macros) SLIC_ASSERT_MSG(val < 0, "val should be negative!"); slic::outputLocalMessages(); EXPECT_EQ(has_aborted, abort_enabled); - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "ERROR"); check_msg(slic::internal::test_stream.str(), "Failed Assert: val < 0\nval should be negative!"); @@ -750,7 +789,7 @@ TEST_P(SlicMacrosParallel, test_abort_error_macros) AXOM_UNUSED_VAR(has_aborted); reset_state(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); #endif } //end NUM_ABORT_STATES loop @@ -768,7 +807,7 @@ TEST_P(SlicMacrosParallel, test_abort_warning_macros) slic::enableAbortOnWarning(); /* enable abort for testing purposes */ slic::setAbortFunction(custom_abort_function); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); // Test for each rank for(int i = 0; i < nranks; i++) @@ -796,7 +835,7 @@ TEST_P(SlicMacrosParallel, test_abort_warning_macros) SLIC_WARNING("SLIC_WARNING message is logged!"); slic::outputLocalMessages(); EXPECT_EQ(has_aborted, abort_enabled); - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "WARNING"); check_msg(slic::internal::test_stream.str(), "SLIC_WARNING message is logged!"); @@ -808,7 +847,7 @@ TEST_P(SlicMacrosParallel, test_abort_warning_macros) SLIC_WARNING_IF(val == 42, "SLIC_WARNING_IF message is logged!"); slic::outputLocalMessages(); EXPECT_EQ(has_aborted, abort_enabled); - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "WARNING"); check_msg(slic::internal::test_stream.str(), "SLIC_WARNING_IF message is logged!"); @@ -819,7 +858,7 @@ TEST_P(SlicMacrosParallel, test_abort_warning_macros) SLIC_WARNING_ROOT("SLIC_WARNING_ROOT message is logged!"); slic::outputLocalMessages(); EXPECT_EQ(has_aborted, abort_enabled); - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "WARNING"); check_msg(slic::internal::test_stream.str(), "SLIC_WARNING_ROOT message is logged!"); @@ -830,7 +869,7 @@ TEST_P(SlicMacrosParallel, test_abort_warning_macros) SLIC_WARNING_ROOT_IF(val == 42, "SLIC_WARNING_ROOT_IF msg logged!"); slic::outputLocalMessages(); EXPECT_EQ(has_aborted, abort_enabled); - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "WARNING"); check_msg(slic::internal::test_stream.str(), "SLIC_WARNING_ROOT_IF msg logged!"); @@ -841,7 +880,7 @@ TEST_P(SlicMacrosParallel, test_abort_warning_macros) SLIC_CHECK(val < 0); slic::outputLocalMessages(); EXPECT_EQ(has_aborted, abort_enabled); - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "WARNING"); check_msg(slic::internal::test_stream.str(), "Failed Check: val < 0"); check_file(slic::internal::test_stream.str()); @@ -851,7 +890,7 @@ TEST_P(SlicMacrosParallel, test_abort_warning_macros) SLIC_CHECK_MSG(val < 0, "val should be negative!"); slic::outputLocalMessages(); EXPECT_EQ(has_aborted, abort_enabled); - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "WARNING"); check_msg(slic::internal::test_stream.str(), "Failed Check: val < 0\nval should be negative!"); @@ -864,7 +903,7 @@ TEST_P(SlicMacrosParallel, test_abort_warning_macros) #else // SLIC_CHECK macros only log messages when AXOM_DEBUG is defined - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); #endif } //end NUM_ABORT_STATES loop @@ -878,7 +917,7 @@ TEST_P(SlicMacrosParallel, test_abort_warning_macros) TEST_P(SlicMacrosParallel, test_assert_macros) { slic::internal::clear_streams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); constexpr int val = 42; SLIC_ASSERT(val < 0); @@ -886,7 +925,7 @@ TEST_P(SlicMacrosParallel, test_assert_macros) #if defined(AXOM_DEBUG) && !defined(AXOM_DEVICE_CODE) if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "ERROR"); check_msg(slic::internal::test_stream.str(), "Failed Assert: val < 0"); check_file(slic::internal::test_stream.str()); @@ -896,19 +935,19 @@ TEST_P(SlicMacrosParallel, test_assert_macros) #else // SLIC_ASSERT macros only log messages when AXOM_DEBUG is defined AXOM_UNUSED_VAR(val); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); #endif SLIC_ASSERT(val > 0); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); SLIC_ASSERT_MSG(val < 0, "val should be negative!"); slic::flushStreams(); #if defined(AXOM_DEBUG) && !defined(AXOM_DEVICE_CODE) if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "ERROR"); check_msg(slic::internal::test_stream.str(), "Failed Assert: val < 0\nval should be negative!"); @@ -919,14 +958,14 @@ TEST_P(SlicMacrosParallel, test_assert_macros) #else // SLIC_ASSERT macros only log messages when AXOM_DEBUG is defined AXOM_UNUSED_VAR(val); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); #endif } // ------------------------------------------------------------------------------ TEST_P(SlicMacrosParallel, test_check_macros) { - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); constexpr int val = 42; SLIC_CHECK(val < 0); @@ -934,7 +973,7 @@ TEST_P(SlicMacrosParallel, test_check_macros) #if defined(AXOM_DEBUG) && !defined(AXOM_DEVICE_CODE) if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "WARNING"); check_msg(slic::internal::test_stream.str(), "Failed Check: val < 0"); check_file(slic::internal::test_stream.str()); @@ -944,19 +983,19 @@ TEST_P(SlicMacrosParallel, test_check_macros) #else // SLIC_CHECK macros only log messages when AXOM_DEBUG is defined AXOM_UNUSED_VAR(val); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); #endif SLIC_CHECK(val > 0); slic::flushStreams(); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); SLIC_CHECK_MSG(val < 0, "val should be negative!"); slic::flushStreams(); #if defined(AXOM_DEBUG) && !defined(AXOM_DEVICE_CODE) if(GetParam() == "Synchronized" || (GetParam() == "Lumberjack" && rank == 0)) { - EXPECT_FALSE(slic::internal::is_stream_empty()); + EXPECT_FALSE(slic::internal::are_all_streams_empty()); check_level(slic::internal::test_stream.str(), "WARNING"); check_msg(slic::internal::test_stream.str(), "Failed Check: val < 0\nval should be negative!"); @@ -967,7 +1006,7 @@ TEST_P(SlicMacrosParallel, test_check_macros) #else // SLIC_CHECK macros only log messages when AXOM_DEBUG is defined AXOM_UNUSED_VAR(val); - EXPECT_TRUE(slic::internal::is_stream_empty()); + EXPECT_TRUE(slic::internal::are_all_streams_empty()); #endif } From 4c618b5f9a8423abb5261a8fa5e68b7e0e04cde6 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 5 Feb 2024 10:55:51 -0800 Subject: [PATCH 457/639] Combiner suggestions --- src/axom/lumberjack/TextEqualityCombiner.hpp | 12 +++++------- src/axom/lumberjack/TextTagCombiner.hpp | 14 ++++++-------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/axom/lumberjack/TextEqualityCombiner.hpp b/src/axom/lumberjack/TextEqualityCombiner.hpp index 3db4753814..99df2ffd4b 100644 --- a/src/axom/lumberjack/TextEqualityCombiner.hpp +++ b/src/axom/lumberjack/TextEqualityCombiner.hpp @@ -40,7 +40,7 @@ namespace lumberjack class TextEqualityCombiner : public Combiner { public: - TextEqualityCombiner() : m_id("TextEqualityCombiner") { } + TextEqualityCombiner() { } /*! ***************************************************************************** @@ -65,11 +65,7 @@ class TextEqualityCombiner : public Combiner bool shouldMessagesBeCombined(const Message& leftMessage, const Message& rightMessage) { - if(leftMessage.text().compare(rightMessage.text()) == 0) - { - return true; - } - return false; + return (leftMessage.text().compare(rightMessage.text()) == 0); } /*! @@ -83,6 +79,8 @@ class TextEqualityCombiner : public Combiner * \param [in] combinee the Message that is combined into the other. * \param [in] ranksLimit The limit on how many individual ranks are tracked * in the combined Message. Message::rankCount is always incremented. + * + * \pre shouldMessagesBeCombined(combined, combinee) must be true ***************************************************************************** */ void combine(Message& combined, const Message& combinee, const int ranksLimit) @@ -91,7 +89,7 @@ class TextEqualityCombiner : public Combiner } private: - std::string m_id; + const std::string m_id = "TextEqualityCombiner"; }; } // end namespace lumberjack diff --git a/src/axom/lumberjack/TextTagCombiner.hpp b/src/axom/lumberjack/TextTagCombiner.hpp index 5e2e336ba1..b0b963187b 100644 --- a/src/axom/lumberjack/TextTagCombiner.hpp +++ b/src/axom/lumberjack/TextTagCombiner.hpp @@ -41,7 +41,7 @@ namespace lumberjack class TextTagCombiner : public Combiner { public: - TextTagCombiner() : m_id("TextTagCombiner") { } + TextTagCombiner() { } /*! ***************************************************************************** @@ -66,12 +66,8 @@ class TextTagCombiner : public Combiner bool shouldMessagesBeCombined(const Message& leftMessage, const Message& rightMessage) { - if(leftMessage.text().compare(rightMessage.text()) == 0 && - leftMessage.tag().compare(rightMessage.tag()) == 0) - { - return true; - } - return false; + return (leftMessage.text().compare(rightMessage.text()) == 0 && + leftMessage.tag().compare(rightMessage.tag()) == 0); } /*! @@ -85,6 +81,8 @@ class TextTagCombiner : public Combiner * \param [in] combinee the Message that is combined into the other. * \param [in] ranksLimit The limit on how many individual ranks are tracked * in the combined Message. Message::rankCount is always incremented. + * + * \pre shouldMessagesBeCombined(combined, combinee) must be true ***************************************************************************** */ void combine(Message& combined, const Message& combinee, const int ranksLimit) @@ -93,7 +91,7 @@ class TextTagCombiner : public Combiner } private: - std::string m_id; + const std::string m_id = "TextTagCombiner"; }; } // end namespace lumberjack From 1ad5c5caad6907f50ce25f056dfb9398f5c2d8e8 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 6 Feb 2024 08:19:20 -0800 Subject: [PATCH 458/639] Make TextTagCombiner new default lumberjack Combiner; update Lumberjack documentation --- src/axom/lumberjack/Lumberjack.cpp | 2 +- src/axom/lumberjack/Lumberjack.hpp | 2 +- src/axom/lumberjack/docs/sphinx/combiner_class.rst | 14 +++++++++++++- src/axom/lumberjack/docs/sphinx/core_concepts.rst | 8 ++++---- src/axom/slic/streams/LumberjackStream.cpp | 1 - 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/axom/lumberjack/Lumberjack.cpp b/src/axom/lumberjack/Lumberjack.cpp index f05cc57581..4b9e82d18a 100644 --- a/src/axom/lumberjack/Lumberjack.cpp +++ b/src/axom/lumberjack/Lumberjack.cpp @@ -23,7 +23,7 @@ void Lumberjack::initialize(Communicator* communicator, int ranksLimit) { m_communicator = communicator; m_ranksLimit = ranksLimit; - m_combiners.push_back(new TextEqualityCombiner); + m_combiners.push_back(new TextTagCombiner); } void Lumberjack::finalize() diff --git a/src/axom/lumberjack/Lumberjack.hpp b/src/axom/lumberjack/Lumberjack.hpp index 51b38368d7..6d3f48878d 100644 --- a/src/axom/lumberjack/Lumberjack.hpp +++ b/src/axom/lumberjack/Lumberjack.hpp @@ -22,7 +22,7 @@ #include "axom/lumberjack/Combiner.hpp" #include "axom/lumberjack/Communicator.hpp" #include "axom/lumberjack/Message.hpp" -#include "axom/lumberjack/TextEqualityCombiner.hpp" +#include "axom/lumberjack/TextTagCombiner.hpp" namespace axom { diff --git a/src/axom/lumberjack/docs/sphinx/combiner_class.rst b/src/axom/lumberjack/docs/sphinx/combiner_class.rst index eea64bed70..70dcc954d6 100644 --- a/src/axom/lumberjack/docs/sphinx/combiner_class.rst +++ b/src/axom/lumberjack/docs/sphinx/combiner_class.rst @@ -23,6 +23,18 @@ combine Combines the second message into the first. Concrete Instances ------------------ +.. _texttagcombiner_class_label: + +TextTagCombiner +^^^^^^^^^^^^^^^ + +This Combiner combines the two given Messages if the Message text strings and tag strings are equal. +It does so by adding the second Message's ranks to the first Message (if not past +the ranksLimit) and incrementing the Message's count as well. This is handled by +Message.addRanks(). + +.. note:: This is the only Combiner automatically added to Lumberjack for you. You can remove it by calling Lumberjack::removeCombiner("TextTagCombiner"). + .. _textequalitycombiner_class_label: TextEqualityCombiner @@ -33,4 +45,4 @@ It does so by adding the second Message's ranks to the first Message (if not pas the ranksLimit) and incrementing the Message's count as well. This is handled by Message.addRanks(). -.. note:: This is the only Combiner automatically added to Lumberjack for you. You can remove it by calling Lumberjack::removeCombiner("TextEqualityCombiner"). +.. note:: You can add this Combiner by calling Lumberjack::addCombiner(new TextEqualityCombiner). diff --git a/src/axom/lumberjack/docs/sphinx/core_concepts.rst b/src/axom/lumberjack/docs/sphinx/core_concepts.rst index 4d1db00602..99d90eacad 100644 --- a/src/axom/lumberjack/docs/sphinx/core_concepts.rst +++ b/src/axom/lumberjack/docs/sphinx/core_concepts.rst @@ -16,18 +16,18 @@ your program. It does so by giving the currently held Messages at the current n two at a time, to the Combiner classes that are currently registered to Lumberjack when a Push happens. -Lumberjack only provides one Combiner, the TextEqualityCombiner. You can write your own +Lumberjack provides one Combiner as default, the TextTagCombiner. You can write your own Combiners and register them with Lumberjack. The idea is that each Combiner would have its own criteria for whether a Message should be combined and how to combine that specific Message with another of the same type. Combiner's have two main functions, shouldMessagesBeCombined and combine. -The function shouldMessagesBeCombined, returns True if the pair of messages satisfy the associated criteria. For example in the TextEqualityCombiner, -if the Text strings are exactly equal, it signals they should be combined. +The function shouldMessagesBeCombined, returns True if the pair of messages satisfy the associated criteria. For example in the TextTagCombiner, +if the Text strings and tag strings are exactly equal, it signals they should be combined. The function combine, takes two Messages and combines them in the way that is specific -to that Combiner class. For example in the TextEqualityCombiner, the only thing +to that Combiner class. For example in the TextTagCombiner, the only thing that happens is the second Message's ranks gets added to the first and the message count is increased. This is because the text strings were equal. This may not be the case for all Combiners that you write yourself. diff --git a/src/axom/slic/streams/LumberjackStream.cpp b/src/axom/slic/streams/LumberjackStream.cpp index 6b5a347e80..c9353cc057 100644 --- a/src/axom/slic/streams/LumberjackStream.cpp +++ b/src/axom/slic/streams/LumberjackStream.cpp @@ -169,7 +169,6 @@ void LumberjackStream::initializeLumberjack(MPI_Comm comm, int ranksLimit) m_ljComm->initialize(comm, ranksLimit); m_lj = new axom::lumberjack::Lumberjack; m_lj->initialize(m_ljComm, ranksLimit); - m_lj->addCombiner(new lumberjack::TextTagCombiner); m_isLJOwnedBySLIC = true; } From 0490b5f6b39c61678b10f6b96ab184a625728f9a Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 6 Feb 2024 13:36:02 -0800 Subject: [PATCH 459/639] Add a TextTagCombiner reference in lumberjack classes page --- src/axom/lumberjack/docs/sphinx/lumberjack_classes.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/src/axom/lumberjack/docs/sphinx/lumberjack_classes.rst b/src/axom/lumberjack/docs/sphinx/lumberjack_classes.rst index bb04be76d5..92721b2627 100644 --- a/src/axom/lumberjack/docs/sphinx/lumberjack_classes.rst +++ b/src/axom/lumberjack/docs/sphinx/lumberjack_classes.rst @@ -15,6 +15,7 @@ Combiners Handles Message combination and tests whether Message classes should be combined. * :ref:`Combiner ` - Abstract base class that all Combiners must inherit from. +* :ref:`TextTagCombiner ` - Combines Message classes that have equal Text and Tag member variables. * :ref:`TextEqualityCombiner ` - Combines Message classes that have equal Text member variables. From 8d71b92d32448e3b12b1261cd02da9fcf0d2837a Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 7 Feb 2024 08:19:14 -0800 Subject: [PATCH 460/639] Add TextEqualityCombiner warnings --- src/axom/lumberjack/TextEqualityCombiner.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/axom/lumberjack/TextEqualityCombiner.hpp b/src/axom/lumberjack/TextEqualityCombiner.hpp index 99df2ffd4b..c20c462200 100644 --- a/src/axom/lumberjack/TextEqualityCombiner.hpp +++ b/src/axom/lumberjack/TextEqualityCombiner.hpp @@ -34,6 +34,9 @@ namespace lumberjack * you. If you want it removed call Lumberjack::removeCombiner with the string * "TextEqualityCombiner" as it's parameter. * + * \warning Using the TextEqualityCombiner with Message::tag has undefined + * behavior. + * * \see Combiner Lumberjack ******************************************************************************* */ From 51c0304f539d70b5d4254130ebfa928951c65bfb Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 7 Feb 2024 09:05:03 -0800 Subject: [PATCH 461/639] getNumStreamsAtTag --> getNumStreamsWithTag --- src/axom/slic/core/Logger.cpp | 2 +- src/axom/slic/core/Logger.hpp | 4 ++-- src/axom/slic/interface/slic.cpp | 4 ++-- src/axom/slic/interface/slic.hpp | 2 +- src/axom/slic/tests/slic_uninit.cpp | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/axom/slic/core/Logger.cpp b/src/axom/slic/core/Logger.cpp index 40d6899b65..46f5b6408b 100644 --- a/src/axom/slic/core/Logger.cpp +++ b/src/axom/slic/core/Logger.cpp @@ -218,7 +218,7 @@ int Logger::getNumStreamsAtMsgLevel(message::Level level) } //------------------------------------------------------------------------------ -int Logger::getNumStreamsAtTag(const std::string& tag) +int Logger::getNumStreamsWithTag(const std::string& tag) { if(m_taggedStreams.find(tag) == m_taggedStreams.end()) { diff --git a/src/axom/slic/core/Logger.hpp b/src/axom/slic/core/Logger.hpp index 83e8aac725..15922b552e 100644 --- a/src/axom/slic/core/Logger.hpp +++ b/src/axom/slic/core/Logger.hpp @@ -219,7 +219,7 @@ class Logger * \return N the number of streams for the given tag. * \post N >= 0 */ - int getNumStreamsAtTag(const std::string& tag); + int getNumStreamsWithTag(const std::string& tag); /*! * \brief Returns the ith stream at the given tag. @@ -228,7 +228,7 @@ class Logger * \param [in] i the index of the stream in query. * * \return stream_ptr pointer to the stream. - * \pre i >= 0 && i < this->getNumStreamsAtTag( tag ) + * \pre i >= 0 && i < this->getNumStreamsWithTag( tag ) * \post stream_ptr != NULL. */ LogStream* getStream(const std::string& tag, int i); diff --git a/src/axom/slic/interface/slic.cpp b/src/axom/slic/interface/slic.cpp index 9f64b1c055..414c2c0c21 100644 --- a/src/axom/slic/interface/slic.cpp +++ b/src/axom/slic/interface/slic.cpp @@ -207,10 +207,10 @@ void addStreamToAllTags(GenericOutputStream* ls) } //------------------------------------------------------------------------------ -int getNumStreamsAtTag(const std::string& tag) +int getNumStreamsWithTag(const std::string& tag) { ensureInitialized(); - return Logger::getActiveLogger()->getNumStreamsAtTag(tag); + return Logger::getActiveLogger()->getNumStreamsWithTag(tag); } //------------------------------------------------------------------------------ diff --git a/src/axom/slic/interface/slic.hpp b/src/axom/slic/interface/slic.hpp index 146435fc7c..4d7e6ecc02 100644 --- a/src/axom/slic/interface/slic.hpp +++ b/src/axom/slic/interface/slic.hpp @@ -273,7 +273,7 @@ void addStreamToAllTags(GenericOutputStream* ls); * \return N the number of streams for the given tag. * \post N >= 0 */ -int getNumStreamsAtTag(const std::string& tag); +int getNumStreamsWithTag(const std::string& tag); /*! * \brief Logs the given message to all registered streams. diff --git a/src/axom/slic/tests/slic_uninit.cpp b/src/axom/slic/tests/slic_uninit.cpp index 6709197d16..4f4a21d848 100644 --- a/src/axom/slic/tests/slic_uninit.cpp +++ b/src/axom/slic/tests/slic_uninit.cpp @@ -96,8 +96,8 @@ TEST(slic_uninit, manage_loggers) axom::slic::addStreamToAllTags( new axom::slic::GenericOutputStream(&std::cout, format)); }); - testInit("getNumStreamsAtTag", - []() { axom::slic::getNumStreamsAtTag("Test"); }); + testInit("getNumStreamsWithTag", + []() { axom::slic::getNumStreamsWithTag("Test"); }); } TEST(slic_uninit, log_methods) From 12b930dac76f318a245f883a5498da23edb24a2d Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 13 Feb 2024 15:33:58 -0800 Subject: [PATCH 462/639] cleanup host-configs --- host-configs/other/Darwin.cmake | 13 --- ...-uno-MSVC-INTEL.cmake => MSVC-INTEL.cmake} | 0 .../other/{sqa-uno-MSVC.cmake => MSVC.cmake} | 0 host-configs/other/README | 2 + host-configs/other/battra.cmake | 79 ------------------- host-configs/other/empress.llnl.gov.cmake | 76 ------------------ host-configs/other/naples.cmake | 29 ------- ...-toss_4_x86_64_ib-clang@14-ifort@19.cmake} | 12 +-- ...o-tpl-toss_4_x86_64_ib-clang@14.0.6.cmake} | 10 +-- ...o-tpl-toss_4_x86_64_ib-intel@19.0.4.cmake} | 6 +- 10 files changed, 16 insertions(+), 211 deletions(-) delete mode 100755 host-configs/other/Darwin.cmake rename host-configs/other/{sqa-uno-MSVC-INTEL.cmake => MSVC-INTEL.cmake} (100%) rename host-configs/other/{sqa-uno-MSVC.cmake => MSVC.cmake} (100%) create mode 100644 host-configs/other/README delete mode 100644 host-configs/other/battra.cmake delete mode 100644 host-configs/other/empress.llnl.gov.cmake delete mode 100644 host-configs/other/naples.cmake rename host-configs/other/{no-tpl-toss_3_x86_64_ib-clang@10-ifort@19.cmake => no-tpl-toss_4_x86_64_ib-clang@14-ifort@19.cmake} (90%) rename host-configs/other/{no-tpl-toss_3_x86_64_ib-clang@10.0.0.cmake => no-tpl-toss_4_x86_64_ib-clang@14.0.6.cmake} (89%) rename host-configs/other/{no-tpl-toss_3_x86_64_ib-intel@19.0.4.cmake => no-tpl-toss_4_x86_64_ib-intel@19.0.4.cmake} (92%) diff --git a/host-configs/other/Darwin.cmake b/host-configs/other/Darwin.cmake deleted file mode 100755 index 7849e8c98e..0000000000 --- a/host-configs/other/Darwin.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) -#------------------------------------------------------------------------------ -# CMake Cache Seed file for OSX machines. -#------------------------------------------------------------------------------ - -#------------------------------------------------------------------------------ -# use clang compilers -#------------------------------------------------------------------------------ -set(CMAKE_C_COMPILER "clang" CACHE PATH "") -set(CMAKE_CXX_COMPILER "clang++" CACHE PATH "") diff --git a/host-configs/other/sqa-uno-MSVC-INTEL.cmake b/host-configs/other/MSVC-INTEL.cmake similarity index 100% rename from host-configs/other/sqa-uno-MSVC-INTEL.cmake rename to host-configs/other/MSVC-INTEL.cmake diff --git a/host-configs/other/sqa-uno-MSVC.cmake b/host-configs/other/MSVC.cmake similarity index 100% rename from host-configs/other/sqa-uno-MSVC.cmake rename to host-configs/other/MSVC.cmake diff --git a/host-configs/other/README b/host-configs/other/README new file mode 100644 index 0000000000..90d95acaba --- /dev/null +++ b/host-configs/other/README @@ -0,0 +1,2 @@ +These host-configs are here for documentation of certain use-cases. These are not regularly +tested and may not be currently working. diff --git a/host-configs/other/battra.cmake b/host-configs/other/battra.cmake deleted file mode 100644 index 1c0a836f77..0000000000 --- a/host-configs/other/battra.cmake +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) - -#------------------------------------------------------------------------------ -# uberenv host-config -# -# This is a generated file, edit at own risk. -#------------------------------------------------------------------------------ -# x86_64-gcc@4.9.3 -#------------------------------------------------------------------------------ - -# cmake from uberenv -# cmake executable path: /home/taylor16/apps/cmake-3.8.2/bin/cmake -#------------------------------------------------------------------------------ -# using gcc@4.9.3 compiler spec -#------------------------------------------------------------------------------ - -# c compiler used by spack -set(CMAKE_C_COMPILER "/home/taylor16/apps/gcc-4.9.4/bin/gcc" CACHE PATH "") - -# cpp compiler used by spack -set(CMAKE_CXX_COMPILER "/home/taylor16/apps/gcc-4.9.4/bin/g++" CACHE PATH "") - -# fortran compiler used by spack -set(ENABLE_FORTRAN ON CACHE PATH "") - -set(CMAKE_Fortran_COMPILER "/home/taylor16/apps/gcc-4.9.4/bin/gfortran" CACHE PATH "") - -# Root directory for generated TPLs -set(TPL_ROOT "/home/taylor16/tpl/v2" CACHE PATH "") - -# hdf5 from uberenv -set(HDF5_DIR "${TPL_ROOT}" CACHE PATH "") - -# conduit from uberenv -set(CONDUIT_DIR "${TPL_ROOT}" CACHE PATH "") - -# doxygen from uberenv -set(DOXYGEN_EXECUTABLE "${TPL_ROOT}/bin/doxygen" CACHE PATH "") - -# python from uberenv -set(PYTHON_EXECUTABLE "${TPL_ROOT}/bin/python" CACHE PATH "") - -# lua from uberenv -set(LUA_DIR "${TPL_ROOT}" CACHE PATH "") - -# sphinx from uberenv -set(SPHINX_EXECUTABLE "${TPL_ROOT}/bin/sphinx-build" CACHE PATH "") - -# uncrustify from uberenv -set(UNCRUSTIFY_EXECUTABLE "${TPL_ROOT}/bin/uncrustify" CACHE PATH "") - -# boost headers from uberenv -set(BOOST_DIR "${TPL_ROOT}" CACHE PATH "") - -# lcov and genhtml from uberenv -set(LCOV_PATH "${TPL_ROOT}/usr/bin/lcov" CACHE PATH "") - -set(GENHTML_PATH "${TPL_ROOT}/usr/bin/genhtml" CACHE PATH "") - -#------------------------------------------------------------------------------ -# end uberenv host-config -#------------------------------------------------------------------------------ - -#------------------------------------------------------------------------------ -# MPI - manually added these for now. -#------------------------------------------------------------------------------ -#set(ENABLE_MPI ON CACHE PATH "") -#set(MPI_C_COMPILER "/home/taylor16/local/mpich-3.2/bin/mpicc" CACHE PATH "") -#set(MPI_CXX_COMPILER "/home/taylor16/local/mpich-3.2/bin/mpicxx" CACHE PATH "") -#set(MPI_Fortran_COMPILER "/home/taylor16/local/mpich-3.2/bin/mpif90" CACHE PATH "") - -#------------------------------------------------------------------------------ -# SHROUD - manually added for now. Use a public build add to TPL later -#------------------------------------------------------------------------------ -set(SHROUD_EXECUTABLE "/home/taylor16/tpl/shroud/bin/shroud" CACHE PATH "") - diff --git a/host-configs/other/empress.llnl.gov.cmake b/host-configs/other/empress.llnl.gov.cmake deleted file mode 100644 index b14db44c58..0000000000 --- a/host-configs/other/empress.llnl.gov.cmake +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) - -#------------------------------------------------------------------------------ -# uberenv host-config -# -# This is a generated file, edit at own risk. -#------------------------------------------------------------------------------ -# x86_64-gcc@4.9.3 -#------------------------------------------------------------------------------ - -# cmake from uberenv -# cmake executable path: /home/taylor16/tpl/v7mpi/spack/opt/spack/x86_64/gcc-4.9.3/cmake-3.3.1-jkk5puodwd24sh2egavyrp2ony2z3wtn/bin/cmake - -#------------------------------------------------------------------------------ -# using gcc@4.9.3 compiler spec -#------------------------------------------------------------------------------ - -# c compiler used by spack -set(CMAKE_C_COMPILER "/home/taylor16/gapps/gcc-4.9.3/bin/gcc" CACHE PATH "") - -# cpp compiler used by spack -set(CMAKE_CXX_COMPILER "/home/taylor16/gapps/gcc-4.9.3/bin/g++" CACHE PATH "") - -# fortran compiler used by spack -set(ENABLE_FORTRAN ON CACHE PATH "") - -set(CMAKE_Fortran_COMPILER "/home/taylor16/gapps/gcc-4.9.3/bin/gfortran" CACHE PATH "") - -# hdf5 from uberenv -set(HDF5_DIR "/home/taylor16/tpl/v7mpi/spack/opt/spack/x86_64/gcc-4.9.3/hdf5-1.8.16-vhefrjw2f57yhjzb77fuvhlaowx66dht" CACHE PATH "") - -# conduit from uberenv -#set(CONDUIT_DIR "/home/taylor16/tpl/v7mpi/spack/opt/spack/x86_64/gcc-4.9.3/conduit-github-sfgmvgy7nlranrdldpoqrfkrcwv3bvid" CACHE PATH "") -set(CONDUIT_DIR "/home/taylor16/conduit/debug-install" CACHE PATH "") - -# doxygen from uberenv -set(DOXYGEN_EXECUTABLE "/home/taylor16/tpl/v7mpi/spack/opt/spack/x86_64/gcc-4.9.3/doxygen-1.8.10-7qxnjx5i5cyy2nbygrdihsdgzrnfvs77/bin/doxygen" CACHE PATH "") - -# python from uberenv -set(PYTHON_EXECUTABLE "/home/taylor16/tpl/v7mpi/spack/opt/spack/x86_64/gcc-4.9.3/python-2.7.11-hk7h4ntkiplj3ukfwxcbr7oxqtf3n2hy/bin/python" CACHE PATH "") - -# lua from uberenv -set(LUA_DIR "/home/taylor16/tpl/v7mpi/spack/opt/spack/x86_64/gcc-4.9.3/lua-5.1.5-44ijmjynmfovg6eteacz54gu6muabngc" CACHE PATH "") - -# sphinx from uberenv -set(SPHINX_EXECUTABLE "/home/taylor16/tpl/v7mpi/spack/opt/spack/x86_64/gcc-4.9.3/python-2.7.11-hk7h4ntkiplj3ukfwxcbr7oxqtf3n2hy/bin/sphinx-build" CACHE PATH "") - -# uncrustify from uberenv -set(UNCRUSTIFY_EXECUTABLE "/home/taylor16/tpl/v7mpi/spack/opt/spack/x86_64/gcc-4.9.3/uncrustify-0.61-sdasmocwkfmf6xupjpoo73rzdddf2nl6/bin/uncrustify" CACHE PATH "") - -# sparsehash headers from uberenv -set(SPARSEHASH_DIR "/home/taylor16/tpl/v7mpi/spack/opt/spack/x86_64/gcc-4.9.3/sparsehash-headers-2.0.2-rmpk4wmjkozch4i54wa7l5zjfyru7yr3" CACHE PATH "") - -# boost headers from uberenv -set(ENABLE_BOOST ON CACHE PATH "") -set(BOOST_ROOT "/home/taylor16/tpl/v7mpi/spack/opt/spack/x86_64/gcc-4.9.3/boost-headers-1.58.0-6jjq5njm5itr67imya3p4fcnmiaj5nab" CACHE PATH "") - -# lcov and genhtml from uberenv -set(LCOV_PATH "/home/taylor16/tpl/v7mpi/spack/opt/spack/x86_64/gcc-4.9.3/lcov-1.11-h3ijl43wxo53yrr7j7gsnmpuc4wc5nrn/usr/bin/lcov" CACHE PATH "") - -set(GENHTML_PATH "/home/taylor16/tpl/v7mpi/spack/opt/spack/x86_64/gcc-4.9.3/lcov-1.11-h3ijl43wxo53yrr7j7gsnmpuc4wc5nrn/usr/bin/genhtml" CACHE PATH "") - -#------------------------------------------------------------------------------ -# end uberenv host-config -#------------------------------------------------------------------------------ - -#------------------------------------------------------------------------------ -# MPI - manually added these for now. -#------------------------------------------------------------------------------ -set(ENABLE_MPI ON CACHE PATH "") -set(MPI_C_COMPILER "/home/taylor16/local/mpich-3.2/bin/mpicc" CACHE PATH "") -set(MPI_CXX_COMPILER "/home/taylor16/local/mpich-3.2/bin/mpicxx" CACHE PATH "") -set(MPI_Fortran_COMPILER "/home/taylor16/local/mpich-3.2/bin/mpif90" CACHE PATH "") diff --git a/host-configs/other/naples.cmake b/host-configs/other/naples.cmake deleted file mode 100644 index 26e09b5c7d..0000000000 --- a/host-configs/other/naples.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) -#------------------------------------------------------------------------------ -# uberenv host-config for asctoolkit -#------------------------------------------------------------------------------ -# cmake from uberenv -# cmake executable path: /Users/harrison37/Work/asctoolkit/uberenv_libs/spack/opt/macosx_10.9_x86_64/clang@3.4svn/cmake@3.2.2/bin/cmake - -# conduit from uberenv -set(CONDUIT_DIR "/Users/harrison37/Work/asctoolkit/uberenv_libs/spack/opt/macosx_10.9_x86_64/clang@3.4svn/conduit@github-6758ccf0" CACHE PATH "") - -# python from uberenv -set(PYTHON_EXECUTABLE "/Users/harrison37/Work/asctoolkit/uberenv_libs/spack/opt/macosx_10.9_x86_64/clang@3.4svn/python@2.7.8/bin/python" CACHE PATH "") - -# sphinx from uberenv -set(SPHINX_EXECUTABLE "/Users/harrison37/Work/asctoolkit/uberenv_libs/spack/opt/macosx_10.9_x86_64/clang@3.4svn/python@2.7.8/bin/sphinx-build" CACHE PATH "") - -# uncrustify from uberenv -set(UNCRUSTIFY_EXECUTABLE "/Users/harrison37/Work/asctoolkit/uberenv_libs/spack/opt/macosx_10.9_x86_64/clang@3.4svn/uncrustify@0.61/bin/uncrustify" CACHE PATH "") - -# sparsehash headers from uberenv -set(SPARSEHASH_DIR "/Users/harrison37/Work/asctoolkit/uberenv_libs/spack/opt/macosx_10.9_x86_64/clang@3.4svn/sparsehash-headers@2.0.2" CACHE PATH "") - -# boost headers from uberenv -set(ENABLE_BOOST ON CACHE PATH "") -set(BOOST_ROOT "/Users/harrison37/Work/asctoolkit/uberenv_libs/spack/opt/macosx_10.9_x86_64/clang@3.4svn/boost-headers@1.58.0" CACHE PATH "") - diff --git a/host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10-ifort@19.cmake b/host-configs/other/no-tpl-toss_4_x86_64_ib-clang@14-ifort@19.cmake similarity index 90% rename from host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10-ifort@19.cmake rename to host-configs/other/no-tpl-toss_4_x86_64_ib-clang@14-ifort@19.cmake index 0938856265..cd7f0139f7 100644 --- a/host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10-ifort@19.cmake +++ b/host-configs/other/no-tpl-toss_4_x86_64_ib-clang@14-ifort@19.cmake @@ -16,7 +16,7 @@ # cd # mkdir build # cd build -# cmake -C ../host-config/other/no-tpl-toss_3_x86_64_ib-clang@10-ifort@19.cmake \ +# cmake -C ../host-config/other/no-tpl-toss_4_x86_64_ib-clang@14-ifort@19.cmake \ # -DCMAKE_BUILD_TYPE={Debug,Release} \ # -DBUILD_SHARED_LIBS={ON,OFF(DEFAULT)} \ # -DENABLE_EXAMPLES={ON,OFF} \ @@ -24,14 +24,14 @@ # -DCMAKE_INSTALL_PREFIX= /path/to/install/dir \ # ../src #------------------------------------------------------------------------------ -# CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake +# CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ set(ENABLE_FORTRAN ON CACHE BOOL "") set(_gnu_root "/usr/tce/packages/gcc/gcc-8.3.1" CACHE PATH "") -set(_clang_root "/usr/tce/packages/clang/clang-10.0.0" CACHE PATH "") -set(_intel_root "/usr/tce/packages/intel/intel-19.0.4" CACHE PATH "") +set(_clang_root "/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") +set(_intel_root "/usr/tce/packages/intel-classic-tce/intel-classic-19.0.4" CACHE PATH "") set(CMAKE_C_COMPILER "${_clang_root}/bin/clang" CACHE PATH "") set(CMAKE_CXX_COMPILER "${_clang_root}/bin/clang++" CACHE PATH "") @@ -60,7 +60,7 @@ set(AXOM_ENABLE_KLEE OFF CACHE BOOL "") #------------------------------------------------------------------------------ set(ENABLE_MPI ON CACHE BOOL "") -set(_mpi_root "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-10.0.0" CACHE PATH "") +set(_mpi_root "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-14.0.6" CACHE PATH "") set(MPI_C_COMPILER "${_mpi_root}/bin/mpicc" CACHE PATH "") set(MPI_CXX_COMPILER "${_mpi_root}/bin/mpicxx" CACHE PATH "") set(MPI_Fortran_COMPILER "${_mpi_root}/bin/mpif90" CACHE PATH "") @@ -75,4 +75,4 @@ set(ENABLE_OPENMP OFF CACHE BOOL "") set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") set(ENABLE_DOCS OFF CACHE BOOL "") -set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") +set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-14.0.6/bin/clang-format" CACHE PATH "") diff --git a/host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10.0.0.cmake b/host-configs/other/no-tpl-toss_4_x86_64_ib-clang@14.0.6.cmake similarity index 89% rename from host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10.0.0.cmake rename to host-configs/other/no-tpl-toss_4_x86_64_ib-clang@14.0.6.cmake index 6587e28b7e..64785589c5 100644 --- a/host-configs/other/no-tpl-toss_3_x86_64_ib-clang@10.0.0.cmake +++ b/host-configs/other/no-tpl-toss_4_x86_64_ib-clang@14.0.6.cmake @@ -15,7 +15,7 @@ # cd # mkdir build # cd build -# cmake -C ../host-config/other/no-tpl-toss3_x86_64_ib-clang@10.0.0.cmake \ +# cmake -C ../host-config/other/no-tpl-toss4_x86_64_ib-clang@14.0.6.cmake \ # -DCMAKE_BUILD_TYPE={Debug,Release} \ # -DBUILD_SHARED_LIBS={ON,OFF(DEFAULT)} \ # -DENABLE_EXAMPLES={ON,OFF} \ @@ -23,12 +23,12 @@ # -DCMAKE_INSTALL_PREFIX= /path/to/install/dir \ # ../src #------------------------------------------------------------------------------ -# CMake executable path: /usr/tce/packages/cmake/cmake-3.16.8/bin/cmake +# CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ set(ENABLE_FORTRAN ON CACHE BOOL "") -set(COMPILER_HOME "/usr/tce/packages/clang/clang-10.0.0" CACHE PATH "") +set(COMPILER_HOME "/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") set(CMAKE_C_COMPILER "${COMPILER_HOME}/bin/clang" CACHE PATH "") set(CMAKE_CXX_COMPILER "${COMPILER_HOME}/bin/clang++" CACHE PATH "") set(CMAKE_Fortran_COMPILER "/usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran" CACHE PATH "") @@ -46,7 +46,7 @@ set(BLT_EXE_LINKER_FLAGS " -Wl,-rpath,${COMPILER_HOME}/lib" CACHE STRING "Adds a #------------------------------------------------------------------------------ set(ENABLE_MPI ON CACHE BOOL "") -set(MPI_HOME "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-10.0.0" CACHE PATH "") +set(MPI_HOME "/usr/tce/packages/mvapich2/mvapich2-2.3-clang-14.0.6" CACHE PATH "") set(MPI_C_COMPILER "${MPI_HOME}/bin/mpicc" CACHE PATH "") set(MPI_CXX_COMPILER "${MPI_HOME}/bin/mpicxx" CACHE PATH "") set(MPI_Fortran_COMPILER "${MPI_HOME}/bin/mpif90" CACHE PATH "") @@ -57,5 +57,5 @@ set(MPIEXEC_NUMPROC_FLAG "-n" CACHE PATH "") #------------------------------------------------------------------------------ # Other #------------------------------------------------------------------------------ -set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-format" CACHE PATH "") +set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-14.0.6/bin/clang-format" CACHE PATH "") diff --git a/host-configs/other/no-tpl-toss_3_x86_64_ib-intel@19.0.4.cmake b/host-configs/other/no-tpl-toss_4_x86_64_ib-intel@19.0.4.cmake similarity index 92% rename from host-configs/other/no-tpl-toss_3_x86_64_ib-intel@19.0.4.cmake rename to host-configs/other/no-tpl-toss_4_x86_64_ib-intel@19.0.4.cmake index bf0ef9100f..d064d9109a 100644 --- a/host-configs/other/no-tpl-toss_3_x86_64_ib-intel@19.0.4.cmake +++ b/host-configs/other/no-tpl-toss_4_x86_64_ib-intel@19.0.4.cmake @@ -15,7 +15,7 @@ # cd # mkdir build # cd build -# cmake -C ../host-config/other/no-tpl-toss3-intel@19.0.4.cmake \ +# cmake -C ../host-config/other/no-tpl-toss_4_x86_64_ib-intel@19.0.4.cmake \ # -DCMAKE_BUILD_TYPE={Debug,Release} \ # -DBUILD_SHARED_LIBS={ON,OFF(DEFAULT)} \ # -DENABLE_EXAMPLES={ON,OFF} \ @@ -23,12 +23,12 @@ # -DCMAKE_INSTALL_PREFIX= /path/to/install/dir \ # ../src #------------------------------------------------------------------------------ -# CMake executable path: /usr/tce/packages/cmake/cmake-3.16.8/bin/cmake +# CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ set(ENABLE_FORTRAN ON CACHE BOOL "") -set(COMPILER_HOME "/usr/tce/packages/intel/intel-19.0.4" ) +set(COMPILER_HOME "/usr/tce/packages/intel-classic-tce/intel-classic-19.0.4" ) set(CMAKE_C_COMPILER "${COMPILER_HOME}/bin/icc" CACHE PATH "") set(CMAKE_CXX_COMPILER "${COMPILER_HOME}/bin/icpc" CACHE PATH "") set(CMAKE_Fortran_COMPILER "${COMPILER_HOME}/bin/ifort" CACHE PATH "") From 02baf1077a566f1aa01fc81242f91fcdd38d6bd7 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 13 Feb 2024 15:57:21 -0800 Subject: [PATCH 463/639] remove old hip host-configs --- ...ss_4_x86_64_ib_cray-clang@14.0.0_hip.cmake | 129 ------------------ ...ss_4_x86_64_ib_cray-clang@15.0.0_hip.cmake | 129 ------------------ 2 files changed, 258 deletions(-) delete mode 100644 host-configs/tioga-toss_4_x86_64_ib_cray-clang@14.0.0_hip.cmake delete mode 100644 host-configs/tioga-toss_4_x86_64_ib_cray-clang@15.0.0_hip.cmake diff --git a/host-configs/tioga-toss_4_x86_64_ib_cray-clang@14.0.0_hip.cmake b/host-configs/tioga-toss_4_x86_64_ib_cray-clang@14.0.0_hip.cmake deleted file mode 100644 index 6c4968c3c7..0000000000 --- a/host-configs/tioga-toss_4_x86_64_ib_cray-clang@14.0.0_hip.cmake +++ /dev/null @@ -1,129 +0,0 @@ -#------------------------------------------------------------------------------ -# !!!! This is a generated file, edit at own risk !!!! -#------------------------------------------------------------------------------ -# CMake executable path: /usr/tce/bin/cmake -#------------------------------------------------------------------------------ - -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0/umpire-2023.06.0-5shsoyik6cl37unfukgypuy5wq3xrf5d;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0/raja-2023.06.0-mihlyyxgy5ksjvblaztoa7lernlfuq5c;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0/camp-2023.06.0-kjnl6w2c7g7373mmyy6z2kmnvwqcjiat;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0/mfem-4.5.2-z5scxsmafi5skftjzrszn2cgfg5smgxr;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0/hypre-2.24.0-kirtgmu2tqj5qeewzcgwxekiw2mjjvnq;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0/lua-5.4.4-s6rzmz2h2k53z53grnpe237uwwzr4nz3;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0/ncurses-6.4-wwijdtdjzvmf4224vzbzcntupmetijri;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0/conduit-0.8.8-2kuebxwabtkkcikcqclqytfllwm3qwhg;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0/parmetis-4.0.3-g4rtt7uakthoyf32g4ug6nntsxsh3im3;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0/metis-5.1.0-bhi2eebvzv5maenn2vbmxsr2ftlqqv5n;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0/hdf5-1.8.22-fo5wthv72ys3e263kvxykonmixg2sxun;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0/c2c-1.8.0-56n4sm5x4ecvwmdazemuqvikg5ngwdwf;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0/blt-0.5.3-2z65cg5imrjg7ktgft4ob5tgxg2cvn4f;/opt/rocm-5.2.3;/opt/rocm-5.2.3/llvm;/opt/rocm-5.2.3;/opt/rocm-5.2.3/hip;/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.16-rocmcc-5.2.3;/usr/tce" CACHE PATH "") - -set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") - -#------------------------------------------------------------------------------ -# Compilers -#------------------------------------------------------------------------------ -# Compiler Spec: clang@=14.0.0 -#------------------------------------------------------------------------------ -if(DEFINED ENV{SPACK_CC}) - - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/spack/lib/spack/env/clang/clang" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/spack/lib/spack/env/clang/clang++" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/spack/lib/spack/env/clang/flang" CACHE PATH "") - -else() - - set(CMAKE_C_COMPILER "/opt/rocm-5.2.3/llvm/bin/amdclang" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/opt/rocm-5.2.3/llvm/bin/amdclang++" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/opt/rocm-5.2.3/llvm/bin/amdflang" CACHE PATH "") - -endif() - -set(CMAKE_Fortran_FLAGS "-Mfreeform" CACHE STRING "") - -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - -set(ENABLE_FORTRAN ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# MPI -#------------------------------------------------------------------------------ - -set(MPI_C_COMPILER "/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.16-rocmcc-5.2.3/bin/mpicc" CACHE PATH "") - -set(MPI_CXX_COMPILER "/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.16-rocmcc-5.2.3/bin/mpicxx" CACHE PATH "") - -set(MPI_Fortran_COMPILER "/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.16-rocmcc-5.2.3/bin/mpif90" CACHE PATH "") - -set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") - -set(ENABLE_MPI ON CACHE BOOL "") - -set(MPIEXEC_EXECUTABLE "/usr/global/tools/flux_wrappers/bin/srun" CACHE PATH "") - -#------------------------------------------------------------------------------ -# Hardware -#------------------------------------------------------------------------------ - -#------------------------------------------------ -# ROCm -#------------------------------------------------ - -set(HIP_ROOT_DIR "/opt/rocm-5.2.3/hip" CACHE PATH "") - -set(HIP_CXX_COMPILER "/opt/rocm-5.2.3/hip/bin/hipcc" CACHE PATH "") - -set(CMAKE_HIP_ARCHITECTURES "gfx90a" CACHE STRING "") - -set(AMDGPU_TARGETS "gfx90a" CACHE STRING "") - -set(GPU_TARGETS "gfx90a" CACHE STRING "") - -#------------------------------------------------------------------------------ - -# Axom ROCm specifics - -#------------------------------------------------------------------------------ - - -set(ENABLE_HIP ON CACHE BOOL "") - -set(HIP_CLANG_INCLUDE_PATH "/opt/rocm-5.2.3/hip/../llvm/lib/clang/14.0.0/include" CACHE PATH "") - -set(CMAKE_EXE_LINKER_FLAGS "-Wl,--disable-new-dtags -L/opt/rocm-5.2.3/hip/../llvm/lib -L/opt/rocm-5.2.3/hip/lib -Wl,-rpath,/opt/rocm-5.2.3/hip/../llvm/lib:/opt/rocm-5.2.3/hip/lib -lpgmath -lflang -lflangrti -lompstub -lamdhip64 -L/opt/rocm-5.2.3/hip/../lib64 -Wl,-rpath,/opt/rocm-5.2.3/hip/../lib64 -L/opt/rocm-5.2.3/hip/../lib -Wl,-rpath,/opt/rocm-5.2.3/hip/../lib -lamd_comgr -lhsa-runtime64 " CACHE STRING "") - -#------------------------------------------------ -# Hardware Specifics -#------------------------------------------------ - -set(ENABLE_OPENMP OFF CACHE BOOL "") - -set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# TPLs -#------------------------------------------------------------------------------ - -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-14.0.0" CACHE PATH "") - -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-2kuebxwabtkkcikcqclqytfllwm3qwhg" CACHE PATH "") - -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-56n4sm5x4ecvwmdazemuqvikg5ngwdwf" CACHE PATH "") - -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-z5scxsmafi5skftjzrszn2cgfg5smgxr" CACHE PATH "") - -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-fo5wthv72ys3e263kvxykonmixg2sxun" CACHE PATH "") - -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-s6rzmz2h2k53z53grnpe237uwwzr4nz3" CACHE PATH "") - -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-mihlyyxgy5ksjvblaztoa7lernlfuq5c" CACHE PATH "") - -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-5shsoyik6cl37unfukgypuy5wq3xrf5d" CACHE PATH "") - -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-kjnl6w2c7g7373mmyy6z2kmnvwqcjiat" CACHE PATH "") - -# scr not built - -#------------------------------------------------------------------------------ -# Devtools -#------------------------------------------------------------------------------ - -# ClangFormat disabled due to llvm and devtools not in spec - -set(ENABLE_CLANGFORMAT OFF CACHE BOOL "") - -set(ENABLE_DOCS OFF CACHE BOOL "") - - diff --git a/host-configs/tioga-toss_4_x86_64_ib_cray-clang@15.0.0_hip.cmake b/host-configs/tioga-toss_4_x86_64_ib_cray-clang@15.0.0_hip.cmake deleted file mode 100644 index 86e9fe071a..0000000000 --- a/host-configs/tioga-toss_4_x86_64_ib_cray-clang@15.0.0_hip.cmake +++ /dev/null @@ -1,129 +0,0 @@ -#------------------------------------------------------------------------------ -# !!!! This is a generated file, edit at own risk !!!! -#------------------------------------------------------------------------------ -# CMake executable path: /usr/tce/bin/cmake -#------------------------------------------------------------------------------ - -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0/umpire-2023.06.0-qlza5hxkti4qhuvnywz6js5xwouogfq5;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0/raja-2023.06.0-vcdxhm5vuta43rgiuayko2slnfksxf7f;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0/camp-2023.06.0-lhl3jkmzbdahxa633diszo6r4drszuy6;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0/mfem-4.5.2-qu3gj4kd7xsetoefz23bofifgyufllhi;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0/hypre-2.24.0-qbm2npjkwsp4vryixh65wbi2vohvpvbv;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0/lua-5.4.4-nciboohbuioaqb35wwibitzc3ypfjbvp;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0/ncurses-6.4-aqfvdlf2fuogw7pvfsg33qvvsdskwxn3;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0/conduit-0.8.8-hqffdgfu3fhgmjlctcuywp66hp5ldg7e;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0/parmetis-4.0.3-22wxjkvf6g6l74z2ztuk3imydnmpi7gq;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0/metis-5.1.0-i4fcjmmgu4qquorg5pjbuipwd7m3viy6;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0/hdf5-1.8.22-eoxieadxuddhem2eot4dqfdj47xngqpj;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0/c2c-1.8.0-da5avt3ikppaabh4do3vgximikvvsjhy;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0/blt-0.5.3-57fuyfjl4ksfli3zskcbvykyrwtrwfne;/opt/rocm-5.4.3;/opt/rocm-5.4.3/llvm;/opt/rocm-5.4.3;/opt/rocm-5.4.3/hip;/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.4.3;/usr/tce" CACHE PATH "") - -set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") - -#------------------------------------------------------------------------------ -# Compilers -#------------------------------------------------------------------------------ -# Compiler Spec: clang@=15.0.0 -#------------------------------------------------------------------------------ -if(DEFINED ENV{SPACK_CC}) - - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/spack/lib/spack/env/clang/clang" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/spack/lib/spack/env/clang/clang++" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/spack/lib/spack/env/clang/flang" CACHE PATH "") - -else() - - set(CMAKE_C_COMPILER "/opt/rocm-5.4.3/llvm/bin/amdclang" CACHE PATH "") - - set(CMAKE_CXX_COMPILER "/opt/rocm-5.4.3/llvm/bin/amdclang++" CACHE PATH "") - - set(CMAKE_Fortran_COMPILER "/opt/rocm-5.4.3/llvm/bin/amdflang" CACHE PATH "") - -endif() - -set(CMAKE_Fortran_FLAGS "-Mfreeform" CACHE STRING "") - -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - -set(ENABLE_FORTRAN ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# MPI -#------------------------------------------------------------------------------ - -set(MPI_C_COMPILER "/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.4.3/bin/mpicc" CACHE PATH "") - -set(MPI_CXX_COMPILER "/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.4.3/bin/mpicxx" CACHE PATH "") - -set(MPI_Fortran_COMPILER "/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.4.3/bin/mpif90" CACHE PATH "") - -set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "") - -set(ENABLE_MPI ON CACHE BOOL "") - -set(MPIEXEC_EXECUTABLE "/usr/global/tools/flux_wrappers/bin/srun" CACHE PATH "") - -#------------------------------------------------------------------------------ -# Hardware -#------------------------------------------------------------------------------ - -#------------------------------------------------ -# ROCm -#------------------------------------------------ - -set(HIP_ROOT_DIR "/opt/rocm-5.4.3/hip" CACHE PATH "") - -set(HIP_CXX_COMPILER "/opt/rocm-5.4.3/hip/bin/hipcc" CACHE PATH "") - -set(CMAKE_HIP_ARCHITECTURES "gfx90a" CACHE STRING "") - -set(AMDGPU_TARGETS "gfx90a" CACHE STRING "") - -set(GPU_TARGETS "gfx90a" CACHE STRING "") - -#------------------------------------------------------------------------------ - -# Axom ROCm specifics - -#------------------------------------------------------------------------------ - - -set(ENABLE_HIP ON CACHE BOOL "") - -set(HIP_CLANG_INCLUDE_PATH "/opt/rocm-5.4.3/hip/../llvm/lib/clang/15.0.0/include" CACHE PATH "") - -set(CMAKE_EXE_LINKER_FLAGS "-Wl,--disable-new-dtags -L/opt/rocm-5.4.3/hip/../llvm/lib -L/opt/rocm-5.4.3/hip/lib -Wl,-rpath,/opt/rocm-5.4.3/hip/../llvm/lib:/opt/rocm-5.4.3/hip/lib -lpgmath -lflang -lflangrti -lompstub -lamdhip64 -L/opt/rocm-5.4.3/hip/../lib64 -Wl,-rpath,/opt/rocm-5.4.3/hip/../lib64 -L/opt/rocm-5.4.3/hip/../lib -Wl,-rpath,/opt/rocm-5.4.3/hip/../lib -lamd_comgr -lhsa-runtime64 " CACHE STRING "") - -#------------------------------------------------ -# Hardware Specifics -#------------------------------------------------ - -set(ENABLE_OPENMP OFF CACHE BOOL "") - -set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") - -#------------------------------------------------------------------------------ -# TPLs -#------------------------------------------------------------------------------ - -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-15.0.0" CACHE PATH "") - -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-hqffdgfu3fhgmjlctcuywp66hp5ldg7e" CACHE PATH "") - -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-da5avt3ikppaabh4do3vgximikvvsjhy" CACHE PATH "") - -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-qu3gj4kd7xsetoefz23bofifgyufllhi" CACHE PATH "") - -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-eoxieadxuddhem2eot4dqfdj47xngqpj" CACHE PATH "") - -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-nciboohbuioaqb35wwibitzc3ypfjbvp" CACHE PATH "") - -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-vcdxhm5vuta43rgiuayko2slnfksxf7f" CACHE PATH "") - -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-qlza5hxkti4qhuvnywz6js5xwouogfq5" CACHE PATH "") - -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-lhl3jkmzbdahxa633diszo6r4drszuy6" CACHE PATH "") - -# scr not built - -#------------------------------------------------------------------------------ -# Devtools -#------------------------------------------------------------------------------ - -# ClangFormat disabled due to llvm and devtools not in spec - -set(ENABLE_CLANGFORMAT OFF CACHE BOOL "") - -set(ENABLE_DOCS OFF CACHE BOOL "") - - From 31012915f0987a916eb2e75f55c2398f7f8cf7f6 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 13 Feb 2024 15:58:34 -0800 Subject: [PATCH 464/639] remove batch scripts --- scripts/llnl_scripts/batch_scripts/README.md | 26 ------------------- .../bsub_llnl_cz_blueos_all_compilers.sh | 22 ---------------- .../batch_scripts/bsub_llnl_cz_blueos_src.sh | 22 ---------------- .../bsub_llnl_rz_blueos_all_compilers.sh | 21 --------------- .../batch_scripts/bsub_llnl_rz_blueos_src.sh | 22 ---------------- .../msub_llnl_cz_toss3_all_compilers.sh | 23 ---------------- .../batch_scripts/msub_llnl_cz_toss3_src.sh | 23 ---------------- .../msub_llnl_rz_toss3_all_compilers.sh | 22 ---------------- .../batch_scripts/msub_llnl_rz_toss3_src.sh | 22 ---------------- .../msub_llnl_test_uberenv_host_configs.sh | 24 ----------------- 10 files changed, 227 deletions(-) delete mode 100644 scripts/llnl_scripts/batch_scripts/README.md delete mode 100755 scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_all_compilers.sh delete mode 100755 scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_src.sh delete mode 100755 scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_all_compilers.sh delete mode 100755 scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_src.sh delete mode 100755 scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_all_compilers.sh delete mode 100755 scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_src.sh delete mode 100755 scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_all_compilers.sh delete mode 100755 scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_src.sh delete mode 100755 scripts/llnl_scripts/batch_scripts/msub_llnl_test_uberenv_host_configs.sh diff --git a/scripts/llnl_scripts/batch_scripts/README.md b/scripts/llnl_scripts/batch_scripts/README.md deleted file mode 100644 index 89f26bae97..0000000000 --- a/scripts/llnl_scripts/batch_scripts/README.md +++ /dev/null @@ -1,26 +0,0 @@ -[comment]: # (#################################################################) -[comment]: # (Copyright 2017-2021, Lawrence Livermore National Security, LLC) -[comment]: # (and Axom Project Developers. See the top-level LICENSE file) -[comment]: # (for details.) -[comment]: # -[comment]: # (# SPDX-License-Identifier: BSD-3-Clause) -[comment]: # (#################################################################) - - -This directory contains some batch scripts to build third-party libraries -or source for multiple configurations on different clusters at LLNL. - -About ------ -There are two types of batch scripts for each network and cluster type: -* The `src` scripts call `/scripts/llnl_scripts/build_src.py` - to build and test all configurations on the given cluster. -* The `all_compilers` scripts call `/scripts/llnl_scripts/build_tpls.py` - to build Axom's third-party libraries (via uberenv) on the given cluster. - As part of this process, it build and test the code using each of these configurations . - -Usage ------ -To use these scripts, log into a cluster on an LLNL network (`CZ` or `RZ`) and call the appropriate script: -* On `toss3` (e.g. `ruby`) use the `msub` scripts: `msub msub_llnl_{c,r}z_toss3_{src,all_compilers}.sh` -* On `blueos` (e.g. `lassen`) use the `bsub` scripts: `bsub < bsub_llnl_{c,r}z_blueos_{src,all_compilers}.sh` diff --git a/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_all_compilers.sh b/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_all_compilers.sh deleted file mode 100755 index 28af8c5711..0000000000 --- a/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_all_compilers.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) - -#BSUB -W 240 -#BSUB -G wbronze -#BSUB -o b.out.cz.blueos.all.compilers.%J.txt -#BSUB -q pbatch -# -# usage: -# cd {to directory with this script} -# bsub < bsub_llnl_cz_blueos_all_compilers.sh -# - -date -cd .. -./build_tpls.py -date - diff --git a/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_src.sh b/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_src.sh deleted file mode 100755 index 0c7025b31a..0000000000 --- a/scripts/llnl_scripts/batch_scripts/bsub_llnl_cz_blueos_src.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) - -#BSUB -W 240 -#BSUB -G wbronze -#BSUB -o b.out.cz.blueos.src.%J.txt -#BSUB -q pbatch -# -# usage: -# cd {to directory with this script} -# bsub < bsub_llnl_cz_blueos_src.sh -# - -date -cd .. -./build_src.py -date - diff --git a/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_all_compilers.sh b/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_all_compilers.sh deleted file mode 100755 index 84f0ab48df..0000000000 --- a/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_all_compilers.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) - -#BSUB -W 240 -#BSUB -o b.out.rz.blueos.all.compilers.%J.txt -#BSUB -q pdebug -# -# usage: -# cd {to directory with this script} -# bsub < bsub_llnl_rz_blueos_all_compilers.sh -# - -date -cd .. -./build_tpls.py -date - diff --git a/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_src.sh b/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_src.sh deleted file mode 100755 index 0463fd8a16..0000000000 --- a/scripts/llnl_scripts/batch_scripts/bsub_llnl_rz_blueos_src.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) - -#BSUB -W 240 -#BSUB -G wbronze -#BSUB -o b.out.rz.blueos.src.%J.txt -#BSUB -q pbatch -# -# usage: -# cd {to directory with this script} -# bsub < bsub_llnl_rz_blueos_src.sh -# - -date -cd .. -./build_src.py -date - diff --git a/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_all_compilers.sh b/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_all_compilers.sh deleted file mode 100755 index c17ae004aa..0000000000 --- a/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_all_compilers.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) - -#MSUB -l nodes=1 -#MSUB -q pbatch -#MSUB -l walltime=8:00:00 -#MSUB -A wbronze -#MSUB -j oe -#MSUB -o m.out.cz.uberenv.toss3.all.compilers.%j.%N.txt -# -# usage: -# cd {to directory with this script} -# msub -d `pwd` msub_llnl_cz_toss3_all_compilers.sh - -date -cd .. -./build_tpls.py -date - diff --git a/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_src.sh b/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_src.sh deleted file mode 100755 index 7867c7368d..0000000000 --- a/scripts/llnl_scripts/batch_scripts/msub_llnl_cz_toss3_src.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) - -#MSUB -l nodes=1 -#MSUB -q pbatch -#MSUB -l walltime=4:00:00 -#MSUB -A wbronze -#MSUB -j oe -#MSUB -o m.out.cz.uberenv.toss3.src.%j.%N.txt -# -# usage: -# cd {to directory with this script} -# msub -d `pwd` msub_llnl_cz_toss3_src.sh - -date -cd .. -./build_src.py -date - diff --git a/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_all_compilers.sh b/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_all_compilers.sh deleted file mode 100755 index dbdd4d2b3a..0000000000 --- a/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_all_compilers.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) - -#MSUB -l nodes=1:ppn=36 -#MSUB -q pdebug -#MSUB -l walltime=4:00:00 -#MSUB -j oe -#MSUB -o m.out.rz.uberenv.toss3.all.compilers.%j.%N.txt -# -# usage: -# cd {to directory with this script} -# msub -d `pwd` msub_llnl_rz_toss3_all_compilers.sh - -date -cd .. -./build_tpls.py -date - diff --git a/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_src.sh b/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_src.sh deleted file mode 100755 index 132a4fe93a..0000000000 --- a/scripts/llnl_scripts/batch_scripts/msub_llnl_rz_toss3_src.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) - -#MSUB -l nodes=1:ppn=36 -#MSUB -q pdebug -#MSUB -l walltime=4:00:00 -#MSUB -j oe -#MSUB -o m.out.rz.uberenv.toss3.src.%j.%N.txt -# -# usage: -# cd {to directory with this script} -# msub -d `pwd` msub_llnl_rz_toss3_src.sh - -date -cd .. -./build_src.py -date - diff --git a/scripts/llnl_scripts/batch_scripts/msub_llnl_test_uberenv_host_configs.sh b/scripts/llnl_scripts/batch_scripts/msub_llnl_test_uberenv_host_configs.sh deleted file mode 100755 index dc587b5747..0000000000 --- a/scripts/llnl_scripts/batch_scripts/msub_llnl_test_uberenv_host_configs.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) - -#MSUB -l nodes=1 -#MSUB -q pbatch -#MSUB -l walltime=4:00:00 -#MSUB -A wbronze -#MSUB -j oe -#MSUB -v UBERENV_PREFIX -#MSUB -o m.out.r.uberenv.test.atk.build.and.install.%j.%N.txt -# -# usage: -# cd {to directory with this script} -# env UBERENV_PREFIX={test path} msub msub_llnl_test_uberenv_host_configs.sh - -date -cd .. -./build_src.py -date - From d037ecb3e0ccb148c6bb89c7ecfd57eded9ed720 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 13 Feb 2024 16:03:34 -0800 Subject: [PATCH 465/639] remove toss 3 --- scripts/llnl_scripts/llnl_lc_build_tools.py | 6 +- .../spack/configs/toss_3_x86_64_ib/spack.yaml | 344 ------------------ .../toss_3_x86_64_ib/spack.yaml | 188 ---------- scripts/spack/specs.json | 7 - src/docs/sphinx/dev_guide/updating_tpls.rst | 2 +- .../sphinx/quickstart_guide/zero_to_axom.rst | 2 +- 6 files changed, 4 insertions(+), 545 deletions(-) delete mode 100644 scripts/spack/configs/toss_3_x86_64_ib/spack.yaml delete mode 100644 scripts/spack/devtools_configs/toss_3_x86_64_ib/spack.yaml diff --git a/scripts/llnl_scripts/llnl_lc_build_tools.py b/scripts/llnl_scripts/llnl_lc_build_tools.py index ae1c4e57e5..dae857189f 100755 --- a/scripts/llnl_scripts/llnl_lc_build_tools.py +++ b/scripts/llnl_scripts/llnl_lc_build_tools.py @@ -559,9 +559,7 @@ def build_devtools(builds_dir, timestamp): sys_type = get_system_type() project_file = "scripts/spack/devtools.json" - if "toss_3" in sys_type: - compiler_spec = "%gcc@8.1.0" - elif "toss_4" in sys_type: + if "toss_4" in sys_type: compiler_spec = "%gcc@10.3.1" elif "blueos" in sys_type: compiler_spec = "%gcc@8.3.1" @@ -683,7 +681,7 @@ def get_platform(): def get_supported_sys_types(): - return ["blueos_3_ppc64le_ib_p9", "darwin-x86_64", "toss_3_x86_64_ib", "toss_4_x86_64_ib", "toss_4_x86_64_ib_cray"] + return ["blueos_3_ppc64le_ib_p9", "darwin-x86_64", "toss_4_x86_64_ib", "toss_4_x86_64_ib_cray"] def get_username(): return getpass.getuser() diff --git a/scripts/spack/configs/toss_3_x86_64_ib/spack.yaml b/scripts/spack/configs/toss_3_x86_64_ib/spack.yaml deleted file mode 100644 index 9f81d830e7..0000000000 --- a/scripts/spack/configs/toss_3_x86_64_ib/spack.yaml +++ /dev/null @@ -1,344 +0,0 @@ -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) - -spack: - config: - install_tree: - root: $spack/.. - projections: - all: '{compiler.name}-{compiler.version}/{name}-{version}-{hash}' - misc_cache: $spack/../misc_cache - test_stage: $spack/../test_stage - build_stage:: - - $spack/../build_stage - - # Regular TPLs do not need views - view: false - - compilers:: - - compiler: - environment: {} - extra_rpaths: [] - flags: - cflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 - cxxflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 - modules: - - clang/9.0.0 - operating_system: rhel7 - paths: - cc: /usr/tce/packages/clang/clang-9.0.0/bin/clang - cxx: /usr/tce/packages/clang/clang-9.0.0/bin/clang++ - f77: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran - fc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran - spec: clang@9.0.0 - target: x86_64 - - compiler: - environment: {} - extra_rpaths: [] - flags: - cflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 - cxxflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 - modules: - - clang/10.0.0 - operating_system: rhel7 - paths: - cc: /usr/tce/packages/clang/clang-10.0.0/bin/clang - cxx: /usr/tce/packages/clang/clang-10.0.0/bin/clang++ - f77: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran - fc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran - spec: clang@10.0.0 - target: x86_64 - - compiler: - environment: {} - extra_rpaths: [] - flags: {} - modules: [] - operating_system: rhel7 - paths: - cc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gcc - cxx: /usr/tce/packages/gcc/gcc-8.3.1/bin/g++ - f77: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran - fc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran - spec: gcc@8.3.1 - target: x86_64 - - compiler: - environment: {} - extra_rpaths: [] - flags: {} - modules: [] - operating_system: rhel7 - paths: - cc: /usr/tce/packages/gcc/gcc-8.1.0/bin/gcc - cxx: /usr/tce/packages/gcc/gcc-8.1.0/bin/g++ - f77: - fc: - # Note: Spack keeps having problems with specs with non-numerical compiler specs. - # This is a special compiler spec to test out not defining a fortran compiler. - spec: gcc@8.1.0 - target: x86_64 - - compiler: - environment: {} - extra_rpaths: [] - flags: - cflags: -gcc-name=/usr/tce/packages/gcc/gcc-8.1.0/bin/gcc - cxxflags: -gxx-name=/usr/tce/packages/gcc/gcc-8.1.0/bin/g++ - fflags: -gcc-name=/usr/tce/packages/gcc/gcc-8.1.0/bin/gcc - modules: [] - operating_system: rhel7 - paths: - cc: /usr/tce/packages/intel/intel-19.0.4/bin/icc - cxx: /usr/tce/packages/intel/intel-19.0.4/bin/icpc - f77: /usr/tce/packages/intel/intel-19.0.4/bin/ifort - fc: /usr/tce/packages/intel/intel-19.0.4/bin/ifort - spec: intel@19.0.4 - target: x86_64 - - packages: - all: - # This defaults us to machine specific flags of ivybridge which allows - # us to run on broadwell as well - target: [ivybridge] - compiler: [gcc, intel, pgi, clang, xl, nag] - providers: - blas: [netlib-lapack] - lapack: [netlib-lapack] - mpi: [mvapich2] - - # LLNL toss3 CUDA - cuda: - buildable: false - externals: - - spec: cuda@10.2 - prefix: /opt/cudatoolkit/10.2 - - # Lock down which MPI we are using - mpi: - buildable: false - mvapich2: - buildable: false - externals: - - spec: mvapich2@2.3%clang@9.0.0 process_managers=slurm arch=linux-rhel7-ivybridge - prefix: /usr/tce/packages/mvapich2/mvapich2-2.3-clang-9.0.0 - - spec: mvapich2@2.3%clang@10.0.0 process_managers=slurm arch=linux-rhel7-ivybridge - prefix: /usr/tce/packages/mvapich2/mvapich2-2.3-clang-10.0.0 - - spec: mvapich2@2.3%gcc@8.1.0 process_managers=slurm arch=linux-rhel7-ivybridge - prefix: /usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.1.0 - - spec: mvapich2@2.3%gcc@8.3.1 process_managers=slurm arch=linux-rhel7-ivybridge - prefix: /usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.3.1 - - spec: mvapich2@2.3%intel@19.0.4 process_managers=slurm arch=linux-rhel7-ivybridge - prefix: /usr/tce/packages/mvapich2/mvapich2-2.3-intel-19.0.0 - - # blas is a bit more complicated because its a virtual package so fake it with - # the following per spack docs - netlib-lapack: - buildable: false - externals: - - spec: netlib-lapack@3.6.1 - prefix: /usr - - # System level packages to not build - autoconf: - buildable: false - externals: - - spec: autoconf@2.69 - prefix: /usr - automake: - buildable: false - externals: - - spec: automake@1.13.4 - prefix: /usr - binutils: - buildable: false - externals: - - spec: binutils@2.27 - prefix: /usr - bzip2: - buildable: false - externals: - - spec: bzip2@1.0.6 - prefix: /usr - curl: - buildable: false - externals: - - spec: curl@7.29.0 - prefix: /usr - diffutils: - buildable: false - externals: - - spec: diffutils@3.3 - prefix: /usr - elfutils: - buildable: false - externals: - - spec: elfutils@0.176 - prefix: /usr - epoxy: - buildable: false - externals: - - spec: epoxy@1.5.2 - prefix: /usr - findutils: - buildable: false - externals: - - spec: findutils@4.5.11 - prefix: /usr - gettext: - buildable: false - externals: - - spec: gettext@0.19.8.1 - prefix: /usr - ghostscript: - buildable: false - externals: - - spec: ghostscript@9.25 - prefix: /usr - groff: - buildable: false - externals: - - spec: groff@1.22.2 - prefix: /usr - libtool: - buildable: false - externals: - - spec: libtool@2.4.2 - prefix: /usr - libunwind: - buildable: false - externals: - - spec: libunwind@8.0.1 - prefix: /usr - libx11: - buildable: false - externals: - - spec: libx11@1.20.4 - prefix: /usr - m4: - buildable: false - externals: - - spec: m4@1.4.16 - prefix: /usr - perl: - buildable: false - externals: - - spec: perl@5.16.3 - prefix: /usr - pkg-config: - buildable: false - externals: - - spec: pkg-config@0.27.1 - prefix: /usr - readline: - buildable: false - externals: - - spec: readline@6.2 - prefix: /usr - tar: - buildable: false - externals: - - spec: tar@1.26 - prefix: /usr - unzip: - buildable: false - externals: - - spec: unzip@6.0 - prefix: /usr - zlib: - buildable: false - externals: - - spec: zlib@1.2.7 - prefix: /usr - - - # External dependencies for SCR - lsf: - buildable: False - externals: - - spec: lsf@10.1 - prefix: /opt/ibm/spectrumcomputing/lsf/10.1 - slurm: - buildable: false - externals: - - spec: slurm@20 - prefix: /usr - libyogrt: - buildable: false - externals: - - spec: libyogrt@1.24 scheduler=lsf - prefix: /usr - - spec: libyogrt@1.24 scheduler=slurm - prefix: /usr - pdsh: - buildable: false - externals: - - spec: pdsh@2.33 - prefix: /usr - - # Globally lock version of third party libraries - camp: - require: "@2023.06.0" - conduit: - require: "@0.8.8~shared~test~examples~utilities" - hdf5: - variants: ~shared~mpi - hypre: - version: [2.24.0] - mfem: - require: "@4.5.2" - raja: - require: "@2023.06.0~shared~examples~exercises" - scr: - require: "@3.0.1~shared~tests~examples" - umpire: - require: "@2023.06.0~shared~examples" - - # Globally lock in versions of Devtools - cmake: - version: [3.21.1] - buildable: false - externals: - - spec: cmake@3.21.1 - prefix: /usr/tce/packages/cmake/cmake-3.21.1 - cppcheck: - version: [2.9] - buildable: false - externals: - - spec: cppcheck@2.9 - prefix: /collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/cppcheck-2.9 - doxygen: - version: [1.8.14] - buildable: false - externals: - - spec: doxygen@1.8.14 - prefix: /collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/doxygen-1.8.14 - graphviz: - version: [7.1.0] - buildable: false - externals: - - spec: graphviz@7.1.0 - prefix: /collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/graphviz-7.1.0 - llvm: - version: [10.0.0] - buildable: false - externals: - - spec: llvm@10.0.0+clang - prefix: /usr/tce/packages/clang/clang-10.0.0 - python: - version: [3.10.10] - buildable: false - externals: - - spec: python@3.10.10 - prefix: /collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10 - py-shroud: - version: [0.12.2] - buildable: false - externals: - - spec: py-shroud@0.12.2 - prefix: /collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10 - py-sphinx: - version: [6.1.3] - buildable: false - externals: - - spec: py-sphinx@6.1.3 - prefix: /collab/usr/gapps/axom/devtools/toss_3_x86_64_ib/latest/python-3.10.10 diff --git a/scripts/spack/devtools_configs/toss_3_x86_64_ib/spack.yaml b/scripts/spack/devtools_configs/toss_3_x86_64_ib/spack.yaml deleted file mode 100644 index 9476208461..0000000000 --- a/scripts/spack/devtools_configs/toss_3_x86_64_ib/spack.yaml +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) - -spack: - config: - install_tree: - root: $spack/.. - projections: - all: '{compiler.name}-{compiler.version}/{name}-{version}-{hash}' - misc_cache: $spack/../misc_cache - test_stage: $spack/../test_stage - build_stage:: - - $spack/../build_stage - - view: - default: - root: ../view - projections: - all: '{name}-{version}' - - compilers:: - - compiler: - environment: {} - extra_rpaths: [] - flags: {} - modules: [] - operating_system: rhel7 - paths: - cc: /usr/tce/packages/gcc/gcc-8.1.0/bin/gcc - cxx: /usr/tce/packages/gcc/gcc-8.1.0/bin/g++ - f77: /usr/tce/packages/gcc/gcc-8.1.0/bin/gfortran - fc: /usr/tce/packages/gcc/gcc-8.1.0/bin/gfortran - spec: gcc@8.1.0 - target: x86_64 - - packages: - all: - # This defaults us to machine specific flags of ivybridge which allows - # us to run on broadwell as well - target: [ivybridge] - compiler: [gcc, intel, pgi, clang, xl, nag] - providers: - blas: [netlib-lapack] - lapack: [netlib-lapack] - mpi: [mvapich2] - gl: [opengl] - glu: [openglu] - opengl: - buildable: false - externals: - - spec: opengl@1.7.0 - prefix: /usr - openglu: - buildable: false - externals: - - spec: openglu@1.3.1 - prefix: /usr - - # Lock down which MPI we are using - mpi: - buildable: false - - # blas is a bit more complicated because its a virtual package so fake it with - # the following per spack docs - netlib-lapack: - buildable: false - externals: - - spec: netlib-lapack@3.6.1 - prefix: /usr - - # System level packages to not build - autoconf: - buildable: false - externals: - - spec: autoconf@2.69 - prefix: /usr - automake: - buildable: false - externals: - - spec: automake@1.13.4 - prefix: /usr - binutils: - buildable: false - externals: - - spec: binutils@2.27 - prefix: /usr - bzip2: - buildable: false - externals: - - spec: bzip2@1.0.6 - prefix: /usr - diffutils: - buildable: false - externals: - - spec: diffutils@3.3 - prefix: /usr - epoxy: - buildable: false - externals: - - spec: epoxy@1.5.2 - prefix: /usr - findutils: - buildable: false - externals: - - spec: findutils@4.5.11 - prefix: /usr - gettext: - buildable: false - externals: - - spec: gettext@0.19.8.1 - prefix: /usr - ghostscript: - buildable: false - externals: - - spec: ghostscript@9.25 - prefix: /usr - groff: - buildable: false - externals: - - spec: groff@1.22.2 - prefix: /usr - libtool: - buildable: false - externals: - - spec: libtool@2.4.2 - prefix: /usr - libx11: - buildable: false - externals: - - spec: libx11@1.20.4 - prefix: /usr - m4: - buildable: false - externals: - - spec: m4@1.4.16 - prefix: /usr - perl: - buildable: false - externals: - - spec: perl@5.16.3 - prefix: /usr - pkg-config: - buildable: false - externals: - - spec: pkg-config@0.27.1 - prefix: /usr - readline: - buildable: false - externals: - - spec: readline@6.2 - prefix: /usr - tar: - buildable: false - externals: - - spec: tar@1.26 - prefix: /usr - unzip: - buildable: false - externals: - - spec: unzip@6.0 - prefix: /usr - xz: - buildable: false - externals: - - spec: xz@5.2.2 - prefix: /usr - zlib: - buildable: false - externals: - - spec: zlib@1.2.7 - prefix: /usr - - # Packages we may want to build in the future with specific versions - cmake: - version: [3.21.1] - buildable: false - externals: - - spec: cmake@3.21.1 - prefix: /usr/tce/packages/cmake/cmake-3.21.1 - llvm: - version: [10.0.0] - buildable: false - externals: - - spec: llvm@10.0.0+clang - prefix: /usr/tce/packages/clang/clang-10.0.0 - diff --git a/scripts/spack/specs.json b/scripts/spack/specs.json index 40175a8b42..e917e1a70c 100644 --- a/scripts/spack/specs.json +++ b/scripts/spack/specs.json @@ -13,13 +13,6 @@ "__comment__":"# ", "__comment__":"##############################################################################", - "toss_3_x86_64_ib": - [ "clang@9.0.0+devtools+mfem+c2c", - "clang@10.0.0+devtools+mfem+c2c+scr", - "gcc@8.3.1+devtools+mfem+c2c+scr", - "gcc@8.1.0~fortran+devtools~mfem+c2c+scr", - "intel@19.0.4~openmp+devtools+mfem+c2c" ], - "toss_4_x86_64_ib": [ "gcc@10.3.1+devtools+hdf5+mfem+c2c+scr", "clang@14.0.6+devtools+hdf5+mfem+c2c+scr", diff --git a/src/docs/sphinx/dev_guide/updating_tpls.rst b/src/docs/sphinx/dev_guide/updating_tpls.rst index 82536f4159..09a3f43792 100644 --- a/src/docs/sphinx/dev_guide/updating_tpls.rst +++ b/src/docs/sphinx/dev_guide/updating_tpls.rst @@ -308,7 +308,7 @@ other Axom developers to use during development, in Axom Gitlab CI testing, etc. # blueos $ lalloc 1 -W 120 scripts/llnl/build_tpl.py - # toss3 + # toss_4 $ srun -N1 --interactive -t 120 scripts/llnl/build_tpl.py This script will build all third-party libraries for all compilers specs diff --git a/src/docs/sphinx/quickstart_guide/zero_to_axom.rst b/src/docs/sphinx/quickstart_guide/zero_to_axom.rst index a37e337619..15f58ecb23 100644 --- a/src/docs/sphinx/quickstart_guide/zero_to_axom.rst +++ b/src/docs/sphinx/quickstart_guide/zero_to_axom.rst @@ -40,7 +40,7 @@ command line option. Supported compiler specs can be found in the Spack compiler We currently regularly test the following Spack configuration files: * Linux Ubuntu 20.04 (via Windows WSL 2) -* TOSS 3 (On ruby at LC) +* TOSS 4 (On Ruby at LC) * BlueOS (On Lassen at LC) To install Axom on a new platform, it is a good idea to start with a known Spack configuration directory From 53a90b52801e3592754f8abc3ca30752bc2bec18 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 13 Feb 2024 16:11:43 -0800 Subject: [PATCH 466/639] another toss3 purge --- src/axom/quest/interface/python/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/quest/interface/python/README.md b/src/axom/quest/interface/python/README.md index 2011848631..c57552a32a 100644 --- a/src/axom/quest/interface/python/README.md +++ b/src/axom/quest/interface/python/README.md @@ -28,7 +28,7 @@ Some functions in `quest_shroud.yaml` are not wrapped pending fixes to shroud. (version 0.10.1 is currently used) A sample host-config file is provided in -`host-configs/other/no-tpl-toss_3_x86_64_ib-intel@19.0.4.cmake`. This host-config requires +`host-configs/other/no-tpl-toss_4_x86_64_ib-intel@19.0.4.cmake`. This host-config requires no third-party libraries but does not enable Sidre. The Python interface requires you build Axom with shared libraries which can be enabled via the CMake command line with `-DBUILD_SHARED_LIBS=ON` and defining MPI_HOME, which is already enabled in the sample host-config. From 799f6f9c35d25a4865a09707f04fffc6fcb58bac Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 13 Feb 2024 19:19:34 -0800 Subject: [PATCH 467/639] remove use of deprecated RAJA::loop_* --- src/axom/core/execution/internal/seq_exec.hpp | 6 +++--- src/axom/core/tests/core_execution_space.hpp | 6 +++--- .../mint/execution/internal/structured_exec.hpp | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/axom/core/execution/internal/seq_exec.hpp b/src/axom/core/execution/internal/seq_exec.hpp index 2ed0cb3256..062c12c454 100644 --- a/src/axom/core/execution/internal/seq_exec.hpp +++ b/src/axom/core/execution/internal/seq_exec.hpp @@ -34,10 +34,10 @@ template <> struct execution_space { #ifdef AXOM_USE_RAJA - using loop_policy = RAJA::loop_exec; + using loop_policy = RAJA::seq_exec; - using reduce_policy = RAJA::loop_reduce; - using atomic_policy = RAJA::loop_atomic; + using reduce_policy = RAJA::seq_reduce; + using atomic_policy = RAJA::seq_atomic; #else using loop_policy = void; using reduce_policy = void; diff --git a/src/axom/core/tests/core_execution_space.hpp b/src/axom/core/tests/core_execution_space.hpp index b06f86b5f1..51edeff3ce 100644 --- a/src/axom/core/tests/core_execution_space.hpp +++ b/src/axom/core/tests/core_execution_space.hpp @@ -139,9 +139,9 @@ TEST(core_execution_space, check_seq_exec) int allocator_id = axom::getUmpireResourceAllocatorID(umpire::resource::Host); check_execution_mappings(allocator_id, IS_ASYNC, ON_DEVICE); } diff --git a/src/axom/mint/execution/internal/structured_exec.hpp b/src/axom/mint/execution/internal/structured_exec.hpp index 486db0792a..d438c91e9f 100644 --- a/src/axom/mint/execution/internal/structured_exec.hpp +++ b/src/axom/mint/execution/internal/structured_exec.hpp @@ -49,17 +49,17 @@ struct structured_exec #ifdef AXOM_USE_RAJA /* clang-format off */ using loop2d_policy = RAJA::KernelPolicy< - RAJA::statement::For< 1, RAJA::loop_exec, // j - RAJA::statement::For< 0, RAJA::loop_exec, // i + RAJA::statement::For< 1, RAJA::seq_exec, // j + RAJA::statement::For< 0, RAJA::seq_exec, // i RAJA::statement::Lambda< 0 > > // END i > // END j >; // END kernel using loop3d_policy = RAJA::KernelPolicy< - RAJA::statement::For< 2, RAJA::loop_exec, // k - RAJA::statement::For< 1, RAJA::loop_exec, // j - RAJA::statement::For< 0, RAJA::loop_exec, // i + RAJA::statement::For< 2, RAJA::seq_exec, // k + RAJA::statement::For< 1, RAJA::seq_exec, // j + RAJA::statement::For< 0, RAJA::seq_exec, // i RAJA::statement::Lambda< 0 > > // END i > // END j @@ -82,7 +82,7 @@ struct structured_exec using loop2d_policy = RAJA::KernelPolicy< RAJA::statement::For< 1, RAJA::omp_parallel_for_exec, // j - RAJA::statement::For< 0, RAJA::loop_exec, // i + RAJA::statement::For< 0, RAJA::seq_exec, // i RAJA::statement::Lambda< 0 > > // END i > // END j @@ -90,8 +90,8 @@ struct structured_exec using loop3d_policy = RAJA::KernelPolicy< RAJA::statement::For< 2, RAJA::omp_parallel_for_exec, // k - RAJA::statement::For< 1, RAJA::loop_exec, // j - RAJA::statement::For< 0, RAJA::loop_exec, // i + RAJA::statement::For< 1, RAJA::seq_exec, // j + RAJA::statement::For< 0, RAJA::seq_exec, // i RAJA::statement::Lambda< 0 > > // END i > // END j From 22fcddfa41953ce604b4587dd98a9f74f9b49f10 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 13 Feb 2024 21:41:26 -0800 Subject: [PATCH 468/639] ensure backwards compatibility for kenny --- src/axom/core/execution/internal/seq_exec.hpp | 13 ++++++++---- src/axom/core/tests/core_execution_space.hpp | 6 ++++++ .../execution/internal/structured_exec.hpp | 20 +++++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/src/axom/core/execution/internal/seq_exec.hpp b/src/axom/core/execution/internal/seq_exec.hpp index 062c12c454..dacd6d5167 100644 --- a/src/axom/core/execution/internal/seq_exec.hpp +++ b/src/axom/core/execution/internal/seq_exec.hpp @@ -34,10 +34,15 @@ template <> struct execution_space { #ifdef AXOM_USE_RAJA - using loop_policy = RAJA::seq_exec; - - using reduce_policy = RAJA::seq_reduce; - using atomic_policy = RAJA::seq_atomic; + #if RAJA_VERSION_MAJOR > 2022 + using loop_policy = RAJA::seq_exec; + using reduce_policy = RAJA::seq_reduce; + using atomic_policy = RAJA::seq_atomic; + #else + using loop_policy = RAJA::loop_exec; + using reduce_policy = RAJA::loop_reduce; + using atomic_policy = RAJA::loop_atomic; + #endif #else using loop_policy = void; using reduce_policy = void; diff --git a/src/axom/core/tests/core_execution_space.hpp b/src/axom/core/tests/core_execution_space.hpp index 51edeff3ce..05d06a4adf 100644 --- a/src/axom/core/tests/core_execution_space.hpp +++ b/src/axom/core/tests/core_execution_space.hpp @@ -139,9 +139,15 @@ TEST(core_execution_space, check_seq_exec) int allocator_id = axom::getUmpireResourceAllocatorID(umpire::resource::Host); check_execution_mappings 2022 RAJA::seq_exec, RAJA::seq_reduce, RAJA::seq_atomic, +#else + RAJA::loop_exec, + RAJA::loop_reduce, + RAJA::loop_atomic, +#endif void>(allocator_id, IS_ASYNC, ON_DEVICE); } diff --git a/src/axom/mint/execution/internal/structured_exec.hpp b/src/axom/mint/execution/internal/structured_exec.hpp index d438c91e9f..909793bd6c 100644 --- a/src/axom/mint/execution/internal/structured_exec.hpp +++ b/src/axom/mint/execution/internal/structured_exec.hpp @@ -49,17 +49,28 @@ struct structured_exec #ifdef AXOM_USE_RAJA /* clang-format off */ using loop2d_policy = RAJA::KernelPolicy< +#if RAJA_VERSION_MAJOR > 2022 RAJA::statement::For< 1, RAJA::seq_exec, // j RAJA::statement::For< 0, RAJA::seq_exec, // i +#else + RAJA::statement::For< 1, RAJA::loop_exec, // j + RAJA::statement::For< 0, RAJA::loop_exec, // i +#endif RAJA::statement::Lambda< 0 > > // END i > // END j >; // END kernel using loop3d_policy = RAJA::KernelPolicy< +#if RAJA_VERSION_MAJOR > 2022 RAJA::statement::For< 2, RAJA::seq_exec, // k RAJA::statement::For< 1, RAJA::seq_exec, // j RAJA::statement::For< 0, RAJA::seq_exec, // i +#else + RAJA::statement::For< 2, RAJA::loop_exec, // k + RAJA::statement::For< 1, RAJA::loop_exec, // j + RAJA::statement::For< 0, RAJA::loop_exec, // i +#endif RAJA::statement::Lambda< 0 > > // END i > // END j @@ -82,7 +93,11 @@ struct structured_exec using loop2d_policy = RAJA::KernelPolicy< RAJA::statement::For< 1, RAJA::omp_parallel_for_exec, // j +#if RAJA_VERSION_MAJOR > 2022 RAJA::statement::For< 0, RAJA::seq_exec, // i +#else + RAJA::statement::For< 0, RAJA::loop_exec, // i +#endif RAJA::statement::Lambda< 0 > > // END i > // END j @@ -90,8 +105,13 @@ struct structured_exec using loop3d_policy = RAJA::KernelPolicy< RAJA::statement::For< 2, RAJA::omp_parallel_for_exec, // k +#if RAJA_VERSION_MAJOR > 2022 RAJA::statement::For< 1, RAJA::seq_exec, // j RAJA::statement::For< 0, RAJA::seq_exec, // i +#else + RAJA::statement::For< 1, RAJA::loop_exec, // j + RAJA::statement::For< 0, RAJA::loop_exec, // i +#endif RAJA::statement::Lambda< 0 > > // END i > // END j From 2de402bdf52099ec92ee543e8f3a4f19ace8f2c1 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 14 Feb 2024 08:05:09 -0800 Subject: [PATCH 469/639] style --- src/axom/core/execution/internal/seq_exec.hpp | 12 ++++++------ src/axom/core/tests/core_execution_space.hpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/axom/core/execution/internal/seq_exec.hpp b/src/axom/core/execution/internal/seq_exec.hpp index dacd6d5167..9c50f80ee8 100644 --- a/src/axom/core/execution/internal/seq_exec.hpp +++ b/src/axom/core/execution/internal/seq_exec.hpp @@ -35,13 +35,13 @@ struct execution_space { #ifdef AXOM_USE_RAJA #if RAJA_VERSION_MAJOR > 2022 - using loop_policy = RAJA::seq_exec; - using reduce_policy = RAJA::seq_reduce; - using atomic_policy = RAJA::seq_atomic; + using loop_policy = RAJA::seq_exec; + using reduce_policy = RAJA::seq_reduce; + using atomic_policy = RAJA::seq_atomic; #else - using loop_policy = RAJA::loop_exec; - using reduce_policy = RAJA::loop_reduce; - using atomic_policy = RAJA::loop_atomic; + using loop_policy = RAJA::loop_exec; + using reduce_policy = RAJA::loop_reduce; + using atomic_policy = RAJA::loop_atomic; #endif #else using loop_policy = void; diff --git a/src/axom/core/tests/core_execution_space.hpp b/src/axom/core/tests/core_execution_space.hpp index 05d06a4adf..9bf2b7d0bf 100644 --- a/src/axom/core/tests/core_execution_space.hpp +++ b/src/axom/core/tests/core_execution_space.hpp @@ -139,15 +139,15 @@ TEST(core_execution_space, check_seq_exec) int allocator_id = axom::getUmpireResourceAllocatorID(umpire::resource::Host); check_execution_mappings 2022 + #if RAJA_VERSION_MAJOR > 2022 RAJA::seq_exec, RAJA::seq_reduce, RAJA::seq_atomic, -#else + #else RAJA::loop_exec, RAJA::loop_reduce, RAJA::loop_atomic, -#endif + #endif void>(allocator_id, IS_ASYNC, ON_DEVICE); } From 91d57f4d57022ef52a7ba9127efdfd4e5342b6e7 Mon Sep 17 00:00:00 2001 From: Lee Taylor Date: Wed, 14 Feb 2024 13:27:10 -0800 Subject: [PATCH 470/639] Update no-tpl intel to 19.1.2 --- ....cmake => no-tpl-toss_4_x86_64_ib-intel@19.1.2.cmake} | 4 ++-- src/axom/quest/interface/python/README.md | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) rename host-configs/other/{no-tpl-toss_4_x86_64_ib-intel@19.0.4.cmake => no-tpl-toss_4_x86_64_ib-intel@19.1.2.cmake} (97%) diff --git a/host-configs/other/no-tpl-toss_4_x86_64_ib-intel@19.0.4.cmake b/host-configs/other/no-tpl-toss_4_x86_64_ib-intel@19.1.2.cmake similarity index 97% rename from host-configs/other/no-tpl-toss_4_x86_64_ib-intel@19.0.4.cmake rename to host-configs/other/no-tpl-toss_4_x86_64_ib-intel@19.1.2.cmake index d064d9109a..86268df1c2 100644 --- a/host-configs/other/no-tpl-toss_4_x86_64_ib-intel@19.0.4.cmake +++ b/host-configs/other/no-tpl-toss_4_x86_64_ib-intel@19.1.2.cmake @@ -28,7 +28,7 @@ set(ENABLE_FORTRAN ON CACHE BOOL "") -set(COMPILER_HOME "/usr/tce/packages/intel-classic-tce/intel-classic-19.0.4" ) +set(COMPILER_HOME "/usr/tce/packages/intel-classic-tce/intel-classic-19.1.2" ) set(CMAKE_C_COMPILER "${COMPILER_HOME}/bin/icc" CACHE PATH "") set(CMAKE_CXX_COMPILER "${COMPILER_HOME}/bin/icpc" CACHE PATH "") set(CMAKE_Fortran_COMPILER "${COMPILER_HOME}/bin/ifort" CACHE PATH "") @@ -44,7 +44,7 @@ set(AXOM_ENABLE_KLEE OFF CACHE BOOL "") #------------------------------------------------------------------------------ set(ENABLE_MPI ON CACHE BOOL "") -set(MPI_HOME "/usr/tce/packages/mvapich2/mvapich2-2.3-intel-19.0.4" CACHE PATH "") +set(MPI_HOME "/usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-19.1.2" CACHE PATH "") set(MPI_C_COMPILER "${MPI_HOME}/bin/mpicc" CACHE PATH "") set(MPI_CXX_COMPILER "${MPI_HOME}/bin/mpicxx" CACHE PATH "") set(MPI_Fortran_COMPILER "${MPI_HOME}/bin/mpif90" CACHE PATH "") diff --git a/src/axom/quest/interface/python/README.md b/src/axom/quest/interface/python/README.md index c57552a32a..11dec93ef3 100644 --- a/src/axom/quest/interface/python/README.md +++ b/src/axom/quest/interface/python/README.md @@ -25,10 +25,15 @@ Both `mpi4py` and Axom should be build with the same version of MPI. These flags may be different than the ones used to compile Axom. Some functions in `quest_shroud.yaml` are not wrapped pending fixes to shroud. -(version 0.10.1 is currently used) +(version 0.13.0 is currently used) A sample host-config file is provided in -`host-configs/other/no-tpl-toss_4_x86_64_ib-intel@19.0.4.cmake`. This host-config requires +`host-configs/other/no-tpl-toss_3_x86_64_ib-intel@19.0.4.cmake`. This host-config requires no third-party libraries but does not enable Sidre. The Python interface requires you build Axom with shared libraries which can be enabled via the CMake command line with `-DBUILD_SHARED_LIBS=ON` and defining MPI_HOME, which is already enabled in the sample host-config. + +To build only quest, and its dependencies: + + ./config-build.py -hc host-configs/other/no-tpl-toss_3_x86_64_ib-intel@19.0.4.cmake -DBUILD_SHARED_LIBS=ON -DAXOM_ENABLE_ALL_COMPONENTS=BOOL:OFF -DAXOM_ENABLE_QUEST=BOOL:ON -DAXOM_ENABLE_MINT=BOOL:ON -DAXOM_ENABLE_SLIC=BOOL:ON -DAXOM_ENABLE_SLAM=BOOL:ON -DAXOM_ENABLE_PRIMAL=BOOL:ON -DAXOM_ENABLE_SPIN=BOOL:ON + From 8a6f288e9779133f545bb38ab253d3d2f13bb006 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 14 Feb 2024 12:28:46 -0800 Subject: [PATCH 471/639] ArrayIndexer handles non-unique strides more robustly. --- src/axom/quest/ArrayIndexer.hpp | 146 +++++++++++++++--- .../examples/quest_marching_cubes_example.cpp | 24 ++- src/axom/quest/tests/quest_array_indexer.cpp | 79 ++++++---- 3 files changed, 194 insertions(+), 55 deletions(-) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index 62ffb29e37..0cefe603d3 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -10,8 +10,19 @@ #include "axom/core/StackArray.hpp" #include "axom/core/numerics/matvecops.hpp" +#include +#include + namespace axom { +struct ArrayStrideOrder +{ + static constexpr int NEITHER = 0; // Neither row nor column + static constexpr int ROW = 1; // Row-major + static constexpr int COLUMN = 2; // Column-major + static constexpr int BOTH = ROW | COLUMN; // Only for 1D arrays +}; + /*! @brief Indexing into a multidimensional structured array. @@ -30,9 +41,9 @@ class ArrayIndexer @param [in] shape Shape of the array @param [in] order: c is column major; r is row major. */ - ArrayIndexer(const axom::StackArray& Shape, char order) + ArrayIndexer(const axom::StackArray& shape, int order) { - initialize(Shape, order); + initializeShape(shape, order); } /*! @@ -45,25 +56,43 @@ class ArrayIndexer ArrayIndexer(const axom::StackArray& shape, const axom::StackArray& slowestDirs) { - initialize(shape, slowestDirs); + initializeShape(shape, slowestDirs); } - //!@brief Constructor for arbitrary-stride indexing. + /*! + @brief Constructor for arbitrary-stride indexing. + + @param [i] strides Strides. Must be unique when DIM > 1. + If not unique, use default constructor and initializeStrides(). + + @internal We could add the order preference to this constructor to + handle the degenerate case of non-unique strides. But that would + clash with the more prevalent constructor taking the array's + shape. + */ ArrayIndexer(const axom::StackArray& strides) : m_strides(strides) { - initialize(strides); + initializeStrides(strides); } + /*! + @brief Default constructor + + Object must be initialized before use. + */ + ArrayIndexer() = default; + /*! @brief Initialize for row- or column-major indexing. @param [in] shape Shape of the array @param [in] order: c is column major; r is row major. */ - inline AXOM_HOST_DEVICE void initialize(const axom::StackArray& shape, - char order) + inline AXOM_HOST_DEVICE void initializeShape(const axom::StackArray& shape, + int order) { - SLIC_ASSERT(order == 'c' || order == 'r'); - if(order == 'r') + SLIC_ASSERT(order == ArrayStrideOrder::COLUMN || + order == ArrayStrideOrder::ROW); + if(order == ArrayStrideOrder::ROW) { for(int d = 0; d < DIM; ++d) { @@ -87,7 +116,8 @@ class ArrayIndexer m_strides[d] = m_strides[d + 1] * shape[d + 1]; } } - SLIC_ASSERT((DIM == 1 && getOrder() == ('r' | 'c')) || (getOrder() == order)); + SLIC_ASSERT((DIM == 1 && getStrideOrder() == ArrayStrideOrder::BOTH) || + (getStrideOrder() == order)); } /*! @@ -97,7 +127,7 @@ class ArrayIndexer slowestDirs[0] is the slowest direction and slowestDirs[DIM-1] is the fastest. */ - inline AXOM_HOST_DEVICE void initialize( + inline AXOM_HOST_DEVICE void initializeShape( const axom::StackArray& shape, const axom::StackArray& slowestDirs) { @@ -112,13 +142,57 @@ class ArrayIndexer } } - //!@brief Initialize for arbitrary-stride indexing. - inline AXOM_HOST_DEVICE void initialize(const axom::StackArray& strides) + /*! + @brief Initialize for arbitrary-stride indexing. + + @param [i] strides Strides. Must be unique when DIM > 1. + If not satisfied, you must use one of the other initializers. + */ + inline AXOM_HOST_DEVICE void initializeStrides( + const axom::StackArray& strides) + { + if(DIM > 1 && !stridesAreUnique(strides)) + { +#if !defined(AXOM_DEVICE_CODE) + std::ostringstream os; + os << "("; + for(int d = 0; d < DIM - 1; ++d) + { + os << strides[d] << ","; + } + os << strides[DIM - 1] << ")"; + std::cerr << "ERROR: ArrayIndexer: Non-unique strides " << os.str() << ".\n" + << "Likely, multi-dim array shape is 1 in some direction.\n" + << "Impossible to compute index ordering.\n" + << "Please use a different ArrayIndexer initializer.\n"; +#endif + utilities::processAbort(); + } + + // 2nd argument doesn't matter because strides are unique. + initializeStrides(strides, axom::ArrayStrideOrder::COLUMN); + } + + /*! + @brief Initialize for arbitrary-stride indexing, + with ordering preference for non-unique strides. + + @param [i] strides Strides. + @param [i] orderPref Ordering preference if strides + are non-unique. + */ + inline AXOM_HOST_DEVICE void initializeStrides( + const axom::StackArray& strides, + int orderPref) { + SLIC_ASSERT(orderPref == axom::ArrayStrideOrder::COLUMN || + orderPref == axom::ArrayStrideOrder::ROW); + m_strides = strides; for(int d = 0; d < DIM; ++d) { - m_slowestDirs[d] = d; + m_slowestDirs[d] = + orderPref == axom::ArrayStrideOrder::COLUMN ? d : DIM - 1 - d; } for(int s = 0; s < DIM; ++s) { @@ -135,7 +209,20 @@ class ArrayIndexer } } - bool operator==(const ArrayIndexer& other) const + static AXOM_HOST_DEVICE bool stridesAreUnique(const axom::StackArray& strides) + { + bool repeats = false; + for(int d = 0; d < DIM; ++d) + { + for(int e = 0; e < d; ++e) + { + repeats |= strides[d] == strides[e]; + } + } + return !repeats; + } + + inline AXOM_HOST_DEVICE bool operator==(const ArrayIndexer& other) const { return m_slowestDirs == other.m_slowestDirs && m_strides == other.m_strides; } @@ -179,17 +266,18 @@ class ArrayIndexer /*! @brief Get the stride order (row- or column-major, or something else). - @return 'r' or 'c' for row- or column major, '\0' for neither, - or if DIM == 1, the value of 'r' | 'c'. + @return 1 if row major, 2 if column major, 0 if neither + and, DIM == 1, 3 (satisfying both row and column ordering). */ - inline AXOM_HOST_DEVICE char getOrder() const + inline AXOM_HOST_DEVICE int getStrideOrder() const { - char order = 'r' | 'c'; + int ord = ArrayStrideOrder::BOTH; for(int d = 0; d < DIM - 1; ++d) { - order &= m_slowestDirs[d] < m_slowestDirs[d + 1] ? 'c' : 'r'; + ord &= m_slowestDirs[d] < m_slowestDirs[d + 1] ? ArrayStrideOrder::COLUMN + : ArrayStrideOrder::ROW; } - return order; + return ord; } //!@brief Convert multidimensional index to flat index. @@ -211,6 +299,22 @@ class ArrayIndexer } return multiIndex; } + + friend std::ostream& operator<<(std::ostream& os, const ArrayIndexer& a) + { + os << "ArrayIndexer: strides=(" << a.m_strides[0]; + for(int d = 1; d < DIM; ++d) + { + os << ',' << a.m_strides[d]; + } + os << ") slowestDirs=(" << a.m_slowestDirs[0]; + for(int d = 1; d < DIM; ++d) + { + os << ',' << a.m_slowestDirs[d]; + } + os << ')'; + return os; + } }; } // end namespace axom diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 48120b2a1e..299a2f516f 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -1100,7 +1100,7 @@ struct ContourTestBase { axom::StackArray domShape; computationalMesh.domainLengths(d, domShape); - indexers[d].initialize(domShape, 'c'); + indexers[d].initializeShape(domShape, int(axom::ArrayStrideOrder::COLUMN)); } for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; @@ -1145,8 +1145,8 @@ struct ContourTestBase ++errCount; SLIC_INFO_IF( params.isVerbose(), - axom::fmt::format("checkContourCellLimits: node {} at {} is not " - "on parent cell boundary.", + axom::fmt::format("checkContourCellLimits: node {} at {} " + "is not on parent cell boundary.", cellNodeIds[nn], nodeCoords)); } @@ -1154,8 +1154,8 @@ struct ContourTestBase } SLIC_INFO_IF(params.isVerbose(), - axom::fmt::format("checkContourCellLimits: found {} nodes " - "not on parent cell boundary.", + axom::fmt::format("checkContourCellLimits: found {} " + "nodes not on parent cell boundary.", errCount)); return errCount; } @@ -1179,10 +1179,13 @@ struct ContourTestBase /* Space to store function views and whether a computational cell contains the contour. We set these up for all domains ahead - of time for accessing as needed later. + of time for accessing as needed later. cellIndexers are for + converting between flat and multidim indices. */ axom::Array> fcnViews( domainCount); + axom::Array> cellIndexers( + domainCount); axom::Array> hasContours(domainCount); for(axom::IndexType domId = 0; domId < domainCount; ++domId) { @@ -1196,6 +1199,9 @@ struct ContourTestBase fcnViews[domId] = mvu.template getConstFieldView(functionName(), false); + cellIndexers[domId].initializeShape( + mvu.getCellShape(), + axom::ArrayStrideOrder::COLUMN); } std::map domainIdToContiguousId; @@ -1234,12 +1240,13 @@ struct ContourTestBase const auto& fcnView = fcnViews[domId]; - axom::ArrayIndexer colMajor(domLengths, 'c'); + const axom::ArrayIndexer& cellIndexer = + cellIndexers[domId]; const axom::IndexType cellCount = product(domLengths); for(axom::IndexType cellId = 0; cellId < cellCount; ++cellId) { axom::StackArray cellIdx = - colMajor.toMultiIndex(cellId); + cellIndexer.toMultiIndex(cellId); // Compute min and max function value in the cell. double minFcnValue = std::numeric_limits::max(); @@ -1248,6 +1255,7 @@ struct ContourTestBase (1 << DIM); // Number of nodes in a cell. for(short int cornerId = 0; cornerId < cornerCount; ++cornerId) { + // Compute multidim index of current corner of parent cell. axom::StackArray cornerIdx = cellIdx; for(int d = 0; d < DIM; ++d) { diff --git a/src/axom/quest/tests/quest_array_indexer.cpp b/src/axom/quest/tests/quest_array_indexer.cpp index f805574f50..4e3b3b4172 100644 --- a/src/axom/quest/tests/quest_array_indexer.cpp +++ b/src/axom/quest/tests/quest_array_indexer.cpp @@ -19,8 +19,10 @@ TEST(quest_array_indexer, quest_strides_and_permutations) constexpr int DIM = 1; axom::StackArray lengths {2}; - axom::ArrayIndexer colIndexer(lengths, 'c'); - EXPECT_EQ(colIndexer.getOrder(), 'c' | 'r'); + axom::ArrayIndexer colIndexer( + lengths, + int(axom::ArrayStrideOrder::COLUMN)); + EXPECT_EQ(colIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::BOTH)); axom::StackArray colSlowestDirs {0}; axom::StackArray colStrides {1}; for(int d = 0; d < DIM; ++d) @@ -32,8 +34,10 @@ TEST(quest_array_indexer, quest_strides_and_permutations) colIndexer == (axom::ArrayIndexer(lengths, colSlowestDirs))); - axom::ArrayIndexer rowIndexer(lengths, 'r'); - EXPECT_EQ(rowIndexer.getOrder(), 'c' | 'r'); + axom::ArrayIndexer rowIndexer( + lengths, + int(axom::ArrayStrideOrder::ROW)); + EXPECT_EQ(rowIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::BOTH)); axom::StackArray rowSlowestDirs {0}; axom::StackArray rowStrides {1}; for(int d = 0; d < DIM; ++d) @@ -50,8 +54,10 @@ TEST(quest_array_indexer, quest_strides_and_permutations) constexpr int DIM = 2; axom::StackArray lengths {3, 2}; - axom::ArrayIndexer colIndexer(lengths, 'c'); - EXPECT_EQ(colIndexer.getOrder(), 'c'); + axom::ArrayIndexer colIndexer( + lengths, + int(axom::ArrayStrideOrder::COLUMN)); + EXPECT_EQ(colIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); axom::StackArray colSlowestDirs {0, 1}; axom::StackArray colStrides {2, 1}; for(int d = 0; d < DIM; ++d) @@ -60,8 +66,10 @@ TEST(quest_array_indexer, quest_strides_and_permutations) EXPECT_EQ(colIndexer.strides()[d], colStrides[d]); } - axom::ArrayIndexer rowIndexer(lengths, 'r'); - EXPECT_EQ(rowIndexer.getOrder(), 'r'); + axom::ArrayIndexer rowIndexer( + lengths, + int(axom::ArrayStrideOrder::ROW)); + EXPECT_EQ(rowIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); axom::StackArray rowSlowestDirs {1, 0}; axom::StackArray rowStrides {1, 3}; for(int d = 0; d < DIM; ++d) @@ -75,8 +83,10 @@ TEST(quest_array_indexer, quest_strides_and_permutations) constexpr int DIM = 3; axom::StackArray lengths {5, 3, 2}; - axom::ArrayIndexer colIndexer(lengths, 'c'); - EXPECT_EQ(colIndexer.getOrder(), 'c'); + axom::ArrayIndexer colIndexer( + lengths, + int(axom::ArrayStrideOrder::COLUMN)); + EXPECT_EQ(colIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); axom::StackArray colSlowestDirs {0, 1, 2}; axom::StackArray colStrides {6, 2, 1}; for(int d = 0; d < DIM; ++d) @@ -85,8 +95,10 @@ TEST(quest_array_indexer, quest_strides_and_permutations) EXPECT_EQ(colIndexer.strides()[d], colStrides[d]); } - axom::ArrayIndexer rowIndexer(lengths, 'r'); - EXPECT_EQ(rowIndexer.getOrder(), 'r'); + axom::ArrayIndexer rowIndexer( + lengths, + int(axom::ArrayStrideOrder::ROW)); + EXPECT_EQ(rowIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); axom::StackArray rowSlowestDirs {2, 1, 0}; axom::StackArray rowStrides {1, 5, 15}; for(int d = 0; d < DIM; ++d) @@ -104,8 +116,11 @@ TEST(quest_array_indexer, quest_col_major_offset) // 1D constexpr int DIM = 1; axom::StackArray lengths {3}; - axom::ArrayIndexer ai(lengths, 'c'); - EXPECT_EQ(ai.getOrder(), 'c' | 'r'); + axom::ArrayIndexer ai( + lengths, + int(axom::ArrayStrideOrder::COLUMN)); + EXPECT_EQ(ai.getStrideOrder(), + int(axom::ArrayStrideOrder::COLUMN) | axom::ArrayStrideOrder::ROW); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -119,8 +134,10 @@ TEST(quest_array_indexer, quest_col_major_offset) // 2D constexpr int DIM = 2; axom::StackArray lengths {3, 2}; - axom::ArrayIndexer ai(lengths, 'c'); - EXPECT_EQ(ai.getOrder(), 'c'); + axom::ArrayIndexer ai( + lengths, + int(axom::ArrayStrideOrder::COLUMN)); + EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -136,8 +153,10 @@ TEST(quest_array_indexer, quest_col_major_offset) { // 3D axom::StackArray lengths {5, 3, 2}; - axom::ArrayIndexer ai(lengths, 'c'); - EXPECT_EQ(ai.getOrder(), 'c'); + axom::ArrayIndexer ai( + lengths, + int(axom::ArrayStrideOrder::COLUMN)); + EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -162,8 +181,10 @@ TEST(quest_array_indexer, quest_row_major_offset) // 1D constexpr int DIM = 1; axom::StackArray lengths {3}; - axom::ArrayIndexer ai(lengths, 'r'); - EXPECT_EQ(ai.getOrder(), 'r' | 'c'); + axom::ArrayIndexer ai(lengths, + int(axom::ArrayStrideOrder::ROW)); + EXPECT_EQ(ai.getStrideOrder(), + int(axom::ArrayStrideOrder::ROW) | axom::ArrayStrideOrder::COLUMN); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -177,8 +198,9 @@ TEST(quest_array_indexer, quest_row_major_offset) // 2D constexpr int DIM = 2; axom::StackArray lengths {3, 2}; - axom::ArrayIndexer ai(lengths, 'r'); - EXPECT_EQ(ai.getOrder(), 'r'); + axom::ArrayIndexer ai(lengths, + int(axom::ArrayStrideOrder::ROW)); + EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); axom::IndexType offset = 0; for(int j = 0; j < lengths[1]; ++j) { @@ -195,8 +217,9 @@ TEST(quest_array_indexer, quest_row_major_offset) // 3D constexpr int DIM = 3; axom::StackArray lengths {5, 3, 2}; - axom::ArrayIndexer ai(lengths, 'r'); - EXPECT_EQ(ai.getOrder(), 'r'); + axom::ArrayIndexer ai(lengths, + int(axom::ArrayStrideOrder::ROW)); + EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); axom::IndexType offset = 0; for(int k = 0; k < lengths[2]; ++k) { @@ -384,7 +407,9 @@ TEST(quest_array_indexer, quest_array_match) constexpr int DIM = 2; axom::StackArray lengths {3, 2}; axom::Array a(lengths); - axom::ArrayIndexer ai(lengths, 'c'); + axom::ArrayIndexer ai( + lengths, + int(axom::ArrayStrideOrder::COLUMN)); for(axom::IndexType i = 0; i < lengths[0]; ++i) { for(axom::IndexType j = 0; j < lengths[1]; ++j) @@ -398,7 +423,9 @@ TEST(quest_array_indexer, quest_array_match) constexpr int DIM = 3; axom::StackArray lengths {5, 3, 2}; axom::Array a(lengths); - axom::ArrayIndexer ai(lengths, 'c'); + axom::ArrayIndexer ai( + lengths, + int(axom::ArrayStrideOrder::COLUMN)); for(axom::IndexType i = 0; i < lengths[0]; ++i) { for(axom::IndexType j = 0; j < lengths[1]; ++j) From a70c71aedd56bc890c2e2f96911ca7ef7c1b299b Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 14 Feb 2024 23:50:10 -0800 Subject: [PATCH 472/639] Silence compiler warning. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 4fa7118770..806c527fcf 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -743,8 +743,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase // to put static 1D and 2D arrays on both host and device? BTNG. template - AXOM_HOST_DEVICE inline typename std::enable_if::type - num_contour_cells(int iCase) const + static AXOM_HOST_DEVICE inline typename std::enable_if::type + num_contour_cells(int iCase) { #define _MC_LOOKUP_NUM_SEGMENTS #include "marching_cubes_lookup.hpp" @@ -754,8 +754,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase } template - AXOM_HOST_DEVICE inline typename std::enable_if::type - cases_table(int iCase, int iEdge) const + static AXOM_HOST_DEVICE inline typename std::enable_if::type + cases_table(int iCase, int iEdge) { #define _MC_LOOKUP_CASES2D #include "marching_cubes_lookup.hpp" @@ -765,8 +765,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase } template - AXOM_HOST_DEVICE inline typename std::enable_if::type - num_contour_cells(int iCase) const + static AXOM_HOST_DEVICE inline typename std::enable_if::type + num_contour_cells(int iCase) { #define _MC_LOOKUP_NUM_TRIANGLES #include "marching_cubes_lookup.hpp" @@ -776,8 +776,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase } template - AXOM_HOST_DEVICE inline typename std::enable_if::type - cases_table(int iCase, int iEdge) const + static AXOM_HOST_DEVICE inline typename std::enable_if::type + cases_table(int iCase, int iEdge) { #define _MC_LOOKUP_CASES3D #include "marching_cubes_lookup.hpp" From eb74d9d52b37a65f2bd2b2b77efecdec5e804916 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 14 Feb 2024 23:50:45 -0800 Subject: [PATCH 473/639] Add option to change multidimensional nested loop ordering. Ordering is hardwired for now. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 85 +++++++++++++++++---- 1 file changed, 69 insertions(+), 16 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 806c527fcf..be080ed056 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -130,22 +130,47 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); + auto order = axom::ArrayStrideOrder::ROW; #if defined(AXOM_USE_RAJA) RAJA::RangeSegment jRange(0, m_bShape[1]); RAJA::RangeSegment iRange(0, m_bShape[0]); using EXEC_POL = typename axom::mint::internal::structured_exec::loop2d_policy; - RAJA::kernel( - RAJA::make_tuple(iRange, jRange), - AXOM_LAMBDA(axom::IndexType i, axom::IndexType j) { - mcu.computeCaseId(i, j); - }); + if(order & axom::ArrayStrideOrder::ROW) + { + RAJA::kernel( + RAJA::make_tuple(iRange, jRange), + AXOM_LAMBDA(axom::IndexType i, axom::IndexType j) { + mcu.computeCaseId(i, j); + }); + } + else + { + RAJA::kernel( + RAJA::make_tuple(jRange, iRange), + AXOM_LAMBDA(axom::IndexType j, axom::IndexType i) { + mcu.computeCaseId(i, j); + }); + } #else - for(int j = 0; j < m_bShape[1]; ++j) + if(order & axom::ArrayStrideOrder::ROW) + { + for(int j = 0; j < m_bShape[1]; ++j) + { + for(int i = 0; i < m_bShape[0]; ++i) + { + mcu.computeCaseId(i, j); + } + } + } + else { for(int i = 0; i < m_bShape[0]; ++i) { - mcu.computeCaseId(i, j); + for(int j = 0; j < m_bShape[1]; ++j) + { + mcu.computeCaseId(i, j); + } } } #endif @@ -157,25 +182,53 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); + auto order = axom::ArrayStrideOrder::COLUMN; #if defined(AXOM_USE_RAJA) RAJA::RangeSegment kRange(0, m_bShape[2]); RAJA::RangeSegment jRange(0, m_bShape[1]); RAJA::RangeSegment iRange(0, m_bShape[0]); using EXEC_POL = typename axom::mint::internal::structured_exec::loop3d_policy; - RAJA::kernel( - RAJA::make_tuple(iRange, jRange, kRange), - AXOM_LAMBDA(axom::IndexType i, axom::IndexType j, axom::IndexType k) { - mcu.computeCaseId(i, j, k); - }); + if(order & axom::ArrayStrideOrder::ROW) + { + RAJA::kernel( + RAJA::make_tuple(iRange, jRange, kRange), + AXOM_LAMBDA(axom::IndexType i, axom::IndexType j, axom::IndexType k) { + mcu.computeCaseId(i, j, k); + }); + } + else + { + RAJA::kernel( + RAJA::make_tuple(kRange, jRange, iRange), + AXOM_LAMBDA(axom::IndexType k, axom::IndexType j, axom::IndexType i) { + mcu.computeCaseId(i, j, k); + }); + } #else - for(int k = 0; k < m_bShape[2]; ++k) + if(order & axom::ArrayStrideOrder::ROW) { - for(int j = 0; j < m_bShape[1]; ++j) + for(int k = 0; k < m_bShape[2]; ++k) { - for(int i = 0; i < m_bShape[0]; ++i) + for(int j = 0; j < m_bShape[1]; ++j) { - mcu.computeCaseId(i, j, k); + for(int i = 0; i < m_bShape[0]; ++i) + { + mcu.computeCaseId(i, j, k); + } + } + } + } + else + { + for(int i = 0; i < m_bShape[0]; ++i) + { + for(int j = 0; j < m_bShape[1]; ++j) + { + for(int k = 0; k < m_bShape[2]; ++k) + { + mcu.computeCaseId(i, j, k); + } } } } From 0a8b135ed85e3ddf1a608a84bccf8e87d0bd31fb Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 15 Feb 2024 08:06:24 -0800 Subject: [PATCH 474/639] Set caseIds and multidim loop ordering to input data ordering to improve cache use. --- src/axom/quest/MarchingCubes.hpp | 3 +- src/axom/quest/detail/MarchingCubesImpl.hpp | 74 ++++++++++++------- .../examples/quest_marching_cubes_example.cpp | 9 ++- 3 files changed, 56 insertions(+), 30 deletions(-) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index df977bc083..8379039778 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -172,7 +172,8 @@ class MarchingCubes @brief Put generated contour in a mint::UnstructuredMesh. @param mesh Output contour mesh @param cellIdField Name of field to store the array of - parent cells ids, numbered in column-major ordering. + parent cells ids, numbered in the row- or column-major + ordering of the nodal scalar function. If empty, the data is not provided. @param domainIdField Name of field to store the parent domain ids. The type of this data is \c DomainIdType. diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index be080ed056..5e56461dab 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -12,6 +12,7 @@ #include "conduit_blueprint.hpp" #include "axom/core/execution/execution_space.hpp" +#include "axom/slic/interface/slic_macros.hpp" #include "axom/quest/ArrayIndexer.hpp" #include "axom/quest/MeshViewUtil.hpp" #include "axom/primal/geometry/Point.hpp" @@ -45,6 +46,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase public: using Point = axom::primal::Point; using MIdx = axom::StackArray; + using Indexer = axom::ArrayIndexer; using FacetIdType = int; using LoopPolicy = typename execution_space::loop_policy; using ReducePolicy = typename execution_space::reduce_policy; @@ -54,7 +56,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_HOST MarchingCubesImpl(int allocatorID) : m_allocatorID(allocatorID) - , m_caseIds(emptyShape(), m_allocatorID) , m_crossingParentIds(axom::StackArray {0}, m_allocatorID) , m_facetIncrs(axom::StackArray {0}, m_allocatorID) , m_firstFacetIds(axom::StackArray {0}, m_allocatorID) @@ -80,8 +81,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase SLIC_ASSERT(conduit::blueprint::mesh::topology::dims(dom.fetch_existing( axom::fmt::format("topologies/{}", topologyName))) == DIM); - // clear(); - m_mvu = axom::quest::MeshViewUtil(dom, topologyName); m_bShape = m_mvu.getCellShape(); @@ -91,15 +90,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase m_maskView = m_mvu.template getConstFieldView(maskFieldName, false); } - /* - TODO: To get good cache performance, we should make m_caseIds - row-major if fcn is that way, and vice versa. However, Array - only support column-major, so we're stuck with that for now. - */ - // m_caseIds.resize(m_bShape, 0); // This unexpectedly fails. - m_caseIds = - axom::Array(m_bShape, m_allocatorID); - m_caseIds.fill(0); + // I would like to move this section to markCrossings() but it + // increases runtime to 10x on HIP and 1.3x on CUDA for some reason. + m_caseIdsFlat = + axom::Array(m_mvu.getCellCount(), + m_allocatorID); } /*! @@ -122,7 +117,22 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase Virtual methods cannot be templated, so this implementation delegates to an implementation templated on DIM. */ - void markCrossings() override { markCrossings_dim(); } + void markCrossings() override + { + m_caseIdsFlat.fill(0); + Indexer fcnIndexer(m_fcnView.strides()); + // Choose caseIds stride order to match function stride order. + m_caseIdsIndexer.initializeShape(m_bShape, fcnIndexer.slowestDirs()); + m_caseIds = axom::ArrayView( + m_caseIdsFlat.data(), + m_bShape, + m_caseIdsIndexer.strides()); + SLIC_ASSERT_MSG(Indexer(m_caseIds.strides()).getStrideOrder() == + fcnIndexer.getStrideOrder(), + "Mismatched order is inefficient."); + + markCrossings_dim(); + } //!@brief Populate m_caseIds with crossing indices. template @@ -130,7 +140,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); - auto order = axom::ArrayStrideOrder::ROW; + auto order = m_caseIdsIndexer.getStrideOrder(); + // order ^= axom::ArrayStrideOrder::BOTH; // Pick wrong ordering to test behavior. #if defined(AXOM_USE_RAJA) RAJA::RangeSegment jRange(0, m_bShape[1]); RAJA::RangeSegment iRange(0, m_bShape[0]); @@ -182,7 +193,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); - auto order = axom::ArrayStrideOrder::COLUMN; + auto order = m_caseIdsIndexer.getStrideOrder(); + // order ^= axom::ArrayStrideOrder::BOTH; // Pick wrong ordering to test behavior. #if defined(AXOM_USE_RAJA) RAJA::RangeSegment kRange(0, m_bShape[2]); RAJA::RangeSegment jRange(0, m_bShape[1]); @@ -246,11 +258,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::ArrayView fcnView; axom::ArrayView maskView; double contourVal; - MarkCrossings_Util(axom::Array& caseIds, + MarkCrossings_Util(axom::ArrayView& caseIds, axom::ArrayView& fcnView_, axom::ArrayView& maskView_, double contourVal_) - : caseIdsView(caseIds.view()) + : caseIdsView(caseIds) , fcnView(fcnView_) , maskView(maskView_) , contourVal(contourVal_) @@ -351,7 +363,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase #endif #endif const axom::IndexType parentCellCount = m_caseIds.size(); - auto caseIdsView = m_caseIds.view(); + auto caseIdsView = m_caseIds; // // Initialize crossingFlags to 0 or 1, prefix-sum it, and count the @@ -449,7 +461,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase // Compute number of crossings in m_caseIds // const axom::IndexType parentCellCount = m_caseIds.size(); - auto caseIdsView = m_caseIds.view(); + auto caseIdsView = m_caseIds; #if defined(AXOM_USE_RAJA) RAJA::ReduceSum vsum(0); RAJA::forall( @@ -550,7 +562,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const auto facetIncrsView = m_facetIncrs.view(); const auto firstFacetIdsView = m_firstFacetIds.view(); const auto crossingParentIdsView = m_crossingParentIds.view(); - const auto caseIdsView = m_caseIds.view(); + const auto caseIdsView = m_caseIds; // Internal contour mesh data to populate axom::ArrayView facetNodeIdsView = m_facetNodeIds; @@ -559,7 +571,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const axom::IndexType facetIndexOffset = m_facetIndexOffset; ComputeContour_Util ccu(m_contourVal, - m_caseIds.strides(), + m_caseIdsIndexer, m_fcnView, m_coordsViews); @@ -606,19 +618,17 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase struct ComputeContour_Util { double contourVal; - MIdx bStrides; axom::ArrayIndexer indexer; axom::ArrayView fcnView; axom::StackArray, DIM> coordsViews; ComputeContour_Util( double contourVal_, - const MIdx& bStrides_, + const axom::ArrayIndexer& parentIndexer_, const axom::ArrayView& fcnView_, const axom::StackArray, DIM> coordsViews_) : contourVal(contourVal_) - , bStrides(bStrides_) - , indexer(bStrides_) + , indexer(parentIndexer_) , fcnView(fcnView_) , coordsViews(coordsViews_) { } @@ -860,7 +870,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase MarchingCubesImpl() { } private: - int m_allocatorID; + const int m_allocatorID; axom::quest::MeshViewUtil m_mvu; MIdx m_bShape; //!< @brief Blueprint cell data shape. @@ -874,7 +884,17 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::ArrayView m_maskView; //!@brief Crossing case for each computational mesh cell. - axom::Array m_caseIds; + axom::Array m_caseIdsFlat; + axom::ArrayView m_caseIds; + /*! + @brief Multi-dim indexer to control m_caseIdsFlat data ordering. + + We want caseIds ordering to match m_fcnView, but Array + only supports column-major ordering currently. To control + the order, we put caseIds in a 1D array and construct a + multidim view with the ordering we want. + */ + axom::ArrayIndexer m_caseIdsIndexer; //!@brief Number of parent cells crossing the contour surface. axom::IndexType m_crossingCount = 0; diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 299a2f516f..975025f03c 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -1095,12 +1095,16 @@ struct ContourTestBase domainIdToContiguousId[domainId] = n; } + // Indexers to transltate between flat and multidim indices. axom::Array> indexers(domainCount); for(int d = 0; d < domainCount; ++d) { axom::StackArray domShape; computationalMesh.domainLengths(d, domShape); - indexers[d].initializeShape(domShape, int(axom::ArrayStrideOrder::COLUMN)); + indexers[d].initializeShape( + domShape, + axom::ArrayIndexer(allCoordsViews[d][0].strides()) + .slowestDirs()); } for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; @@ -1201,7 +1205,8 @@ struct ContourTestBase mvu.template getConstFieldView(functionName(), false); cellIndexers[domId].initializeShape( mvu.getCellShape(), - axom::ArrayStrideOrder::COLUMN); + axom::ArrayIndexer(fcnViews[domId].strides()) + .slowestDirs()); } std::map domainIdToContiguousId; From bbb84441149de1af5ee3adc582f055bbf53f6ab8 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sat, 17 Feb 2024 00:35:18 -0800 Subject: [PATCH 475/639] Optimize out unneeded cuda memory allocation/deallocation. --- src/axom/quest/MarchingCubes.cpp | 39 ++- src/axom/quest/MarchingCubes.hpp | 28 ++- src/axom/quest/detail/MarchingCubesImpl.hpp | 229 ++++++++++-------- .../examples/quest_marching_cubes_example.cpp | 5 + 4 files changed, 182 insertions(+), 119 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 83952b838f..bbe2dea7f5 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -20,6 +20,8 @@ namespace axom { namespace quest { +const axom::StackArray twoZeros{0, 0}; + MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, int allocatorID, MarchingCubesDataParallelism dataParallelism, @@ -35,6 +37,11 @@ MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, , m_fcnPath() , m_maskFieldName(maskField) , m_maskPath(maskField.empty() ? std::string() : "fields/" + maskField) + , m_facetIndexOffsets(0, 0) + , m_facetCount(0) + , m_facetNodeIds(twoZeros, m_allocatorID) + , m_facetNodeCoords(twoZeros, m_allocatorID) + , m_facetParentIds(0, 0, m_allocatorID) { SLIC_ASSERT_MSG( conduit::blueprint::mesh::is_multi_domain(bpMesh), @@ -64,6 +71,7 @@ void MarchingCubes::setFunctionField(const std::string& fcnField) void MarchingCubes::computeIsocontour(double contourVal) { + AXOM_PERF_MARK_FUNCTION("MarchingCubes::computeIsoContour"); // Mark and scan domains while adding up their // facet counts to get the total facet counts. m_facetIndexOffsets.resize(m_singles.size()); @@ -86,10 +94,10 @@ void MarchingCubes::computeIsocontour(double contourVal) auto facetParentIdsView = m_facetParentIds.view(); for(axom::IndexType d = 0; d < m_singles.size(); ++d) { - m_singles[d]->setOutputBuffers(facetNodeIdsView, - facetNodeCoordsView, - facetParentIdsView, - m_facetIndexOffsets[d]); + m_singles[d]->getImpl().setOutputBuffers(facetNodeIdsView, + facetNodeCoordsView, + facetParentIdsView, + m_facetIndexOffsets[d]); } for(axom::IndexType d = 0; d < m_singles.size(); ++d) @@ -136,11 +144,23 @@ axom::Array MarchingCubes::getContourFacetDomainIds return rval; } +void MarchingCubes::clear() +{ + for(int d = 0; d < m_singles.size(); ++d) + { + m_singles[d]->getImpl().clear(); + } + m_facetNodeIds.clear(); + m_facetNodeCoords.clear(); + m_facetParentIds.clear(); +} + void MarchingCubes::populateContourMesh( axom::mint::UnstructuredMesh& mesh, const std::string& cellIdField, const std::string& domainIdField) const { + AXOM_PERF_MARK_FUNCTION("MarchingCubes::populateContourMesh"); if(!cellIdField.empty() && !mesh.hasField(cellIdField, axom::mint::CELL_CENTERED)) { @@ -157,6 +177,8 @@ void MarchingCubes::populateContourMesh( // Reserve space once for all local domains. const axom::IndexType contourCellCount = getContourCellCount(); const axom::IndexType contourNodeCount = getContourNodeCount(); + // Temporarily disable reservation due to unknown bug. + // See https://github.com/LLNL/axom/pull/1271 mesh.reserveCells(contourCellCount); mesh.reserveNodes(contourNodeCount); @@ -221,15 +243,14 @@ void MarchingCubes::populateContourMesh( void MarchingCubes::allocateOutputBuffers() { + AXOM_PERF_MARK_FUNCTION("MarchingCubes::allocateOutputBuffers"); if(!m_singles.empty()) { int ndim = m_singles[0]->spatialDimension(); const auto nodeCount = m_facetCount * ndim; - m_facetNodeIds = - axom::Array({m_facetCount, ndim}, m_allocatorID); - m_facetNodeCoords = axom::Array({nodeCount, ndim}, m_allocatorID); - axom::StackArray t1 {m_facetCount}; - m_facetParentIds = axom::Array(t1, m_allocatorID); + m_facetNodeIds.resize(axom::StackArray{m_facetCount, ndim}, 0); + m_facetNodeCoords.resize(axom::StackArray{nodeCount, ndim}, 0.0); + m_facetParentIds.resize(axom::StackArray{m_facetCount}, 0); } } diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 8379039778..91b9fbefa9 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -268,6 +268,14 @@ class MarchingCubes #endif //@} + /*! + @brief Clear computed data (without deallocating memory). + + After clearing, you can choose another field, contour value and + recompute the contour. You cannot change the mesh. + */ + void clear(); + private: RuntimePolicy m_runtimePolicy; int m_allocatorID = axom::INVALID_ALLOCATOR_ID; @@ -390,19 +398,6 @@ class MarchingCubesSingleDomain { return m_impl->getContourCellCount(); } - void setOutputBuffers(axom::ArrayView &facetNodeIds, - axom::ArrayView &facetNodeCoords, - axom::ArrayView &facetParentIds, - axom::IndexType facetIndexOffset) - { - SLIC_ASSERT(facetNodeIds.getAllocatorID() == m_allocatorID); - SLIC_ASSERT(facetNodeCoords.getAllocatorID() == m_allocatorID); - SLIC_ASSERT(facetParentIds.getAllocatorID() == m_allocatorID); - m_impl->setOutputBuffers(facetNodeIds, - facetNodeCoords, - facetParentIds, - facetIndexOffset); - } void computeContour() { m_impl->computeContour(); } /*! @@ -487,6 +482,8 @@ class MarchingCubesSingleDomain virtual ~ImplBase() { } + virtual void clear() = 0; + MarchingCubesDataParallelism m_dataParallelism = MarchingCubesDataParallelism::byPolicy; @@ -497,6 +494,11 @@ class MarchingCubesSingleDomain axom::IndexType m_facetIndexOffset = -1; }; + ImplBase& getImpl() + { + return *m_impl; + } + private: RuntimePolicy m_runtimePolicy; int m_allocatorID = axom::INVALID_ALLOCATOR_ID; diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 5e56461dab..6e091ea4c3 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -50,15 +50,28 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase using FacetIdType = int; using LoopPolicy = typename execution_space::loop_policy; using ReducePolicy = typename execution_space::reduce_policy; +#if defined(AXOM_USE_RAJA) + // Intel oneAPI compiler segfaults with OpenMP RAJA scan + #ifdef __INTEL_LLVM_COMPILER + using ScanPolicy = + typename axom::execution_space::loop_policy; + #else + using ScanPolicy = typename axom::execution_space::loop_policy; + #endif +#endif using SequentialLoopPolicy = typename execution_space::loop_policy; static constexpr auto MemorySpace = execution_space::memory_space; AXOM_HOST MarchingCubesImpl(int allocatorID) : m_allocatorID(allocatorID) - , m_crossingParentIds(axom::StackArray {0}, m_allocatorID) - , m_facetIncrs(axom::StackArray {0}, m_allocatorID) - , m_firstFacetIds(axom::StackArray {0}, m_allocatorID) + , m_caseIdsFlat(0, 0, m_allocatorID) + , m_caseIds() + , m_crossingFlags(0, 0, m_allocatorID) + , m_scannedFlags(0, 0, m_allocatorID) + , m_crossingParentIds(0, 0, m_allocatorID) + , m_facetIncrs(0, 0, m_allocatorID) + , m_firstFacetIds(0, 0, m_allocatorID) { } /*! @@ -78,6 +91,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const std::string& topologyName, const std::string& maskFieldName) override { + // Time this due to potentially slow memory allocation + AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::initialize"); + SLIC_ASSERT(conduit::blueprint::mesh::topology::dims(dom.fetch_existing( axom::fmt::format("topologies/{}", topologyName))) == DIM); @@ -89,12 +105,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { m_maskView = m_mvu.template getConstFieldView(maskFieldName, false); } - - // I would like to move this section to markCrossings() but it - // increases runtime to 10x on HIP and 1.3x on CUDA for some reason. - m_caseIdsFlat = - axom::Array(m_mvu.getCellCount(), - m_allocatorID); } /*! @@ -119,9 +129,13 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase */ void markCrossings() override { + AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::markCrossings"); + + m_caseIdsFlat.resize(m_mvu.getCellCount(), 0); m_caseIdsFlat.fill(0); - Indexer fcnIndexer(m_fcnView.strides()); + // Choose caseIds stride order to match function stride order. + Indexer fcnIndexer(m_fcnView.strides()); m_caseIdsIndexer.initializeShape(m_bShape, fcnIndexer.slowestDirs()); m_caseIds = axom::ArrayView( m_caseIdsFlat.data(), @@ -291,11 +305,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase if(useZone) { // clang-format off - double nodalValues[CELL_CORNER_COUNT] = - {fcnView(i , j ), - fcnView(i + 1, j ), - fcnView(i + 1, j + 1), - fcnView(i , j + 1)}; + double nodalValues[CELL_CORNER_COUNT] = + {fcnView(i , j ), + fcnView(i + 1, j ), + fcnView(i + 1, j + 1), + fcnView(i , j + 1)}; // clang-format on caseIdsView(i, j) = computeCrossingCase(nodalValues); } @@ -310,15 +324,15 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase if(useZone) { // clang-format off - double nodalValues[CELL_CORNER_COUNT] = - {fcnView(i + 1, j , k ), - fcnView(i + 1, j + 1, k ), - fcnView(i , j + 1, k ), - fcnView(i , j , k ), - fcnView(i + 1, j , k + 1), - fcnView(i + 1, j + 1, k + 1), - fcnView(i , j + 1, k + 1), - fcnView(i , j , k + 1)}; + double nodalValues[CELL_CORNER_COUNT] = + {fcnView(i + 1, j , k ), + fcnView(i + 1, j + 1, k ), + fcnView(i , j + 1, k ), + fcnView(i , j , k ), + fcnView(i + 1, j , k + 1), + fcnView(i + 1, j + 1, k + 1), + fcnView(i , j + 1, k + 1), + fcnView(i , j , k + 1)}; // clang-format on caseIdsView(i, j, k) = computeCrossingCase(nodalValues); } @@ -327,6 +341,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase void scanCrossings() override { + AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::scanCrossings"); constexpr MarchingCubesDataParallelism autoPolicy = std::is_same::value ? MarchingCubesDataParallelism::hybridParallel @@ -343,93 +358,92 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase (m_dataParallelism == axom::quest::MarchingCubesDataParallelism::byPolicy && autoPolicy == MarchingCubesDataParallelism::hybridParallel)) { - scanCrossings_hybridParallel(); + AXOM_PERF_MARK_SECTION( + "MarchingCubesImpl::scanCrossings:hybridParallel", + scanCrossings_hybridParallel();); } else { - scanCrossings_fullParallel(); + AXOM_PERF_MARK_SECTION( + "MarchingCubesImpl::scanCrossings:fullParallel", + scanCrossings_fullParallel();); } } + void allocateIndexLists() + { + AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::allocateIndexLists"); + m_crossingParentIds.resize(m_crossingCount, 0); + m_facetIncrs.resize(m_crossingCount, 0); + m_firstFacetIds.resize(1 + m_crossingCount, 0); + } + void scanCrossings_fullParallel() { -#if defined(AXOM_USE_RAJA) - #ifdef __INTEL_LLVM_COMPILER - // Intel oneAPI compiler segfaults with OpenMP RAJA scan - using ScanPolicy = - typename axom::execution_space::loop_policy; - #else - using ScanPolicy = typename axom::execution_space::loop_policy; - #endif -#endif const axom::IndexType parentCellCount = m_caseIds.size(); auto caseIdsView = m_caseIds; // - // Initialize crossingFlags to 0 or 1, prefix-sum it, and count the + // Initialize m_crossingFlags, prefix-sum it, and count the // crossings. // - // All 1D array data alligns with m_caseId, which is column-major - // (the default for Array class), leading to *column-major* parent - // cell ids, regardless of the ordering of the input mesh data. - // - - axom::StackArray tmpShape {parentCellCount}; - axom::Array crossingFlags(tmpShape); - auto crossingFlagsView = crossingFlags.view(); - axom::for_all( - 0, - parentCellCount, - AXOM_LAMBDA(axom::IndexType parentCellId) { - auto numContourCells = - num_contour_cells(caseIdsView.flatIndex(parentCellId)); - crossingFlagsView[parentCellId] = bool(numContourCells); - }); - axom::StackArray tmpShape1 {1 + parentCellCount}; - axom::Array scannedFlags(tmpShape1); - scannedFlags.fill(0, 1, 0); + m_crossingFlags.resize(m_mvu.getCellCount(), 0); + m_scannedFlags.resize(1 + m_mvu.getCellCount(), 0); + + auto crossingFlagsView = m_crossingFlags.view(); + AXOM_PERF_MARK_SECTION( + "MarchingCubesImpl::scanCrossings:set_flags", + axom::for_all( + 0, + parentCellCount, + AXOM_LAMBDA(axom::IndexType parentCellId) { + auto numContourCells = + num_contour_cells(caseIdsView.flatIndex(parentCellId)); + crossingFlagsView[parentCellId] = bool(numContourCells); + });); + + m_scannedFlags.fill(0, 1, 0); + AXOM_PERF_MARK_SECTION( + "MarchingCubesImpl::scanCrossings:scan_flags", #if defined(AXOM_USE_RAJA) - RAJA::inclusive_scan( - RAJA::make_span(crossingFlags.data(), parentCellCount), - RAJA::make_span(scannedFlags.data() + 1, parentCellCount), - RAJA::operators::plus {}); + RAJA::inclusive_scan( + RAJA::make_span(m_crossingFlags.data(), parentCellCount), + RAJA::make_span(m_scannedFlags.data() + 1, parentCellCount), + RAJA::operators::plus {}); #else - for(axom::IndexType n = 0; n < parentCellCount; ++n) - { - scannedFlags[n + 1] = scannedFlags[n] + crossingFlags[n]; - } + for(axom::IndexType n = 0; n < parentCellCount; ++n) + { + m_scannedFlags[n + 1] = m_scannedFlags[n] + m_crossingFlags[n]; + } #endif + ); axom::copy(&m_crossingCount, - scannedFlags.data() + scannedFlags.size() - 1, + m_scannedFlags.data() + m_scannedFlags.size() - 1, sizeof(axom::IndexType)); // // Generate crossing-cells index list and corresponding facet counts. // - - const axom::StackArray tmpShape2 {m_crossingCount}; - const axom::StackArray tmpShape3 {1 + m_crossingCount}; - m_crossingParentIds.resize(tmpShape2, 0); - m_facetIncrs.resize(tmpShape2, 0); - m_firstFacetIds.resize(tmpShape3, 0); - - auto scannedFlagsView = scannedFlags.view(); + allocateIndexLists(); + auto scannedFlagsView = m_scannedFlags.view(); auto crossingParentIdsView = m_crossingParentIds.view(); auto facetIncrsView = m_facetIncrs.view(); - auto loopBody = AXOM_LAMBDA(axom::IndexType parentCellId) - { - if(scannedFlagsView[parentCellId] != scannedFlagsView[1 + parentCellId]) + AXOM_PERF_MARK_SECTION( + "MarchingCubesImpl::scanCrossings:set_incrs", + auto loopBody = AXOM_LAMBDA(axom::IndexType parentCellId) { - auto crossingId = scannedFlagsView[parentCellId]; - auto facetIncr = num_contour_cells(caseIdsView.flatIndex(parentCellId)); - crossingParentIdsView[crossingId] = parentCellId; - facetIncrsView[crossingId] = facetIncr; - } - }; - axom::for_all(0, parentCellCount, loopBody); + if(scannedFlagsView[parentCellId] != scannedFlagsView[1 + parentCellId]) + { + auto crossingId = scannedFlagsView[parentCellId]; + auto facetIncr = num_contour_cells(caseIdsView.flatIndex(parentCellId)); + crossingParentIdsView[crossingId] = parentCellId; + facetIncrsView[crossingId] = facetIncr; + } + }; + axom::for_all(0, parentCellCount, loopBody);); // // Prefix-sum the facets counts to get first facet id for each crossing @@ -437,17 +451,20 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase // m_firstFacetIds.fill(0, 1, 0); + AXOM_PERF_MARK_SECTION( + "MarchingCubesImpl::scanCrossings:scan_incrs", #if defined(AXOM_USE_RAJA) - RAJA::inclusive_scan( - RAJA::make_span(m_facetIncrs.data(), m_crossingCount), - RAJA::make_span(m_firstFacetIds.data() + 1, m_crossingCount), - RAJA::operators::plus {}); + RAJA::inclusive_scan( + RAJA::make_span(m_facetIncrs.data(), m_crossingCount), + RAJA::make_span(m_firstFacetIds.data() + 1, m_crossingCount), + RAJA::operators::plus {}); #else - for(axom::IndexType n = 0; n < parentCellCount; ++n) - { - m_firstFacetIds[n + 1] = m_firstFacetIds[n] + m_facetIncrs[n]; - } + for(axom::IndexType n = 0; n < parentCellCount; ++n) + { + m_firstFacetIds[n + 1] = m_firstFacetIds[n] + m_facetIncrs[n]; + } #endif + ); axom::copy(&m_facetCount, m_firstFacetIds.data() + m_firstFacetIds.size() - 1, @@ -534,13 +551,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const auto firstFacetIdsView = m_firstFacetIds.view(); #if defined(AXOM_USE_RAJA) - // Intel oneAPI compiler segfaults with OpenMP RAJA scan - #ifdef __INTEL_LLVM_COMPILER - using ScanPolicy = - typename axom::execution_space::loop_policy; - #else - using ScanPolicy = typename axom::execution_space::loop_policy; - #endif RAJA::inclusive_scan( RAJA::make_span(facetIncrsView.data(), m_crossingCount), RAJA::make_span(firstFacetIdsView.data() + 1, m_crossingCount), @@ -559,6 +569,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase void computeContour() override { + AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::computeContour"); const auto facetIncrsView = m_facetIncrs.view(); const auto firstFacetIdsView = m_firstFacetIds.view(); const auto crossingParentIdsView = m_crossingParentIds.view(); @@ -869,6 +880,24 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase */ MarchingCubesImpl() { } + /*! + @brief Clear computed data (without deallocating memory). + + After clearing, you can change the field, contour value + and recompute the contour. + */ + void clear() override + { + m_caseIdsFlat.clear(); + m_crossingFlags.clear(); + m_scannedFlags.clear(); + m_crossingParentIds.clear(); + m_facetIncrs.clear(); + m_firstFacetIds.clear(); + m_crossingCount = 0; + m_facetCount = 0; + } + private: const int m_allocatorID; @@ -896,6 +925,12 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase */ axom::ArrayIndexer m_caseIdsIndexer; + //!@brief Whether a parent cell crosses the contour. + axom::Array m_crossingFlags; + + //!@brief Prefix sum of m_crossingFlags + axom::Array m_scannedFlags; + //!@brief Number of parent cells crossing the contour surface. axom::IndexType m_crossingCount = 0; diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 975025f03c..4388588761 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -515,6 +515,7 @@ struct BlueprintStructuredMesh template void moveMeshDataToNewMemorySpace(const std::string& path, int allocId) { + AXOM_PERF_MARK_FUNCTION("moveMeshDataToNewMemorySpace"); // For reference for(auto& dom : _mdMesh.children()) { moveConduitDataToNewMemorySpace(dom, path, allocId); @@ -758,6 +759,10 @@ struct ContourTestBase #endif computeTimer.start(); mc.computeIsocontour(params.contourVal); + for(int i=0; i<4; ++i) { + mc.clear(); + mc.computeIsocontour(params.contourVal); + } computeTimer.stop(); printTimingStats(computeTimer, name() + " contour"); From a13bc1f1e0835ce44aac4e1931c0f92d0cd4e5f7 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sat, 17 Feb 2024 18:54:04 -0800 Subject: [PATCH 476/639] Allow MarchingCubes to retain allocated memory when initialzed to a different mesh. --- src/axom/quest/MarchingCubes.cpp | 91 +++++++---- src/axom/quest/MarchingCubes.hpp | 142 ++++++++++-------- .../examples/quest_marching_cubes_example.cpp | 17 ++- 3 files changed, 150 insertions(+), 100 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index bbe2dea7f5..22f3e07482 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -24,39 +24,62 @@ const axom::StackArray twoZeros{0, 0}; MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, int allocatorID, - MarchingCubesDataParallelism dataParallelism, - const conduit::Node& bpMesh, - const std::string& topologyName, - const std::string& maskField) + MarchingCubesDataParallelism dataParallelism) : m_runtimePolicy(runtimePolicy) , m_allocatorID(allocatorID) , m_dataParallelism(dataParallelism) , m_singles() - , m_topologyName(topologyName) + , m_topologyName() , m_fcnFieldName() , m_fcnPath() - , m_maskFieldName(maskField) - , m_maskPath(maskField.empty() ? std::string() : "fields/" + maskField) + , m_maskFieldName() + , m_maskPath() , m_facetIndexOffsets(0, 0) , m_facetCount(0) , m_facetNodeIds(twoZeros, m_allocatorID) , m_facetNodeCoords(twoZeros, m_allocatorID) , m_facetParentIds(0, 0, m_allocatorID) +{ +} + +// Set the object up for a blueprint mesh state. +void MarchingCubes::initialize( + const conduit::Node& bpMesh, + const std::string& topologyName, + const std::string& maskField) { SLIC_ASSERT_MSG( conduit::blueprint::mesh::is_multi_domain(bpMesh), "MarchingCubes class input mesh must be in multidomain format."); - m_singles.reserve(conduit::blueprint::mesh::number_of_domains(bpMesh)); - for(auto& dom : bpMesh.children()) + clear(); + + m_topologyName = topologyName; + m_maskFieldName = maskField; + + /* + To avoid slow memory allocations (especially on GPUs) keep the + single-domain objects around and just re-initialize them. Arrays + will be cleared, but not deallocated. To really deallocate + memory, deallocate the MarchingCubes object. The actual number + of domains is m_domainCount, not m_singles.size(). + */ + auto newDomainCount = conduit::blueprint::mesh::number_of_domains(bpMesh); + + while( m_singles.size() < newDomainCount ) { m_singles.emplace_back(new MarchingCubesSingleDomain(m_runtimePolicy, m_allocatorID, - m_dataParallelism, - dom, - m_topologyName, - maskField)); + m_dataParallelism)); + } + + for (int d = 0; d < newDomainCount; ++d) + { + const auto& dom = bpMesh.child(d); + m_singles[d]->initialize(dom, m_topologyName, maskField); } + + m_domainCount = newDomainCount; } void MarchingCubes::setFunctionField(const std::string& fcnField) @@ -150,6 +173,7 @@ void MarchingCubes::clear() { m_singles[d]->getImpl().clear(); } + m_domainCount = 0; m_facetNodeIds.clear(); m_facetNodeCoords.clear(); m_facetParentIds.clear(); @@ -257,36 +281,28 @@ void MarchingCubes::allocateOutputBuffers() MarchingCubesSingleDomain::MarchingCubesSingleDomain( RuntimePolicy runtimePolicy, int allocatorID, - MarchingCubesDataParallelism dataPar, - const conduit::Node& dom, - const std::string& topologyName, - const std::string& maskField) + MarchingCubesDataParallelism dataPar) : m_runtimePolicy(runtimePolicy) , m_allocatorID(allocatorID) , m_dataParallelism(dataPar) , m_dom(nullptr) , m_ndim(0) - , m_topologyName(topologyName) + , m_topologyName() , m_fcnFieldName() , m_fcnPath() - , m_maskFieldName(maskField) - , m_maskPath(maskField.empty() ? std::string() : "fields/" + maskField) + , m_maskFieldName() + , m_maskPath() { - // Set domain first, to get m_ndim, which is required to allocate m_impl. - setDomain(dom); - - m_impl = - axom::quest::detail::marching_cubes::newMarchingCubesImpl(m_runtimePolicy, - m_allocatorID, - m_ndim); - - m_impl->initialize(*m_dom, m_topologyName, m_maskFieldName); - m_impl->setDataParallelism(m_dataParallelism); return; } -void MarchingCubesSingleDomain::setDomain(const conduit::Node& dom) +void MarchingCubesSingleDomain::initialize( + const conduit::Node& dom, + const std::string& topologyName, + const std::string& maskField) { + m_topologyName = topologyName; + SLIC_ASSERT_MSG( !conduit::blueprint::mesh::is_multi_domain(dom), "MarchingCubesSingleDomain is single-domain only. Try MarchingCubes."); @@ -300,8 +316,13 @@ void MarchingCubesSingleDomain::setDomain(const conduit::Node& dom) if(!m_maskPath.empty()) { + m_maskPath = maskField.empty() ? std::string() : "fields/" + maskField; SLIC_ASSERT(dom.has_path(m_maskPath + "/values")); } + else + { + m_maskPath.clear(); + } m_dom = &dom; @@ -313,6 +334,14 @@ void MarchingCubesSingleDomain::setDomain(const conduit::Node& dom) !conduit::blueprint::mcarray::is_interleaved( dom.fetch_existing(coordsetPath + "/values")), "MarchingCubes currently requires contiguous coordinates layout."); + + m_impl = + axom::quest::detail::marching_cubes::newMarchingCubesImpl(m_runtimePolicy, + m_allocatorID, + m_ndim); + + m_impl->initialize(dom, topologyName, maskField); + m_impl->setDataParallelism(m_dataParallelism); } MarchingCubes::DomainIdType MarchingCubesSingleDomain::getDomainId( diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 91b9fbefa9..1f4b6c6412 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -110,43 +110,44 @@ class MarchingCubes using RuntimePolicy = axom::runtime_policy::Policy; using DomainIdType = int; /*! - * \brief Constructor sets up computational mesh and data for running the - * marching cubes algorithm. - * - * \param [in] runtimePolicy A value from RuntimePolicy. - * The simplest policy is RuntimePolicy::seq, which specifies - * running sequentially on the CPU. - * \param [in] allocatorID Data allocator ID. Choose something compatible - * with \c runtimePolicy. See \c esecution_space. - * \param [in] dataParallelism Data parallel implementation choice. - * \param [in] bpMesh Blueprint multi-domain mesh containing scalar field. - * \param [in] topologyName Name of Blueprint topology to use in \a bpMesh. - * \param [in] maskField Cell-based std::int32_t mask field. If provided, - * cells where this field evaluates to false are skipped. - * - * Array data in \a dom must be accessible in the \a runtimePolicy - * environment. It's an error if not, e.g., using CPU memory with - * a GPU policy. - * - * Some data from \a bpMesh may be cached by the constructor. - * Any change to it after the constructor leads to undefined behavior. - * - * The mesh coordinates should be contiguous. See - * conduit::blueprint::is_contiguous(). In the future, this - * requirement may be relaxed, possibly at the cost of a - * transformation and storage of the temporary contiguous layout. - * - * Blueprint allows users to specify ids for the domains. If - * "state/domain_id" exists in the domains, it is used as the domain - * id. Otherwise, the domain's interation index within the - * multidomain mesh is used. - */ + \brief Constructor sets up computational mesh and data for running the + marching cubes algorithm. + + \param [in] runtimePolicy A value from RuntimePolicy. + The simplest policy is RuntimePolicy::seq, which specifies + running sequentially on the CPU. + \param [in] allocatorID Data allocator ID. Choose something compatible + with \c runtimePolicy. See \c esecution_space. + \param [in] dataParallelism Data parallel implementation choice. + \param [in] bpMesh Blueprint multi-domain mesh containing scalar field. + \param [in] topologyName Name of Blueprint topology to use in \a bpMesh. + \param [in] maskField Cell-based std::int32_t mask field. If provided, + cells where this field evaluates to false are skipped. + + Array data in \a dom must be accessible in the \a runtimePolicy + environment. It's an error if not, e.g., using CPU memory with + a GPU policy. + + Some data from \a bpMesh may be cached by the constructor. + Any change to it after the constructor leads to undefined behavior. + + The mesh coordinates should be contiguous. See + conduit::blueprint::is_contiguous(). In the future, this + requirement may be relaxed, possibly at the cost of a + transformation and storage of the temporary contiguous layout. + + Blueprint allows users to specify ids for the domains. If + "state/domain_id" exists in the domains, it is used as the domain + id. Otherwise, the domain's interation index within the + multidomain mesh is used. + */ MarchingCubes(RuntimePolicy runtimePolicy, int allocatorId, - MarchingCubesDataParallelism dataParallelism, - const conduit::Node &bpMesh, - const std::string &topologyName, - const std::string &maskField = {}); + MarchingCubesDataParallelism dataParallelism); + + void initialize(const conduit::Node &bpMesh, + const std::string &topologyName, + const std::string &maskField = {}); /*! @brief Set the field containing the nodal function. @@ -269,10 +270,13 @@ class MarchingCubes //@} /*! - @brief Clear computed data (without deallocating memory). + @brief Clear computed data. + + After clearing, you have to call initialize as if it + was a new object. - After clearing, you can choose another field, contour value and - recompute the contour. You cannot change the mesh. + @internal For good GPU performance, memory is not deallocated. To + really deallocate memory, destruct this object and use another. */ void clear(); @@ -284,9 +288,16 @@ class MarchingCubes MarchingCubesDataParallelism m_dataParallelism = MarchingCubesDataParallelism::byPolicy; - //! @brief Single-domain implementations. + //!@brief Number of domains. + axom::IndexType m_domainCount; + + /*! + @brief Single-domain implementations. + + May be longer than m_domainCount (the real count). + */ axom::Array> m_singles; - const std::string m_topologyName; + std::string m_topologyName; std::string m_fcnFieldName; std::string m_fcnPath; std::string m_maskFieldName; @@ -343,29 +354,34 @@ class MarchingCubesSingleDomain * \param [in] allocatorID Data allocator ID. Choose something compatible * with \c runtimePolicy. See \c esecution_space. * \param [in] dataPar Choice of data-parallel implementation. - * \param [in] dom Blueprint single-domain mesh containing scalar field. - * \param [in] topologyName Name of Blueprint topology to use in \a dom - * \param [in] maskField Cell-based std::int32_t mask field. If provided, - * cells where this field evaluates to false are skipped. - * - * Array data in \a dom must be accessible in the \a runtimePolicy - * environment. It's an error if not, e.g., using CPU memory with - * a GPU policy. - * - * Some data from \a dom may be cached by the constructor. - * Any change to it after the constructor leads to undefined behavior. - * - * The mesh coordinates should be stored contiguously. See - * conduit::blueprint::is_contiguous(). In the future, this - * requirement may be relaxed, possibly at the cost of a - * transformation and storage of the temporary contiguous layout. */ MarchingCubesSingleDomain(RuntimePolicy runtimePolicy, int allocatorID, - MarchingCubesDataParallelism dataPar, - const conduit::Node &dom, - const std::string &topologyName, - const std::string &maskfield); + MarchingCubesDataParallelism dataPar); + + /*! + @brief Intitialize object to a domain. + \param [in] dom Blueprint single-domain mesh containing scalar field. + \param [in] topologyName Name of Blueprint topology to use in \a dom + \param [in] maskField Cell-based std::int32_t mask field. If provided, + cells where this field evaluates to false are skipped. + + Array data in \a dom must be accessible in the the \a + runtimePolicy environment in the constructor. It's an error if + not, e.g., using CPU memory with a GPU policy. + + Some data from \a dom may be cached by the constructor. Any + change to it without re-initialization leads to undefined + behavior. + + The mesh coordinates should be stored contiguously. See + conduit::blueprint::is_contiguous(). In the future, this + requirement may be relaxed, possibly at the cost of a + transformation and storage of the temporary contiguous layout. + */ + void initialize( const conduit::Node &dom, + const std::string &topologyName, + const std::string &maskfield); int spatialDimension() const { return m_ndim; } @@ -514,15 +530,15 @@ class MarchingCubesSingleDomain int m_ndim; //!@brief Name of Blueprint topology in m_dom. - const std::string m_topologyName; + std::string m_topologyName; std::string m_fcnFieldName; //!@brief Path to nodal scalar function in m_dom. std::string m_fcnPath; - const std::string m_maskFieldName; + std::string m_maskFieldName; //!@brief Path to mask in m_dom. - const std::string m_maskPath; + std::string m_maskPath; double m_contourVal = 0.0; diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 4388588761..8188a78167 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -744,13 +744,13 @@ struct ContourTestBase } } #endif +for(int j=0; j<5; ++j) +{ // Create marching cubes algorithm object and set some parameters quest::MarchingCubes mc(params.policy, s_allocatorId, - params.dataParallelism, - computationalMesh.asConduitNode(), - "mesh"); - + params.dataParallelism); + mc.initialize(computationalMesh.asConduitNode(), "mesh"); mc.setFunctionField(functionName()); axom::utilities::Timer computeTimer(false); @@ -759,12 +759,12 @@ struct ContourTestBase #endif computeTimer.start(); mc.computeIsocontour(params.contourVal); - for(int i=0; i<4; ++i) { + for(int i=0; i<3; ++i) { mc.clear(); mc.computeIsocontour(params.contourVal); } computeTimer.stop(); - printTimingStats(computeTimer, name() + " contour"); + // printTimingStats(computeTimer, name() + " contour"); { int mn, mx, sum; @@ -781,6 +781,7 @@ struct ContourTestBase axom::fmt::format("Surface mesh has locally {} cells, {} nodes.", mc.getContourCellCount(), mc.getContourNodeCount())); +} // Return conduit data to host memory. if(s_allocatorId != axom::execution_space::allocatorID()) @@ -797,6 +798,7 @@ struct ContourTestBase axom::execution_space::allocatorID()); } +#if 0 // Put contour mesh in a mint object for error checking and output. std::string sidreGroupName = name() + "_mesh"; sidre::DataStore objectDS; @@ -831,6 +833,9 @@ struct ContourTestBase objectDS.getRoot()->destroyGroupAndData(sidreGroupName); return localErrCount; +#else + return 0; +#endif } void computeNodalDistance(BlueprintStructuredMesh& bpMesh) From 1aa60eeb749381cb2b770c13965857f148c4a0ea Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sun, 18 Feb 2024 11:31:09 -0800 Subject: [PATCH 477/639] Parameterize the number of repetitions for performance testing. --- .../examples/quest_marching_cubes_example.cpp | 93 +++++++++++-------- 1 file changed, 55 insertions(+), 38 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 8188a78167..e0e582c9da 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -100,6 +100,11 @@ struct Input quest::MarchingCubesDataParallelism dataParallelism = quest::MarchingCubesDataParallelism::byPolicy; + // Distinct MarchingCubes objects count. + int objectRepCount = 1; + // Contour generation count for each MarchingCubes objects. + int contourGenCount = 1; + private: bool _verboseOutput {false}; @@ -185,6 +190,18 @@ struct Input "Enable/disable checking results against analytical solution") ->capture_default_str(); + // + // Number of repetitions to run + // + + app.add_option("--objectReps", objectRepCount) + ->description("Number of MarchingCube object repetitions to run") + ->capture_default_str(); + + app.add_option("--contourGenReps", contourGenCount) + ->description("Number of contour repetitions to run for each MarchingCubes object") + ->capture_default_str(); + app.get_formatter()->column_width(60); // could throw an exception @@ -744,44 +761,47 @@ struct ContourTestBase } } #endif -for(int j=0; j<5; ++j) -{ - // Create marching cubes algorithm object and set some parameters - quest::MarchingCubes mc(params.policy, - s_allocatorId, - params.dataParallelism); - mc.initialize(computationalMesh.asConduitNode(), "mesh"); - mc.setFunctionField(functionName()); - - axom::utilities::Timer computeTimer(false); + std::unique_ptr mcPtr; + for(int j=0; j(params.policy, + s_allocatorId, + params.dataParallelism); + auto& mc = *mcPtr; + mc.initialize(computationalMesh.asConduitNode(), "mesh"); + mc.setFunctionField(functionName()); + + axom::utilities::Timer computeTimer(false); #ifdef AXOM_USE_MPI - MPI_Barrier(MPI_COMM_WORLD); + MPI_Barrier(MPI_COMM_WORLD); #endif - computeTimer.start(); - mc.computeIsocontour(params.contourVal); - for(int i=0; i<3; ++i) { - mc.clear(); - mc.computeIsocontour(params.contourVal); - } - computeTimer.stop(); - // printTimingStats(computeTimer, name() + " contour"); + computeTimer.start(); + for(int i=0; i::allocatorID()) @@ -798,7 +818,6 @@ for(int j=0; j<5; ++j) axom::execution_space::allocatorID()); } -#if 0 // Put contour mesh in a mint object for error checking and output. std::string sidreGroupName = name() + "_mesh"; sidre::DataStore objectDS; @@ -807,6 +826,7 @@ for(int j=0; j<5; ++j) DIM, DIM == 2 ? mint::CellType::SEGMENT : mint::CellType::TRIANGLE, meshGroup); + auto& mc = *mcPtr; axom::utilities::Timer extractTimer(false); extractTimer.start(); mc.populateContourMesh(contourMesh, m_parentCellIdField, m_domainIdField); @@ -833,9 +853,6 @@ for(int j=0; j<5; ++j) objectDS.getRoot()->destroyGroupAndData(sidreGroupName); return localErrCount; -#else - return 0; -#endif } void computeNodalDistance(BlueprintStructuredMesh& bpMesh) From 17cc260df2304954d974c1bef9a385ba50def92c Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sun, 18 Feb 2024 12:56:18 -0800 Subject: [PATCH 478/639] Factor MarchingCubesSingleDomain into its own file. --- src/axom/quest/MarchingCubes.cpp | 12 +- src/axom/quest/MarchingCubes.hpp | 229 +-------------- src/axom/quest/detail/MarchingCubesImpl.hpp | 1 + .../detail/MarchingCubesSingleDomain.cpp | 102 +++++++ .../detail/MarchingCubesSingleDomain.hpp | 271 ++++++++++++++++++ 5 files changed, 385 insertions(+), 230 deletions(-) create mode 100644 src/axom/quest/detail/MarchingCubesSingleDomain.cpp create mode 100644 src/axom/quest/detail/MarchingCubesSingleDomain.hpp diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 22f3e07482..5b2e2b7a90 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -13,6 +13,7 @@ #include "axom/core/execution/execution_space.hpp" #include "axom/quest/MarchingCubes.hpp" +#include "axom/quest/detail/MarchingCubesSingleDomain.hpp" #include "axom/quest/detail/MarchingCubesImpl.hpp" #include "axom/fmt.hpp" @@ -143,21 +144,22 @@ axom::IndexType MarchingCubes::getContourNodeCount() const Domain ids are provided as a new Array instead of ArrayView because we don't store it internally. */ -axom::Array MarchingCubes::getContourFacetDomainIds( +template +axom::Array MarchingCubes::getContourFacetDomainIds( int allocatorID) const { // Put parent domain ids into a new Array. const axom::IndexType len = getContourCellCount(); - axom::Array rval( + axom::Array rval( len, len, allocatorID != axom::INVALID_ALLOCATOR_ID ? allocatorID : m_allocatorID); for(int d = 0; d < m_singles.size(); ++d) { - MarchingCubes::DomainIdType domainId = m_singles[d]->getDomainId(d); + DomainIdType domainId = static_cast(m_singles[d]->getDomainId(d)); axom::IndexType contourCellCount = m_singles[d]->getContourCellCount(); axom::IndexType offset = m_facetIndexOffsets[d]; - axom::detail::ArrayOps::fill( + axom::detail::ArrayOps::fill( rval.data(), offset, contourCellCount, @@ -257,7 +259,7 @@ void MarchingCubes::populateContourMesh( // Put parent domain ids into the mesh. auto* domainIdPtr = mesh.getFieldPtr(domainIdField, axom::mint::CELL_CENTERED); - auto tmpContourFacetDomainIds = getContourFacetDomainIds(hostAllocatorId); + auto tmpContourFacetDomainIds = getContourFacetDomainIds(hostAllocatorId); axom::copy(domainIdPtr, tmpContourFacetDomainIds.data(), m_facetCount * sizeof(DomainIdType)); diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 1f4b6c6412..ef9c6a7865 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -72,8 +72,7 @@ class MarchingCubesSingleDomain; * cubes). * * The input mesh is a Conduit::Node following the Mesh Blueprint - * convention. The mesh must be in multi-domain format. For - * single-domain, see MarchingCubesSingleDomain. + * convention. The mesh must be in multi-domain format. * * Usage example: * @beginverbatim @@ -238,10 +237,9 @@ class MarchingCubes use the id set in the constructor. The buffer size is getContourCellCount(). - - Memory space of data corresponds to allocator set in the constructor. */ - axom::Array getContourFacetDomainIds( + template + axom::Array getContourFacetDomainIds( int allocatorID = axom::INVALID_ALLOCATOR_ID) const; #if 1 @@ -296,7 +294,7 @@ class MarchingCubes May be longer than m_domainCount (the real count). */ - axom::Array> m_singles; + axom::Array> m_singles; std::string m_topologyName; std::string m_fcnFieldName; std::string m_fcnPath; @@ -334,225 +332,6 @@ class MarchingCubes void allocateOutputBuffers(); }; -/*! - * \@brief Class implementing marching cubes algorithm for a single - * domain. - * - * \sa MarchingCubes - */ -class MarchingCubesSingleDomain -{ -public: - using RuntimePolicy = axom::runtime_policy::Policy; - /*! - * \brief Constructor for applying algorithm in a single domain. - * See MarchingCubes for the multi-domain implementation. - * - * \param [in] runtimePolicy A value from RuntimePolicy. - * The simplest policy is RuntimePolicy::seq, which specifies - * running sequentially on the CPU. - * \param [in] allocatorID Data allocator ID. Choose something compatible - * with \c runtimePolicy. See \c esecution_space. - * \param [in] dataPar Choice of data-parallel implementation. - */ - MarchingCubesSingleDomain(RuntimePolicy runtimePolicy, - int allocatorID, - MarchingCubesDataParallelism dataPar); - - /*! - @brief Intitialize object to a domain. - \param [in] dom Blueprint single-domain mesh containing scalar field. - \param [in] topologyName Name of Blueprint topology to use in \a dom - \param [in] maskField Cell-based std::int32_t mask field. If provided, - cells where this field evaluates to false are skipped. - - Array data in \a dom must be accessible in the the \a - runtimePolicy environment in the constructor. It's an error if - not, e.g., using CPU memory with a GPU policy. - - Some data from \a dom may be cached by the constructor. Any - change to it without re-initialization leads to undefined - behavior. - - The mesh coordinates should be stored contiguously. See - conduit::blueprint::is_contiguous(). In the future, this - requirement may be relaxed, possibly at the cost of a - transformation and storage of the temporary contiguous layout. - */ - void initialize( const conduit::Node &dom, - const std::string &topologyName, - const std::string &maskfield); - - int spatialDimension() const { return m_ndim; } - - /*! - @brief Specify the field containing the nodal scalar function - in the input mesh. - \param [in] fcnField Name of node-based scalar function values. - */ - void setFunctionField(const std::string &fcnField) - { - m_fcnFieldName = fcnField; - m_fcnPath = "fields/" + fcnField; - SLIC_ASSERT(m_dom->has_path(m_fcnPath)); - SLIC_ASSERT(m_dom->fetch_existing(m_fcnPath + "/association").as_string() == - "vertex"); - SLIC_ASSERT(m_dom->has_path(m_fcnPath + "/values")); - m_impl->setFunctionField(fcnField); - } - - void setContourValue(double contourVal) - { - m_contourVal = contourVal; - if(m_impl) m_impl->setContourValue(m_contourVal); - } - - // Methods trivially delegated to implementation. - void markCrossings() { m_impl->markCrossings(); } - void scanCrossings() { m_impl->scanCrossings(); } - axom::IndexType getContourCellCount() - { - return m_impl->getContourCellCount(); - } - void computeContour() { m_impl->computeContour(); } - - /*! - @brief Get the Blueprint domain id specified in \a state/domain_id - if it is provided, or use the given default if not provided. - */ - MarchingCubes::DomainIdType getDomainId(MarchingCubes::DomainIdType defaultId) const; - - //!@brief Get number of cells in the generated contour mesh. - axom::IndexType getContourCellCount() const - { - SLIC_ASSERT_MSG( - m_impl, - "There is no contour mesh until you call computeIsocontour()"); - axom::IndexType cellCount = m_impl->getContourCellCount(); - return cellCount; - } - - //!@brief Get number of nodes in the generated contour mesh. - axom::IndexType getContourNodeCount() const - { - return m_ndim * getContourCellCount(); - } - - /*! - @brief Base class for implementations templated on dimension DIM - and execution space ExecSpace. - - Implementation details templated on DIM and ExecSpace cannot - be in MarchingCubesSingleDomain so should live in this class. - - This class allows m_impl to refer to any implementation used - at runtime. - */ - struct ImplBase - { - /*! - @brief Prepare internal data for operating on the given domain. - - Put in here codes that can't be in MarchingCubesSingleDomain - due to template use (DIM and ExecSpace). - */ - virtual void initialize(const conduit::Node &dom, - const std::string &topologyName, - const std::string &maskPath = {}) = 0; - - virtual void setFunctionField(const std::string &fcnFieldName) = 0; - virtual void setContourValue(double contourVal) = 0; - - void setDataParallelism(MarchingCubesDataParallelism dataPar) - { - m_dataParallelism = dataPar; - } - - //@{ - //!@name Distinct phases in contour generation. - //!@brief Compute the contour mesh. - //!@brief Mark parent cells that cross the contour value. - virtual void markCrossings() = 0; - //!@brief Scan operations to determine counts and offsets. - virtual void scanCrossings() = 0; - //!@brief Compute contour data. - virtual void computeContour() = 0; - //@} - - //@{ - //!@name Output methods - //!@brief Return number of contour mesh facets generated. - virtual axom::IndexType getContourCellCount() const = 0; - //@} - - void setOutputBuffers(axom::ArrayView &facetNodeIds, - axom::ArrayView &facetNodeCoords, - axom::ArrayView &facetParentIds, - axom::IndexType facetIndexOffset) - { - m_facetNodeIds = facetNodeIds; - m_facetNodeCoords = facetNodeCoords; - m_facetParentIds = facetParentIds; - m_facetIndexOffset = facetIndexOffset; - } - - virtual ~ImplBase() { } - - virtual void clear() = 0; - - MarchingCubesDataParallelism m_dataParallelism = - MarchingCubesDataParallelism::byPolicy; - - double m_contourVal = 0.0; - axom::ArrayView m_facetNodeIds; - axom::ArrayView m_facetNodeCoords; - axom::ArrayView m_facetParentIds; - axom::IndexType m_facetIndexOffset = -1; - }; - - ImplBase& getImpl() - { - return *m_impl; - } - -private: - RuntimePolicy m_runtimePolicy; - int m_allocatorID = axom::INVALID_ALLOCATOR_ID; - - //@brief Choice of full or partial data-parallelism, or byPolicy. - MarchingCubesDataParallelism m_dataParallelism = - MarchingCubesDataParallelism::byPolicy; - - /*! - \brief Computational mesh as a conduit::Node. - */ - const conduit::Node *m_dom; - int m_ndim; - - //!@brief Name of Blueprint topology in m_dom. - std::string m_topologyName; - - std::string m_fcnFieldName; - //!@brief Path to nodal scalar function in m_dom. - std::string m_fcnPath; - - std::string m_maskFieldName; - //!@brief Path to mask in m_dom. - std::string m_maskPath; - - double m_contourVal = 0.0; - - std::unique_ptr m_impl; - - /*! - * \brief Set the blueprint single-domain mesh. - * - * Some data from \a dom may be cached. - */ - void setDomain(const conduit::Node &dom); - -}; // class MarchingCubesSingleDomain - } // namespace quest } // namespace axom diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 6e091ea4c3..6324a0692a 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -15,6 +15,7 @@ #include "axom/slic/interface/slic_macros.hpp" #include "axom/quest/ArrayIndexer.hpp" #include "axom/quest/MeshViewUtil.hpp" +#include "axom/quest/detail/MarchingCubesSingleDomain.hpp" #include "axom/primal/geometry/Point.hpp" #include "axom/primal/constants.hpp" #include "axom/mint/execution/internal/structured_exec.hpp" diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.cpp b/src/axom/quest/detail/MarchingCubesSingleDomain.cpp new file mode 100644 index 0000000000..b06cddb0a1 --- /dev/null +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.cpp @@ -0,0 +1,102 @@ +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +#include "axom/config.hpp" + +// Implementation requires Conduit. +#ifndef AXOM_USE_CONDUIT + #error "MarchingCubes.cpp requires conduit" +#endif +#include "conduit_blueprint.hpp" + +#include "axom/core/execution/execution_space.hpp" +#include "axom/quest/detail/MarchingCubesSingleDomain.hpp" +#include "axom/quest/detail/MarchingCubesImpl.hpp" +#include "axom/fmt.hpp" + +namespace axom +{ +namespace quest +{ + +MarchingCubesSingleDomain::MarchingCubesSingleDomain( + RuntimePolicy runtimePolicy, + int allocatorID, + MarchingCubesDataParallelism dataPar) + : m_runtimePolicy(runtimePolicy) + , m_allocatorID(allocatorID) + , m_dataParallelism(dataPar) + , m_dom(nullptr) + , m_ndim(0) + , m_topologyName() + , m_fcnFieldName() + , m_fcnPath() + , m_maskFieldName() + , m_maskPath() +{ + return; +} + +void MarchingCubesSingleDomain::initialize( + const conduit::Node& dom, + const std::string& topologyName, + const std::string& maskField) +{ + m_topologyName = topologyName; + + SLIC_ASSERT_MSG( + !conduit::blueprint::mesh::is_multi_domain(dom), + "MarchingCubesSingleDomain is single-domain only. Try MarchingCubes."); + SLIC_ASSERT( + dom.fetch_existing("topologies/" + m_topologyName + "/type").as_string() == + "structured"); + + const std::string coordsetPath = "coordsets/" + + dom.fetch_existing("topologies/" + m_topologyName + "/coordset").as_string(); + SLIC_ASSERT(dom.has_path(coordsetPath)); + + if(!m_maskPath.empty()) + { + m_maskPath = maskField.empty() ? std::string() : "fields/" + maskField; + SLIC_ASSERT(dom.has_path(m_maskPath + "/values")); + } + else + { + m_maskPath.clear(); + } + + m_dom = &dom; + + m_ndim = conduit::blueprint::mesh::topology::dims( + dom.fetch_existing(axom::fmt::format("topologies/{}", m_topologyName))); + SLIC_ASSERT(m_ndim >= 2 && m_ndim <= 3); + + SLIC_ASSERT_MSG( + !conduit::blueprint::mcarray::is_interleaved( + dom.fetch_existing(coordsetPath + "/values")), + "MarchingCubes currently requires contiguous coordinates layout."); + + m_impl = + axom::quest::detail::marching_cubes::newMarchingCubesImpl(m_runtimePolicy, + m_allocatorID, + m_ndim); + + m_impl->initialize(dom, topologyName, maskField); + m_impl->setDataParallelism(m_dataParallelism); +} + +int32_t MarchingCubesSingleDomain::getDomainId( + int32_t defaultId) const +{ + int rval = defaultId; + if(m_dom->has_path("state/domain_id")) + { + rval = m_dom->fetch_existing("state/domain_id").to_int32(); + } + return rval; +} + +} // end namespace quest +} // end namespace axom diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp new file mode 100644 index 0000000000..0fc4d1f117 --- /dev/null +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp @@ -0,0 +1,271 @@ +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +/*! + * \file MarchingCubesSingleDomain.hpp + * + * \brief Consists of classes implementing marching cubes algorithm to + * compute isocontour from a scalar field in a blueprint mesh. + */ + +#ifndef AXOM_QUEST_MARCHINGCUBESSINGLEDOMAIN_H_ +#define AXOM_QUEST_MARCHINGCUBESSINGLEDOMAIN_H_ + +#include "axom/config.hpp" + +// Implementation requires Conduit. +#ifdef AXOM_USE_CONDUIT + + // Axom includes + #include "axom/core/execution/runtime_policy.hpp" + #include "axom/mint/mesh/UnstructuredMesh.hpp" + #include "axom/quest/MarchingCubes.hpp" + + // Conduit includes + #include "conduit_node.hpp" + + // C++ includes + #include + +namespace axom +{ +namespace quest +{ +namespace detail +{ +namespace marching_cubes +{ +template +class MarchingCubesImpl; +} // namespace marching_cubes +} // namespace detail + +/*! + * \@brief Class implementing marching cubes algorithm for a single + * domain. + * + * \sa MarchingCubes + */ +class MarchingCubesSingleDomain +{ +public: + using DomainIdType = int; + using RuntimePolicy = axom::runtime_policy::Policy; + /*! + * \brief Constructor for applying algorithm in a single domain. + * See MarchingCubes for the multi-domain implementation. + * + * \param [in] runtimePolicy A value from RuntimePolicy. + * The simplest policy is RuntimePolicy::seq, which specifies + * running sequentially on the CPU. + * \param [in] allocatorID Data allocator ID. Choose something compatible + * with \c runtimePolicy. See \c esecution_space. + * \param [in] dataPar Choice of data-parallel implementation. + */ + MarchingCubesSingleDomain(RuntimePolicy runtimePolicy, + int allocatorID, + MarchingCubesDataParallelism dataPar); + + ~MarchingCubesSingleDomain() {} + + /*! + @brief Intitialize object to a domain. + \param [in] dom Blueprint single-domain mesh containing scalar field. + \param [in] topologyName Name of Blueprint topology to use in \a dom + \param [in] maskField Cell-based std::int32_t mask field. If provided, + cells where this field evaluates to false are skipped. + + Array data in \a dom must be accessible in the the \a + runtimePolicy environment in the constructor. It's an error if + not, e.g., using CPU memory with a GPU policy. + + Some data from \a dom may be cached by the constructor. Any + change to it without re-initialization leads to undefined + behavior. + + The mesh coordinates should be stored contiguously. See + conduit::blueprint::is_contiguous(). In the future, this + requirement may be relaxed, possibly at the cost of a + transformation and storage of the temporary contiguous layout. + */ + void initialize( const conduit::Node &dom, + const std::string &topologyName, + const std::string &maskfield); + + int spatialDimension() const { return m_ndim; } + + /*! + @brief Specify the field containing the nodal scalar function + in the input mesh. + \param [in] fcnField Name of node-based scalar function values. + */ + void setFunctionField(const std::string &fcnField) + { + m_fcnFieldName = fcnField; + m_fcnPath = "fields/" + fcnField; + SLIC_ASSERT(m_dom->has_path(m_fcnPath)); + SLIC_ASSERT(m_dom->fetch_existing(m_fcnPath + "/association").as_string() == + "vertex"); + SLIC_ASSERT(m_dom->has_path(m_fcnPath + "/values")); + m_impl->setFunctionField(fcnField); + } + + void setContourValue(double contourVal) + { + m_contourVal = contourVal; + if(m_impl) m_impl->setContourValue(m_contourVal); + } + + // Methods trivially delegated to implementation. + void markCrossings() { m_impl->markCrossings(); } + void scanCrossings() { m_impl->scanCrossings(); } + axom::IndexType getContourCellCount() + { + return m_impl->getContourCellCount(); + } + void computeContour() { m_impl->computeContour(); } + + /*! + @brief Get the Blueprint domain id specified in \a state/domain_id + if it is provided, or use the given default if not provided. + */ + int32_t getDomainId(int32_t defaultId) const; + + //!@brief Get number of cells in the generated contour mesh. + axom::IndexType getContourCellCount() const + { + SLIC_ASSERT_MSG( + m_impl, + "There is no contour mesh until you call computeIsocontour()"); + axom::IndexType cellCount = m_impl->getContourCellCount(); + return cellCount; + } + + //!@brief Get number of nodes in the generated contour mesh. + axom::IndexType getContourNodeCount() const + { + return m_ndim * getContourCellCount(); + } + + /*! + @brief Base class for implementations templated on dimension DIM + and execution space ExecSpace. + + Implementation details templated on DIM and ExecSpace cannot + be in MarchingCubesSingleDomain so should live in this class. + + This class allows m_impl to refer to any implementation used + at runtime. + */ + struct ImplBase + { + /*! + @brief Prepare internal data for operating on the given domain. + + Put in here codes that can't be in MarchingCubesSingleDomain + due to template use (DIM and ExecSpace). + */ + virtual void initialize(const conduit::Node &dom, + const std::string &topologyName, + const std::string &maskPath = {}) = 0; + + virtual void setFunctionField(const std::string &fcnFieldName) = 0; + virtual void setContourValue(double contourVal) = 0; + + void setDataParallelism(MarchingCubesDataParallelism dataPar) + { + m_dataParallelism = dataPar; + } + + //@{ + //!@name Distinct phases in contour generation. + //!@brief Compute the contour mesh. + //!@brief Mark parent cells that cross the contour value. + virtual void markCrossings() = 0; + //!@brief Scan operations to determine counts and offsets. + virtual void scanCrossings() = 0; + //!@brief Compute contour data. + virtual void computeContour() = 0; + //@} + + //@{ + //!@name Output methods + //!@brief Return number of contour mesh facets generated. + virtual axom::IndexType getContourCellCount() const = 0; + //@} + + void setOutputBuffers(axom::ArrayView &facetNodeIds, + axom::ArrayView &facetNodeCoords, + axom::ArrayView &facetParentIds, + axom::IndexType facetIndexOffset) + { + m_facetNodeIds = facetNodeIds; + m_facetNodeCoords = facetNodeCoords; + m_facetParentIds = facetParentIds; + m_facetIndexOffset = facetIndexOffset; + } + + virtual ~ImplBase() { } + + virtual void clear() = 0; + + MarchingCubesDataParallelism m_dataParallelism = + MarchingCubesDataParallelism::byPolicy; + + double m_contourVal = 0.0; + axom::ArrayView m_facetNodeIds; + axom::ArrayView m_facetNodeCoords; + axom::ArrayView m_facetParentIds; + axom::IndexType m_facetIndexOffset = -1; + }; + + ImplBase& getImpl() + { + return *m_impl; + } + +private: + RuntimePolicy m_runtimePolicy; + int m_allocatorID = axom::INVALID_ALLOCATOR_ID; + + //@brief Choice of full or partial data-parallelism, or byPolicy. + MarchingCubesDataParallelism m_dataParallelism = + MarchingCubesDataParallelism::byPolicy; + + /*! + \brief Computational mesh as a conduit::Node. + */ + const conduit::Node *m_dom; + int m_ndim; + + //!@brief Name of Blueprint topology in m_dom. + std::string m_topologyName; + + std::string m_fcnFieldName; + //!@brief Path to nodal scalar function in m_dom. + std::string m_fcnPath; + + std::string m_maskFieldName; + //!@brief Path to mask in m_dom. + std::string m_maskPath; + + double m_contourVal = 0.0; + + std::unique_ptr m_impl; + + /*! + * \brief Set the blueprint single-domain mesh. + * + * Some data from \a dom may be cached. + */ + void setDomain(const conduit::Node &dom); + +}; // class MarchingCubesSingleDomain + +} // namespace quest +} // namespace axom + +#endif // AXOM_USE_CONDUIT +#endif // AXOM_QUEST_MARCHINGCUBES_H_ From 5d2903a63cd7c5d936c22f214778ae1bf7bc1b88 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sun, 18 Feb 2024 15:09:48 -0800 Subject: [PATCH 479/639] Rename computeContour, which was easily confused with computeIsocontour. --- src/axom/quest/CMakeLists.txt | 4 +- src/axom/quest/MarchingCubes.cpp | 79 +------------------ src/axom/quest/detail/MarchingCubesImpl.hpp | 18 ++--- .../detail/MarchingCubesSingleDomain.hpp | 4 +- .../examples/quest_marching_cubes_example.cpp | 35 ++++---- 5 files changed, 34 insertions(+), 106 deletions(-) diff --git a/src/axom/quest/CMakeLists.txt b/src/axom/quest/CMakeLists.txt index ac2468103f..7daceb2ea3 100644 --- a/src/axom/quest/CMakeLists.txt +++ b/src/axom/quest/CMakeLists.txt @@ -119,13 +119,13 @@ endif() blt_list_append( TO quest_headers - ELEMENTS MarchingCubes.hpp detail/MarchingCubesImpl.hpp + ELEMENTS MarchingCubes.hpp detail/MarchingCubesSingleDomain.hpp detail/MarchingCubesImpl.hpp IF CONDUIT_FOUND ) blt_list_append( TO quest_sources - ELEMENTS MarchingCubes.cpp + ELEMENTS MarchingCubes.cpp detail/MarchingCubesSingleDomain.cpp IF CONDUIT_FOUND ) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 5b2e2b7a90..64ad721453 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -126,7 +126,7 @@ void MarchingCubes::computeIsocontour(double contourVal) for(axom::IndexType d = 0; d < m_singles.size(); ++d) { - m_singles[d]->computeContour(); + m_singles[d]->computeFacets(); } } @@ -280,82 +280,5 @@ void MarchingCubes::allocateOutputBuffers() } } -MarchingCubesSingleDomain::MarchingCubesSingleDomain( - RuntimePolicy runtimePolicy, - int allocatorID, - MarchingCubesDataParallelism dataPar) - : m_runtimePolicy(runtimePolicy) - , m_allocatorID(allocatorID) - , m_dataParallelism(dataPar) - , m_dom(nullptr) - , m_ndim(0) - , m_topologyName() - , m_fcnFieldName() - , m_fcnPath() - , m_maskFieldName() - , m_maskPath() -{ - return; -} - -void MarchingCubesSingleDomain::initialize( - const conduit::Node& dom, - const std::string& topologyName, - const std::string& maskField) -{ - m_topologyName = topologyName; - - SLIC_ASSERT_MSG( - !conduit::blueprint::mesh::is_multi_domain(dom), - "MarchingCubesSingleDomain is single-domain only. Try MarchingCubes."); - SLIC_ASSERT( - dom.fetch_existing("topologies/" + m_topologyName + "/type").as_string() == - "structured"); - - const std::string coordsetPath = "coordsets/" + - dom.fetch_existing("topologies/" + m_topologyName + "/coordset").as_string(); - SLIC_ASSERT(dom.has_path(coordsetPath)); - - if(!m_maskPath.empty()) - { - m_maskPath = maskField.empty() ? std::string() : "fields/" + maskField; - SLIC_ASSERT(dom.has_path(m_maskPath + "/values")); - } - else - { - m_maskPath.clear(); - } - - m_dom = &dom; - - m_ndim = conduit::blueprint::mesh::topology::dims( - dom.fetch_existing(axom::fmt::format("topologies/{}", m_topologyName))); - SLIC_ASSERT(m_ndim >= 2 && m_ndim <= 3); - - SLIC_ASSERT_MSG( - !conduit::blueprint::mcarray::is_interleaved( - dom.fetch_existing(coordsetPath + "/values")), - "MarchingCubes currently requires contiguous coordinates layout."); - - m_impl = - axom::quest::detail::marching_cubes::newMarchingCubesImpl(m_runtimePolicy, - m_allocatorID, - m_ndim); - - m_impl->initialize(dom, topologyName, maskField); - m_impl->setDataParallelism(m_dataParallelism); -} - -MarchingCubes::DomainIdType MarchingCubesSingleDomain::getDomainId( - MarchingCubes::DomainIdType defaultId) const -{ - MarchingCubes::DomainIdType rval = defaultId; - if(m_dom->has_path("state/domain_id")) - { - rval = m_dom->fetch_existing("state/domain_id").as_int(); - } - return rval; -} - } // end namespace quest } // end namespace axom diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 6324a0692a..b2eb09d0be 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -568,9 +568,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase m_firstFacetIds.resize(m_crossingCount); } - void computeContour() override + void computeFacets() override { - AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::computeContour"); + AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::computeFacets"); const auto facetIncrsView = m_facetIncrs.view(); const auto firstFacetIdsView = m_firstFacetIds.view(); const auto crossingParentIdsView = m_crossingParentIds.view(); @@ -582,7 +582,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::ArrayView facetParentIdsView = m_facetParentIds; const axom::IndexType facetIndexOffset = m_facetIndexOffset; - ComputeContour_Util ccu(m_contourVal, + ComputeFacets_Util cfu(m_contourVal, m_caseIdsIndexer, m_fcnView, m_coordsViews); @@ -593,7 +593,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase auto caseId = caseIdsView.flatIndex(parentCellId); Point cornerCoords[CELL_CORNER_COUNT]; double cornerValues[CELL_CORNER_COUNT]; - ccu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); + cfu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); auto additionalFacets = facetIncrsView[crossingId]; auto firstFacetId = facetIndexOffset + firstFacetIdsView[crossingId]; @@ -611,7 +611,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase facetNodeIdsView[newFacetId][d] = newCornerId; int edge = cases_table(caseId, fId * DIM + d); - ccu.linear_interp(edge, + cfu.linear_interp(edge, cornerCoords, cornerValues, &facetNodeCoordsView(newCornerId, 0)); @@ -623,17 +623,17 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase } /*! - @brief Implementation used by MarchingCubesImpl::computeContour(). + @brief Implementation used by MarchingCubesImpl::computeFacets(). containing just the objects needed for that part, to be made available on devices. */ - struct ComputeContour_Util + struct ComputeFacets_Util { double contourVal; axom::ArrayIndexer indexer; axom::ArrayView fcnView; axom::StackArray, DIM> coordsViews; - ComputeContour_Util( + ComputeFacets_Util( double contourVal_, const axom::ArrayIndexer& parentIndexer_, const axom::ArrayView& fcnView_, @@ -811,7 +811,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase crossingPt[d] = p1[d] + w * (p2[d] - p1[d]); } } - }; // ComputeContour_Util + }; // ComputeFacets_Util // These 4 functions provide access to the look-up table // whether on host or device. Is there a more elegant way diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp index 0fc4d1f117..ecbe7b8757 100644 --- a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp @@ -125,7 +125,7 @@ class MarchingCubesSingleDomain { return m_impl->getContourCellCount(); } - void computeContour() { m_impl->computeContour(); } + void computeFacets() { m_impl->computeFacets(); } /*! @brief Get the Blueprint domain id specified in \a state/domain_id @@ -187,7 +187,7 @@ class MarchingCubesSingleDomain //!@brief Scan operations to determine counts and offsets. virtual void scanCrossings() = 0; //!@brief Compute contour data. - virtual void computeContour() = 0; + virtual void computeFacets() = 0; //@} //@{ diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index e0e582c9da..459430eb83 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -786,21 +786,7 @@ struct ContourTestBase computeTimer.stop(); // printTimingStats(computeTimer, name() + " contour"); - { - int mn, mx, sum; - getIntMinMax(mc.getContourCellCount(), mn, mx, sum); - SLIC_INFO(axom::fmt::format( - "Contour mesh has {{min:{}, max:{}, sum:{}, avg:{}}} cells", - mn, - mx, - sum, - (double)sum / numRanks)); - } - SLIC_INFO_IF( - params.isVerbose(), - axom::fmt::format("Surface mesh has locally {} cells, {} nodes.", - mc.getContourCellCount(), - mc.getContourNodeCount())); + printRunStats(mc); } // Return conduit data to host memory. @@ -855,6 +841,25 @@ struct ContourTestBase return localErrCount; } + void printRunStats(const quest::MarchingCubes& mc) + { + { + int mn, mx, sum; + getIntMinMax(mc.getContourCellCount(), mn, mx, sum); + SLIC_INFO(axom::fmt::format( + "Contour mesh has {{min:{}, max:{}, sum:{}, avg:{}}} cells", + mn, + mx, + sum, + (double)sum / numRanks)); + } + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("Contour mesh has locally {} cells, {} nodes.", + mc.getContourCellCount(), + mc.getContourNodeCount())); + } + void computeNodalDistance(BlueprintStructuredMesh& bpMesh) { SLIC_ASSERT(bpMesh.dimension() == DIM); From 379ff7b94cec7fd427793dffeea65a6e9d7d90cf Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sun, 18 Feb 2024 18:38:15 -0800 Subject: [PATCH 480/639] Clean up data sharing code by giving friend access to MarchingCubes. --- src/axom/quest/MarchingCubes.cpp | 7 +- src/axom/quest/MarchingCubes.hpp | 17 ++- src/axom/quest/detail/MarchingCubesImpl.hpp | 75 ++----------- .../detail/MarchingCubesSingleDomain.cpp | 106 ++++++++++++++++-- .../detail/MarchingCubesSingleDomain.hpp | 16 ++- 5 files changed, 134 insertions(+), 87 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 64ad721453..420b0bc2f1 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -37,6 +37,9 @@ MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, , m_maskPath() , m_facetIndexOffsets(0, 0) , m_facetCount(0) + , m_caseIdsFlat(0, 0, m_allocatorID) + , m_crossingFlags(0, 0, m_allocatorID) + , m_scannedFlags(0, 0, m_allocatorID) , m_facetNodeIds(twoZeros, m_allocatorID) , m_facetNodeCoords(twoZeros, m_allocatorID) , m_facetParentIds(0, 0, m_allocatorID) @@ -69,9 +72,7 @@ void MarchingCubes::initialize( while( m_singles.size() < newDomainCount ) { - m_singles.emplace_back(new MarchingCubesSingleDomain(m_runtimePolicy, - m_allocatorID, - m_dataParallelism)); + m_singles.emplace_back(new detail::marching_cubes::MarchingCubesSingleDomain(*this)); } for (int d = 0; d < newDomainCount; ++d) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index ef9c6a7865..56da969a93 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -37,7 +37,8 @@ namespace detail namespace marching_cubes { template -class MarchingCubesImpl; +class MarchingCubesImpl; // TODO: Delete this. +class MarchingCubesSingleDomain; } // namespace marching_cubes } // namespace detail @@ -57,7 +58,6 @@ enum class MarchingCubesDataParallelism fullParallel = 2 }; -class MarchingCubesSingleDomain; /*! * \@brief Class implementing marching cubes to compute a contour @@ -278,6 +278,9 @@ class MarchingCubes */ void clear(); + // Allow single-domain code to share common scratch space. + friend detail::marching_cubes::MarchingCubesSingleDomain; + private: RuntimePolicy m_runtimePolicy; int m_allocatorID = axom::INVALID_ALLOCATOR_ID; @@ -294,7 +297,7 @@ class MarchingCubes May be longer than m_domainCount (the real count). */ - axom::Array> m_singles; + axom::Array> m_singles; std::string m_topologyName; std::string m_fcnFieldName; std::string m_fcnPath; @@ -307,6 +310,14 @@ class MarchingCubes //!@brief Facet count over all parent domains. axom::IndexType m_facetCount = 0; + //@{ + //!@name Scratch space, shared among singles + // Memory alloc is slow on CUDA, so this optimizes space AND time. + axom::Array m_caseIdsFlat; + axom::Array m_crossingFlags; + axom::Array m_scannedFlags; + //@} + //@{ //!@name Generated contour mesh, shared with singles. /*! diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index b2eb09d0be..e5b3fbc187 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -64,7 +64,10 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase typename execution_space::loop_policy; static constexpr auto MemorySpace = execution_space::memory_space; - AXOM_HOST MarchingCubesImpl(int allocatorID) + AXOM_HOST MarchingCubesImpl(int allocatorID, + axom::Array& caseIdsFlat, + axom::Array& crossingFlags, + axom::Array& scannedFlags) : m_allocatorID(allocatorID) , m_caseIdsFlat(0, 0, m_allocatorID) , m_caseIds() @@ -73,7 +76,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase , m_crossingParentIds(0, 0, m_allocatorID) , m_facetIncrs(0, 0, m_allocatorID) , m_firstFacetIds(0, 0, m_allocatorID) - { } + { + SLIC_ASSERT(caseIdsFlat.getAllocatorID() == allocatorID); + SLIC_ASSERT(crossingFlags.getAllocatorID() == allocatorID); + SLIC_ASSERT(scannedFlags.getAllocatorID() == allocatorID); + } /*! @brief Initialize data to a blueprint domain. @@ -964,70 +971,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase } }; -/*! - @brief Allocate a MarchingCubesImpl object, template-specialized - for caller-specified runtime policy and physical dimension. -*/ -static std::unique_ptr -newMarchingCubesImpl(MarchingCubes::RuntimePolicy runtimePolicy, - int allocatorID, - int dim) -{ - using ImplBase = axom::quest::MarchingCubesSingleDomain::ImplBase; - - SLIC_ASSERT(dim >= 2 && dim <= 3); - std::unique_ptr impl; - if(runtimePolicy == MarchingCubes::RuntimePolicy::seq) - { - impl = dim == 2 - ? std::unique_ptr( - new MarchingCubesImpl<2, axom::SEQ_EXEC, axom::SEQ_EXEC>(allocatorID)) - : std::unique_ptr( - new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>(allocatorID)); - } -#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP - else if(runtimePolicy == MarchingCubes::RuntimePolicy::omp) - { - impl = dim == 2 - ? std::unique_ptr( - new MarchingCubesImpl<2, axom::OMP_EXEC, axom::SEQ_EXEC>(allocatorID)) - : std::unique_ptr( - new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>(allocatorID)); - } -#endif -#ifdef AXOM_RUNTIME_POLICY_USE_CUDA - else if(runtimePolicy == MarchingCubes::RuntimePolicy::cuda) - { - impl = dim == 2 - ? std::unique_ptr( - new MarchingCubesImpl<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>( - allocatorID)) - : std::unique_ptr( - new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>( - allocatorID)); - } -#endif -#ifdef AXOM_RUNTIME_POLICY_USE_HIP - else if(runtimePolicy == MarchingCubes::RuntimePolicy::hip) - { - impl = dim == 2 - ? std::unique_ptr( - new MarchingCubesImpl<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>( - allocatorID)) - : std::unique_ptr( - new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>( - allocatorID)); - } -#endif - else - { - SLIC_ERROR(axom::fmt::format( - "MarchingCubesSingleDomain has no implementation for runtime policy {}", - runtimePolicy)); - } - return impl; -} - } // end namespace marching_cubes } // end namespace detail } // end namespace quest diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.cpp b/src/axom/quest/detail/MarchingCubesSingleDomain.cpp index b06cddb0a1..00544dcc46 100644 --- a/src/axom/quest/detail/MarchingCubesSingleDomain.cpp +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.cpp @@ -20,14 +20,17 @@ namespace axom { namespace quest { +namespace detail +{ +namespace marching_cubes +{ MarchingCubesSingleDomain::MarchingCubesSingleDomain( - RuntimePolicy runtimePolicy, - int allocatorID, - MarchingCubesDataParallelism dataPar) - : m_runtimePolicy(runtimePolicy) - , m_allocatorID(allocatorID) - , m_dataParallelism(dataPar) + MarchingCubes& mc) + : m_mc(mc) + , m_runtimePolicy(mc.m_runtimePolicy) + , m_allocatorID(mc.m_allocatorID) + , m_dataParallelism(mc.m_dataParallelism) , m_dom(nullptr) , m_ndim(0) , m_topologyName() @@ -78,15 +81,96 @@ void MarchingCubesSingleDomain::initialize( dom.fetch_existing(coordsetPath + "/values")), "MarchingCubes currently requires contiguous coordinates layout."); - m_impl = - axom::quest::detail::marching_cubes::newMarchingCubesImpl(m_runtimePolicy, - m_allocatorID, - m_ndim); + m_impl = newMarchingCubesImpl(); m_impl->initialize(dom, topologyName, maskField); m_impl->setDataParallelism(m_dataParallelism); } +/*! + @brief Allocate a MarchingCubesImpl object, template-specialized + for caller-specified runtime policy and physical dimension. +*/ +std::unique_ptr +MarchingCubesSingleDomain::newMarchingCubesImpl() +{ + SLIC_ASSERT(m_ndim >= 2 && m_ndim <= 3); + std::unique_ptr impl; + if(m_runtimePolicy == MarchingCubes::RuntimePolicy::seq) + { + impl = m_ndim == 2 + ? std::unique_ptr( + new MarchingCubesImpl<2, axom::SEQ_EXEC, axom::SEQ_EXEC>(m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)) + : std::unique_ptr( + new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>(m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)); + } +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP + else if(m_runtimePolicy == MarchingCubes::RuntimePolicy::omp) + { + impl = m_ndim == 2 + ? std::unique_ptr( + new MarchingCubesImpl<2, axom::OMP_EXEC, axom::SEQ_EXEC>(m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)) + : std::unique_ptr( + new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>(m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)); + } +#endif +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + else if(m_runtimePolicy == MarchingCubes::RuntimePolicy::cuda) + { + impl = m_ndim == 2 + ? std::unique_ptr( + new MarchingCubesImpl<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>( + m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)) + : std::unique_ptr( + new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>( + m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)); + } +#endif +#ifdef AXOM_RUNTIME_POLICY_USE_HIP + else if(m_runtimePolicy == MarchingCubes::RuntimePolicy::hip) + { + impl = m_ndim == 2 + ? std::unique_ptr( + new MarchingCubesImpl<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>( + m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)) + : std::unique_ptr( + new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>( + m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)); + } +#endif + else + { + SLIC_ERROR(axom::fmt::format( + "MarchingCubesSingleDomain has no implementation for runtime policy {}", + m_runtimePolicy)); + } + return impl; +} + int32_t MarchingCubesSingleDomain::getDomainId( int32_t defaultId) const { @@ -100,3 +184,5 @@ int32_t MarchingCubesSingleDomain::getDomainId( } // end namespace quest } // end namespace axom +} // end namespace quest +} // end namespace axom diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp index ecbe7b8757..1958339a0a 100644 --- a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp @@ -39,8 +39,6 @@ namespace marching_cubes { template class MarchingCubesImpl; -} // namespace marching_cubes -} // namespace detail /*! * \@brief Class implementing marching cubes algorithm for a single @@ -64,9 +62,7 @@ class MarchingCubesSingleDomain * with \c runtimePolicy. See \c esecution_space. * \param [in] dataPar Choice of data-parallel implementation. */ - MarchingCubesSingleDomain(RuntimePolicy runtimePolicy, - int allocatorID, - MarchingCubesDataParallelism dataPar); + MarchingCubesSingleDomain(MarchingCubes& mc); ~MarchingCubesSingleDomain() {} @@ -227,6 +223,9 @@ class MarchingCubesSingleDomain } private: + //!@brief Multi-somain implementation this object is under. + MarchingCubes& m_mc; + RuntimePolicy m_runtimePolicy; int m_allocatorID = axom::INVALID_ALLOCATOR_ID; @@ -262,8 +261,15 @@ class MarchingCubesSingleDomain */ void setDomain(const conduit::Node &dom); + /*! + @brief Allocate MarchingCubesImpl object + */ + std::unique_ptr newMarchingCubesImpl(); + }; // class MarchingCubesSingleDomain +} // end namespace marching_cubes +} // end namespace detail } // namespace quest } // namespace axom From 0076384afe04b3a164f79a8ba9edf9138d561086 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sun, 18 Feb 2024 20:49:07 -0800 Subject: [PATCH 481/639] More scratch data sharing to improve CUDA performance. Introduce smaller domain-specific m_crossingCases to let us share the much bigger m_caseIdsFlat array. --- src/axom/quest/MarchingCubes.hpp | 4 +- src/axom/quest/detail/MarchingCubesImpl.hpp | 52 ++++++++++++++------- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 56da969a93..18eee70db7 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -127,7 +127,7 @@ class MarchingCubes environment. It's an error if not, e.g., using CPU memory with a GPU policy. - Some data from \a bpMesh may be cached by the constructor. + Some metadata from \a bpMesh may be cached by the constructor. Any change to it after the constructor leads to undefined behavior. The mesh coordinates should be contiguous. See @@ -311,7 +311,7 @@ class MarchingCubes axom::IndexType m_facetCount = 0; //@{ - //!@name Scratch space, shared among singles + //!@name Scratch space from m_allocatorID, shared among singles // Memory alloc is slow on CUDA, so this optimizes space AND time. axom::Array m_caseIdsFlat; axom::Array m_crossingFlags; diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index e5b3fbc187..1540da79ea 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -69,10 +69,12 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::Array& crossingFlags, axom::Array& scannedFlags) : m_allocatorID(allocatorID) - , m_caseIdsFlat(0, 0, m_allocatorID) , m_caseIds() - , m_crossingFlags(0, 0, m_allocatorID) - , m_scannedFlags(0, 0, m_allocatorID) + , m_caseIdsIndexer() + , m_caseIdsFlat(caseIdsFlat) + , m_crossingCases(0, 0, m_allocatorID) + , m_crossingFlags(crossingFlags) + , m_scannedFlags(scannedFlags) , m_crossingParentIds(0, 0, m_allocatorID) , m_facetIncrs(0, 0, m_allocatorID) , m_firstFacetIds(0, 0, m_allocatorID) @@ -382,6 +384,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::allocateIndexLists"); m_crossingParentIds.resize(m_crossingCount, 0); + m_crossingCases.resize(m_crossingCount, 0); m_facetIncrs.resize(m_crossingCount, 0); m_firstFacetIds.resize(1 + m_crossingCount, 0); } @@ -432,11 +435,12 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase sizeof(axom::IndexType)); // - // Generate crossing-cells index list and corresponding facet counts. + // Generate crossing info in compact arrays. // allocateIndexLists(); auto scannedFlagsView = m_scannedFlags.view(); auto crossingParentIdsView = m_crossingParentIds.view(); + auto crossingCasesView = m_crossingCases.view(); auto facetIncrsView = m_facetIncrs.view(); AXOM_PERF_MARK_SECTION( @@ -446,8 +450,10 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase if(scannedFlagsView[parentCellId] != scannedFlagsView[1 + parentCellId]) { auto crossingId = scannedFlagsView[parentCellId]; - auto facetIncr = num_contour_cells(caseIdsView.flatIndex(parentCellId)); + auto caseId = caseIdsView.flatIndex(parentCellId); + auto facetIncr = num_contour_cells(caseId); crossingParentIdsView[crossingId] = parentCellId; + crossingCasesView[crossingId] = caseId; facetIncrsView[crossingId] = facetIncr; } }; @@ -507,11 +513,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase // // Allocate space for crossing info // - m_crossingParentIds.resize(m_crossingCount); - m_facetIncrs.resize(m_crossingCount); - m_firstFacetIds.resize(1 + m_crossingCount); - + allocateIndexLists(); auto crossingParentIdsView = m_crossingParentIds.view(); + auto crossingCasesView = m_crossingCases.view(); auto facetIncrsView = m_facetIncrs.view(); axom::IndexType* crossingId = axom::allocate( @@ -524,8 +528,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase auto ccc = num_contour_cells(caseId); if(ccc != 0) { - facetIncrsView[*crossingId] = ccc; crossingParentIdsView[*crossingId] = n; + crossingCasesView[*crossingId] = caseId; + facetIncrsView[*crossingId] = ccc; ++(*crossingId); } }; @@ -581,6 +586,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase const auto facetIncrsView = m_facetIncrs.view(); const auto firstFacetIdsView = m_firstFacetIds.view(); const auto crossingParentIdsView = m_crossingParentIds.view(); + const auto crossingCasesView = m_crossingCases.view(); const auto caseIdsView = m_caseIds; // Internal contour mesh data to populate @@ -597,7 +603,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase auto gen_for_parent_cell = AXOM_LAMBDA(axom::IndexType crossingId) { auto parentCellId = crossingParentIdsView[crossingId]; - auto caseId = caseIdsView.flatIndex(parentCellId); + auto caseId = crossingCasesView[crossingId]; + // auto caseId = caseIdsView.flatIndex(parentCellId); Point cornerCoords[CELL_CORNER_COUNT]; double cornerValues[CELL_CORNER_COUNT]; cfu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); @@ -920,11 +927,16 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::ArrayView m_fcnView; axom::ArrayView m_maskView; - //!@brief Crossing case for each computational mesh cell. - axom::Array m_caseIdsFlat; + /*! + @brief Crossing case for each computational mesh cell. + + This is a multidim view into 1D data from m_caseIdsFlat, + set up with help from m_caseIdsIndexer. + */ axom::ArrayView m_caseIds; /*! - @brief Multi-dim indexer to control m_caseIdsFlat data ordering. + @brief Multidim indexer to handle data ordering in + m_caseIdsFlat. We want caseIds ordering to match m_fcnView, but Array only supports column-major ordering currently. To control @@ -933,11 +945,19 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase */ axom::ArrayIndexer m_caseIdsIndexer; + // Array references refer to shared Arrays in MarchingCubes. + + //!@brief Crossing case for each computational mesh cell. + axom::Array& m_caseIdsFlat; + + //!@brief Case ids for found crossings. + axom::Array m_crossingCases; + //!@brief Whether a parent cell crosses the contour. - axom::Array m_crossingFlags; + axom::Array& m_crossingFlags; //!@brief Prefix sum of m_crossingFlags - axom::Array m_scannedFlags; + axom::Array& m_scannedFlags; //!@brief Number of parent cells crossing the contour surface. axom::IndexType m_crossingCount = 0; From 7f7acaf5b53c179e940d30f7cb2eb5d1c82a8491 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sun, 18 Feb 2024 21:43:22 -0800 Subject: [PATCH 482/639] Autoformat. --- src/axom/quest/MarchingCubes.cpp | 41 ++++---- src/axom/quest/MarchingCubes.hpp | 3 +- src/axom/quest/detail/MarchingCubesImpl.hpp | 58 +++++------- .../detail/MarchingCubesSingleDomain.cpp | 94 +++++++++---------- .../detail/MarchingCubesSingleDomain.hpp | 17 ++-- .../examples/quest_marching_cubes_example.cpp | 28 +++--- 6 files changed, 120 insertions(+), 121 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 420b0bc2f1..906d0840a6 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -21,7 +21,7 @@ namespace axom { namespace quest { -const axom::StackArray twoZeros{0, 0}; +const axom::StackArray twoZeros {0, 0}; MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, int allocatorID, @@ -43,14 +43,12 @@ MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, , m_facetNodeIds(twoZeros, m_allocatorID) , m_facetNodeCoords(twoZeros, m_allocatorID) , m_facetParentIds(0, 0, m_allocatorID) -{ -} +{ } // Set the object up for a blueprint mesh state. -void MarchingCubes::initialize( - const conduit::Node& bpMesh, - const std::string& topologyName, - const std::string& maskField) +void MarchingCubes::initialize(const conduit::Node& bpMesh, + const std::string& topologyName, + const std::string& maskField) { SLIC_ASSERT_MSG( conduit::blueprint::mesh::is_multi_domain(bpMesh), @@ -70,12 +68,13 @@ void MarchingCubes::initialize( */ auto newDomainCount = conduit::blueprint::mesh::number_of_domains(bpMesh); - while( m_singles.size() < newDomainCount ) + while(m_singles.size() < newDomainCount) { - m_singles.emplace_back(new detail::marching_cubes::MarchingCubesSingleDomain(*this)); + m_singles.emplace_back( + new detail::marching_cubes::MarchingCubesSingleDomain(*this)); } - for (int d = 0; d < newDomainCount; ++d) + for(int d = 0; d < newDomainCount; ++d) { const auto& dom = bpMesh.child(d); m_singles[d]->initialize(dom, m_topologyName, maskField); @@ -145,9 +144,8 @@ axom::IndexType MarchingCubes::getContourNodeCount() const Domain ids are provided as a new Array instead of ArrayView because we don't store it internally. */ -template -axom::Array MarchingCubes::getContourFacetDomainIds( - int allocatorID) const +template +axom::Array MarchingCubes::getContourFacetDomainIds(int allocatorID) const { // Put parent domain ids into a new Array. const axom::IndexType len = getContourCellCount(); @@ -157,7 +155,8 @@ axom::Array MarchingCubes::getContourFacetDomainIds( allocatorID != axom::INVALID_ALLOCATOR_ID ? allocatorID : m_allocatorID); for(int d = 0; d < m_singles.size(); ++d) { - DomainIdType domainId = static_cast(m_singles[d]->getDomainId(d)); + DomainIdType domainId = + static_cast(m_singles[d]->getDomainId(d)); axom::IndexType contourCellCount = m_singles[d]->getContourCellCount(); axom::IndexType offset = m_facetIndexOffsets[d]; axom::detail::ArrayOps::fill( @@ -260,7 +259,8 @@ void MarchingCubes::populateContourMesh( // Put parent domain ids into the mesh. auto* domainIdPtr = mesh.getFieldPtr(domainIdField, axom::mint::CELL_CENTERED); - auto tmpContourFacetDomainIds = getContourFacetDomainIds(hostAllocatorId); + auto tmpContourFacetDomainIds = + getContourFacetDomainIds(hostAllocatorId); axom::copy(domainIdPtr, tmpContourFacetDomainIds.data(), m_facetCount * sizeof(DomainIdType)); @@ -275,9 +275,14 @@ void MarchingCubes::allocateOutputBuffers() { int ndim = m_singles[0]->spatialDimension(); const auto nodeCount = m_facetCount * ndim; - m_facetNodeIds.resize(axom::StackArray{m_facetCount, ndim}, 0); - m_facetNodeCoords.resize(axom::StackArray{nodeCount, ndim}, 0.0); - m_facetParentIds.resize(axom::StackArray{m_facetCount}, 0); + m_facetNodeIds.resize( + axom::StackArray {m_facetCount, ndim}, + 0); + m_facetNodeCoords.resize( + axom::StackArray {nodeCount, ndim}, + 0.0); + m_facetParentIds.resize(axom::StackArray {m_facetCount}, + 0); } } diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 18eee70db7..fd9e90e1f9 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -58,7 +58,6 @@ enum class MarchingCubesDataParallelism fullParallel = 2 }; - /*! * \@brief Class implementing marching cubes to compute a contour * mesh from a scalar function on an input mesh. @@ -238,7 +237,7 @@ class MarchingCubes The buffer size is getContourCellCount(). */ - template + template axom::Array getContourFacetDomainIds( int allocatorID = axom::INVALID_ALLOCATOR_ID) const; diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 1540da79ea..284c3578c4 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -52,12 +52,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase using LoopPolicy = typename execution_space::loop_policy; using ReducePolicy = typename execution_space::reduce_policy; #if defined(AXOM_USE_RAJA) - // Intel oneAPI compiler segfaults with OpenMP RAJA scan + // Intel oneAPI compiler segfaults with OpenMP RAJA scan #ifdef __INTEL_LLVM_COMPILER - using ScanPolicy = - typename axom::execution_space::loop_policy; + using ScanPolicy = typename axom::execution_space::loop_policy; #else - using ScanPolicy = typename axom::execution_space::loop_policy; + using ScanPolicy = typename axom::execution_space::loop_policy; #endif #endif using SequentialLoopPolicy = @@ -368,15 +367,13 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase (m_dataParallelism == axom::quest::MarchingCubesDataParallelism::byPolicy && autoPolicy == MarchingCubesDataParallelism::hybridParallel)) { - AXOM_PERF_MARK_SECTION( - "MarchingCubesImpl::scanCrossings:hybridParallel", - scanCrossings_hybridParallel();); + AXOM_PERF_MARK_SECTION("MarchingCubesImpl::scanCrossings:hybridParallel", + scanCrossings_hybridParallel();); } else { - AXOM_PERF_MARK_SECTION( - "MarchingCubesImpl::scanCrossings:fullParallel", - scanCrossings_fullParallel();); + AXOM_PERF_MARK_SECTION("MarchingCubesImpl::scanCrossings:fullParallel", + scanCrossings_fullParallel();); } } @@ -412,7 +409,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase auto numContourCells = num_contour_cells(caseIdsView.flatIndex(parentCellId)); crossingFlagsView[parentCellId] = bool(numContourCells); - });); + });); m_scannedFlags.fill(0, 1, 0); AXOM_PERF_MARK_SECTION( @@ -423,12 +420,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase RAJA::make_span(m_scannedFlags.data() + 1, parentCellCount), RAJA::operators::plus {}); #else - for(axom::IndexType n = 0; n < parentCellCount; ++n) - { + for(axom::IndexType n = 0; n < parentCellCount; ++n) { m_scannedFlags[n + 1] = m_scannedFlags[n] + m_crossingFlags[n]; } #endif - ); + ); axom::copy(&m_crossingCount, m_scannedFlags.data() + m_scannedFlags.size() - 1, @@ -445,18 +441,18 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_PERF_MARK_SECTION( "MarchingCubesImpl::scanCrossings:set_incrs", - auto loopBody = AXOM_LAMBDA(axom::IndexType parentCellId) - { - if(scannedFlagsView[parentCellId] != scannedFlagsView[1 + parentCellId]) - { - auto crossingId = scannedFlagsView[parentCellId]; - auto caseId = caseIdsView.flatIndex(parentCellId); - auto facetIncr = num_contour_cells(caseId); - crossingParentIdsView[crossingId] = parentCellId; - crossingCasesView[crossingId] = caseId; - facetIncrsView[crossingId] = facetIncr; - } - }; + auto loopBody = + AXOM_LAMBDA(axom::IndexType parentCellId) { + if(scannedFlagsView[parentCellId] != scannedFlagsView[1 + parentCellId]) + { + auto crossingId = scannedFlagsView[parentCellId]; + auto caseId = caseIdsView.flatIndex(parentCellId); + auto facetIncr = num_contour_cells(caseId); + crossingParentIdsView[crossingId] = parentCellId; + crossingCasesView[crossingId] = caseId; + facetIncrsView[crossingId] = facetIncr; + } + }; axom::for_all(0, parentCellCount, loopBody);); // @@ -473,12 +469,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase RAJA::make_span(m_firstFacetIds.data() + 1, m_crossingCount), RAJA::operators::plus {}); #else - for(axom::IndexType n = 0; n < parentCellCount; ++n) - { + for(axom::IndexType n = 0; n < parentCellCount; ++n) { m_firstFacetIds[n + 1] = m_firstFacetIds[n] + m_facetIncrs[n]; } #endif - ); + ); axom::copy(&m_facetCount, m_firstFacetIds.data() + m_firstFacetIds.size() - 1, @@ -595,10 +590,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::ArrayView facetParentIdsView = m_facetParentIds; const axom::IndexType facetIndexOffset = m_facetIndexOffset; - ComputeFacets_Util cfu(m_contourVal, - m_caseIdsIndexer, - m_fcnView, - m_coordsViews); + ComputeFacets_Util cfu(m_contourVal, m_caseIdsIndexer, m_fcnView, m_coordsViews); auto gen_for_parent_cell = AXOM_LAMBDA(axom::IndexType crossingId) { diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.cpp b/src/axom/quest/detail/MarchingCubesSingleDomain.cpp index 00544dcc46..55758ac743 100644 --- a/src/axom/quest/detail/MarchingCubesSingleDomain.cpp +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.cpp @@ -24,9 +24,7 @@ namespace detail { namespace marching_cubes { - -MarchingCubesSingleDomain::MarchingCubesSingleDomain( - MarchingCubes& mc) +MarchingCubesSingleDomain::MarchingCubesSingleDomain(MarchingCubes& mc) : m_mc(mc) , m_runtimePolicy(mc.m_runtimePolicy) , m_allocatorID(mc.m_allocatorID) @@ -42,10 +40,9 @@ MarchingCubesSingleDomain::MarchingCubesSingleDomain( return; } -void MarchingCubesSingleDomain::initialize( - const conduit::Node& dom, - const std::string& topologyName, - const std::string& maskField) +void MarchingCubesSingleDomain::initialize(const conduit::Node& dom, + const std::string& topologyName, + const std::string& maskField) { m_topologyName = topologyName; @@ -100,30 +97,34 @@ MarchingCubesSingleDomain::newMarchingCubesImpl() { impl = m_ndim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::SEQ_EXEC, axom::SEQ_EXEC>(m_mc.m_allocatorID, - m_mc.m_caseIdsFlat, - m_mc.m_crossingFlags, - m_mc.m_scannedFlags)) + new MarchingCubesImpl<2, axom::SEQ_EXEC, axom::SEQ_EXEC>( + m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)) : std::unique_ptr( - new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>(m_mc.m_allocatorID, - m_mc.m_caseIdsFlat, - m_mc.m_crossingFlags, - m_mc.m_scannedFlags)); + new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>( + m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)); } #ifdef AXOM_RUNTIME_POLICY_USE_OPENMP else if(m_runtimePolicy == MarchingCubes::RuntimePolicy::omp) { impl = m_ndim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::OMP_EXEC, axom::SEQ_EXEC>(m_mc.m_allocatorID, - m_mc.m_caseIdsFlat, - m_mc.m_crossingFlags, - m_mc.m_scannedFlags)) + new MarchingCubesImpl<2, axom::OMP_EXEC, axom::SEQ_EXEC>( + m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)) : std::unique_ptr( - new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>(m_mc.m_allocatorID, - m_mc.m_caseIdsFlat, - m_mc.m_crossingFlags, - m_mc.m_scannedFlags)); + new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>( + m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_CUDA @@ -131,17 +132,17 @@ MarchingCubesSingleDomain::newMarchingCubesImpl() { impl = m_ndim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>( - m_mc.m_allocatorID, - m_mc.m_caseIdsFlat, - m_mc.m_crossingFlags, - m_mc.m_scannedFlags)) + new MarchingCubesImpl<2, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>( + m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)) : std::unique_ptr( - new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>( - m_mc.m_allocatorID, - m_mc.m_caseIdsFlat, - m_mc.m_crossingFlags, - m_mc.m_scannedFlags)); + new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>( + m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_HIP @@ -149,17 +150,17 @@ MarchingCubesSingleDomain::newMarchingCubesImpl() { impl = m_ndim == 2 ? std::unique_ptr( - new MarchingCubesImpl<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>( - m_mc.m_allocatorID, - m_mc.m_caseIdsFlat, - m_mc.m_crossingFlags, - m_mc.m_scannedFlags)) + new MarchingCubesImpl<2, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>( + m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)) : std::unique_ptr( - new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>( - m_mc.m_allocatorID, - m_mc.m_caseIdsFlat, - m_mc.m_crossingFlags, - m_mc.m_scannedFlags)); + new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>( + m_mc.m_allocatorID, + m_mc.m_caseIdsFlat, + m_mc.m_crossingFlags, + m_mc.m_scannedFlags)); } #endif else @@ -171,8 +172,7 @@ MarchingCubesSingleDomain::newMarchingCubesImpl() return impl; } -int32_t MarchingCubesSingleDomain::getDomainId( - int32_t defaultId) const +int32_t MarchingCubesSingleDomain::getDomainId(int32_t defaultId) const { int rval = defaultId; if(m_dom->has_path("state/domain_id")) @@ -182,7 +182,7 @@ int32_t MarchingCubesSingleDomain::getDomainId( return rval; } -} // end namespace quest -} // end namespace axom +} // namespace marching_cubes +} // namespace detail } // end namespace quest } // end namespace axom diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp index 1958339a0a..a61526d5d5 100644 --- a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp @@ -62,9 +62,9 @@ class MarchingCubesSingleDomain * with \c runtimePolicy. See \c esecution_space. * \param [in] dataPar Choice of data-parallel implementation. */ - MarchingCubesSingleDomain(MarchingCubes& mc); + MarchingCubesSingleDomain(MarchingCubes &mc); - ~MarchingCubesSingleDomain() {} + ~MarchingCubesSingleDomain() { } /*! @brief Intitialize object to a domain. @@ -86,9 +86,9 @@ class MarchingCubesSingleDomain requirement may be relaxed, possibly at the cost of a transformation and storage of the temporary contiguous layout. */ - void initialize( const conduit::Node &dom, - const std::string &topologyName, - const std::string &maskfield); + void initialize(const conduit::Node &dom, + const std::string &topologyName, + const std::string &maskfield); int spatialDimension() const { return m_ndim; } @@ -217,14 +217,11 @@ class MarchingCubesSingleDomain axom::IndexType m_facetIndexOffset = -1; }; - ImplBase& getImpl() - { - return *m_impl; - } + ImplBase &getImpl() { return *m_impl; } private: //!@brief Multi-somain implementation this object is under. - MarchingCubes& m_mc; + MarchingCubes &m_mc; RuntimePolicy m_runtimePolicy; int m_allocatorID = axom::INVALID_ALLOCATOR_ID; diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 459430eb83..0a024afad8 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -199,7 +199,8 @@ struct Input ->capture_default_str(); app.add_option("--contourGenReps", contourGenCount) - ->description("Number of contour repetitions to run for each MarchingCubes object") + ->description( + "Number of contour repetitions to run for each MarchingCubes object") ->capture_default_str(); app.get_formatter()->column_width(60); @@ -532,7 +533,7 @@ struct BlueprintStructuredMesh template void moveMeshDataToNewMemorySpace(const std::string& path, int allocId) { - AXOM_PERF_MARK_FUNCTION("moveMeshDataToNewMemorySpace"); // For reference + AXOM_PERF_MARK_FUNCTION("moveMeshDataToNewMemorySpace"); // For reference for(auto& dom : _mdMesh.children()) { moveConduitDataToNewMemorySpace(dom, path, allocId); @@ -762,7 +763,7 @@ struct ContourTestBase } #endif std::unique_ptr mcPtr; - for(int j=0; j(params.policy, @@ -777,9 +778,14 @@ struct ContourTestBase MPI_Barrier(MPI_COMM_WORLD); #endif computeTimer.start(); - for(int i=0; i Date: Mon, 19 Feb 2024 10:46:59 -0800 Subject: [PATCH 483/639] Move translation of data parallelism byPolicy out of the way. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 38 +++++++++++-------- .../detail/MarchingCubesSingleDomain.hpp | 5 +-- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 284c3578c4..2dcfcaa4a6 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -116,6 +116,27 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase } } + AXOM_HOST void setDataParallelism(MarchingCubesDataParallelism dataPar) override + { + constexpr MarchingCubesDataParallelism autoPolicy = + std::is_same::value + ? MarchingCubesDataParallelism::hybridParallel + : +#if defined(AXOM_USE_OPENMP) && defined(AXOM_USE_RAJA) + std::is_same::value + ? MarchingCubesDataParallelism::hybridParallel + : +#endif + MarchingCubesDataParallelism::fullParallel; + + m_dataParallelism = dataPar; + + if(m_dataParallelism == axom::quest::MarchingCubesDataParallelism::byPolicy) + { + m_dataParallelism = autoPolicy; + } + } + /*! @brief Set the scale field name @param fcnFieldName Name of nodal function is in dom @@ -351,26 +372,13 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase void scanCrossings() override { AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::scanCrossings"); - constexpr MarchingCubesDataParallelism autoPolicy = - std::is_same::value - ? MarchingCubesDataParallelism::hybridParallel - : -#if defined(AXOM_USE_OPENMP) && defined(AXOM_USE_RAJA) - std::is_same::value - ? MarchingCubesDataParallelism::hybridParallel - : -#endif - MarchingCubesDataParallelism::fullParallel; - if(m_dataParallelism == - axom::quest::MarchingCubesDataParallelism::hybridParallel || - (m_dataParallelism == axom::quest::MarchingCubesDataParallelism::byPolicy && - autoPolicy == MarchingCubesDataParallelism::hybridParallel)) + axom::quest::MarchingCubesDataParallelism::hybridParallel) { AXOM_PERF_MARK_SECTION("MarchingCubesImpl::scanCrossings:hybridParallel", scanCrossings_hybridParallel();); } - else + else if(m_dataParallelism == axom::quest::MarchingCubesDataParallelism::fullParallel) { AXOM_PERF_MARK_SECTION("MarchingCubesImpl::scanCrossings:fullParallel", scanCrossings_fullParallel();); diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp index a61526d5d5..a1fb0f388f 100644 --- a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp @@ -170,10 +170,7 @@ class MarchingCubesSingleDomain virtual void setFunctionField(const std::string &fcnFieldName) = 0; virtual void setContourValue(double contourVal) = 0; - void setDataParallelism(MarchingCubesDataParallelism dataPar) - { - m_dataParallelism = dataPar; - } + virtual void setDataParallelism(MarchingCubesDataParallelism dataPar) = 0; //@{ //!@name Distinct phases in contour generation. From 3476d612eabae9a7da677122c5c8000ab947f85f Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 19 Feb 2024 12:17:57 -0800 Subject: [PATCH 484/639] Use shared buffer for facetIncrs. --- src/axom/quest/MarchingCubes.cpp | 1 + src/axom/quest/MarchingCubes.hpp | 3 ++- src/axom/quest/detail/MarchingCubesImpl.hpp | 21 ++++++++-------- .../detail/MarchingCubesSingleDomain.cpp | 24 ++++++++++++------- 4 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 906d0840a6..ac30955467 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -40,6 +40,7 @@ MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, , m_caseIdsFlat(0, 0, m_allocatorID) , m_crossingFlags(0, 0, m_allocatorID) , m_scannedFlags(0, 0, m_allocatorID) + , m_facetIncrs(0, 0, m_allocatorID) , m_facetNodeIds(twoZeros, m_allocatorID) , m_facetNodeCoords(twoZeros, m_allocatorID) , m_facetParentIds(0, 0, m_allocatorID) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index fd9e90e1f9..3c07683fe7 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -313,8 +313,9 @@ class MarchingCubes //!@name Scratch space from m_allocatorID, shared among singles // Memory alloc is slow on CUDA, so this optimizes space AND time. axom::Array m_caseIdsFlat; - axom::Array m_crossingFlags; + axom::Array m_crossingFlags; axom::Array m_scannedFlags; + axom::Array m_facetIncrs; //@} //@{ diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 2dcfcaa4a6..a53022ae5d 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -65,8 +65,9 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase AXOM_HOST MarchingCubesImpl(int allocatorID, axom::Array& caseIdsFlat, - axom::Array& crossingFlags, - axom::Array& scannedFlags) + axom::Array& crossingFlags, + axom::Array& scannedFlags, + axom::Array& facetIncrs) : m_allocatorID(allocatorID) , m_caseIds() , m_caseIdsIndexer() @@ -75,7 +76,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase , m_crossingFlags(crossingFlags) , m_scannedFlags(scannedFlags) , m_crossingParentIds(0, 0, m_allocatorID) - , m_facetIncrs(0, 0, m_allocatorID) + , m_facetIncrs(facetIncrs) // (0, 0, m_allocatorID) , m_firstFacetIds(0, 0, m_allocatorID) { SLIC_ASSERT(caseIdsFlat.getAllocatorID() == allocatorID); @@ -102,6 +103,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { // Time this due to potentially slow memory allocation AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::initialize"); + clear(); SLIC_ASSERT(conduit::blueprint::mesh::topology::dims(dom.fetch_existing( axom::fmt::format("topologies/{}", topologyName))) == DIM); @@ -486,7 +488,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::copy(&m_facetCount, m_firstFacetIds.data() + m_firstFacetIds.size() - 1, sizeof(axom::IndexType)); - m_firstFacetIds.resize(m_crossingCount); + // m_firstFacetIds.resize(m_crossingCount); } void scanCrossings_hybridParallel() @@ -580,17 +582,15 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::copy(&m_facetCount, m_firstFacetIds.data() + m_firstFacetIds.size() - 1, sizeof(axom::IndexType)); - m_firstFacetIds.resize(m_crossingCount); + // m_firstFacetIds.resize(m_crossingCount); } void computeFacets() override { AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::computeFacets"); - const auto facetIncrsView = m_facetIncrs.view(); const auto firstFacetIdsView = m_firstFacetIds.view(); const auto crossingParentIdsView = m_crossingParentIds.view(); const auto crossingCasesView = m_crossingCases.view(); - const auto caseIdsView = m_caseIds; // Internal contour mesh data to populate axom::ArrayView facetNodeIdsView = m_facetNodeIds; @@ -604,12 +604,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { auto parentCellId = crossingParentIdsView[crossingId]; auto caseId = crossingCasesView[crossingId]; - // auto caseId = caseIdsView.flatIndex(parentCellId); Point cornerCoords[CELL_CORNER_COUNT]; double cornerValues[CELL_CORNER_COUNT]; cfu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); - auto additionalFacets = facetIncrsView[crossingId]; + auto additionalFacets = firstFacetIdsView[crossingId+1] - firstFacetIdsView[crossingId]; auto firstFacetId = facetIndexOffset + firstFacetIdsView[crossingId]; for(axom::IndexType fId = 0; fId < additionalFacets; ++fId) @@ -954,7 +953,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::Array m_crossingCases; //!@brief Whether a parent cell crosses the contour. - axom::Array& m_crossingFlags; + axom::Array& m_crossingFlags; //!@brief Prefix sum of m_crossingFlags axom::Array& m_scannedFlags; @@ -970,7 +969,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::Array m_crossingParentIds; //!@brief Number of surface mesh facets added by each crossing. - axom::Array m_facetIncrs; + axom::Array& m_facetIncrs; //!@brief First index of facets for each crossing. axom::Array m_firstFacetIds; diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.cpp b/src/axom/quest/detail/MarchingCubesSingleDomain.cpp index 55758ac743..517e4f89ea 100644 --- a/src/axom/quest/detail/MarchingCubesSingleDomain.cpp +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.cpp @@ -101,13 +101,15 @@ MarchingCubesSingleDomain::newMarchingCubesImpl() m_mc.m_allocatorID, m_mc.m_caseIdsFlat, m_mc.m_crossingFlags, - m_mc.m_scannedFlags)) + m_mc.m_scannedFlags, + m_mc.m_facetIncrs)) : std::unique_ptr( new MarchingCubesImpl<3, axom::SEQ_EXEC, axom::SEQ_EXEC>( m_mc.m_allocatorID, m_mc.m_caseIdsFlat, m_mc.m_crossingFlags, - m_mc.m_scannedFlags)); + m_mc.m_scannedFlags, + m_mc.m_facetIncrs)); } #ifdef AXOM_RUNTIME_POLICY_USE_OPENMP else if(m_runtimePolicy == MarchingCubes::RuntimePolicy::omp) @@ -118,13 +120,15 @@ MarchingCubesSingleDomain::newMarchingCubesImpl() m_mc.m_allocatorID, m_mc.m_caseIdsFlat, m_mc.m_crossingFlags, - m_mc.m_scannedFlags)) + m_mc.m_scannedFlags, + m_mc.m_facetIncrs)) : std::unique_ptr( new MarchingCubesImpl<3, axom::OMP_EXEC, axom::SEQ_EXEC>( m_mc.m_allocatorID, m_mc.m_caseIdsFlat, m_mc.m_crossingFlags, - m_mc.m_scannedFlags)); + m_mc.m_scannedFlags, + m_mc.m_facetIncrs)); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_CUDA @@ -136,13 +140,15 @@ MarchingCubesSingleDomain::newMarchingCubesImpl() m_mc.m_allocatorID, m_mc.m_caseIdsFlat, m_mc.m_crossingFlags, - m_mc.m_scannedFlags)) + m_mc.m_scannedFlags, + m_mc.m_facetIncrs)) : std::unique_ptr( new MarchingCubesImpl<3, axom::CUDA_EXEC<256>, axom::CUDA_EXEC<1>>( m_mc.m_allocatorID, m_mc.m_caseIdsFlat, m_mc.m_crossingFlags, - m_mc.m_scannedFlags)); + m_mc.m_scannedFlags, + m_mc.m_facetIncrs)); } #endif #ifdef AXOM_RUNTIME_POLICY_USE_HIP @@ -154,13 +160,15 @@ MarchingCubesSingleDomain::newMarchingCubesImpl() m_mc.m_allocatorID, m_mc.m_caseIdsFlat, m_mc.m_crossingFlags, - m_mc.m_scannedFlags)) + m_mc.m_scannedFlags, + m_mc.m_facetIncrs)) : std::unique_ptr( new MarchingCubesImpl<3, axom::HIP_EXEC<256>, axom::HIP_EXEC<1>>( m_mc.m_allocatorID, m_mc.m_caseIdsFlat, m_mc.m_crossingFlags, - m_mc.m_scannedFlags)); + m_mc.m_scannedFlags, + m_mc.m_facetIncrs)); } #endif else From 0146b1e1563679b90dd665d339f5853e61427fdc Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 19 Feb 2024 14:05:47 -0800 Subject: [PATCH 485/639] Reuse =MarchingCubes= object for better performance. --- .../examples/quest_marching_cubes_example.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 0a024afad8..f28d4c9d3b 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -762,14 +762,21 @@ struct ContourTestBase } } #endif + std::unique_ptr mcPtr; for(int j = 0; j < params.objectRepCount; ++j) { - // Create marching cubes algorithm object and set some parameters - mcPtr = std::make_unique(params.policy, - s_allocatorId, - params.dataParallelism); + // Clear and re-use MarchingCubes object. + if(!mcPtr) + { + mcPtr = std::make_unique(params.policy, + s_allocatorId, + params.dataParallelism); + } + mcPtr->clear(); + auto& mc = *mcPtr; + mc.initialize(computationalMesh.asConduitNode(), "mesh"); mc.setFunctionField(functionName()); From 6a2ad712368f357ad7e56326b53ffb3475aee89c Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 19 Feb 2024 15:58:28 -0800 Subject: [PATCH 486/639] Autoformat. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index a53022ae5d..2832fd36d4 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -76,7 +76,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase , m_crossingFlags(crossingFlags) , m_scannedFlags(scannedFlags) , m_crossingParentIds(0, 0, m_allocatorID) - , m_facetIncrs(facetIncrs) // (0, 0, m_allocatorID) + , m_facetIncrs(facetIncrs) // (0, 0, m_allocatorID) , m_firstFacetIds(0, 0, m_allocatorID) { SLIC_ASSERT(caseIdsFlat.getAllocatorID() == allocatorID); @@ -375,12 +375,13 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase { AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::scanCrossings"); if(m_dataParallelism == - axom::quest::MarchingCubesDataParallelism::hybridParallel) + axom::quest::MarchingCubesDataParallelism::hybridParallel) { AXOM_PERF_MARK_SECTION("MarchingCubesImpl::scanCrossings:hybridParallel", scanCrossings_hybridParallel();); } - else if(m_dataParallelism == axom::quest::MarchingCubesDataParallelism::fullParallel) + else if(m_dataParallelism == + axom::quest::MarchingCubesDataParallelism::fullParallel) { AXOM_PERF_MARK_SECTION("MarchingCubesImpl::scanCrossings:fullParallel", scanCrossings_fullParallel();); @@ -608,7 +609,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase double cornerValues[CELL_CORNER_COUNT]; cfu.get_corner_coords_and_values(parentCellId, cornerCoords, cornerValues); - auto additionalFacets = firstFacetIdsView[crossingId+1] - firstFacetIdsView[crossingId]; + auto additionalFacets = + firstFacetIdsView[crossingId + 1] - firstFacetIdsView[crossingId]; auto firstFacetId = facetIndexOffset + firstFacetIdsView[crossingId]; for(axom::IndexType fId = 0; fId < additionalFacets; ++fId) From 3b8e9977d62c5bff0bc1fa67a3767de383b6f1d3 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 19 Feb 2024 23:03:49 -0800 Subject: [PATCH 487/639] Time all reps. --- .../examples/quest_marching_cubes_example.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index f28d4c9d3b..7b601403d7 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -764,6 +764,8 @@ struct ContourTestBase #endif std::unique_ptr mcPtr; + axom::utilities::Timer repsTimer(false); + repsTimer.start(); for(int j = 0; j < params.objectRepCount; ++j) { // Clear and re-use MarchingCubes object. @@ -780,14 +782,12 @@ struct ContourTestBase mc.initialize(computationalMesh.asConduitNode(), "mesh"); mc.setFunctionField(functionName()); - axom::utilities::Timer computeTimer(false); #ifdef AXOM_USE_MPI MPI_Barrier(MPI_COMM_WORLD); #endif - computeTimer.start(); for(int i = 0; i < params.contourGenCount; ++i) { - SLIC_INFO(axom::fmt::format( + SLIC_DEBUG(axom::fmt::format( "MarchingCubes object rep {} of {}, contour run {} of {}:", j, params.objectRepCount, @@ -796,11 +796,14 @@ struct ContourTestBase mc.clear(); mc.computeIsocontour(params.contourVal); } - computeTimer.stop(); - // printTimingStats(computeTimer, name() + " contour"); - - printRunStats(mc); } + repsTimer.stop(); + SLIC_INFO(axom::fmt::format("Finished {} object reps x {} contour reps", + params.objectRepCount, params.contourGenCount)); + printTimingStats(repsTimer, name() + " contour"); + + auto& mc = *mcPtr; + printRunStats(mc); // Return conduit data to host memory. if(s_allocatorId != axom::execution_space::allocatorID()) @@ -825,7 +828,6 @@ struct ContourTestBase DIM, DIM == 2 ? mint::CellType::SEGMENT : mint::CellType::TRIANGLE, meshGroup); - auto& mc = *mcPtr; axom::utilities::Timer extractTimer(false); extractTimer.start(); mc.populateContourMesh(contourMesh, m_parentCellIdField, m_domainIdField); From 8d910ca5af4a154838fbc5694fece65ee4af6118 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 20 Feb 2024 17:03:20 -0800 Subject: [PATCH 488/639] clean up and unify TPL importing logic between installed and build system states --- src/cmake/axom-config.cmake.in | 155 ++++++++---------- src/cmake/thirdparty/FindConduit.cmake | 41 ----- .../thirdparty/SetupAxomThirdParty.cmake | 137 ++++------------ 3 files changed, 101 insertions(+), 232 deletions(-) delete mode 100644 src/cmake/thirdparty/FindConduit.cmake diff --git a/src/cmake/axom-config.cmake.in b/src/cmake/axom-config.cmake.in index 46e2e2204c..28271ed1ef 100644 --- a/src/cmake/axom-config.cmake.in +++ b/src/cmake/axom-config.cmake.in @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (BSD-3-Clause) #------------------------------------------------------------------------------ -cmake_minimum_required(VERSION 3.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8 FATAL_ERROR) @PACKAGE_INIT@ @@ -84,10 +84,28 @@ if(NOT AXOM_FOUND) # camp if(AXOM_USE_CAMP) set(AXOM_CAMP_DIR "@CAMP_DIR@") - if(NOT CAMP_DIR) - set(CAMP_DIR ${AXOM_CAMP_DIR}) + if(NOT camp_DIR) + set(camp_DIR ${AXOM_CAMP_DIR}) endif() - find_dependency(camp REQUIRED NO_DEFAULT_PATH PATHS "${CAMP_DIR}/lib/cmake/camp") + find_dependency(camp REQUIRED) + endif() + + # umpire + if(AXOM_USE_UMPIRE) + set(AXOM_UMPIRE_DIR "@UMPIRE_DIR@") + if(NOT umpire_DIR) + set(umpire_DIR ${AXOM_UMPIRE_DIR}) + endif() + find_dependency(umpire REQUIRED) + endif() + + # raja + if(AXOM_USE_RAJA) + set(AXOM_RAJA_DIR "@RAJA_DIR@") + if(NOT raja_DIR) + set(raja_DIR ${AXOM_RAJA_DIR}) + endif() + find_dependency(RAJA REQUIRED) endif() # conduit @@ -109,47 +127,25 @@ if(NOT AXOM_FOUND) # hdf5 if(AXOM_USE_HDF5) set(AXOM_HDF5_DIR "@HDF5_DIR@") - # Note: Targets not currently imported + # Note: 'hdf5" target is exported as 'axom::hdf5' endif() # lua if(AXOM_USE_LUA) set(AXOM_LUA_DIR "@LUA_DIR@") - # Note: Targets not currently imported + # Note: 'lua" target is exported as 'axom::lua' endif() # mfem if(AXOM_USE_MFEM) set(AXOM_MFEM_DIR "@MFEM_DIR@") - # Note: Targets not currently imported - endif() - - # raja - if(AXOM_USE_RAJA) - set(AXOM_RAJA_DIR "@RAJA_DIR@") - if(NOT RAJA_DIR) - set(RAJA_DIR ${AXOM_RAJA_DIR}) - endif() - find_dependency(RAJA REQUIRED NO_DEFAULT_PATH - PATHS "${RAJA_DIR}/share/raja/cmake" - "${RAJA_DIR}/lib/cmake/raja") + # Note: 'mfem" target is exported as 'axom::mfem' endif() # scr if(AXOM_USE_SCR) set(AXOM_SCR_DIR "@SCR_DIR@") - # Note: Targets not currently imported - endif() - - # umpire - if(AXOM_USE_UMPIRE) - set(AXOM_UMPIRE_DIR "@UMPIRE_DIR@") - if(NOT UMPIRE_DIR) - set(UMPIRE_DIR ${AXOM_UMPIRE_DIR}) - endif() - find_dependency(umpire REQUIRED NO_DEFAULT_PATH - PATHS "${UMPIRE_DIR}/share/umpire/cmake" - "${UMPIRE_DIR}/lib/cmake/umpire") + # Note: 'scr" target is exported as 'axom::scr' endif() #---------------------------------------------------------------------------- @@ -165,7 +161,7 @@ if(NOT AXOM_FOUND) # we want the import root, which is right above the "lib" prefix get_filename_component(_IMPORT_ROOT "${_IMPORT_PREFIX}" PATH) - include(${AXOM_CMAKE_CONFIG_DIR}/axom-targets.cmake) + include(${AXOM_CMAKE_CONFIG_DIR}/BLTSetupTargets.cmake)include(${AXOM_CMAKE_CONFIG_DIR}/axom-targets.cmake) # Create convenience target that bundles all Axom targets (axom) add_library(axom INTERFACE IMPORTED) @@ -181,13 +177,6 @@ if(NOT AXOM_FOUND) APPEND) endforeach() - # HACK: Clear INTERFACE_COMPILE_OPTIONS to avoid requiring OpenMP in user code - # This can (hopefully) be removed when we fix blt's treatment of OpenMP - if(TARGET RAJA AND AXOM_USE_OPENMP) - set_target_properties(RAJA PROPERTIES INTERFACE_COMPILE_OPTIONS "") - endif() - - #--------------------------------------------------------------------------- # Remove non-existant INTERFACE_INCLUDE_DIRECTORIES from imported targets # to work around CMake error @@ -205,65 +194,57 @@ if(NOT AXOM_FOUND) ## recursively in the variable name TLIST holds. macro(axom_find_target_dependencies) - set(options) - set(singleValuedArgs TARGET TLIST) - set(multiValuedArgs) + set(options) + set(singleValuedArgs TARGET TLIST) + set(multiValuedArgs) - # parse the arguments to the macro - cmake_parse_arguments(arg - "${options}" "${singleValuedArgs}" "${multiValuedArgs}" ${ARGN}) + # parse the arguments to the macro + cmake_parse_arguments(arg + "${options}" "${singleValuedArgs}" "${multiValuedArgs}" ${ARGN}) - # check for required arguments - if(NOT DEFINED arg_TARGET) - message(FATAL_ERROR "TARGET is a required parameter for the axom_find_target_dependencies macro") - endif() + # check for required arguments + if(NOT DEFINED arg_TARGET) + message(FATAL_ERROR "TARGET is a required parameter for the axom_find_target_dependencies macro") + endif() - if(NOT DEFINED arg_TLIST OR NOT DEFINED ${arg_TLIST}) - message(FATAL_ERROR "TLIST is a required parameter for the axom_find_target_dependencies macro") - endif() + if(NOT DEFINED arg_TLIST OR NOT DEFINED ${arg_TLIST}) + message(FATAL_ERROR "TLIST is a required parameter for the axom_find_target_dependencies macro") + endif() - string(TOUPPER ${arg_TARGET} _target_upper) - if(_BLT_${_target_upper}_IS_REGISTERED_LIBRARY) - # recursive call - set (_depends_on "${_BLT_${_target_upper}_DEPENDS_ON}") - foreach(t ${_depends_on}) - if (NOT "${t}" IN_LIST ${arg_TLIST}) - list(APPEND ${arg_TLIST} ${t}) - axom_find_target_dependencies(TARGET ${t} TLIST ${arg_TLIST}) - endif() - endforeach() - unset(_depends_on) - endif() + set(_depends_on "") - # check if this is a valid cmake target - if(TARGET ${arg_TARGET}) - # get link libaries if whitelisted - set(_property_list "") - get_property(_target_type TARGET ${arg_TARGET} PROPERTY TYPE) - if(NOT "${_target_type}" STREQUAL "INTERFACE_LIBRARY") - get_property(_propval TARGET ${arg_TARGET} PROPERTY LINK_LIBRARIES SET) - get_target_property(_propval ${arg_TARGET} LINK_LIBRARIES) - if (_propval AND NOT "${_propval}" IN_LIST ${arg_TLIST}) - list(APPEND _property_list ${_propval}) - endif() + # Get dependencies if BLT registered library + string(TOUPPER ${arg_TARGET} _target_upper) + if(_BLT_${_target_upper}_IS_REGISTERED_LIBRARY) + list(APPEND _depends_on "${_BLT_${_target_upper}_DEPENDS_ON}") endif() - # get interface link libraries - get_property(_propval TARGET ${arg_TARGET} PROPERTY INTERFACE_LINK_LIBRARIES SET) - get_target_property(_propval ${arg_TARGET} INTERFACE_LINK_LIBRARIES) - if (_propval AND NOT "${_propval}" IN_LIST ${arg_TLIST}) - list(APPEND _property_list ${_propval}) + # Get dependencies if CMake target + if(TARGET ${arg_TARGET}) + get_property(_target_type TARGET ${arg_TARGET} PROPERTY TYPE) + if(NOT "${_target_type}" STREQUAL "INTERFACE_LIBRARY") + get_target_property(_propval ${arg_TARGET} LINK_LIBRARIES) + if(_propval) + list(APPEND _depends_on ${_propval}) + endif() + endif() + + # get interface link libraries + get_target_property(_propval ${arg_TARGET} INTERFACE_LINK_LIBRARIES) + if (_propval) + list(APPEND _depends_on ${_propval}) + endif() endif() - - # recursive call - foreach(t ${_property_list}) - list(APPEND ${arg_TLIST} ${t}) - axom_find_target_dependencies(TARGET ${t} TLIST ${arg_TLIST}) + + blt_list_remove_duplicates(TO _depends_on) + foreach(t ${_depends_on}) + if (NOT "${t}" IN_LIST ${arg_TLIST}) + list(APPEND ${arg_TLIST} ${t}) + axom_find_target_dependencies(TARGET ${t} TLIST ${arg_TLIST}) + endif() endforeach() - unset(_property_list) - unset(_propval) - endif() + unset(_depends_on) endmacro(axom_find_target_dependencies) set(_deps "") diff --git a/src/cmake/thirdparty/FindConduit.cmake b/src/cmake/thirdparty/FindConduit.cmake deleted file mode 100644 index 0e85402cf5..0000000000 --- a/src/cmake/thirdparty/FindConduit.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and -# other Axom Project Developers. See the top-level LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) -#------------------------------------------------------------------------------ -# Setup Conduit -#------------------------------------------------------------------------------ -# This file defines: -# CONDUIT_FOUND - If Conduit was found -# -# If found, the Conduit CMake targets will also be imported -#------------------------------------------------------------------------------ - -# first Check for CONDUIT_DIR - -if(NOT CONDUIT_DIR) - MESSAGE(FATAL_ERROR "Could not find Conduit. Conduit requires explicit CONDUIT_DIR.") -endif() - -# This is used in axom-config.cmake.in -set(AXOM_CONDUIT_CONFIG_SUBDIR "lib/cmake/conduit" CACHE PATH "") - -if(NOT WIN32) - set(_conduit_config "${CONDUIT_DIR}/${AXOM_CONDUIT_CONFIG_SUBDIR}/ConduitConfig.cmake") - if(NOT EXISTS ${_conduit_config}) - MESSAGE(FATAL_ERROR "Could not find Conduit cmake include file ${_conduit_config}") - endif() - - find_package(Conduit REQUIRED - NO_DEFAULT_PATH - PATHS ${CONDUIT_DIR}/${AXOM_CONDUIT_CONFIG_SUBDIR}) -else() - # Allow for several different configurations of Conduit - find_package(Conduit CONFIG - REQUIRED - HINTS ${CONDUIT_DIR}/${AXOM_CONDUIT_CONFIG_SUBDIR} - ${CONDUIT_DIR}/cmake/conduit - ${CONDUIT_DIR}/share/cmake/conduit - ${CONDUIT_DIR}/share/conduit - ${CONDUIT_DIR}/cmake) -endif() \ No newline at end of file diff --git a/src/cmake/thirdparty/SetupAxomThirdParty.cmake b/src/cmake/thirdparty/SetupAxomThirdParty.cmake index 44b38e733f..9a3447d497 100644 --- a/src/cmake/thirdparty/SetupAxomThirdParty.cmake +++ b/src/cmake/thirdparty/SetupAxomThirdParty.cmake @@ -15,11 +15,13 @@ endif() set(TPL_DEPS) +include(CMakeFindDependencyMacro) + #------------------------------------------------------------------------------ # Create global variable to toggle between GPU targets #------------------------------------------------------------------------------ if(AXOM_ENABLE_CUDA) - set(axom_device_depends cuda CACHE STRING "" FORCE) + set(axom_device_depends blt::cuda CACHE STRING "" FORCE) endif() if(AXOM_ENABLE_HIP) set(axom_device_depends blt::hip CACHE STRING "" FORCE) @@ -32,33 +34,26 @@ if ((RAJA_DIR OR UMPIRE_DIR) AND NOT CAMP_DIR) message(FATAL_ERROR "CAMP_DIR is required if RAJA_DIR or UMPIRE_DIR is provided.") endif() -# Note: Let Umpire find Camp via camp_DIR, don't find it ourselves +axom_assert_is_directory(VARIABLE_NAME CAMP_DIR) set(camp_DIR ${CAMP_DIR}) +find_dependency(camp REQUIRED) #------------------------------------------------------------------------------ # UMPIRE #------------------------------------------------------------------------------ if (UMPIRE_DIR) - if (NOT EXISTS "${UMPIRE_DIR}") - message(FATAL_ERROR "Given UMPIRE_DIR does not exist: ${UMPIRE_DIR}") - endif() - - if (NOT IS_DIRECTORY "${UMPIRE_DIR}") - message(FATAL_ERROR "Given UMPIRE_DIR is not a directory: ${UMPIRE_DIR}") - endif() - - find_package(umpire REQUIRED PATHS ${UMPIRE_DIR} ) + axom_assert_is_directory(VARIABLE_NAME UMPIRE_DIR) + set(umpire_DIR ${UMPIRE_DIR}) + find_package(umpire REQUIRED) message(STATUS "Checking for expected Umpire target 'umpire'") if (NOT TARGET umpire) message(FATAL_ERROR "Umpire failed to load: ${UMPIRE_DIR}") - else() - message(STATUS "Umpire loaded: ${UMPIRE_DIR}") - set_property(TARGET umpire - APPEND PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES - ${UMPIRE_INCLUDE_DIRS}) - set(UMPIRE_FOUND TRUE CACHE BOOL "") endif() + message(STATUS "Umpire loaded: ${UMPIRE_DIR}") + set(UMPIRE_FOUND TRUE CACHE BOOL "") + + blt_convert_to_system_includes(TARGET umpire) else() message(STATUS "Umpire support is OFF") set(UMPIRE_FOUND FALSE CACHE BOOL "") @@ -69,42 +64,16 @@ endif() # RAJA #------------------------------------------------------------------------------ if (RAJA_DIR) - if (NOT EXISTS "${RAJA_DIR}") - message(FATAL_ERROR "Given RAJA_DIR does not exist: ${RAJA_DIR}") - endif() - - if (NOT IS_DIRECTORY "${RAJA_DIR}") - message(FATAL_ERROR "Given RAJA_DIR is not a directory: ${RAJA_DIR}") - endif() - - find_package(RAJA REQUIRED PATHS ${RAJA_DIR} ) + axom_assert_is_directory(VARIABLE_NAME RAJA_DIR) + set(raja_DIR ${RAJA_DIR}) + find_dependency(raja REQUIRED) message(STATUS "Checking for expected RAJA target 'RAJA'") if (NOT TARGET RAJA) message(FATAL_ERROR "RAJA failed to load: ${RAJA_DIR}") - else() - message(STATUS "RAJA loaded: ${RAJA_DIR}") - set(RAJA_FOUND TRUE CACHE BOOL "") - endif() - - # Suppress warnings from cub and cuda related to the (low) version - # of clang that XL compiler pretends to be. - if(C_COMPILER_FAMILY_IS_XL) - if(TARGET RAJA::cub) - blt_add_target_definitions( - TO RAJA::cub - SCOPE INTERFACE - TARGET_DEFINITIONS CUB_IGNORE_DEPRECATED_CPP_DIALECT) - endif() - - if(TARGET cuda) - blt_add_target_definitions( - TO cuda - SCOPE INTERFACE - TARGET_DEFINITIONS THRUST_IGNORE_DEPRECATED_CPP_DIALECT) - endif() endif() - + message(STATUS "RAJA loaded: ${RAJA_DIR}") + set(RAJA_FOUND TRUE CACHE BOOL "") else() message(STATUS "RAJA support is OFF" ) set(RAJA_FOUND FALSE CACHE BOOL "") @@ -116,16 +85,18 @@ endif() # Find Conduit first, then find HDF5 to fix "Could NOT find HDF5" issue with # newer CMake versions if (CONDUIT_DIR) - include(cmake/thirdparty/FindConduit.cmake) + axom_assert_is_directory(VARIABLE_NAME CONDUIT_DIR) + set(conduit_DIR ${CONDUIT_DIR}) + find_dependency(conduit REQUIRED) - # Manually set includes as system includes - set_property(TARGET conduit::conduit - APPEND PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES - "${CONDUIT_INSTALL_PREFIX}/include/") + message(STATUS "Checking for expected Conduit target 'conduit::conduit'") + if (NOT TARGET conduit::conduit) + message(FATAL_ERROR "Conduit failed to load: ${CONDUIT_DIR}") + endif() + message(STATUS "Conduit loaded: ${CONDUIT_DIR}") + set(CONDUIT_FOUND TRUE CACHE BOOL "") - set_property(TARGET conduit::conduit - APPEND PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES - "${CONDUIT_INSTALL_PREFIX}/include/conduit/") + blt_convert_to_system_includes(TARGET conduit::conduit) else() message(STATUS "Conduit support is OFF") endif() @@ -134,6 +105,7 @@ endif() # HDF5 #------------------------------------------------------------------------------ if (HDF5_DIR) + axom_assert_is_directory(VARIABLE_NAME HDF5_DIR) include(cmake/thirdparty/SetupHDF5.cmake) blt_list_append(TO TPL_DEPS ELEMENTS hdf5) else() @@ -160,6 +132,7 @@ if (TARGET mfem) set(MFEM_FOUND TRUE CACHE BOOL "" FORCE) elseif (MFEM_DIR) + axom_assert_is_directory(VARIABLE_NAME MFEM_DIR) include(cmake/thirdparty/FindMFEM.cmake) # If the CMake build system was used, a CMake target for mfem already exists if (NOT TARGET mfem) @@ -233,6 +206,8 @@ endif() # SCR #------------------------------------------------------------------------------ if (SCR_DIR) + axom_assert_is_directory(VARIABLE_NAME SCR_DIR) + include(cmake/thirdparty/FindSCR.cmake) blt_import_library( NAME scr INCLUDES ${SCR_INCLUDE_DIRS} @@ -250,6 +225,7 @@ endif() # LUA #------------------------------------------------------------------------------ if (LUA_DIR) + axom_assert_is_directory(VARIABLE_NAME LUA_DIR) include(cmake/thirdparty/FindLUA.cmake) if(NOT TARGET lua) blt_import_library( NAME lua @@ -270,6 +246,7 @@ endif() # C2C #------------------------------------------------------------------------------ if (C2C_DIR) + axom_assert_is_directory(VARIABLE_NAME C2C_DIR) include(cmake/thirdparty/FindC2C.cmake) blt_import_library( NAME c2c @@ -283,49 +260,6 @@ else() set(C2C_FOUND OFF CACHE BOOL "") endif() - -#------------------------------------------------------------------------------ -# Remove exported OpenMP flags because they are not language agnostic -#------------------------------------------------------------------------------ -set(_props) -if( ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0" ) - list(APPEND _props INTERFACE_LINK_OPTIONS) -endif() -list(APPEND _props INTERFACE_COMPILE_OPTIONS) - -foreach(_target RAJA camp umpire umpire_alloc conduit::conduit) - if(TARGET ${_target}) - message(STATUS "Removing OpenMP Flags from target[${_target}]") - - foreach(_prop ${_props}) - get_target_property(_flags ${_target} ${_prop}) - if ( _flags ) - string( REPLACE "${OpenMP_CXX_FLAGS}" "" - correct_flags "${_flags}" ) - string( REPLACE "${OpenMP_Fortran_FLAGS}" "" - correct_flags "${correct_flags}" ) - - set_target_properties( ${_target} PROPERTIES ${_prop} "${correct_flags}" ) - endif() - endforeach() - endif() -endforeach() - -# Newer versions of RAJA keeps its flags in a specific target -if(TARGET RAJA) - get_target_property(_flags RAJA INTERFACE_LINK_LIBRARIES) - if ( _flags ) - list(REMOVE_ITEM _flags "RAJA::openmp") - set_target_properties( RAJA PROPERTIES INTERFACE_LINK_LIBRARIES "${_flags}" ) - endif() -endif() - -# Clear Camp's openmp target until BLT handles this fully -if (TARGET blt::openmp) - set_target_properties(blt::openmp PROPERTIES INTERFACE_COMPILE_OPTIONS "") - set_target_properties(blt::openmp PROPERTIES INTERFACE_LINK_OPTIONS "") -endif() - #------------------------------------------------------------------------------ # jsonschema - for Inlet testing purposes #------------------------------------------------------------------------------ @@ -335,11 +269,6 @@ blt_find_executable(NAME jsonschema) #------------------------------------------------------------------------------ # Targets that need to be exported but don't have a CMake config file #------------------------------------------------------------------------------ -blt_list_append(TO TPL_DEPS ELEMENTS cuda cuda_runtime IF AXOM_ENABLE_CUDA) -blt_list_append(TO TPL_DEPS ELEMENTS blt_hip blt_hip_runtime IF AXOM_ENABLE_HIP) -blt_list_append(TO TPL_DEPS ELEMENTS openmp IF AXOM_ENABLE_OPENMP) -blt_list_append(TO TPL_DEPS ELEMENTS mpi IF AXOM_ENABLE_MPI) - foreach(dep ${TPL_DEPS}) # If the target is EXPORTABLE, add it to the export set get_target_property(_is_imported ${dep} IMPORTED) From c06ee8e5979cc1544d75d9b1f474457caf920111 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 20 Feb 2024 17:03:35 -0800 Subject: [PATCH 489/639] add macro to verify directories --- src/cmake/AxomMacros.cmake | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/cmake/AxomMacros.cmake b/src/cmake/AxomMacros.cmake index dffdcbe415..d70caec9c5 100644 --- a/src/cmake/AxomMacros.cmake +++ b/src/cmake/AxomMacros.cmake @@ -259,6 +259,30 @@ macro(axom_add_test) endmacro(axom_add_test) +#------------------------------------------------------------------------------ +# Asserts that the given VARIABLE_NAME's value is a directory and exists. +# Fails with a helpful message when it doesn't. +#------------------------------------------------------------------------------ +macro(axom_assert_is_directory) + + set(options) + set(singleValueArgs VARIABLE_NAME) + set(multiValueArgs) + + # Parse the arguments to the macro + cmake_parse_arguments(arg + "${options}" "${singleValueArgs}" "${multiValueArgs}" ${ARGN}) + + if (NOT EXISTS "${${arg_VARIABLE_NAME}}") + message(FATAL_ERROR "Given ${arg_VARIABLE_NAME} does not exist: ${${arg_VARIABLE_NAME}}") + endif() + + if (NOT IS_DIRECTORY "${${arg_VARIABLE_NAME}}") + message(FATAL_ERROR "Given ${arg_VARIABLE_NAME} is not a directory: ${${arg_VARIABLE_NAME}}") + endif() + +endmacro(axom_assert_is_directory) + ##------------------------------------------------------------------------------ ## convert_to_native_escaped_file_path( path output ) ## From 25069147f3f4bc685ad1c529f994bce30399c5a3 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 20 Feb 2024 17:03:52 -0800 Subject: [PATCH 490/639] bump blt to 0.6.1 --- src/cmake/blt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmake/blt b/src/cmake/blt index 4e1fa86639..148c53ecc8 160000 --- a/src/cmake/blt +++ b/src/cmake/blt @@ -1 +1 @@ -Subproject commit 4e1fa86639496e30a22cc10eaf0cd199bcc53008 +Subproject commit 148c53ecc8bcaad5eaa4c1e39cb8144b8f1388ae From 1f1a25b1448adbee81e63d5cc5fd3f43104de804 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 20 Feb 2024 17:04:13 -0800 Subject: [PATCH 491/639] move to new installed targets that are namespaced --- src/CMakeLists.txt | 5 ++--- src/cmake/AxomConfig.cmake | 7 +++---- src/thirdparty/tests/CMakeLists.txt | 13 ++++++------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e1c4836cc4..a217514590 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -97,9 +97,8 @@ if (“${PROJECT_SOURCE_DIR}” STREQUAL “${CMAKE_SOURCE_DIR}”) set(ENABLE_GMOCK ON CACHE BOOL "") endif() - # Mark BLT's built-in third-party targets as EXPORTABLE so they can be added - # to the axom-targets export set - set(BLT_EXPORT_THIRDPARTY ON CACHE BOOL "") + # We use BLT's install targets logic + set(BLT_EXPORT_THIRDPARTY OFF CACHE BOOL "" FORCE) endif() if("${BLT_CXX_STD}" STREQUAL "c++98" OR "${BLT_CXX_STD}" STREQUAL "c++11") diff --git a/src/cmake/AxomConfig.cmake b/src/cmake/AxomConfig.cmake index 9a2b7db90c..6d4865b544 100644 --- a/src/cmake/AxomConfig.cmake +++ b/src/cmake/AxomConfig.cmake @@ -147,6 +147,8 @@ install( ${AXOM_INSTALL_CMAKE_MODULE_DIR} ) +# Install BLT files that recreate BLT targets in downstream projects +blt_install_tpl_setups(DESTINATION ${AXOM_INSTALL_CMAKE_MODULE_DIR}) #------------------------------------------------------------------------------ # Create a list of exported targets so that other projects that include Axom @@ -156,10 +158,7 @@ install( # Add it to a temporary list before creating the cache variable to use list(APPEND) set(_axom_exported_targets ${AXOM_COMPONENTS_ENABLED}) -blt_list_append(TO _axom_exported_targets ELEMENTS cuda cuda_runtime IF AXOM_ENABLE_CUDA) -blt_list_append(TO _axom_exported_targets ELEMENTS hip hip_runtime IF AXOM_ENABLE_HIP) - -set(_optional_targets cli11 fmt hdf5 lua openmp sol sparsehash) +set(_optional_targets cli11 fmt hdf5 lua sol sparsehash) foreach(_tar ${_optional_targets}) string(TOUPPER ${_tar} _upper_tar) if(ENABLE_${_upper_tar} OR ${_upper_tar}_FOUND) diff --git a/src/thirdparty/tests/CMakeLists.txt b/src/thirdparty/tests/CMakeLists.txt index 174e17e13a..5dbf56c584 100644 --- a/src/thirdparty/tests/CMakeLists.txt +++ b/src/thirdparty/tests/CMakeLists.txt @@ -88,17 +88,17 @@ if (CONDUIT_FOUND) FOLDER axom/thirdparty/tests ) axom_add_test(NAME conduit_smoke - COMMAND conduit_smoke_test) + COMMAND conduit_smoke_test) if (ENABLE_FORTRAN) axom_add_executable(NAME conduit_smoke_F_test - SOURCES f_conduit_smoke.f - OUTPUT_DIR ${TEST_OUTPUT_DIRECTORY} - DEPENDS_ON conduit::conduit fruit - FOLDER axom/thirdparty/tests ) + SOURCES f_conduit_smoke.f + OUTPUT_DIR ${TEST_OUTPUT_DIRECTORY} + DEPENDS_ON conduit::conduit fruit + FOLDER axom/thirdparty/tests ) axom_add_test(NAME conduit_smoke_F - COMMAND conduit_smoke_F_test) + COMMAND conduit_smoke_F_test) endif() endif() @@ -126,7 +126,6 @@ endif() # Smoke test for fmt third party library #------------------------------------------------------------------------------ set(fmt_smoke_dependencies fmt gtest) -blt_list_append( TO fmt_smoke_dependencies ELEMENTS cuda IF AXOM_ENABLE_CUDA) axom_add_executable( NAME fmt_smoke_test From 850cff4e67285ad614a7d9b6add14b68b3eec8c3 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 20 Feb 2024 17:16:26 -0800 Subject: [PATCH 492/639] bump spack, various TPL versions, bump radiuss-spack-configs --- .uberenv_config.json | 2 +- .../spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml | 10 +++++----- scripts/spack/configs/toss_4_x86_64_ib/spack.yaml | 10 +++++----- .../spack/configs/toss_4_x86_64_ib_cray/spack.yaml | 10 +++++----- scripts/spack/packages/umpire/package.py | 11 +++++++++++ scripts/spack/radiuss-spack-configs | 2 +- 6 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 scripts/spack/packages/umpire/package.py diff --git a/.uberenv_config.json b/.uberenv_config.json index 7a3e6b96d2..7bad086557 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,7 +4,7 @@ "package_final_phase": "initconfig", "package_source_dir": "../..", "spack_url": "https://github.com/spack/spack.git", -"spack_commit": "61421b3a67941f5c91239360b4d7d3ee5c3428df", +"spack_commit": "0d92b07dbd30b41bc6f50a61f26bc0056dca5e44", "spack_configs_path": "scripts/spack/configs", "spack_packages_path": ["scripts/spack/radiuss-spack-configs/packages", "scripts/spack/packages"], "spack_concretizer": "clingo", diff --git a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml index afb2b5fe6a..ea4dffbba6 100644 --- a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -304,21 +304,21 @@ spack: # Globally lock version of third party libraries camp: - require: "@2023.06.0" + require: "@2024.02.0" conduit: - require: "@0.8.8~shared~test~examples~utilities" + require: "@0.9.1~shared~test~examples~utilities" hdf5: variants: ~shared~mpi hypre: version: [2.24.0] mfem: - require: "@4.5.2" + require: "@4.6.0" raja: - require: "@2023.06.0~shared~examples~exercises" + require: "@2024.02.0~shared~examples~exercises" scr: require: "@3.0.1~shared~tests~examples" umpire: - require: "@2023.06.0~shared~examples" + require: "@2024.02.20~shared~examples" # Globally lock in versions of Devtools cmake: diff --git a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml index 9045d48165..4c42cea1c2 100644 --- a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml @@ -268,21 +268,21 @@ spack: # Globally lock version of third party libraries camp: - require: "@2023.06.0" + require: "@2024.02.0" conduit: - require: "@0.8.8~shared~test~examples~utilities" + require: "@0.9.1~shared~test~examples~utilities" hdf5: variants: ~shared~mpi hypre: version: [2.24.0] mfem: - require: "@4.5.2" + require: "@4.6.0" raja: - require: "@2023.06.0~shared~examples~exercises" + require: "@2024.02.0~shared~examples~exercises" scr: require: "@3.0.1~shared~tests~examples" umpire: - require: "@2023.06.0~shared~examples" + require: "@2024.01.31~shared~examples" # Lock in versions of Devtools cmake: diff --git a/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml b/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml index 808000b709..32e7d84698 100644 --- a/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml +++ b/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml @@ -337,21 +337,21 @@ spack: # Globally lock version of third party libraries camp: - require: "@2023.06.0" + require: "@2024.02.0" conduit: - require: "@0.8.8~shared~test~examples~utilities" + require: "@0.9.1~shared~test~examples~utilities" hdf5: variants: ~shared~mpi hypre: version: [2.24.0] mfem: - require: "@4.5.2" + require: "@4.6.0" raja: - require: "@2023.06.0~shared~examples~exercises" + require: "@2024.02.0~shared~examples~exercises" scr: require: "@3.0.1~shared~tests~examples" umpire: - require: "@2023.06.0~shared~examples" + require: "@2024.01.31~shared~examples" py-shroud: version: [0.13.0] diff --git a/scripts/spack/packages/umpire/package.py b/scripts/spack/packages/umpire/package.py new file mode 100644 index 0000000000..4c3388f6bb --- /dev/null +++ b/scripts/spack/packages/umpire/package.py @@ -0,0 +1,11 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.pkg.llnl.radiuss.umpire import Umpire as RadiussUmpire + +class Umpire(RadiussUmpire): + # Note: This just points at a commit in the task/update-blt-tpl-exports branch. + # It also has a made up version + version("2024.01.31", commit="f2ae5edd1e49e7fa18656203d742de3bd9490961", submodules=False) diff --git a/scripts/spack/radiuss-spack-configs b/scripts/spack/radiuss-spack-configs index f204a025ce..4016a0ff72 160000 --- a/scripts/spack/radiuss-spack-configs +++ b/scripts/spack/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit f204a025ce8de449bb4fbd246e496415a6e55075 +Subproject commit 4016a0ff72425b243a3f11c06e814a08721774f0 From bbcd5f781bfcdac9ea06ca9f6a9ee399f11a086c Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 21 Feb 2024 13:12:19 -0800 Subject: [PATCH 493/639] fix spack concretization error --- scripts/spack/configs/toss_4_x86_64_ib/spack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml index 4c42cea1c2..5c3d83d1f1 100644 --- a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml @@ -95,11 +95,11 @@ spack: mvapich2: buildable: false externals: - - spec: mvapich2@2.3.6%clang@14.0.6 process_managers=slurm arch=linux-rhel8-ivybridge + - spec: mvapich2@2.3.6%clang@14.0.6~alloca~cuda~debug~hwloc_graphics~hwlocv2+regcache+wrapperrpath build_system=autotools ch3_rank_bits=32 fabrics=mrail file_systems=auto process_managers=slurm threads=multiple prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6 - - spec: mvapich2@2.3.6%gcc@10.3.1 process_managers=slurm arch=linux-rhel8-ivybridge + - spec: mvapich2@2.3.6%gcc@10.3.1~alloca~cuda~debug~hwloc_graphics~hwlocv2+regcache+wrapperrpath build_system=autotools ch3_rank_bits=32 fabrics=mrail file_systems=auto process_managers=slurm threads=multiple prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1 - - spec: mvapich2@2.3.6%intel@2022.1.0 process_managers=slurm arch=linux-rhel8-ivybridge + - spec: mvapich2@2.3.6%intel@2022.1.0~alloca~cuda~debug~hwloc_graphics~hwlocv2+regcache+wrapperrpath build_system=autotools ch3_rank_bits=32 fabrics=mrail file_systems=auto process_managers=slurm threads=multiple prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0 netlib-lapack: From 779de44458989c5cad385d9dbe644c34c71f4007 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 21 Feb 2024 15:32:37 -0800 Subject: [PATCH 494/639] Temporary work-around for un-related bug being addressed by PR #1271. --- .../examples/quest_marching_cubes_example.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 7b601403d7..21055bdbb8 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -799,7 +799,8 @@ struct ContourTestBase } repsTimer.stop(); SLIC_INFO(axom::fmt::format("Finished {} object reps x {} contour reps", - params.objectRepCount, params.contourGenCount)); + params.objectRepCount, + params.contourGenCount)); printTimingStats(repsTimer, name() + " contour"); auto& mc = *mcPtr; @@ -823,11 +824,11 @@ struct ContourTestBase // Put contour mesh in a mint object for error checking and output. std::string sidreGroupName = name() + "_mesh"; sidre::DataStore objectDS; + // While awaiting fix for PR #1271, don't use Sidre storage in contourMesh. sidre::Group* meshGroup = objectDS.getRoot()->createGroup(sidreGroupName); axom::mint::UnstructuredMesh contourMesh( DIM, - DIM == 2 ? mint::CellType::SEGMENT : mint::CellType::TRIANGLE, - meshGroup); + DIM == 2 ? mint::CellType::SEGMENT : mint::CellType::TRIANGLE); axom::utilities::Timer extractTimer(false); extractTimer.start(); mc.populateContourMesh(contourMesh, m_parentCellIdField, m_domainIdField); @@ -846,10 +847,14 @@ struct ContourTestBase checkCellsContainingContour(computationalMesh, contourMesh); } - // Write contour mesh to file. - std::string outputName = name() + "_contour_mesh"; - saveMesh(*meshGroup, outputName); - SLIC_INFO(axom::fmt::format("Wrote {} contour in {}", name(), outputName)); + if(contourMesh.hasSidreGroup()) + { + assert(contourMesh.getSidreGroup() == meshGroup); + // Write contour mesh to file. + std::string outputName = name() + "_contour_mesh"; + saveMesh(*contourMesh.getSidreGroup(), outputName); + SLIC_INFO(axom::fmt::format("Wrote {} contour in {}", name(), outputName)); + } objectDS.getRoot()->destroyGroupAndData(sidreGroupName); From e8177626e485c725f446c3f6758136fb4ff22f3c Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 5 Feb 2024 14:49:21 -0800 Subject: [PATCH 495/639] Array: enable device-side emplace_back/push_back --- src/axom/core/Array.hpp | 54 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index aaf9f81dc3..938f899dde 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -598,7 +598,7 @@ class Array : public ArrayBase> * * \pre DIM == 1 */ - void push_back(const T& value); + AXOM_HOST_DEVICE void push_back(const T& value); /*! * \brief Push a value to the back of the array. @@ -609,7 +609,7 @@ class Array : public ArrayBase> * * \pre DIM == 1 */ - void push_back(T&& value); + AXOM_HOST_DEVICE void push_back(T&& value); /*! * \brief Inserts new element at the end of the Array. @@ -622,7 +622,7 @@ class Array : public ArrayBase> * \pre DIM == 1 */ template - void emplace_back(Args&&... args); + AXOM_HOST_DEVICE void emplace_back(Args&&... args); /// @} @@ -849,6 +849,16 @@ class Array : public ArrayBase> */ T* reserveForInsert(IndexType n, IndexType pos); + /*! + * \brief Make space for a subsequent insertion into the array. + * + * \param [in] n the number of elements to insert. + * + * \note This version supports concurrent GPU insertions. + * \note Reallocation is not supported. + */ + AXOM_DEVICE IndexType reserveForDeviceInsert(IndexType n); + /*! * \brief Update the number of elements. * @@ -1309,7 +1319,7 @@ inline typename Array::ArrayIterator Array::emplac //------------------------------------------------------------------------------ template -inline void Array::push_back(const T& value) +AXOM_HOST_DEVICE inline void Array::push_back(const T& value) { static_assert(DIM == 1, "push_back is only supported for 1D arrays"); emplace_back(value); @@ -1317,7 +1327,7 @@ inline void Array::push_back(const T& value) //------------------------------------------------------------------------------ template -inline void Array::push_back(T&& value) +AXOM_HOST_DEVICE inline void Array::push_back(T&& value) { static_assert(DIM == 1, "push_back is only supported for 1D arrays"); emplace_back(std::move(value)); @@ -1326,10 +1336,16 @@ inline void Array::push_back(T&& value) //------------------------------------------------------------------------------ template template -inline void Array::emplace_back(Args&&... args) +AXOM_HOST_DEVICE inline void Array::emplace_back(Args&&... args) { static_assert(DIM == 1, "emplace_back is only supported for 1D arrays"); +#ifdef AXOM_DEVICE_CODE + IndexType insertIndex = reserveForDeviceInsert(1); + // Construct in-place in uninitialized memory. + new(m_data + insertIndex) T(std::forward(args)...); +#else emplace(size(), std::forward(args)...); +#endif } //------------------------------------------------------------------------------ @@ -1484,6 +1500,32 @@ inline T* Array::reserveForInsert(IndexType n, IndexType pos) return m_data + pos; } +//------------------------------------------------------------------------------ +template +AXOM_DEVICE inline IndexType Array::reserveForDeviceInsert(IndexType n) +{ +#ifdef AXOM_DEVICE_CODE + // Device path: supports insertion while m_num_elements < m_capacity + // Does not support insertions which require reallocating the underlying + // buffer. + IndexType new_pos = RAJA::atomicAdd(&m_num_elements, n); + if(new_pos >= m_capacity) + { + #ifdef AXOM_DEBUG + printf( + "Array::reserveForInsert: size() exceeded capacity() when inserting " + "on the device.\n"); + #endif + #ifdef AXOM_USE_CUDA + __trap(); + #elif defined(AXOM_USE_HIP) + abort(); + #endif + } + return new_pos; +#endif +} + //------------------------------------------------------------------------------ template inline void Array::updateNumElements(IndexType new_num_elements) From dd17b5911e229d053ef5d714253b1ad84d88249e Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 5 Feb 2024 16:14:30 -0800 Subject: [PATCH 496/639] Add a test for device-side emplace/push_back --- src/axom/core/tests/core_array_for_all.hpp | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/src/axom/core/tests/core_array_for_all.hpp b/src/axom/core/tests/core_array_for_all.hpp index dcfe405832..3f1a5dd2d3 100644 --- a/src/axom/core/tests/core_array_for_all.hpp +++ b/src/axom/core/tests/core_array_for_all.hpp @@ -1177,4 +1177,75 @@ AXOM_TYPED_TEST(core_array_for_all, nontrivial_emplace) } } +//------------------------------------------------------------------------------ +constexpr int INSERT_ON_HOST = 1; +constexpr int INSERT_ON_DEVICE = 2; +struct DeviceInsert +{ + AXOM_HOST_DEVICE DeviceInsert(int value) : m_value(value) + { +#ifdef AXOM_DEVICE_CODE + m_host_or_device = INSERT_ON_DEVICE; +#else + m_host_or_device = INSERT_ON_HOST; +#endif + } + + int m_value; + int m_host_or_device; +}; + +AXOM_TYPED_TEST(core_array_for_all, device_insert) +{ + using ExecSpace = typename TestFixture::ExecSpace; + using DynamicArray = typename TestFixture::template DynamicTArray; + using DynamicArrayOfArrays = + typename TestFixture::template DynamicTArray; + + int kernelAllocID = axom::execution_space::allocatorID(); + + constexpr axom::IndexType N = 374; + + DynamicArrayOfArrays arr_container(1, 1, kernelAllocID); + arr_container[0] = DynamicArray(0, N, kernelAllocID); + const auto arr_v = arr_container.view(); + + EXPECT_EQ(arr_container[0].size(), 0); + EXPECT_EQ(arr_container[0].capacity(), N); + + axom::for_all( + N, + AXOM_LAMBDA(axom::IndexType idx) { arr_v[0].emplace_back(3 * idx + 5); }); + + // handles synchronization, if necessary + if(axom::execution_space::async()) + { + axom::synchronize(); + } + + EXPECT_EQ(arr_container[0].size(), N); + EXPECT_EQ(arr_container[0].capacity(), N); + + // Device-side inserts may occur in any order. + // Sort them before we check the inserted values. + std::sort(arr_container[0].begin(), + arr_container[0].end(), + [](const DeviceInsert& a, const DeviceInsert& b) -> bool { + return a.m_value < b.m_value; + }); + + for(int i = 0; i < N; i++) + { + EXPECT_EQ(arr_container[0][i].m_value, 3 * i + 5); + if(axom::execution_space::onDevice()) + { + EXPECT_EQ(arr_container[0][i].m_host_or_device, INSERT_ON_DEVICE); + } + else + { + EXPECT_EQ(arr_container[0][i].m_host_or_device, INSERT_ON_HOST); + } + } +} + } // end namespace testing From 0a53e1ac76b759d5deed06cd5d6347b9769eb64a Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 5 Feb 2024 16:19:09 -0800 Subject: [PATCH 497/639] Add comments about restrictions for device-side push_back --- src/axom/core/Array.hpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index 938f899dde..9a717594b3 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -595,6 +595,9 @@ class Array : public ArrayBase> * \param [in] value the value to be added to the back. * * \note Reallocation is done if the new size will exceed the capacity. + * \note If used in a device kernel, the number of push_backs must not exceed + * the capacity, since device-side reallocations aren't supported. + * \note Array must be allocated in unified memory if calling on the device. * * \pre DIM == 1 */ @@ -606,6 +609,9 @@ class Array : public ArrayBase> * \param [in] value the value to move to the back. * * \note Reallocation is done if the new size will exceed the capacity. + * \note If used in a device kernel, the number of push_backs must not exceed + * the capacity, since device-side reallocations aren't supported. + * \note Array must be allocated in unified memory if calling on the device. * * \pre DIM == 1 */ @@ -618,6 +624,9 @@ class Array : public ArrayBase> * * \note Reallocation is done if the new size will exceed the capacity. * \note The size increases by 1. + * \note If used in a device kernel, the number of push_backs must not exceed + * the capacity, since device-side reallocations aren't supported. + * \note Array must be allocated in unified memory if calling on the device. * * \pre DIM == 1 */ From 49aea30d702e77d5ea87e82e9fcc1f49f6a126ab Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 5 Feb 2024 18:03:47 -0800 Subject: [PATCH 498/639] Fix for OpenMP --- src/axom/core/tests/core_array_for_all.hpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/axom/core/tests/core_array_for_all.hpp b/src/axom/core/tests/core_array_for_all.hpp index 3f1a5dd2d3..b814314623 100644 --- a/src/axom/core/tests/core_array_for_all.hpp +++ b/src/axom/core/tests/core_array_for_all.hpp @@ -1215,7 +1215,23 @@ AXOM_TYPED_TEST(core_array_for_all, device_insert) axom::for_all( N, - AXOM_LAMBDA(axom::IndexType idx) { arr_v[0].emplace_back(3 * idx + 5); }); + AXOM_LAMBDA(axom::IndexType idx) { +#ifdef AXOM_USE_OPENMP + if(omp_in_parallel()) + { + #pragma omp critical + { + arr_v[0].emplace_back(3 * idx + 5); + } + } + else + { + arr_v[0].emplace_back(3 * idx + 5); + } +#else + arr_v[0].emplace_back(3 * idx + 5); +#endif + }); // handles synchronization, if necessary if(axom::execution_space::async()) From 490f8da3ec7f6f78084fdbbc58f30b242a2c771b Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 5 Feb 2024 21:22:25 -0800 Subject: [PATCH 499/639] Fixup ifdefs --- src/axom/core/tests/core_array_for_all.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/axom/core/tests/core_array_for_all.hpp b/src/axom/core/tests/core_array_for_all.hpp index b814314623..fb0ebdab91 100644 --- a/src/axom/core/tests/core_array_for_all.hpp +++ b/src/axom/core/tests/core_array_for_all.hpp @@ -1216,7 +1216,8 @@ AXOM_TYPED_TEST(core_array_for_all, device_insert) axom::for_all( N, AXOM_LAMBDA(axom::IndexType idx) { -#ifdef AXOM_USE_OPENMP +#if defined(AXOM_USE_OPENMP) && defined(AXOM_USE_RAJA) && \ + !defined(AXOM_DEVICE_CODE) if(omp_in_parallel()) { #pragma omp critical From 6332f90776a9a3dbd27146ec075edc256a8a3a33 Mon Sep 17 00:00:00 2001 From: Max Yang Date: Tue, 6 Feb 2024 14:58:39 -0800 Subject: [PATCH 500/639] Warnings cleanup --- src/axom/core/Array.hpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index 9a717594b3..4b0269832c 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -1513,7 +1513,12 @@ inline T* Array::reserveForInsert(IndexType n, IndexType pos) template AXOM_DEVICE inline IndexType Array::reserveForDeviceInsert(IndexType n) { -#ifdef AXOM_DEVICE_CODE +#ifndef AXOM_DEVICE_CODE + // Host path: should never be called. + AXOM_UNUSED_VAR(n); + assert(false); + return {}; +#else // Device path: supports insertion while m_num_elements < m_capacity // Does not support insertions which require reallocating the underlying // buffer. From 60f76839aa655b8b014039231ff6dce7a792e01d Mon Sep 17 00:00:00 2001 From: Max Yang Date: Wed, 7 Feb 2024 16:55:28 -0800 Subject: [PATCH 501/639] Update RELEASE-NOTES --- RELEASE-NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 36f4dbd425..d349b905ea 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -30,6 +30,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ negative, resulting in the signed volume becoming positive. - Adds `FlatMap`, a generic key-value store which aims for drop-in compatibility with `std::unordered_map`, but utilizes an open-addressing design. +- Adds support for device-side use of `Array::push_back()` and `Array::emplace_back()`. ### Changed - `DistributedClosestPoint` outputs are now controlled by the `setOutput` method. From cb66d9fc575edba0b57f1d39857c3d947eefe933 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 21 Feb 2024 18:17:28 -0800 Subject: [PATCH 502/639] Help compiler select the right Array::resize overload method. When IndexType is 64 bits, and a 2D Array is resized given a StackArray and a 64-bit value, compiler gags trying to cast the StackArray into an integral type when it should just instantiate a resize method that takes the StackArray. --- src/axom/core/Array.hpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index aaf9f81dc3..ad6ececbf0 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -723,7 +723,10 @@ class Array : public ArrayBase> * * \note Reallocation is done if the new size will exceed the capacity. */ - template > + template < + typename... Args, + typename Enable = typename std::enable_if< + sizeof...(Args) == DIM && detail::all_types_are_integral::value>::type> void resize(Args... args) { static_assert(std::is_default_constructible::value, @@ -735,7 +738,10 @@ class Array : public ArrayBase> } /// \overload - template > + template < + typename... Args, + typename Enable = typename std::enable_if< + sizeof...(Args) == DIM && detail::all_types_are_integral::value>::type> void resize(ArrayOptions::Uninitialized, Args... args) { const StackArray dims {{static_cast(args)...}}; From 1422a6e72092a8b0166f1a482085fde3521e88cf Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 21 Feb 2024 22:51:38 -0800 Subject: [PATCH 503/639] Restore check that facets aren't too far inside parent cell. Because parent cells smaller than the tolerance get inverted when contracted, I had disabled this test. Now, I have logic to limit the contraction to prevent inversion. --- src/axom/primal/geometry/Vector.hpp | 44 ++++++++++++++++++- .../detail/MarchingCubesSingleDomain.hpp | 1 - .../examples/quest_marching_cubes_example.cpp | 32 +++++++++++--- 3 files changed, 70 insertions(+), 7 deletions(-) diff --git a/src/axom/primal/geometry/Vector.hpp b/src/axom/primal/geometry/Vector.hpp index 2f1afc8362..08b000ab67 100644 --- a/src/axom/primal/geometry/Vector.hpp +++ b/src/axom/primal/geometry/Vector.hpp @@ -126,13 +126,31 @@ AXOM_HOST_DEVICE Vector operator*(const T scalar, /*! * \brief Scalar division of vector; Scalar on rhs. * \param [in] vec vector instance - * \param [in]n scalar user-supplied scalar. + * \param [in] scalar user-supplied scalar. * \return C resulting vector, \f$ \ni: C_i = vec_i / scalar, \forall i\f$ * \pre scalar != 0.0 */ template Vector operator/(const Vector& vec, const T scalar); +/*! + * \brief Element-wise < operator. + * \param [in] vec vector instance + * \param [in] scalar user-supplied scalar. + * \return Whether all vector elements are < a scalar. + */ +template +bool operator<(const Vector& vec, const T scalar); + +/*! + * \brief Element-wise >= operator. + * \param [in] vec vector instance + * \param [in] scalar user-supplied scalar. + * \return Whether all vector elements are >= a scalar. + */ +template +bool operator>=(const Vector& vec, const T scalar); + /*! * \brief Overloaded output operator for vectors * \param [in] os C++ output stream @@ -698,6 +716,30 @@ std::ostream& operator<<(std::ostream& os, const Vector& vec) return os; } +//------------------------------------------------------------------------------ +template +inline bool operator<(const Vector& vec, const T scalar) +{ + bool result(true); + for(int d = 0; d < NDIMS; ++d) + { + result &= vec[d] < scalar; + } + return result; +} + +//------------------------------------------------------------------------------ +template +inline bool operator>=(const Vector& vec, const T scalar) +{ + bool result(true); + for(int d = 0; d < NDIMS; ++d) + { + result &= vec[d] >= scalar; + } + return result; +} + //------------------------------------------------------------------------------ template inline Vector Vector::make_vector(const T& x, diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp index a1fb0f388f..7285134c9b 100644 --- a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp @@ -49,7 +49,6 @@ class MarchingCubesImpl; class MarchingCubesSingleDomain { public: - using DomainIdType = int; using RuntimePolicy = axom::runtime_policy::Policy; /*! * \brief Constructor for applying algorithm in a single domain. diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 21055bdbb8..d3eb7f839e 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -32,6 +32,7 @@ #include "axom/quest/MeshViewUtil.hpp" #include "axom/sidre.hpp" #include "axom/core/Types.hpp" +#include "axom/core/numerics/floating_point_limits.hpp" #include "conduit_blueprint.hpp" #include "conduit_relay_io_blueprint.hpp" @@ -828,7 +829,8 @@ struct ContourTestBase sidre::Group* meshGroup = objectDS.getRoot()->createGroup(sidreGroupName); axom::mint::UnstructuredMesh contourMesh( DIM, - DIM == 2 ? mint::CellType::SEGMENT : mint::CellType::TRIANGLE); + DIM == 2 ? mint::CellType::SEGMENT : mint::CellType::TRIANGLE, + meshGroup); axom::utilities::Timer extractTimer(false); extractTimer.start(); mc.populateContourMesh(contourMesh, m_parentCellIdField, m_domainIdField); @@ -847,7 +849,7 @@ struct ContourTestBase checkCellsContainingContour(computationalMesh, contourMesh); } - if(contourMesh.hasSidreGroup()) + if (contourMesh.hasSidreGroup()) { assert(contourMesh.getSidreGroup() == meshGroup); // Write contour mesh to file. @@ -1183,9 +1185,16 @@ struct ContourTestBase upper[d] = coordsViews[d][upperIdx]; } axom::primal::BoundingBox parentCellBox(lower, upper); - double tol = errorTolerance(); + auto tol = axom::numerics::floating_point_limits::epsilon(); axom::primal::BoundingBox big(parentCellBox); big.expand(tol); + axom::primal::BoundingBox small(parentCellBox); + auto range = parentCellBox.range(); + bool checkSmall = range >= tol; + if (checkSmall) + { + small.expand(-tol); + } axom::IndexType* cellNodeIds = contourMesh.getCellNodeIDs(contourCellNum); const axom::IndexType cellNodeCount = @@ -1202,7 +1211,18 @@ struct ContourTestBase SLIC_INFO_IF( params.isVerbose(), axom::fmt::format("checkContourCellLimits: node {} at {} " - "is not on parent cell boundary.", + "too far outside parent cell boundary.", + cellNodeIds[nn], + nodeCoords)); + } + + if(checkSmall && small.contains(nodeCoords)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("checkContourCellLimits: node {} at {} " + "too far inside parent cell boundary.", cellNodeIds[nn], nodeCoords)); } @@ -1530,7 +1550,9 @@ struct PlanarContourTest return std::string("dist_to_plane"); } - double errorTolerance() const override { return 1e-15; } + double errorTolerance() const override { + return axom::numerics::floating_point_limits::epsilon(); + } }; /// Utility function to transform blueprint node storage. From d117af7b711c9efec3f347ced41cfaaa6c067f38 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 22 Feb 2024 16:46:58 -0800 Subject: [PATCH 504/639] bump to blt 0.6.1 + openmp branch --- src/cmake/blt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmake/blt b/src/cmake/blt index 148c53ecc8..d5a13bdda6 160000 --- a/src/cmake/blt +++ b/src/cmake/blt @@ -1 +1 @@ -Subproject commit 148c53ecc8bcaad5eaa4c1e39cb8144b8f1388ae +Subproject commit d5a13bdda659b4e1da1846f0b3a6c0de26a4e5d6 From 903d3274e68991edabf40d2eacfff36280f7ab0e Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 22 Feb 2024 16:47:24 -0800 Subject: [PATCH 505/639] guard against bare fmt call --- src/axom/sidre/examples/sidre_createdatastore.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/axom/sidre/examples/sidre_createdatastore.cpp b/src/axom/sidre/examples/sidre_createdatastore.cpp index 1045c7edc0..15becfd9c2 100644 --- a/src/axom/sidre/examples/sidre_createdatastore.cpp +++ b/src/axom/sidre/examples/sidre_createdatastore.cpp @@ -208,7 +208,7 @@ void access_datastore(DataStore* ds) void iterate_datastore(DataStore* ds) { - const std::string fill_line = fmt::format("{:=^80}", ""); + const std::string fill_line = axom::fmt::format("{:=^80}", ""); std::cout << fill_line << std::endl; @@ -216,7 +216,7 @@ void iterate_datastore(DataStore* ds) std::cout << "The datastore has the following attributes:\n"; for(auto& attr : ds->attributes()) { - std::cout << fmt::format(" * [{}] '{}' of type {} and default value: {}\n", + std::cout << axom::fmt::format(" * [{}] '{}' of type {} and default value: {}\n", attr.getIndex(), attr.getName(), conduit::DataType::id_to_name(attr.getTypeID()), @@ -229,7 +229,7 @@ void iterate_datastore(DataStore* ds) std::cout << "The datastore has the following buffers:\n"; for(auto& buff : ds->buffers()) { - std::cout << fmt::format( + std::cout << axom::fmt::format( " * [{}] {} buffer with {} elements of type {} with {} views\n", buff.getIndex(), buff.isAllocated() ? "Allocated" : "Unallocated", @@ -244,7 +244,7 @@ void iterate_datastore(DataStore* ds) std::cout << "The root group has the following groups:\n"; for(auto& grp : ds->getRoot()->groups()) { - std::cout << fmt::format(" * [{}] '{}' with {} groups and {} views\n", + std::cout << axom::fmt::format(" * [{}] '{}' with {} groups and {} views\n", grp.getIndex(), grp.getName(), grp.getNumGroups(), @@ -257,7 +257,7 @@ void iterate_datastore(DataStore* ds) std::cout << "The 'state' group has the following views:\n"; for(auto& view : ds->getRoot()->getGroup("state")->views()) { - std::cout << fmt::format( + std::cout << axom::fmt::format( " * [{}] '{}' -- {} view of type {} and {} elements\n", view.getIndex(), view.getName(), From b1598148e6bbffc4b3697e14eecf243711968607 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 22 Feb 2024 16:48:18 -0800 Subject: [PATCH 506/639] use umpire on new branch til they release --- scripts/spack/packages/umpire/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spack/packages/umpire/package.py b/scripts/spack/packages/umpire/package.py index 4c3388f6bb..01e24fd6b9 100644 --- a/scripts/spack/packages/umpire/package.py +++ b/scripts/spack/packages/umpire/package.py @@ -8,4 +8,4 @@ class Umpire(RadiussUmpire): # Note: This just points at a commit in the task/update-blt-tpl-exports branch. # It also has a made up version - version("2024.01.31", commit="f2ae5edd1e49e7fa18656203d742de3bd9490961", submodules=False) + version("2024.01.31.1", commit="f2ae5edd1e49e7fa18656203d742de3bd9490961", submodules=True) From e548dd98259cfb0a9fbc5648a7d82149a1624555 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 22 Feb 2024 16:50:13 -0800 Subject: [PATCH 507/639] unify and clean up finding --- src/cmake/axom-config.cmake.in | 31 ++++++++++++------- .../thirdparty/SetupAxomThirdParty.cmake | 15 +++++---- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/cmake/axom-config.cmake.in b/src/cmake/axom-config.cmake.in index 28271ed1ef..e8f47bfb78 100644 --- a/src/cmake/axom-config.cmake.in +++ b/src/cmake/axom-config.cmake.in @@ -75,6 +75,11 @@ if(NOT AXOM_FOUND) #---------------------------------------------------------------------------- include(CMakeFindDependencyMacro) + # Enable various find commands to look in non-default paths + set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS TRUE) + set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE) + set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS TRUE) + # c2c if(AXOM_USE_C2C) set(AXOM_C2C_DIR "@C2C_DIR@") @@ -84,28 +89,28 @@ if(NOT AXOM_FOUND) # camp if(AXOM_USE_CAMP) set(AXOM_CAMP_DIR "@CAMP_DIR@") - if(NOT camp_DIR) - set(camp_DIR ${AXOM_CAMP_DIR}) + if(NOT CAMP_DIR) + set(CAMP_DIR ${AXOM_CAMP_DIR}) endif() - find_dependency(camp REQUIRED) + find_dependency(camp REQUIRED PATHS "${CAMP_DIR}") endif() # umpire if(AXOM_USE_UMPIRE) set(AXOM_UMPIRE_DIR "@UMPIRE_DIR@") - if(NOT umpire_DIR) - set(umpire_DIR ${AXOM_UMPIRE_DIR}) + if(NOT UMPIRE_DIR) + set(UMPIRE_DIR ${AXOM_UMPIRE_DIR}) endif() - find_dependency(umpire REQUIRED) + find_dependency(umpire REQUIRED PATHS "${UMPIRE_DIR}") endif() # raja if(AXOM_USE_RAJA) set(AXOM_RAJA_DIR "@RAJA_DIR@") - if(NOT raja_DIR) - set(raja_DIR ${AXOM_RAJA_DIR}) + if(NOT RAJA_DIR) + set(RAJA_DIR ${AXOM_RAJA_DIR}) endif() - find_dependency(RAJA REQUIRED) + find_dependency(RAJA REQUIRED PATHS "${RAJA_DIR}") endif() # conduit @@ -120,8 +125,9 @@ if(NOT AXOM_FOUND) find_package(MPI REQUIRED) endif() - find_dependency(Conduit REQUIRED NO_DEFAULT_PATH - PATHS "${CONDUIT_DIR}/@AXOM_CONDUIT_CONFIG_SUBDIR@") + find_dependency(Conduit REQUIRED + PATHS "${CONDUIT_DIR}" + "${CONDUIT_DIR}/lib/cmake/conduit") endif() # hdf5 @@ -161,7 +167,8 @@ if(NOT AXOM_FOUND) # we want the import root, which is right above the "lib" prefix get_filename_component(_IMPORT_ROOT "${_IMPORT_PREFIX}" PATH) - include(${AXOM_CMAKE_CONFIG_DIR}/BLTSetupTargets.cmake)include(${AXOM_CMAKE_CONFIG_DIR}/axom-targets.cmake) + include(${AXOM_CMAKE_CONFIG_DIR}/BLTSetupTargets.cmake) + include(${AXOM_CMAKE_CONFIG_DIR}/axom-targets.cmake) # Create convenience target that bundles all Axom targets (axom) add_library(axom INTERFACE IMPORTED) diff --git a/src/cmake/thirdparty/SetupAxomThirdParty.cmake b/src/cmake/thirdparty/SetupAxomThirdParty.cmake index 9a3447d497..37c2f5490d 100644 --- a/src/cmake/thirdparty/SetupAxomThirdParty.cmake +++ b/src/cmake/thirdparty/SetupAxomThirdParty.cmake @@ -35,16 +35,15 @@ if ((RAJA_DIR OR UMPIRE_DIR) AND NOT CAMP_DIR) endif() axom_assert_is_directory(VARIABLE_NAME CAMP_DIR) -set(camp_DIR ${CAMP_DIR}) -find_dependency(camp REQUIRED) +find_dependency(camp REQUIRED PATHS "${CAMP_DIR}") +set(CAMP_FOUND TRUE CACHE BOOL "") #------------------------------------------------------------------------------ # UMPIRE #------------------------------------------------------------------------------ if (UMPIRE_DIR) axom_assert_is_directory(VARIABLE_NAME UMPIRE_DIR) - set(umpire_DIR ${UMPIRE_DIR}) - find_package(umpire REQUIRED) + find_dependency(umpire REQUIRED PATHS "${UMPIRE_DIR}") message(STATUS "Checking for expected Umpire target 'umpire'") if (NOT TARGET umpire) @@ -65,8 +64,7 @@ endif() #------------------------------------------------------------------------------ if (RAJA_DIR) axom_assert_is_directory(VARIABLE_NAME RAJA_DIR) - set(raja_DIR ${RAJA_DIR}) - find_dependency(raja REQUIRED) + find_dependency(raja REQUIRED PATHS "${RAJA_DIR}") message(STATUS "Checking for expected RAJA target 'RAJA'") if (NOT TARGET RAJA) @@ -86,8 +84,9 @@ endif() # newer CMake versions if (CONDUIT_DIR) axom_assert_is_directory(VARIABLE_NAME CONDUIT_DIR) - set(conduit_DIR ${CONDUIT_DIR}) - find_dependency(conduit REQUIRED) + find_dependency(Conduit REQUIRED + PATHS "${CONDUIT_DIR}" + "${CONDUIT_DIR}/lib/cmake/conduit") message(STATUS "Checking for expected Conduit target 'conduit::conduit'") if (NOT TARGET conduit::conduit) From 3e12efe8cd6e72af864c8898eab8d3b8ea30bb9e Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 17 Jan 2024 14:47:39 -0800 Subject: [PATCH 508/639] Testing variations of reading silo into conduit --- src/axom/quest/examples/CMakeLists.txt | 11 + .../quest/examples/quest_bvh_silo_example.cpp | 650 ++++++++++++++++++ 2 files changed, 661 insertions(+) create mode 100644 src/axom/quest/examples/quest_bvh_silo_example.cpp diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index e8b52053c5..eef2e18209 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -33,6 +33,17 @@ if (RAJA_FOUND AND UMPIRE_FOUND) ) endif() +# BVH silo example ------------------------------------------------------------ +if (CONDUIT_FOUND AND RAJA_FOUND AND UMPIRE_FOUND) + axom_add_executable( + NAME quest_bvh_silo_example_ex + SOURCES quest_bvh_silo_example.cpp + OUTPUT_DIR ${EXAMPLE_OUTPUT_DIRECTORY} + DEPENDS_ON ${quest_example_depends} conduit::conduit + FOLDER axom/quest/examples + ) +endif() + # Shaping example ------------------------------------------------------------- if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI AND AXOM_ENABLE_SIDRE AND AXOM_ENABLE_MFEM_SIDRE_DATACOLLECTION diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp new file mode 100644 index 0000000000..8f29f27076 --- /dev/null +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -0,0 +1,650 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +//----------------------------------------------------------------------------- +/// +/// file: device_spatial_indexes.cpp +/// +/// This example uses a spatial index, the linear BVH tree from Axom's spin +/// component, in addition to RAJA and Umpire based kernels for a highly +// efficient performance-portable self-intersection algorithm. +//----------------------------------------------------------------------------- + +#include "axom/config.hpp" +#include "axom/core.hpp" +#include "axom/slic.hpp" + +#ifdef AXOM_USE_RAJA + #include "RAJA/RAJA.hpp" +#else + #error This example requires axom to be configured with RAJA support +#endif + +#ifdef AXOM_USE_UMPIRE + #include "umpire/Umpire.hpp" +#else + #error This example requires axom to be configured with Umpire support +#endif + +#ifdef AXOM_USE_CONDUIT + #include "conduit_relay.hpp" + #include "conduit_relay_io_silo.hpp" +#else + #error This example requires axom to be configured with Conduit support +#endif + +#include "axom/mint.hpp" +#include "axom/primal.hpp" +#include "axom/spin.hpp" +#include "axom/quest.hpp" + +#include "axom/fmt.hpp" +#include "axom/CLI11.hpp" + +#include +#include + +using seq_exec = axom::SEQ_EXEC; + +// clang-format off +#if defined(AXOM_USE_OPENMP) + using omp_exec = axom::OMP_EXEC; +#else + using omp_exec = seq_exec; +#endif + +#if defined(AXOM_USE_CUDA) + constexpr int BLK_SZ = 256; + using cuda_exec = axom::CUDA_EXEC; +#else + using cuda_exec = seq_exec; +#endif +// clang-format on + +//----------------------------------------------------------------------------- +/// Basic RAII utility class for initializing and finalizing slic logger +//----------------------------------------------------------------------------- +struct BasicLogger +{ + BasicLogger() + { + namespace slic = axom::slic; + + // Initialize the SLIC logger + slic::initialize(); + slic::setLoggingMsgLevel(slic::message::Debug); + + // Customize logging levels and formatting + const std::string slicFormatStr = "[lesson_04: ] \n"; + + slic::addStreamToMsgLevel(new slic::GenericOutputStream(&std::cerr), + slic::message::Error); + slic::addStreamToMsgLevel( + new slic::GenericOutputStream(&std::cerr, slicFormatStr), + slic::message::Warning); + + auto* compactStream = + new slic::GenericOutputStream(&std::cout, slicFormatStr); + slic::addStreamToMsgLevel(compactStream, slic::message::Info); + slic::addStreamToMsgLevel(compactStream, slic::message::Debug); + } + + ~BasicLogger() { axom::slic::finalize(); } +}; + +//----------------------------------------------------------------------------- +/// Struct to help with parsing and storing command line args +//----------------------------------------------------------------------------- +enum class RuntimePolicy +{ + raja_seq = 1, + raja_omp = 2, + raja_cuda = 3 +}; + +struct Input +{ + static const std::map s_validPolicies; + + std::string mesh_file {""}; + bool verboseOutput {false}; + double weldThreshold {1e-6}; + double intersectionThreshold {1e-08}; + RuntimePolicy policy {RuntimePolicy::raja_seq}; + + void parse(int argc, char** argv, axom::CLI::App& app); + bool isVerbose() const { return verboseOutput; } +}; + +void Input::parse(int argc, char** argv, axom::CLI::App& app) +{ + app.add_option("-i, --infile", mesh_file) + ->description("The input STL mesh file") + ->required() + ->check(axom::CLI::ExistingFile); + + app.add_flag("-v,--verbose", verboseOutput) + ->description("Increase logging verbosity?") + ->capture_default_str(); + + app.add_option("--weld-threshold", weldThreshold) + ->description( + "Threshold to use when welding vertices.\n" + "Will skip if not strictly positive.") + ->capture_default_str(); + + app.add_option("--intersection-threshold", intersectionThreshold) + ->description("Threshold to use when testing for intersecting triangles") + ->capture_default_str(); + + app.add_option("-p, --policy", policy) + ->description( + "Execution policy." + "\nSet to 'raja_seq' or 1 to use the RAJA sequential policy." +#ifdef AXOM_USE_OPENMP + "\nSet to 'raja_omp' or 2 to use the RAJA openmp policy." +#endif +#ifdef AXOM_USE_OPENMP + "\nSet to 'raja_cuda' or 3 to use the RAJA cuda policy." +#endif + ) + ->capture_default_str() + ->transform(axom::CLI::CheckedTransformer(Input::s_validPolicies)); + + app.get_formatter()->column_width(40); + + app.parse(argc, argv); // Could throw an exception + + // Output parsed information + SLIC_INFO(axom::fmt::format( + R"( + Parsed parameters: + * STL mesh: '{}' + * Threshold for welding: {} + * Skip welding: {} + * Threshold for intersections: {} + * Verbose logging: {} + * Runtime execution policy: '{}' + )", + mesh_file, + weldThreshold, + (weldThreshold <= 0.), + intersectionThreshold, + verboseOutput, + policy == RuntimePolicy::raja_omp + ? "raja_omp" + : (policy == RuntimePolicy::raja_cuda) ? "raja_cuda" : "raja_seq")); +} + +const std::map Input::s_validPolicies( + {{"raja_seq", RuntimePolicy::raja_seq} +#ifdef AXOM_USE_OPENMP + , + {"raja_omp", RuntimePolicy::raja_omp} +#endif +#ifdef AXOM_USE_CUDA + , + {"raja_cuda", RuntimePolicy::raja_cuda} +#endif + }); + +//----------------------------------------------------------------------------- +/// Basic triangle mesh to be used in our application +//----------------------------------------------------------------------------- +struct TriangleMesh +{ + using Point = axom::primal::Point; + using Triangle = axom::primal::Triangle; + using BoundingBox = axom::primal::BoundingBox; + + axom::IndexType numTriangles() const { return m_triangles.size(); } + axom::Array& triangles() { return m_triangles; } + const axom::Array& triangles() const { return m_triangles; } + + BoundingBox& meshBoundingBox() { return m_meshBoundingBox; } + const BoundingBox& meshBoundingBox() const { return m_meshBoundingBox; } + + axom::Array& triangleBoundingBoxes() + { + return m_triangleBoundingBoxes; + } + const axom::Array& triangleBoundingBoxes() const + { + return m_triangleBoundingBoxes; + } + + axom::Array m_triangles; + axom::Array m_triangleBoundingBoxes; + BoundingBox m_meshBoundingBox; +}; + +void loadSiloMesh(const std::string& mesh_path, double weldThreshold) +{ + conduit::Node n_load; + conduit::Node n_opts; + n_opts["mesh_name"] = ""; + + std::string new_path; + new_path.append(mesh_path); + new_path.append(":MMESH"); + + // conduit write and read, works + // int a_val = 20; + // int b_val = 8; + // int c_val = 13; + + // conduit::Node n; + // n["a"] = a_val; + // n["b"] = b_val; + // n["c"] = c_val; + // conduit::relay::io::silo_write(n,"tout_cold_storage_test.silo:myobj"); + + // conduit::relay::io::silo_read("tout_cold_storage_test.silo:myobj",n_load); + + // std::cout << "round trip" << std::endl; + // n_load.print(); + + + // This has to already have blueprint stuff... + // conduit::relay::io::blueprint::load_mesh(mesh_path,n_load); + + // Invalid path for load... (same after develop update...) + // conduit::relay::io::load(mesh_path,n_load); + + // THIS WORKS!!! After updating to conduit develop... + // In t_relay_silo.cpp at the bottom, does not work.... + // + // Function does not exist.... + // conduit::relay::io::silo::load_mesh(mesh_path, n_opts, n_load); + // conduit::relay::io::silo::load_mesh(mesh_path, n_load); + + // In conduit_relay_io_silo_api.hpp, Invalid path for load... (same after develop) + // conduit::relay::io::silo_read(mesh_path, n_load); + + // In conduit_relay_io_silo_api.hpp (same after develop update...) + // DBGetVarLength: Low-level function call failed: MMESH_conduit_json + // DBGetVarLength: Low-level function call failed: MMESH_conduit_bin + // terminate called after throwing an instance of 'std::bad_alloc' + // conduit::relay::io::silo_read(new_path, n_load); + + // Invalid path for load... (same after develop update...) + // DBGetVarLength: Low-level function call failed: MMESH_conduit_json + // DBGetVarLength: Low-level function call failed: MMESH_conduit_bin + // terminate called after throwing an instance of 'std::bad_alloc' + // conduit::relay::io::load(new_path,n_load); + + n_load.print(); +} + +TriangleMesh makeTriangleMesh(const std::string& stl_mesh_path, + double weldThreshold) +{ + TriangleMesh triMesh; + + // load STL mesh into a mint unstructured mesh + auto* surface_mesh = new axom::mint::UnstructuredMesh( + 3, + axom::mint::TRIANGLE); + { + axom::utilities::Timer timer(true); + + auto reader = std::make_unique(); + reader->setFileName(stl_mesh_path); + reader->read(); + reader->getMesh(surface_mesh); + + timer.stop(); + SLIC_INFO(axom::fmt::format("Loading the mesh took {:4.3} seconds.", + timer.elapsedTimeInSec())); + } + + // optionally weld triangle mesh + if(weldThreshold > 0.) + { + axom::utilities::Timer timer(true); + axom::quest::weldTriMeshVertices(&surface_mesh, weldThreshold); + timer.stop(); + + SLIC_INFO(axom::fmt::format("Vertex welding took {:4.3} seconds.", + timer.elapsedTimeInSec())); + SLIC_INFO(axom::fmt::format( + axom::utilities::locale(), + "After welding, mesh has {:L} vertices and {:L} triangles.", + surface_mesh->getNumberOfNodes(), + surface_mesh->getNumberOfCells())); + } + + // extract triangles into an axom::Array + const int numCells = surface_mesh->getNumberOfCells(); + triMesh.m_triangles.reserve(numCells); + { + TriangleMesh::Triangle tri; + std::array triCell; + for(int i = 0; i < numCells; ++i) + { + surface_mesh->getCellNodeIDs(i, triCell.data()); + surface_mesh->getNode(triCell[0], tri[0].data()); + surface_mesh->getNode(triCell[1], tri[1].data()); + surface_mesh->getNode(triCell[2], tri[2].data()); + + triMesh.m_triangles.emplace_back(tri); + } + } + + delete surface_mesh; + surface_mesh = nullptr; + + // compute and store triangle bounding boxes and mesh bounding box + triMesh.m_triangleBoundingBoxes.reserve(numCells); + for(const auto& tri : triMesh.triangles()) + { + triMesh.m_triangleBoundingBoxes.emplace_back( + axom::primal::compute_bounding_box(tri)); + triMesh.m_meshBoundingBox.addBox(triMesh.m_triangleBoundingBoxes.back()); + } + + SLIC_INFO( + axom::fmt::format("Mesh bounding box is {}.", triMesh.meshBoundingBox())); + + return triMesh; +} + +using IndexPair = std::pair; + +template +axom::Array findIntersectionsBVH(const TriangleMesh& triMesh, + double tol, + bool verboseOutput = false) +{ + SLIC_INFO("Running naive intersection algorithm in execution Space: " + << axom::execution_space::name()); + + using TriangleArray = axom::Array; + using BBoxArray = axom::Array; + using IndexArray = axom::Array; + constexpr bool on_device = axom::execution_space::onDevice(); + + using ATOMIC_POL = typename axom::execution_space::atomic_policy; + + axom::Array intersectionPairs; + + // Get ids of necessary allocators + const int host_allocator = + axom::getUmpireResourceAllocatorID(umpire::resource::Host); + const int kernel_allocator = on_device + ? axom::getUmpireResourceAllocatorID(umpire::resource::Device) + : axom::execution_space::allocatorID(); + + // Copy the triangles to the device, if necessary + // Either way, tris_v will be a view w/ data in the correct space + auto& tris_h = triMesh.triangles(); + TriangleArray tris_d = + on_device ? TriangleArray(tris_h, kernel_allocator) : TriangleArray(); + auto tris_v = on_device ? tris_d.view() : tris_h.view(); + + // Copy the bboxes to the device, if necessary + // Either way, bbox_v will be a view w/ data in the correct space + auto& bbox_h = triMesh.triangleBoundingBoxes(); + BBoxArray bbox_d = + on_device ? BBoxArray(bbox_h, kernel_allocator) : BBoxArray(); + auto bbox_v = on_device ? bbox_d.view() : bbox_h.view(); + + axom::utilities::Timer timer; + + // Initialize a BVH tree over the triangle bounding boxes + timer.start(); + axom::spin::BVH<3, ExecSpace, double> bvh; + bvh.setAllocatorID(kernel_allocator); + bvh.initialize(bbox_v, bbox_v.size()); + timer.stop(); + SLIC_INFO_IF(verboseOutput, + axom::fmt::format("0: Initializing BVH took {:4.3} seconds.", + timer.elapsedTimeInSec())); + + // Search for intersecting bounding boxes of triangles; + // result is returned as CSR arrays for candidate data + timer.start(); + IndexArray offsets_d(bbox_v.size(), bbox_v.size(), kernel_allocator); + IndexArray counts_d(bbox_v.size(), bbox_v.size(), kernel_allocator); + IndexArray candidates_d(0, 0, kernel_allocator); + + auto offsets_v = offsets_d.view(); + auto counts_v = counts_d.view(); + bvh.findBoundingBoxes(offsets_v, counts_v, candidates_d, bbox_v.size(), bbox_v); + + timer.stop(); + SLIC_INFO_IF(verboseOutput, + axom::fmt::format( + "1: Querying candidate bounding boxes took {:4.3} seconds.", + timer.elapsedTimeInSec())); + + // Expand candidate list into corresponding arrays of indices + // Only keep results where candidate has a greater index than triangle + // and when both are non-degenerate + IndexArray indices_d(axom::ArrayOptions::Uninitialized {}, + candidates_d.size(), + kernel_allocator); + + IndexArray validCandidates_d(axom::ArrayOptions::Uninitialized {}, + candidates_d.size(), + kernel_allocator); + + axom::IndexType numCandidates {}; + timer.start(); + { + const int totalTriangles = triMesh.numTriangles(); + + IndexArray numValidCandidates_d(1, 1, kernel_allocator); + numValidCandidates_d.fill(0); + auto* numValidCandidates_p = numValidCandidates_d.data(); + + auto indices_v = indices_d.view(); + auto validCandidates_v = validCandidates_d.view(); + auto candidates_v = candidates_d.view(); + + // Compute a device bool array of validity flags + axom::Array is_valid_d(axom::ArrayOptions::Uninitialized {}, + bbox_v.size(), + kernel_allocator); + auto is_valid_v = is_valid_d.view(); + + axom::for_all( + totalTriangles, + AXOM_LAMBDA(axom::IndexType i) { is_valid_v[i] = !tris_v[i].degenerate(); }); + + // Keep pairs of valid triangles whose bounding boxes overlap + axom::for_all( + totalTriangles, + AXOM_LAMBDA(axom::IndexType i) { + for(int j = 0; j < counts_v[i]; j++) + { + const axom::IndexType potential = candidates_v[offsets_v[i] + j]; + if(i < potential && is_valid_v[i] && is_valid_v[potential]) + { + const auto idx = RAJA::atomicAdd(numValidCandidates_p, + axom::IndexType {1}); + indices_v[idx] = i; + validCandidates_v[idx] = potential; + } + } + }); + + axom::copy(&numCandidates, numValidCandidates_p, sizeof(axom::IndexType)); + } + timer.stop(); + SLIC_INFO_IF( + verboseOutput, + axom::fmt::format("2: Filtering invalid candidates took {:4.3} seconds.", + timer.elapsedTimeInSec())); + + // Iterate through valid candidates to find actual intersections + IndexArray intersect_d[2] = {IndexArray(axom::ArrayOptions::Uninitialized {}, + numCandidates, + kernel_allocator), + IndexArray(axom::ArrayOptions::Uninitialized {}, + numCandidates, + kernel_allocator)}; + axom::IndexType numIntersections {}; + timer.start(); + { + auto intersect1_v = intersect_d[0].view(); + auto intersect2_v = intersect_d[1].view(); + + IndexArray numIntersections_d(1, 1, kernel_allocator); + auto* numIntersections_p = numIntersections_d.data(); + + auto indices_v = indices_d.view(); + auto validCandidates_v = validCandidates_d.view(); + + // Perform triangle-triangle tests + axom::for_all( + numCandidates, + AXOM_LAMBDA(axom::IndexType i) { + constexpr bool includeBoundaries = false; + const auto index = indices_v[i]; + const auto candidate = validCandidates_v[i]; + if(axom::primal::intersect(tris_v[index], + tris_v[candidate], + includeBoundaries, + tol)) + { + const auto idx = + RAJA::atomicAdd(numIntersections_p, axom::IndexType {1}); + intersect1_v[idx] = index; + intersect2_v[idx] = candidate; + } + }); + + axom::copy(&numIntersections, numIntersections_p, sizeof(axom::IndexType)); + } + intersect_d[0].resize(numIntersections); + intersect_d[1].resize(numIntersections); + + timer.stop(); + SLIC_INFO_IF( + verboseOutput, + axom::fmt::format("3: Finding actual intersections took {:4.3} seconds.", + timer.elapsedTimeInSec())); + + SLIC_INFO_IF( + verboseOutput, + axom::fmt::format(axom::utilities::locale(), + R"(Stats for self-intersection query + -- Number of mesh triangles {:L} + -- Total possible candidates {:L} + -- Candidates from BVH query {:L} + -- Potential candidates after filtering {:L} + -- Actual intersections {:L} + )", + triMesh.numTriangles(), + triMesh.numTriangles() * (triMesh.numTriangles() - 1) / 2., + candidates_d.size(), + numCandidates, + numIntersections)); + + // copy results back to host and into return vector + IndexArray intersect_h[2] = { + on_device ? IndexArray(intersect_d[0], host_allocator) : IndexArray(), + on_device ? IndexArray(intersect_d[1], host_allocator) : IndexArray()}; + + auto intersect1_h_v = on_device ? intersect_h[0].view() : intersect_d[0].view(); + auto intersect2_h_v = on_device ? intersect_h[1].view() : intersect_d[1].view(); + + for(axom::IndexType idx = 0; idx < numIntersections; ++idx) + { + intersectionPairs.emplace_back( + std::make_pair(intersect1_h_v[idx], intersect2_h_v[idx])); + } + + return intersectionPairs; +} + +int main(int argc, char** argv) +{ + // Initialize logger; use RAII so it will finalize at the end of the application + BasicLogger logger; + + // Parse the command line arguments + Input params; + { + axom::CLI::App app {"Naive triangle mesh intersection tester"}; + try + { + params.parse(argc, argv, app); + } + catch(const axom::CLI::ParseError& e) + { + return app.exit(e); + } + } + + // Update the logging level based on verbosity flag + axom::slic::setLoggingMsgLevel(params.isVerbose() ? axom::slic::message::Debug + : axom::slic::message::Info); + + // Load Silo mesh + SLIC_INFO(axom::fmt::format("Reading file: '{}'...\n", params.mesh_file)); + + loadSiloMesh(params.mesh_file, params.weldThreshold); + // TriangleMesh mesh = makeTriangleMesh(params.mesh_file, params.weldThreshold); + + // Check for self-intersections; results are returned as an array of index pairs +// axom::Array intersectionPairs; +// axom::utilities::Timer timer(true); +// switch(params.policy) +// { +// case RuntimePolicy::raja_omp: +// #ifdef AXOM_USE_OPENMP +// intersectionPairs = +// findIntersectionsBVH(mesh, +// params.intersectionThreshold, +// params.isVerbose()); +// #endif +// break; +// case RuntimePolicy::raja_cuda: +// #ifdef AXOM_USE_CUDA +// intersectionPairs = +// findIntersectionsBVH(mesh, +// params.intersectionThreshold, +// params.isVerbose()); +// #endif +// break; +// default: // RuntimePolicy::raja_seq +// intersectionPairs = +// findIntersectionsBVH(mesh, +// params.intersectionThreshold, +// params.isVerbose()); +// break; +// } +// timer.stop(); + +// SLIC_INFO(axom::fmt::format("Computing intersections {} took {:4.3} seconds.", +// "with a BVH tree", +// timer.elapsedTimeInSec())); +// SLIC_INFO(axom::fmt::format(axom::utilities::locale(), +// "Mesh had {:L} intersection pairs", +// intersectionPairs.size())); + +// // print first few pairs +// const int numIntersections = intersectionPairs.size(); +// if(numIntersections > 0 && params.isVerbose()) +// { +// constexpr int MAX_PRINT = 20; +// if(numIntersections > MAX_PRINT) +// { +// intersectionPairs.resize(MAX_PRINT); +// SLIC_INFO(axom::fmt::format("First {} intersection pairs: {} ...\n", +// MAX_PRINT, +// axom::fmt::join(intersectionPairs, ", "))); +// } +// else +// { +// SLIC_INFO(axom::fmt::format("Intersection pairs: {}\n", +// axom::fmt::join(intersectionPairs, ", "))); +// } +// } + + return 0; +} From 036cf3c3a4b2d371c58b19d8d97cfe191d7aa9f0 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 17 Jan 2024 14:48:17 -0800 Subject: [PATCH 509/639] Changes to use conduit@develop with silo to get necessary silo features --- scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml | 2 +- scripts/spack/configs/toss_4_x86_64_ib/spack.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml index afb2b5fe6a..f7de55ea42 100644 --- a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -306,7 +306,7 @@ spack: camp: require: "@2023.06.0" conduit: - require: "@0.8.8~shared~test~examples~utilities" + require: "@develop~shared~test~examples~utilities+silo" hdf5: variants: ~shared~mpi hypre: diff --git a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml index 9045d48165..3e80f20f5b 100644 --- a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml @@ -270,7 +270,7 @@ spack: camp: require: "@2023.06.0" conduit: - require: "@0.8.8~shared~test~examples~utilities" + require: "@develop~shared~test~examples~utilities+silo" hdf5: variants: ~shared~mpi hypre: From aca3137fdd4aee3a2299f170bdea55b568110fe7 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 19 Jan 2024 07:46:19 -0800 Subject: [PATCH 510/639] WIP - printing out conduit node details --- .../quest/examples/quest_bvh_silo_example.cpp | 54 ++----------------- 1 file changed, 4 insertions(+), 50 deletions(-) diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index 8f29f27076..2f7d3abb25 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -223,59 +223,13 @@ struct TriangleMesh void loadSiloMesh(const std::string& mesh_path, double weldThreshold) { conduit::Node n_load; - conduit::Node n_opts; - n_opts["mesh_name"] = ""; + conduit::relay::io::silo::load_mesh(mesh_path, n_load); - std::string new_path; - new_path.append(mesh_path); - new_path.append(":MMESH"); + n_load.print_detailed(); - // conduit write and read, works - // int a_val = 20; - // int b_val = 8; - // int c_val = 13; + // Gets us the number of domains, yay... + SLIC_INFO("Number of children are " << n_load.number_of_children()); - // conduit::Node n; - // n["a"] = a_val; - // n["b"] = b_val; - // n["c"] = c_val; - // conduit::relay::io::silo_write(n,"tout_cold_storage_test.silo:myobj"); - - // conduit::relay::io::silo_read("tout_cold_storage_test.silo:myobj",n_load); - - // std::cout << "round trip" << std::endl; - // n_load.print(); - - - // This has to already have blueprint stuff... - // conduit::relay::io::blueprint::load_mesh(mesh_path,n_load); - - // Invalid path for load... (same after develop update...) - // conduit::relay::io::load(mesh_path,n_load); - - // THIS WORKS!!! After updating to conduit develop... - // In t_relay_silo.cpp at the bottom, does not work.... - // - // Function does not exist.... - // conduit::relay::io::silo::load_mesh(mesh_path, n_opts, n_load); - // conduit::relay::io::silo::load_mesh(mesh_path, n_load); - - // In conduit_relay_io_silo_api.hpp, Invalid path for load... (same after develop) - // conduit::relay::io::silo_read(mesh_path, n_load); - - // In conduit_relay_io_silo_api.hpp (same after develop update...) - // DBGetVarLength: Low-level function call failed: MMESH_conduit_json - // DBGetVarLength: Low-level function call failed: MMESH_conduit_bin - // terminate called after throwing an instance of 'std::bad_alloc' - // conduit::relay::io::silo_read(new_path, n_load); - - // Invalid path for load... (same after develop update...) - // DBGetVarLength: Low-level function call failed: MMESH_conduit_json - // DBGetVarLength: Low-level function call failed: MMESH_conduit_bin - // terminate called after throwing an instance of 'std::bad_alloc' - // conduit::relay::io::load(new_path,n_load); - - n_load.print(); } TriangleMesh makeTriangleMesh(const std::string& stl_mesh_path, From f31db96bdb5e3f36b7f8bce8199f0c546c3146db Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 19 Jan 2024 15:50:32 -0800 Subject: [PATCH 511/639] WIP - figured out accessor details... --- .../quest/examples/quest_bvh_silo_example.cpp | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index 2f7d3abb25..d3d2d806d7 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -77,7 +77,7 @@ struct BasicLogger slic::setLoggingMsgLevel(slic::message::Debug); // Customize logging levels and formatting - const std::string slicFormatStr = "[lesson_04: ] \n"; + const std::string slicFormatStr = "[] \n"; slic::addStreamToMsgLevel(new slic::GenericOutputStream(&std::cerr), slic::message::Error); @@ -225,10 +225,33 @@ void loadSiloMesh(const std::string& mesh_path, double weldThreshold) conduit::Node n_load; conduit::relay::io::silo::load_mesh(mesh_path, n_load); - n_load.print_detailed(); - + // Oh... don't need detailed, normal print is enough. + // n_load.print_detailed(); + // n_load.print(); // Gets us the number of domains, yay... - SLIC_INFO("Number of children are " << n_load.number_of_children()); + + + int num_domains = n_load.number_of_children(); + SLIC_INFO("Number of children are " << num_domains); + + // n_load[0].print(); + // SLIC_INFO("coordsets/MMESH/values is: "); + (n_load[0]["coordsets/MMESH/values"]).print(); + + // This is how you get the size of the array... + + + SLIC_INFO("x values are "); + n_load[0]["coordsets/MMESH/values"]["x"].print(); + + double *x_vals = n_load[0]["coordsets/MMESH/values"]["x"].value(); + int x_size = (n_load[0]["coordsets/MMESH/values"]["x"]).dtype().number_of_elements(); + std::vector x (x_vals, x_vals + x_size); + + SLIC_INFO("Vector size is " << x.size()); + + // SLIC_INFO("x size is " << (n_load[0]["coordsets/MMESH/values"]["x"]).dtype().number_of_elements()); + } From 872018846391c997a2eb2f41387126d2ec341ebe Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 22 Jan 2024 13:25:51 -0800 Subject: [PATCH 512/639] WIP - got reading for structured, would like unstructured instead --- .../quest/examples/quest_bvh_silo_example.cpp | 187 +++++++++++------- 1 file changed, 118 insertions(+), 69 deletions(-) diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index d3d2d806d7..6263033a4e 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -48,6 +48,8 @@ using seq_exec = axom::SEQ_EXEC; +using UMesh = axom::mint::UnstructuredMesh; + // clang-format off #if defined(AXOM_USE_OPENMP) using omp_exec = axom::OMP_EXEC; @@ -222,37 +224,84 @@ struct TriangleMesh void loadSiloMesh(const std::string& mesh_path, double weldThreshold) { + // The silo mesh to load into Conduit conduit::Node n_load; + + // The Conduit node containing mesh coordinates + conduit::Node n_coordinates; + + // The conduit node containing dimensions + conduit::Node n_dimensions; + conduit::relay::io::silo::load_mesh(mesh_path, n_load); + n_coordinates = n_load[0]["coordsets/MMESH/values"]; + n_dimensions = n_load[0]["topologies/MMESH/elements/dims"]; - // Oh... don't need detailed, normal print is enough. - // n_load.print_detailed(); - // n_load.print(); + n_load.print(); // Gets us the number of domains, yay... - int num_domains = n_load.number_of_children(); SLIC_INFO("Number of children are " << num_domains); - // n_load[0].print(); - // SLIC_INFO("coordsets/MMESH/values is: "); - (n_load[0]["coordsets/MMESH/values"]).print(); + (n_coordinates).print(); - // This is how you get the size of the array... + // Get x,y,z vertices from Conduit + std::vector> coordinates(3); + // Get surface mesh + // UMesh * surface_mesh = new UMesh(3, mint::HEX); + + // Conduit dimensions are number of zones, mint is numnber of nodes (plus 1) + int x_dim = n_dimensions[0].value(); + int y_dim = n_dimensions[1].value(); + int z_dim = n_dimensions[2].value(); + + axom::mint::RectilinearMesh mesh(x_dim + 1, y_dim + 1, z_dim + 1); + + // Get sorted and unique vertices for structured mesh format + for(int i = 0; i < 3; i++) + { + SLIC_INFO("0 is x, 1 is y, 2 is z"); + SLIC_INFO(i << " values are "); + n_coordinates[i].print(); - SLIC_INFO("x values are "); - n_load[0]["coordsets/MMESH/values"]["x"].print(); + double* vals = n_coordinates[i].value(); + int size = (n_coordinates[i]).dtype().number_of_elements(); + std::vector vals_vec(vals, vals + size); - double *x_vals = n_load[0]["coordsets/MMESH/values"]["x"].value(); - int x_size = (n_load[0]["coordsets/MMESH/values"]["x"]).dtype().number_of_elements(); - std::vector x (x_vals, x_vals + x_size); + SLIC_INFO("Vector size is " << vals_vec.size()); - SLIC_INFO("Vector size is " << x.size()); + // Sort and remove duplicate elements + sort(vals_vec.begin(), vals_vec.end()); + std::vector::iterator it; + it = unique(vals_vec.begin(), vals_vec.end()); + vals_vec.resize(distance(vals_vec.begin(), it)); - // SLIC_INFO("x size is " << (n_load[0]["coordsets/MMESH/values"]["x"]).dtype().number_of_elements()); + coordinates[i] = vals_vec; + std::cout << "component " << i << " contains:"; + + for(it = coordinates[i].begin(); it != coordinates[i].end(); ++it) + std::cout << ' ' << *it; + std::cout << '\n'; + + SLIC_INFO("Component size after sort and unique operation is " + << coordinates[i].size()); + } + + // Initialize structured mesh coordinates + for(int i = 0; i < 3; i++) + { + double* component = mesh.getCoordinateArray(i); + for(unsigned long j = 0; j < coordinates[i].size(); j++) + { + component[j] = coordinates[i][j]; + // SLIC_INFO("Component " << i << ", vertex " << j << " is: " << component[j]); + } + } + // Write out to vtk for test viewing + axom::mint::write_vtk(&mesh, "test.vtk"); } TriangleMesh makeTriangleMesh(const std::string& stl_mesh_path, @@ -568,60 +617,60 @@ int main(int argc, char** argv) // TriangleMesh mesh = makeTriangleMesh(params.mesh_file, params.weldThreshold); // Check for self-intersections; results are returned as an array of index pairs -// axom::Array intersectionPairs; -// axom::utilities::Timer timer(true); -// switch(params.policy) -// { -// case RuntimePolicy::raja_omp: -// #ifdef AXOM_USE_OPENMP -// intersectionPairs = -// findIntersectionsBVH(mesh, -// params.intersectionThreshold, -// params.isVerbose()); -// #endif -// break; -// case RuntimePolicy::raja_cuda: -// #ifdef AXOM_USE_CUDA -// intersectionPairs = -// findIntersectionsBVH(mesh, -// params.intersectionThreshold, -// params.isVerbose()); -// #endif -// break; -// default: // RuntimePolicy::raja_seq -// intersectionPairs = -// findIntersectionsBVH(mesh, -// params.intersectionThreshold, -// params.isVerbose()); -// break; -// } -// timer.stop(); - -// SLIC_INFO(axom::fmt::format("Computing intersections {} took {:4.3} seconds.", -// "with a BVH tree", -// timer.elapsedTimeInSec())); -// SLIC_INFO(axom::fmt::format(axom::utilities::locale(), -// "Mesh had {:L} intersection pairs", -// intersectionPairs.size())); - -// // print first few pairs -// const int numIntersections = intersectionPairs.size(); -// if(numIntersections > 0 && params.isVerbose()) -// { -// constexpr int MAX_PRINT = 20; -// if(numIntersections > MAX_PRINT) -// { -// intersectionPairs.resize(MAX_PRINT); -// SLIC_INFO(axom::fmt::format("First {} intersection pairs: {} ...\n", -// MAX_PRINT, -// axom::fmt::join(intersectionPairs, ", "))); -// } -// else -// { -// SLIC_INFO(axom::fmt::format("Intersection pairs: {}\n", -// axom::fmt::join(intersectionPairs, ", "))); -// } -// } + // axom::Array intersectionPairs; + // axom::utilities::Timer timer(true); + // switch(params.policy) + // { + // case RuntimePolicy::raja_omp: + // #ifdef AXOM_USE_OPENMP + // intersectionPairs = + // findIntersectionsBVH(mesh, + // params.intersectionThreshold, + // params.isVerbose()); + // #endif + // break; + // case RuntimePolicy::raja_cuda: + // #ifdef AXOM_USE_CUDA + // intersectionPairs = + // findIntersectionsBVH(mesh, + // params.intersectionThreshold, + // params.isVerbose()); + // #endif + // break; + // default: // RuntimePolicy::raja_seq + // intersectionPairs = + // findIntersectionsBVH(mesh, + // params.intersectionThreshold, + // params.isVerbose()); + // break; + // } + // timer.stop(); + + // SLIC_INFO(axom::fmt::format("Computing intersections {} took {:4.3} seconds.", + // "with a BVH tree", + // timer.elapsedTimeInSec())); + // SLIC_INFO(axom::fmt::format(axom::utilities::locale(), + // "Mesh had {:L} intersection pairs", + // intersectionPairs.size())); + + // // print first few pairs + // const int numIntersections = intersectionPairs.size(); + // if(numIntersections > 0 && params.isVerbose()) + // { + // constexpr int MAX_PRINT = 20; + // if(numIntersections > MAX_PRINT) + // { + // intersectionPairs.resize(MAX_PRINT); + // SLIC_INFO(axom::fmt::format("First {} intersection pairs: {} ...\n", + // MAX_PRINT, + // axom::fmt::join(intersectionPairs, ", "))); + // } + // else + // { + // SLIC_INFO(axom::fmt::format("Intersection pairs: {}\n", + // axom::fmt::join(intersectionPairs, ", "))); + // } + // } return 0; } From fd3a4530ba14c46b4c1a1599ae2e085593c053f5 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 23 Jan 2024 11:37:40 -0800 Subject: [PATCH 513/639] WIP - can use to_unstructured to get cell to node connectivity --- .../quest/examples/quest_bvh_silo_example.cpp | 133 +++++++++++------- 1 file changed, 85 insertions(+), 48 deletions(-) diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index 6263033a4e..5ea783b03c 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -237,71 +237,108 @@ void loadSiloMesh(const std::string& mesh_path, double weldThreshold) n_coordinates = n_load[0]["coordsets/MMESH/values"]; n_dimensions = n_load[0]["topologies/MMESH/elements/dims"]; - n_load.print(); + n_load.print_detailed(); + + conduit::Node unstruct_topo; + conduit::Node unstruct_coords; + + conduit::blueprint::mesh::topology::structured::to_unstructured(n_load[0]["topologies/MMESH"], + unstruct_topo, + unstruct_coords); + + unstruct_topo.print_detailed(); + unstruct_coords.print_detailed(); + // using Point = axom::primal::Point; + // NOTE: This assumes dimension of mesh is same for each axis + // As such, I don't think it's general enough... + // std::vector> connectivity_array(1000); + + // int dim = 10; + + // for(int i = 0; i < math.pow(dim, 3); i++) + // { + // // You need logic to skip nodes along the OTHER edge of the mesh, as there are no + // // nodes around to form a cell. + // // if (???) + // // { + // // continue; + // // } + // std::vector connectivity { + // Point(i, i, i), + // Point(i + 1, i + 1, i + 1), + // Point(i + dim + 1, i + dim + 1, i + dim + 1), + // Point(i + dim, i + dim, i + dim), + // Point(i + (dim * dim), i + (dim * dim), i + (dim * dim)), + // Point(i + (dim * dim) + 1, i + (dim * dim) + 1, i + (dim * dim) + 1), + // Point(i + (dim * dim) + dim + 1, i + (dim * dim) + dim + 1, i + (dim * dim) + dim + 1), + // Point(i + (dim * dim) + dim, i + (dim * dim) + dim, i + (dim * dim) + dim) + // }; + // } + // Gets us the number of domains, yay... - int num_domains = n_load.number_of_children(); - SLIC_INFO("Number of children are " << num_domains); + // int num_domains = n_load.number_of_children(); + // SLIC_INFO("Number of children are " << num_domains); - (n_coordinates).print(); + // (n_coordinates).print(); - // Get x,y,z vertices from Conduit - std::vector> coordinates(3); + // // Get x,y,z vertices from Conduit + // std::vector> coordinates(3); - // Get surface mesh - // UMesh * surface_mesh = new UMesh(3, mint::HEX); + // // Get surface mesh + // // UMesh * surface_mesh = new UMesh(3, mint::HEX); - // Conduit dimensions are number of zones, mint is numnber of nodes (plus 1) - int x_dim = n_dimensions[0].value(); - int y_dim = n_dimensions[1].value(); - int z_dim = n_dimensions[2].value(); + // // Conduit dimensions are number of zones, mint is numnber of nodes (plus 1) + // int x_dim = n_dimensions[0].value(); + // int y_dim = n_dimensions[1].value(); + // int z_dim = n_dimensions[2].value(); - axom::mint::RectilinearMesh mesh(x_dim + 1, y_dim + 1, z_dim + 1); + // axom::mint::RectilinearMesh mesh(x_dim + 1, y_dim + 1, z_dim + 1); - // Get sorted and unique vertices for structured mesh format - for(int i = 0; i < 3; i++) - { - SLIC_INFO("0 is x, 1 is y, 2 is z"); - SLIC_INFO(i << " values are "); - n_coordinates[i].print(); + // // Get sorted and unique vertices for structured mesh format + // for(int i = 0; i < 3; i++) + // { + // SLIC_INFO("0 is x, 1 is y, 2 is z"); + // SLIC_INFO(i << " values are "); + // n_coordinates[i].print(); - double* vals = n_coordinates[i].value(); - int size = (n_coordinates[i]).dtype().number_of_elements(); - std::vector vals_vec(vals, vals + size); + // double* vals = n_coordinates[i].value(); + // int size = (n_coordinates[i]).dtype().number_of_elements(); + // std::vector vals_vec(vals, vals + size); - SLIC_INFO("Vector size is " << vals_vec.size()); + // SLIC_INFO("Vector size is " << vals_vec.size()); - // Sort and remove duplicate elements - sort(vals_vec.begin(), vals_vec.end()); - std::vector::iterator it; - it = unique(vals_vec.begin(), vals_vec.end()); - vals_vec.resize(distance(vals_vec.begin(), it)); + // // Sort and remove duplicate elements + // sort(vals_vec.begin(), vals_vec.end()); + // std::vector::iterator it; + // it = unique(vals_vec.begin(), vals_vec.end()); + // vals_vec.resize(distance(vals_vec.begin(), it)); - coordinates[i] = vals_vec; + // coordinates[i] = vals_vec; - std::cout << "component " << i << " contains:"; + // std::cout << "component " << i << " contains:"; - for(it = coordinates[i].begin(); it != coordinates[i].end(); ++it) - std::cout << ' ' << *it; - std::cout << '\n'; + // for(it = coordinates[i].begin(); it != coordinates[i].end(); ++it) + // std::cout << ' ' << *it; + // std::cout << '\n'; - SLIC_INFO("Component size after sort and unique operation is " - << coordinates[i].size()); - } + // SLIC_INFO("Component size after sort and unique operation is " + // << coordinates[i].size()); + // } - // Initialize structured mesh coordinates - for(int i = 0; i < 3; i++) - { - double* component = mesh.getCoordinateArray(i); - for(unsigned long j = 0; j < coordinates[i].size(); j++) - { - component[j] = coordinates[i][j]; - // SLIC_INFO("Component " << i << ", vertex " << j << " is: " << component[j]); - } - } + // // Initialize structured mesh coordinates + // for(int i = 0; i < 3; i++) + // { + // double* component = mesh.getCoordinateArray(i); + // for(unsigned long j = 0; j < coordinates[i].size(); j++) + // { + // component[j] = coordinates[i][j]; + // // SLIC_INFO("Component " << i << ", vertex " << j << " is: " << component[j]); + // } + // } - // Write out to vtk for test viewing - axom::mint::write_vtk(&mesh, "test.vtk"); + // // Write out to vtk for test viewing + // axom::mint::write_vtk(&mesh, "test.vtk"); } TriangleMesh makeTriangleMesh(const std::string& stl_mesh_path, From f68ad6e90059de0d9730b2e0091a12a2f4673ae4 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 23 Jan 2024 11:52:29 -0800 Subject: [PATCH 514/639] WIP comment --- src/axom/quest/examples/quest_bvh_silo_example.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index 5ea783b03c..40fd5b980d 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -237,7 +237,7 @@ void loadSiloMesh(const std::string& mesh_path, double weldThreshold) n_coordinates = n_load[0]["coordsets/MMESH/values"]; n_dimensions = n_load[0]["topologies/MMESH/elements/dims"]; - n_load.print_detailed(); + // n_load.print_detailed(); conduit::Node unstruct_topo; conduit::Node unstruct_coords; @@ -248,6 +248,12 @@ void loadSiloMesh(const std::string& mesh_path, double weldThreshold) unstruct_topo.print_detailed(); unstruct_coords.print_detailed(); + + UMesh * mesh = new UMesh(3, mint::HEX); + + // Append the mesh nodes + // TODO + // using Point = axom::primal::Point; // NOTE: This assumes dimension of mesh is same for each axis // As such, I don't think it's general enough... From f59a759dc1c4305c26be5aa2029d034acd9fa4c8 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 30 Jan 2024 11:49:01 -0800 Subject: [PATCH 515/639] WIP - can load silo mesh files now, need to verify contents are expected --- .../quest/examples/quest_bvh_silo_example.cpp | 290 ++++++++++-------- .../slic/streams/.nfs804502ae00213988000006ef | 187 +++++++++++ 2 files changed, 344 insertions(+), 133 deletions(-) create mode 100644 src/axom/slic/streams/.nfs804502ae00213988000006ef diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index 40fd5b980d..62b09f43c9 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -110,9 +110,9 @@ struct Input { static const std::map s_validPolicies; - std::string mesh_file {""}; + std::string mesh_file_first {""}; + std::string mesh_file_second {""}; bool verboseOutput {false}; - double weldThreshold {1e-6}; double intersectionThreshold {1e-08}; RuntimePolicy policy {RuntimePolicy::raja_seq}; @@ -122,8 +122,13 @@ struct Input void Input::parse(int argc, char** argv, axom::CLI::App& app) { - app.add_option("-i, --infile", mesh_file) - ->description("The input STL mesh file") + app.add_option("-i, --infile", mesh_file_first) + ->description("The first input silo mesh file to insert into BVH") + ->required() + ->check(axom::CLI::ExistingFile); + + app.add_option("-q, --queryfile", mesh_file_second) + ->description("The second input silo mesh file to query BVH") ->required() ->check(axom::CLI::ExistingFile); @@ -131,14 +136,8 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) ->description("Increase logging verbosity?") ->capture_default_str(); - app.add_option("--weld-threshold", weldThreshold) - ->description( - "Threshold to use when welding vertices.\n" - "Will skip if not strictly positive.") - ->capture_default_str(); - app.add_option("--intersection-threshold", intersectionThreshold) - ->description("Threshold to use when testing for intersecting triangles") + ->description("Threshold to use when testing for intersecting hexes") ->capture_default_str(); app.add_option("-p, --policy", policy) @@ -163,16 +162,14 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) SLIC_INFO(axom::fmt::format( R"( Parsed parameters: - * STL mesh: '{}' - * Threshold for welding: {} - * Skip welding: {} + * First Silo mesh to insert into BVH: '{}' + * Second Silo mesh to query BVH: '{}' * Threshold for intersections: {} * Verbose logging: {} * Runtime execution policy: '{}' )", - mesh_file, - weldThreshold, - (weldThreshold <= 0.), + mesh_file_first, + mesh_file_second, intersectionThreshold, verboseOutput, policy == RuntimePolicy::raja_omp @@ -222,129 +219,148 @@ struct TriangleMesh BoundingBox m_meshBoundingBox; }; -void loadSiloMesh(const std::string& mesh_path, double weldThreshold) +struct HexMesh { - // The silo mesh to load into Conduit - conduit::Node n_load; + using Point = axom::primal::Point; + using Hexahedron = axom::primal::Hexahedron; + using BoundingBox = axom::primal::BoundingBox; - // The Conduit node containing mesh coordinates - conduit::Node n_coordinates; + axom::IndexType numHexes() const { return m_hexes.size(); } + axom::Array& hexes() { return m_hexes; } + const axom::Array& hexes() const { return m_hexes; } - // The conduit node containing dimensions - conduit::Node n_dimensions; + BoundingBox& meshBoundingBox() { return m_meshBoundingBox; } + const BoundingBox& meshBoundingBox() const { return m_meshBoundingBox; } - conduit::relay::io::silo::load_mesh(mesh_path, n_load); - n_coordinates = n_load[0]["coordsets/MMESH/values"]; - n_dimensions = n_load[0]["topologies/MMESH/elements/dims"]; + axom::Array& hexBoundingBoxes() { return m_hexBoundingBoxes; } + const axom::Array& hexBoundingBoxes() const + { + return m_hexBoundingBoxes; + } - // n_load.print_detailed(); + axom::Array m_hexes; + axom::Array m_hexBoundingBoxes; + BoundingBox m_meshBoundingBox; +}; + +HexMesh loadSiloHexMesh(const std::string& mesh_path) +{ + HexMesh hexMesh; + + axom::utilities::Timer timer(true); + + // Load silo mesh into Conduit node + conduit::Node n_load; + conduit::relay::io::silo::load_mesh(mesh_path, n_load); + // Get unstructured topology for the cell connectivity conduit::Node unstruct_topo; conduit::Node unstruct_coords; - conduit::blueprint::mesh::topology::structured::to_unstructured(n_load[0]["topologies/MMESH"], - unstruct_topo, - unstruct_coords); - - unstruct_topo.print_detailed(); - unstruct_coords.print_detailed(); - - UMesh * mesh = new UMesh(3, mint::HEX); - - // Append the mesh nodes - // TODO - - // using Point = axom::primal::Point; - // NOTE: This assumes dimension of mesh is same for each axis - // As such, I don't think it's general enough... - // std::vector> connectivity_array(1000); - - // int dim = 10; - - // for(int i = 0; i < math.pow(dim, 3); i++) - // { - // // You need logic to skip nodes along the OTHER edge of the mesh, as there are no - // // nodes around to form a cell. - // // if (???) - // // { - // // continue; - // // } - // std::vector connectivity { - // Point(i, i, i), - // Point(i + 1, i + 1, i + 1), - // Point(i + dim + 1, i + dim + 1, i + dim + 1), - // Point(i + dim, i + dim, i + dim), - // Point(i + (dim * dim), i + (dim * dim), i + (dim * dim)), - // Point(i + (dim * dim) + 1, i + (dim * dim) + 1, i + (dim * dim) + 1), - // Point(i + (dim * dim) + dim + 1, i + (dim * dim) + dim + 1, i + (dim * dim) + dim + 1), - // Point(i + (dim * dim) + dim, i + (dim * dim) + dim, i + (dim * dim) + dim) - // }; - // } - - // Gets us the number of domains, yay... - - // int num_domains = n_load.number_of_children(); - // SLIC_INFO("Number of children are " << num_domains); - - // (n_coordinates).print(); - - // // Get x,y,z vertices from Conduit - // std::vector> coordinates(3); - - // // Get surface mesh - // // UMesh * surface_mesh = new UMesh(3, mint::HEX); - - // // Conduit dimensions are number of zones, mint is numnber of nodes (plus 1) - // int x_dim = n_dimensions[0].value(); - // int y_dim = n_dimensions[1].value(); - // int z_dim = n_dimensions[2].value(); - - // axom::mint::RectilinearMesh mesh(x_dim + 1, y_dim + 1, z_dim + 1); - - // // Get sorted and unique vertices for structured mesh format - // for(int i = 0; i < 3; i++) - // { - // SLIC_INFO("0 is x, 1 is y, 2 is z"); - // SLIC_INFO(i << " values are "); - // n_coordinates[i].print(); - - // double* vals = n_coordinates[i].value(); - // int size = (n_coordinates[i]).dtype().number_of_elements(); - // std::vector vals_vec(vals, vals + size); - - // SLIC_INFO("Vector size is " << vals_vec.size()); - - // // Sort and remove duplicate elements - // sort(vals_vec.begin(), vals_vec.end()); - // std::vector::iterator it; - // it = unique(vals_vec.begin(), vals_vec.end()); - // vals_vec.resize(distance(vals_vec.begin(), it)); - - // coordinates[i] = vals_vec; - - // std::cout << "component " << i << " contains:"; - - // for(it = coordinates[i].begin(); it != coordinates[i].end(); ++it) - // std::cout << ' ' << *it; - // std::cout << '\n'; - - // SLIC_INFO("Component size after sort and unique operation is " - // << coordinates[i].size()); - // } - - // // Initialize structured mesh coordinates - // for(int i = 0; i < 3; i++) - // { - // double* component = mesh.getCoordinateArray(i); - // for(unsigned long j = 0; j < coordinates[i].size(); j++) - // { - // component[j] = coordinates[i][j]; - // // SLIC_INFO("Component " << i << ", vertex " << j << " is: " << component[j]); - // } - // } + conduit::blueprint::mesh::topology::structured::to_unstructured( + n_load[0]["topologies/MMESH"], + unstruct_topo, + unstruct_coords); + + // Verify this is a hexahedral mesh + std::string shape = unstruct_topo["elements/shape"].as_string(); + if(shape != "hex") + { + SLIC_ERROR("A hex mesh was expected!"); + } + + UMesh* mesh = new UMesh(3, axom::mint::HEX); + + int* connectivity = unstruct_topo["elements/connectivity"].value(); + + const int HEX_OFFSET = 8; + int num_nodes = (unstruct_coords["values/x"]).dtype().number_of_elements(); + double* x_vals = unstruct_coords["values/x"].value(); + double* y_vals = unstruct_coords["values/y"].value(); + double* z_vals = unstruct_coords["values/z"].value(); + + int connectivity_size = + (unstruct_topo["elements/connectivity"]).dtype().number_of_elements(); + + // Sanity check for number of cells + int cell_calc_from_nodes = + std::round(std::pow(std::pow(num_nodes, 1.0 / 3.0) - 1, 3)); + int cell_calc_from_connectivity = connectivity_size / HEX_OFFSET; + if(cell_calc_from_nodes != cell_calc_from_connectivity) + { + SLIC_ERROR("Number of connectivity elements is not expected!\n" + << "First calculation is " << cell_calc_from_nodes + << " and second calculation is " << cell_calc_from_connectivity); + } + + // Append mesh nodes + for(int i = 0; i < num_nodes; i++) + { + mesh->appendNode(x_vals[i], y_vals[i], z_vals[i]); + } + + // Append mesh cells + for(int i = 0; i < connectivity_size / HEX_OFFSET; i++) + { + const axom::IndexType cell[] = { + connectivity[i * HEX_OFFSET], + connectivity[(i * HEX_OFFSET) + 1], + connectivity[(i * HEX_OFFSET) + 2], + connectivity[(i * HEX_OFFSET) + 3], + connectivity[(i * HEX_OFFSET) + 4], + connectivity[(i * HEX_OFFSET) + 5], + connectivity[(i * HEX_OFFSET) + 6], + connectivity[(i * HEX_OFFSET) + 7], + }; + + mesh->appendCell(cell); + } + + timer.stop(); + SLIC_INFO(axom::fmt::format("Loading the mesh took {:4.3} seconds.", + timer.elapsedTimeInSec())); // // Write out to vtk for test viewing - // axom::mint::write_vtk(&mesh, "test.vtk"); + // axom::mint::write_vtk(mesh, "test.vtk"); + + // extract hexes into an axom::Array + const int numCells = mesh->getNumberOfCells(); + hexMesh.m_hexes.reserve(numCells); + { + HexMesh::Hexahedron hex; + std::array hexCell; + for(int i = 0; i < numCells; ++i) + { + mesh->getCellNodeIDs(i, hexCell.data()); + mesh->getNode(hexCell[0], hex[0].data()); + mesh->getNode(hexCell[1], hex[1].data()); + mesh->getNode(hexCell[2], hex[2].data()); + mesh->getNode(hexCell[3], hex[3].data()); + mesh->getNode(hexCell[4], hex[4].data()); + mesh->getNode(hexCell[5], hex[5].data()); + mesh->getNode(hexCell[6], hex[6].data()); + mesh->getNode(hexCell[7], hex[7].data()); + + hexMesh.m_hexes.emplace_back(hex); + } + } + + delete mesh; + mesh = nullptr; + + // compute and store hex bounding boxes and mesh bounding box + hexMesh.m_hexBoundingBoxes.reserve(numCells); + for(const auto& hex : hexMesh.hexes()) + { + hexMesh.m_hexBoundingBoxes.emplace_back( + axom::primal::compute_bounding_box(hex)); + hexMesh.m_meshBoundingBox.addBox(hexMesh.m_hexBoundingBoxes.back()); + } + + SLIC_INFO( + axom::fmt::format("Mesh bounding box is {}.", hexMesh.meshBoundingBox())); + + return hexMesh; } TriangleMesh makeTriangleMesh(const std::string& stl_mesh_path, @@ -638,7 +654,7 @@ int main(int argc, char** argv) // Parse the command line arguments Input params; { - axom::CLI::App app {"Naive triangle mesh intersection tester"}; + axom::CLI::App app {"Silo Hex BVH mesh intersection tester"}; try { params.parse(argc, argv, app); @@ -653,10 +669,18 @@ int main(int argc, char** argv) axom::slic::setLoggingMsgLevel(params.isVerbose() ? axom::slic::message::Debug : axom::slic::message::Info); - // Load Silo mesh - SLIC_INFO(axom::fmt::format("Reading file: '{}'...\n", params.mesh_file)); + // Load Silo mesh into BVH + SLIC_INFO(axom::fmt::format("Reading silo file to insert into BVH: '{}'...\n", + params.mesh_file_first)); + + HexMesh bvh_mesh = loadSiloHexMesh(params.mesh_file_first); + + // Load Silo mesh for querying BVH + SLIC_INFO(axom::fmt::format("Reading silo file to query BVH: '{}'...\n", + params.mesh_file_second)); + + HexMesh query_mesh = loadSiloHexMesh(params.mesh_file_second); - loadSiloMesh(params.mesh_file, params.weldThreshold); // TriangleMesh mesh = makeTriangleMesh(params.mesh_file, params.weldThreshold); // Check for self-intersections; results are returned as an array of index pairs diff --git a/src/axom/slic/streams/.nfs804502ae00213988000006ef b/src/axom/slic/streams/.nfs804502ae00213988000006ef new file mode 100644 index 0000000000..d43f78fc09 --- /dev/null +++ b/src/axom/slic/streams/.nfs804502ae00213988000006ef @@ -0,0 +1,187 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +#include "axom/slic/streams/LumberjackStream.hpp" + +#include + +#include "axom/core/Macros.hpp" + +#include "axom/lumberjack/BinaryTreeCommunicator.hpp" +#include "axom/lumberjack/Lumberjack.hpp" +#include "axom/lumberjack/TextTagCombiner.hpp" + +namespace axom +{ +namespace slic +{ +//------------------------------------------------------------------------------ +LumberjackStream::LumberjackStream(std::ostream* stream, + MPI_Comm comm, + int ranksLimit) + : m_isLJOwnedBySLIC(false) + , m_stream(stream) +{ + this->initializeLumberjack(comm, ranksLimit); +} + +//------------------------------------------------------------------------------ +LumberjackStream::LumberjackStream(std::ostream* stream, + MPI_Comm comm, + int ranksLimit, + const std::string& format) + : m_isLJOwnedBySLIC(false) + , m_stream(stream) +{ + this->initializeLumberjack(comm, ranksLimit); + this->setFormatString(format); +} + +//------------------------------------------------------------------------------ +LumberjackStream::LumberjackStream(std::ostream* stream, + axom::lumberjack::Lumberjack* lj) + : m_lj(lj) + , m_isLJOwnedBySLIC(false) + , m_stream(stream) +{ } + +//------------------------------------------------------------------------------ +LumberjackStream::LumberjackStream(std::ostream* stream, + axom::lumberjack::Lumberjack* lj, + const std::string& format) + : m_lj(lj) + , m_isLJOwnedBySLIC(false) + , m_stream(stream) +{ + this->setFormatString(format); +} + +//------------------------------------------------------------------------------ +LumberjackStream::~LumberjackStream() +{ + if(m_isLJOwnedBySLIC) + { + this->finalizeLumberjack(); + } +} + +//------------------------------------------------------------------------------ +void LumberjackStream::append(message::Level msgLevel, + const std::string& message, + const std::string& tagName, + const std::string& fileName, + int line, + bool AXOM_UNUSED_PARAM(filter_duplicates), + bool AXOM_UNUSED_PARAM(tag_stream_only)) +{ + if(m_lj == nullptr) + { + std::cerr + << "ERROR: NULL Lumberjack instance in LumberjackStream::append!\n"; + return; + } + + m_lj->queueMessage(message, fileName, line, msgLevel, tagName); +} + +//------------------------------------------------------------------------------ +void LumberjackStream::outputLocal() +{ + if(m_lj == nullptr) + { + std::cerr + << "ERROR: NULL Lumberjack instance in LumberjackStream::flush!\n"; + return; + } + + //Non-collective write to console + this->write(true); +} + +//------------------------------------------------------------------------------ +void LumberjackStream::flush() +{ + if(m_lj == nullptr) + { + std::cerr + << "ERROR: NULL Lumberjack instance in LumberjackStream::flush!\n"; + return; + } + + // Collective push of messages to output node followed by write to console + m_lj->pushMessagesFully(); + this->write(); +} + +//------------------------------------------------------------------------------ +void LumberjackStream::push() +{ + if(m_lj == nullptr) + { + std::cerr << "ERROR: NULL Lumberjack instance in LumberjackStream::push!\n"; + return; + } + + m_lj->pushMessagesOnce(); +} + +//------------------------------------------------------------------------------ +void LumberjackStream::write(bool local) +{ + if(m_lj == nullptr) + { + std::cerr + << "ERROR: NULL Lumberjack instance in LumberjackStream::write!\n"; + return; + } + + if(m_lj->isOutputNode() || local) + { + std::vector messages = m_lj->getMessages(); + + const int nmessages = static_cast(messages.size()); + std::string rankString; + for(int i = 0; i < nmessages; ++i) + { + rankString = std::to_string(messages[i]->count()) + ": " + + messages[i]->stringOfRanks(); + (*m_stream) << this->getFormatedMessage( + message::getLevelAsString( + static_cast(messages[i]->level())), + messages[i]->text(), + messages[i]->tag(), + rankString, + messages[i]->fileName(), + messages[i]->lineNumber()); + } + + m_stream->flush(); + m_lj->clearMessages(); + } +} + +//------------------------------------------------------------------------------ +void LumberjackStream::initializeLumberjack(MPI_Comm comm, int ranksLimit) +{ + m_ljComm = new axom::lumberjack::BinaryTreeCommunicator; + m_ljComm->initialize(comm, ranksLimit); + m_lj = new axom::lumberjack::Lumberjack; + m_lj->initialize(m_ljComm, ranksLimit); + m_lj->addCombiner(new lumberjack::TextTagCombiner); + m_isLJOwnedBySLIC = true; +} + +//------------------------------------------------------------------------------ +void LumberjackStream::finalizeLumberjack() +{ + m_lj->finalize(); + m_ljComm->finalize(); + delete m_lj; + delete m_ljComm; + m_isLJOwnedBySLIC = false; +} + +} /* namespace slic */ +} /* namespace axom */ From 9785b83f1e65437d81903adba83df630d2d861ff Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 30 Jan 2024 14:51:43 -0800 Subject: [PATCH 516/639] Example working, still need to error check, and implement hex-hex intersection check --- .../quest/examples/quest_bvh_silo_example.cpp | 360 +++++++----------- .../slic/streams/.nfs804502ae00213988000006ef | 187 --------- 2 files changed, 134 insertions(+), 413 deletions(-) delete mode 100644 src/axom/slic/streams/.nfs804502ae00213988000006ef diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index 62b09f43c9..dee2807bab 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -190,35 +190,8 @@ const std::map Input::s_validPolicies( }); //----------------------------------------------------------------------------- -/// Basic triangle mesh to be used in our application +/// Basic hexahedron mesh to be used in our application //----------------------------------------------------------------------------- -struct TriangleMesh -{ - using Point = axom::primal::Point; - using Triangle = axom::primal::Triangle; - using BoundingBox = axom::primal::BoundingBox; - - axom::IndexType numTriangles() const { return m_triangles.size(); } - axom::Array& triangles() { return m_triangles; } - const axom::Array& triangles() const { return m_triangles; } - - BoundingBox& meshBoundingBox() { return m_meshBoundingBox; } - const BoundingBox& meshBoundingBox() const { return m_meshBoundingBox; } - - axom::Array& triangleBoundingBoxes() - { - return m_triangleBoundingBoxes; - } - const axom::Array& triangleBoundingBoxes() const - { - return m_triangleBoundingBoxes; - } - - axom::Array m_triangles; - axom::Array m_triangleBoundingBoxes; - BoundingBox m_meshBoundingBox; -}; - struct HexMesh { using Point = axom::primal::Point; @@ -358,96 +331,24 @@ HexMesh loadSiloHexMesh(const std::string& mesh_path) } SLIC_INFO( - axom::fmt::format("Mesh bounding box is {}.", hexMesh.meshBoundingBox())); + axom::fmt::format("Mesh bounding box is {}.\n", hexMesh.meshBoundingBox())); return hexMesh; } -TriangleMesh makeTriangleMesh(const std::string& stl_mesh_path, - double weldThreshold) -{ - TriangleMesh triMesh; - - // load STL mesh into a mint unstructured mesh - auto* surface_mesh = new axom::mint::UnstructuredMesh( - 3, - axom::mint::TRIANGLE); - { - axom::utilities::Timer timer(true); - - auto reader = std::make_unique(); - reader->setFileName(stl_mesh_path); - reader->read(); - reader->getMesh(surface_mesh); - - timer.stop(); - SLIC_INFO(axom::fmt::format("Loading the mesh took {:4.3} seconds.", - timer.elapsedTimeInSec())); - } - - // optionally weld triangle mesh - if(weldThreshold > 0.) - { - axom::utilities::Timer timer(true); - axom::quest::weldTriMeshVertices(&surface_mesh, weldThreshold); - timer.stop(); - - SLIC_INFO(axom::fmt::format("Vertex welding took {:4.3} seconds.", - timer.elapsedTimeInSec())); - SLIC_INFO(axom::fmt::format( - axom::utilities::locale(), - "After welding, mesh has {:L} vertices and {:L} triangles.", - surface_mesh->getNumberOfNodes(), - surface_mesh->getNumberOfCells())); - } - - // extract triangles into an axom::Array - const int numCells = surface_mesh->getNumberOfCells(); - triMesh.m_triangles.reserve(numCells); - { - TriangleMesh::Triangle tri; - std::array triCell; - for(int i = 0; i < numCells; ++i) - { - surface_mesh->getCellNodeIDs(i, triCell.data()); - surface_mesh->getNode(triCell[0], tri[0].data()); - surface_mesh->getNode(triCell[1], tri[1].data()); - surface_mesh->getNode(triCell[2], tri[2].data()); - - triMesh.m_triangles.emplace_back(tri); - } - } - - delete surface_mesh; - surface_mesh = nullptr; - - // compute and store triangle bounding boxes and mesh bounding box - triMesh.m_triangleBoundingBoxes.reserve(numCells); - for(const auto& tri : triMesh.triangles()) - { - triMesh.m_triangleBoundingBoxes.emplace_back( - axom::primal::compute_bounding_box(tri)); - triMesh.m_meshBoundingBox.addBox(triMesh.m_triangleBoundingBoxes.back()); - } - - SLIC_INFO( - axom::fmt::format("Mesh bounding box is {}.", triMesh.meshBoundingBox())); - - return triMesh; -} - using IndexPair = std::pair; template -axom::Array findIntersectionsBVH(const TriangleMesh& triMesh, +axom::Array findIntersectionsBVH(const HexMesh& insertMesh, + const HexMesh& queryMesh, double tol, bool verboseOutput = false) { - SLIC_INFO("Running naive intersection algorithm in execution Space: " + SLIC_INFO("Running BVH intersection algorithm in execution Space: " << axom::execution_space::name()); - using TriangleArray = axom::Array; - using BBoxArray = axom::Array; + using HexArray = axom::Array; + using BBoxArray = axom::Array; using IndexArray = axom::Array; constexpr bool on_device = axom::execution_space::onDevice(); @@ -462,42 +363,60 @@ axom::Array findIntersectionsBVH(const TriangleMesh& triMesh, ? axom::getUmpireResourceAllocatorID(umpire::resource::Device) : axom::execution_space::allocatorID(); - // Copy the triangles to the device, if necessary - // Either way, tris_v will be a view w/ data in the correct space - auto& tris_h = triMesh.triangles(); - TriangleArray tris_d = - on_device ? TriangleArray(tris_h, kernel_allocator) : TriangleArray(); - auto tris_v = on_device ? tris_d.view() : tris_h.view(); - - // Copy the bboxes to the device, if necessary + // Copy the insert-BVH hexes to the device, if necessary + // Either way, insert_hexes_v will be a view w/ data in the correct space + auto& insert_hexes_h = insertMesh.hexes(); + HexArray insert_hexes_d = + on_device ? HexArray(insert_hexes_h, kernel_allocator) : HexArray(); + auto insert_hexes_v = on_device ? insert_hexes_d.view() : insert_hexes_h.view(); + + // Copy the insert-BVH bboxes to the device, if necessary + // Either way, insert_bbox_v will be a view w/ data in the correct space + auto& insert_bbox_h = insertMesh.hexBoundingBoxes(); + BBoxArray insert_bbox_d = + on_device ? BBoxArray(insert_bbox_h, kernel_allocator) : BBoxArray(); + auto insert_bbox_v = on_device ? insert_bbox_d.view() : insert_bbox_h.view(); + + // Copy the query-BVH hexes to the device, if necessary + // Either way, query_hexes_v will be a view w/ data in the correct space + auto& query_hexes_h = queryMesh.hexes(); + HexArray query_hexes_d = + on_device ? HexArray(query_hexes_h, kernel_allocator) : HexArray(); + auto query_hexes_v = on_device ? query_hexes_d.view() : query_hexes_h.view(); + + // Copy the query-BVH bboxes to the device, if necessary // Either way, bbox_v will be a view w/ data in the correct space - auto& bbox_h = triMesh.triangleBoundingBoxes(); - BBoxArray bbox_d = - on_device ? BBoxArray(bbox_h, kernel_allocator) : BBoxArray(); - auto bbox_v = on_device ? bbox_d.view() : bbox_h.view(); + auto& query_bbox_h = queryMesh.hexBoundingBoxes(); + BBoxArray query_bbox_d = + on_device ? BBoxArray(query_bbox_h, kernel_allocator) : BBoxArray(); + auto query_bbox_v = on_device ? query_bbox_d.view() : query_bbox_h.view(); axom::utilities::Timer timer; - // Initialize a BVH tree over the triangle bounding boxes + // Initialize a BVH tree over the insert mesh bounding boxes timer.start(); axom::spin::BVH<3, ExecSpace, double> bvh; bvh.setAllocatorID(kernel_allocator); - bvh.initialize(bbox_v, bbox_v.size()); + bvh.initialize(insert_bbox_v, insert_bbox_v.size()); timer.stop(); SLIC_INFO_IF(verboseOutput, axom::fmt::format("0: Initializing BVH took {:4.3} seconds.", timer.elapsedTimeInSec())); - // Search for intersecting bounding boxes of triangles; + // Search for intersecting bounding boxes of hexes to query; // result is returned as CSR arrays for candidate data timer.start(); - IndexArray offsets_d(bbox_v.size(), bbox_v.size(), kernel_allocator); - IndexArray counts_d(bbox_v.size(), bbox_v.size(), kernel_allocator); + IndexArray offsets_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); + IndexArray counts_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); IndexArray candidates_d(0, 0, kernel_allocator); auto offsets_v = offsets_d.view(); auto counts_v = counts_d.view(); - bvh.findBoundingBoxes(offsets_v, counts_v, candidates_d, bbox_v.size(), bbox_v); + bvh.findBoundingBoxes(offsets_v, + counts_v, + candidates_d, + query_bbox_v.size(), + query_bbox_v); timer.stop(); SLIC_INFO_IF(verboseOutput, @@ -505,9 +424,7 @@ axom::Array findIntersectionsBVH(const TriangleMesh& triMesh, "1: Querying candidate bounding boxes took {:4.3} seconds.", timer.elapsedTimeInSec())); - // Expand candidate list into corresponding arrays of indices - // Only keep results where candidate has a greater index than triangle - // and when both are non-degenerate + // Initialize query indices and bvh candidate indices IndexArray indices_d(axom::ArrayOptions::Uninitialized {}, candidates_d.size(), kernel_allocator); @@ -519,7 +436,7 @@ axom::Array findIntersectionsBVH(const TriangleMesh& triMesh, axom::IndexType numCandidates {}; timer.start(); { - const int totalTriangles = triMesh.numTriangles(); + const int totalQueryHexes = queryMesh.numHexes(); IndexArray numValidCandidates_d(1, 1, kernel_allocator); numValidCandidates_d.fill(0); @@ -529,42 +446,28 @@ axom::Array findIntersectionsBVH(const TriangleMesh& triMesh, auto validCandidates_v = validCandidates_d.view(); auto candidates_v = candidates_d.view(); - // Compute a device bool array of validity flags - axom::Array is_valid_d(axom::ArrayOptions::Uninitialized {}, - bbox_v.size(), - kernel_allocator); - auto is_valid_v = is_valid_d.view(); - - axom::for_all( - totalTriangles, - AXOM_LAMBDA(axom::IndexType i) { is_valid_v[i] = !tris_v[i].degenerate(); }); - - // Keep pairs of valid triangles whose bounding boxes overlap + // Initialize pairs of query and candidate indices axom::for_all( - totalTriangles, + totalQueryHexes, AXOM_LAMBDA(axom::IndexType i) { for(int j = 0; j < counts_v[i]; j++) { const axom::IndexType potential = candidates_v[offsets_v[i] + j]; - if(i < potential && is_valid_v[i] && is_valid_v[potential]) - { - const auto idx = RAJA::atomicAdd(numValidCandidates_p, - axom::IndexType {1}); - indices_v[idx] = i; - validCandidates_v[idx] = potential; - } + const auto idx = RAJA::atomicAdd(numValidCandidates_p, + axom::IndexType {1}); + indices_v[idx] = i; + validCandidates_v[idx] = potential; } }); axom::copy(&numCandidates, numValidCandidates_p, sizeof(axom::IndexType)); } timer.stop(); - SLIC_INFO_IF( - verboseOutput, - axom::fmt::format("2: Filtering invalid candidates took {:4.3} seconds.", - timer.elapsedTimeInSec())); + SLIC_INFO_IF(verboseOutput, + axom::fmt::format("2: Linearizing query indices and bvh " + "candidate indices took {:4.3} seconds.", + timer.elapsedTimeInSec())); - // Iterate through valid candidates to find actual intersections IndexArray intersect_d[2] = {IndexArray(axom::ArrayOptions::Uninitialized {}, numCandidates, kernel_allocator), @@ -583,17 +486,20 @@ axom::Array findIntersectionsBVH(const TriangleMesh& triMesh, auto indices_v = indices_d.view(); auto validCandidates_v = validCandidates_d.view(); - // Perform triangle-triangle tests + // Perform hex-hex tests axom::for_all( numCandidates, AXOM_LAMBDA(axom::IndexType i) { constexpr bool includeBoundaries = false; const auto index = indices_v[i]; const auto candidate = validCandidates_v[i]; - if(axom::primal::intersect(tris_v[index], - tris_v[candidate], - includeBoundaries, - tol)) + // For now, using bbox-bbox intersection, because well, have to implement + // the hex-hex intersection routine first. + // if(axom::primal::intersect(query_hexes_v[index], + // insert_hexes_v[candidate], + // includeBoundaries, + // tol)) + if(axom::primal::intersect(query_bbox_v[index], insert_bbox_v[candidate])) { const auto idx = RAJA::atomicAdd(numIntersections_p, axom::IndexType {1}); @@ -613,21 +519,22 @@ axom::Array findIntersectionsBVH(const TriangleMesh& triMesh, axom::fmt::format("3: Finding actual intersections took {:4.3} seconds.", timer.elapsedTimeInSec())); - SLIC_INFO_IF( - verboseOutput, - axom::fmt::format(axom::utilities::locale(), - R"(Stats for self-intersection query - -- Number of mesh triangles {:L} + SLIC_INFO_IF(verboseOutput, + axom::fmt::format(axom::utilities::locale(), + R"(Stats for query + -- Number of insert-BVH mesh hexes {:L} + -- Number of query mesh hexes {:L} -- Total possible candidates {:L} -- Candidates from BVH query {:L} - -- Potential candidates after filtering {:L} + -- Potential candidates after linearizing {:L} -- Actual intersections {:L} )", - triMesh.numTriangles(), - triMesh.numTriangles() * (triMesh.numTriangles() - 1) / 2., - candidates_d.size(), - numCandidates, - numIntersections)); + insertMesh.numHexes(), + queryMesh.numHexes(), + insertMesh.numHexes() * queryMesh.numHexes(), + candidates_d.size(), + numCandidates, + numIntersections)); // copy results back to host and into return vector IndexArray intersect_h[2] = { @@ -644,7 +551,7 @@ axom::Array findIntersectionsBVH(const TriangleMesh& triMesh, } return intersectionPairs; -} +} // end of findIntersectionsBVH for Silo Meshes int main(int argc, char** argv) { @@ -673,7 +580,7 @@ int main(int argc, char** argv) SLIC_INFO(axom::fmt::format("Reading silo file to insert into BVH: '{}'...\n", params.mesh_file_first)); - HexMesh bvh_mesh = loadSiloHexMesh(params.mesh_file_first); + HexMesh insert_mesh = loadSiloHexMesh(params.mesh_file_first); // Load Silo mesh for querying BVH SLIC_INFO(axom::fmt::format("Reading silo file to query BVH: '{}'...\n", @@ -681,63 +588,64 @@ int main(int argc, char** argv) HexMesh query_mesh = loadSiloHexMesh(params.mesh_file_second); - // TriangleMesh mesh = makeTriangleMesh(params.mesh_file, params.weldThreshold); - // Check for self-intersections; results are returned as an array of index pairs - // axom::Array intersectionPairs; - // axom::utilities::Timer timer(true); - // switch(params.policy) - // { - // case RuntimePolicy::raja_omp: - // #ifdef AXOM_USE_OPENMP - // intersectionPairs = - // findIntersectionsBVH(mesh, - // params.intersectionThreshold, - // params.isVerbose()); - // #endif - // break; - // case RuntimePolicy::raja_cuda: - // #ifdef AXOM_USE_CUDA - // intersectionPairs = - // findIntersectionsBVH(mesh, - // params.intersectionThreshold, - // params.isVerbose()); - // #endif - // break; - // default: // RuntimePolicy::raja_seq - // intersectionPairs = - // findIntersectionsBVH(mesh, - // params.intersectionThreshold, - // params.isVerbose()); - // break; - // } - // timer.stop(); - - // SLIC_INFO(axom::fmt::format("Computing intersections {} took {:4.3} seconds.", - // "with a BVH tree", - // timer.elapsedTimeInSec())); - // SLIC_INFO(axom::fmt::format(axom::utilities::locale(), - // "Mesh had {:L} intersection pairs", - // intersectionPairs.size())); - - // // print first few pairs - // const int numIntersections = intersectionPairs.size(); - // if(numIntersections > 0 && params.isVerbose()) - // { - // constexpr int MAX_PRINT = 20; - // if(numIntersections > MAX_PRINT) - // { - // intersectionPairs.resize(MAX_PRINT); - // SLIC_INFO(axom::fmt::format("First {} intersection pairs: {} ...\n", - // MAX_PRINT, - // axom::fmt::join(intersectionPairs, ", "))); - // } - // else - // { - // SLIC_INFO(axom::fmt::format("Intersection pairs: {}\n", - // axom::fmt::join(intersectionPairs, ", "))); - // } - // } + axom::Array intersectionPairs; + axom::utilities::Timer timer(true); + switch(params.policy) + { + case RuntimePolicy::raja_omp: +#ifdef AXOM_USE_OPENMP + intersectionPairs = + findIntersectionsBVH(insert_mesh, + query_mesh, + params.intersectionThreshold, + params.isVerbose()); +#endif + break; + case RuntimePolicy::raja_cuda: +#ifdef AXOM_USE_CUDA + intersectionPairs = + findIntersectionsBVH(insert_mesh, + query_mesh, + params.intersectionThreshold, + params.isVerbose()); +#endif + break; + default: // RuntimePolicy::raja_seq + intersectionPairs = + findIntersectionsBVH(insert_mesh, + query_mesh, + params.intersectionThreshold, + params.isVerbose()); + break; + } + timer.stop(); + + SLIC_INFO(axom::fmt::format("Computing intersections {} took {:4.3} seconds.", + "with a BVH tree", + timer.elapsedTimeInSec())); + SLIC_INFO(axom::fmt::format(axom::utilities::locale(), + "Mesh had {:L} intersection pairs", + intersectionPairs.size())); + + // print first few pairs + const int numIntersections = intersectionPairs.size(); + if(numIntersections > 0 && params.isVerbose()) + { + constexpr int MAX_PRINT = 20; + if(numIntersections > MAX_PRINT) + { + intersectionPairs.resize(MAX_PRINT); + SLIC_INFO(axom::fmt::format("First {} intersection pairs: {} ...\n", + MAX_PRINT, + axom::fmt::join(intersectionPairs, ", "))); + } + else + { + SLIC_INFO(axom::fmt::format("Intersection pairs: {}\n", + axom::fmt::join(intersectionPairs, ", "))); + } + } return 0; } diff --git a/src/axom/slic/streams/.nfs804502ae00213988000006ef b/src/axom/slic/streams/.nfs804502ae00213988000006ef deleted file mode 100644 index d43f78fc09..0000000000 --- a/src/axom/slic/streams/.nfs804502ae00213988000006ef +++ /dev/null @@ -1,187 +0,0 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and -// other Axom Project Developers. See the top-level LICENSE file for details. -// -// SPDX-License-Identifier: (BSD-3-Clause) - -#include "axom/slic/streams/LumberjackStream.hpp" - -#include - -#include "axom/core/Macros.hpp" - -#include "axom/lumberjack/BinaryTreeCommunicator.hpp" -#include "axom/lumberjack/Lumberjack.hpp" -#include "axom/lumberjack/TextTagCombiner.hpp" - -namespace axom -{ -namespace slic -{ -//------------------------------------------------------------------------------ -LumberjackStream::LumberjackStream(std::ostream* stream, - MPI_Comm comm, - int ranksLimit) - : m_isLJOwnedBySLIC(false) - , m_stream(stream) -{ - this->initializeLumberjack(comm, ranksLimit); -} - -//------------------------------------------------------------------------------ -LumberjackStream::LumberjackStream(std::ostream* stream, - MPI_Comm comm, - int ranksLimit, - const std::string& format) - : m_isLJOwnedBySLIC(false) - , m_stream(stream) -{ - this->initializeLumberjack(comm, ranksLimit); - this->setFormatString(format); -} - -//------------------------------------------------------------------------------ -LumberjackStream::LumberjackStream(std::ostream* stream, - axom::lumberjack::Lumberjack* lj) - : m_lj(lj) - , m_isLJOwnedBySLIC(false) - , m_stream(stream) -{ } - -//------------------------------------------------------------------------------ -LumberjackStream::LumberjackStream(std::ostream* stream, - axom::lumberjack::Lumberjack* lj, - const std::string& format) - : m_lj(lj) - , m_isLJOwnedBySLIC(false) - , m_stream(stream) -{ - this->setFormatString(format); -} - -//------------------------------------------------------------------------------ -LumberjackStream::~LumberjackStream() -{ - if(m_isLJOwnedBySLIC) - { - this->finalizeLumberjack(); - } -} - -//------------------------------------------------------------------------------ -void LumberjackStream::append(message::Level msgLevel, - const std::string& message, - const std::string& tagName, - const std::string& fileName, - int line, - bool AXOM_UNUSED_PARAM(filter_duplicates), - bool AXOM_UNUSED_PARAM(tag_stream_only)) -{ - if(m_lj == nullptr) - { - std::cerr - << "ERROR: NULL Lumberjack instance in LumberjackStream::append!\n"; - return; - } - - m_lj->queueMessage(message, fileName, line, msgLevel, tagName); -} - -//------------------------------------------------------------------------------ -void LumberjackStream::outputLocal() -{ - if(m_lj == nullptr) - { - std::cerr - << "ERROR: NULL Lumberjack instance in LumberjackStream::flush!\n"; - return; - } - - //Non-collective write to console - this->write(true); -} - -//------------------------------------------------------------------------------ -void LumberjackStream::flush() -{ - if(m_lj == nullptr) - { - std::cerr - << "ERROR: NULL Lumberjack instance in LumberjackStream::flush!\n"; - return; - } - - // Collective push of messages to output node followed by write to console - m_lj->pushMessagesFully(); - this->write(); -} - -//------------------------------------------------------------------------------ -void LumberjackStream::push() -{ - if(m_lj == nullptr) - { - std::cerr << "ERROR: NULL Lumberjack instance in LumberjackStream::push!\n"; - return; - } - - m_lj->pushMessagesOnce(); -} - -//------------------------------------------------------------------------------ -void LumberjackStream::write(bool local) -{ - if(m_lj == nullptr) - { - std::cerr - << "ERROR: NULL Lumberjack instance in LumberjackStream::write!\n"; - return; - } - - if(m_lj->isOutputNode() || local) - { - std::vector messages = m_lj->getMessages(); - - const int nmessages = static_cast(messages.size()); - std::string rankString; - for(int i = 0; i < nmessages; ++i) - { - rankString = std::to_string(messages[i]->count()) + ": " + - messages[i]->stringOfRanks(); - (*m_stream) << this->getFormatedMessage( - message::getLevelAsString( - static_cast(messages[i]->level())), - messages[i]->text(), - messages[i]->tag(), - rankString, - messages[i]->fileName(), - messages[i]->lineNumber()); - } - - m_stream->flush(); - m_lj->clearMessages(); - } -} - -//------------------------------------------------------------------------------ -void LumberjackStream::initializeLumberjack(MPI_Comm comm, int ranksLimit) -{ - m_ljComm = new axom::lumberjack::BinaryTreeCommunicator; - m_ljComm->initialize(comm, ranksLimit); - m_lj = new axom::lumberjack::Lumberjack; - m_lj->initialize(m_ljComm, ranksLimit); - m_lj->addCombiner(new lumberjack::TextTagCombiner); - m_isLJOwnedBySLIC = true; -} - -//------------------------------------------------------------------------------ -void LumberjackStream::finalizeLumberjack() -{ - m_lj->finalize(); - m_ljComm->finalize(); - delete m_lj; - delete m_ljComm; - m_isLJOwnedBySLIC = false; -} - -} /* namespace slic */ -} /* namespace axom */ From 34d896b3ffb9876827e788d79d11db5a38554443 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 31 Jan 2024 10:40:35 -0800 Subject: [PATCH 517/639] host device decorate intersection bbox bbox overload to get CUDA working --- src/axom/primal/operators/intersect.hpp | 3 +- .../quest/examples/quest_bvh_silo_example.cpp | 43 ++++++++++++++++++- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/axom/primal/operators/intersect.hpp b/src/axom/primal/operators/intersect.hpp index c766327af6..57dbc11bf9 100644 --- a/src/axom/primal/operators/intersect.hpp +++ b/src/axom/primal/operators/intersect.hpp @@ -402,7 +402,8 @@ bool intersect(const Segment& S, const BoundingBox& bb) * \return true iff bb1 intersects with bb2, otherwise, false. */ template -bool intersect(const BoundingBox& bb1, const BoundingBox& bb2) +AXOM_HOST_DEVICE bool intersect(const BoundingBox& bb1, + const BoundingBox& bb2) { return bb1.intersectsWith(bb2); } diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index dee2807bab..e73ba1a9eb 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -261,7 +261,7 @@ HexMesh loadSiloHexMesh(const std::string& mesh_path) int cell_calc_from_connectivity = connectivity_size / HEX_OFFSET; if(cell_calc_from_nodes != cell_calc_from_connectivity) { - SLIC_ERROR("Number of connectivity elements is not expected!\n" + SLIC_ERROR("Number of cells is not expected!\n" << "First calculation is " << cell_calc_from_nodes << " and second calculation is " << cell_calc_from_connectivity); } @@ -426,10 +426,12 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, // Initialize query indices and bvh candidate indices IndexArray indices_d(axom::ArrayOptions::Uninitialized {}, + candidates_d.size(), candidates_d.size(), kernel_allocator); IndexArray validCandidates_d(axom::ArrayOptions::Uninitialized {}, + candidates_d.size(), candidates_d.size(), kernel_allocator); @@ -469,9 +471,11 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, timer.elapsedTimeInSec())); IndexArray intersect_d[2] = {IndexArray(axom::ArrayOptions::Uninitialized {}, + numCandidates, numCandidates, kernel_allocator), IndexArray(axom::ArrayOptions::Uninitialized {}, + numCandidates, numCandidates, kernel_allocator)}; axom::IndexType numIntersections {}; @@ -486,6 +490,41 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, auto indices_v = indices_d.view(); auto validCandidates_v = validCandidates_d.view(); + // axom::for_all( + // 1, + // AXOM_LAMBDA(axom::IndexType i) { + + // printf("indices_v size is %d\n", indices_v.size()); + // printf("validCandidates_v size is %d\n", validCandidates_v.size()); + // printf("query_bbox_v size is %d\n", query_bbox_v.size()); + // printf("insert_bbox_v size is %d\n", insert_bbox_v.size()); + // printf("query_hexes_v size is %d\n", query_hexes_v.size()); + // printf("insert_hexes_v size is %d\n", insert_hexes_v.size()); + // printf("intersect1_v size is %d\n", intersect1_v.size()); + // printf("intersect2_v size is %d\n", intersect2_v.size()); + + // printf("numIntersections_p value is %d\n", numIntersections_p[0]); + + // // Try access stuff + // for (int j = 0; j < query_bbox_v.size(); j++) + // { + // auto qbv = query_bbox_v[j]; + // auto ibv = insert_bbox_v[j]; + // auto qhv = query_hexes_v[j]; + // auto ihv = insert_hexes_v[j]; + // } + + // for (int j = 0; j < intersect1_v.size(); j++) + // { + // auto a1 = indices_v[j]; + // auto v1 = validCandidates_v[j]; + // const auto idx = + // RAJA::atomicAdd(numIntersections_p, axom::IndexType {1}); + // intersect1_v[idx] = j; + // intersect2_v[idx] = j; + // } + + // }); // Perform hex-hex tests axom::for_all( numCandidates, @@ -493,12 +532,14 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, constexpr bool includeBoundaries = false; const auto index = indices_v[i]; const auto candidate = validCandidates_v[i]; + // For now, using bbox-bbox intersection, because well, have to implement // the hex-hex intersection routine first. // if(axom::primal::intersect(query_hexes_v[index], // insert_hexes_v[candidate], // includeBoundaries, // tol)) + if(axom::primal::intersect(query_bbox_v[index], insert_bbox_v[candidate])) { const auto idx = From c8c57a29b261cba5651e5a1de19e920af44c31a0 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 2 Feb 2024 07:47:04 -0800 Subject: [PATCH 518/639] Boilerplate for clip(hex,hex) to fill out --- src/axom/primal/operators/clip.hpp | 46 ++++++++++++++++ .../primal/operators/detail/clip_impl.hpp | 53 +++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/src/axom/primal/operators/clip.hpp b/src/axom/primal/operators/clip.hpp index 3585015afc..dc5267f060 100644 --- a/src/axom/primal/operators/clip.hpp +++ b/src/axom/primal/operators/clip.hpp @@ -142,6 +142,52 @@ AXOM_HOST_DEVICE Polyhedron clip(const Hexahedron& hex, return detail::clipHexahedron(hex, tet, eps, tryFixOrientation); } +/*! + * \brief Clips a 3D hexahedron against another hexahedron in 3D, returning + * the geometric intersection as a polyhedron + * + * This function clips the hexahedron by the 6 planes obtained from the + * hexahedron's faces (normals point inward). Clipping the + * hexahedron/polyhedron by each plane gives the polyhedron above that plane. + * Clipping the polyhedron by a plane involves + * finding new vertices at the intersection of the polyhedron edges and + * the plane, removing vertices from the polyhedron that are below the + * plane, and redefining the neighbors for each vertex (a vertex is a + * neighbor of another vertex if there is an edge between them). + * + * + * \param [in] hex The hexahedron to clip + * \param [in] tet The hexahedron to clip against + * \param [in] eps The epsilon value + * \param [in] tryFixOrientation If true, takes each shape with a negative + * signed volume and swaps the order of some vertices in that + * shape to try to obtain a nonnegative signed volume. + * Defaults to false. + * + * \return A polyhedron of the hexahedron clipped against the tetrahedron. + * + * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. + * + * \warning tryFixOrientation flag does not guarantee the shapes' vertex orders + * will be valid. It is the responsiblity of the caller to pass + * shapes with a valid vertex order. Otherwise, if the shapes have + * invalid vertex orders, the returned Polyhedron + * will have a non-positive and/or unexpected volume. + * + * \warning If tryFixOrientation flag is false and some of the shapes have + * a negative signed volume, the returned Polyhedron + * will have a non-positive and/or unexpected volume. + * + */ +template +AXOM_HOST_DEVICE Polyhedron clip(const Hexahedron& hex1, + const Hexahedron& hex2, + double eps = 1.e-10, + bool tryFixOrientation = false) +{ + return detail::clipHexahedron(hex1, hex2, eps, tryFixOrientation); +} + /*! * \brief Clips a 3D hexahedron against a tetrahedron in 3D, returning * the geometric intersection of the hexahedron and the tetrahedron diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index fadc142609..3b02dd19be 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -536,6 +536,59 @@ AXOM_HOST_DEVICE Polyhedron clipHexahedron( return poly; } +/*! + * \brief Finds the clipped intersection Polyhedron between Hexahedron + * hex1 and another Hexahedron hex2. + * + * \param [in] hex1 The hexahedron + * \param [in] hex2 The other hexahedron + * \param [in] eps The tolerance for plane point orientation. + * \param [in] tryFixOrientation Check if the signed volume of each shape is positive. + * \return The Polyhedron formed from clipping the hexahedra. + * + */ +template +AXOM_HOST_DEVICE Polyhedron clipHexahedron( + const Hexahedron& hex1, + const Hexahedron& hex2, + double eps, + bool tryFixOrientation) +{ + using PlaneType = Plane; + using PolyhedronType = Polyhedron; + + // Initialize our polyhedron to return + PolyhedronType poly = PolyhedronType::from_primitive(hex1, tryFixOrientation); + + // Initialize planes from hexahedron vertices + // (Ordering here matters to get the correct winding) + PlaneType planes[6] = {make_plane(hex2[], hex2[], hex2[]), + make_plane(hex2[], hex2[], hex2[]), + make_plane(hex2[], hex2[], hex2[]), + make_plane(hex2[], hex2[], hex2[]), + make_plane(hex2[], hex2[], hex2[]), + make_plane(hex2[], hex2[], hex2[])}; + + // Adjusts planes in case tetrahedron signed volume is negative + if(tryFixOrientation) + { + PolyhedronType hex_poly = + PolyhedronType::from_primitive(hex2, tryFixOrientation); + planes[0] = make_plane(hex_poly[], hex_poly[], hex_poly[]); + planes[1] = make_plane(hex_poly[], hex_poly[], hex_poly[]); + planes[2] = make_plane(hex_poly[], hex_poly[], hex_poly[]); + planes[3] = make_plane(hex_poly[], hex_poly[], hex_poly[]); + planes[4] = make_plane(hex_poly[], hex_poly[], hex_poly[]); + planes[5] = make_plane(hex_poly[], hex_poly[], hex_poly[]); + } + + axom::StackArray planeSize = {6}; + axom::ArrayView planesView(planes, planeSize); + + clipPolyhedron(poly, planesView, eps); + return poly; +} + /*! * \brief Finds the clipped intersection Polyhedron between Octahedron * oct and Tetrahedron tet. From d46e5ee804922ed49b703f25be53d93d0f1cd177 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 6 Feb 2024 09:35:45 -0800 Subject: [PATCH 519/639] Revert "Boilerplate for clip(hex,hex) to fill out" This reverts commit 0de1468a6d8a43563f5b4ab3f228b72f3148a153. --- src/axom/primal/operators/clip.hpp | 46 ---------------- .../primal/operators/detail/clip_impl.hpp | 53 ------------------- 2 files changed, 99 deletions(-) diff --git a/src/axom/primal/operators/clip.hpp b/src/axom/primal/operators/clip.hpp index dc5267f060..3585015afc 100644 --- a/src/axom/primal/operators/clip.hpp +++ b/src/axom/primal/operators/clip.hpp @@ -142,52 +142,6 @@ AXOM_HOST_DEVICE Polyhedron clip(const Hexahedron& hex, return detail::clipHexahedron(hex, tet, eps, tryFixOrientation); } -/*! - * \brief Clips a 3D hexahedron against another hexahedron in 3D, returning - * the geometric intersection as a polyhedron - * - * This function clips the hexahedron by the 6 planes obtained from the - * hexahedron's faces (normals point inward). Clipping the - * hexahedron/polyhedron by each plane gives the polyhedron above that plane. - * Clipping the polyhedron by a plane involves - * finding new vertices at the intersection of the polyhedron edges and - * the plane, removing vertices from the polyhedron that are below the - * plane, and redefining the neighbors for each vertex (a vertex is a - * neighbor of another vertex if there is an edge between them). - * - * - * \param [in] hex The hexahedron to clip - * \param [in] tet The hexahedron to clip against - * \param [in] eps The epsilon value - * \param [in] tryFixOrientation If true, takes each shape with a negative - * signed volume and swaps the order of some vertices in that - * shape to try to obtain a nonnegative signed volume. - * Defaults to false. - * - * \return A polyhedron of the hexahedron clipped against the tetrahedron. - * - * \note Function is based off clipPolyhedron() in Mike Owen's PolyClipper. - * - * \warning tryFixOrientation flag does not guarantee the shapes' vertex orders - * will be valid. It is the responsiblity of the caller to pass - * shapes with a valid vertex order. Otherwise, if the shapes have - * invalid vertex orders, the returned Polyhedron - * will have a non-positive and/or unexpected volume. - * - * \warning If tryFixOrientation flag is false and some of the shapes have - * a negative signed volume, the returned Polyhedron - * will have a non-positive and/or unexpected volume. - * - */ -template -AXOM_HOST_DEVICE Polyhedron clip(const Hexahedron& hex1, - const Hexahedron& hex2, - double eps = 1.e-10, - bool tryFixOrientation = false) -{ - return detail::clipHexahedron(hex1, hex2, eps, tryFixOrientation); -} - /*! * \brief Clips a 3D hexahedron against a tetrahedron in 3D, returning * the geometric intersection of the hexahedron and the tetrahedron diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index 3b02dd19be..fadc142609 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -536,59 +536,6 @@ AXOM_HOST_DEVICE Polyhedron clipHexahedron( return poly; } -/*! - * \brief Finds the clipped intersection Polyhedron between Hexahedron - * hex1 and another Hexahedron hex2. - * - * \param [in] hex1 The hexahedron - * \param [in] hex2 The other hexahedron - * \param [in] eps The tolerance for plane point orientation. - * \param [in] tryFixOrientation Check if the signed volume of each shape is positive. - * \return The Polyhedron formed from clipping the hexahedra. - * - */ -template -AXOM_HOST_DEVICE Polyhedron clipHexahedron( - const Hexahedron& hex1, - const Hexahedron& hex2, - double eps, - bool tryFixOrientation) -{ - using PlaneType = Plane; - using PolyhedronType = Polyhedron; - - // Initialize our polyhedron to return - PolyhedronType poly = PolyhedronType::from_primitive(hex1, tryFixOrientation); - - // Initialize planes from hexahedron vertices - // (Ordering here matters to get the correct winding) - PlaneType planes[6] = {make_plane(hex2[], hex2[], hex2[]), - make_plane(hex2[], hex2[], hex2[]), - make_plane(hex2[], hex2[], hex2[]), - make_plane(hex2[], hex2[], hex2[]), - make_plane(hex2[], hex2[], hex2[]), - make_plane(hex2[], hex2[], hex2[])}; - - // Adjusts planes in case tetrahedron signed volume is negative - if(tryFixOrientation) - { - PolyhedronType hex_poly = - PolyhedronType::from_primitive(hex2, tryFixOrientation); - planes[0] = make_plane(hex_poly[], hex_poly[], hex_poly[]); - planes[1] = make_plane(hex_poly[], hex_poly[], hex_poly[]); - planes[2] = make_plane(hex_poly[], hex_poly[], hex_poly[]); - planes[3] = make_plane(hex_poly[], hex_poly[], hex_poly[]); - planes[4] = make_plane(hex_poly[], hex_poly[], hex_poly[]); - planes[5] = make_plane(hex_poly[], hex_poly[], hex_poly[]); - } - - axom::StackArray planeSize = {6}; - axom::ArrayView planesView(planes, planeSize); - - clipPolyhedron(poly, planesView, eps); - return poly; -} - /*! * \brief Finds the clipped intersection Polyhedron between Octahedron * oct and Tetrahedron tet. From cd63e8c97f8bbc75efeb0de0525c2981c85eaf00 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 6 Feb 2024 11:57:34 -0800 Subject: [PATCH 520/639] First pass at using blueprint mesh input --- .../quest/examples/quest_bvh_silo_example.cpp | 200 +++++++++--------- 1 file changed, 104 insertions(+), 96 deletions(-) diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index e73ba1a9eb..0332a4e110 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -30,7 +30,7 @@ #ifdef AXOM_USE_CONDUIT #include "conduit_relay.hpp" - #include "conduit_relay_io_silo.hpp" + #include "conduit_blueprint.hpp" #else #error This example requires axom to be configured with Conduit support #endif @@ -123,12 +123,12 @@ struct Input void Input::parse(int argc, char** argv, axom::CLI::App& app) { app.add_option("-i, --infile", mesh_file_first) - ->description("The first input silo mesh file to insert into BVH") + ->description("The first input Blueprint mesh file to insert into BVH") ->required() ->check(axom::CLI::ExistingFile); app.add_option("-q, --queryfile", mesh_file_second) - ->description("The second input silo mesh file to query BVH") + ->description("The second input Blueprint mesh file to query BVH") ->required() ->check(axom::CLI::ExistingFile); @@ -162,8 +162,8 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) SLIC_INFO(axom::fmt::format( R"( Parsed parameters: - * First Silo mesh to insert into BVH: '{}' - * Second Silo mesh to query BVH: '{}' + * First Blueprint mesh to insert into BVH: '{}' + * Second Blueprint mesh to query BVH: '{}' * Threshold for intersections: {} * Verbose logging: {} * Runtime execution policy: '{}' @@ -216,7 +216,7 @@ struct HexMesh BoundingBox m_meshBoundingBox; }; -HexMesh loadSiloHexMesh(const std::string& mesh_path) +HexMesh loadBlueprintHexMesh(const std::string& mesh_path) { HexMesh hexMesh; @@ -224,19 +224,12 @@ HexMesh loadSiloHexMesh(const std::string& mesh_path) // Load silo mesh into Conduit node conduit::Node n_load; - conduit::relay::io::silo::load_mesh(mesh_path, n_load); - - // Get unstructured topology for the cell connectivity - conduit::Node unstruct_topo; - conduit::Node unstruct_coords; - - conduit::blueprint::mesh::topology::structured::to_unstructured( - n_load[0]["topologies/MMESH"], - unstruct_topo, - unstruct_coords); + // conduit::relay::io::silo::load_mesh(mesh_path, n_load); + conduit::relay::io::blueprint::read_mesh(mesh_path, n_load); + n_load.print(); // Verify this is a hexahedral mesh - std::string shape = unstruct_topo["elements/shape"].as_string(); + std::string shape = n_load[0]["topologies/topo/elements/shape"].as_string(); if(shape != "hex") { SLIC_ERROR("A hex mesh was expected!"); @@ -244,16 +237,17 @@ HexMesh loadSiloHexMesh(const std::string& mesh_path) UMesh* mesh = new UMesh(3, axom::mint::HEX); - int* connectivity = unstruct_topo["elements/connectivity"].value(); + int* connectivity = n_load[0]["topologies/topo/elements/connectivity"].value(); const int HEX_OFFSET = 8; - int num_nodes = (unstruct_coords["values/x"]).dtype().number_of_elements(); - double* x_vals = unstruct_coords["values/x"].value(); - double* y_vals = unstruct_coords["values/y"].value(); - double* z_vals = unstruct_coords["values/z"].value(); + int num_nodes = + (n_load[0]["coordsets/coords/values/x"]).dtype().number_of_elements(); + double* x_vals = n_load[0]["coordsets/coords/values/x"].value(); + double* y_vals = n_load[0]["coordsets/coords/values/y"].value(); + double* z_vals = n_load[0]["coordsets/coords/values/z"].value(); int connectivity_size = - (unstruct_topo["elements/connectivity"]).dtype().number_of_elements(); + (n_load[0]["topologies/topo/elements/connectivity"]).dtype().number_of_elements(); // Sanity check for number of cells int cell_calc_from_nodes = @@ -293,8 +287,16 @@ HexMesh loadSiloHexMesh(const std::string& mesh_path) SLIC_INFO(axom::fmt::format("Loading the mesh took {:4.3} seconds.", timer.elapsedTimeInSec())); - // // Write out to vtk for test viewing + // Write out to vtk for test viewing + // SLIC_INFO("Writing out mesh to test.vtk for debugging"); + // timer.start(); // axom::mint::write_vtk(mesh, "test.vtk"); + // timer.stop(); + // SLIC_INFO( + // axom::fmt::format("Writing out mesh to test.vtk took {:4.3} seconds.", + // timer.elapsedTimeInSec())); + + timer.start(); // extract hexes into an axom::Array const int numCells = mesh->getNumberOfCells(); @@ -333,6 +335,11 @@ HexMesh loadSiloHexMesh(const std::string& mesh_path) SLIC_INFO( axom::fmt::format("Mesh bounding box is {}.\n", hexMesh.meshBoundingBox())); + timer.stop(); + SLIC_INFO( + axom::fmt::format("Writing out mesh to hexMesh object took {:4.3} seconds.", + timer.elapsedTimeInSec())); + return hexMesh; } @@ -592,7 +599,7 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, } return intersectionPairs; -} // end of findIntersectionsBVH for Silo Meshes +} // end of findIntersectionsBVH for Blueprint Meshes int main(int argc, char** argv) { @@ -602,7 +609,7 @@ int main(int argc, char** argv) // Parse the command line arguments Input params; { - axom::CLI::App app {"Silo Hex BVH mesh intersection tester"}; + axom::CLI::App app {"Blueprint Hex BVH mesh intersection tester"}; try { params.parse(argc, argv, app); @@ -617,76 +624,77 @@ int main(int argc, char** argv) axom::slic::setLoggingMsgLevel(params.isVerbose() ? axom::slic::message::Debug : axom::slic::message::Info); - // Load Silo mesh into BVH - SLIC_INFO(axom::fmt::format("Reading silo file to insert into BVH: '{}'...\n", - params.mesh_file_first)); - - HexMesh insert_mesh = loadSiloHexMesh(params.mesh_file_first); - - // Load Silo mesh for querying BVH - SLIC_INFO(axom::fmt::format("Reading silo file to query BVH: '{}'...\n", - params.mesh_file_second)); - - HexMesh query_mesh = loadSiloHexMesh(params.mesh_file_second); - - // Check for self-intersections; results are returned as an array of index pairs - axom::Array intersectionPairs; - axom::utilities::Timer timer(true); - switch(params.policy) - { - case RuntimePolicy::raja_omp: -#ifdef AXOM_USE_OPENMP - intersectionPairs = - findIntersectionsBVH(insert_mesh, - query_mesh, - params.intersectionThreshold, - params.isVerbose()); -#endif - break; - case RuntimePolicy::raja_cuda: -#ifdef AXOM_USE_CUDA - intersectionPairs = - findIntersectionsBVH(insert_mesh, - query_mesh, - params.intersectionThreshold, - params.isVerbose()); -#endif - break; - default: // RuntimePolicy::raja_seq - intersectionPairs = - findIntersectionsBVH(insert_mesh, - query_mesh, - params.intersectionThreshold, - params.isVerbose()); - break; - } - timer.stop(); - - SLIC_INFO(axom::fmt::format("Computing intersections {} took {:4.3} seconds.", - "with a BVH tree", - timer.elapsedTimeInSec())); - SLIC_INFO(axom::fmt::format(axom::utilities::locale(), - "Mesh had {:L} intersection pairs", - intersectionPairs.size())); - - // print first few pairs - const int numIntersections = intersectionPairs.size(); - if(numIntersections > 0 && params.isVerbose()) - { - constexpr int MAX_PRINT = 20; - if(numIntersections > MAX_PRINT) - { - intersectionPairs.resize(MAX_PRINT); - SLIC_INFO(axom::fmt::format("First {} intersection pairs: {} ...\n", - MAX_PRINT, - axom::fmt::join(intersectionPairs, ", "))); - } - else - { - SLIC_INFO(axom::fmt::format("Intersection pairs: {}\n", - axom::fmt::join(intersectionPairs, ", "))); - } - } + // Load Blueprint mesh into BVH + SLIC_INFO( + axom::fmt::format("Reading Blueprint file to insert into BVH: '{}'...\n", + params.mesh_file_first)); + + HexMesh insert_mesh = loadBlueprintHexMesh(params.mesh_file_first); + + // Load Blueprint mesh for querying BVH + // SLIC_INFO(axom::fmt::format("Reading Blueprint file to query BVH: '{}'...\n", + // params.mesh_file_second)); + + // HexMesh query_mesh = loadBlueprintHexMesh(params.mesh_file_second); + + // // Check for self-intersections; results are returned as an array of index pairs + // axom::Array intersectionPairs; + // axom::utilities::Timer timer(true); + // switch(params.policy) + // { + // case RuntimePolicy::raja_omp: + // #ifdef AXOM_USE_OPENMP + // intersectionPairs = + // findIntersectionsBVH(insert_mesh, + // query_mesh, + // params.intersectionThreshold, + // params.isVerbose()); + // #endif + // break; + // case RuntimePolicy::raja_cuda: + // #ifdef AXOM_USE_CUDA + // intersectionPairs = + // findIntersectionsBVH(insert_mesh, + // query_mesh, + // params.intersectionThreshold, + // params.isVerbose()); + // #endif + // break; + // default: // RuntimePolicy::raja_seq + // intersectionPairs = + // findIntersectionsBVH(insert_mesh, + // query_mesh, + // params.intersectionThreshold, + // params.isVerbose()); + // break; + // } + // timer.stop(); + + // SLIC_INFO(axom::fmt::format("Computing intersections {} took {:4.3} seconds.", + // "with a BVH tree", + // timer.elapsedTimeInSec())); + // SLIC_INFO(axom::fmt::format(axom::utilities::locale(), + // "Mesh had {:L} intersection pairs", + // intersectionPairs.size())); + + // // print first few pairs + // const int numIntersections = intersectionPairs.size(); + // if(numIntersections > 0 && params.isVerbose()) + // { + // constexpr int MAX_PRINT = 20; + // if(numIntersections > MAX_PRINT) + // { + // intersectionPairs.resize(MAX_PRINT); + // SLIC_INFO(axom::fmt::format("First {} intersection pairs: {} ...\n", + // MAX_PRINT, + // axom::fmt::join(intersectionPairs, ", "))); + // } + // else + // { + // SLIC_INFO(axom::fmt::format("Intersection pairs: {}\n", + // axom::fmt::join(intersectionPairs, ", "))); + // } + // } return 0; } From 9b5d00178451672a45a854d91d28828ea44463ed Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 6 Feb 2024 13:21:12 -0800 Subject: [PATCH 521/639] Update data submodule with blueprint meshes --- data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data b/data index ae15cb5f72..1eafa5e3c2 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit ae15cb5f7279a5b89f7db39e69b82d2331e45a80 +Subproject commit 1eafa5e3c2bfde11f28d646cbeb580fa02da0721 From 830433ef606f2b680d2f1fd0d484ebe8cc03da5d Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 6 Feb 2024 14:45:31 -0800 Subject: [PATCH 522/639] Load just hexMesh structures by default, make vtk debug option verbose --- .../quest/examples/quest_bvh_silo_example.cpp | 147 +++++++++--------- 1 file changed, 76 insertions(+), 71 deletions(-) diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index 0332a4e110..ae64c840dd 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -216,15 +216,15 @@ struct HexMesh BoundingBox m_meshBoundingBox; }; -HexMesh loadBlueprintHexMesh(const std::string& mesh_path) +HexMesh loadBlueprintHexMesh(const std::string& mesh_path, + bool verboseOutput = false) { HexMesh hexMesh; axom::utilities::Timer timer(true); - // Load silo mesh into Conduit node + // Load Blueprint mesh into Conduit node conduit::Node n_load; - // conduit::relay::io::silo::load_mesh(mesh_path, n_load); conduit::relay::io::blueprint::read_mesh(mesh_path, n_load); n_load.print(); @@ -235,16 +235,10 @@ HexMesh loadBlueprintHexMesh(const std::string& mesh_path) SLIC_ERROR("A hex mesh was expected!"); } - UMesh* mesh = new UMesh(3, axom::mint::HEX); - - int* connectivity = n_load[0]["topologies/topo/elements/connectivity"].value(); - const int HEX_OFFSET = 8; + int num_nodes = (n_load[0]["coordsets/coords/values/x"]).dtype().number_of_elements(); - double* x_vals = n_load[0]["coordsets/coords/values/x"].value(); - double* y_vals = n_load[0]["coordsets/coords/values/y"].value(); - double* z_vals = n_load[0]["coordsets/coords/values/z"].value(); int connectivity_size = (n_load[0]["topologies/topo/elements/connectivity"]).dtype().number_of_elements(); @@ -260,69 +254,31 @@ HexMesh loadBlueprintHexMesh(const std::string& mesh_path) << " and second calculation is " << cell_calc_from_connectivity); } - // Append mesh nodes - for(int i = 0; i < num_nodes; i++) - { - mesh->appendNode(x_vals[i], y_vals[i], z_vals[i]); - } - - // Append mesh cells - for(int i = 0; i < connectivity_size / HEX_OFFSET; i++) - { - const axom::IndexType cell[] = { - connectivity[i * HEX_OFFSET], - connectivity[(i * HEX_OFFSET) + 1], - connectivity[(i * HEX_OFFSET) + 2], - connectivity[(i * HEX_OFFSET) + 3], - connectivity[(i * HEX_OFFSET) + 4], - connectivity[(i * HEX_OFFSET) + 5], - connectivity[(i * HEX_OFFSET) + 6], - connectivity[(i * HEX_OFFSET) + 7], - }; - - mesh->appendCell(cell); - } - - timer.stop(); - SLIC_INFO(axom::fmt::format("Loading the mesh took {:4.3} seconds.", - timer.elapsedTimeInSec())); - - // Write out to vtk for test viewing - // SLIC_INFO("Writing out mesh to test.vtk for debugging"); - // timer.start(); - // axom::mint::write_vtk(mesh, "test.vtk"); - // timer.stop(); - // SLIC_INFO( - // axom::fmt::format("Writing out mesh to test.vtk took {:4.3} seconds.", - // timer.elapsedTimeInSec())); + // extract hexes into an axom::Array + int* connectivity = n_load[0]["topologies/topo/elements/connectivity"].value(); - timer.start(); + double* x_vals = n_load[0]["coordsets/coords/values/x"].value(); + double* y_vals = n_load[0]["coordsets/coords/values/y"].value(); + double* z_vals = n_load[0]["coordsets/coords/values/z"].value(); - // extract hexes into an axom::Array - const int numCells = mesh->getNumberOfCells(); + const int numCells = connectivity_size / HEX_OFFSET; hexMesh.m_hexes.reserve(numCells); + HexMesh::Hexahedron hex; + axom::Array hexPoints(HEX_OFFSET); + + for(int i = 0; i < numCells; ++i) { - HexMesh::Hexahedron hex; - std::array hexCell; - for(int i = 0; i < numCells; ++i) + for(int j = 0; j < HEX_OFFSET; j++) { - mesh->getCellNodeIDs(i, hexCell.data()); - mesh->getNode(hexCell[0], hex[0].data()); - mesh->getNode(hexCell[1], hex[1].data()); - mesh->getNode(hexCell[2], hex[2].data()); - mesh->getNode(hexCell[3], hex[3].data()); - mesh->getNode(hexCell[4], hex[4].data()); - mesh->getNode(hexCell[5], hex[5].data()); - mesh->getNode(hexCell[6], hex[6].data()); - mesh->getNode(hexCell[7], hex[7].data()); - - hexMesh.m_hexes.emplace_back(hex); + int offset = i * HEX_OFFSET; + hexPoints[j] = HexMesh::Point({x_vals[connectivity[offset + j]], + y_vals[connectivity[offset + j]], + z_vals[connectivity[offset + j]]}); } + hex = HexMesh::Hexahedron(hexPoints); + hexMesh.m_hexes.emplace_back(hex); } - delete mesh; - mesh = nullptr; - // compute and store hex bounding boxes and mesh bounding box hexMesh.m_hexBoundingBoxes.reserve(numCells); for(const auto& hex : hexMesh.hexes()) @@ -336,12 +292,60 @@ HexMesh loadBlueprintHexMesh(const std::string& mesh_path) axom::fmt::format("Mesh bounding box is {}.\n", hexMesh.meshBoundingBox())); timer.stop(); - SLIC_INFO( - axom::fmt::format("Writing out mesh to hexMesh object took {:4.3} seconds.", - timer.elapsedTimeInSec())); + SLIC_INFO(axom::fmt::format( + "Writing out Blueprint mesh to hexMesh object took {:4.3} seconds.", + timer.elapsedTimeInSec())); + + // Optional verbose output that writes Blueprint mesh to vtk + if(verboseOutput) + { + timer.start(); + + UMesh* mesh = new UMesh(3, axom::mint::HEX); + + // Append mesh nodes + for(int i = 0; i < num_nodes; i++) + { + mesh->appendNode(x_vals[i], y_vals[i], z_vals[i]); + } + + // Append mesh cells + for(int i = 0; i < numCells; i++) + { + const axom::IndexType cell[] = { + connectivity[i * HEX_OFFSET], + connectivity[(i * HEX_OFFSET) + 1], + connectivity[(i * HEX_OFFSET) + 2], + connectivity[(i * HEX_OFFSET) + 3], + connectivity[(i * HEX_OFFSET) + 4], + connectivity[(i * HEX_OFFSET) + 5], + connectivity[(i * HEX_OFFSET) + 6], + connectivity[(i * HEX_OFFSET) + 7], + }; + + mesh->appendCell(cell); + } + + timer.stop(); + SLIC_INFO( + axom::fmt::format("Loading the Blueprint mesh took {:4.3} seconds.", + timer.elapsedTimeInSec())); + + // Write out to vtk for test viewing + SLIC_INFO("Writing out Blueprint mesh to test.vtk for debugging..."); + timer.start(); + axom::mint::write_vtk(mesh, "test.vtk"); + timer.stop(); + SLIC_INFO(axom::fmt::format( + "Writing out Blueprint mesh to test.vtk took {:4.3} seconds.", + timer.elapsedTimeInSec())); + + delete mesh; + mesh = nullptr; + } // end of verbose output return hexMesh; -} +} // end of loadBlueprintHexMesh using IndexPair = std::pair; @@ -629,13 +633,14 @@ int main(int argc, char** argv) axom::fmt::format("Reading Blueprint file to insert into BVH: '{}'...\n", params.mesh_file_first)); - HexMesh insert_mesh = loadBlueprintHexMesh(params.mesh_file_first); + HexMesh insert_mesh = + loadBlueprintHexMesh(params.mesh_file_first, params.isVerbose()); // Load Blueprint mesh for querying BVH // SLIC_INFO(axom::fmt::format("Reading Blueprint file to query BVH: '{}'...\n", // params.mesh_file_second)); - // HexMesh query_mesh = loadBlueprintHexMesh(params.mesh_file_second); + // HexMesh query_mesh = loadBlueprintHexMesh(params.mesh_file_second, params.isVerbose()); // // Check for self-intersections; results are returned as an array of index pairs // axom::Array intersectionPairs; From 3266b9994a1bd63d0486b6668617d714502282de Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 7 Feb 2024 08:15:52 -0800 Subject: [PATCH 523/639] Turn on the bvh intersection, make timing comments always on --- .../quest/examples/quest_bvh_silo_example.cpp | 168 +++++++++--------- 1 file changed, 82 insertions(+), 86 deletions(-) diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index ae64c840dd..b1cc484241 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -226,7 +226,6 @@ HexMesh loadBlueprintHexMesh(const std::string& mesh_path, // Load Blueprint mesh into Conduit node conduit::Node n_load; conduit::relay::io::blueprint::read_mesh(mesh_path, n_load); - n_load.print(); // Verify this is a hexahedral mesh std::string shape = n_load[0]["topologies/topo/elements/shape"].as_string(); @@ -410,9 +409,8 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, bvh.setAllocatorID(kernel_allocator); bvh.initialize(insert_bbox_v, insert_bbox_v.size()); timer.stop(); - SLIC_INFO_IF(verboseOutput, - axom::fmt::format("0: Initializing BVH took {:4.3} seconds.", - timer.elapsedTimeInSec())); + SLIC_INFO(axom::fmt::format("0: Initializing BVH took {:4.3} seconds.", + timer.elapsedTimeInSec())); // Search for intersecting bounding boxes of hexes to query; // result is returned as CSR arrays for candidate data @@ -430,10 +428,9 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, query_bbox_v); timer.stop(); - SLIC_INFO_IF(verboseOutput, - axom::fmt::format( - "1: Querying candidate bounding boxes took {:4.3} seconds.", - timer.elapsedTimeInSec())); + SLIC_INFO(axom::fmt::format( + "1: Querying candidate bounding boxes took {:4.3} seconds.", + timer.elapsedTimeInSec())); // Initialize query indices and bvh candidate indices IndexArray indices_d(axom::ArrayOptions::Uninitialized {}, @@ -476,10 +473,10 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, axom::copy(&numCandidates, numValidCandidates_p, sizeof(axom::IndexType)); } timer.stop(); - SLIC_INFO_IF(verboseOutput, - axom::fmt::format("2: Linearizing query indices and bvh " - "candidate indices took {:4.3} seconds.", - timer.elapsedTimeInSec())); + SLIC_INFO( + axom::fmt::format("2: Linearizing query indices and bvh " + "candidate indices took {:4.3} seconds.", + timer.elapsedTimeInSec())); IndexArray intersect_d[2] = {IndexArray(axom::ArrayOptions::Uninitialized {}, numCandidates, @@ -566,14 +563,12 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, intersect_d[1].resize(numIntersections); timer.stop(); - SLIC_INFO_IF( - verboseOutput, + SLIC_INFO( axom::fmt::format("3: Finding actual intersections took {:4.3} seconds.", timer.elapsedTimeInSec())); - SLIC_INFO_IF(verboseOutput, - axom::fmt::format(axom::utilities::locale(), - R"(Stats for query + SLIC_INFO(axom::fmt::format(axom::utilities::locale(), + R"(Stats for query -- Number of insert-BVH mesh hexes {:L} -- Number of query mesh hexes {:L} -- Total possible candidates {:L} @@ -581,12 +576,12 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, -- Potential candidates after linearizing {:L} -- Actual intersections {:L} )", - insertMesh.numHexes(), - queryMesh.numHexes(), - insertMesh.numHexes() * queryMesh.numHexes(), - candidates_d.size(), - numCandidates, - numIntersections)); + insertMesh.numHexes(), + queryMesh.numHexes(), + insertMesh.numHexes() * queryMesh.numHexes(), + candidates_d.size(), + numCandidates, + numIntersections)); // copy results back to host and into return vector IndexArray intersect_h[2] = { @@ -637,69 +632,70 @@ int main(int argc, char** argv) loadBlueprintHexMesh(params.mesh_file_first, params.isVerbose()); // Load Blueprint mesh for querying BVH - // SLIC_INFO(axom::fmt::format("Reading Blueprint file to query BVH: '{}'...\n", - // params.mesh_file_second)); - - // HexMesh query_mesh = loadBlueprintHexMesh(params.mesh_file_second, params.isVerbose()); - - // // Check for self-intersections; results are returned as an array of index pairs - // axom::Array intersectionPairs; - // axom::utilities::Timer timer(true); - // switch(params.policy) - // { - // case RuntimePolicy::raja_omp: - // #ifdef AXOM_USE_OPENMP - // intersectionPairs = - // findIntersectionsBVH(insert_mesh, - // query_mesh, - // params.intersectionThreshold, - // params.isVerbose()); - // #endif - // break; - // case RuntimePolicy::raja_cuda: - // #ifdef AXOM_USE_CUDA - // intersectionPairs = - // findIntersectionsBVH(insert_mesh, - // query_mesh, - // params.intersectionThreshold, - // params.isVerbose()); - // #endif - // break; - // default: // RuntimePolicy::raja_seq - // intersectionPairs = - // findIntersectionsBVH(insert_mesh, - // query_mesh, - // params.intersectionThreshold, - // params.isVerbose()); - // break; - // } - // timer.stop(); - - // SLIC_INFO(axom::fmt::format("Computing intersections {} took {:4.3} seconds.", - // "with a BVH tree", - // timer.elapsedTimeInSec())); - // SLIC_INFO(axom::fmt::format(axom::utilities::locale(), - // "Mesh had {:L} intersection pairs", - // intersectionPairs.size())); - - // // print first few pairs - // const int numIntersections = intersectionPairs.size(); - // if(numIntersections > 0 && params.isVerbose()) - // { - // constexpr int MAX_PRINT = 20; - // if(numIntersections > MAX_PRINT) - // { - // intersectionPairs.resize(MAX_PRINT); - // SLIC_INFO(axom::fmt::format("First {} intersection pairs: {} ...\n", - // MAX_PRINT, - // axom::fmt::join(intersectionPairs, ", "))); - // } - // else - // { - // SLIC_INFO(axom::fmt::format("Intersection pairs: {}\n", - // axom::fmt::join(intersectionPairs, ", "))); - // } - // } + SLIC_INFO(axom::fmt::format("Reading Blueprint file to query BVH: '{}'...\n", + params.mesh_file_second)); + + HexMesh query_mesh = + loadBlueprintHexMesh(params.mesh_file_second, params.isVerbose()); + + // Check for self-intersections; results are returned as an array of index pairs + axom::Array intersectionPairs; + axom::utilities::Timer timer(true); + switch(params.policy) + { + case RuntimePolicy::raja_omp: +#ifdef AXOM_USE_OPENMP + intersectionPairs = + findIntersectionsBVH(insert_mesh, + query_mesh, + params.intersectionThreshold, + params.isVerbose()); +#endif + break; + case RuntimePolicy::raja_cuda: +#ifdef AXOM_USE_CUDA + intersectionPairs = + findIntersectionsBVH(insert_mesh, + query_mesh, + params.intersectionThreshold, + params.isVerbose()); +#endif + break; + default: // RuntimePolicy::raja_seq + intersectionPairs = + findIntersectionsBVH(insert_mesh, + query_mesh, + params.intersectionThreshold, + params.isVerbose()); + break; + } + timer.stop(); + + SLIC_INFO(axom::fmt::format("Computing intersections {} took {:4.3} seconds.", + "with a BVH tree", + timer.elapsedTimeInSec())); + SLIC_INFO(axom::fmt::format(axom::utilities::locale(), + "Mesh had {:L} intersection pairs", + intersectionPairs.size())); + + // print first few pairs + const int numIntersections = intersectionPairs.size(); + if(numIntersections > 0 && params.isVerbose()) + { + constexpr int MAX_PRINT = 20; + if(numIntersections > MAX_PRINT) + { + intersectionPairs.resize(MAX_PRINT); + SLIC_INFO(axom::fmt::format("First {} intersection pairs: {} ...\n", + MAX_PRINT, + axom::fmt::join(intersectionPairs, ", "))); + } + else + { + SLIC_INFO(axom::fmt::format("Intersection pairs: {}\n", + axom::fmt::join(intersectionPairs, ", "))); + } + } return 0; } From ee917262643b18b090235301e0fa1072ae7f35ff Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 7 Feb 2024 10:37:35 -0800 Subject: [PATCH 524/639] Write out candidate pairs --- src/axom/quest/examples/quest_bvh_silo_example.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index b1cc484241..763b65efcd 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -695,6 +695,20 @@ int main(int argc, char** argv) SLIC_INFO(axom::fmt::format("Intersection pairs: {}\n", axom::fmt::join(intersectionPairs, ", "))); } + + // Write out candidate pairs + SLIC_INFO("Writing out candidate pairs..."); + std::ofstream outf("candidates.txt"); + if(!outf) + { + return false; + } + + outf << intersectionPairs.size() << " candidate pairs:" << std::endl; + for(size_t i = 0; i < intersectionPairs.size(); ++i) + { + outf << intersectionPairs[i].first << " " << intersectionPairs[i].second << std::endl; + } } return 0; From 4a1c1679e70ec5dc97981f73e3dbe0bed6fcbe4e Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 7 Feb 2024 11:06:54 -0800 Subject: [PATCH 525/639] warnings fix, fix int overflow --- src/axom/quest/examples/quest_bvh_silo_example.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index 763b65efcd..500b784b36 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -578,7 +578,7 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, )", insertMesh.numHexes(), queryMesh.numHexes(), - insertMesh.numHexes() * queryMesh.numHexes(), + 1.0 * insertMesh.numHexes() * queryMesh.numHexes(), candidates_d.size(), numCandidates, numIntersections)); @@ -699,15 +699,12 @@ int main(int argc, char** argv) // Write out candidate pairs SLIC_INFO("Writing out candidate pairs..."); std::ofstream outf("candidates.txt"); - if(!outf) - { - return false; - } outf << intersectionPairs.size() << " candidate pairs:" << std::endl; - for(size_t i = 0; i < intersectionPairs.size(); ++i) + for(int i = 0; i < intersectionPairs.size(); ++i) { - outf << intersectionPairs[i].first << " " << intersectionPairs[i].second << std::endl; + outf << intersectionPairs[i].first << " " << intersectionPairs[i].second + << std::endl; } } From cef4fe9c41229237c394f233a6b83f7658c345a6 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 7 Feb 2024 12:30:34 -0800 Subject: [PATCH 526/639] Remove intersection-based logic; focus on finding candidates; find candidate pairs on host instead of on device due to poor host performance due to atomics --- .../quest/examples/quest_bvh_silo_example.cpp | 243 ++++-------------- 1 file changed, 43 insertions(+), 200 deletions(-) diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_bvh_silo_example.cpp index 500b784b36..4a39e4c7eb 100644 --- a/src/axom/quest/examples/quest_bvh_silo_example.cpp +++ b/src/axom/quest/examples/quest_bvh_silo_example.cpp @@ -9,7 +9,7 @@ /// /// This example uses a spatial index, the linear BVH tree from Axom's spin /// component, in addition to RAJA and Umpire based kernels for a highly -// efficient performance-portable self-intersection algorithm. +// efficient performance-portable candidate-finding algorithm. //----------------------------------------------------------------------------- #include "axom/config.hpp" @@ -113,7 +113,6 @@ struct Input std::string mesh_file_first {""}; std::string mesh_file_second {""}; bool verboseOutput {false}; - double intersectionThreshold {1e-08}; RuntimePolicy policy {RuntimePolicy::raja_seq}; void parse(int argc, char** argv, axom::CLI::App& app); @@ -136,10 +135,6 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) ->description("Increase logging verbosity?") ->capture_default_str(); - app.add_option("--intersection-threshold", intersectionThreshold) - ->description("Threshold to use when testing for intersecting hexes") - ->capture_default_str(); - app.add_option("-p, --policy", policy) ->description( "Execution policy." @@ -164,13 +159,11 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) Parsed parameters: * First Blueprint mesh to insert into BVH: '{}' * Second Blueprint mesh to query BVH: '{}' - * Threshold for intersections: {} * Verbose logging: {} * Runtime execution policy: '{}' )", mesh_file_first, mesh_file_second, - intersectionThreshold, verboseOutput, policy == RuntimePolicy::raja_omp ? "raja_omp" @@ -349,12 +342,10 @@ HexMesh loadBlueprintHexMesh(const std::string& mesh_path, using IndexPair = std::pair; template -axom::Array findIntersectionsBVH(const HexMesh& insertMesh, - const HexMesh& queryMesh, - double tol, - bool verboseOutput = false) +axom::Array findCandidatesBVH(const HexMesh& insertMesh, + const HexMesh& queryMesh) { - SLIC_INFO("Running BVH intersection algorithm in execution Space: " + SLIC_INFO("Running BVH candidates algorithm in execution Space: " << axom::execution_space::name()); using HexArray = axom::Array; @@ -362,9 +353,7 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, using IndexArray = axom::Array; constexpr bool on_device = axom::execution_space::onDevice(); - using ATOMIC_POL = typename axom::execution_space::atomic_policy; - - axom::Array intersectionPairs; + axom::Array candidatePairs; // Get ids of necessary allocators const int host_allocator = @@ -378,7 +367,6 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, auto& insert_hexes_h = insertMesh.hexes(); HexArray insert_hexes_d = on_device ? HexArray(insert_hexes_h, kernel_allocator) : HexArray(); - auto insert_hexes_v = on_device ? insert_hexes_d.view() : insert_hexes_h.view(); // Copy the insert-BVH bboxes to the device, if necessary // Either way, insert_bbox_v will be a view w/ data in the correct space @@ -392,7 +380,6 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, auto& query_hexes_h = queryMesh.hexes(); HexArray query_hexes_d = on_device ? HexArray(query_hexes_h, kernel_allocator) : HexArray(); - auto query_hexes_v = on_device ? query_hexes_d.view() : query_hexes_h.view(); // Copy the query-BVH bboxes to the device, if necessary // Either way, bbox_v will be a view w/ data in the correct space @@ -412,7 +399,7 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, SLIC_INFO(axom::fmt::format("0: Initializing BVH took {:4.3} seconds.", timer.elapsedTimeInSec())); - // Search for intersecting bounding boxes of hexes to query; + // Search for candidate bounding boxes of hexes to query; // result is returned as CSR arrays for candidate data timer.start(); IndexArray offsets_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); @@ -432,140 +419,26 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, "1: Querying candidate bounding boxes took {:4.3} seconds.", timer.elapsedTimeInSec())); - // Initialize query indices and bvh candidate indices - IndexArray indices_d(axom::ArrayOptions::Uninitialized {}, - candidates_d.size(), - candidates_d.size(), - kernel_allocator); + // Initialize candidatePairs to return + timer.start(); - IndexArray validCandidates_d(axom::ArrayOptions::Uninitialized {}, - candidates_d.size(), - candidates_d.size(), - kernel_allocator); + IndexArray offsets_h(offsets_d, host_allocator); + IndexArray counts_h(counts_d, host_allocator); + IndexArray candidates_h(candidates_d, host_allocator); - axom::IndexType numCandidates {}; - timer.start(); + for(int i = 0; i < queryMesh.numHexes(); i++) { - const int totalQueryHexes = queryMesh.numHexes(); - - IndexArray numValidCandidates_d(1, 1, kernel_allocator); - numValidCandidates_d.fill(0); - auto* numValidCandidates_p = numValidCandidates_d.data(); - - auto indices_v = indices_d.view(); - auto validCandidates_v = validCandidates_d.view(); - auto candidates_v = candidates_d.view(); - - // Initialize pairs of query and candidate indices - axom::for_all( - totalQueryHexes, - AXOM_LAMBDA(axom::IndexType i) { - for(int j = 0; j < counts_v[i]; j++) - { - const axom::IndexType potential = candidates_v[offsets_v[i] + j]; - const auto idx = RAJA::atomicAdd(numValidCandidates_p, - axom::IndexType {1}); - indices_v[idx] = i; - validCandidates_v[idx] = potential; - } - }); - - axom::copy(&numCandidates, numValidCandidates_p, sizeof(axom::IndexType)); + for(int j = 0; j < counts_h[i]; j++) + { + candidatePairs.emplace_back( + std::make_pair(i, candidates_h[offsets_h[i] + j])); + } } timer.stop(); - SLIC_INFO( - axom::fmt::format("2: Linearizing query indices and bvh " - "candidate indices took {:4.3} seconds.", - timer.elapsedTimeInSec())); - - IndexArray intersect_d[2] = {IndexArray(axom::ArrayOptions::Uninitialized {}, - numCandidates, - numCandidates, - kernel_allocator), - IndexArray(axom::ArrayOptions::Uninitialized {}, - numCandidates, - numCandidates, - kernel_allocator)}; - axom::IndexType numIntersections {}; - timer.start(); - { - auto intersect1_v = intersect_d[0].view(); - auto intersect2_v = intersect_d[1].view(); - - IndexArray numIntersections_d(1, 1, kernel_allocator); - auto* numIntersections_p = numIntersections_d.data(); - - auto indices_v = indices_d.view(); - auto validCandidates_v = validCandidates_d.view(); - - // axom::for_all( - // 1, - // AXOM_LAMBDA(axom::IndexType i) { - - // printf("indices_v size is %d\n", indices_v.size()); - // printf("validCandidates_v size is %d\n", validCandidates_v.size()); - // printf("query_bbox_v size is %d\n", query_bbox_v.size()); - // printf("insert_bbox_v size is %d\n", insert_bbox_v.size()); - // printf("query_hexes_v size is %d\n", query_hexes_v.size()); - // printf("insert_hexes_v size is %d\n", insert_hexes_v.size()); - // printf("intersect1_v size is %d\n", intersect1_v.size()); - // printf("intersect2_v size is %d\n", intersect2_v.size()); - - // printf("numIntersections_p value is %d\n", numIntersections_p[0]); - - // // Try access stuff - // for (int j = 0; j < query_bbox_v.size(); j++) - // { - // auto qbv = query_bbox_v[j]; - // auto ibv = insert_bbox_v[j]; - // auto qhv = query_hexes_v[j]; - // auto ihv = insert_hexes_v[j]; - // } - - // for (int j = 0; j < intersect1_v.size(); j++) - // { - // auto a1 = indices_v[j]; - // auto v1 = validCandidates_v[j]; - // const auto idx = - // RAJA::atomicAdd(numIntersections_p, axom::IndexType {1}); - // intersect1_v[idx] = j; - // intersect2_v[idx] = j; - // } - - // }); - // Perform hex-hex tests - axom::for_all( - numCandidates, - AXOM_LAMBDA(axom::IndexType i) { - constexpr bool includeBoundaries = false; - const auto index = indices_v[i]; - const auto candidate = validCandidates_v[i]; - - // For now, using bbox-bbox intersection, because well, have to implement - // the hex-hex intersection routine first. - // if(axom::primal::intersect(query_hexes_v[index], - // insert_hexes_v[candidate], - // includeBoundaries, - // tol)) - - if(axom::primal::intersect(query_bbox_v[index], insert_bbox_v[candidate])) - { - const auto idx = - RAJA::atomicAdd(numIntersections_p, axom::IndexType {1}); - intersect1_v[idx] = index; - intersect2_v[idx] = candidate; - } - }); - - axom::copy(&numIntersections, numIntersections_p, sizeof(axom::IndexType)); - } - intersect_d[0].resize(numIntersections); - intersect_d[1].resize(numIntersections); - timer.stop(); - SLIC_INFO( - axom::fmt::format("3: Finding actual intersections took {:4.3} seconds.", - timer.elapsedTimeInSec())); + SLIC_INFO(axom::fmt::format( + "2: Initializing candidate pairs on host took {:4.3} seconds.", + timer.elapsedTimeInSec())); SLIC_INFO(axom::fmt::format(axom::utilities::locale(), R"(Stats for query @@ -573,32 +446,14 @@ axom::Array findIntersectionsBVH(const HexMesh& insertMesh, -- Number of query mesh hexes {:L} -- Total possible candidates {:L} -- Candidates from BVH query {:L} - -- Potential candidates after linearizing {:L} - -- Actual intersections {:L} )", insertMesh.numHexes(), queryMesh.numHexes(), 1.0 * insertMesh.numHexes() * queryMesh.numHexes(), - candidates_d.size(), - numCandidates, - numIntersections)); - - // copy results back to host and into return vector - IndexArray intersect_h[2] = { - on_device ? IndexArray(intersect_d[0], host_allocator) : IndexArray(), - on_device ? IndexArray(intersect_d[1], host_allocator) : IndexArray()}; - - auto intersect1_h_v = on_device ? intersect_h[0].view() : intersect_d[0].view(); - auto intersect2_h_v = on_device ? intersect_h[1].view() : intersect_d[1].view(); - - for(axom::IndexType idx = 0; idx < numIntersections; ++idx) - { - intersectionPairs.emplace_back( - std::make_pair(intersect1_h_v[idx], intersect2_h_v[idx])); - } + candidates_h.size())); - return intersectionPairs; -} // end of findIntersectionsBVH for Blueprint Meshes + return candidatePairs; +} // end of findCandidatesBVH for Blueprint Meshes int main(int argc, char** argv) { @@ -608,7 +463,7 @@ int main(int argc, char** argv) // Parse the command line arguments Input params; { - axom::CLI::App app {"Blueprint Hex BVH mesh intersection tester"}; + axom::CLI::App app {"Blueprint Hex BVH mesh candidate tester"}; try { params.parse(argc, argv, app); @@ -638,72 +493,60 @@ int main(int argc, char** argv) HexMesh query_mesh = loadBlueprintHexMesh(params.mesh_file_second, params.isVerbose()); - // Check for self-intersections; results are returned as an array of index pairs - axom::Array intersectionPairs; + // Check for candidates; results are returned as an array of index pairs + axom::Array candidatePairs; axom::utilities::Timer timer(true); switch(params.policy) { case RuntimePolicy::raja_omp: #ifdef AXOM_USE_OPENMP - intersectionPairs = - findIntersectionsBVH(insert_mesh, - query_mesh, - params.intersectionThreshold, - params.isVerbose()); + candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); #endif break; case RuntimePolicy::raja_cuda: #ifdef AXOM_USE_CUDA - intersectionPairs = - findIntersectionsBVH(insert_mesh, - query_mesh, - params.intersectionThreshold, - params.isVerbose()); + candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); #endif break; default: // RuntimePolicy::raja_seq - intersectionPairs = - findIntersectionsBVH(insert_mesh, - query_mesh, - params.intersectionThreshold, - params.isVerbose()); + candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); break; } timer.stop(); - SLIC_INFO(axom::fmt::format("Computing intersections {} took {:4.3} seconds.", + SLIC_INFO(axom::fmt::format("Computing candidates {} took {:4.3} seconds.", "with a BVH tree", timer.elapsedTimeInSec())); SLIC_INFO(axom::fmt::format(axom::utilities::locale(), - "Mesh had {:L} intersection pairs", - intersectionPairs.size())); + "Mesh had {:L} candidates pairs", + candidatePairs.size())); // print first few pairs - const int numIntersections = intersectionPairs.size(); - if(numIntersections > 0 && params.isVerbose()) + const int numCandidates = candidatePairs.size(); + if(numCandidates > 0 && params.isVerbose()) { constexpr int MAX_PRINT = 20; - if(numIntersections > MAX_PRINT) + if(numCandidates > MAX_PRINT) { - intersectionPairs.resize(MAX_PRINT); - SLIC_INFO(axom::fmt::format("First {} intersection pairs: {} ...\n", + candidatePairs.resize(MAX_PRINT); + SLIC_INFO(axom::fmt::format("First {} candidate pairs: {} ...\n", MAX_PRINT, - axom::fmt::join(intersectionPairs, ", "))); + axom::fmt::join(candidatePairs, ", "))); } else { - SLIC_INFO(axom::fmt::format("Intersection pairs: {}\n", - axom::fmt::join(intersectionPairs, ", "))); + SLIC_INFO(axom::fmt::format("Candidate pairs: {}\n", + axom::fmt::join(candidatePairs, ", "))); } // Write out candidate pairs SLIC_INFO("Writing out candidate pairs..."); std::ofstream outf("candidates.txt"); - outf << intersectionPairs.size() << " candidate pairs:" << std::endl; - for(int i = 0; i < intersectionPairs.size(); ++i) + outf << candidatePairs.size() << " candidate pairs:" << std::endl; + for(int i = 0; i < candidatePairs.size(); ++i) { - outf << intersectionPairs[i].first << " " << intersectionPairs[i].second + outf << candidatePairs[i].first << " " << candidatePairs[i].second << std::endl; } } From 91dfb92e325fab7403d30f4c1444c441c5141aea Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 7 Feb 2024 12:44:52 -0800 Subject: [PATCH 527/639] Change executable name to quest_candidates_examples_ex --- src/axom/quest/examples/CMakeLists.txt | 4 ++-- ...uest_bvh_silo_example.cpp => quest_candidates_example.cpp} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename src/axom/quest/examples/{quest_bvh_silo_example.cpp => quest_candidates_example.cpp} (100%) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index eef2e18209..9a71ed1e86 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -36,8 +36,8 @@ endif() # BVH silo example ------------------------------------------------------------ if (CONDUIT_FOUND AND RAJA_FOUND AND UMPIRE_FOUND) axom_add_executable( - NAME quest_bvh_silo_example_ex - SOURCES quest_bvh_silo_example.cpp + NAME quest_candidates_example_ex + SOURCES quest_candidates_example.cpp OUTPUT_DIR ${EXAMPLE_OUTPUT_DIRECTORY} DEPENDS_ON ${quest_example_depends} conduit::conduit FOLDER axom/quest/examples diff --git a/src/axom/quest/examples/quest_bvh_silo_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp similarity index 100% rename from src/axom/quest/examples/quest_bvh_silo_example.cpp rename to src/axom/quest/examples/quest_candidates_example.cpp From faeccec8c91d0d7496ec5f0ff60c32fe6b2092e0 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 7 Feb 2024 16:23:52 -0800 Subject: [PATCH 528/639] Add option to get implicit grid candidates --- .../examples/quest_candidates_example.cpp | 224 ++++++++++++++++-- 1 file changed, 203 insertions(+), 21 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 4a39e4c7eb..2b4249c4ca 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -108,10 +108,13 @@ enum class RuntimePolicy struct Input { + static const std::set s_validMethods; static const std::map s_validPolicies; std::string mesh_file_first {""}; std::string mesh_file_second {""}; + std::string method {"bvh"}; + int resolution {0}; bool verboseOutput {false}; RuntimePolicy policy {RuntimePolicy::raja_seq}; @@ -131,6 +134,15 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) ->required() ->check(axom::CLI::ExistingFile); + app + .add_option("-r,--resolution", + resolution, + "With '-m implicit', set resolution of implicit grid. \n" + "Set to less than 1 to use the implicit spatial index\n" + "with a resolution of the cube root of the number of\n" + "hexes.") + ->capture_default_str(); + app.add_flag("-v,--verbose", verboseOutput) ->description("Increase logging verbosity?") ->capture_default_str(); @@ -149,6 +161,16 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) ->capture_default_str() ->transform(axom::CLI::CheckedTransformer(Input::s_validPolicies)); + app + .add_option( + "-m, --method", + method, + "Method to use. \n" + "Set to 'bvh' to use the bounding volume hierarchy spatial index.\n" + "Set to 'implicit' to use the implicit grid spatial index.") + ->capture_default_str() + ->check(axom::CLI::IsMember {Input::s_validMethods}); + app.get_formatter()->column_width(40); app.parse(argc, argv); // Could throw an exception @@ -157,14 +179,18 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) SLIC_INFO(axom::fmt::format( R"( Parsed parameters: - * First Blueprint mesh to insert into BVH: '{}' - * Second Blueprint mesh to query BVH: '{}' + * First Blueprint mesh to insert: '{}' + * Second Blueprint mesh to query: '{}' * Verbose logging: {} + * Spatial method: '{}' + * Resolution: '{}' * Runtime execution policy: '{}' )", mesh_file_first, mesh_file_second, verboseOutput, + method == "bvh" ? "Bounding Volume Hierarchy (BVH)" : "Implicit Grid", + method == "bvh" ? "Not Applicable" : std::to_string(resolution), policy == RuntimePolicy::raja_omp ? "raja_omp" : (policy == RuntimePolicy::raja_cuda) ? "raja_cuda" : "raja_seq")); @@ -182,6 +208,11 @@ const std::map Input::s_validPolicies( #endif }); +const std::set Input::s_validMethods({ + "bvh", + "implicit", +}); + //----------------------------------------------------------------------------- /// Basic hexahedron mesh to be used in our application //----------------------------------------------------------------------------- @@ -400,7 +431,6 @@ axom::Array findCandidatesBVH(const HexMesh& insertMesh, timer.elapsedTimeInSec())); // Search for candidate bounding boxes of hexes to query; - // result is returned as CSR arrays for candidate data timer.start(); IndexArray offsets_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); IndexArray counts_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); @@ -455,6 +485,130 @@ axom::Array findCandidatesBVH(const HexMesh& insertMesh, return candidatePairs; } // end of findCandidatesBVH for Blueprint Meshes +template +axom::Array findCandidatesImplicit(const HexMesh& insertMesh, + const HexMesh& queryMesh, + int resolution) +{ + axom::Array candidatePairs; + + SLIC_INFO("Running Implicit Grid candidates algorithm in execution Space: " + << axom::execution_space::name()); + + using HexArray = axom::Array; + using BBoxArray = axom::Array; + using IndexArray = axom::Array; + constexpr bool on_device = axom::execution_space::onDevice(); + + // Get ids of necessary allocators + const int host_allocator = + axom::getUmpireResourceAllocatorID(umpire::resource::Host); + const int kernel_allocator = on_device + ? axom::getUmpireResourceAllocatorID(umpire::resource::Device) + : axom::execution_space::allocatorID(); + + // Copy the insert hexes to the device, if necessary + // Either way, insert_hexes_v will be a view w/ data in the correct space + auto& insert_hexes_h = insertMesh.hexes(); + HexArray insert_hexes_d = + on_device ? HexArray(insert_hexes_h, kernel_allocator) : HexArray(); + + // Copy the insert bboxes to the device, if necessary + // Either way, insert_bbox_v will be a view w/ data in the correct space + auto& insert_bbox_h = insertMesh.hexBoundingBoxes(); + + // Bounding box of entire insert mesh + HexMesh::BoundingBox insert_mesh_bbox_h = insertMesh.meshBoundingBox(); + + // Copy the query hexes to the device, if necessary + // Either way, query_hexes_v will be a view w/ data in the correct space + auto& query_hexes_h = queryMesh.hexes(); + HexArray query_hexes_d = + on_device ? HexArray(query_hexes_h, kernel_allocator) : HexArray(); + + // Copy the query bboxes to the device, if necessary + // Either way, bbox_v will be a view w/ data in the correct space + auto& query_bbox_h = queryMesh.hexBoundingBoxes(); + BBoxArray query_bbox_d = + on_device ? BBoxArray(query_bbox_h, kernel_allocator) : BBoxArray(); + auto query_bbox_v = on_device ? query_bbox_d.view() : query_bbox_h.view(); + + axom::utilities::Timer timer; + timer.start(); + + // If given resolution is less than one, use the cube root of the + // number of hexes + if(resolution < 1) + { + resolution = (int)(1 + std::pow(insertMesh.numHexes(), 1 / 3.)); + } + + const axom::primal::Point resolutions(resolution); + + axom::spin::ImplicitGrid<3, ExecSpace, int> gridIndex(insert_mesh_bbox_h, + &resolutions, + insertMesh.numHexes(), + kernel_allocator); + gridIndex.insert(insertMesh.numHexes(), insert_bbox_h.data()); + timer.stop(); + SLIC_INFO( + axom::fmt::format("0: Initializing Implicit Grid took {:4.3} seconds.", + timer.elapsedTimeInSec())); + + timer.start(); + IndexArray offsets_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); + IndexArray counts_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); + IndexArray candidates_d(0, 0, kernel_allocator); + + auto offsets_v = offsets_d.view(); + auto counts_v = counts_d.view(); + + gridIndex.getCandidatesAsArray(queryMesh.numHexes(), + query_bbox_h.data(), + offsets_v, + counts_v, + candidates_d); + timer.stop(); + SLIC_INFO(axom::fmt::format( + "1: Querying candidate bounding boxes took {:4.3} seconds.", + timer.elapsedTimeInSec())); + + // Initialize candidatePairs to return + timer.start(); + + IndexArray offsets_h(offsets_d, host_allocator); + IndexArray counts_h(counts_d, host_allocator); + IndexArray candidates_h(candidates_d, host_allocator); + + for(int i = 0; i < queryMesh.numHexes(); i++) + { + for(int j = 0; j < counts_h[i]; j++) + { + candidatePairs.emplace_back( + std::make_pair(i, candidates_h[offsets_h[i] + j])); + } + } + timer.stop(); + + SLIC_INFO(axom::fmt::format( + "2: Initializing candidate pairs on host took {:4.3} seconds.", + timer.elapsedTimeInSec())); + + SLIC_INFO(axom::fmt::format(axom::utilities::locale(), + R"(Stats for query + -- Number of insert mesh hexes {:L} + -- Number of query mesh hexes {:L} + -- Total possible candidates {:L} + -- Candidates from Implicit Grid query {:L} + )", + insertMesh.numHexes(), + queryMesh.numHexes(), + 1.0 * insertMesh.numHexes() * queryMesh.numHexes(), + candidates_h.size())); + + return candidatePairs; +} + int main(int argc, char** argv) { // Initialize logger; use RAII so it will finalize at the end of the application @@ -478,16 +632,15 @@ int main(int argc, char** argv) axom::slic::setLoggingMsgLevel(params.isVerbose() ? axom::slic::message::Debug : axom::slic::message::Info); - // Load Blueprint mesh into BVH - SLIC_INFO( - axom::fmt::format("Reading Blueprint file to insert into BVH: '{}'...\n", - params.mesh_file_first)); + // Load Blueprint mesh to insert into spatial index + SLIC_INFO(axom::fmt::format("Reading Blueprint file to insert: '{}'...\n", + params.mesh_file_first)); HexMesh insert_mesh = loadBlueprintHexMesh(params.mesh_file_first, params.isVerbose()); - // Load Blueprint mesh for querying BVH - SLIC_INFO(axom::fmt::format("Reading Blueprint file to query BVH: '{}'...\n", + // Load Blueprint mesh for querying spatial index + SLIC_INFO(axom::fmt::format("Reading Blueprint file to query: '{}'...\n", params.mesh_file_second)); HexMesh query_mesh = @@ -496,26 +649,55 @@ int main(int argc, char** argv) // Check for candidates; results are returned as an array of index pairs axom::Array candidatePairs; axom::utilities::Timer timer(true); - switch(params.policy) + + if(params.method == "bvh") + { + switch(params.policy) + { + case RuntimePolicy::raja_omp: +#ifdef AXOM_USE_OPENMP + candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); +#endif + break; + case RuntimePolicy::raja_cuda: +#ifdef AXOM_USE_CUDA + candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); +#endif + break; + default: // RuntimePolicy::raja_seq + candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); + break; + } + } + // Implicit Grid + else { - case RuntimePolicy::raja_omp: + switch(params.policy) + { + case RuntimePolicy::raja_omp: #ifdef AXOM_USE_OPENMP - candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); + candidatePairs = findCandidatesImplicit(insert_mesh, + query_mesh, + params.resolution); #endif - break; - case RuntimePolicy::raja_cuda: + break; + case RuntimePolicy::raja_cuda: #ifdef AXOM_USE_CUDA - candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); + candidatePairs = findCandidatesImplicit(insert_mesh, + query_mesh, + params.resolution); #endif - break; - default: // RuntimePolicy::raja_seq - candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); - break; + break; + default: // RuntimePolicy::raja_seq + candidatePairs = findCandidatesImplicit(insert_mesh, + query_mesh, + params.resolution); + break; + } } timer.stop(); - SLIC_INFO(axom::fmt::format("Computing candidates {} took {:4.3} seconds.", - "with a BVH tree", + SLIC_INFO(axom::fmt::format("Computing candidates took {:4.3} seconds.", timer.elapsedTimeInSec())); SLIC_INFO(axom::fmt::format(axom::utilities::locale(), "Mesh had {:L} candidates pairs", From fbbf994ece0fe495cbe8eb80bb7628522ab71a72 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 9 Feb 2024 10:17:51 -0800 Subject: [PATCH 529/639] Rearrange timing statements --- .../examples/quest_candidates_example.cpp | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 2b4249c4ca..151bbd4d52 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -245,8 +245,6 @@ HexMesh loadBlueprintHexMesh(const std::string& mesh_path, { HexMesh hexMesh; - axom::utilities::Timer timer(true); - // Load Blueprint mesh into Conduit node conduit::Node n_load; conduit::relay::io::blueprint::read_mesh(mesh_path, n_load); @@ -314,16 +312,9 @@ HexMesh loadBlueprintHexMesh(const std::string& mesh_path, SLIC_INFO( axom::fmt::format("Mesh bounding box is {}.\n", hexMesh.meshBoundingBox())); - timer.stop(); - SLIC_INFO(axom::fmt::format( - "Writing out Blueprint mesh to hexMesh object took {:4.3} seconds.", - timer.elapsedTimeInSec())); - // Optional verbose output that writes Blueprint mesh to vtk if(verboseOutput) { - timer.start(); - UMesh* mesh = new UMesh(3, axom::mint::HEX); // Append mesh nodes @@ -349,14 +340,9 @@ HexMesh loadBlueprintHexMesh(const std::string& mesh_path, mesh->appendCell(cell); } - timer.stop(); - SLIC_INFO( - axom::fmt::format("Loading the Blueprint mesh took {:4.3} seconds.", - timer.elapsedTimeInSec())); - // Write out to vtk for test viewing SLIC_INFO("Writing out Blueprint mesh to test.vtk for debugging..."); - timer.start(); + axom::utilities::Timer timer(true); axom::mint::write_vtk(mesh, "test.vtk"); timer.stop(); SLIC_INFO(axom::fmt::format( @@ -628,6 +614,8 @@ int main(int argc, char** argv) } } + axom::utilities::Timer timer(true); + // Update the logging level based on verbosity flag axom::slic::setLoggingMsgLevel(params.isVerbose() ? axom::slic::message::Debug : axom::slic::message::Info); @@ -646,9 +634,14 @@ int main(int argc, char** argv) HexMesh query_mesh = loadBlueprintHexMesh(params.mesh_file_second, params.isVerbose()); + timer.stop(); + + SLIC_INFO(axom::fmt::format("Reading in Blueprint files took {:4.3} seconds.", + timer.elapsedTimeInSec())); + // Check for candidates; results are returned as an array of index pairs axom::Array candidatePairs; - axom::utilities::Timer timer(true); + timer.start(); if(params.method == "bvh") { From 563e709e2e2683f95318138a663112b1d3bf02a3 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 9 Feb 2024 11:04:55 -0800 Subject: [PATCH 530/639] Add HIP policy --- .../examples/quest_candidates_example.cpp | 38 +++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 151bbd4d52..0258af79b7 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -58,11 +58,14 @@ using UMesh = axom::mint::UnstructuredMesh; #endif #if defined(AXOM_USE_CUDA) - constexpr int BLK_SZ = 256; - using cuda_exec = axom::CUDA_EXEC; + constexpr int CUDA_BLK_SZ = 256; + using cuda_exec = axom::CUDA_EXEC; #else using cuda_exec = seq_exec; #endif + +// Hip exec included from IntersectionShaper header + // clang-format on //----------------------------------------------------------------------------- @@ -103,7 +106,8 @@ enum class RuntimePolicy { raja_seq = 1, raja_omp = 2, - raja_cuda = 3 + raja_cuda = 3, + raja_hip = 4 }; struct Input @@ -154,8 +158,11 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) #ifdef AXOM_USE_OPENMP "\nSet to 'raja_omp' or 2 to use the RAJA openmp policy." #endif -#ifdef AXOM_USE_OPENMP +#ifdef AXOM_USE_CUDA "\nSet to 'raja_cuda' or 3 to use the RAJA cuda policy." +#endif +#ifdef AXOM_USE_HIP + "\nSet to 'raja_hip' or 4 to use the RAJA hip policy." #endif ) ->capture_default_str() @@ -191,9 +198,10 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) verboseOutput, method == "bvh" ? "Bounding Volume Hierarchy (BVH)" : "Implicit Grid", method == "bvh" ? "Not Applicable" : std::to_string(resolution), - policy == RuntimePolicy::raja_omp - ? "raja_omp" - : (policy == RuntimePolicy::raja_cuda) ? "raja_cuda" : "raja_seq")); + policy == RuntimePolicy::raja_omp ? "raja_omp" + : (policy == RuntimePolicy::raja_cuda) + ? "raja_cuda" + : (policy == RuntimePolicy::raja_hip) ? "raja_hip" : "raja_seq")); } const std::map Input::s_validPolicies( @@ -205,6 +213,10 @@ const std::map Input::s_validPolicies( #ifdef AXOM_USE_CUDA , {"raja_cuda", RuntimePolicy::raja_cuda} +#endif +#ifdef AXOM_USE_HIP + , + {"raja_hip", RuntimePolicy::raja_hip} #endif }); @@ -655,6 +667,11 @@ int main(int argc, char** argv) case RuntimePolicy::raja_cuda: #ifdef AXOM_USE_CUDA candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); +#endif + break; + case RuntimePolicy::raja_hip: +#ifdef AXOM_USE_HIP + candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); #endif break; default: // RuntimePolicy::raja_seq @@ -679,6 +696,13 @@ int main(int argc, char** argv) candidatePairs = findCandidatesImplicit(insert_mesh, query_mesh, params.resolution); +#endif + break; + case RuntimePolicy::raja_hip: +#ifdef AXOM_USE_HIP + candidatePairs = findCandidatesImplicit(insert_mesh, + query_mesh, + params.resolution); #endif break; default: // RuntimePolicy::raja_seq From 606e5a40e488cbf974857df7ff1d0847a6f1ceac Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 9 Feb 2024 15:48:20 -0800 Subject: [PATCH 531/639] Fix HIP implicit grid function --- src/axom/quest/examples/quest_candidates_example.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 0258af79b7..c1ed6c18f6 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -514,6 +514,9 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, // Copy the insert bboxes to the device, if necessary // Either way, insert_bbox_v will be a view w/ data in the correct space auto& insert_bbox_h = insertMesh.hexBoundingBoxes(); + BBoxArray insert_bbox_d = + on_device ? BBoxArray(insert_bbox_h, kernel_allocator) : BBoxArray(); + auto insert_bbox_v = on_device ? insert_bbox_d.view() : insert_bbox_h.view(); // Bounding box of entire insert mesh HexMesh::BoundingBox insert_mesh_bbox_h = insertMesh.meshBoundingBox(); @@ -547,7 +550,7 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, &resolutions, insertMesh.numHexes(), kernel_allocator); - gridIndex.insert(insertMesh.numHexes(), insert_bbox_h.data()); + gridIndex.insert(insertMesh.numHexes(), insert_bbox_v.data()); timer.stop(); SLIC_INFO( axom::fmt::format("0: Initializing Implicit Grid took {:4.3} seconds.", @@ -562,7 +565,7 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, auto counts_v = counts_d.view(); gridIndex.getCandidatesAsArray(queryMesh.numHexes(), - query_bbox_h.data(), + query_bbox_v.data(), offsets_v, counts_v, candidates_d); From 3f387424e2c4bc717bde9472db4ed6a1498d9fbd Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 12 Feb 2024 15:16:09 -0800 Subject: [PATCH 532/639] Give explicit type --- src/axom/quest/examples/quest_candidates_example.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index c1ed6c18f6..5166b2f9b9 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -561,8 +561,8 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, IndexArray counts_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); IndexArray candidates_d(0, 0, kernel_allocator); - auto offsets_v = offsets_d.view(); - auto counts_v = counts_d.view(); + axom::ArrayView offsets_v = offsets_d.view(); + axom::ArrayView counts_v = counts_d.view(); gridIndex.getCandidatesAsArray(queryMesh.numHexes(), query_bbox_v.data(), From 10bc7738cf006a8a5db320f186c76ba193013aa5 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 12 Feb 2024 16:13:59 -0800 Subject: [PATCH 533/639] Try a different overload --- src/axom/quest/examples/quest_candidates_example.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 5166b2f9b9..ec787bac29 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -564,11 +564,7 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, axom::ArrayView offsets_v = offsets_d.view(); axom::ArrayView counts_v = counts_d.view(); - gridIndex.getCandidatesAsArray(queryMesh.numHexes(), - query_bbox_v.data(), - offsets_v, - counts_v, - candidates_d); + gridIndex.getCandidatesAsArray(query_bbox_v, offsets_v, counts_v, candidates_d); timer.stop(); SLIC_INFO(axom::fmt::format( "1: Querying candidate bounding boxes took {:4.3} seconds.", From 4f9208191a2c9664d45d6c37cbadced5b02ee5ad Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 13 Feb 2024 08:24:35 -0800 Subject: [PATCH 534/639] Try int instead of IndexArray --- src/axom/quest/examples/quest_candidates_example.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index ec787bac29..828ff48699 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -559,10 +559,10 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, timer.start(); IndexArray offsets_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); IndexArray counts_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); - IndexArray candidates_d(0, 0, kernel_allocator); + axom::Array candidates_d(0, 0, kernel_allocator); - axom::ArrayView offsets_v = offsets_d.view(); - axom::ArrayView counts_v = counts_d.view(); + axom::ArrayView offsets_v = offsets_d.view(); + axom::ArrayView counts_v = counts_d.view(); gridIndex.getCandidatesAsArray(query_bbox_v, offsets_v, counts_v, candidates_d); timer.stop(); From 9bdf9d315000e9791c91e8ae02a42a4176be8756 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 13 Feb 2024 08:32:34 -0800 Subject: [PATCH 535/639] Use axom::Array instead of axom::ArrayView --- src/axom/quest/examples/quest_candidates_example.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 828ff48699..ce34763176 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -564,7 +564,7 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, axom::ArrayView offsets_v = offsets_d.view(); axom::ArrayView counts_v = counts_d.view(); - gridIndex.getCandidatesAsArray(query_bbox_v, offsets_v, counts_v, candidates_d); + gridIndex.getCandidatesAsArray(query_bbox_d, offsets_d, counts_d, candidates_d); timer.stop(); SLIC_INFO(axom::fmt::format( "1: Querying candidate bounding boxes took {:4.3} seconds.", From 6002dfe98c5228a202b3c8759682a12b44f2e57e Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 13 Feb 2024 08:35:01 -0800 Subject: [PATCH 536/639] int Arrays instead of IndexType Arrays --- src/axom/quest/examples/quest_candidates_example.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index ce34763176..dec021cd85 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -557,8 +557,8 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, timer.elapsedTimeInSec())); timer.start(); - IndexArray offsets_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); - IndexArray counts_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); + axom::Array offsets_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); + axom::Array counts_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); axom::Array candidates_d(0, 0, kernel_allocator); axom::ArrayView offsets_v = offsets_d.view(); From 425c8ddb5e26c42e7197c58a81c695368092d90e Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 13 Feb 2024 09:05:27 -0800 Subject: [PATCH 537/639] Make host allocations int as well --- src/axom/quest/examples/quest_candidates_example.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index dec021cd85..1c23be6205 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -495,7 +495,7 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, using HexArray = axom::Array; using BBoxArray = axom::Array; - using IndexArray = axom::Array; + // using IndexArray = axom::Array; constexpr bool on_device = axom::execution_space::onDevice(); // Get ids of necessary allocators @@ -561,8 +561,8 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, axom::Array counts_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); axom::Array candidates_d(0, 0, kernel_allocator); - axom::ArrayView offsets_v = offsets_d.view(); - axom::ArrayView counts_v = counts_d.view(); + // axom::ArrayView offsets_v = offsets_d.view(); + // axom::ArrayView counts_v = counts_d.view(); gridIndex.getCandidatesAsArray(query_bbox_d, offsets_d, counts_d, candidates_d); timer.stop(); @@ -573,9 +573,9 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, // Initialize candidatePairs to return timer.start(); - IndexArray offsets_h(offsets_d, host_allocator); - IndexArray counts_h(counts_d, host_allocator); - IndexArray candidates_h(candidates_d, host_allocator); + axom::Array offsets_h(offsets_d, host_allocator); + axom::Array counts_h(counts_d, host_allocator); + axom::Array candidates_h(candidates_d, host_allocator); for(int i = 0; i < queryMesh.numHexes(); i++) { From d66fcfb6f09dd7915d88b8c226e9a7b7c2c35618 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 13 Feb 2024 09:49:09 -0800 Subject: [PATCH 538/639] Use offset and count views (again) --- .../examples/quest_candidates_example.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 1c23be6205..ea49cdd521 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -495,7 +495,7 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, using HexArray = axom::Array; using BBoxArray = axom::Array; - // using IndexArray = axom::Array; + using IndexArray = axom::Array; constexpr bool on_device = axom::execution_space::onDevice(); // Get ids of necessary allocators @@ -557,14 +557,14 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, timer.elapsedTimeInSec())); timer.start(); - axom::Array offsets_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); - axom::Array counts_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); - axom::Array candidates_d(0, 0, kernel_allocator); + IndexArray offsets_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); + IndexArray counts_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); + IndexArray candidates_d(0, 0, kernel_allocator); - // axom::ArrayView offsets_v = offsets_d.view(); - // axom::ArrayView counts_v = counts_d.view(); + auto offsets_v = offsets_d.view(); + auto counts_v = counts_d.view(); - gridIndex.getCandidatesAsArray(query_bbox_d, offsets_d, counts_d, candidates_d); + gridIndex.getCandidatesAsArray(query_bbox_v, offsets_v, counts_v, candidates_d); timer.stop(); SLIC_INFO(axom::fmt::format( "1: Querying candidate bounding boxes took {:4.3} seconds.", @@ -573,9 +573,9 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, // Initialize candidatePairs to return timer.start(); - axom::Array offsets_h(offsets_d, host_allocator); - axom::Array counts_h(counts_d, host_allocator); - axom::Array candidates_h(candidates_d, host_allocator); + IndexArray offsets_h(offsets_d, host_allocator); + IndexArray counts_h(counts_d, host_allocator); + IndexArray candidates_h(candidates_d, host_allocator); for(int i = 0; i < queryMesh.numHexes(); i++) { From 299c13b688a95d29a20497b34afc6bfd4df0d8d2 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 13 Feb 2024 11:45:51 -0800 Subject: [PATCH 539/639] Comments --- .../quest/examples/quest_candidates_example.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index ea49cdd521..436e29f3fb 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -49,6 +49,7 @@ using seq_exec = axom::SEQ_EXEC; using UMesh = axom::mint::UnstructuredMesh; +using IndexPair = std::pair; // clang-format off #if defined(AXOM_USE_OPENMP) @@ -129,12 +130,13 @@ struct Input void Input::parse(int argc, char** argv, axom::CLI::App& app) { app.add_option("-i, --infile", mesh_file_first) - ->description("The first input Blueprint mesh file to insert into BVH") + ->description( + "The first input Blueprint mesh file to insert into spatial index") ->required() ->check(axom::CLI::ExistingFile); app.add_option("-q, --queryfile", mesh_file_second) - ->description("The second input Blueprint mesh file to query BVH") + ->description("The second input Blueprint mesh file to query spatial index") ->required() ->check(axom::CLI::ExistingFile); @@ -142,13 +144,13 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) .add_option("-r,--resolution", resolution, "With '-m implicit', set resolution of implicit grid. \n" - "Set to less than 1 to use the implicit spatial index\n" + "Set to less than 1 to use the implicit grid spatial index\n" "with a resolution of the cube root of the number of\n" "hexes.") ->capture_default_str(); app.add_flag("-v,--verbose", verboseOutput) - ->description("Increase logging verbosity?") + ->description("Increase logging verbosity") ->capture_default_str(); app.add_option("-p, --policy", policy) @@ -368,8 +370,6 @@ HexMesh loadBlueprintHexMesh(const std::string& mesh_path, return hexMesh; } // end of loadBlueprintHexMesh -using IndexPair = std::pair; - template axom::Array findCandidatesBVH(const HexMesh& insertMesh, const HexMesh& queryMesh) @@ -505,7 +505,7 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, ? axom::getUmpireResourceAllocatorID(umpire::resource::Device) : axom::execution_space::allocatorID(); - // Copy the insert hexes to the device, if necessary + // Copy the insert hexes to the device, if necessary // Either way, insert_hexes_v will be a view w/ data in the correct space auto& insert_hexes_h = insertMesh.hexes(); HexArray insert_hexes_d = @@ -521,7 +521,7 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, // Bounding box of entire insert mesh HexMesh::BoundingBox insert_mesh_bbox_h = insertMesh.meshBoundingBox(); - // Copy the query hexes to the device, if necessary + // Copy the query hexes to the device, if necessary // Either way, query_hexes_v will be a view w/ data in the correct space auto& query_hexes_h = queryMesh.hexes(); HexArray query_hexes_d = From 9fb7def97c78f2e90ee54413eea11fa32ba264b6 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 13 Feb 2024 16:00:43 -0800 Subject: [PATCH 540/639] Undo spack changes --- scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml | 2 +- scripts/spack/configs/toss_4_x86_64_ib/spack.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml index f7de55ea42..afb2b5fe6a 100644 --- a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -306,7 +306,7 @@ spack: camp: require: "@2023.06.0" conduit: - require: "@develop~shared~test~examples~utilities+silo" + require: "@0.8.8~shared~test~examples~utilities" hdf5: variants: ~shared~mpi hypre: diff --git a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml index 3e80f20f5b..9045d48165 100644 --- a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml @@ -270,7 +270,7 @@ spack: camp: require: "@2023.06.0" conduit: - require: "@develop~shared~test~examples~utilities+silo" + require: "@0.8.8~shared~test~examples~utilities" hdf5: variants: ~shared~mpi hypre: From 79deebd9716d0d83ed421b9993ca9021adc5dcd2 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 14 Feb 2024 11:10:53 -0800 Subject: [PATCH 541/639] Fix header description --- src/axom/quest/examples/quest_candidates_example.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 436e29f3fb..1e55174ad2 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -1,15 +1,16 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) //----------------------------------------------------------------------------- /// -/// file: device_spatial_indexes.cpp +/// file: quest_candidates_examples.cpp /// -/// This example uses a spatial index, the linear BVH tree from Axom's spin -/// component, in addition to RAJA and Umpire based kernels for a highly -// efficient performance-portable candidate-finding algorithm. +/// This example takes as input two Blueprint unstructured hex meshes, and +/// finds the candidates of intersection between the meshes using a +/// spatial index, either a Bounding Volume Hierarchy or an Implicit Grid. +/// The example supports HIP and CUDA execution through RAJA. //----------------------------------------------------------------------------- #include "axom/config.hpp" From 36eaef29ce8466405f0ef08e93f6ae9a8a6efadb Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 16 Feb 2024 08:52:22 -0800 Subject: [PATCH 542/639] Use similar algorithm to BVH two-pass to filter Implicit Grid candidates based on bounding box intersection --- .../examples/quest_candidates_example.cpp | 106 +++++++++++++++--- 1 file changed, 91 insertions(+), 15 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 1e55174ad2..7c14107273 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -565,33 +565,109 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, auto offsets_v = offsets_d.view(); auto counts_v = counts_d.view(); - gridIndex.getCandidatesAsArray(query_bbox_v, offsets_v, counts_v, candidates_d); + // First pass: get number of bounding box candidates for each query bounding box + // Logic here mirrors the BVH two-pass query + const auto grid_device = gridIndex.getQueryObject(); + using reduce_pol = typename axom::execution_space::reduce_policy; + RAJA::ReduceSum totalCandidatePairs(0); + + axom::for_all( + queryMesh.numHexes(), + AXOM_LAMBDA(int icell) { + int count = 0; + + // Define a function that is called on every candidate reached during + // traversal. The function below simply counts the number of candidates + // that intersect with the given query bounding box. + auto isBBIntersect = [&](int candidateIdx) { + if(axom::primal::intersect(insert_bbox_v[candidateIdx], + query_bbox_v[icell])) + { + count++; + } + }; + + // Call visitCandidates to iterate through the candidates + grid_device.visitCandidates(query_bbox_v[icell], isBBIntersect); + + // Store the number of intersections for each query bounding box + counts_v[icell] = count; + totalCandidatePairs += count; + }); + + // Generate offsets from the counts + using exec_pol = typename axom::execution_space::loop_policy; + RAJA::exclusive_scan( + RAJA::make_span(counts_v.data(), queryMesh.numHexes()), + RAJA::make_span(offsets_v.data(), queryMesh.numHexes()), + RAJA::operators::plus {}); + timer.stop(); SLIC_INFO(axom::fmt::format( - "1: Querying candidate bounding boxes took {:4.3} seconds.", + "1: Counting candidate bounding boxes took {:4.3} seconds.", timer.elapsedTimeInSec())); // Initialize candidatePairs to return timer.start(); - IndexArray offsets_h(offsets_d, host_allocator); - IndexArray counts_h(counts_d, host_allocator); - IndexArray candidates_h(candidates_d, host_allocator); + // Allocate arrays for intersection pairs + IndexArray firstPair_d(totalCandidatePairs.get(), + totalCandidatePairs.get(), + kernel_allocator); + IndexArray secondPair_d(totalCandidatePairs.get(), + totalCandidatePairs.get(), + kernel_allocator); + auto first_pair_v = firstPair_d.view(); + auto second_pair_v = secondPair_d.view(); + + // Second pass: fill candidates array pairs on device + axom::for_all( + queryMesh.numHexes(), + AXOM_LAMBDA(axom::IndexType icell) { + axom::IndexType offset = offsets_v[icell]; + + // Store the intersection candidate + auto fillCandidates = [&](int candidateIdx) { + if(axom::primal::intersect(insert_bbox_v[candidateIdx], + query_bbox_v[icell])) + { + first_pair_v[offset] = icell; + second_pair_v[offset] = candidateIdx; + offset++; + } + }; + + grid_device.visitCandidates(query_bbox_v[icell], fillCandidates); + }); - for(int i = 0; i < queryMesh.numHexes(); i++) - { - for(int j = 0; j < counts_h[i]; j++) - { - candidatePairs.emplace_back( - std::make_pair(i, candidates_h[offsets_h[i] + j])); - } - } timer.stop(); SLIC_INFO(axom::fmt::format( - "2: Initializing candidate pairs on host took {:4.3} seconds.", + "2: Initializing candidate pairs on device took {:4.3} seconds.", timer.elapsedTimeInSec())); + // copy results back to host and into return vector + timer.start(); + + IndexArray candidates_h[2] = { + on_device ? IndexArray(firstPair_d, host_allocator) : IndexArray(), + on_device ? IndexArray(secondPair_d, host_allocator) : IndexArray()}; + + auto candidate1_h_v = on_device ? candidates_h[0].view() : firstPair_d.view(); + auto candidate2_h_v = on_device ? candidates_h[1].view() : secondPair_d.view(); + + for(int idx = 0; idx < totalCandidatePairs; ++idx) + { + candidatePairs.emplace_back( + std::make_pair(candidate1_h_v[idx], candidate2_h_v[idx])); + } + + timer.stop(); + + SLIC_INFO( + axom::fmt::format("3: Moving candidate pairs to host took {:4.3} seconds.", + timer.elapsedTimeInSec())); + SLIC_INFO(axom::fmt::format(axom::utilities::locale(), R"(Stats for query -- Number of insert mesh hexes {:L} @@ -602,7 +678,7 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, insertMesh.numHexes(), queryMesh.numHexes(), 1.0 * insertMesh.numHexes() * queryMesh.numHexes(), - candidates_h.size())); + candidatePairs.size())); return candidatePairs; } From ca05cf624207ae26a9f297af5fe1568d7fbbc2aa Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 16 Feb 2024 10:42:00 -0800 Subject: [PATCH 543/639] Trying to initialize candidate pairs on device in BVH - slightly worse performance --- .../examples/quest_candidates_example.cpp | 81 +++++++++++++++---- 1 file changed, 67 insertions(+), 14 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 7c14107273..f97e899365 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -449,25 +449,78 @@ axom::Array findCandidatesBVH(const HexMesh& insertMesh, timer.elapsedTimeInSec())); // Initialize candidatePairs to return + // Allocate arrays for candidate pairs timer.start(); - IndexArray offsets_h(offsets_d, host_allocator); - IndexArray counts_h(counts_d, host_allocator); - IndexArray candidates_h(candidates_d, host_allocator); + auto candidates_v = candidates_d.view(); + IndexArray firstPair_d(candidates_v.size(), + candidates_v.size(), + kernel_allocator); + IndexArray secondPair_d(candidates_v.size(), + candidates_v.size(), + kernel_allocator); + auto first_pair_v = firstPair_d.view(); + auto second_pair_v = secondPair_d.view(); + + axom::for_all( + query_bbox_v.size(), + AXOM_LAMBDA(axom::IndexType icell) { + axom::IndexType offset = offsets_v[icell]; + + for(int j = 0; j < counts_v[icell]; j++) + { + int pair_index = offset + j; + first_pair_v[pair_index] = icell; + second_pair_v[pair_index] = candidates_v[pair_index]; + } + }); + + timer.stop(); + SLIC_INFO(axom::fmt::format( + "2: Initializing candidate pairs on device took {:4.3} seconds.", + timer.elapsedTimeInSec())); + + // copy results back to host and into return vector + timer.start(); + + IndexArray candidates_h[2] = { + on_device ? IndexArray(firstPair_d, host_allocator) : IndexArray(), + on_device ? IndexArray(secondPair_d, host_allocator) : IndexArray()}; + + auto candidate1_h_v = on_device ? candidates_h[0].view() : firstPair_d.view(); + auto candidate2_h_v = on_device ? candidates_h[1].view() : secondPair_d.view(); - for(int i = 0; i < queryMesh.numHexes(); i++) + for(int idx = 0; idx < candidates_v.size(); ++idx) { - for(int j = 0; j < counts_h[i]; j++) - { - candidatePairs.emplace_back( - std::make_pair(i, candidates_h[offsets_h[i] + j])); - } + candidatePairs.emplace_back( + std::make_pair(candidate1_h_v[idx], candidate2_h_v[idx])); } + timer.stop(); - SLIC_INFO(axom::fmt::format( - "2: Initializing candidate pairs on host took {:4.3} seconds.", - timer.elapsedTimeInSec())); + SLIC_INFO( + axom::fmt::format("3: Moving candidate pairs to host took {:4.3} seconds.", + timer.elapsedTimeInSec())); + + // timer.start(); + + // IndexArray offsets_h(offsets_d, host_allocator); + // IndexArray counts_h(counts_d, host_allocator); + // IndexArray candidates_h(candidates_d, host_allocator); + + // for(int i = 0; i < queryMesh.numHexes(); i++) + // { + // for(int j = 0; j < counts_h[i]; j++) + // { + // candidatePairs.emplace_back( + // std::make_pair(i, candidates_h[offsets_h[i] + j])); + // } + // } + // timer.stop(); + + // SLIC_INFO(axom::fmt::format( + // "2: Initializing candidate pairs on host took {:4.3} seconds.", + // timer.elapsedTimeInSec())); SLIC_INFO(axom::fmt::format(axom::utilities::locale(), R"(Stats for query @@ -479,7 +532,7 @@ axom::Array findCandidatesBVH(const HexMesh& insertMesh, insertMesh.numHexes(), queryMesh.numHexes(), 1.0 * insertMesh.numHexes() * queryMesh.numHexes(), - candidates_h.size())); + candidatePairs.size())); return candidatePairs; } // end of findCandidatesBVH for Blueprint Meshes @@ -610,7 +663,7 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, // Initialize candidatePairs to return timer.start(); - // Allocate arrays for intersection pairs + // Allocate arrays for candidate pairs IndexArray firstPair_d(totalCandidatePairs.get(), totalCandidatePairs.get(), kernel_allocator); From a5f7e894418c7cde62fd6406e1d6291012d34ebf Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 16 Feb 2024 11:32:06 -0800 Subject: [PATCH 544/639] Try BVH two pass - worse performance as well --- .../examples/quest_candidates_example.cpp | 93 ++++++++++++++----- 1 file changed, 71 insertions(+), 22 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index f97e899365..2ac85ff97f 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -429,50 +429,99 @@ axom::Array findCandidatesBVH(const HexMesh& insertMesh, SLIC_INFO(axom::fmt::format("0: Initializing BVH took {:4.3} seconds.", timer.elapsedTimeInSec())); - // Search for candidate bounding boxes of hexes to query; + // Initialize candidatePairs to return timer.start(); + + // Create a traverser object from the BVH + const auto bvh_device = bvh.getTraverser(); + + using reduce_pol = typename axom::execution_space::reduce_policy; + RAJA::ReduceSum totalCandidatePairs(0); + + // Lambda to check bounding boxes for intersection + auto bbIsect = [] AXOM_HOST_DEVICE( + const HexMesh::BoundingBox& queryBbox, + const HexMesh::BoundingBox& insertBbox) -> bool { + return queryBbox.intersectsWith(insertBbox); + }; + + // Allocate arrays for offsets and counts IndexArray offsets_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); IndexArray counts_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); - IndexArray candidates_d(0, 0, kernel_allocator); - auto offsets_v = offsets_d.view(); auto counts_v = counts_d.view(); - bvh.findBoundingBoxes(offsets_v, - counts_v, - candidates_d, - query_bbox_v.size(), - query_bbox_v); + + // First pass: get number of bounding box collisions for each surface element + axom::for_all( + query_bbox_v.size(), + AXOM_LAMBDA(axom::IndexType icell) { + axom::IndexType count = 0; + + // Define a function that is called on every leaf node reached during + // traversal. The function below simply counts the number of candidate + // collisions with the given query object. + auto countCandidates = [&](std::int32_t currentNode, + const std::int32_t* leafNodes) { + AXOM_UNUSED_VAR(leafNodes); + if(currentNode > icell) + { + count++; + } + }; + + // Call traverse_tree() to run the counting query. + bvh_device.traverse_tree(insert_bbox_v[icell], countCandidates, bbIsect); + + // Afterwards, we can store the number of collisions for each surface + // element, as well as an overall count of intersections. + counts_v[icell] = count; + totalCandidatePairs += count; + }); + + // Generate offsets + using exec_pol = typename axom::execution_space::loop_policy; + RAJA::exclusive_scan( + RAJA::make_span(counts_v.data(), queryMesh.numHexes()), + RAJA::make_span(offsets_v.data(), queryMesh.numHexes()), + RAJA::operators::plus {}); timer.stop(); SLIC_INFO(axom::fmt::format( - "1: Querying candidate bounding boxes took {:4.3} seconds.", + "1: Counting candidate bounding boxes took {:4.3} seconds.", timer.elapsedTimeInSec())); // Initialize candidatePairs to return - // Allocate arrays for candidate pairs timer.start(); - auto candidates_v = candidates_d.view(); - IndexArray firstPair_d(candidates_v.size(), - candidates_v.size(), + // Allocate arrays for candidate pairs + IndexArray firstPair_d(totalCandidatePairs.get(), + totalCandidatePairs.get(), kernel_allocator); - IndexArray secondPair_d(candidates_v.size(), - candidates_v.size(), + IndexArray secondPair_d(totalCandidatePairs.get(), + totalCandidatePairs.get(), kernel_allocator); auto first_pair_v = firstPair_d.view(); auto second_pair_v = secondPair_d.view(); + // Second pass: fill candidates array pairs on device axom::for_all( query_bbox_v.size(), AXOM_LAMBDA(axom::IndexType icell) { axom::IndexType offset = offsets_v[icell]; - for(int j = 0; j < counts_v[icell]; j++) - { - int pair_index = offset + j; - first_pair_v[pair_index] = icell; - second_pair_v[pair_index] = candidates_v[pair_index]; - } + // Store the intersection candidate + auto fillCandidates = [&](std::int32_t currentNode, + const std::int32_t* leafs) { + if(currentNode > icell) + { + first_pair_v[offset] = icell; + second_pair_v[offset] = leafs[currentNode]; + offset++; + } + }; + + // Call traverse_tree() a second time to run the counting query. + bvh_device.traverse_tree(query_bbox_v[icell], fillCandidates, bbIsect); }); timer.stop(); @@ -490,7 +539,7 @@ axom::Array findCandidatesBVH(const HexMesh& insertMesh, auto candidate1_h_v = on_device ? candidates_h[0].view() : firstPair_d.view(); auto candidate2_h_v = on_device ? candidates_h[1].view() : secondPair_d.view(); - for(int idx = 0; idx < candidates_v.size(); ++idx) + for(int idx = 0; idx < totalCandidatePairs; ++idx) { candidatePairs.emplace_back( std::make_pair(candidate1_h_v[idx], candidate2_h_v[idx])); From c225321a6433151ce603d87fb071af622e09f952 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 16 Feb 2024 13:11:24 -0800 Subject: [PATCH 545/639] Revert back to original bvh implementation --- .../examples/quest_candidates_example.cpp | 146 +++--------------- 1 file changed, 22 insertions(+), 124 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 2ac85ff97f..a7fdc5b6a9 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -429,147 +429,45 @@ axom::Array findCandidatesBVH(const HexMesh& insertMesh, SLIC_INFO(axom::fmt::format("0: Initializing BVH took {:4.3} seconds.", timer.elapsedTimeInSec())); - // Initialize candidatePairs to return + // Search for candidate bounding boxes of hexes to query; timer.start(); - - // Create a traverser object from the BVH - const auto bvh_device = bvh.getTraverser(); - - using reduce_pol = typename axom::execution_space::reduce_policy; - RAJA::ReduceSum totalCandidatePairs(0); - - // Lambda to check bounding boxes for intersection - auto bbIsect = [] AXOM_HOST_DEVICE( - const HexMesh::BoundingBox& queryBbox, - const HexMesh::BoundingBox& insertBbox) -> bool { - return queryBbox.intersectsWith(insertBbox); - }; - - // Allocate arrays for offsets and counts IndexArray offsets_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); IndexArray counts_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); + IndexArray candidates_d(0, 0, kernel_allocator); + auto offsets_v = offsets_d.view(); auto counts_v = counts_d.view(); - - // First pass: get number of bounding box collisions for each surface element - axom::for_all( - query_bbox_v.size(), - AXOM_LAMBDA(axom::IndexType icell) { - axom::IndexType count = 0; - - // Define a function that is called on every leaf node reached during - // traversal. The function below simply counts the number of candidate - // collisions with the given query object. - auto countCandidates = [&](std::int32_t currentNode, - const std::int32_t* leafNodes) { - AXOM_UNUSED_VAR(leafNodes); - if(currentNode > icell) - { - count++; - } - }; - - // Call traverse_tree() to run the counting query. - bvh_device.traverse_tree(insert_bbox_v[icell], countCandidates, bbIsect); - - // Afterwards, we can store the number of collisions for each surface - // element, as well as an overall count of intersections. - counts_v[icell] = count; - totalCandidatePairs += count; - }); - - // Generate offsets - using exec_pol = typename axom::execution_space::loop_policy; - RAJA::exclusive_scan( - RAJA::make_span(counts_v.data(), queryMesh.numHexes()), - RAJA::make_span(offsets_v.data(), queryMesh.numHexes()), - RAJA::operators::plus {}); + bvh.findBoundingBoxes(offsets_v, + counts_v, + candidates_d, + query_bbox_v.size(), + query_bbox_v); timer.stop(); SLIC_INFO(axom::fmt::format( - "1: Counting candidate bounding boxes took {:4.3} seconds.", + "1: Querying candidate bounding boxes took {:4.3} seconds.", timer.elapsedTimeInSec())); // Initialize candidatePairs to return timer.start(); - // Allocate arrays for candidate pairs - IndexArray firstPair_d(totalCandidatePairs.get(), - totalCandidatePairs.get(), - kernel_allocator); - IndexArray secondPair_d(totalCandidatePairs.get(), - totalCandidatePairs.get(), - kernel_allocator); - auto first_pair_v = firstPair_d.view(); - auto second_pair_v = secondPair_d.view(); - - // Second pass: fill candidates array pairs on device - axom::for_all( - query_bbox_v.size(), - AXOM_LAMBDA(axom::IndexType icell) { - axom::IndexType offset = offsets_v[icell]; - - // Store the intersection candidate - auto fillCandidates = [&](std::int32_t currentNode, - const std::int32_t* leafs) { - if(currentNode > icell) - { - first_pair_v[offset] = icell; - second_pair_v[offset] = leafs[currentNode]; - offset++; - } - }; - - // Call traverse_tree() a second time to run the counting query. - bvh_device.traverse_tree(query_bbox_v[icell], fillCandidates, bbIsect); - }); - - timer.stop(); - SLIC_INFO(axom::fmt::format( - "2: Initializing candidate pairs on device took {:4.3} seconds.", - timer.elapsedTimeInSec())); - - // copy results back to host and into return vector - timer.start(); - - IndexArray candidates_h[2] = { - on_device ? IndexArray(firstPair_d, host_allocator) : IndexArray(), - on_device ? IndexArray(secondPair_d, host_allocator) : IndexArray()}; + IndexArray offsets_h(offsets_d, host_allocator); + IndexArray counts_h(counts_d, host_allocator); + IndexArray candidates_h(candidates_d, host_allocator); - auto candidate1_h_v = on_device ? candidates_h[0].view() : firstPair_d.view(); - auto candidate2_h_v = on_device ? candidates_h[1].view() : secondPair_d.view(); - - for(int idx = 0; idx < totalCandidatePairs; ++idx) + for(int i = 0; i < queryMesh.numHexes(); i++) { - candidatePairs.emplace_back( - std::make_pair(candidate1_h_v[idx], candidate2_h_v[idx])); + for(int j = 0; j < counts_h[i]; j++) + { + candidatePairs.emplace_back( + std::make_pair(i, candidates_h[offsets_h[i] + j])); + } } - timer.stop(); - SLIC_INFO( - axom::fmt::format("3: Moving candidate pairs to host took {:4.3} seconds.", - timer.elapsedTimeInSec())); - - // timer.start(); - - // IndexArray offsets_h(offsets_d, host_allocator); - // IndexArray counts_h(counts_d, host_allocator); - // IndexArray candidates_h(candidates_d, host_allocator); - - // for(int i = 0; i < queryMesh.numHexes(); i++) - // { - // for(int j = 0; j < counts_h[i]; j++) - // { - // candidatePairs.emplace_back( - // std::make_pair(i, candidates_h[offsets_h[i] + j])); - // } - // } - // timer.stop(); - - // SLIC_INFO(axom::fmt::format( - // "2: Initializing candidate pairs on host took {:4.3} seconds.", - // timer.elapsedTimeInSec())); + SLIC_INFO(axom::fmt::format( + "2: Initializing candidate pairs on host took {:4.3} seconds.", + timer.elapsedTimeInSec())); SLIC_INFO(axom::fmt::format(axom::utilities::locale(), R"(Stats for query @@ -581,7 +479,7 @@ axom::Array findCandidatesBVH(const HexMesh& insertMesh, insertMesh.numHexes(), queryMesh.numHexes(), 1.0 * insertMesh.numHexes() * queryMesh.numHexes(), - candidatePairs.size())); + candidates_h.size())); return candidatePairs; } // end of findCandidatesBVH for Blueprint Meshes From 21ca3772eabdb26e94b743555ad064a1aa5d4939 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 16 Feb 2024 13:41:04 -0800 Subject: [PATCH 546/639] Reword prints; move timer for spatial index initialization to encapsulate whole process (initialization time is accurately higher) --- .../examples/quest_candidates_example.cpp | 36 ++++++++----------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index a7fdc5b6a9..b0868a81b6 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -375,6 +375,9 @@ template axom::Array findCandidatesBVH(const HexMesh& insertMesh, const HexMesh& queryMesh) { + axom::utilities::Timer timer; + timer.start(); + SLIC_INFO("Running BVH candidates algorithm in execution Space: " << axom::execution_space::name()); @@ -418,10 +421,7 @@ axom::Array findCandidatesBVH(const HexMesh& insertMesh, on_device ? BBoxArray(query_bbox_h, kernel_allocator) : BBoxArray(); auto query_bbox_v = on_device ? query_bbox_d.view() : query_bbox_h.view(); - axom::utilities::Timer timer; - // Initialize a BVH tree over the insert mesh bounding boxes - timer.start(); axom::spin::BVH<3, ExecSpace, double> bvh; bvh.setAllocatorID(kernel_allocator); bvh.initialize(insert_bbox_v, insert_bbox_v.size()); @@ -489,6 +489,9 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, const HexMesh& queryMesh, int resolution) { + axom::utilities::Timer timer; + timer.start(); + axom::Array candidatePairs; SLIC_INFO("Running Implicit Grid candidates algorithm in execution Space: " @@ -535,9 +538,6 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, on_device ? BBoxArray(query_bbox_h, kernel_allocator) : BBoxArray(); auto query_bbox_v = on_device ? query_bbox_d.view() : query_bbox_h.view(); - axom::utilities::Timer timer; - timer.start(); - // If given resolution is less than one, use the cube root of the // number of hexes if(resolution < 1) @@ -560,17 +560,18 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, timer.start(); IndexArray offsets_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); IndexArray counts_d(query_bbox_v.size(), query_bbox_v.size(), kernel_allocator); - IndexArray candidates_d(0, 0, kernel_allocator); auto offsets_v = offsets_d.view(); auto counts_v = counts_d.view(); - // First pass: get number of bounding box candidates for each query bounding box - // Logic here mirrors the BVH two-pass query + // Object to query the candidates const auto grid_device = gridIndex.getQueryObject(); + using reduce_pol = typename axom::execution_space::reduce_policy; RAJA::ReduceSum totalCandidatePairs(0); + // First pass: get number of bounding box candidates for each query bounding box + // Logic here mirrors the BVH two-pass query axom::for_all( queryMesh.numHexes(), AXOM_LAMBDA(int icell) { @@ -602,14 +603,7 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, RAJA::make_span(offsets_v.data(), queryMesh.numHexes()), RAJA::operators::plus {}); - timer.stop(); - SLIC_INFO(axom::fmt::format( - "1: Counting candidate bounding boxes took {:4.3} seconds.", - timer.elapsedTimeInSec())); - - // Initialize candidatePairs to return - timer.start(); - + // Initialize candidatePairs to return. // Allocate arrays for candidate pairs IndexArray firstPair_d(totalCandidatePairs.get(), totalCandidatePairs.get(), @@ -643,7 +637,7 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, timer.stop(); SLIC_INFO(axom::fmt::format( - "2: Initializing candidate pairs on device took {:4.3} seconds.", + "1: Querying candidate bounding boxes took {:4.3} seconds.", timer.elapsedTimeInSec())); // copy results back to host and into return vector @@ -664,9 +658,9 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, timer.stop(); - SLIC_INFO( - axom::fmt::format("3: Moving candidate pairs to host took {:4.3} seconds.", - timer.elapsedTimeInSec())); + SLIC_INFO(axom::fmt::format( + "2: Initializing candidate pairs on host took {:4.3} seconds.", + timer.elapsedTimeInSec())); SLIC_INFO(axom::fmt::format(axom::utilities::locale(), R"(Stats for query From fce614dac3cb2df31c4dc3b523127563ec8ce11c Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 16 Feb 2024 14:32:10 -0800 Subject: [PATCH 547/639] Use runtime policy presets --- .../examples/quest_candidates_example.cpp | 107 ++++++++---------- 1 file changed, 50 insertions(+), 57 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index b0868a81b6..08c0946a5c 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -51,15 +51,16 @@ using seq_exec = axom::SEQ_EXEC; using UMesh = axom::mint::UnstructuredMesh; using IndexPair = std::pair; +using RuntimePolicy = axom::runtime_policy::Policy; // clang-format off -#if defined(AXOM_USE_OPENMP) +#if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) using omp_exec = axom::OMP_EXEC; #else using omp_exec = seq_exec; #endif -#if defined(AXOM_USE_CUDA) +#if defined(AXOM_RUNTIME_POLICY_USE_CUDA) constexpr int CUDA_BLK_SZ = 256; using cuda_exec = axom::CUDA_EXEC; #else @@ -104,25 +105,17 @@ struct BasicLogger //----------------------------------------------------------------------------- /// Struct to help with parsing and storing command line args //----------------------------------------------------------------------------- -enum class RuntimePolicy -{ - raja_seq = 1, - raja_omp = 2, - raja_cuda = 3, - raja_hip = 4 -}; struct Input { static const std::set s_validMethods; - static const std::map s_validPolicies; std::string mesh_file_first {""}; std::string mesh_file_second {""}; std::string method {"bvh"}; int resolution {0}; bool verboseOutput {false}; - RuntimePolicy policy {RuntimePolicy::raja_seq}; + RuntimePolicy policy {RuntimePolicy::seq}; void parse(int argc, char** argv, axom::CLI::App& app); bool isVerbose() const { return verboseOutput; } @@ -157,19 +150,20 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) app.add_option("-p, --policy", policy) ->description( "Execution policy." - "\nSet to 'raja_seq' or 1 to use the RAJA sequential policy." -#ifdef AXOM_USE_OPENMP - "\nSet to 'raja_omp' or 2 to use the RAJA openmp policy." + "\nSet to 'seq' or 0 to use the RAJA sequential policy." +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP + "\nSet to 'omp' or 1 to use the RAJA openmp policy." #endif -#ifdef AXOM_USE_CUDA - "\nSet to 'raja_cuda' or 3 to use the RAJA cuda policy." +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + "\nSet to 'cuda' or 2 to use the RAJA cuda policy." #endif -#ifdef AXOM_USE_HIP - "\nSet to 'raja_hip' or 4 to use the RAJA hip policy." +#ifdef AXOM_RUNTIME_POLICY_USE_HIP + "\nSet to 'hip' or 3 to use the RAJA hip policy." #endif ) ->capture_default_str() - ->transform(axom::CLI::CheckedTransformer(Input::s_validPolicies)); + ->transform( + axom::CLI::CheckedTransformer(axom::runtime_policy::s_nameToPolicy)); app .add_option( @@ -201,27 +195,26 @@ void Input::parse(int argc, char** argv, axom::CLI::App& app) verboseOutput, method == "bvh" ? "Bounding Volume Hierarchy (BVH)" : "Implicit Grid", method == "bvh" ? "Not Applicable" : std::to_string(resolution), - policy == RuntimePolicy::raja_omp ? "raja_omp" - : (policy == RuntimePolicy::raja_cuda) - ? "raja_cuda" - : (policy == RuntimePolicy::raja_hip) ? "raja_hip" : "raja_seq")); -} - -const std::map Input::s_validPolicies( - {{"raja_seq", RuntimePolicy::raja_seq} -#ifdef AXOM_USE_OPENMP - , - {"raja_omp", RuntimePolicy::raja_omp} + policy == +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP + RuntimePolicy::omp + ? "omp" + : policy == #endif -#ifdef AXOM_USE_CUDA - , - {"raja_cuda", RuntimePolicy::raja_cuda} +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + RuntimePolicy::cuda + ? "cuda" + : policy == #endif -#ifdef AXOM_USE_HIP - , - {"raja_hip", RuntimePolicy::raja_hip} +#ifdef AXOM_RUNTIME_POLICY_USE_HIP + RuntimePolicy::hip + ? "hip" + : policy == #endif - }); + RuntimePolicy::seq + ? "seq" + : "policy not valid")); +} const std::set Input::s_validMethods({ "bvh", @@ -729,22 +722,22 @@ int main(int argc, char** argv) { switch(params.policy) { - case RuntimePolicy::raja_omp: -#ifdef AXOM_USE_OPENMP +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP + case RuntimePolicy::omp: candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); -#endif break; - case RuntimePolicy::raja_cuda: -#ifdef AXOM_USE_CUDA - candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); #endif +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + case RuntimePolicy::cuda: + candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); break; - case RuntimePolicy::raja_hip: -#ifdef AXOM_USE_HIP - candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); #endif +#ifdef AXOM_RUNTIME_POLICY_USE_HIP + case RuntimePolicy::hip: + candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); break; - default: // RuntimePolicy::raja_seq +#endif + default: // RuntimePolicy::seq candidatePairs = findCandidatesBVH(insert_mesh, query_mesh); break; } @@ -754,28 +747,28 @@ int main(int argc, char** argv) { switch(params.policy) { - case RuntimePolicy::raja_omp: -#ifdef AXOM_USE_OPENMP +#ifdef AXOM_RUNTIME_POLICY_USE_OPENMP + case RuntimePolicy::omp: candidatePairs = findCandidatesImplicit(insert_mesh, query_mesh, params.resolution); -#endif break; - case RuntimePolicy::raja_cuda: -#ifdef AXOM_USE_CUDA +#endif +#ifdef AXOM_RUNTIME_POLICY_USE_CUDA + case RuntimePolicy::cuda: candidatePairs = findCandidatesImplicit(insert_mesh, query_mesh, params.resolution); -#endif break; - case RuntimePolicy::raja_hip: -#ifdef AXOM_USE_HIP +#endif +#ifdef AXOM_RUNTIME_POLICY_USE_HIP + case RuntimePolicy::hip: candidatePairs = findCandidatesImplicit(insert_mesh, query_mesh, params.resolution); -#endif break; - default: // RuntimePolicy::raja_seq +#endif + default: // RuntimePolicy::seq candidatePairs = findCandidatesImplicit(insert_mesh, query_mesh, params.resolution); From 45062cc46b83b46efc0bfc6e97b7545e1f9a30d6 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Fri, 16 Feb 2024 15:51:05 -0800 Subject: [PATCH 548/639] Disable openmp scan for intel --- src/axom/quest/examples/quest_candidates_example.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 08c0946a5c..88137b6310 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -589,8 +589,14 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, totalCandidatePairs += count; }); - // Generate offsets from the counts +// Generate offsets from the counts +// (Note: exclusive scan for offsets in candidate array +// Intel oneAPI compiler segfaults with OpenMP RAJA scan) +#ifdef __INTEL_LLVM_COMPILER + using exec_pol = typename axom::execution_space::loop_policy; +#else using exec_pol = typename axom::execution_space::loop_policy; +#endif RAJA::exclusive_scan( RAJA::make_span(counts_v.data(), queryMesh.numHexes()), RAJA::make_span(offsets_v.data(), queryMesh.numHexes()), From 20f909fa3a4272a34fe3099dc3efb337c70e1c6e Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 20 Feb 2024 10:13:44 -0800 Subject: [PATCH 549/639] Add unit tests for candidates example executable --- src/axom/quest/examples/CMakeLists.txt | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index 9a71ed1e86..ca8ed9df25 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -42,6 +42,42 @@ if (CONDUIT_FOUND AND RAJA_FOUND AND UMPIRE_FOUND) DEPENDS_ON ${quest_example_depends} conduit::conduit FOLDER axom/quest/examples ) + + # Add unit tests + if(AXOM_ENABLE_TESTS AND AXOM_DATA_DIR) + + # Run the candidates example with the BVH and different raja policies + + set(input_file "${AXOM_DATA_DIR}/quest/ucart23z.cycle_000000.root") + set(query_file "${AXOM_DATA_DIR}/quest/ucart23z_shifted.cycle_000000.root") + + set(_methods "bvh") + + set (_policies "seq") + blt_list_append(TO _policies ELEMENTS "omp" IF AXOM_ENABLE_OPENMP) + blt_list_append(TO _policies ELEMENTS "cuda" IF AXOM_ENABLE_CUDA) + blt_list_append(TO _policies ELEMENTS "hip" IF AXOM_ENABLE_HIP) + + + foreach(_method ${_methods}) + foreach(_policy ${_policies}) + + set(_testname "quest_candidates_example_${_method}_${_policy}") + axom_add_test( + NAME ${_testname} + COMMAND quest_candidates_example_ex + --infile ${input_file} + --queryfile ${query_file} + --method ${_method} + --policy ${_policy} + ) + + set_tests_properties(${_testname} PROPERTIES + PASS_REGULAR_EXPRESSION "Mesh had 63\,521\,199 candidates pairs") + endforeach() + endforeach() + endif() + endif() # Shaping example ------------------------------------------------------------- From 6b28dc3e9ed991e369faad008c5b925031f94726 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 20 Feb 2024 10:53:19 -0800 Subject: [PATCH 550/639] Differentiate between initialize candidate pairs on device and copying to host for output --- .../examples/quest_candidates_example.cpp | 73 ++++++++++++++----- 1 file changed, 54 insertions(+), 19 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 88137b6310..541c73f1c4 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -440,27 +440,56 @@ axom::Array findCandidatesBVH(const HexMesh& insertMesh, SLIC_INFO(axom::fmt::format( "1: Querying candidate bounding boxes took {:4.3} seconds.", timer.elapsedTimeInSec())); + timer.start(); + + // Initialize candidate pairs on device. + auto candidates_v = candidates_d.view(); + IndexArray firstPair_d(candidates_v.size(), + candidates_v.size(), + kernel_allocator); + IndexArray secondPair_d(candidates_v.size(), + candidates_v.size(), + kernel_allocator); + auto first_pair_v = firstPair_d.view(); + auto second_pair_v = secondPair_d.view(); + + axom::for_all( + query_bbox_v.size(), + AXOM_LAMBDA(axom::IndexType icell) { + axom::IndexType offset = offsets_v[icell]; + + for(int j = 0; j < counts_v[icell]; j++) + { + int pair_index = offset + j; + first_pair_v[pair_index] = icell; + second_pair_v[pair_index] = candidates_v[pair_index]; + } + }); - // Initialize candidatePairs to return + timer.stop(); + SLIC_INFO(axom::fmt::format( + "2: Initializing candidate pairs (on device) took {:4.3} seconds.", + timer.elapsedTimeInSec())); timer.start(); - IndexArray offsets_h(offsets_d, host_allocator); - IndexArray counts_h(counts_d, host_allocator); - IndexArray candidates_h(candidates_d, host_allocator); + // copy pairs back to host and into return array + IndexArray candidates_h[2] = { + on_device ? IndexArray(firstPair_d, host_allocator) : IndexArray(), + on_device ? IndexArray(secondPair_d, host_allocator) : IndexArray()}; - for(int i = 0; i < queryMesh.numHexes(); i++) + auto candidate1_h_v = on_device ? candidates_h[0].view() : firstPair_d.view(); + auto candidate2_h_v = on_device ? candidates_h[1].view() : secondPair_d.view(); + + for(int idx = 0; idx < candidates_v.size(); ++idx) { - for(int j = 0; j < counts_h[i]; j++) - { - candidatePairs.emplace_back( - std::make_pair(i, candidates_h[offsets_h[i] + j])); - } + candidatePairs.emplace_back( + std::make_pair(candidate1_h_v[idx], candidate2_h_v[idx])); } - timer.stop(); - SLIC_INFO(axom::fmt::format( - "2: Initializing candidate pairs on host took {:4.3} seconds.", - timer.elapsedTimeInSec())); + timer.stop(); + SLIC_INFO( + axom::fmt::format("3: Moving candidate pairs to host took {:4.3} seconds.", + timer.elapsedTimeInSec())); SLIC_INFO(axom::fmt::format(axom::utilities::locale(), R"(Stats for query @@ -472,7 +501,7 @@ axom::Array findCandidatesBVH(const HexMesh& insertMesh, insertMesh.numHexes(), queryMesh.numHexes(), 1.0 * insertMesh.numHexes() * queryMesh.numHexes(), - candidates_h.size())); + candidatePairs.size())); return candidatePairs; } // end of findCandidatesBVH for Blueprint Meshes @@ -589,6 +618,12 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, totalCandidatePairs += count; }); + timer.stop(); + SLIC_INFO(axom::fmt::format( + "1: Querying candidate bounding boxes took {:4.3} seconds.", + timer.elapsedTimeInSec())); + timer.start(); + // Generate offsets from the counts // (Note: exclusive scan for offsets in candidate array // Intel oneAPI compiler segfaults with OpenMP RAJA scan) @@ -636,7 +671,7 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, timer.stop(); SLIC_INFO(axom::fmt::format( - "1: Querying candidate bounding boxes took {:4.3} seconds.", + "2: Initializing candidate pairs (on device) took {:4.3} seconds.", timer.elapsedTimeInSec())); // copy results back to host and into return vector @@ -657,9 +692,9 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, timer.stop(); - SLIC_INFO(axom::fmt::format( - "2: Initializing candidate pairs on host took {:4.3} seconds.", - timer.elapsedTimeInSec())); + SLIC_INFO( + axom::fmt::format("3: Moving candidate pairs to host took {:4.3} seconds.", + timer.elapsedTimeInSec())); SLIC_INFO(axom::fmt::format(axom::utilities::locale(), R"(Stats for query From 173aee25049333f56de998a26ac2f4e1123748db Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 20 Feb 2024 15:22:21 -0800 Subject: [PATCH 551/639] Do not run sequential test for time savings --- src/axom/quest/examples/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index ca8ed9df25..8c62038f2d 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -53,7 +53,7 @@ if (CONDUIT_FOUND AND RAJA_FOUND AND UMPIRE_FOUND) set(_methods "bvh") - set (_policies "seq") + set (_policies) blt_list_append(TO _policies ELEMENTS "omp" IF AXOM_ENABLE_OPENMP) blt_list_append(TO _policies ELEMENTS "cuda" IF AXOM_ENABLE_CUDA) blt_list_append(TO _policies ELEMENTS "hip" IF AXOM_ENABLE_HIP) From f7369a4f80ed0dd437a389141763a5e8be17a732 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Tue, 20 Feb 2024 15:22:46 -0800 Subject: [PATCH 552/639] Update release notes - add missing entry for slic tags pr as well --- RELEASE-NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index d349b905ea..e11aaefd22 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -31,6 +31,9 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - Adds `FlatMap`, a generic key-value store which aims for drop-in compatibility with `std::unordered_map`, but utilizes an open-addressing design. - Adds support for device-side use of `Array::push_back()` and `Array::emplace_back()`. +- Adds initial support for using Slic streams with tags +- Adds an example that finds intersection candidate pairs between two Silo + hexahedral meshes using either a BVH or Implicit Grid spatial index ### Changed - `DistributedClosestPoint` outputs are now controlled by the `setOutput` method. From 84229a313c457d65597eda8a12b5d135f7da4a86 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 21 Feb 2024 08:50:45 -0800 Subject: [PATCH 553/639] Verify blueprint mesh --- src/axom/quest/examples/quest_candidates_example.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 541c73f1c4..9203bf9b0c 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -257,6 +257,14 @@ HexMesh loadBlueprintHexMesh(const std::string& mesh_path, conduit::Node n_load; conduit::relay::io::blueprint::read_mesh(mesh_path, n_load); + // Check if Blueprint mesh conforms + conduit::Node n_info; + if(conduit::blueprint::verify("mesh", n_load, n_info) == false) + { + n_info.print(); + SLIC_ERROR("Mesh verification has failed!"); + } + // Verify this is a hexahedral mesh std::string shape = n_load[0]["topologies/topo/elements/shape"].as_string(); if(shape != "hex") From 58fa84948a7143b7f6673f46dc7583e9c2ab4f2f Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 21 Feb 2024 08:55:23 -0800 Subject: [PATCH 554/639] Clarify reference to BVH two pass, traverser API --- src/axom/quest/examples/quest_candidates_example.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/axom/quest/examples/quest_candidates_example.cpp b/src/axom/quest/examples/quest_candidates_example.cpp index 9203bf9b0c..932fe5a494 100644 --- a/src/axom/quest/examples/quest_candidates_example.cpp +++ b/src/axom/quest/examples/quest_candidates_example.cpp @@ -600,8 +600,9 @@ axom::Array findCandidatesImplicit(const HexMesh& insertMesh, using reduce_pol = typename axom::execution_space::reduce_policy; RAJA::ReduceSum totalCandidatePairs(0); - // First pass: get number of bounding box candidates for each query bounding box - // Logic here mirrors the BVH two-pass query + // First pass: get number of bounding box candidates for each query bounding + // box. Logic here mirrors the quest_bvh_two_pass.cpp example. See also + // the "Device Traversal API" for BVH. axom::for_all( queryMesh.numHexes(), AXOM_LAMBDA(int icell) { From 7e24d07916ff88988899559ea92f036372eb2fb4 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 21 Feb 2024 11:39:04 -0800 Subject: [PATCH 555/639] Fix regex for example pass, add rest of policy, spatial index combinations --- src/axom/quest/examples/CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index 8c62038f2d..19e9258653 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -46,14 +46,16 @@ if (CONDUIT_FOUND AND RAJA_FOUND AND UMPIRE_FOUND) # Add unit tests if(AXOM_ENABLE_TESTS AND AXOM_DATA_DIR) - # Run the candidates example with the BVH and different raja policies + # Run the candidates example with the different spatial indices + # and raja policies - set(input_file "${AXOM_DATA_DIR}/quest/ucart23z.cycle_000000.root") - set(query_file "${AXOM_DATA_DIR}/quest/ucart23z_shifted.cycle_000000.root") + # Use same file for input and query + set(input_file "${AXOM_DATA_DIR}/quest/ucart10.cycle_000000.root") + set(query_file "${AXOM_DATA_DIR}/quest/ucart10.cycle_000000.root") - set(_methods "bvh") + set(_methods "bvh" "implicit") - set (_policies) + set (_policies "seq") blt_list_append(TO _policies ELEMENTS "omp" IF AXOM_ENABLE_OPENMP) blt_list_append(TO _policies ELEMENTS "cuda" IF AXOM_ENABLE_CUDA) blt_list_append(TO _policies ELEMENTS "hip" IF AXOM_ENABLE_HIP) @@ -72,8 +74,9 @@ if (CONDUIT_FOUND AND RAJA_FOUND AND UMPIRE_FOUND) --policy ${_policy} ) + # Match either one comma or none for portability set_tests_properties(${_testname} PROPERTIES - PASS_REGULAR_EXPRESSION "Mesh had 63\,521\,199 candidates pairs") + PASS_REGULAR_EXPRESSION "Mesh had 21[,]?952 candidates pairs") endforeach() endforeach() endif() From eefc7d6df94242d51dee7f79e07f6bc03b15daf9 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 21 Feb 2024 13:32:49 -0800 Subject: [PATCH 556/639] Update submodule - Add 1000 element blueprint hex meshes cube for unit testing --- data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data b/data index 1eafa5e3c2..1402f87d62 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 1eafa5e3c2bfde11f28d646cbeb580fa02da0721 +Subproject commit 1402f87d629ce40f4fb97645e3505e53c8280b3d From 5cb75963bbd68e4645a614f738c4a01902d3701c Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Wed, 21 Feb 2024 14:17:44 -0800 Subject: [PATCH 557/639] Update unit test with shifted mesh as query --- src/axom/quest/examples/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index 19e9258653..4b680d9b3d 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -51,7 +51,7 @@ if (CONDUIT_FOUND AND RAJA_FOUND AND UMPIRE_FOUND) # Use same file for input and query set(input_file "${AXOM_DATA_DIR}/quest/ucart10.cycle_000000.root") - set(query_file "${AXOM_DATA_DIR}/quest/ucart10.cycle_000000.root") + set(query_file "${AXOM_DATA_DIR}/quest/ucart10_shifted.cycle_000000.root") set(_methods "bvh" "implicit") @@ -76,7 +76,7 @@ if (CONDUIT_FOUND AND RAJA_FOUND AND UMPIRE_FOUND) # Match either one comma or none for portability set_tests_properties(${_testname} PROPERTIES - PASS_REGULAR_EXPRESSION "Mesh had 21[,]?952 candidates pairs") + PASS_REGULAR_EXPRESSION "Mesh had 6[,]?859 candidates pairs") endforeach() endforeach() endif() From a2cf9d69fefc6ca53854cb46ad345f87b28e8092 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 27 Feb 2024 16:24:40 -0800 Subject: [PATCH 558/639] Store facet domain ids, as a prereq for supporting AMR. --- src/axom/quest/MarchingCubes.cpp | 49 +++++++++++--------------------- src/axom/quest/MarchingCubes.hpp | 14 ++++++--- 2 files changed, 26 insertions(+), 37 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index ac30955467..ced9618343 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -44,6 +44,7 @@ MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, , m_facetNodeIds(twoZeros, m_allocatorID) , m_facetNodeCoords(twoZeros, m_allocatorID) , m_facetParentIds(0, 0, m_allocatorID) + , m_facetDomainIds(0, 0, m_allocatorID) { } // Set the object up for a blueprint mesh state. @@ -129,6 +130,17 @@ void MarchingCubes::computeIsocontour(double contourVal) { m_singles[d]->computeFacets(); } + + for(axom::IndexType d = 0; d < m_singles.size(); ++d) + { + const auto domainId = m_singles[d]->getDomainId(d); + const auto domainFacetCount = + ( d < m_singles.size() - 1 ? m_facetIndexOffsets[d+1] : m_facetCount ) + - m_facetIndexOffsets[d]; + m_facetDomainIds.fill(domainId, + domainFacetCount, + m_facetIndexOffsets[d]); + } } axom::IndexType MarchingCubes::getContourNodeCount() const @@ -141,35 +153,6 @@ axom::IndexType MarchingCubes::getContourNodeCount() const return contourNodeCount; } -/* - Domain ids are provided as a new Array instead of ArrayView because - we don't store it internally. -*/ -template -axom::Array MarchingCubes::getContourFacetDomainIds(int allocatorID) const -{ - // Put parent domain ids into a new Array. - const axom::IndexType len = getContourCellCount(); - axom::Array rval( - len, - len, - allocatorID != axom::INVALID_ALLOCATOR_ID ? allocatorID : m_allocatorID); - for(int d = 0; d < m_singles.size(); ++d) - { - DomainIdType domainId = - static_cast(m_singles[d]->getDomainId(d)); - axom::IndexType contourCellCount = m_singles[d]->getContourCellCount(); - axom::IndexType offset = m_facetIndexOffsets[d]; - axom::detail::ArrayOps::fill( - rval.data(), - offset, - contourCellCount, - allocatorID, - domainId); - } - return rval; -} - void MarchingCubes::clear() { for(int d = 0; d < m_singles.size(); ++d) @@ -260,11 +243,9 @@ void MarchingCubes::populateContourMesh( // Put parent domain ids into the mesh. auto* domainIdPtr = mesh.getFieldPtr(domainIdField, axom::mint::CELL_CENTERED); - auto tmpContourFacetDomainIds = - getContourFacetDomainIds(hostAllocatorId); axom::copy(domainIdPtr, - tmpContourFacetDomainIds.data(), - m_facetCount * sizeof(DomainIdType)); + m_facetDomainIds.data(), + m_facetCount * sizeof(axom::IndexType)); } } } @@ -284,6 +265,8 @@ void MarchingCubes::allocateOutputBuffers() 0.0); m_facetParentIds.resize(axom::StackArray {m_facetCount}, 0); + m_facetDomainIds.resize(axom::StackArray {m_facetCount}, + 0); } } diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 3c07683fe7..e6c20e4d15 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -115,7 +115,7 @@ class MarchingCubes The simplest policy is RuntimePolicy::seq, which specifies running sequentially on the CPU. \param [in] allocatorID Data allocator ID. Choose something compatible - with \c runtimePolicy. See \c esecution_space. + with \c runtimePolicy. See \c execution_space. \param [in] dataParallelism Data parallel implementation choice. \param [in] bpMesh Blueprint multi-domain mesh containing scalar field. \param [in] topologyName Name of Blueprint topology to use in \a bpMesh. @@ -237,9 +237,10 @@ class MarchingCubes The buffer size is getContourCellCount(). */ - template - axom::Array getContourFacetDomainIds( - int allocatorID = axom::INVALID_ALLOCATOR_ID) const; + axom::ArrayView getContourFacetDomainIds() const + { + return m_facetDomainIds.view(); + } #if 1 // Is there a use case for this? @@ -337,6 +338,11 @@ class MarchingCubes @see allocateOutputBuffers(). */ axom::Array m_facetParentIds; + + /*! + @brief Domain ids of facets. + */ + axom::Array m_facetDomainIds; //@} //!@brief Allocate output buffers corresponding to runtime policy. From effab869250d5e484e4fdb67272d6f9a0e422d18 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 27 Feb 2024 17:07:30 -0800 Subject: [PATCH 559/639] Change logic to allow building contour mesh from multiple inputs. This is part of the support for meshes represented by multiple conduit nodes (such as SAMR). However this support is still under development and not tested. --- src/axom/quest/MarchingCubes.cpp | 31 ++++++++++++------- src/axom/quest/MarchingCubes.hpp | 31 ++++++++++++++----- src/axom/quest/detail/MarchingCubesImpl.hpp | 10 +++--- .../detail/MarchingCubesSingleDomain.cpp | 8 ++--- .../detail/MarchingCubesSingleDomain.hpp | 14 ++++----- .../examples/quest_marching_cubes_example.cpp | 8 ++--- 6 files changed, 62 insertions(+), 40 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index ced9618343..4083e5039c 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -48,15 +48,15 @@ MarchingCubes::MarchingCubes(RuntimePolicy runtimePolicy, { } // Set the object up for a blueprint mesh state. -void MarchingCubes::initialize(const conduit::Node& bpMesh, - const std::string& topologyName, - const std::string& maskField) +void MarchingCubes::setMesh(const conduit::Node& bpMesh, + const std::string& topologyName, + const std::string& maskField) { SLIC_ASSERT_MSG( conduit::blueprint::mesh::is_multi_domain(bpMesh), "MarchingCubes class input mesh must be in multidomain format."); - clear(); + clearMesh(); m_topologyName = topologyName; m_maskFieldName = maskField; @@ -64,9 +64,9 @@ void MarchingCubes::initialize(const conduit::Node& bpMesh, /* To avoid slow memory allocations (especially on GPUs) keep the single-domain objects around and just re-initialize them. Arrays - will be cleared, but not deallocated. To really deallocate - memory, deallocate the MarchingCubes object. The actual number - of domains is m_domainCount, not m_singles.size(). + will be cleared, but not deallocated. The actual number of + domains is m_domainCount, not m_singles.size(). To *really* + deallocate memory, deallocate the MarchingCubes object. */ auto newDomainCount = conduit::blueprint::mesh::number_of_domains(bpMesh); @@ -79,7 +79,7 @@ void MarchingCubes::initialize(const conduit::Node& bpMesh, for(int d = 0; d < newDomainCount; ++d) { const auto& dom = bpMesh.child(d); - m_singles[d]->initialize(dom, m_topologyName, maskField); + m_singles[d]->setDomain(dom, m_topologyName, maskField); } m_domainCount = newDomainCount; @@ -98,10 +98,10 @@ void MarchingCubes::setFunctionField(const std::string& fcnField) void MarchingCubes::computeIsocontour(double contourVal) { AXOM_PERF_MARK_FUNCTION("MarchingCubes::computeIsoContour"); + // Mark and scan domains while adding up their // facet counts to get the total facet counts. m_facetIndexOffsets.resize(m_singles.size()); - m_facetCount = 0; for(axom::IndexType d = 0; d < m_singles.size(); ++d) { auto& single = *m_singles[d]; @@ -153,11 +153,11 @@ axom::IndexType MarchingCubes::getContourNodeCount() const return contourNodeCount; } -void MarchingCubes::clear() +void MarchingCubes::clearMesh() { for(int d = 0; d < m_singles.size(); ++d) { - m_singles[d]->getImpl().clear(); + m_singles[d]->getImpl().clearDomain(); } m_domainCount = 0; m_facetNodeIds.clear(); @@ -165,6 +165,15 @@ void MarchingCubes::clear() m_facetParentIds.clear(); } +void MarchingCubes::clearOutput() +{ + m_facetCount = 0; + m_facetNodeIds.clear(); + m_facetNodeCoords.clear(); + m_facetParentIds.clear(); + m_facetDomainIds.clear(); +} + void MarchingCubes::populateContourMesh( axom::mint::UnstructuredMesh& mesh, const std::string& cellIdField, diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index e6c20e4d15..2eefd45860 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -143,9 +143,14 @@ class MarchingCubes int allocatorId, MarchingCubesDataParallelism dataParallelism); - void initialize(const conduit::Node &bpMesh, - const std::string &topologyName, - const std::string &maskField = {}); + /*! + @brief Set the input mesh. + + @see clearMesh() + */ + void setMesh(const conduit::Node &bpMesh, + const std::string &topologyName, + const std::string &maskField = {}); /*! @brief Set the field containing the nodal function. @@ -156,7 +161,10 @@ class MarchingCubes /*! \brief Computes the isocontour. \param [in] contourVal isocontour value - */ + + Each computeIsocontour call adds to previously computed contour + mesh. + */ void computeIsocontour(double contourVal = 0.0); //!@brief Get number of cells in the generated contour mesh. @@ -268,15 +276,22 @@ class MarchingCubes //@} /*! - @brief Clear computed data. + @brief Clear the input mesh data. - After clearing, you have to call initialize as if it - was a new object. + The contour mesh is *not* cleared. See clearOutput() for this. + + After clearing, you have to call setMesh() as if it was a new + object. @internal For good GPU performance, memory is not deallocated. To really deallocate memory, destruct this object and use another. */ - void clear(); + void clearMesh(); + + /*! + @brief Clear the computed contour mesh. + */ + void clearOutput(); // Allow single-domain code to share common scratch space. friend detail::marching_cubes::MarchingCubesSingleDomain; diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 2832fd36d4..5a6940fbf7 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -97,13 +97,13 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase The above data from the domain MUST be in a memory space compatible with ExecSpace. */ - AXOM_HOST void initialize(const conduit::Node& dom, - const std::string& topologyName, - const std::string& maskFieldName) override + AXOM_HOST void setDomain(const conduit::Node& dom, + const std::string& topologyName, + const std::string& maskFieldName) override { // Time this due to potentially slow memory allocation AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::initialize"); - clear(); + clearDomain(); SLIC_ASSERT(conduit::blueprint::mesh::topology::dims(dom.fetch_existing( axom::fmt::format("topologies/{}", topologyName))) == DIM); @@ -902,7 +902,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase After clearing, you can change the field, contour value and recompute the contour. */ - void clear() override + void clearDomain() override { m_caseIdsFlat.clear(); m_crossingFlags.clear(); diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.cpp b/src/axom/quest/detail/MarchingCubesSingleDomain.cpp index 517e4f89ea..ae711c8462 100644 --- a/src/axom/quest/detail/MarchingCubesSingleDomain.cpp +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.cpp @@ -40,9 +40,9 @@ MarchingCubesSingleDomain::MarchingCubesSingleDomain(MarchingCubes& mc) return; } -void MarchingCubesSingleDomain::initialize(const conduit::Node& dom, - const std::string& topologyName, - const std::string& maskField) +void MarchingCubesSingleDomain::setDomain(const conduit::Node& dom, + const std::string& topologyName, + const std::string& maskField) { m_topologyName = topologyName; @@ -80,7 +80,7 @@ void MarchingCubesSingleDomain::initialize(const conduit::Node& dom, m_impl = newMarchingCubesImpl(); - m_impl->initialize(dom, topologyName, maskField); + m_impl->setDomain(dom, topologyName, maskField); m_impl->setDataParallelism(m_dataParallelism); } diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp index 7285134c9b..24045d2325 100644 --- a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp @@ -85,9 +85,9 @@ class MarchingCubesSingleDomain requirement may be relaxed, possibly at the cost of a transformation and storage of the temporary contiguous layout. */ - void initialize(const conduit::Node &dom, - const std::string &topologyName, - const std::string &maskfield); + void setDomain(const conduit::Node &dom, + const std::string &topologyName, + const std::string &maskfield); int spatialDimension() const { return m_ndim; } @@ -162,9 +162,9 @@ class MarchingCubesSingleDomain Put in here codes that can't be in MarchingCubesSingleDomain due to template use (DIM and ExecSpace). */ - virtual void initialize(const conduit::Node &dom, - const std::string &topologyName, - const std::string &maskPath = {}) = 0; + virtual void setDomain(const conduit::Node &dom, + const std::string &topologyName, + const std::string &maskPath = {}) = 0; virtual void setFunctionField(const std::string &fcnFieldName) = 0; virtual void setContourValue(double contourVal) = 0; @@ -201,7 +201,7 @@ class MarchingCubesSingleDomain virtual ~ImplBase() { } - virtual void clear() = 0; + virtual void clearDomain() = 0; MarchingCubesDataParallelism m_dataParallelism = MarchingCubesDataParallelism::byPolicy; diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index d3eb7f839e..fd01afea6f 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -769,18 +769,16 @@ struct ContourTestBase repsTimer.start(); for(int j = 0; j < params.objectRepCount; ++j) { - // Clear and re-use MarchingCubes object. if(!mcPtr) { mcPtr = std::make_unique(params.policy, s_allocatorId, params.dataParallelism); } - mcPtr->clear(); - auto& mc = *mcPtr; - mc.initialize(computationalMesh.asConduitNode(), "mesh"); + // Clear and set MarchingCubes object for a "new" mesh. + mc.setMesh(computationalMesh.asConduitNode(), "mesh"); mc.setFunctionField(functionName()); #ifdef AXOM_USE_MPI @@ -794,7 +792,7 @@ struct ContourTestBase params.objectRepCount, i, params.contourGenCount)); - mc.clear(); + mc.clearOutput(); mc.computeIsocontour(params.contourVal); } } From d38eb1e0e2185c0b6b2a0dbebbcb62c478c46641 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 27 Feb 2024 19:13:16 -0800 Subject: [PATCH 560/639] Switch from functors to strategy pattern. --- .../examples/quest_marching_cubes_example.cpp | 307 +++++++----------- 1 file changed, 114 insertions(+), 193 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index fd01afea6f..165b7d96b0 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -674,40 +674,67 @@ static void addToStackArray(axom::StackArray& a, U b) } } +/*! + @brief Strategy pattern for supporting different contour types. +*/ +template +struct ContourTestStrategy +{ + using PointType = axom::primal::Point; + //!@brief Return test name. + virtual std::string testName() const = 0; + + //!@brief Return field name for storing nodal function. + virtual std::string functionName() const = 0; + + //!@brief Return error tolerance for contour mesh accuracy check. + virtual double errorTolerance() const = 0; + + //!@brief Return the analytical value of the scalar field. + virtual double valueAt(const PointType& pt) const = 0; + + virtual ~ContourTestStrategy() {} +}; + /** ValueFunctorType is a copy-able functor that returns the scalar function value. It should have operator(const PointType &) return a double. */ -template +template struct ContourTestBase { static constexpr auto MemorySpace = axom::execution_space::memory_space; using PointType = axom::primal::Point; - ContourTestBase(const ValueFunctorType& valueFunctor) - : m_parentCellIdField("parentCellIds") + ContourTestBase(const std::shared_ptr>& testStrategy) + : m_testStrategy(testStrategy) + , m_parentCellIdField("parentCellIds") , m_domainIdField("domainIdField") - , m_valueFunctor(valueFunctor) { } virtual ~ContourTestBase() { } //!@brief Return field name for storing nodal function. - virtual std::string name() const = 0; + virtual std::string testName() const { return m_testStrategy->testName(); } //!@brief Return field name for storing nodal function. - virtual std::string functionName() const = 0; + virtual std::string functionName() const { return m_testStrategy->functionName(); } //!@brief Return error tolerance for contour mesh accuracy check. - virtual double errorTolerance() const = 0; + virtual double errorTolerance() const { return m_testStrategy->errorTolerance(); } + std::shared_ptr> getTestStrategy() const + { + return m_testStrategy; + } + + std::shared_ptr> m_testStrategy; const std::string m_parentCellIdField; const std::string m_domainIdField; - ValueFunctorType m_valueFunctor; int runTest(BlueprintStructuredMesh& computationalMesh) { - SLIC_INFO(banner(axom::fmt::format("Testing {} contour.", name()))); + SLIC_INFO(banner(axom::fmt::format("Testing {} contour.", testName()))); // Conduit data is in host memory, move to devices for testing. if(s_allocatorId != axom::execution_space::allocatorID()) @@ -800,7 +827,7 @@ struct ContourTestBase SLIC_INFO(axom::fmt::format("Finished {} object reps x {} contour reps", params.objectRepCount, params.contourGenCount)); - printTimingStats(repsTimer, name() + " contour"); + printTimingStats(repsTimer, testName() + " contour"); auto& mc = *mcPtr; printRunStats(mc); @@ -821,7 +848,7 @@ struct ContourTestBase } // Put contour mesh in a mint object for error checking and output. - std::string sidreGroupName = name() + "_mesh"; + std::string sidreGroupName = testName() + "_mesh"; sidre::DataStore objectDS; // While awaiting fix for PR #1271, don't use Sidre storage in contourMesh. sidre::Group* meshGroup = objectDS.getRoot()->createGroup(sidreGroupName); @@ -833,7 +860,7 @@ struct ContourTestBase extractTimer.start(); mc.populateContourMesh(contourMesh, m_parentCellIdField, m_domainIdField); extractTimer.stop(); - printTimingStats(extractTimer, name() + " extract"); + printTimingStats(extractTimer, testName() + " extract"); int localErrCount = 0; if(params.checkResults) @@ -851,9 +878,9 @@ struct ContourTestBase { assert(contourMesh.getSidreGroup() == meshGroup); // Write contour mesh to file. - std::string outputName = name() + "_contour_mesh"; + std::string outputName = testName() + "_contour_mesh"; saveMesh(*contourMesh.getSidreGroup(), outputName); - SLIC_INFO(axom::fmt::format("Wrote {} contour in {}", name(), outputName)); + SLIC_INFO(axom::fmt::format("Wrote {} contour in {}", testName(), outputName)); } objectDS.getRoot()->destroyGroupAndData(sidreGroupName); @@ -925,7 +952,6 @@ struct ContourTestBase } #if defined(AXOM_USE_RAJA) - auto valueFunctor = m_valueFunctor; RAJA::RangeSegment iRange(0, fieldShape[0]); RAJA::RangeSegment jRange(0, fieldShape[1]); using EXEC_POL = @@ -938,7 +964,7 @@ struct ContourTestBase { pt[d] = coordsViews[d](i, j); } - fieldView(i, j) = valueFunctor(pt); + fieldView(i, j) = m_testStrategy->valueAt(pt); }); #else for(axom::IndexType j = 0; j < fieldShape[1]; ++j) @@ -950,7 +976,7 @@ struct ContourTestBase { pt[d] = coordsViews[d](i, j); } - fieldView(i, j) = m_valueFunctor(pt); + fieldView(i, j) = m_testStrategy->valueAt(pt); } } #endif @@ -969,7 +995,6 @@ struct ContourTestBase } #if defined(AXOM_USE_RAJA) - auto valueFunctor = m_valueFunctor; RAJA::RangeSegment iRange(0, fieldShape[0]); RAJA::RangeSegment jRange(0, fieldShape[1]); RAJA::RangeSegment kRange(0, fieldShape[2]); @@ -983,7 +1008,7 @@ struct ContourTestBase { pt[d] = coordsViews[d](i, j, k); } - fieldView(i, j, k) = valueFunctor(pt); + fieldView(i, j, k) = m_testStrategy->valueAt(pt); }); #else for(axom::IndexType k = 0; k < fieldShape[2]; ++k) @@ -997,7 +1022,7 @@ struct ContourTestBase { pt[d] = coordsViews[d](i, j, k); } - fieldView(i, j, k) = m_valueFunctor(pt); + fieldView(i, j, k) = m_testStrategy->valueAt(pt); } } } @@ -1034,7 +1059,7 @@ struct ContourTestBase for(axom::IndexType i = 0; i < nodeCount; ++i) { contourMesh.getNode(i, pt.data()); - double analyticalVal = m_valueFunctor(pt); + double analyticalVal = m_testStrategy->valueAt(pt); double diff = std::abs(analyticalVal - contourVal); if(diffPtr) { @@ -1375,75 +1400,72 @@ struct ContourTestBase } }; -/*! - @brief Function providing distance from a point. -*/ template -struct RoundFunctor -{ +struct PlanarTestStrategy : public ContourTestStrategy { using PointType = axom::primal::Point; - const axom::primal::Sphere _sphere; - RoundFunctor(const PointType& center) : _sphere(center, 0.0) { } - AXOM_HOST_DEVICE double operator()(const PointType& pt) const + PlanarTestStrategy(const axom::primal::Vector& perpDir, + const PointType& inPlane) + : ContourTestStrategy() + , _plane(perpDir.unitVector(), inPlane) + , _errTol(axom::numerics::floating_point_limits::epsilon()) + {} + virtual std::string testName() const override { return std::string("planar"); } + virtual std::string functionName() const override { - return _sphere.computeSignedDistance(pt); + return std::string("dist_to_plane"); } -}; -template -struct RoundContourTest - : public ContourTestBase> -{ - static constexpr auto MemorySpace = - axom::execution_space::memory_space; - using PointType = axom::primal::Point; - using FunctorType = RoundFunctor; - /*! - @brief Constructor. - - @param center [in] Center of ring or sphere - */ - RoundContourTest(const PointType& center) - : ContourTestBase(FunctorType(center)) - , _sphere(center, 0.0) - , _roundFunctor(center) - , _errTol(1e-3) - { } - virtual ~RoundContourTest() { } - const axom::primal::Sphere _sphere; - FunctorType _roundFunctor; + double errorTolerance() const override { return _errTol; } + virtual double valueAt(const PointType& pt) const override + { + return _plane.signedDistance(pt); + } + const axom::primal::Plane _plane; double _errTol; +}; - virtual std::string name() const override { return std::string("round"); } - +template +struct RoundTestStrategy : public ContourTestStrategy { + using PointType = axom::primal::Point; + RoundTestStrategy(const PointType& center) + : ContourTestStrategy() + , _sphere(center, 0.0) + , _errTol(1e-3) + {} + virtual std::string testName() const override { return std::string("round"); } virtual std::string functionName() const override { return std::string("dist_to_center"); } - double errorTolerance() const override { return _errTol; } - + virtual double valueAt(const PointType& pt) const override + { + return _sphere.computeSignedDistance(pt); + } void setToleranceByLongestEdge(const BlueprintStructuredMesh& bsm) { // Heuristic of appropriate error tolerance. double maxSpacing = bsm.maxSpacing(); _errTol = 0.1 * maxSpacing; } + const axom::primal::Sphere _sphere; + double _errTol; }; -/*! - @brief Function for approximate gyroid surface -*/ template -struct GyroidFunctor -{ +struct GyroidTestStrategy : public ContourTestStrategy { using PointType = axom::primal::Point; - const PointType _scale; - const double _offset; - GyroidFunctor(const PointType& scale, double offset) - : _scale(scale) - , _offset(offset) - { } - AXOM_HOST_DEVICE double operator()(const PointType& pt) const + GyroidTestStrategy(const PointType& scale, double offset) + : ContourTestStrategy() + , _scale(scale) + , _offset(offset) + {} + virtual std::string testName() const override { return std::string("gyroid"); } + virtual std::string functionName() const override + { + return std::string("gyroid_fcn"); + } + double errorTolerance() const override { return _errTol; } + virtual double valueAt(const PointType& pt) const override { if(DIM == 3) { @@ -1458,40 +1480,6 @@ struct GyroidFunctor sin(pt[1] * _scale[1]) + _offset; } } -}; -template -struct GyroidContourTest - : public ContourTestBase> -{ - static constexpr auto MemorySpace = - axom::execution_space::memory_space; - using PointType = axom::primal::Point; - using FunctorType = GyroidFunctor; - /*! - @brief Constructor. - - @param scale [in] Gyroid function scaling factors - */ - GyroidContourTest(const PointType& scale, double offset) - : ContourTestBase(FunctorType(scale, offset)) - , _scale(scale) - , _gyroidFunctor(scale, offset) - , _errTol(1e-3) - { } - virtual ~GyroidContourTest() { } - const PointType _scale; - FunctorType _gyroidFunctor; - double _errTol; - - virtual std::string name() const override { return std::string("gyroid"); } - - virtual std::string functionName() const override - { - return std::string("gyroid_fcn"); - } - - double errorTolerance() const override { return _errTol; } - void setToleranceByLongestEdge(const BlueprintStructuredMesh& bsm) { // Heuristic of appropriate error tolerance. @@ -1499,81 +1487,11 @@ struct GyroidContourTest axom::primal::Vector v(_scale); _errTol = 0.1 * v.norm() * maxSpacing; } + const PointType _scale; + const double _offset; + double _errTol; }; -/*! - @brief Function providing signed distance from a plane. -*/ -template -struct PlanarFunctor -{ - using PointType = axom::primal::Point; - const axom::primal::Plane _plane; - PlanarFunctor(const axom::primal::Vector& perpDir, - const PointType& inPlane) - : _plane(perpDir.unitVector(), inPlane) - { } - AXOM_HOST_DEVICE double operator()(const PointType& pt) const - { - return _plane.signedDistance(pt); - } -}; -template -struct PlanarContourTest - : public ContourTestBase> -{ - static constexpr auto MemorySpace = - axom::execution_space::memory_space; - using PointType = axom::primal::Point; - using FunctorType = PlanarFunctor; - /*! - @brief Constructor. - - @param inPlane [in] A point in the plane. - @param perpDir [in] Perpendicular direction on positive side. - */ - PlanarContourTest(const PointType& inPlane, - const axom::primal::Vector& perpDir) - : ContourTestBase( - FunctorType(perpDir.unitVector(), inPlane)) - , _plane(perpDir.unitVector(), inPlane) - { } - virtual ~PlanarContourTest() { } - const axom::primal::Plane _plane; - - virtual std::string name() const override { return std::string("planar"); } - - virtual std::string functionName() const override - { - return std::string("dist_to_plane"); - } - - double errorTolerance() const override { - return axom::numerics::floating_point_limits::epsilon(); - } -}; - -/// Utility function to transform blueprint node storage. -void makeCoordsContiguous(conduit::Node& coordValues) -{ - bool isInterleaved = conduit::blueprint::mcarray::is_interleaved(coordValues); - if(isInterleaved) - { - conduit::Node oldValues = coordValues; - conduit::blueprint::mcarray::to_contiguous(oldValues, coordValues); - } -} - -/// Utility function to transform blueprint node storage. -void makeCoordsInterleaved(conduit::Node& coordValues) -{ - bool isInterleaved = conduit::blueprint::mcarray::is_interleaved(coordValues); - if(!isInterleaved) - { - conduit::Node oldValues = coordValues; - conduit::blueprint::mcarray::to_interleaved(oldValues, coordValues); - } -} /// int allocatorIdToTest(axom::runtime_policy::Policy policy) @@ -1662,32 +1580,35 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) // params specify which tests to run. //--------------------------------------------------------------------------- - std::shared_ptr> roundTest; - std::shared_ptr> gyroidTest; - std::shared_ptr> planarTest; + std::shared_ptr> planarTest; + std::shared_ptr> roundTest; + std::shared_ptr> gyroidTest; + + if(params.usingPlanar()) + { + auto strat = std::make_shared>(params.planeNormal(), + params.inplanePoint()); + planarTest = std::make_shared>(strat); + planarTest->computeNodalDistance(computationalMesh); + } if(params.usingRound()) { - roundTest = std::make_shared>( - params.roundContourCenter()); - roundTest->setToleranceByLongestEdge(computationalMesh); + auto strat = std::make_shared>(params.roundContourCenter()); + strat->setToleranceByLongestEdge(computationalMesh); + roundTest = std::make_shared>(strat); roundTest->computeNodalDistance(computationalMesh); } + if(params.usingGyroid()) { - gyroidTest = std::make_shared>( - params.gyroidScaleFactor(), - params.contourVal); - gyroidTest->setToleranceByLongestEdge(computationalMesh); + auto strat = std::make_shared>(params.gyroidScaleFactor(), + params.contourVal); + strat->setToleranceByLongestEdge(computationalMesh); + gyroidTest = std::make_shared>(strat); gyroidTest->computeNodalDistance(computationalMesh); } - if(params.usingPlanar()) - { - planarTest = std::make_shared>( - params.inplanePoint(), - params.planeNormal()); - planarTest->computeNodalDistance(computationalMesh); - } + if(params.isVerbose()) { computationalMesh.printMeshInfo(); From 250c36e8b1161dbcf95a366e7244b505665b66e8 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 27 Feb 2024 20:48:19 -0800 Subject: [PATCH 561/639] Combine surface meshes to test logic for supporting SAMR. --- .../examples/quest_marching_cubes_example.cpp | 315 ++++++++++++------ 1 file changed, 214 insertions(+), 101 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 165b7d96b0..dfe401b4a6 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -707,13 +707,15 @@ struct ContourTestBase static constexpr auto MemorySpace = axom::execution_space::memory_space; using PointType = axom::primal::Point; - ContourTestBase(const std::shared_ptr>& testStrategy) - : m_testStrategy(testStrategy) + // ContourTestBase(const std::shared_ptr>& testStrategy) + ContourTestBase() + : m_testStrategies() , m_parentCellIdField("parentCellIds") , m_domainIdField("domainIdField") { } virtual ~ContourTestBase() { } +#if 0 //!@brief Return field name for storing nodal function. virtual std::string testName() const { return m_testStrategy->testName(); } @@ -727,14 +729,24 @@ struct ContourTestBase { return m_testStrategy; } +#endif + void addTestStrategy( const std::shared_ptr>& testStrategy ) + { + m_testStrategies.push_back(testStrategy); + SLIC_INFO(axom::fmt::format("Add test {}.", testStrategy->testName())); + } - std::shared_ptr> m_testStrategy; + axom::Array>> m_testStrategies; const std::string m_parentCellIdField; const std::string m_domainIdField; int runTest(BlueprintStructuredMesh& computationalMesh) { - SLIC_INFO(banner(axom::fmt::format("Testing {} contour.", testName()))); + // Compute the nodal distance functions. + for( const auto& strategy : m_testStrategies ) + { + computeNodalDistance(computationalMesh, *strategy); + } // Conduit data is in host memory, move to devices for testing. if(s_allocatorId != axom::execution_space::allocatorID()) @@ -746,9 +758,12 @@ struct ContourTestBase computationalMesh.coordsetPath() + "/values/" + axes[d], s_allocatorId); } - computationalMesh.moveMeshDataToNewMemorySpace( - axom::fmt::format("fields/{}/values", functionName()), - s_allocatorId); + for( const auto& strategy : m_testStrategies ) + { + computationalMesh.moveMeshDataToNewMemorySpace( + axom::fmt::format("fields/{}/values", strategy->functionName()), + s_allocatorId); + } } #if defined(AXOM_USE_UMPIRE) @@ -760,33 +775,36 @@ struct ContourTestBase { std::string resourceName = "HOST"; umpire::ResourceManager& rm = umpire::ResourceManager::getInstance(); - const std::string dataPath = - axom::fmt::format("fields/{}/values", functionName()); - void* dataPtr = - computationalMesh.domain(0).fetch_existing(dataPath).data_ptr(); - bool dataFromUmpire = rm.hasAllocator(dataPtr); - if(dataFromUmpire) - { - umpire::Allocator allocator = rm.getAllocator(dataPtr); - resourceName = allocator.getName(); - } - SLIC_INFO( - axom::fmt::format("Testing with policy {} and function data on {}", - params.policy, - resourceName)); - if(params.policy == axom::runtime_policy::Policy::seq) + for( const auto& strategy : m_testStrategies ) { - SLIC_ASSERT(resourceName == "HOST"); - } - #if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) - else if(params.policy == axom::runtime_policy::Policy::omp) - { - SLIC_ASSERT(resourceName == "HOST"); - } - #endif - else - { - SLIC_ASSERT(resourceName == "DEVICE"); + const std::string dataPath = + axom::fmt::format("fields/{}/values", strategy->functionName()); + void* dataPtr = + computationalMesh.domain(0).fetch_existing(dataPath).data_ptr(); + bool dataFromUmpire = rm.hasAllocator(dataPtr); + if(dataFromUmpire) + { + umpire::Allocator allocator = rm.getAllocator(dataPtr); + resourceName = allocator.getName(); + } + SLIC_INFO( + axom::fmt::format("Testing with policy {} and function data on {}", + params.policy, + resourceName)); + if(params.policy == axom::runtime_policy::Policy::seq) + { + SLIC_ASSERT(resourceName == "HOST"); + } +#if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) + else if(params.policy == axom::runtime_policy::Policy::omp) + { + SLIC_ASSERT(resourceName == "HOST"); + } +#endif + else + { + SLIC_ASSERT(resourceName == "DEVICE"); + } } } #endif @@ -806,7 +824,7 @@ struct ContourTestBase // Clear and set MarchingCubes object for a "new" mesh. mc.setMesh(computationalMesh.asConduitNode(), "mesh"); - mc.setFunctionField(functionName()); + mc.setFunctionField(m_testStrategies[0]->functionName()); #ifdef AXOM_USE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -827,7 +845,7 @@ struct ContourTestBase SLIC_INFO(axom::fmt::format("Finished {} object reps x {} contour reps", params.objectRepCount, params.contourGenCount)); - printTimingStats(repsTimer, testName() + " contour"); + printTimingStats(repsTimer, "contour"); auto& mc = *mcPtr; printRunStats(mc); @@ -842,13 +860,16 @@ struct ContourTestBase computationalMesh.coordsetPath() + "/values/" + axes[d], axom::execution_space::allocatorID()); } - computationalMesh.moveMeshDataToNewMemorySpace( - axom::fmt::format("fields/{}/values", functionName()), - axom::execution_space::allocatorID()); + for( const auto& strategy : m_testStrategies ) + { + computationalMesh.moveMeshDataToNewMemorySpace( + axom::fmt::format("fields/{}/values", strategy->functionName()), + axom::execution_space::allocatorID()); + } } // Put contour mesh in a mint object for error checking and output. - std::string sidreGroupName = testName() + "_mesh"; + std::string sidreGroupName = "contour_mesh"; sidre::DataStore objectDS; // While awaiting fix for PR #1271, don't use Sidre storage in contourMesh. sidre::Group* meshGroup = objectDS.getRoot()->createGroup(sidreGroupName); @@ -860,27 +881,33 @@ struct ContourTestBase extractTimer.start(); mc.populateContourMesh(contourMesh, m_parentCellIdField, m_domainIdField); extractTimer.stop(); - printTimingStats(extractTimer, testName() + " extract"); + printTimingStats(extractTimer, "extract"); int localErrCount = 0; if(params.checkResults) { +#if 0 + // Temporarily disable until logic to check multiple strategies. localErrCount += checkContourSurface(contourMesh, params.contourVal, "diff"); +#endif localErrCount += checkContourCellLimits(computationalMesh, contourMesh); +#if 0 + // Temporarily disable until logic to check multiple strategies. localErrCount += checkCellsContainingContour(computationalMesh, contourMesh); +#endif } if (contourMesh.hasSidreGroup()) { assert(contourMesh.getSidreGroup() == meshGroup); // Write contour mesh to file. - std::string outputName = testName() + "_contour_mesh"; + std::string outputName = "contour_mesh"; saveMesh(*contourMesh.getSidreGroup(), outputName); - SLIC_INFO(axom::fmt::format("Wrote {} contour in {}", testName(), outputName)); + SLIC_INFO(axom::fmt::format("Wrote contour mesh to {}", outputName)); } objectDS.getRoot()->destroyGroupAndData(sidreGroupName); @@ -907,7 +934,8 @@ struct ContourTestBase mc.getContourNodeCount())); } - void computeNodalDistance(BlueprintStructuredMesh& bpMesh) + void computeNodalDistance(BlueprintStructuredMesh& bpMesh, + ContourTestStrategy& strat) { SLIC_ASSERT(bpMesh.dimension() == DIM); for(int domId = 0; domId < bpMesh.domainCount(); ++domId) @@ -917,7 +945,7 @@ struct ContourTestBase mvu(dom, "mesh"); // Create nodal function data with ghosts like node coords. - mvu.createField(functionName(), + mvu.createField(strat.functionName(), "vertex", conduit::DataType::float64(mvu.getCoordsCountWithGhosts()), mvu.getCoordsStrides(), @@ -931,19 +959,20 @@ struct ContourTestBase mvu(dom, "mesh"); const auto coordsViews = mvu.getConstCoordsViews(false); axom::ArrayView fieldView = - mvu.template getFieldView(functionName(), false); + mvu.template getFieldView(strat.functionName(), false); for(int d = 0; d < DIM; ++d) { SLIC_ASSERT(coordsViews[d].shape() == fieldView.shape()); } - populateNodalDistance(coordsViews, fieldView); + populateNodalDistance(coordsViews, fieldView, strat); } } template typename std::enable_if::type populateNodalDistance( const axom::StackArray, DIM>& coordsViews, - axom::ArrayView& fieldView) + axom::ArrayView& fieldView, + ContourTestStrategy& strat) { const auto& fieldShape = fieldView.shape(); for(int d = 0; d < DIM; ++d) @@ -951,22 +980,6 @@ struct ContourTestBase SLIC_ASSERT(coordsViews[d].shape() == fieldShape); } -#if defined(AXOM_USE_RAJA) - RAJA::RangeSegment iRange(0, fieldShape[0]); - RAJA::RangeSegment jRange(0, fieldShape[1]); - using EXEC_POL = - typename axom::mint::internal::structured_exec::loop2d_policy; - RAJA::kernel( - RAJA::make_tuple(iRange, jRange), - AXOM_LAMBDA(axom::IndexType i, axom::IndexType j) { - PointType pt; - for(int d = 0; d < DIM; ++d) - { - pt[d] = coordsViews[d](i, j); - } - fieldView(i, j) = m_testStrategy->valueAt(pt); - }); -#else for(axom::IndexType j = 0; j < fieldShape[1]; ++j) { for(axom::IndexType i = 0; i < fieldShape[0]; ++i) @@ -976,17 +989,17 @@ struct ContourTestBase { pt[d] = coordsViews[d](i, j); } - fieldView(i, j) = m_testStrategy->valueAt(pt); + fieldView(i, j) = strat.valueAt(pt); } } -#endif } template typename std::enable_if::type populateNodalDistance( const axom::StackArray, DIM>& coordsViews, - axom::ArrayView& fieldView) + axom::ArrayView& fieldView, + ContourTestStrategy& strat) { const auto& fieldShape = fieldView.shape(); for(int d = 0; d < DIM; ++d) @@ -994,23 +1007,6 @@ struct ContourTestBase SLIC_ASSERT(coordsViews[d].shape() == fieldShape); } -#if defined(AXOM_USE_RAJA) - RAJA::RangeSegment iRange(0, fieldShape[0]); - RAJA::RangeSegment jRange(0, fieldShape[1]); - RAJA::RangeSegment kRange(0, fieldShape[2]); - using EXEC_POL = - typename axom::mint::internal::structured_exec::loop3d_policy; - RAJA::kernel( - RAJA::make_tuple(iRange, jRange, kRange), - AXOM_LAMBDA(axom::IndexType i, axom::IndexType j, axom::IndexType k) { - PointType pt; - for(int d = 0; d < DIM; ++d) - { - pt[d] = coordsViews[d](i, j, k); - } - fieldView(i, j, k) = m_testStrategy->valueAt(pt); - }); -#else for(axom::IndexType k = 0; k < fieldShape[2]; ++k) { for(axom::IndexType j = 0; j < fieldShape[1]; ++j) @@ -1022,13 +1018,13 @@ struct ContourTestBase { pt[d] = coordsViews[d](i, j, k); } - fieldView(i, j, k) = m_testStrategy->valueAt(pt); + fieldView(i, j, k) = strat.valueAt(pt); } } } -#endif } +#if 0 /* TODO: Additional tests: - surface points should lie on computational mesh edges. @@ -1086,6 +1082,7 @@ struct ContourTestBase tol)); return errCount; } +#endif //!@brief Get view of output domain id data. axom::ArrayView getDomainIdView( @@ -1259,6 +1256,7 @@ struct ContourTestBase return errCount; } +#if 0 /*! Check that computational cells that contain the contour value have at least one contour mesh cell. @@ -1398,6 +1396,7 @@ struct ContourTestBase errCount)); return errCount; } +#endif }; template @@ -1493,6 +1492,106 @@ struct GyroidTestStrategy : public ContourTestStrategy { }; +#if 0 +template +void populateNodalDistance( + const axom::StackArray, DIM>& coordsViews, + axom::ArrayView& fieldView, + const ContourTestStrategy& strat); + +template +void computeNodalDistance(BlueprintStructuredMesh& bpMesh, + const ContourTestStrategy& strat) +{ + SLIC_ASSERT(bpMesh.dimension() == DIM); + for(int domId = 0; domId < bpMesh.domainCount(); ++domId) + { + conduit::Node& dom = bpMesh.domain(domId); + axom::quest::MeshViewUtil::memory_space> + mvu(dom, "mesh"); + + // Create nodal function data with ghosts like node coords. + mvu.createField(strat.functionName(), + "vertex", + conduit::DataType::float64(mvu.getCoordsCountWithGhosts()), + mvu.getCoordsStrides(), + mvu.getCoordsOffsets()); + } + + for(int domId = 0; domId < bpMesh.domainCount(); ++domId) + { + conduit::Node& dom = bpMesh.domain(domId); + axom::quest::MeshViewUtil::memory_space> + mvu(dom, "mesh"); + const auto coordsViews = mvu.getConstCoordsViews(false); + axom::ArrayView::memory_space> fieldView = + mvu.template getFieldView(strat.functionName(), false); + for(int d = 0; d < DIM; ++d) + { + SLIC_ASSERT(coordsViews[d].shape() == fieldView.shape()); + } + populateNodalDistance(coordsViews, fieldView, strat); + } +} + +template <> +void populateNodalDistance<2>( + const axom::StackArray::memory_space>, 2>& coordsViews, + axom::ArrayView& fieldView, + const ContourTestStrategy<2>& strat) +{ + using PointType = axom::primal::Point; + const auto& fieldShape = fieldView.shape(); + for(int d = 0; d < 2; ++d) + { + SLIC_ASSERT(coordsViews[d].shape() == fieldShape); + } + + for(axom::IndexType j = 0; j < fieldShape[1]; ++j) + { + for(axom::IndexType i = 0; i < fieldShape[0]; ++i) + { + PointType pt; + for(int d = 0; d < 2; ++d) + { + pt[d] = coordsViews[d](i, j); + } + fieldView(i, j) = strat.valueAt(pt); + } + } +} + +template <> +void populateNodalDistance<3>( + const axom::StackArray::memory_space>, 3>& coordsViews, + axom::ArrayView& fieldView, + const ContourTestStrategy<3>& strat) +{ + using PointType = axom::primal::Point; + const auto& fieldShape = fieldView.shape(); + for(int d = 0; d < 3; ++d) + { + SLIC_ASSERT(coordsViews[d].shape() == fieldShape); + } + + for(axom::IndexType k = 0; k < fieldShape[2]; ++k) + { + for(axom::IndexType j = 0; j < fieldShape[1]; ++j) + { + for(axom::IndexType i = 0; i < fieldShape[0]; ++i) + { + PointType pt; + for(int d = 0; d < 3; ++d) + { + pt[d] = coordsViews[d](i, j, k); + } + fieldView(i, j, k) = strat.valueAt(pt); + } + } + } +} +#endif + /// int allocatorIdToTest(axom::runtime_policy::Policy policy) { @@ -1583,30 +1682,41 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) std::shared_ptr> planarTest; std::shared_ptr> roundTest; std::shared_ptr> gyroidTest; + std::shared_ptr> planarStrat; + std::shared_ptr> roundStrat; + std::shared_ptr> gyroidStrat; + + ContourTestBase contourTest; if(params.usingPlanar()) { - auto strat = std::make_shared>(params.planeNormal(), - params.inplanePoint()); - planarTest = std::make_shared>(strat); - planarTest->computeNodalDistance(computationalMesh); + planarStrat = std::make_shared>(params.planeNormal(), + params.inplanePoint()); + planarTest = std::make_shared>(); + planarTest->addTestStrategy(planarStrat); + contourTest.addTestStrategy(planarStrat); + // computeNodalDistance(computationalMesh, *planarStrat); } if(params.usingRound()) { - auto strat = std::make_shared>(params.roundContourCenter()); - strat->setToleranceByLongestEdge(computationalMesh); - roundTest = std::make_shared>(strat); - roundTest->computeNodalDistance(computationalMesh); + roundStrat = std::make_shared>(params.roundContourCenter()); + roundStrat->setToleranceByLongestEdge(computationalMesh); + roundTest = std::make_shared>(); + roundTest->addTestStrategy(roundStrat); + contourTest.addTestStrategy(roundStrat); + // computeNodalDistance(computationalMesh, *roundStrat); } if(params.usingGyroid()) { - auto strat = std::make_shared>(params.gyroidScaleFactor(), - params.contourVal); - strat->setToleranceByLongestEdge(computationalMesh); - gyroidTest = std::make_shared>(strat); - gyroidTest->computeNodalDistance(computationalMesh); + gyroidStrat = std::make_shared>(params.gyroidScaleFactor(), + params.contourVal); + gyroidStrat->setToleranceByLongestEdge(computationalMesh); + gyroidTest = std::make_shared>(); + gyroidTest->addTestStrategy(gyroidStrat); + contourTest.addTestStrategy(gyroidStrat); + // computeNodalDistance(computationalMesh, *gyroidStrat); } if(params.isVerbose()) @@ -1618,24 +1728,27 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) saveMesh(computationalMesh.asConduitNode(), params.fieldsFile); int localErrCount = 0; + localErrCount += contourTest.runTest(computationalMesh); +#if 0 if(planarTest) { - localErrCount += planarTest->runTest(computationalMesh); + localErrCount += contourTest.runTest(computationalMesh); } slic::flushStreams(); if(roundTest) { - localErrCount += roundTest->runTest(computationalMesh); + localErrCount += contourTest.runTest(computationalMesh); } slic::flushStreams(); if(gyroidTest) { - localErrCount += gyroidTest->runTest(computationalMesh); + localErrCount += contourTest.runTest(computationalMesh); } slic::flushStreams(); +#endif // Check results From eef4deb7e28d34884f1b9009e72fa4cacc5ab9f1 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 28 Feb 2024 11:48:41 -0800 Subject: [PATCH 562/639] Update correctness tests to work on the combined contour output. --- src/axom/quest/ArrayIndexer.hpp | 30 + src/axom/quest/MarchingCubes.cpp | 7 +- src/axom/quest/MarchingCubes.hpp | 2 + src/axom/quest/MeshViewUtil.hpp | 24 +- .../examples/quest_marching_cubes_example.cpp | 594 +++++++----------- 5 files changed, 286 insertions(+), 371 deletions(-) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index 0cefe603d3..bd493d134e 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -59,6 +59,21 @@ class ArrayIndexer initializeShape(shape, slowestDirs); } + /*! + @brief Constructor for a given shape with the ordering of an + existing ArrayIndexer. + + @param [in] shape Shape of the array + @param [in] orderSource: ArrayIndex to copy stride order + from. + */ + ArrayIndexer( + const axom::StackArray& shape, + const axom::ArrayIndexer& orderSource) + { + initializeShape(shape, orderSource); + } + /*! @brief Constructor for arbitrary-stride indexing. @@ -142,6 +157,21 @@ class ArrayIndexer } } + /*! + @brief Initialize for a given shape with the ordering of an + existing ArrayIndexer. + + @param [in] shape Shape of the array + @param [in] orderSource: ArrayIndex to copy stride order + from. + */ + inline AXOM_HOST_DEVICE void initializeShape( + const axom::StackArray& shape, + const axom::ArrayIndexer& orderSource) + { + initializeShape(shape, orderSource.slowestDirs()); + } + /*! @brief Initialize for arbitrary-stride indexing. diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 4083e5039c..163ec92b47 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -145,11 +145,8 @@ void MarchingCubes::computeIsocontour(double contourVal) axom::IndexType MarchingCubes::getContourNodeCount() const { - axom::IndexType contourNodeCount = 0; - for(int dId = 0; dId < m_singles.size(); ++dId) - { - contourNodeCount += m_singles[dId]->getContourNodeCount(); - } + axom::IndexType contourNodeCount = + m_singles.empty() ? 0 : m_facetCount * m_singles[0]->spatialDimension(); return contourNodeCount; } diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 2eefd45860..629b01d43c 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -169,6 +169,8 @@ class MarchingCubes //!@brief Get number of cells in the generated contour mesh. axom::IndexType getContourCellCount() const { return m_facetCount; } + //!@brief Get number of cells in the generated contour mesh. + axom::IndexType getContourFacetCount() const { return m_facetCount; } //!@brief Get number of nodes in the generated contour mesh. axom::IndexType getContourNodeCount() const; diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index ad68fc0b44..0db7104ebf 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -181,13 +181,13 @@ static void stridesAndOffsetsToShapes(const axom::StackArray& realSh \brief Utility for high-level access into a blueprint mesh, for structured mesh with explicit coordinates. - Note: This class was written for a specific use and is not as - general as it may seem. + Note: This class was written for a specific use and supports + only structured domains with explicit node values. - Blueprint mesh data is sufficient but sparse, leaving users - to compute a number of intermediate data to get to high-level - data of interest, such as views into array data. This class - encapsulates those common utilities. + Blueprint mesh data is sufficient but sparse, leaving users to + compute some intermediate data to get to high-level data of + interest, such as views into array data. This class encapsulates + those common functions. Views are single-domain-specific. They don't apply to multi-domain meshes. They are also topology specific, with the topology name @@ -202,7 +202,7 @@ static void stridesAndOffsetsToShapes(const axom::StackArray& realSh TODO: Figure out if there's a better place for this utility. It's only in axom/quest because the initial need was there. */ -template +template class MeshViewUtil { public: @@ -676,13 +676,17 @@ class MeshViewUtil const MdIndices& strides, const MdIndices& offsets) { + SLIC_ERROR_IF( + m_dom == nullptr, + axom::fmt::format("Cannot create field {}." + " MeshViewUtil was not constructed with a mutable domain.", fieldName)); SLIC_ERROR_IF( m_dom->has_path("fields/" + fieldName), axom::fmt::format("Cannot create field {}. It already exists.", fieldName)); SLIC_ERROR_IF( association != "vertex" && association != "element", - axom::fmt::format("Not yet supporting association '{}'.", association)); + axom::fmt::format("MeshViewUtil doesn't support association '{}' yet.", association)); const auto& realShape = getRealExtents(association); MdIndices loPads, hiPads, paddedShape, strideOrder; @@ -752,6 +756,10 @@ class MeshViewUtil const MdIndices& hiPads, const MdIndices& strideOrder) { + SLIC_ERROR_IF( + m_dom == nullptr, + axom::fmt::format("Cannot create field {}." + " MeshViewUtil was not constructed with a mutable domain.", fieldName)); SLIC_ERROR_IF( m_dom->has_path("fields/" + fieldName), axom::fmt::format("Cannot create field {}. It already exists.", fieldName)); diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index dfe401b4a6..b75df0e378 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -311,7 +311,8 @@ struct BlueprintStructuredMesh public: explicit BlueprintStructuredMesh(const std::string& meshFile, const std::string& topologyName) - : _topologyPath("topologies/" + topologyName) + : _topologyName(topologyName) + , _topologyPath("topologies/" + topologyName) { readBlueprintMesh(meshFile); for(int d = 0; d < _mdMesh.number_of_children(); ++d) @@ -345,6 +346,18 @@ struct BlueprintStructuredMesh return _mdMesh.child(domainIdx); } + template + axom::quest::MeshViewUtil getDomainView(axom::IndexType domainId) + { + return axom::quest::MeshViewUtil(domain(domainId), _topologyName); + } + + template + axom::quest::MeshViewUtil getDomainView(axom::IndexType domainId) const + { + return axom::quest::MeshViewUtil(domain(domainId), _topologyName); + } + /*! @brief Get the number of cells in each direction of a blueprint single domain. @@ -546,6 +559,7 @@ struct BlueprintStructuredMesh conduit::Node _mdMesh; axom::IndexType _domCount; bool _coordsAreStrided = false; + const std::string _topologyName; const std::string _topologyPath; std::string _coordsetPath; double _maxSpacing = -1.0; @@ -675,12 +689,16 @@ static void addToStackArray(axom::StackArray& a, U b) } /*! - @brief Strategy pattern for supporting different contour types. + @brief Strategy pattern for supporting a variety of contour types. + + The strategy encapsulates the scalar functions and things related to + it. */ template struct ContourTestStrategy { using PointType = axom::primal::Point; + //!@brief Return test name. virtual std::string testName() const = 0; @@ -696,11 +714,6 @@ struct ContourTestStrategy virtual ~ContourTestStrategy() {} }; -/** - ValueFunctorType is a copy-able functor that returns the scalar - function value. It should have operator(const PointType &) return - a double. -*/ template struct ContourTestBase { @@ -715,21 +728,6 @@ struct ContourTestBase { } virtual ~ContourTestBase() { } -#if 0 - //!@brief Return field name for storing nodal function. - virtual std::string testName() const { return m_testStrategy->testName(); } - - //!@brief Return field name for storing nodal function. - virtual std::string functionName() const { return m_testStrategy->functionName(); } - - //!@brief Return error tolerance for contour mesh accuracy check. - virtual double errorTolerance() const { return m_testStrategy->errorTolerance(); } - - std::shared_ptr> getTestStrategy() const - { - return m_testStrategy; - } -#endif void addTestStrategy( const std::shared_ptr>& testStrategy ) { m_testStrategies.push_back(testStrategy); @@ -737,6 +735,9 @@ struct ContourTestBase } axom::Array>> m_testStrategies; + //!@brief Prefix sum of facet counts from test strategies. + axom::Array m_strategyFacetPrefixSum; + const std::string m_parentCellIdField; const std::string m_domainIdField; @@ -824,7 +825,6 @@ struct ContourTestBase // Clear and set MarchingCubes object for a "new" mesh. mc.setMesh(computationalMesh.asConduitNode(), "mesh"); - mc.setFunctionField(m_testStrategies[0]->functionName()); #ifdef AXOM_USE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -838,7 +838,14 @@ struct ContourTestBase i, params.contourGenCount)); mc.clearOutput(); - mc.computeIsocontour(params.contourVal); + m_strategyFacetPrefixSum.clear(); + m_strategyFacetPrefixSum.push_back(0); + for( const auto& strategy : m_testStrategies ) + { + mc.setFunctionField(strategy->functionName()); + mc.computeIsocontour(params.contourVal); + m_strategyFacetPrefixSum.push_back(mc.getContourFacetCount()); + } } } repsTimer.stop(); @@ -886,19 +893,13 @@ struct ContourTestBase int localErrCount = 0; if(params.checkResults) { -#if 0 - // Temporarily disable until logic to check multiple strategies. localErrCount += checkContourSurface(contourMesh, params.contourVal, "diff"); -#endif localErrCount += checkContourCellLimits(computationalMesh, contourMesh); -#if 0 - // Temporarily disable until logic to check multiple strategies. localErrCount += checkCellsContainingContour(computationalMesh, contourMesh); -#endif } if (contourMesh.hasSidreGroup()) @@ -940,26 +941,22 @@ struct ContourTestBase SLIC_ASSERT(bpMesh.dimension() == DIM); for(int domId = 0; domId < bpMesh.domainCount(); ++domId) { - conduit::Node& dom = bpMesh.domain(domId); - axom::quest::MeshViewUtil::memory_space> - mvu(dom, "mesh"); + auto domainView = bpMesh.getDomainView(domId); // Create nodal function data with ghosts like node coords. - mvu.createField(strat.functionName(), - "vertex", - conduit::DataType::float64(mvu.getCoordsCountWithGhosts()), - mvu.getCoordsStrides(), - mvu.getCoordsOffsets()); + domainView.createField(strat.functionName(), + "vertex", + conduit::DataType::float64(domainView.getCoordsCountWithGhosts()), + domainView.getCoordsStrides(), + domainView.getCoordsOffsets()); } for(int domId = 0; domId < bpMesh.domainCount(); ++domId) { - conduit::Node& dom = bpMesh.domain(domId); - axom::quest::MeshViewUtil::memory_space> - mvu(dom, "mesh"); - const auto coordsViews = mvu.getConstCoordsViews(false); - axom::ArrayView fieldView = - mvu.template getFieldView(strat.functionName(), false); + auto domainView = bpMesh.getDomainView(domId); + const auto coordsViews = domainView.getConstCoordsViews(false); + axom::ArrayView fieldView = + domainView.template getFieldView(strat.functionName(), false); for(int d = 0; d < DIM; ++d) { SLIC_ASSERT(coordsViews[d].shape() == fieldView.shape()); @@ -969,9 +966,9 @@ struct ContourTestBase } template typename std::enable_if::type populateNodalDistance( - const axom::StackArray, DIM>& + const axom::StackArray, DIM>& coordsViews, - axom::ArrayView& fieldView, + axom::ArrayView& fieldView, ContourTestStrategy& strat) { const auto& fieldShape = fieldView.shape(); @@ -996,9 +993,9 @@ struct ContourTestBase template typename std::enable_if::type populateNodalDistance( - const axom::StackArray, DIM>& + const axom::StackArray, DIM>& coordsViews, - axom::ArrayView& fieldView, + axom::ArrayView& fieldView, ContourTestStrategy& strat) { const auto& fieldShape = fieldView.shape(); @@ -1024,13 +1021,6 @@ struct ContourTestBase } } -#if 0 - /* - TODO: Additional tests: - - surface points should lie on computational mesh edges. - - computational cells stradling contourVal should be - parents to at least 1 contour mesh cell. - */ /** Check for errors in the surface contour mesh. - analytical scalar value at surface points should be @@ -1048,41 +1038,47 @@ struct ContourTestBase contourMesh.createField(diffField, axom::mint::NODE_CENTERED); } - double tol = errorTolerance(); int errCount = 0; - const axom::IndexType nodeCount = contourMesh.getNumberOfNodes(); - PointType pt; - for(axom::IndexType i = 0; i < nodeCount; ++i) + for(axom::IndexType iStrat = 0; iStrat < m_testStrategies.size(); ++iStrat) { - contourMesh.getNode(i, pt.data()); - double analyticalVal = m_testStrategy->valueAt(pt); - double diff = std::abs(analyticalVal - contourVal); - if(diffPtr) - { - diffPtr[i] = diff; - } - if(diff > tol) + auto contourNodeBegin = DIM * m_strategyFacetPrefixSum[iStrat]; + auto contourNodeEnd = DIM * m_strategyFacetPrefixSum[iStrat + 1]; + + auto& strategy = *m_testStrategies[iStrat]; + double tol = strategy.errorTolerance(); + + PointType pt; + for(axom::IndexType iNode = contourNodeBegin; iNode < contourNodeEnd; ++iNode) { - ++errCount; - SLIC_INFO_IF( - params.isVerbose(), - axom::fmt::format( - "checkContourSurface: node {} at {} has dist {}, off by {}", - i, - pt, - analyticalVal, - diff)); + contourMesh.getNode(iNode, pt.data()); + double analyticalVal = strategy.valueAt(pt); + double diff = std::abs(analyticalVal - contourVal); + if(diffPtr) + { + diffPtr[iNode] = diff; + } + if(diff > tol) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format( + "checkContourSurface: node {} at {} has dist {}, off by {}", + iNode, + pt, + analyticalVal, + diff)); + } } + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format( + "checkContourSurface: found {} errors outside tolerance of {}", + errCount, + tol)); } - SLIC_INFO_IF( - params.isVerbose(), - axom::fmt::format( - "checkContourSurface: found {} errors outside tolerance of {}", - errCount, - tol)); return errCount; } -#endif //!@brief Get view of output domain id data. axom::ArrayView getDomainIdView( @@ -1140,33 +1136,31 @@ struct ContourTestBase axom::mint::UnstructuredMesh& contourMesh) { int errCount = 0; - const axom::IndexType cellCount = contourMesh.getNumberOfCells(); auto parentCellIdView = get_parent_cell_id_view(contourMesh); auto domainIdView = getDomainIdView(contourMesh); const axom::IndexType domainCount = computationalMesh.domainCount(); - axom::Array::ConstCoordsViewsType> + axom::Array::ConstCoordsViewsType> allCoordsViews(domainCount); - for(int n = 0; n < domainCount; ++n) + for(int iDomain = 0; iDomain < domainCount; ++iDomain) { - const auto& dom = computationalMesh.domain(n); - axom::quest::MeshViewUtil mvu(dom, "mesh"); - allCoordsViews[n] = mvu.getConstCoordsViews(false); + auto domainView = computationalMesh.getDomainView(iDomain); + allCoordsViews[iDomain] = domainView.getConstCoordsViews(false); } std::map domainIdToContiguousId; - for(int n = 0; n < domainCount; ++n) + for(int iDomain = 0; iDomain < domainCount; ++iDomain) { - const auto& dom = computationalMesh.domain(n); - axom::quest::MarchingCubes::DomainIdType domainId = n; + const auto& dom = computationalMesh.domain(iDomain); + axom::quest::MarchingCubes::DomainIdType domainId = iDomain; if(dom.has_path("state/domain_id")) { domainId = dom.fetch_existing("state/domain_id").value(); } - domainIdToContiguousId[domainId] = n; + domainIdToContiguousId[domainId] = iDomain; } // Indexers to transltate between flat and multidim indices. @@ -1181,70 +1175,75 @@ struct ContourTestBase .slowestDirs()); } - for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; - ++contourCellNum) + for(axom::IndexType iStrat = 0; iStrat < m_testStrategies.size(); ++iStrat) { - axom::quest::MarchingCubes::DomainIdType domainId = - domainIdView[contourCellNum]; - axom::quest::MarchingCubes::DomainIdType contiguousIndex = - domainIdToContiguousId[domainId]; - typename axom::quest::MeshViewUtil::ConstCoordsViewsType& - coordsViews = allCoordsViews[contiguousIndex]; - - axom::IndexType parentCellId = parentCellIdView[contourCellNum]; - - axom::StackArray parentCellIdx = - indexers[contiguousIndex].toMultiIndex(parentCellId); - axom::StackArray upperIdx = parentCellIdx; - addToStackArray(upperIdx, 1); - - PointType lower, upper; - for(int d = 0; d < DIM; ++d) - { - lower[d] = coordsViews[d][parentCellIdx]; - upper[d] = coordsViews[d][upperIdx]; - } - axom::primal::BoundingBox parentCellBox(lower, upper); - auto tol = axom::numerics::floating_point_limits::epsilon(); - axom::primal::BoundingBox big(parentCellBox); - big.expand(tol); - axom::primal::BoundingBox small(parentCellBox); - auto range = parentCellBox.range(); - bool checkSmall = range >= tol; - if (checkSmall) + auto contourCellBegin = m_strategyFacetPrefixSum[iStrat]; + auto contourCellEnd = m_strategyFacetPrefixSum[iStrat + 1]; + for(axom::IndexType iContourCell = contourCellBegin; iContourCell < contourCellEnd; + ++iContourCell) { - small.expand(-tol); - } + axom::quest::MarchingCubes::DomainIdType domainId = + domainIdView[iContourCell]; + axom::quest::MarchingCubes::DomainIdType contiguousIndex = + domainIdToContiguousId[domainId]; + typename axom::quest::MeshViewUtil::ConstCoordsViewsType& + coordsViews = allCoordsViews[contiguousIndex]; - axom::IndexType* cellNodeIds = contourMesh.getCellNodeIDs(contourCellNum); - const axom::IndexType cellNodeCount = - contourMesh.getNumberOfCellNodes(contourCellNum); + axom::IndexType parentCellId = parentCellIdView[iContourCell]; - for(axom::IndexType nn = 0; nn < cellNodeCount; ++nn) - { - PointType nodeCoords; - contourMesh.getNode(cellNodeIds[nn], nodeCoords.data()); + axom::StackArray parentCellIdx = + indexers[contiguousIndex].toMultiIndex(parentCellId); + axom::StackArray upperIdx = parentCellIdx; + addToStackArray(upperIdx, 1); - if(!big.contains(nodeCoords)) + PointType lower, upper; + for(int d = 0; d < DIM; ++d) { - ++errCount; - SLIC_INFO_IF( - params.isVerbose(), - axom::fmt::format("checkContourCellLimits: node {} at {} " - "too far outside parent cell boundary.", - cellNodeIds[nn], - nodeCoords)); + lower[d] = coordsViews[d][parentCellIdx]; + upper[d] = coordsViews[d][upperIdx]; + } + axom::primal::BoundingBox parentCellBox(lower, upper); + auto tol = axom::numerics::floating_point_limits::epsilon(); + axom::primal::BoundingBox big(parentCellBox); + big.expand(tol); + axom::primal::BoundingBox small(parentCellBox); + auto range = parentCellBox.range(); + bool checkSmall = range >= tol; + if (checkSmall) + { + small.expand(-tol); } - if(checkSmall && small.contains(nodeCoords)) + axom::IndexType* cellNodeIds = contourMesh.getCellNodeIDs(iContourCell); + const axom::IndexType cellNodeCount = + contourMesh.getNumberOfCellNodes(iContourCell); + + for(axom::IndexType nn = 0; nn < cellNodeCount; ++nn) { - ++errCount; - SLIC_INFO_IF( - params.isVerbose(), - axom::fmt::format("checkContourCellLimits: node {} at {} " - "too far inside parent cell boundary.", - cellNodeIds[nn], - nodeCoords)); + PointType nodeCoords; + contourMesh.getNode(cellNodeIds[nn], nodeCoords.data()); + + if(!big.contains(nodeCoords)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("checkContourCellLimits: node {} at {} " + "too far outside parent cell boundary.", + cellNodeIds[nn], + nodeCoords)); + } + + if(checkSmall && small.contains(nodeCoords)) + { + ++errCount; + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format("checkContourCellLimits: node {} at {} " + "too far inside parent cell boundary.", + cellNodeIds[nn], + nodeCoords)); + } } } } @@ -1256,7 +1255,6 @@ struct ContourTestBase return errCount; } -#if 0 /*! Check that computational cells that contain the contour value have at least one contour mesh cell. @@ -1266,137 +1264,150 @@ struct ContourTestBase axom::mint::UnstructuredMesh& contourMesh) { int errCount = 0; - const axom::IndexType cellCount = contourMesh.getNumberOfCells(); auto parentCellIdView = get_parent_cell_id_view(contourMesh); auto domainIdView = getDomainIdView(contourMesh); const axom::IndexType domainCount = computationalMesh.domainCount(); + // + // Compute mapping to look up domains from the domain id. + // + std::map domainIdToContiguousId; + for(axom::quest::MarchingCubes::DomainIdType iDomain = 0; iDomain < domainCount; ++iDomain) + { + const auto& dom = computationalMesh.domain(iDomain); + axom::quest::MarchingCubes::DomainIdType domainId = iDomain; + if(dom.has_path("state/domain_id")) + { + domainId = dom.fetch_existing("state/domain_id").value(); + } + domainIdToContiguousId[domainId] = iDomain; + } + /* - Space to store function views and whether a computational cell - contains the contour. We set these up for all domains ahead - of time for accessing as needed later. cellIndexers are for - converting between flat and multidim indices. + If strategy iStrat creates a contour through cell cellId of + domain contiguousDomainId, then set bit iStrat in hasContours: + hasContours[contiguousDomainId][cellId] & (1 < iStrat). */ axom::Array> fcnViews( domainCount); axom::Array> cellIndexers( domainCount); - axom::Array> hasContours(domainCount); + axom::Array> hasContours(domainCount); for(axom::IndexType domId = 0; domId < domainCount; ++domId) { - const auto& dom = computationalMesh.domain(domId); - axom::quest::MeshViewUtil mvu(dom, "mesh"); + axom::quest::MeshViewUtil domainView = computationalMesh.getDomainView(domId); - const axom::IndexType cellCount = mvu.getCellCount(); + const axom::IndexType cellCount = domainView.getCellCount(); - axom::Array& hasContour = hasContours[domId]; - hasContour.resize(cellCount, false); - - fcnViews[domId] = - mvu.template getConstFieldView(functionName(), false); - cellIndexers[domId].initializeShape( - mvu.getCellShape(), - axom::ArrayIndexer(fcnViews[domId].strides()) - .slowestDirs()); + axom::Array& hasContour = hasContours[domId]; + hasContour.resize(cellCount, 0); } - std::map domainIdToContiguousId; - for(axom::quest::MarchingCubes::DomainIdType n = 0; n < domainCount; ++n) + for(int iStrat = 0; iStrat < m_testStrategies.size(); ++iStrat) { - const auto& dom = computationalMesh.domain(n); - axom::quest::MarchingCubes::DomainIdType domainId = n; - if(dom.has_path("state/domain_id")) + auto contourCellBegin = m_strategyFacetPrefixSum[iStrat]; + auto contourCellEnd = m_strategyFacetPrefixSum[iStrat + 1]; + axom::IndexType bitFlag = (1 << iStrat); + for(axom::IndexType iContourCell = contourCellBegin; iContourCell < contourCellEnd; + ++iContourCell) { - domainId = dom.fetch_existing("state/domain_id").value(); + axom::quest::MarchingCubes::DomainIdType domainId = + domainIdView[iContourCell]; + axom::quest::MarchingCubes::DomainIdType contiguousId = + domainIdToContiguousId[domainId]; + const axom::IndexType parentCellId = parentCellIdView[iContourCell]; + hasContours[contiguousId][parentCellId] |= bitFlag; } - domainIdToContiguousId[domainId] = n; - } - - for(axom::IndexType contourCellNum = 0; contourCellNum < cellCount; - ++contourCellNum) - { - axom::quest::MarchingCubes::DomainIdType domainId = - domainIdView[contourCellNum]; - axom::quest::MarchingCubes::DomainIdType contiguousId = - domainIdToContiguousId[domainId]; - const axom::IndexType parentCellId = parentCellIdView[contourCellNum]; - hasContours[contiguousId][parentCellId] = true; } // Verify that cells marked by hasContours touches the contour // and other cells don't. for(axom::IndexType domId = 0; domId < domainCount; ++domId) { - const auto& dom = computationalMesh.domain(domId); - axom::quest::MeshViewUtil mvu(dom, "mesh"); + auto domainView = computationalMesh.getDomainView(domId); axom::StackArray domLengths; computationalMesh.domainLengths(domId, domLengths); - assert(domLengths == mvu.getRealExtents("element")); + assert(domLengths == domainView.getRealExtents("element")); - const auto& fcnView = fcnViews[domId]; + const axom::IndexType parentCellCount = domainView.getCellCount(); + // axom::Array hasContour(parentCellCount, parentCellCount); - const axom::ArrayIndexer& cellIndexer = - cellIndexers[domId]; - const axom::IndexType cellCount = product(domLengths); - for(axom::IndexType cellId = 0; cellId < cellCount; ++cellId) + for(axom::IndexType parentCellId = 0; parentCellId < parentCellCount; ++parentCellId) { - axom::StackArray cellIdx = - cellIndexer.toMultiIndex(cellId); - - // Compute min and max function value in the cell. - double minFcnValue = std::numeric_limits::max(); - double maxFcnValue = std::numeric_limits::min(); - constexpr short int cornerCount = - (1 << DIM); // Number of nodes in a cell. - for(short int cornerId = 0; cornerId < cornerCount; ++cornerId) + const axom::IndexType hasContourBits = hasContours[domId][parentCellId]; + + for(axom::IndexType iStrat = 0; iStrat < m_testStrategies.size(); ++iStrat) { - // Compute multidim index of current corner of parent cell. - axom::StackArray cornerIdx = cellIdx; - for(int d = 0; d < DIM; ++d) + auto& strategy = *m_testStrategies[iStrat]; + const axom::IndexType iStratBit = (1 << iStrat); + + const auto& fcnView = + domainView.template getConstFieldView(strategy.functionName(), false); + + axom::ArrayIndexer + cellIndexer(domLengths, + axom::ArrayIndexer(fcnView.strides())); + + axom::StackArray parentCellIdx = + cellIndexer.toMultiIndex(parentCellId); + + // Compute min and max function values in the cell. + double minFcnValue = std::numeric_limits::max(); + double maxFcnValue = std::numeric_limits::min(); + constexpr short int cornerCount = + (1 << DIM); // Number of nodes in a cell. + for(short int cornerId = 0; cornerId < cornerCount; ++cornerId) { - if(cornerId & (1 << d)) + // Compute multidim index of current corner of parent cell. + axom::StackArray cornerIdx = parentCellIdx; + for(int d = 0; d < DIM; ++d) { - ++cornerIdx[d]; + if(cornerId & (1 << d)) + { + ++cornerIdx[d]; + } } + + double fcnValue = fcnView[cornerIdx]; + minFcnValue = std::min(minFcnValue, fcnValue); + maxFcnValue = std::max(maxFcnValue, fcnValue); } - double fcnValue = fcnView[cornerIdx]; - minFcnValue = std::min(minFcnValue, fcnValue); - maxFcnValue = std::max(maxFcnValue, fcnValue); - } + const bool hasContour = hasContourBits & iStratBit; - // If the min or max values in the cell is close to params.contourVal - // touchesContour and hasCont can go either way. So don't check. - if(minFcnValue != params.contourVal && maxFcnValue != params.contourVal) - { - const bool touchesContour = (minFcnValue <= params.contourVal && - maxFcnValue >= params.contourVal); - const bool hasCont = hasContours[domId][cellId]; - if(touchesContour != hasCont) + bool touchesContour = (minFcnValue <= params.contourVal && + maxFcnValue >= params.contourVal); + // If the min or max values in the cell is close to params.contourVal + // touchesContour and hasCont can go either way. So give it a pass. + if(minFcnValue == params.contourVal || maxFcnValue == params.contourVal) + { + touchesContour = hasContour; + } + + if(touchesContour != hasContour) { ++errCount; SLIC_INFO_IF(params.isVerbose(), axom::fmt::format( "checkCellsContainingContour: cell {}: hasContour " - "({}) and touchesContour ({}) don't agree.", - cellIdx, - hasCont, - touchesContour)); + "({}) and touchesContour ({}) don't agree for strategy {}.", + parentCellIdx, + hasContour, + touchesContour, + strategy.testName())); } } } } - SLIC_INFO_IF(params.isVerbose(), axom::fmt::format("checkCellsContainingContour: found {} " "misrepresented computational cells.", errCount)); return errCount; } -#endif }; template @@ -1491,107 +1502,6 @@ struct GyroidTestStrategy : public ContourTestStrategy { double _errTol; }; - -#if 0 -template -void populateNodalDistance( - const axom::StackArray, DIM>& coordsViews, - axom::ArrayView& fieldView, - const ContourTestStrategy& strat); - -template -void computeNodalDistance(BlueprintStructuredMesh& bpMesh, - const ContourTestStrategy& strat) -{ - SLIC_ASSERT(bpMesh.dimension() == DIM); - for(int domId = 0; domId < bpMesh.domainCount(); ++domId) - { - conduit::Node& dom = bpMesh.domain(domId); - axom::quest::MeshViewUtil::memory_space> - mvu(dom, "mesh"); - - // Create nodal function data with ghosts like node coords. - mvu.createField(strat.functionName(), - "vertex", - conduit::DataType::float64(mvu.getCoordsCountWithGhosts()), - mvu.getCoordsStrides(), - mvu.getCoordsOffsets()); - } - - for(int domId = 0; domId < bpMesh.domainCount(); ++domId) - { - conduit::Node& dom = bpMesh.domain(domId); - axom::quest::MeshViewUtil::memory_space> - mvu(dom, "mesh"); - const auto coordsViews = mvu.getConstCoordsViews(false); - axom::ArrayView::memory_space> fieldView = - mvu.template getFieldView(strat.functionName(), false); - for(int d = 0; d < DIM; ++d) - { - SLIC_ASSERT(coordsViews[d].shape() == fieldView.shape()); - } - populateNodalDistance(coordsViews, fieldView, strat); - } -} - -template <> -void populateNodalDistance<2>( - const axom::StackArray::memory_space>, 2>& coordsViews, - axom::ArrayView& fieldView, - const ContourTestStrategy<2>& strat) -{ - using PointType = axom::primal::Point; - const auto& fieldShape = fieldView.shape(); - for(int d = 0; d < 2; ++d) - { - SLIC_ASSERT(coordsViews[d].shape() == fieldShape); - } - - for(axom::IndexType j = 0; j < fieldShape[1]; ++j) - { - for(axom::IndexType i = 0; i < fieldShape[0]; ++i) - { - PointType pt; - for(int d = 0; d < 2; ++d) - { - pt[d] = coordsViews[d](i, j); - } - fieldView(i, j) = strat.valueAt(pt); - } - } -} - -template <> -void populateNodalDistance<3>( - const axom::StackArray::memory_space>, 3>& coordsViews, - axom::ArrayView& fieldView, - const ContourTestStrategy<3>& strat) -{ - using PointType = axom::primal::Point; - const auto& fieldShape = fieldView.shape(); - for(int d = 0; d < 3; ++d) - { - SLIC_ASSERT(coordsViews[d].shape() == fieldShape); - } - - for(axom::IndexType k = 0; k < fieldShape[2]; ++k) - { - for(axom::IndexType j = 0; j < fieldShape[1]; ++j) - { - for(axom::IndexType i = 0; i < fieldShape[0]; ++i) - { - PointType pt; - for(int d = 0; d < 3; ++d) - { - pt[d] = coordsViews[d](i, j, k); - } - fieldView(i, j, k) = strat.valueAt(pt); - } - } - } -} -#endif - /// int allocatorIdToTest(axom::runtime_policy::Policy policy) { @@ -1679,9 +1589,6 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) // params specify which tests to run. //--------------------------------------------------------------------------- - std::shared_ptr> planarTest; - std::shared_ptr> roundTest; - std::shared_ptr> gyroidTest; std::shared_ptr> planarStrat; std::shared_ptr> roundStrat; std::shared_ptr> gyroidStrat; @@ -1692,20 +1599,14 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) { planarStrat = std::make_shared>(params.planeNormal(), params.inplanePoint()); - planarTest = std::make_shared>(); - planarTest->addTestStrategy(planarStrat); contourTest.addTestStrategy(planarStrat); - // computeNodalDistance(computationalMesh, *planarStrat); } if(params.usingRound()) { roundStrat = std::make_shared>(params.roundContourCenter()); roundStrat->setToleranceByLongestEdge(computationalMesh); - roundTest = std::make_shared>(); - roundTest->addTestStrategy(roundStrat); contourTest.addTestStrategy(roundStrat); - // computeNodalDistance(computationalMesh, *roundStrat); } if(params.usingGyroid()) @@ -1713,10 +1614,7 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) gyroidStrat = std::make_shared>(params.gyroidScaleFactor(), params.contourVal); gyroidStrat->setToleranceByLongestEdge(computationalMesh); - gyroidTest = std::make_shared>(); - gyroidTest->addTestStrategy(gyroidStrat); contourTest.addTestStrategy(gyroidStrat); - // computeNodalDistance(computationalMesh, *gyroidStrat); } if(params.isVerbose()) @@ -1730,26 +1628,6 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) int localErrCount = 0; localErrCount += contourTest.runTest(computationalMesh); -#if 0 - if(planarTest) - { - localErrCount += contourTest.runTest(computationalMesh); - } - slic::flushStreams(); - - if(roundTest) - { - localErrCount += contourTest.runTest(computationalMesh); - } - slic::flushStreams(); - - if(gyroidTest) - { - localErrCount += contourTest.runTest(computationalMesh); - } - slic::flushStreams(); -#endif - // Check results int errCount = 0; From fcfb99e69668669125b36c3c03b55519ae1e4223 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 29 Feb 2024 10:45:43 -0800 Subject: [PATCH 563/639] Let ArrayIndexer handle non-unit fastest strides. --- src/axom/quest/ArrayIndexer.hpp | 22 ++++++---- src/axom/quest/tests/quest_array_indexer.cpp | 45 +++++++------------- 2 files changed, 29 insertions(+), 38 deletions(-) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index bd493d134e..f4a797a8f9 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -17,10 +17,10 @@ namespace axom { struct ArrayStrideOrder { - static constexpr int NEITHER = 0; // Neither row nor column + static constexpr int ARBITRARY = 0; // Neither row nor column static constexpr int ROW = 1; // Row-major static constexpr int COLUMN = 2; // Column-major - static constexpr int BOTH = ROW | COLUMN; // Only for 1D arrays + static constexpr int BOTH = ROW | COLUMN; // 1D arrays are both }; /*! @@ -40,10 +40,13 @@ class ArrayIndexer @brief Constructor for row- or column-major indexing. @param [in] shape Shape of the array @param [in] order: c is column major; r is row major. + @param [in] fastestStrideLength: Stride in the fastest + direction. */ - ArrayIndexer(const axom::StackArray& shape, int order) + ArrayIndexer(const axom::StackArray& shape, int order, + int fastestStrideLength = 1) { - initializeShape(shape, order); + initializeShape(shape, order, fastestStrideLength); } /*! @@ -101,9 +104,12 @@ class ArrayIndexer @brief Initialize for row- or column-major indexing. @param [in] shape Shape of the array @param [in] order: c is column major; r is row major. + @param [in] fastestStrideLength: Stride in the fastest + direction. */ inline AXOM_HOST_DEVICE void initializeShape(const axom::StackArray& shape, - int order) + int order, + int fastestStrideLength = 1) { SLIC_ASSERT(order == ArrayStrideOrder::COLUMN || order == ArrayStrideOrder::ROW); @@ -113,7 +119,7 @@ class ArrayIndexer { m_slowestDirs[d] = DIM - 1 - d; } - m_strides[0] = 1; + m_strides[0] = fastestStrideLength; for(int d = 1; d < DIM; ++d) { m_strides[d] = m_strides[d - 1] * shape[d - 1]; @@ -125,14 +131,12 @@ class ArrayIndexer { m_slowestDirs[d] = d; } - m_strides[DIM - 1] = 1; + m_strides[DIM - 1] = fastestStrideLength; for(int d = DIM - 2; d >= 0; --d) { m_strides[d] = m_strides[d + 1] * shape[d + 1]; } } - SLIC_ASSERT((DIM == 1 && getStrideOrder() == ArrayStrideOrder::BOTH) || - (getStrideOrder() == order)); } /*! diff --git a/src/axom/quest/tests/quest_array_indexer.cpp b/src/axom/quest/tests/quest_array_indexer.cpp index 4e3b3b4172..c637c7d0bf 100644 --- a/src/axom/quest/tests/quest_array_indexer.cpp +++ b/src/axom/quest/tests/quest_array_indexer.cpp @@ -20,8 +20,7 @@ TEST(quest_array_indexer, quest_strides_and_permutations) axom::StackArray lengths {2}; axom::ArrayIndexer colIndexer( - lengths, - int(axom::ArrayStrideOrder::COLUMN)); + lengths, axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(colIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::BOTH)); axom::StackArray colSlowestDirs {0}; axom::StackArray colStrides {1}; @@ -35,8 +34,7 @@ TEST(quest_array_indexer, quest_strides_and_permutations) (axom::ArrayIndexer(lengths, colSlowestDirs))); axom::ArrayIndexer rowIndexer( - lengths, - int(axom::ArrayStrideOrder::ROW)); + lengths, axom::ArrayStrideOrder::ROW); EXPECT_EQ(rowIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::BOTH)); axom::StackArray rowSlowestDirs {0}; axom::StackArray rowStrides {1}; @@ -55,8 +53,7 @@ TEST(quest_array_indexer, quest_strides_and_permutations) axom::StackArray lengths {3, 2}; axom::ArrayIndexer colIndexer( - lengths, - int(axom::ArrayStrideOrder::COLUMN)); + lengths, axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(colIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); axom::StackArray colSlowestDirs {0, 1}; axom::StackArray colStrides {2, 1}; @@ -67,8 +64,7 @@ TEST(quest_array_indexer, quest_strides_and_permutations) } axom::ArrayIndexer rowIndexer( - lengths, - int(axom::ArrayStrideOrder::ROW)); + lengths, axom::ArrayStrideOrder::ROW); EXPECT_EQ(rowIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); axom::StackArray rowSlowestDirs {1, 0}; axom::StackArray rowStrides {1, 3}; @@ -84,8 +80,7 @@ TEST(quest_array_indexer, quest_strides_and_permutations) axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer colIndexer( - lengths, - int(axom::ArrayStrideOrder::COLUMN)); + lengths, axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(colIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); axom::StackArray colSlowestDirs {0, 1, 2}; axom::StackArray colStrides {6, 2, 1}; @@ -96,8 +91,7 @@ TEST(quest_array_indexer, quest_strides_and_permutations) } axom::ArrayIndexer rowIndexer( - lengths, - int(axom::ArrayStrideOrder::ROW)); + lengths, axom::ArrayStrideOrder::ROW); EXPECT_EQ(rowIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); axom::StackArray rowSlowestDirs {2, 1, 0}; axom::StackArray rowStrides {1, 5, 15}; @@ -117,10 +111,8 @@ TEST(quest_array_indexer, quest_col_major_offset) constexpr int DIM = 1; axom::StackArray lengths {3}; axom::ArrayIndexer ai( - lengths, - int(axom::ArrayStrideOrder::COLUMN)); - EXPECT_EQ(ai.getStrideOrder(), - int(axom::ArrayStrideOrder::COLUMN) | axom::ArrayStrideOrder::ROW); + lengths, axom::ArrayStrideOrder::COLUMN); + EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::BOTH)); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -135,8 +127,7 @@ TEST(quest_array_indexer, quest_col_major_offset) constexpr int DIM = 2; axom::StackArray lengths {3, 2}; axom::ArrayIndexer ai( - lengths, - int(axom::ArrayStrideOrder::COLUMN)); + lengths, axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) @@ -154,8 +145,7 @@ TEST(quest_array_indexer, quest_col_major_offset) // 3D axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer ai( - lengths, - int(axom::ArrayStrideOrder::COLUMN)); + lengths, axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) @@ -182,9 +172,8 @@ TEST(quest_array_indexer, quest_row_major_offset) constexpr int DIM = 1; axom::StackArray lengths {3}; axom::ArrayIndexer ai(lengths, - int(axom::ArrayStrideOrder::ROW)); - EXPECT_EQ(ai.getStrideOrder(), - int(axom::ArrayStrideOrder::ROW) | axom::ArrayStrideOrder::COLUMN); + axom::ArrayStrideOrder::ROW); + EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::BOTH)); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -199,7 +188,7 @@ TEST(quest_array_indexer, quest_row_major_offset) constexpr int DIM = 2; axom::StackArray lengths {3, 2}; axom::ArrayIndexer ai(lengths, - int(axom::ArrayStrideOrder::ROW)); + axom::ArrayStrideOrder::ROW); EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); axom::IndexType offset = 0; for(int j = 0; j < lengths[1]; ++j) @@ -218,7 +207,7 @@ TEST(quest_array_indexer, quest_row_major_offset) constexpr int DIM = 3; axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer ai(lengths, - int(axom::ArrayStrideOrder::ROW)); + axom::ArrayStrideOrder::ROW); EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); axom::IndexType offset = 0; for(int k = 0; k < lengths[2]; ++k) @@ -408,8 +397,7 @@ TEST(quest_array_indexer, quest_array_match) axom::StackArray lengths {3, 2}; axom::Array a(lengths); axom::ArrayIndexer ai( - lengths, - int(axom::ArrayStrideOrder::COLUMN)); + lengths, axom::ArrayStrideOrder::COLUMN); for(axom::IndexType i = 0; i < lengths[0]; ++i) { for(axom::IndexType j = 0; j < lengths[1]; ++j) @@ -424,8 +412,7 @@ TEST(quest_array_indexer, quest_array_match) axom::StackArray lengths {5, 3, 2}; axom::Array a(lengths); axom::ArrayIndexer ai( - lengths, - int(axom::ArrayStrideOrder::COLUMN)); + lengths, axom::ArrayStrideOrder::COLUMN); for(axom::IndexType i = 0; i < lengths[0]; ++i) { for(axom::IndexType j = 0; j < lengths[1]; ++j) From cec01a0b743802acb635b078e3fc1537faa62212 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 29 Feb 2024 15:39:31 -0800 Subject: [PATCH 564/639] Update comments for MarchingCubes constructor and setMesh. --- src/axom/quest/MarchingCubes.hpp | 33 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 629b01d43c..c11c57ee05 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -106,10 +106,10 @@ class MarchingCubes { public: using RuntimePolicy = axom::runtime_policy::Policy; - using DomainIdType = int; + using DomainIdType = axom::IndexType; /*! - \brief Constructor sets up computational mesh and data for running the - marching cubes algorithm. + \brief Constructor sets up runtime preferences for the marching + cubes implementation. \param [in] runtimePolicy A value from RuntimePolicy. The simplest policy is RuntimePolicy::seq, which specifies @@ -117,34 +117,29 @@ class MarchingCubes \param [in] allocatorID Data allocator ID. Choose something compatible with \c runtimePolicy. See \c execution_space. \param [in] dataParallelism Data parallel implementation choice. + */ + MarchingCubes(RuntimePolicy runtimePolicy, + int allocatorId, + MarchingCubesDataParallelism dataParallelism); + + /*! + @brief Set the input mesh. \param [in] bpMesh Blueprint multi-domain mesh containing scalar field. \param [in] topologyName Name of Blueprint topology to use in \a bpMesh. \param [in] maskField Cell-based std::int32_t mask field. If provided, cells where this field evaluates to false are skipped. Array data in \a dom must be accessible in the \a runtimePolicy - environment. It's an error if not, e.g., using CPU memory with - a GPU policy. - - Some metadata from \a bpMesh may be cached by the constructor. - Any change to it after the constructor leads to undefined behavior. + environment specified in the constructor. It's an error if not, + e.g., using CPU memory with a GPU policy. - The mesh coordinates should be contiguous. See - conduit::blueprint::is_contiguous(). In the future, this - requirement may be relaxed, possibly at the cost of a - transformation and storage of the temporary contiguous layout. + Some metadata from \a bpMesh may be cached. Any change to it + after setMesh() leads to undefined behavior. Blueprint allows users to specify ids for the domains. If "state/domain_id" exists in the domains, it is used as the domain id. Otherwise, the domain's interation index within the multidomain mesh is used. - */ - MarchingCubes(RuntimePolicy runtimePolicy, - int allocatorId, - MarchingCubesDataParallelism dataParallelism); - - /*! - @brief Set the input mesh. @see clearMesh() */ From f34ef4fdcaa99f0ac1e60157f0631315b51ecafe Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 1 Mar 2024 15:08:46 -0800 Subject: [PATCH 565/639] Add domain ids to the data relinquished. --- src/axom/quest/MarchingCubes.hpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index c11c57ee05..834e3f7f06 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -247,8 +247,6 @@ class MarchingCubes return m_facetDomainIds.view(); } - #if 1 - // Is there a use case for this? /*! @brief Give caller posession of the contour data. @@ -256,20 +254,24 @@ class MarchingCubes to stay in scope after the MarchingCubes object is deleted. @pre isoContour() must have been called. - @post outputs can no longer be accessed from object. + @post outputs can no longer be accessed from object, as though + clearOutput() has been called. */ void relinquishContourData(axom::Array &facetNodeIds, axom::Array &facetNodeCoords, - axom::Array &facetParentIds) + axom::Array &facetParentIds, + axom::Array& facetDomainIds) { + facetNodeIds.clear(); + facetNodeCoords.clear(); + facetParentIds.clear(); + facetDomainIds.clear(); + facetNodeIds.swap(m_facetNodeIds); facetNodeCoords.swap(m_facetNodeCoords); facetParentIds.swap(m_facetParentIds); - m_facetNodeIds.clear(); - m_facetNodeCoords.clear(); - m_facetParentIds.clear(); + facetDomainIds.swap(m_facetDomainIds); } - #endif //@} /*! From ab4ab927027a9511bfc75fb3dca80b3944aca58f Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Sat, 2 Mar 2024 17:56:20 -0800 Subject: [PATCH 566/639] Zero out m_facetCount after relinquishing output data. Test for zero otuput. Silence waring. --- .../mint/mesh/internal/ConnectivityArrayHelpers.hpp | 4 ++-- src/axom/quest/MarchingCubes.hpp | 3 ++- .../quest/examples/quest_marching_cubes_example.cpp | 12 ++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/axom/mint/mesh/internal/ConnectivityArrayHelpers.hpp b/src/axom/mint/mesh/internal/ConnectivityArrayHelpers.hpp index cfbe757be2..eac075d62f 100644 --- a/src/axom/mint/mesh/internal/ConnectivityArrayHelpers.hpp +++ b/src/axom/mint/mesh/internal/ConnectivityArrayHelpers.hpp @@ -137,8 +137,8 @@ inline CellType initializeFromGroup( "sidre::Group " << group->getPathName() << " does not conform to mesh blueprint."); - sidre::View* type_view = elems_group->getView("types"); - m_types = std::make_unique>(type_view); + sidre::View* elem_type_view = elems_group->getView("types"); + m_types = std::make_unique>(elem_type_view); } return cell_type; diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 834e3f7f06..6e8fda8064 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -253,7 +253,7 @@ class MarchingCubes This efficiently turns the generated contour data to the caller, to stay in scope after the MarchingCubes object is deleted. - @pre isoContour() must have been called. + @pre computeIsocontour() must have been called. @post outputs can no longer be accessed from object, as though clearOutput() has been called. */ @@ -266,6 +266,7 @@ class MarchingCubes facetNodeCoords.clear(); facetParentIds.clear(); facetDomainIds.clear(); + m_facetCount = 0; facetNodeIds.swap(m_facetNodeIds); facetNodeCoords.swap(m_facetNodeCoords); diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index b75df0e378..7d95745044 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -890,6 +890,18 @@ struct ContourTestBase extractTimer.stop(); printTimingStats(extractTimer, "extract"); + { + axom::Array facetNodeIds; + axom::Array facetNodeCoords; + axom::Array facetParentIds; + axom::Array facetDomainIds; + mc.relinquishContourData( facetNodeIds, + facetNodeCoords, + facetParentIds, + facetDomainIds ); + SLIC_ASSERT(mc.getContourFacetCount() == 0); + } + int localErrCount = 0; if(params.checkResults) { From 7d488bf7c0f1f431b3f8ee2b1dd50e915e57fc17 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 4 Mar 2024 15:06:32 -0800 Subject: [PATCH 567/639] Update data submodule --- data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data b/data index 1402f87d62..400c4e5066 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 1402f87d629ce40f4fb97645e3505e53c8280b3d +Subproject commit 400c4e5066620c653b770bd84b77c326da588567 From 44dc828d57295381cb636d2e832182cf62583fce Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 4 Mar 2024 22:01:28 -0800 Subject: [PATCH 568/639] Autoformat. --- src/axom/quest/ArrayIndexer.hpp | 8 +- src/axom/quest/MarchingCubes.cpp | 8 +- src/axom/quest/MarchingCubes.hpp | 4 +- src/axom/quest/MeshViewUtil.hpp | 21 ++- src/axom/quest/detail/MarchingCubesImpl.hpp | 4 +- .../examples/quest_marching_cubes_example.cpp | 156 ++++++++++-------- src/axom/quest/tests/quest_array_indexer.cpp | 38 +++-- 7 files changed, 133 insertions(+), 106 deletions(-) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index f4a797a8f9..9f36ff3c34 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -43,7 +43,8 @@ class ArrayIndexer @param [in] fastestStrideLength: Stride in the fastest direction. */ - ArrayIndexer(const axom::StackArray& shape, int order, + ArrayIndexer(const axom::StackArray& shape, + int order, int fastestStrideLength = 1) { initializeShape(shape, order, fastestStrideLength); @@ -70,9 +71,8 @@ class ArrayIndexer @param [in] orderSource: ArrayIndex to copy stride order from. */ - ArrayIndexer( - const axom::StackArray& shape, - const axom::ArrayIndexer& orderSource) + ArrayIndexer(const axom::StackArray& shape, + const axom::ArrayIndexer& orderSource) { initializeShape(shape, orderSource); } diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 163ec92b47..6aa7e49815 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -135,11 +135,9 @@ void MarchingCubes::computeIsocontour(double contourVal) { const auto domainId = m_singles[d]->getDomainId(d); const auto domainFacetCount = - ( d < m_singles.size() - 1 ? m_facetIndexOffsets[d+1] : m_facetCount ) - - m_facetIndexOffsets[d]; - m_facetDomainIds.fill(domainId, - domainFacetCount, - m_facetIndexOffsets[d]); + (d < m_singles.size() - 1 ? m_facetIndexOffsets[d + 1] : m_facetCount) - + m_facetIndexOffsets[d]; + m_facetDomainIds.fill(domainId, domainFacetCount, m_facetIndexOffsets[d]); } } diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index 6e8fda8064..c09f43be6b 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -171,7 +171,7 @@ class MarchingCubes axom::IndexType getContourNodeCount() const; //@{ - //!@name Output methods + //!@name Output methods (experimental interface, subject to change) /*! @brief Put generated contour in a mint::UnstructuredMesh. @param mesh Output contour mesh @@ -260,7 +260,7 @@ class MarchingCubes void relinquishContourData(axom::Array &facetNodeIds, axom::Array &facetNodeCoords, axom::Array &facetParentIds, - axom::Array& facetDomainIds) + axom::Array &facetDomainIds) { facetNodeIds.clear(); facetNodeCoords.clear(); diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 0db7104ebf..9b64fab789 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -676,17 +676,19 @@ class MeshViewUtil const MdIndices& strides, const MdIndices& offsets) { - SLIC_ERROR_IF( - m_dom == nullptr, - axom::fmt::format("Cannot create field {}." - " MeshViewUtil was not constructed with a mutable domain.", fieldName)); + SLIC_ERROR_IF(m_dom == nullptr, + axom::fmt::format( + "Cannot create field {}." + " MeshViewUtil was not constructed with a mutable domain.", + fieldName)); SLIC_ERROR_IF( m_dom->has_path("fields/" + fieldName), axom::fmt::format("Cannot create field {}. It already exists.", fieldName)); SLIC_ERROR_IF( association != "vertex" && association != "element", - axom::fmt::format("MeshViewUtil doesn't support association '{}' yet.", association)); + axom::fmt::format("MeshViewUtil doesn't support association '{}' yet.", + association)); const auto& realShape = getRealExtents(association); MdIndices loPads, hiPads, paddedShape, strideOrder; @@ -756,10 +758,11 @@ class MeshViewUtil const MdIndices& hiPads, const MdIndices& strideOrder) { - SLIC_ERROR_IF( - m_dom == nullptr, - axom::fmt::format("Cannot create field {}." - " MeshViewUtil was not constructed with a mutable domain.", fieldName)); + SLIC_ERROR_IF(m_dom == nullptr, + axom::fmt::format( + "Cannot create field {}." + " MeshViewUtil was not constructed with a mutable domain.", + fieldName)); SLIC_ERROR_IF( m_dom->has_path("fields/" + fieldName), axom::fmt::format("Cannot create field {}. It already exists.", fieldName)); diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 5a6940fbf7..6e90497daa 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -98,8 +98,8 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase compatible with ExecSpace. */ AXOM_HOST void setDomain(const conduit::Node& dom, - const std::string& topologyName, - const std::string& maskFieldName) override + const std::string& topologyName, + const std::string& maskFieldName) override { // Time this due to potentially slow memory allocation AXOM_PERF_MARK_FUNCTION("MarchingCubesImpl::initialize"); diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 7d95745044..99c58ec5b1 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -694,7 +694,7 @@ static void addToStackArray(axom::StackArray& a, U b) The strategy encapsulates the scalar functions and things related to it. */ -template +template struct ContourTestStrategy { using PointType = axom::primal::Point; @@ -711,7 +711,7 @@ struct ContourTestStrategy //!@brief Return the analytical value of the scalar field. virtual double valueAt(const PointType& pt) const = 0; - virtual ~ContourTestStrategy() {} + virtual ~ContourTestStrategy() { } }; template @@ -728,7 +728,7 @@ struct ContourTestBase { } virtual ~ContourTestBase() { } - void addTestStrategy( const std::shared_ptr>& testStrategy ) + void addTestStrategy(const std::shared_ptr>& testStrategy) { m_testStrategies.push_back(testStrategy); SLIC_INFO(axom::fmt::format("Add test {}.", testStrategy->testName())); @@ -744,7 +744,7 @@ struct ContourTestBase int runTest(BlueprintStructuredMesh& computationalMesh) { // Compute the nodal distance functions. - for( const auto& strategy : m_testStrategies ) + for(const auto& strategy : m_testStrategies) { computeNodalDistance(computationalMesh, *strategy); } @@ -759,7 +759,7 @@ struct ContourTestBase computationalMesh.coordsetPath() + "/values/" + axes[d], s_allocatorId); } - for( const auto& strategy : m_testStrategies ) + for(const auto& strategy : m_testStrategies) { computationalMesh.moveMeshDataToNewMemorySpace( axom::fmt::format("fields/{}/values", strategy->functionName()), @@ -776,7 +776,7 @@ struct ContourTestBase { std::string resourceName = "HOST"; umpire::ResourceManager& rm = umpire::ResourceManager::getInstance(); - for( const auto& strategy : m_testStrategies ) + for(const auto& strategy : m_testStrategies) { const std::string dataPath = axom::fmt::format("fields/{}/values", strategy->functionName()); @@ -796,12 +796,12 @@ struct ContourTestBase { SLIC_ASSERT(resourceName == "HOST"); } -#if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) + #if defined(AXOM_RUNTIME_POLICY_USE_OPENMP) else if(params.policy == axom::runtime_policy::Policy::omp) { SLIC_ASSERT(resourceName == "HOST"); } -#endif + #endif else { SLIC_ASSERT(resourceName == "DEVICE"); @@ -840,7 +840,7 @@ struct ContourTestBase mc.clearOutput(); m_strategyFacetPrefixSum.clear(); m_strategyFacetPrefixSum.push_back(0); - for( const auto& strategy : m_testStrategies ) + for(const auto& strategy : m_testStrategies) { mc.setFunctionField(strategy->functionName()); mc.computeIsocontour(params.contourVal); @@ -867,7 +867,7 @@ struct ContourTestBase computationalMesh.coordsetPath() + "/values/" + axes[d], axom::execution_space::allocatorID()); } - for( const auto& strategy : m_testStrategies ) + for(const auto& strategy : m_testStrategies) { computationalMesh.moveMeshDataToNewMemorySpace( axom::fmt::format("fields/{}/values", strategy->functionName()), @@ -895,10 +895,10 @@ struct ContourTestBase axom::Array facetNodeCoords; axom::Array facetParentIds; axom::Array facetDomainIds; - mc.relinquishContourData( facetNodeIds, - facetNodeCoords, - facetParentIds, - facetDomainIds ); + mc.relinquishContourData(facetNodeIds, + facetNodeCoords, + facetParentIds, + facetDomainIds); SLIC_ASSERT(mc.getContourFacetCount() == 0); } @@ -914,7 +914,7 @@ struct ContourTestBase checkCellsContainingContour(computationalMesh, contourMesh); } - if (contourMesh.hasSidreGroup()) + if(contourMesh.hasSidreGroup()) { assert(contourMesh.getSidreGroup() == meshGroup); // Write contour mesh to file. @@ -956,11 +956,12 @@ struct ContourTestBase auto domainView = bpMesh.getDomainView(domId); // Create nodal function data with ghosts like node coords. - domainView.createField(strat.functionName(), - "vertex", - conduit::DataType::float64(domainView.getCoordsCountWithGhosts()), - domainView.getCoordsStrides(), - domainView.getCoordsOffsets()); + domainView.createField( + strat.functionName(), + "vertex", + conduit::DataType::float64(domainView.getCoordsCountWithGhosts()), + domainView.getCoordsStrides(), + domainView.getCoordsOffsets()); } for(int domId = 0; domId < bpMesh.domainCount(); ++domId) @@ -978,8 +979,7 @@ struct ContourTestBase } template typename std::enable_if::type populateNodalDistance( - const axom::StackArray, DIM>& - coordsViews, + const axom::StackArray, DIM>& coordsViews, axom::ArrayView& fieldView, ContourTestStrategy& strat) { @@ -1005,8 +1005,7 @@ struct ContourTestBase template typename std::enable_if::type populateNodalDistance( - const axom::StackArray, DIM>& - coordsViews, + const axom::StackArray, DIM>& coordsViews, axom::ArrayView& fieldView, ContourTestStrategy& strat) { @@ -1060,7 +1059,8 @@ struct ContourTestBase double tol = strategy.errorTolerance(); PointType pt; - for(axom::IndexType iNode = contourNodeBegin; iNode < contourNodeEnd; ++iNode) + for(axom::IndexType iNode = contourNodeBegin; iNode < contourNodeEnd; + ++iNode) { contourMesh.getNode(iNode, pt.data()); double analyticalVal = strategy.valueAt(pt); @@ -1191,15 +1191,16 @@ struct ContourTestBase { auto contourCellBegin = m_strategyFacetPrefixSum[iStrat]; auto contourCellEnd = m_strategyFacetPrefixSum[iStrat + 1]; - for(axom::IndexType iContourCell = contourCellBegin; iContourCell < contourCellEnd; + for(axom::IndexType iContourCell = contourCellBegin; + iContourCell < contourCellEnd; ++iContourCell) { axom::quest::MarchingCubes::DomainIdType domainId = domainIdView[iContourCell]; axom::quest::MarchingCubes::DomainIdType contiguousIndex = domainIdToContiguousId[domainId]; - typename axom::quest::MeshViewUtil::ConstCoordsViewsType& - coordsViews = allCoordsViews[contiguousIndex]; + typename axom::quest::MeshViewUtil::ConstCoordsViewsType& coordsViews = + allCoordsViews[contiguousIndex]; axom::IndexType parentCellId = parentCellIdView[iContourCell]; @@ -1221,7 +1222,7 @@ struct ContourTestBase axom::primal::BoundingBox small(parentCellBox); auto range = parentCellBox.range(); bool checkSmall = range >= tol; - if (checkSmall) + if(checkSmall) { small.expand(-tol); } @@ -1286,7 +1287,9 @@ struct ContourTestBase // Compute mapping to look up domains from the domain id. // std::map domainIdToContiguousId; - for(axom::quest::MarchingCubes::DomainIdType iDomain = 0; iDomain < domainCount; ++iDomain) + for(axom::quest::MarchingCubes::DomainIdType iDomain = 0; + iDomain < domainCount; + ++iDomain) { const auto& dom = computationalMesh.domain(iDomain); axom::quest::MarchingCubes::DomainIdType domainId = iDomain; @@ -1309,7 +1312,8 @@ struct ContourTestBase axom::Array> hasContours(domainCount); for(axom::IndexType domId = 0; domId < domainCount; ++domId) { - axom::quest::MeshViewUtil domainView = computationalMesh.getDomainView(domId); + axom::quest::MeshViewUtil domainView = + computationalMesh.getDomainView(domId); const axom::IndexType cellCount = domainView.getCellCount(); @@ -1322,7 +1326,8 @@ struct ContourTestBase auto contourCellBegin = m_strategyFacetPrefixSum[iStrat]; auto contourCellEnd = m_strategyFacetPrefixSum[iStrat + 1]; axom::IndexType bitFlag = (1 << iStrat); - for(axom::IndexType iContourCell = contourCellBegin; iContourCell < contourCellEnd; + for(axom::IndexType iContourCell = contourCellBegin; + iContourCell < contourCellEnd; ++iContourCell) { axom::quest::MarchingCubes::DomainIdType domainId = @@ -1347,7 +1352,8 @@ struct ContourTestBase const axom::IndexType parentCellCount = domainView.getCellCount(); // axom::Array hasContour(parentCellCount, parentCellCount); - for(axom::IndexType parentCellId = 0; parentCellId < parentCellCount; ++parentCellId) + for(axom::IndexType parentCellId = 0; parentCellId < parentCellCount; + ++parentCellId) { const axom::IndexType hasContourBits = hasContours[domId][parentCellId]; @@ -1356,12 +1362,13 @@ struct ContourTestBase auto& strategy = *m_testStrategies[iStrat]; const axom::IndexType iStratBit = (1 << iStrat); - const auto& fcnView = - domainView.template getConstFieldView(strategy.functionName(), false); + const auto& fcnView = domainView.template getConstFieldView( + strategy.functionName(), + false); - axom::ArrayIndexer - cellIndexer(domLengths, - axom::ArrayIndexer(fcnView.strides())); + axom::ArrayIndexer cellIndexer( + domLengths, + axom::ArrayIndexer(fcnView.strides())); axom::StackArray parentCellIdx = cellIndexer.toMultiIndex(parentCellId); @@ -1402,14 +1409,15 @@ struct ContourTestBase if(touchesContour != hasContour) { ++errCount; - SLIC_INFO_IF(params.isVerbose(), - axom::fmt::format( - "checkCellsContainingContour: cell {}: hasContour " - "({}) and touchesContour ({}) don't agree for strategy {}.", - parentCellIdx, - hasContour, - touchesContour, - strategy.testName())); + SLIC_INFO_IF( + params.isVerbose(), + axom::fmt::format( + "checkCellsContainingContour: cell {}: hasContour " + "({}) and touchesContour ({}) don't agree for strategy {}.", + parentCellIdx, + hasContour, + touchesContour, + strategy.testName())); } } } @@ -1423,15 +1431,19 @@ struct ContourTestBase }; template -struct PlanarTestStrategy : public ContourTestStrategy { +struct PlanarTestStrategy : public ContourTestStrategy +{ using PointType = axom::primal::Point; PlanarTestStrategy(const axom::primal::Vector& perpDir, const PointType& inPlane) - : ContourTestStrategy() - , _plane(perpDir.unitVector(), inPlane) - , _errTol(axom::numerics::floating_point_limits::epsilon()) - {} - virtual std::string testName() const override { return std::string("planar"); } + : ContourTestStrategy() + , _plane(perpDir.unitVector(), inPlane) + , _errTol(axom::numerics::floating_point_limits::epsilon()) + { } + virtual std::string testName() const override + { + return std::string("planar"); + } virtual std::string functionName() const override { return std::string("dist_to_plane"); @@ -1446,13 +1458,14 @@ struct PlanarTestStrategy : public ContourTestStrategy { }; template -struct RoundTestStrategy : public ContourTestStrategy { +struct RoundTestStrategy : public ContourTestStrategy +{ using PointType = axom::primal::Point; RoundTestStrategy(const PointType& center) - : ContourTestStrategy() - , _sphere(center, 0.0) - , _errTol(1e-3) - {} + : ContourTestStrategy() + , _sphere(center, 0.0) + , _errTol(1e-3) + { } virtual std::string testName() const override { return std::string("round"); } virtual std::string functionName() const override { @@ -1474,14 +1487,18 @@ struct RoundTestStrategy : public ContourTestStrategy { }; template -struct GyroidTestStrategy : public ContourTestStrategy { +struct GyroidTestStrategy : public ContourTestStrategy +{ using PointType = axom::primal::Point; GyroidTestStrategy(const PointType& scale, double offset) - : ContourTestStrategy() - , _scale(scale) - , _offset(offset) - {} - virtual std::string testName() const override { return std::string("gyroid"); } + : ContourTestStrategy() + , _scale(scale) + , _offset(offset) + { } + virtual std::string testName() const override + { + return std::string("gyroid"); + } virtual std::string functionName() const override { return std::string("gyroid_fcn"); @@ -1609,22 +1626,25 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) if(params.usingPlanar()) { - planarStrat = std::make_shared>(params.planeNormal(), - params.inplanePoint()); + planarStrat = + std::make_shared>(params.planeNormal(), + params.inplanePoint()); contourTest.addTestStrategy(planarStrat); } if(params.usingRound()) { - roundStrat = std::make_shared>(params.roundContourCenter()); + roundStrat = + std::make_shared>(params.roundContourCenter()); roundStrat->setToleranceByLongestEdge(computationalMesh); contourTest.addTestStrategy(roundStrat); } if(params.usingGyroid()) { - gyroidStrat = std::make_shared>(params.gyroidScaleFactor(), - params.contourVal); + gyroidStrat = + std::make_shared>(params.gyroidScaleFactor(), + params.contourVal); gyroidStrat->setToleranceByLongestEdge(computationalMesh); contourTest.addTestStrategy(gyroidStrat); } diff --git a/src/axom/quest/tests/quest_array_indexer.cpp b/src/axom/quest/tests/quest_array_indexer.cpp index c637c7d0bf..70d6b601b2 100644 --- a/src/axom/quest/tests/quest_array_indexer.cpp +++ b/src/axom/quest/tests/quest_array_indexer.cpp @@ -20,7 +20,8 @@ TEST(quest_array_indexer, quest_strides_and_permutations) axom::StackArray lengths {2}; axom::ArrayIndexer colIndexer( - lengths, axom::ArrayStrideOrder::COLUMN); + lengths, + axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(colIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::BOTH)); axom::StackArray colSlowestDirs {0}; axom::StackArray colStrides {1}; @@ -34,7 +35,8 @@ TEST(quest_array_indexer, quest_strides_and_permutations) (axom::ArrayIndexer(lengths, colSlowestDirs))); axom::ArrayIndexer rowIndexer( - lengths, axom::ArrayStrideOrder::ROW); + lengths, + axom::ArrayStrideOrder::ROW); EXPECT_EQ(rowIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::BOTH)); axom::StackArray rowSlowestDirs {0}; axom::StackArray rowStrides {1}; @@ -53,7 +55,8 @@ TEST(quest_array_indexer, quest_strides_and_permutations) axom::StackArray lengths {3, 2}; axom::ArrayIndexer colIndexer( - lengths, axom::ArrayStrideOrder::COLUMN); + lengths, + axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(colIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); axom::StackArray colSlowestDirs {0, 1}; axom::StackArray colStrides {2, 1}; @@ -64,7 +67,8 @@ TEST(quest_array_indexer, quest_strides_and_permutations) } axom::ArrayIndexer rowIndexer( - lengths, axom::ArrayStrideOrder::ROW); + lengths, + axom::ArrayStrideOrder::ROW); EXPECT_EQ(rowIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); axom::StackArray rowSlowestDirs {1, 0}; axom::StackArray rowStrides {1, 3}; @@ -80,7 +84,8 @@ TEST(quest_array_indexer, quest_strides_and_permutations) axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer colIndexer( - lengths, axom::ArrayStrideOrder::COLUMN); + lengths, + axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(colIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); axom::StackArray colSlowestDirs {0, 1, 2}; axom::StackArray colStrides {6, 2, 1}; @@ -91,7 +96,8 @@ TEST(quest_array_indexer, quest_strides_and_permutations) } axom::ArrayIndexer rowIndexer( - lengths, axom::ArrayStrideOrder::ROW); + lengths, + axom::ArrayStrideOrder::ROW); EXPECT_EQ(rowIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); axom::StackArray rowSlowestDirs {2, 1, 0}; axom::StackArray rowStrides {1, 5, 15}; @@ -110,8 +116,8 @@ TEST(quest_array_indexer, quest_col_major_offset) // 1D constexpr int DIM = 1; axom::StackArray lengths {3}; - axom::ArrayIndexer ai( - lengths, axom::ArrayStrideOrder::COLUMN); + axom::ArrayIndexer ai(lengths, + axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::BOTH)); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) @@ -126,8 +132,8 @@ TEST(quest_array_indexer, quest_col_major_offset) // 2D constexpr int DIM = 2; axom::StackArray lengths {3, 2}; - axom::ArrayIndexer ai( - lengths, axom::ArrayStrideOrder::COLUMN); + axom::ArrayIndexer ai(lengths, + axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) @@ -144,8 +150,8 @@ TEST(quest_array_indexer, quest_col_major_offset) { // 3D axom::StackArray lengths {5, 3, 2}; - axom::ArrayIndexer ai( - lengths, axom::ArrayStrideOrder::COLUMN); + axom::ArrayIndexer ai(lengths, + axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) @@ -396,8 +402,8 @@ TEST(quest_array_indexer, quest_array_match) constexpr int DIM = 2; axom::StackArray lengths {3, 2}; axom::Array a(lengths); - axom::ArrayIndexer ai( - lengths, axom::ArrayStrideOrder::COLUMN); + axom::ArrayIndexer ai(lengths, + axom::ArrayStrideOrder::COLUMN); for(axom::IndexType i = 0; i < lengths[0]; ++i) { for(axom::IndexType j = 0; j < lengths[1]; ++j) @@ -411,8 +417,8 @@ TEST(quest_array_indexer, quest_array_match) constexpr int DIM = 3; axom::StackArray lengths {5, 3, 2}; axom::Array a(lengths); - axom::ArrayIndexer ai( - lengths, axom::ArrayStrideOrder::COLUMN); + axom::ArrayIndexer ai(lengths, + axom::ArrayStrideOrder::COLUMN); for(axom::IndexType i = 0; i < lengths[0]; ++i) { for(axom::IndexType j = 0; j < lengths[1]; ++j) From dfef1574c7c82b0e35b7ca6a6c49635899dcb96a Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 5 Mar 2024 08:55:02 -0800 Subject: [PATCH 569/639] Re-disable plotting of test mesh, which I enabled for debugging. --- .../examples/quest_marching_cubes_example.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 99c58ec5b1..8eaa754b0a 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -743,12 +743,6 @@ struct ContourTestBase int runTest(BlueprintStructuredMesh& computationalMesh) { - // Compute the nodal distance functions. - for(const auto& strategy : m_testStrategies) - { - computeNodalDistance(computationalMesh, *strategy); - } - // Conduit data is in host memory, move to devices for testing. if(s_allocatorId != axom::execution_space::allocatorID()) { @@ -882,8 +876,7 @@ struct ContourTestBase sidre::Group* meshGroup = objectDS.getRoot()->createGroup(sidreGroupName); axom::mint::UnstructuredMesh contourMesh( DIM, - DIM == 2 ? mint::CellType::SEGMENT : mint::CellType::TRIANGLE, - meshGroup); + DIM == 2 ? mint::CellType::SEGMENT : mint::CellType::TRIANGLE); axom::utilities::Timer extractTimer(false); extractTimer.start(); mc.populateContourMesh(contourMesh, m_parentCellIdField, m_domainIdField); @@ -1031,6 +1024,13 @@ struct ContourTestBase } } } + void computeNodalDistance(BlueprintStructuredMesh& bpMesh) + { + for( auto& strategy : m_testStrategies ) + { + computeNodalDistance(bpMesh, *strategy); + } + } /** Check for errors in the surface contour mesh. @@ -1649,6 +1649,8 @@ int testNdimInstance(BlueprintStructuredMesh& computationalMesh) contourTest.addTestStrategy(gyroidStrat); } + contourTest.computeNodalDistance(computationalMesh); + if(params.isVerbose()) { computationalMesh.printMeshInfo(); From 02fab158245716b24ac58248513cd202e25b647c Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 5 Mar 2024 08:55:40 -0800 Subject: [PATCH 570/639] Fix an error failing 64-bit tests. --- src/axom/quest/examples/quest_marching_cubes_example.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 8eaa754b0a..a615fb5bb8 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -1170,7 +1170,7 @@ struct ContourTestBase axom::quest::MarchingCubes::DomainIdType domainId = iDomain; if(dom.has_path("state/domain_id")) { - domainId = dom.fetch_existing("state/domain_id").value(); + domainId = dom.fetch_existing("state/domain_id").to_value(); } domainIdToContiguousId[domainId] = iDomain; } @@ -1295,7 +1295,7 @@ struct ContourTestBase axom::quest::MarchingCubes::DomainIdType domainId = iDomain; if(dom.has_path("state/domain_id")) { - domainId = dom.fetch_existing("state/domain_id").value(); + domainId = dom.fetch_existing("state/domain_id").to_value(); } domainIdToContiguousId[domainId] = iDomain; } From cada931796a740d3b755c55db0178049db4f1e8f Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 5 Mar 2024 16:41:44 -0800 Subject: [PATCH 571/639] temporarily add blt package so we can point at the pre-0.6.2 release --- scripts/spack/packages/blt/package.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 scripts/spack/packages/blt/package.py diff --git a/scripts/spack/packages/blt/package.py b/scripts/spack/packages/blt/package.py new file mode 100644 index 0000000000..7d0a6ca32a --- /dev/null +++ b/scripts/spack/packages/blt/package.py @@ -0,0 +1,11 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.pkg.llnl.radiuss.blt import Blt as RadiussBlt + +class Blt(RadiussBlt): + # Note: This just points at a commit in the bugfix/white238/openmp branch. + # It also has a made up version + version("0.6.1.3", commit="1b6ababd46d3b1c1fcfa8b713c76121800be9c3e") From 5a0e77c524099fdeaebe94f6e9690424ac64ca46 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 5 Mar 2024 16:48:28 -0800 Subject: [PATCH 572/639] fix version --- scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml index ea4dffbba6..6bae5dac36 100644 --- a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -318,7 +318,7 @@ spack: scr: require: "@3.0.1~shared~tests~examples" umpire: - require: "@2024.02.20~shared~examples" + require: "@2024.01.31~shared~examples" # Globally lock in versions of Devtools cmake: From bed4bad4a0554ef457653b85908d37c472ec8a22 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 5 Mar 2024 16:49:03 -0800 Subject: [PATCH 573/639] bump blt to the pre-0.6.2 release --- src/cmake/blt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmake/blt b/src/cmake/blt index d5a13bdda6..1b6ababd46 160000 --- a/src/cmake/blt +++ b/src/cmake/blt @@ -1 +1 @@ -Subproject commit d5a13bdda659b4e1da1846f0b3a6c0de26a4e5d6 +Subproject commit 1b6ababd46d3b1c1fcfa8b713c76121800be9c3e From 2b0b8b3667399de272f3cf104ca6eb89da46321b Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 5 Mar 2024 21:10:17 -0800 Subject: [PATCH 574/639] Autoformat. --- src/axom/quest/examples/quest_marching_cubes_example.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index a615fb5bb8..09aaf29a2c 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -1026,7 +1026,7 @@ struct ContourTestBase } void computeNodalDistance(BlueprintStructuredMesh& bpMesh) { - for( auto& strategy : m_testStrategies ) + for(auto& strategy : m_testStrategies) { computeNodalDistance(bpMesh, *strategy); } From e252b06d2c21853e915282d0445f644210f026fd Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 5 Mar 2024 21:48:36 -0800 Subject: [PATCH 575/639] Update release notes. --- RELEASE-NOTES.md | 5 +++++ src/axom/quest/MarchingCubes.hpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index e11aaefd22..1f37407379 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -36,6 +36,11 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ hexahedral meshes using either a BVH or Implicit Grid spatial index ### Changed +- `MarchingCubes` has optimizations to improve GPU performance, particularly for + repeated computations. The constructor has changed and a new `setMesh` method + is added to set (or change) the mesh. New accessors present output data + without moving them from device to host. These accessors are an interim + solution and likely to be updated in the future. - `DistributedClosestPoint` outputs are now controlled by the `setOutput` method. - `MarchingCubes` allows user to select the underlying data-parallel implementation - `fullParallel` works best on GPUs. diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index c09f43be6b..bd8b459aea 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -171,7 +171,7 @@ class MarchingCubes axom::IndexType getContourNodeCount() const; //@{ - //!@name Output methods (experimental interface, subject to change) + //!@name Output methods (interim interfaces, subject to change) /*! @brief Put generated contour in a mint::UnstructuredMesh. @param mesh Output contour mesh @@ -188,7 +188,7 @@ class MarchingCubes Important: mint::UnstructuredMesh only supports host memory, so regardless of the allocator ID, this method always deep-copies data to host memory. To access the data without deep-copying, see - the other output methods. + the other output methods in this name group. */ void populateContourMesh( axom::mint::UnstructuredMesh &mesh, From b4bb2e265a866e3ea2439d2340a47b6dbcecd45a Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Wed, 6 Mar 2024 11:31:18 -0800 Subject: [PATCH 576/639] Improve ArrayIndexer documentation by code review comments. --- src/axom/quest/ArrayIndexer.hpp | 54 +++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index 9f36ff3c34..760fcc9304 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -15,6 +15,13 @@ namespace axom { +/*! + @brief Indicator for stride ordering. + + Multidimensional array data can be in row-major order, column-major order, + or some arbitrarily permuted order. Row and column major ordering are the + same thing if the array is 1D. +*/ struct ArrayStrideOrder { static constexpr int ARBITRARY = 0; // Neither row nor column @@ -39,21 +46,22 @@ class ArrayIndexer /*! @brief Constructor for row- or column-major indexing. @param [in] shape Shape of the array - @param [in] order: c is column major; r is row major. - @param [in] fastestStrideLength: Stride in the fastest + @param [in] arrayStrideOrder A order indicator from + ArrayStrideOrder. + @param [in] fastestStrideLength Stride in the fastest direction. */ ArrayIndexer(const axom::StackArray& shape, - int order, + int arrayStrideOrder, int fastestStrideLength = 1) { - initializeShape(shape, order, fastestStrideLength); + initializeShape(shape, arrayStrideOrder, fastestStrideLength); } /*! @brief Constructor for a given order permutation. @param [in] shape Shape of the array - @param [in] slowestDirs: permutation vector, where + @param [in] slowestDirs permutation vector, where slowestDirs[0] is the slowest direction and slowestDirs[DIM-1] is the fastest. */ @@ -68,7 +76,7 @@ class ArrayIndexer existing ArrayIndexer. @param [in] shape Shape of the array - @param [in] orderSource: ArrayIndex to copy stride order + @param [in] orderSource ArrayIndex to copy stride order from. */ ArrayIndexer(const axom::StackArray& shape, @@ -83,9 +91,9 @@ class ArrayIndexer @param [i] strides Strides. Must be unique when DIM > 1. If not unique, use default constructor and initializeStrides(). - @internal We could add the order preference to this constructor to - handle the degenerate case of non-unique strides. But that would - clash with the more prevalent constructor taking the array's + @internal We could add the ArrayStrideOrder preference to this constructor + to handle the degenerate case of non-unique strides. But that would + clash with the more prevalent usage of constructing from the array's shape. */ ArrayIndexer(const axom::StackArray& strides) : m_strides(strides) @@ -103,17 +111,19 @@ class ArrayIndexer /*! @brief Initialize for row- or column-major indexing. @param [in] shape Shape of the array - @param [in] order: c is column major; r is row major. - @param [in] fastestStrideLength: Stride in the fastest + @param [in] arrayStrideOrder An order indicator from + ArrayStrideOrder. + @param [in] fastestStrideLength Stride in the fastest direction. */ inline AXOM_HOST_DEVICE void initializeShape(const axom::StackArray& shape, - int order, + int arrayStrideOrder, int fastestStrideLength = 1) { - SLIC_ASSERT(order == ArrayStrideOrder::COLUMN || - order == ArrayStrideOrder::ROW); - if(order == ArrayStrideOrder::ROW) + SLIC_ASSERT(arrayStrideOrder == ArrayStrideOrder::COLUMN || + arrayStrideOrder == ArrayStrideOrder::ROW || + (DIM == 1 && arrayStrideOrder == ArrayStrideOrder::BOTH)); + if(arrayStrideOrder == ArrayStrideOrder::ROW) { for(int d = 0; d < DIM; ++d) { @@ -142,7 +152,7 @@ class ArrayIndexer /*! @brief Initialize for a given order permutation. @param [in] shape Shape of the array - @param [in] slowestDirs: permutation vector, where + @param [in] slowestDirs permutation vector, where slowestDirs[0] is the slowest direction and slowestDirs[DIM-1] is the fastest. */ @@ -166,7 +176,7 @@ class ArrayIndexer existing ArrayIndexer. @param [in] shape Shape of the array - @param [in] orderSource: ArrayIndex to copy stride order + @param [in] orderSource ArrayIndex to copy stride order from. */ inline AXOM_HOST_DEVICE void initializeShape( @@ -212,8 +222,8 @@ class ArrayIndexer with ordering preference for non-unique strides. @param [i] strides Strides. - @param [i] orderPref Ordering preference if strides - are non-unique. + @param [i] orderPref Ordering preference value + (from ArrayStrideOrder) if strides are non-unique. */ inline AXOM_HOST_DEVICE void initializeStrides( const axom::StackArray& strides, @@ -246,7 +256,7 @@ class ArrayIndexer static AXOM_HOST_DEVICE bool stridesAreUnique(const axom::StackArray& strides) { bool repeats = false; - for(int d = 0; d < DIM; ++d) + for(int d = 1; d < DIM; ++d) { for(int e = 0; e < d; ++e) { @@ -300,8 +310,8 @@ class ArrayIndexer /*! @brief Get the stride order (row- or column-major, or something else). - @return 1 if row major, 2 if column major, 0 if neither - and, DIM == 1, 3 (satisfying both row and column ordering). + @return Value from ArrayStrideOrder, indicating column order, + row order, both column and row (1D only) or arbitrary order. */ inline AXOM_HOST_DEVICE int getStrideOrder() const { From 0cb913f4bdd01a727965bd0d53065747f651b771 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 6 Mar 2024 13:51:48 -0800 Subject: [PATCH 577/639] turn on openmp for more blueos specs --- scripts/spack/specs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/spack/specs.json b/scripts/spack/specs.json index e917e1a70c..fed1c5f3a1 100644 --- a/scripts/spack/specs.json +++ b/scripts/spack/specs.json @@ -25,8 +25,8 @@ "__comment__":"# Note: clang-ibm + raja+openmp causes runtime failures, turning it off until there is an alternative", "blueos_3_ppc64le_ib_p9": - [ "clang@10.0.1.1~openmp+devtools+mfem+c2c", - "clang@10.0.1.2~openmp+devtools+mfem+c2c+cuda cuda_arch=70", + [ "clang@10.0.1.1+devtools+mfem+c2c", + "clang@10.0.1.2+devtools+mfem+c2c+cuda cuda_arch=70", "gcc@8.3.1.1+devtools~mfem+c2c", "gcc@8.3.1.2+devtools~mfem+c2c+cuda cuda_arch=70", "xl@16.1.1.1~openmp+devtools+mfem+c2c", From 6876650659b099fb0d6e51a8b843dc6637a71f93 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 6 Mar 2024 13:52:55 -0800 Subject: [PATCH 578/639] bump blt --- scripts/spack/packages/blt/package.py | 2 +- src/cmake/blt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/spack/packages/blt/package.py b/scripts/spack/packages/blt/package.py index 7d0a6ca32a..a4872d865e 100644 --- a/scripts/spack/packages/blt/package.py +++ b/scripts/spack/packages/blt/package.py @@ -8,4 +8,4 @@ class Blt(RadiussBlt): # Note: This just points at a commit in the bugfix/white238/openmp branch. # It also has a made up version - version("0.6.1.3", commit="1b6ababd46d3b1c1fcfa8b713c76121800be9c3e") + version("0.6.1.4", commit="c98f320835d71f778fbffcc48f07675142c08635") diff --git a/src/cmake/blt b/src/cmake/blt index 1b6ababd46..c98f320835 160000 --- a/src/cmake/blt +++ b/src/cmake/blt @@ -1 +1 @@ -Subproject commit 1b6ababd46d3b1c1fcfa8b713c76121800be9c3e +Subproject commit c98f320835d71f778fbffcc48f07675142c08635 From 6950ecc90946444f7bbbda2cc8a7b4b05a7612ff Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 6 Mar 2024 16:37:03 -0800 Subject: [PATCH 579/639] update spack packages to include new releases --- .../spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml | 2 +- scripts/spack/configs/toss_4_x86_64_ib/spack.yaml | 2 +- .../spack/configs/toss_4_x86_64_ib_cray/spack.yaml | 2 +- scripts/spack/packages/umpire/package.py | 11 ----------- scripts/spack/radiuss-spack-configs | 2 +- 5 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 scripts/spack/packages/umpire/package.py diff --git a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml index 6bae5dac36..166f47abfd 100644 --- a/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -318,7 +318,7 @@ spack: scr: require: "@3.0.1~shared~tests~examples" umpire: - require: "@2024.01.31~shared~examples" + require: "@2024.02.0~shared~examples" # Globally lock in versions of Devtools cmake: diff --git a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml index 5c3d83d1f1..bd15768713 100644 --- a/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack/configs/toss_4_x86_64_ib/spack.yaml @@ -282,7 +282,7 @@ spack: scr: require: "@3.0.1~shared~tests~examples" umpire: - require: "@2024.01.31~shared~examples" + require: "@2024.02.0~shared~examples" # Lock in versions of Devtools cmake: diff --git a/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml b/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml index 32e7d84698..b6f2a47429 100644 --- a/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml +++ b/scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml @@ -351,7 +351,7 @@ spack: scr: require: "@3.0.1~shared~tests~examples" umpire: - require: "@2024.01.31~shared~examples" + require: "@2024.02.0~shared~examples" py-shroud: version: [0.13.0] diff --git a/scripts/spack/packages/umpire/package.py b/scripts/spack/packages/umpire/package.py deleted file mode 100644 index 01e24fd6b9..0000000000 --- a/scripts/spack/packages/umpire/package.py +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.pkg.llnl.radiuss.umpire import Umpire as RadiussUmpire - -class Umpire(RadiussUmpire): - # Note: This just points at a commit in the task/update-blt-tpl-exports branch. - # It also has a made up version - version("2024.01.31.1", commit="f2ae5edd1e49e7fa18656203d742de3bd9490961", submodules=True) diff --git a/scripts/spack/radiuss-spack-configs b/scripts/spack/radiuss-spack-configs index 4016a0ff72..c5854178b6 160000 --- a/scripts/spack/radiuss-spack-configs +++ b/scripts/spack/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 4016a0ff72425b243a3f11c06e814a08721774f0 +Subproject commit c5854178b618b882386dd5f3c82fd34528b85522 From 4faba6ad0fb144629845c04ee202a58602b8189f Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 6 Mar 2024 21:09:26 -0800 Subject: [PATCH 580/639] update docker versions --- scripts/spack/configs/docker/ubuntu20/spack.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/spack/configs/docker/ubuntu20/spack.yaml b/scripts/spack/configs/docker/ubuntu20/spack.yaml index c76610f703..8260933ac9 100644 --- a/scripts/spack/configs/docker/ubuntu20/spack.yaml +++ b/scripts/spack/configs/docker/ubuntu20/spack.yaml @@ -132,22 +132,22 @@ spack: # Globally lock version of third party libraries camp: - require: "@2023.06.0" + require: "@2024.02.0" conduit: - require: "@0.8.8~shared~test~examples~utilities" + require: "@0.9.1~shared~test~examples~utilities" hdf5: variants: ~shared~mpi hypre: version: [2.24.0] # do shared mfem to allow PIC flag in mfem mfem: - require: "@4.5.2+shared~static" + require: "@4.6.0+shared~static" raja: - require: "@2023.06.0~shared~examples~exercises" + require: "@2024.02.0~shared~examples~exercises" scr: - require: "@develop~shared" + require: "@3.0.1~shared~tests~examples" umpire: - require: "@2023.06.0~shared~examples" + require: "@2024.02.0~shared~examples" # Globally lock in version of devtools cmake: From f79630c5def1db922a2e7936e5e8c9316cfe83af Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 6 Mar 2024 23:56:45 -0800 Subject: [PATCH 581/639] cz host-configs --- ...lueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake | 38 +++++++------ ..._3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake | 38 +++++++------ ...n-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake | 34 ++++++----- ...eos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake | 34 ++++++----- ...n-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake | 36 +++++++----- ...eos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake | 36 +++++++----- ...quartz-toss_4_x86_64_ib-clang@14.0.6.cmake | 56 ++++++++++--------- .../quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake | 56 ++++++++++--------- ...artz-toss_4_x86_64_ib-intel@2022.1.0.cmake | 34 ++++++----- ...ss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake | 36 +++++++----- 10 files changed, 229 insertions(+), 169 deletions(-) diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake index a7661ee71b..ac2f466390 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/umpire-2023.06.0-h6wvcftrmg6w5e7etumawlsf5trgvsl7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/raja-2023.06.0-jra4z7ctml3mpzsuixtbegawg7g75cec;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/camp-2023.06.0-abpqpyhwsuhzu4csmdy2nejqzrkfqh7a;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/mfem-4.5.2-dbebdqverfh4lwgj5nal5d2vgmmvl4xb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/hypre-2.24.0-vrxf2vyvdlmylt5u2cu3vy4dqdc76yvq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/lua-5.4.4-o6kjgr3nt6ssvrj3mmonawxj3sbbcnel;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/conduit-0.8.8-6vxxfa5atbct57263kwixtpa5jz54kew;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/parmetis-4.0.3-aivfy5rovu5bwsiryry63apan5cdtc4m;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/metis-5.1.0-k7t53hncr4qxzqoyzhekte5rqrorclyh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/hdf5-1.8.22-x626yhzvwnx7ssrmgl3lnvncx7s5nbkf;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/zlib-1.2.13-aple3eiihvtvpurrdvosba4qab7rgdnr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/c2c-1.8.0-alkiietbi3stbihkzci37tecdzdyxpwh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1/blt-0.5.3-e5rbowq4pvwwuchttguahzyjcpa5zvgr;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/umpire-2024.02.0-3fzuqd3tqb3kh2lai5yqmgom24mlcior;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/raja-2024.02.0-btiwe3jepovgjlxdtuqm4xssselzimcx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/py-jsonschema-2.6.0-szvkvnsgmp3mys5qwxkzidfljbrx2lc4;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/mfem-4.6.0-izljwvlcbrcbcueewxc74qbs7l3vy3rk;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/hypre-2.24.0-euib2ua4oleljrkszmkexls4kw5cvrr7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/lua-5.4.4-aovjhut3d6o67vxccjkyhfbrxc2eg4de;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/conduit-0.9.1-dfi65iel4lwlrvhi2i7n2hbvxuzlf3fv;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/parmetis-4.0.3-djitip36l7hy2ubwbvrnqmfeodhnjtpk;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/hdf5-1.8.23-ifirj3a475sf7jrliip2tj7laqyidak6;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/blt-0.6.1.4-7qqqx4bcdk5wy7ycpymq6engsddxn4y2;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/fmt-10.2.1-sscbhyiiak2butrj6656mn7nfx37rpr6;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/camp-2024.02.0-zxgjohy7qy2v3nqg4eaba3azthsqhcga;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/metis-5.1.0-e5ov7trmcxxc4pa6cbysd525iyiswtkn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/c2c-1.8.0-vlmxcctikvg2swezpvdqweczpsueuyrl;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/usr/tcetmp;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/cmake/cmake-3.21.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/axom-develop-wpre5jwym4gwxknegvw5mdlqmnqxgv3b/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/axom-develop-wpre5jwym4gwxknegvw5mdlqmnqxgv3b/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/c2c-1.8.0-vlmxcctikvg2swezpvdqweczpsueuyrl/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/conduit-0.9.1-dfi65iel4lwlrvhi2i7n2hbvxuzlf3fv/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/hdf5-1.8.23-ifirj3a475sf7jrliip2tj7laqyidak6/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/metis-5.1.0-e5ov7trmcxxc4pa6cbysd525iyiswtkn/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/parmetis-4.0.3-djitip36l7hy2ubwbvrnqmfeodhnjtpk/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/lua-5.4.4-aovjhut3d6o67vxccjkyhfbrxc2eg4de/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/mfem-4.6.0-izljwvlcbrcbcueewxc74qbs7l3vy3rk/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/hypre-2.24.0-euib2ua4oleljrkszmkexls4kw5cvrr7/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/py-jsonschema-2.6.0-szvkvnsgmp3mys5qwxkzidfljbrx2lc4/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/raja-2024.02.0-btiwe3jepovgjlxdtuqm4xssselzimcx/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/camp-2024.02.0-zxgjohy7qy2v3nqg4eaba3azthsqhcga/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/umpire-2024.02.0-3fzuqd3tqb3kh2lai5yqmgom24mlcior/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/fmt-10.2.1-sscbhyiiak2butrj6656mn7nfx37rpr6/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8;/usr/tce/packages/clang/clang-ibm-10.0.1/release/lib;/usr/tce/packages/clang/clang-ibm-10.0.1-gcc-8.3.1/release/lib" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/axom-develop-wpre5jwym4gwxknegvw5mdlqmnqxgv3b/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/axom-develop-wpre5jwym4gwxknegvw5mdlqmnqxgv3b/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/c2c-1.8.0-vlmxcctikvg2swezpvdqweczpsueuyrl/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/conduit-0.9.1-dfi65iel4lwlrvhi2i7n2hbvxuzlf3fv/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/hdf5-1.8.23-ifirj3a475sf7jrliip2tj7laqyidak6/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/metis-5.1.0-e5ov7trmcxxc4pa6cbysd525iyiswtkn/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/parmetis-4.0.3-djitip36l7hy2ubwbvrnqmfeodhnjtpk/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/lua-5.4.4-aovjhut3d6o67vxccjkyhfbrxc2eg4de/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/mfem-4.6.0-izljwvlcbrcbcueewxc74qbs7l3vy3rk/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/hypre-2.24.0-euib2ua4oleljrkszmkexls4kw5cvrr7/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/py-jsonschema-2.6.0-szvkvnsgmp3mys5qwxkzidfljbrx2lc4/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/raja-2024.02.0-btiwe3jepovgjlxdtuqm4xssselzimcx/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/camp-2024.02.0-zxgjohy7qy2v3nqg4eaba3azthsqhcga/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/umpire-2024.02.0-3fzuqd3tqb3kh2lai5yqmgom24mlcior/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1/fmt-10.2.1-sscbhyiiak2butrj6656mn7nfx37rpr6/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8;/usr/tce/packages/clang/clang-ibm-10.0.1/release/lib;/usr/tce/packages/clang/clang-ibm-10.0.1-gcc-8.3.1/release/lib" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -37,8 +43,6 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "-lgfortran" CACHE STRING "") set(CMAKE_Fortran_STANDARD_LIBRARIES "-lgfortran" CACHE STRING "") -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") set(BLT_EXE_LINKER_FLAGS " -Wl,-rpath,/usr/tce/packages/clang/clang-ibm-10.0.1-gcc-8.3.1/lib" CACHE STRING "Adds a missing libstdc++ rpath") @@ -69,7 +73,7 @@ set(BLT_MPI_COMMAND_APPEND "mpibind" CACHE STRING "") # Hardware Specifics #------------------------------------------------ -set(ENABLE_OPENMP OFF CACHE BOOL "") +set(ENABLE_OPENMP ON CACHE BOOL "") set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") @@ -79,23 +83,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.1" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-6vxxfa5atbct57263kwixtpa5jz54kew" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-dfi65iel4lwlrvhi2i7n2hbvxuzlf3fv" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-alkiietbi3stbihkzci37tecdzdyxpwh" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-vlmxcctikvg2swezpvdqweczpsueuyrl" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-dbebdqverfh4lwgj5nal5d2vgmmvl4xb" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-izljwvlcbrcbcueewxc74qbs7l3vy3rk" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-x626yhzvwnx7ssrmgl3lnvncx7s5nbkf" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-ifirj3a475sf7jrliip2tj7laqyidak6" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-o6kjgr3nt6ssvrj3mmonawxj3sbbcnel" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-aovjhut3d6o67vxccjkyhfbrxc2eg4de" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-jra4z7ctml3mpzsuixtbegawg7g75cec" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-btiwe3jepovgjlxdtuqm4xssselzimcx" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-h6wvcftrmg6w5e7etumawlsf5trgvsl7" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-3fzuqd3tqb3kh2lai5yqmgom24mlcior" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-abpqpyhwsuhzu4csmdy2nejqzrkfqh7a" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-zxgjohy7qy2v3nqg4eaba3azthsqhcga" CACHE PATH "") # scr not built @@ -109,6 +113,8 @@ set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-forma set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-szvkvnsgmp3mys5qwxkzidfljbrx2lc4/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake index 5d7b349e27..8da84005d4 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/umpire-2023.06.0-mgplvx55qtfnxdwb4cicp2bpu4z2koxq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/raja-2023.06.0-itml4o7c6upowd3s2uvk5wj23cywocev;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/camp-2023.06.0-s2bfmphdqig3ci4pdvkfvygprydcppyl;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/cub-2.1.0-p5pq3qyp3tthknvf4evygd4yaoay32tu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/mfem-4.5.2-5aoi62ejerozb42y5awjlgucluokakho;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/hypre-2.24.0-cfxkqrgvzhhkau6afaoohfe3zvmxhr7l;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/lua-5.4.4-27btgrl45gsrfpectq4nqwg3uep2lbcn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/conduit-0.8.8-k25pxkfamv77gz7cplvupfseutwule7o;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/parmetis-4.0.3-ae4f6v6uuhhbv776uy73zl4zqoralhbc;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/metis-5.1.0-ttpdauwjjvuesdbpa2pzh2inam3xgg7u;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/hdf5-1.8.22-ix4txea5c6dbzixdj3ef6dstpnlt6xvb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/zlib-1.2.13-ywvuuomigfzzbq4fxcgkdrnvnnwkj7zt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/c2c-1.8.0-icsf7aewc7ocohld45ibjxvygujkq3zd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2/blt-0.5.3-pytnag7yitffjizxs6mtsgj6amwvpd4v;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/umpire-2024.02.0-gdid6sheotanplgeox4xo25w6gqqsztl;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/raja-2024.02.0-o7rjribikrvq6wydxxz22wdo544ai4z2;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/camp-2024.02.0-2jxkuw2qyj7egsho3lshh2ceoa6n3srm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/py-jsonschema-2.6.0-jzezi7fphud2hpmaepsb5s456tz2dqol;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/mfem-4.6.0-63jbjowv2dojriwkpag6ws3tbm4erk7v;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/hypre-2.24.0-olonyxmliyqz7gjwd5jkenyxuphjff2d;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/lua-5.4.4-5okbr3yhq4vyonc2yt22lich6jkdgp3i;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/conduit-0.9.1-mypcbb7eqvp4oqjftdvw53oql5f5wemd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/parmetis-4.0.3-gxoxo6iesczbj7ltl3he3vxlv2xb6bdo;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/hdf5-1.8.23-5n6b7og6vcevg2pkbjjrhf54ta4fhl2i;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/blt-0.6.1.4-niyj5uvj7qaxuceaoycpenida5z56ied;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/fmt-10.2.1-rvh2rhnae6757hi6saunbnnicoowhtns;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/cub-2.1.0-ib4hkd2iic3p7ni4lhz5bqd5yivtxo7r;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/metis-5.1.0-5t5rx3oakpli3ywkum4kfhzdiacrdkso;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/c2c-1.8.0-ouuns7euqd3fbobccnfh2zcfgxo2nsss;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0;/usr/tce/packages/cuda/cuda-11.2.0;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/usr/tcetmp;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/cmake/cmake-3.21.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/axom-develop-ndiry4fjmug7ogvh36noblti67rdegj2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/axom-develop-ndiry4fjmug7ogvh36noblti67rdegj2/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/c2c-1.8.0-ouuns7euqd3fbobccnfh2zcfgxo2nsss/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/conduit-0.9.1-mypcbb7eqvp4oqjftdvw53oql5f5wemd/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/hdf5-1.8.23-5n6b7og6vcevg2pkbjjrhf54ta4fhl2i/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/metis-5.1.0-5t5rx3oakpli3ywkum4kfhzdiacrdkso/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/parmetis-4.0.3-gxoxo6iesczbj7ltl3he3vxlv2xb6bdo/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/lua-5.4.4-5okbr3yhq4vyonc2yt22lich6jkdgp3i/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/mfem-4.6.0-63jbjowv2dojriwkpag6ws3tbm4erk7v/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/hypre-2.24.0-olonyxmliyqz7gjwd5jkenyxuphjff2d/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/py-jsonschema-2.6.0-jzezi7fphud2hpmaepsb5s456tz2dqol/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/raja-2024.02.0-o7rjribikrvq6wydxxz22wdo544ai4z2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/camp-2024.02.0-2jxkuw2qyj7egsho3lshh2ceoa6n3srm/lib;/usr/tce/packages/cuda/cuda-11.2.0/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/umpire-2024.02.0-gdid6sheotanplgeox4xo25w6gqqsztl/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/fmt-10.2.1-rvh2rhnae6757hi6saunbnnicoowhtns/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8;/usr/tce/packages/clang/clang-ibm-10.0.1/release/lib;/usr/tce/packages/clang/clang-ibm-10.0.1-gcc-8.3.1/release/lib" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/axom-develop-ndiry4fjmug7ogvh36noblti67rdegj2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/axom-develop-ndiry4fjmug7ogvh36noblti67rdegj2/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/c2c-1.8.0-ouuns7euqd3fbobccnfh2zcfgxo2nsss/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/conduit-0.9.1-mypcbb7eqvp4oqjftdvw53oql5f5wemd/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/hdf5-1.8.23-5n6b7og6vcevg2pkbjjrhf54ta4fhl2i/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/metis-5.1.0-5t5rx3oakpli3ywkum4kfhzdiacrdkso/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/parmetis-4.0.3-gxoxo6iesczbj7ltl3he3vxlv2xb6bdo/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/lua-5.4.4-5okbr3yhq4vyonc2yt22lich6jkdgp3i/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/mfem-4.6.0-63jbjowv2dojriwkpag6ws3tbm4erk7v/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/hypre-2.24.0-olonyxmliyqz7gjwd5jkenyxuphjff2d/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/py-jsonschema-2.6.0-jzezi7fphud2hpmaepsb5s456tz2dqol/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/raja-2024.02.0-o7rjribikrvq6wydxxz22wdo544ai4z2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/camp-2024.02.0-2jxkuw2qyj7egsho3lshh2ceoa6n3srm/lib;/usr/tce/packages/cuda/cuda-11.2.0/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/umpire-2024.02.0-gdid6sheotanplgeox4xo25w6gqqsztl/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2/fmt-10.2.1-rvh2rhnae6757hi6saunbnnicoowhtns/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8;/usr/tce/packages/clang/clang-ibm-10.0.1/release/lib;/usr/tce/packages/clang/clang-ibm-10.0.1-gcc-8.3.1/release/lib" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -37,8 +43,6 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "-lgfortran" CACHE STRING "") set(CMAKE_Fortran_STANDARD_LIBRARIES "-lgfortran" CACHE STRING "") -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") set(BLT_EXE_LINKER_FLAGS " -Xlinker -rpath -Xlinker /usr/tce/packages/clang/clang-ibm-10.0.1-gcc-8.3.1/lib" CACHE STRING "Adds a missing libstdc++ rpath") @@ -97,7 +101,7 @@ set(gtest_disable_pthreads ON CACHE BOOL "") # Hardware Specifics #------------------------------------------------ -set(ENABLE_OPENMP OFF CACHE BOOL "") +set(ENABLE_OPENMP ON CACHE BOOL "") set(ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "") @@ -107,23 +111,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/clang-10.0.1.2" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/clang-10.0.1.2" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-k25pxkfamv77gz7cplvupfseutwule7o" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-mypcbb7eqvp4oqjftdvw53oql5f5wemd" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-icsf7aewc7ocohld45ibjxvygujkq3zd" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-ouuns7euqd3fbobccnfh2zcfgxo2nsss" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-5aoi62ejerozb42y5awjlgucluokakho" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-63jbjowv2dojriwkpag6ws3tbm4erk7v" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-ix4txea5c6dbzixdj3ef6dstpnlt6xvb" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-5n6b7og6vcevg2pkbjjrhf54ta4fhl2i" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-27btgrl45gsrfpectq4nqwg3uep2lbcn" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-5okbr3yhq4vyonc2yt22lich6jkdgp3i" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-itml4o7c6upowd3s2uvk5wj23cywocev" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-o7rjribikrvq6wydxxz22wdo544ai4z2" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-mgplvx55qtfnxdwb4cicp2bpu4z2koxq" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-gdid6sheotanplgeox4xo25w6gqqsztl" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-s2bfmphdqig3ci4pdvkfvygprydcppyl" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-2jxkuw2qyj7egsho3lshh2ceoa6n3srm" CACHE PATH "") # scr not built @@ -137,6 +141,8 @@ set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-forma set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-jzezi7fphud2hpmaepsb5s456tz2dqol/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake index 49a08e57f0..2a1c2d905f 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/umpire-2023.06.0-g7qmb2qhubkm3azuvfmqs76otesjurcs;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/raja-2023.06.0-tvlbnpgx2hbiu3bjvx44ozxhvusclguk;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/camp-2023.06.0-civqzez47ip24ln7c5q6gofaniemdr54;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/lua-5.4.4-e7cdhkbaxuyqljoyozzxrt2n57erhszx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/conduit-0.8.8-3li2jcc2mecqbanoew5tznr4uzl2k2jg;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/parmetis-4.0.3-c2ub4mddqt7faykccls5eae7xogpi32w;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/metis-5.1.0-t6qk2khpceidsormndy6gj56qbnehxai;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/hdf5-1.8.22-nydokvym7klek6hqoyijbwf3tbmd32ux;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/zlib-1.2.13-zd2x25bmmjwxhw7siucfywjgk7oc262j;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/c2c-1.8.0-zgwmbota3vhdxcdjlwxbhomlwllwhvnc;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1/blt-0.5.3-zghdcshuqlqnbrezcylwnefie7pkvsab;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/umpire-2024.02.0-3fyzeztrclnysexhwf75pm2nxel77776;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/fmt-10.2.1-2vqr6w6s2qq7bt4iq7mdrfiqgfiw6f5l;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/raja-2024.02.0-e6tn6qcf3j2hqkz5ht3xrmlbddp3ngnn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/camp-2024.02.0-avtdwxn6q374o2nqe4rqkjzasuvmudta;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/py-jsonschema-2.6.0-me5qygs6iauo7miussleiado3nbnw5ot;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/lua-5.4.4-v5n5ab5npmyxguqaja6xdmyl6r3gsc5a;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/conduit-0.9.1-7fwf4minhh6ymveutjnb4zetvxwurm66;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/parmetis-4.0.3-p5pmp73u6nshwemscw43atzgaerk4ulu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/metis-5.1.0-devoja547pbzdundjnarm3hug2hhay2l;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/hdf5-1.8.23-7cjtcdwjrtfgcnqoiyfrufybdw5g6i6h;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/c2c-1.8.0-vj22dsxnnfc6hx73lfgpdmlhithbd5bq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/blt-0.6.1.4-6lng5thw5prsyymfu2yzy7xdwtwij6ij;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/gcc-runtime-8.3.1.1-pykxuo3lctv7fu6i325szadkdcwrrkim;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/usr/tcetmp;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/cmake/cmake-3.21.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/axom-develop-mrrvgirrsjrtdsyltswvulji3his36xi/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/axom-develop-mrrvgirrsjrtdsyltswvulji3his36xi/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/c2c-1.8.0-vj22dsxnnfc6hx73lfgpdmlhithbd5bq/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/gcc-runtime-8.3.1.1-pykxuo3lctv7fu6i325szadkdcwrrkim/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/conduit-0.9.1-7fwf4minhh6ymveutjnb4zetvxwurm66/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/hdf5-1.8.23-7cjtcdwjrtfgcnqoiyfrufybdw5g6i6h/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/metis-5.1.0-devoja547pbzdundjnarm3hug2hhay2l/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/parmetis-4.0.3-p5pmp73u6nshwemscw43atzgaerk4ulu/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/lua-5.4.4-v5n5ab5npmyxguqaja6xdmyl6r3gsc5a/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/py-jsonschema-2.6.0-me5qygs6iauo7miussleiado3nbnw5ot/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/raja-2024.02.0-e6tn6qcf3j2hqkz5ht3xrmlbddp3ngnn/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/camp-2024.02.0-avtdwxn6q374o2nqe4rqkjzasuvmudta/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/umpire-2024.02.0-3fyzeztrclnysexhwf75pm2nxel77776/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/fmt-10.2.1-2vqr6w6s2qq7bt4iq7mdrfiqgfiw6f5l/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/axom-develop-mrrvgirrsjrtdsyltswvulji3his36xi/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/axom-develop-mrrvgirrsjrtdsyltswvulji3his36xi/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/c2c-1.8.0-vj22dsxnnfc6hx73lfgpdmlhithbd5bq/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/gcc-runtime-8.3.1.1-pykxuo3lctv7fu6i325szadkdcwrrkim/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/conduit-0.9.1-7fwf4minhh6ymveutjnb4zetvxwurm66/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/hdf5-1.8.23-7cjtcdwjrtfgcnqoiyfrufybdw5g6i6h/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/metis-5.1.0-devoja547pbzdundjnarm3hug2hhay2l/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/parmetis-4.0.3-p5pmp73u6nshwemscw43atzgaerk4ulu/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/lua-5.4.4-v5n5ab5npmyxguqaja6xdmyl6r3gsc5a/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/py-jsonschema-2.6.0-me5qygs6iauo7miussleiado3nbnw5ot/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/raja-2024.02.0-e6tn6qcf3j2hqkz5ht3xrmlbddp3ngnn/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/camp-2024.02.0-avtdwxn6q374o2nqe4rqkjzasuvmudta/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/umpire-2024.02.0-3fyzeztrclnysexhwf75pm2nxel77776/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1/fmt-10.2.1-2vqr6w6s2qq7bt4iq7mdrfiqgfiw6f5l/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -31,8 +37,6 @@ else() endif() -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") #------------------------------------------------------------------------------ @@ -71,23 +75,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.1" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-3li2jcc2mecqbanoew5tznr4uzl2k2jg" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-7fwf4minhh6ymveutjnb4zetvxwurm66" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-zgwmbota3vhdxcdjlwxbhomlwllwhvnc" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-vj22dsxnnfc6hx73lfgpdmlhithbd5bq" CACHE PATH "") # MFEM not built -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-nydokvym7klek6hqoyijbwf3tbmd32ux" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-7cjtcdwjrtfgcnqoiyfrufybdw5g6i6h" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-e7cdhkbaxuyqljoyozzxrt2n57erhszx" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-v5n5ab5npmyxguqaja6xdmyl6r3gsc5a" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-tvlbnpgx2hbiu3bjvx44ozxhvusclguk" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-e6tn6qcf3j2hqkz5ht3xrmlbddp3ngnn" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-g7qmb2qhubkm3azuvfmqs76otesjurcs" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-3fyzeztrclnysexhwf75pm2nxel77776" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-civqzez47ip24ln7c5q6gofaniemdr54" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-avtdwxn6q374o2nqe4rqkjzasuvmudta" CACHE PATH "") # scr not built @@ -101,6 +105,8 @@ set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-forma set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-me5qygs6iauo7miussleiado3nbnw5ot/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake index 5ee8b381e9..1b51e8b4dd 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/umpire-2023.06.0-rgprey5lhrxtjnaqmm56x5t4zfwv7n2f;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/raja-2023.06.0-aszr6mr5prbpfd3qqcb7ukntna6a3rfb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/camp-2023.06.0-54bzgyk2if7ilhc2saaia3flihlvkqhu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/cub-2.1.0-zpxcavwsek3eamis6c2ekyd4wpc2aff7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/lua-5.4.4-uzsm5gerahtqcinqqfwleer62mlgl6xt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/conduit-0.8.8-pslusbff27xjqw5sct3jnddyeqlyide3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/parmetis-4.0.3-bcniwrmmygfl3ngqqy4ogyuopuilgfy2;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/metis-5.1.0-tht2h2hqk4psrvunj7egarksgyayew3d;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/hdf5-1.8.22-h2labsbvwxgxwvphjb5i357an3dgjhqp;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/zlib-1.2.13-obyznlavcvoyytpvwwyi65s5ngcnpigv;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/c2c-1.8.0-snpbqgmnulnruetig5di7nef2gir354f;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2/blt-0.5.3-umf5hhz3yl7vspds2fejsjdbmy2npyqb;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/umpire-2024.02.0-ax6j3jggtgph2kx53njdclhij5457lnr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/fmt-10.2.1-zv6ntw5mnzrvvm2mfyyjjly7cmixmgqr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/raja-2024.02.0-qz732p5cbhzuecyyn47d67h55wir7owh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/camp-2024.02.0-drrgkykr3onmqdkoc2jg6hzxzszakj35;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/cub-2.1.0-i64fir4ytcl7w527jny2bj67irxva2pu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/py-jsonschema-2.6.0-5rwlawwpfl75pzasnxiulrkcxmznmijx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/lua-5.4.4-saqxtlwqxhm5xszi6ohoalufvorkont7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/conduit-0.9.1-66pob6ova32wkqvnbdbskk5zk44tjbnk;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/parmetis-4.0.3-2h2xjxkc3qwi237ui476jgsqi2e4kpkh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/metis-5.1.0-3de4wffnqmwqslyiizuoheny6abmfkkn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/hdf5-1.8.23-ada6dnl7e76lppixolnsjy7gmi4adfoh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/c2c-1.8.0-c76hxrgyy2igrclt6cnsvydrkd77ufvm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/blt-0.6.1.4-ldmftyubptq3py7xr6wirrg2eorm357z;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/gcc-runtime-8.3.1.2-7lxa2lyos6dnjfydj2ewpv4wlnnvp2hh;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0;/usr/tce/packages/cuda/cuda-11.2.0;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/usr/tcetmp;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/cmake/cmake-3.21.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/axom-develop-qewlj77x5de57xeii6pfarnsgahvapao/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/axom-develop-qewlj77x5de57xeii6pfarnsgahvapao/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/c2c-1.8.0-c76hxrgyy2igrclt6cnsvydrkd77ufvm/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/gcc-runtime-8.3.1.2-7lxa2lyos6dnjfydj2ewpv4wlnnvp2hh/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/conduit-0.9.1-66pob6ova32wkqvnbdbskk5zk44tjbnk/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/hdf5-1.8.23-ada6dnl7e76lppixolnsjy7gmi4adfoh/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/metis-5.1.0-3de4wffnqmwqslyiizuoheny6abmfkkn/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/parmetis-4.0.3-2h2xjxkc3qwi237ui476jgsqi2e4kpkh/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/lua-5.4.4-saqxtlwqxhm5xszi6ohoalufvorkont7/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/py-jsonschema-2.6.0-5rwlawwpfl75pzasnxiulrkcxmznmijx/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/raja-2024.02.0-qz732p5cbhzuecyyn47d67h55wir7owh/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/camp-2024.02.0-drrgkykr3onmqdkoc2jg6hzxzszakj35/lib;/usr/tce/packages/cuda/cuda-11.2.0/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/umpire-2024.02.0-ax6j3jggtgph2kx53njdclhij5457lnr/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/fmt-10.2.1-zv6ntw5mnzrvvm2mfyyjjly7cmixmgqr/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/axom-develop-qewlj77x5de57xeii6pfarnsgahvapao/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/axom-develop-qewlj77x5de57xeii6pfarnsgahvapao/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/c2c-1.8.0-c76hxrgyy2igrclt6cnsvydrkd77ufvm/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/gcc-runtime-8.3.1.2-7lxa2lyos6dnjfydj2ewpv4wlnnvp2hh/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/conduit-0.9.1-66pob6ova32wkqvnbdbskk5zk44tjbnk/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/hdf5-1.8.23-ada6dnl7e76lppixolnsjy7gmi4adfoh/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/metis-5.1.0-3de4wffnqmwqslyiizuoheny6abmfkkn/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/parmetis-4.0.3-2h2xjxkc3qwi237ui476jgsqi2e4kpkh/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/lua-5.4.4-saqxtlwqxhm5xszi6ohoalufvorkont7/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/py-jsonschema-2.6.0-5rwlawwpfl75pzasnxiulrkcxmznmijx/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/raja-2024.02.0-qz732p5cbhzuecyyn47d67h55wir7owh/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/camp-2024.02.0-drrgkykr3onmqdkoc2jg6hzxzszakj35/lib;/usr/tce/packages/cuda/cuda-11.2.0/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/umpire-2024.02.0-ax6j3jggtgph2kx53njdclhij5457lnr/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2/fmt-10.2.1-zv6ntw5mnzrvvm2mfyyjjly7cmixmgqr/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -31,8 +37,6 @@ else() endif() -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") #------------------------------------------------------------------------------ @@ -99,23 +103,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/gcc-8.3.1.2" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/gcc-8.3.1.2" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-pslusbff27xjqw5sct3jnddyeqlyide3" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-66pob6ova32wkqvnbdbskk5zk44tjbnk" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-snpbqgmnulnruetig5di7nef2gir354f" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-c76hxrgyy2igrclt6cnsvydrkd77ufvm" CACHE PATH "") # MFEM not built -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-h2labsbvwxgxwvphjb5i357an3dgjhqp" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-ada6dnl7e76lppixolnsjy7gmi4adfoh" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-uzsm5gerahtqcinqqfwleer62mlgl6xt" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-saqxtlwqxhm5xszi6ohoalufvorkont7" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-aszr6mr5prbpfd3qqcb7ukntna6a3rfb" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-qz732p5cbhzuecyyn47d67h55wir7owh" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-rgprey5lhrxtjnaqmm56x5t4zfwv7n2f" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-ax6j3jggtgph2kx53njdclhij5457lnr" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-54bzgyk2if7ilhc2saaia3flihlvkqhu" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-drrgkykr3onmqdkoc2jg6hzxzszakj35" CACHE PATH "") # scr not built @@ -129,6 +133,8 @@ set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-forma set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-5rwlawwpfl75pzasnxiulrkcxmznmijx/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake index db8b81fd69..aacc63f587 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/umpire-2023.06.0-cmose4tqzlwsrjjhoklstt6ga3yym6ni;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/raja-2023.06.0-uqr6nybua6ic5xjwqd75hqtngiz6wjwb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/camp-2023.06.0-3k5jzo2qageywkgo7i65ybqksjqbu67j;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/mfem-4.5.2-5tpknd5eztbbomidbr3qcs75hyvdqegw;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/hypre-2.24.0-kgmrxqyc3pjlwgzvgbchceub5u4v4tgt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/lua-5.4.4-22nibaxxfzwid5jk3udivaptba2xtw4r;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/conduit-0.8.8-tnyxf6f7sh7kg3pzvt5acfp4btsprsp7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/parmetis-4.0.3-zsfvlzuxwixta5mjt4dqwikslhx6l6dd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/metis-5.1.0-hpfbnba3mgk2opmqn3efr2mmda76yacg;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/hdf5-1.8.22-eduvgrxspycy6xfw2t6i6uogdtzgnygm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/zlib-1.2.13-tnpzx5nxltbrlx27lozjehkg2lkb7lew;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/c2c-1.8.0-vxyvicuyswybrekljpj7khd56uobpc62;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1/blt-0.5.3-zleps37vlw57krmv2zruxq6bpxpn6fik;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/umpire-2024.02.0-kglsalrxtcw2bh4hnsnc5gq5jevvv7bl;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/py-jsonschema-2.6.0-7skzmrvuuo6gtwscj6b6fbdyo7sioz5h;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/mfem-4.6.0-2qilfn4m5dmpxjm2evip6nusosmiqrsz;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/hypre-2.24.0-scxx626pb345r4bpsmn4idus6dt42jcs;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/lua-5.4.4-b43zhs5fpjqoog4hrtfrtxuetq7pwd4b;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/conduit-0.9.1-gds2atmvlsftghczkaxrbdi4fotbl2a3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/parmetis-4.0.3-unks4pi2gc6heogvv2m3cvjvgc2etfp4;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/hdf5-1.8.23-ur6rpcf7qqngwf25ezjwei6en7rcsnxq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/blt-0.6.1.4-neovqnvk3tazh7clai422vfazmbjeaqp;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/fmt-10.2.1-iknryrusj34wtt4nk4pn2ybgwa77grms;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/camp-2024.02.0-a2mltgoskoemplkmkkup5cs4pmfn64j7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/raja-2024.02.0-kimeva5su2xhbqpy54xx5lnmvypbavab;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/metis-5.1.0-qww4ax3mkehdlf7akdbjzokbf4wxws5m;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/c2c-1.8.0-bbzy4skytx3akdcm2fvslpxn44vhsq2y;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/usr/tcetmp;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/cmake/cmake-3.21.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/axom-develop-mwe36w3aijwdbfu4ckdjv2wksrvqbsj2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/axom-develop-mwe36w3aijwdbfu4ckdjv2wksrvqbsj2/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/c2c-1.8.0-bbzy4skytx3akdcm2fvslpxn44vhsq2y/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/conduit-0.9.1-gds2atmvlsftghczkaxrbdi4fotbl2a3/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/hdf5-1.8.23-ur6rpcf7qqngwf25ezjwei6en7rcsnxq/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/metis-5.1.0-qww4ax3mkehdlf7akdbjzokbf4wxws5m/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/parmetis-4.0.3-unks4pi2gc6heogvv2m3cvjvgc2etfp4/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/lua-5.4.4-b43zhs5fpjqoog4hrtfrtxuetq7pwd4b/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/mfem-4.6.0-2qilfn4m5dmpxjm2evip6nusosmiqrsz/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/hypre-2.24.0-scxx626pb345r4bpsmn4idus6dt42jcs/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/py-jsonschema-2.6.0-7skzmrvuuo6gtwscj6b6fbdyo7sioz5h/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/raja-2024.02.0-kimeva5su2xhbqpy54xx5lnmvypbavab/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/camp-2024.02.0-a2mltgoskoemplkmkkup5cs4pmfn64j7/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/umpire-2024.02.0-kglsalrxtcw2bh4hnsnc5gq5jevvv7bl/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/fmt-10.2.1-iknryrusj34wtt4nk4pn2ybgwa77grms/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/axom-develop-mwe36w3aijwdbfu4ckdjv2wksrvqbsj2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/axom-develop-mwe36w3aijwdbfu4ckdjv2wksrvqbsj2/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/c2c-1.8.0-bbzy4skytx3akdcm2fvslpxn44vhsq2y/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/conduit-0.9.1-gds2atmvlsftghczkaxrbdi4fotbl2a3/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/hdf5-1.8.23-ur6rpcf7qqngwf25ezjwei6en7rcsnxq/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/metis-5.1.0-qww4ax3mkehdlf7akdbjzokbf4wxws5m/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/parmetis-4.0.3-unks4pi2gc6heogvv2m3cvjvgc2etfp4/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/lua-5.4.4-b43zhs5fpjqoog4hrtfrtxuetq7pwd4b/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/mfem-4.6.0-2qilfn4m5dmpxjm2evip6nusosmiqrsz/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/hypre-2.24.0-scxx626pb345r4bpsmn4idus6dt42jcs/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/py-jsonschema-2.6.0-7skzmrvuuo6gtwscj6b6fbdyo7sioz5h/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/raja-2024.02.0-kimeva5su2xhbqpy54xx5lnmvypbavab/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/camp-2024.02.0-a2mltgoskoemplkmkkup5cs4pmfn64j7/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/umpire-2024.02.0-kglsalrxtcw2bh4hnsnc5gq5jevvv7bl/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1/fmt-10.2.1-iknryrusj34wtt4nk4pn2ybgwa77grms/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/xl/xlc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/xl/xlc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/xl/xlc++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/xl/xlc++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/xl/xlf90" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/xl/xlf90" CACHE PATH "") else() @@ -37,8 +43,6 @@ set(CMAKE_CXX_FLAGS "--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1" CACHE STRI set(CMAKE_Fortran_FLAGS "--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1" CACHE STRING "") -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") #------------------------------------------------------------------------------ @@ -83,23 +87,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.1" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-tnyxf6f7sh7kg3pzvt5acfp4btsprsp7" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-gds2atmvlsftghczkaxrbdi4fotbl2a3" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-vxyvicuyswybrekljpj7khd56uobpc62" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-bbzy4skytx3akdcm2fvslpxn44vhsq2y" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-5tpknd5eztbbomidbr3qcs75hyvdqegw" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-2qilfn4m5dmpxjm2evip6nusosmiqrsz" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-eduvgrxspycy6xfw2t6i6uogdtzgnygm" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-ur6rpcf7qqngwf25ezjwei6en7rcsnxq" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-22nibaxxfzwid5jk3udivaptba2xtw4r" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-b43zhs5fpjqoog4hrtfrtxuetq7pwd4b" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-uqr6nybua6ic5xjwqd75hqtngiz6wjwb" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-kimeva5su2xhbqpy54xx5lnmvypbavab" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-cmose4tqzlwsrjjhoklstt6ga3yym6ni" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-kglsalrxtcw2bh4hnsnc5gq5jevvv7bl" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-3k5jzo2qageywkgo7i65ybqksjqbu67j" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-a2mltgoskoemplkmkkup5cs4pmfn64j7" CACHE PATH "") # scr not built @@ -113,6 +117,8 @@ set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-forma set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-7skzmrvuuo6gtwscj6b6fbdyo7sioz5h/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake index 0c56ae97a2..2c16ebf051 100644 --- a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake +++ b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/umpire-2023.06.0-5pojmv2de7q5pimrh253hwamycx7jfl7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/raja-2023.06.0-7et5l25lkvvjz2r772uabj7hrstg3y2z;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/camp-2023.06.0-q4hulo6jzt2wnuzzj5jjmlvkdtu4ckdj;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/cub-2.1.0-45sgqog6spfots46rohzcokfoaxjil4p;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/mfem-4.5.2-264o4xkxhcafenixttd6lw5k466a62b3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/hypre-2.24.0-x2zforves4hmpcuwjskxbvxu55i5kpfx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/lua-5.4.4-6yyyruucztcz5p4w33mhydqn5kiywkjn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/conduit-0.8.8-pil6joltz2jsp4vcdsfgndntfkqoi3na;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/parmetis-4.0.3-ogq2nkkjvarhjgaweb6b5lglfcmes3hm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/metis-5.1.0-7ojc3lx2y6dk2g7gvl6m5n4fq5yewukb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/hdf5-1.8.22-y23h3hgemr7s6terq2mvsz5if5u327sr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/zlib-1.2.13-nd6r3ccnozxmd7jdwyxbgvqg5y2bn3ds;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/c2c-1.8.0-ckwviu4jwtot52xykd3kuryozuw5o35p;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2/blt-0.5.3-47zfyusaljp2e7x3lsq3iggqvapxox6t;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.2.0;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/umpire-2024.02.0-57lf4jwgiqrgzpeaj7uerwej3ht4wgyt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/raja-2024.02.0-kghzomlpcrlcri3dky476kdizqatfe5c;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/camp-2024.02.0-ppwilytkx2rffmtiroong3ucsojgc2o7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/py-jsonschema-2.6.0-qpksngigqtckjhj62aeckyiptsyrquwo;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/mfem-4.6.0-giwvzuwtccsd4dt3y6co4ul3x2lkgmpw;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/hypre-2.24.0-njvlsye4yxx7gzho7hpvfaiyugfztlef;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/lua-5.4.4-6jtix4lxlnmvpkuahs62qqbjk5yubmux;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/conduit-0.9.1-wh6qi5s3jncyggsy6w4dxdlcg3n3feag;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/parmetis-4.0.3-buyj5iliasgoeiauw335rdrvht4l46ut;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/hdf5-1.8.23-vlybikhncayldwo36udsi225qyan7dos;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/blt-0.6.1.4-lhkhl33mqna6lfzkqz5fbwzy6by5effo;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/fmt-10.2.1-fl5fgyfjfnworql33rfi4oufl2fyx2ec;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/cub-2.1.0-gk54nvuh77yqhzft2rlourfzd7aqvs6i;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/metis-5.1.0-wzyd4pwtce4c22uw3tq3dljdjpfjrd3z;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/c2c-1.8.0-jklapw7gpgw7rftjwecmk22p7wz4qpc2;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0;/usr/tce/packages/cuda/cuda-11.2.0;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/usr/tcetmp;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/cmake/cmake-3.21.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/axom-develop-woz7ol2eqtmsmfz3sckoddilap5hixzq/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/axom-develop-woz7ol2eqtmsmfz3sckoddilap5hixzq/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/c2c-1.8.0-jklapw7gpgw7rftjwecmk22p7wz4qpc2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/conduit-0.9.1-wh6qi5s3jncyggsy6w4dxdlcg3n3feag/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/hdf5-1.8.23-vlybikhncayldwo36udsi225qyan7dos/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/metis-5.1.0-wzyd4pwtce4c22uw3tq3dljdjpfjrd3z/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/parmetis-4.0.3-buyj5iliasgoeiauw335rdrvht4l46ut/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.2.0/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/lua-5.4.4-6jtix4lxlnmvpkuahs62qqbjk5yubmux/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/mfem-4.6.0-giwvzuwtccsd4dt3y6co4ul3x2lkgmpw/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/hypre-2.24.0-njvlsye4yxx7gzho7hpvfaiyugfztlef/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/py-jsonschema-2.6.0-qpksngigqtckjhj62aeckyiptsyrquwo/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/raja-2024.02.0-kghzomlpcrlcri3dky476kdizqatfe5c/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/camp-2024.02.0-ppwilytkx2rffmtiroong3ucsojgc2o7/lib;/usr/tce/packages/cuda/cuda-11.2.0/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/umpire-2024.02.0-57lf4jwgiqrgzpeaj7uerwej3ht4wgyt/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/fmt-10.2.1-fl5fgyfjfnworql33rfi4oufl2fyx2ec/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/axom-develop-woz7ol2eqtmsmfz3sckoddilap5hixzq/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/axom-develop-woz7ol2eqtmsmfz3sckoddilap5hixzq/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/c2c-1.8.0-jklapw7gpgw7rftjwecmk22p7wz4qpc2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/conduit-0.9.1-wh6qi5s3jncyggsy6w4dxdlcg3n3feag/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/hdf5-1.8.23-vlybikhncayldwo36udsi225qyan7dos/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/metis-5.1.0-wzyd4pwtce4c22uw3tq3dljdjpfjrd3z/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/parmetis-4.0.3-buyj5iliasgoeiauw335rdrvht4l46ut/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.2.0/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/lua-5.4.4-6jtix4lxlnmvpkuahs62qqbjk5yubmux/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/mfem-4.6.0-giwvzuwtccsd4dt3y6co4ul3x2lkgmpw/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/hypre-2.24.0-njvlsye4yxx7gzho7hpvfaiyugfztlef/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/py-jsonschema-2.6.0-qpksngigqtckjhj62aeckyiptsyrquwo/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/raja-2024.02.0-kghzomlpcrlcri3dky476kdizqatfe5c/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/camp-2024.02.0-ppwilytkx2rffmtiroong3ucsojgc2o7/lib;/usr/tce/packages/cuda/cuda-11.2.0/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/umpire-2024.02.0-57lf4jwgiqrgzpeaj7uerwej3ht4wgyt/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2/fmt-10.2.1-fl5fgyfjfnworql33rfi4oufl2fyx2ec/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/xl/xlc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/xl/xlc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/xl/xlc++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/xl/xlc++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/spack/lib/spack/env/xl/xlf90" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/spack/lib/spack/env/xl/xlf90" CACHE PATH "") else() @@ -37,8 +43,6 @@ set(CMAKE_CXX_FLAGS "--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1" CACHE STRI set(CMAKE_Fortran_FLAGS "--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1" CACHE STRING "") -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") #------------------------------------------------------------------------------ @@ -111,23 +115,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_18_12_46_33/xl-16.1.1.2" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_06_20_19_26/xl-16.1.1.2" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-pil6joltz2jsp4vcdsfgndntfkqoi3na" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-wh6qi5s3jncyggsy6w4dxdlcg3n3feag" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-ckwviu4jwtot52xykd3kuryozuw5o35p" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-jklapw7gpgw7rftjwecmk22p7wz4qpc2" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-264o4xkxhcafenixttd6lw5k466a62b3" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-giwvzuwtccsd4dt3y6co4ul3x2lkgmpw" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-y23h3hgemr7s6terq2mvsz5if5u327sr" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-vlybikhncayldwo36udsi225qyan7dos" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-6yyyruucztcz5p4w33mhydqn5kiywkjn" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-6jtix4lxlnmvpkuahs62qqbjk5yubmux" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-7et5l25lkvvjz2r772uabj7hrstg3y2z" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-kghzomlpcrlcri3dky476kdizqatfe5c" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-5pojmv2de7q5pimrh253hwamycx7jfl7" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-57lf4jwgiqrgzpeaj7uerwej3ht4wgyt" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-q4hulo6jzt2wnuzzj5jjmlvkdtu4ckdj" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-ppwilytkx2rffmtiroong3ucsojgc2o7" CACHE PATH "") # scr not built @@ -141,6 +145,8 @@ set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-forma set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-qpksngigqtckjhj62aeckyiptsyrquwo/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake index 756d66b5d0..db22ed82db 100644 --- a/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake +++ b/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/scr-3.0.1-5edtc4k2wstti2dh4kp2tno7rmwr3lyd;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/spath-0.2.0-gvlnzegcdph7ien3w4tjcxevblf2xe4r;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/libyogrt-1.33-3joihut3xh67qmtalrqadzujfzxwpodj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/er-0.2.0-befo66qsdjjulpnhaxvhk4uil45ynd6u;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/shuffile-0.2.0-j5blkpa2h3keb562qb5pdnfiuzyaecfd;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/redset-0.2.0-tllpyzklkik7oa32us3tigl7vdvil42o;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/rankstr-0.1.0-jkgwo3kyvegaapdtm67mg4aknu44foyn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/dtcmp-1.1.4-u376uqcnt3y7ebu5ocfvk7bovkr2febv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/lwgrp-1.0.5-am6sfml4trdhzlds365vbepezgdvdocz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/axl-0.7.1-t7yboywzjziqb3hbgidynhbk5vd33jc7;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/kvtree-1.3.0-4zcbvvaqpbkdt7xc4pbu7urlkdywjjd7;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/hypre-2.24.0-bwh42bebp4hiuwzlwcthpgkawape6dp3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/parmetis-4.0.3-jthqwflsj5bpe6onwsb5r2zi5wbx6pq4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/metis-5.1.0-imzig3eih3itpztvvk4yildzgq6aeelo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/gmake-4.4.1-6lgy76r7dbvqm6mbwb2jkpcuycf7tb27;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6/blt-0.5.3-xa3bmu75nkolqiewb5ftk5tp2jpzw57n;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/umpire-2024.02.0-jhuql5fc2vhya4sdl7g4nlcrzaoycqai;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/scr-3.0.1-t7t35dyvwswfrk3lp2k4tcjpiyyylgr6;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/spath-0.2.0-5ypljdbn6yf6ab3jabzpeeuxxvbm6vix;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/er-0.2.0-pfk7tzcycgqnc73twpnleapauynyrmuo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/shuffile-0.2.0-lcyevsv6yv4cwtahb3kt5h4emqtfwwvb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/redset-0.2.0-yg22aoerdpabedvtormddcankg4lkitu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/rankstr-0.1.0-t7qtfe3uihx4s2ia5gft2rvwmbfsaqcz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/dtcmp-1.1.4-scoxi2onj4nu3g5em5dgc4imwzihgfjj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/lwgrp-1.0.5-rdvuqikm56okeru5jkroem5tpaybke3q;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/axl-0.7.1-dvovqn3v6stb27lftz5c2jv7ykyt74o3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/kvtree-1.3.0-3lkpy2ktv66bhbyxtg7r6xca2shap6sw;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/raja-2024.02.0-i7u43vvuic25rvjjhkeblvxeitkvzjwy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/py-jsonschema-2.6.0-6j5dc4xbppedseqpxhmnvdsvfm5nohqz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/mfem-4.6.0-2sgpgtnhas5crnwvexabyzuzouxgblc5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/hypre-2.24.0-jonmheld2iyk5vpkxjps3wvk6ojyvkm5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/conduit-0.9.1-sioyszp7ze6fzubtdslxlpkxzojic7hq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/parmetis-4.0.3-de7rslbjz6xchwd4jlec2iswp6yf4yt7;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/hdf5-1.8.23-j75364eqyn3yxqzod7t4v3hpbaw3zqg4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/blt-0.6.1.4-oouarzy7h3sj5quygkhjaduigaxbj4at;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/fmt-10.2.1-lfndxhuits6wwazxaoj5dxl3ix3hw2cc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/camp-2024.02.0-ejjy6cua3jj5bnwbk3r6x46ffgqe6tip;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/zlib-ng-2.1.5-lkg7eg7nky6w74eujzgmp6hnhkaf2w7p;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/libyogrt-1.33-z45arsyuiqgmqeo3vnzdiosnbyksfypl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/metis-5.1.0-ggcpxjmhkbi3nwtqmgu7dal2rsedyza5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/gmake-4.4.1-jimcbwsnakmlfui3jg7a4e6327ry222f;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/c2c-1.8.0-eojdjy4bkke6p7mtj47tsbk35f3ag3us;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/axom-develop-e3jrpv4mb36q3jxxcbz2ubhcdd75zs2a/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/axom-develop-e3jrpv4mb36q3jxxcbz2ubhcdd75zs2a/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/c2c-1.8.0-eojdjy4bkke6p7mtj47tsbk35f3ag3us/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/conduit-0.9.1-sioyszp7ze6fzubtdslxlpkxzojic7hq/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/hdf5-1.8.23-j75364eqyn3yxqzod7t4v3hpbaw3zqg4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/zlib-ng-2.1.5-lkg7eg7nky6w74eujzgmp6hnhkaf2w7p/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/metis-5.1.0-ggcpxjmhkbi3nwtqmgu7dal2rsedyza5/lib;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/parmetis-4.0.3-de7rslbjz6xchwd4jlec2iswp6yf4yt7/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/mfem-4.6.0-2sgpgtnhas5crnwvexabyzuzouxgblc5/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/hypre-2.24.0-jonmheld2iyk5vpkxjps3wvk6ojyvkm5/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/py-jsonschema-2.6.0-6j5dc4xbppedseqpxhmnvdsvfm5nohqz/lib;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/raja-2024.02.0-i7u43vvuic25rvjjhkeblvxeitkvzjwy/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/camp-2024.02.0-ejjy6cua3jj5bnwbk3r6x46ffgqe6tip/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/dtcmp-1.1.4-scoxi2onj4nu3g5em5dgc4imwzihgfjj/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/lwgrp-1.0.5-rdvuqikm56okeru5jkroem5tpaybke3q/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/libyogrt-1.33-z45arsyuiqgmqeo3vnzdiosnbyksfypl/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/scr-3.0.1-t7t35dyvwswfrk3lp2k4tcjpiyyylgr6/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/axl-0.7.1-dvovqn3v6stb27lftz5c2jv7ykyt74o3/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/kvtree-1.3.0-3lkpy2ktv66bhbyxtg7r6xca2shap6sw/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/er-0.2.0-pfk7tzcycgqnc73twpnleapauynyrmuo/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/rankstr-0.1.0-t7qtfe3uihx4s2ia5gft2rvwmbfsaqcz/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/redset-0.2.0-yg22aoerdpabedvtormddcankg4lkitu/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/shuffile-0.2.0-lcyevsv6yv4cwtahb3kt5h4emqtfwwvb/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/spath-0.2.0-5ypljdbn6yf6ab3jabzpeeuxxvbm6vix/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/umpire-2024.02.0-jhuql5fc2vhya4sdl7g4nlcrzaoycqai/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/fmt-10.2.1-lfndxhuits6wwazxaoj5dxl3ix3hw2cc/lib64;/opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/axom-develop-e3jrpv4mb36q3jxxcbz2ubhcdd75zs2a/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/axom-develop-e3jrpv4mb36q3jxxcbz2ubhcdd75zs2a/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/c2c-1.8.0-eojdjy4bkke6p7mtj47tsbk35f3ag3us/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/conduit-0.9.1-sioyszp7ze6fzubtdslxlpkxzojic7hq/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/hdf5-1.8.23-j75364eqyn3yxqzod7t4v3hpbaw3zqg4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/zlib-ng-2.1.5-lkg7eg7nky6w74eujzgmp6hnhkaf2w7p/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/metis-5.1.0-ggcpxjmhkbi3nwtqmgu7dal2rsedyza5/lib;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/parmetis-4.0.3-de7rslbjz6xchwd4jlec2iswp6yf4yt7/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/mfem-4.6.0-2sgpgtnhas5crnwvexabyzuzouxgblc5/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/hypre-2.24.0-jonmheld2iyk5vpkxjps3wvk6ojyvkm5/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/py-jsonschema-2.6.0-6j5dc4xbppedseqpxhmnvdsvfm5nohqz/lib;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/raja-2024.02.0-i7u43vvuic25rvjjhkeblvxeitkvzjwy/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/camp-2024.02.0-ejjy6cua3jj5bnwbk3r6x46ffgqe6tip/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/dtcmp-1.1.4-scoxi2onj4nu3g5em5dgc4imwzihgfjj/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/lwgrp-1.0.5-rdvuqikm56okeru5jkroem5tpaybke3q/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/libyogrt-1.33-z45arsyuiqgmqeo3vnzdiosnbyksfypl/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/scr-3.0.1-t7t35dyvwswfrk3lp2k4tcjpiyyylgr6/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/axl-0.7.1-dvovqn3v6stb27lftz5c2jv7ykyt74o3/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/kvtree-1.3.0-3lkpy2ktv66bhbyxtg7r6xca2shap6sw/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/er-0.2.0-pfk7tzcycgqnc73twpnleapauynyrmuo/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/rankstr-0.1.0-t7qtfe3uihx4s2ia5gft2rvwmbfsaqcz/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/redset-0.2.0-yg22aoerdpabedvtormddcankg4lkitu/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/shuffile-0.2.0-lcyevsv6yv4cwtahb3kt5h4emqtfwwvb/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/spath-0.2.0-5ypljdbn6yf6ab3jabzpeeuxxvbm6vix/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/umpire-2024.02.0-jhuql5fc2vhya4sdl7g4nlcrzaoycqai/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6/fmt-10.2.1-lfndxhuits6wwazxaoj5dxl3ix3hw2cc/lib64;/opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -31,8 +37,6 @@ else() endif() -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") set(BLT_EXE_LINKER_FLAGS " -Wl,-rpath,/usr/tce/packages/clang/clang-14.0.6/lib" CACHE STRING "Adds a missing libstdc++ rpath") @@ -69,45 +73,45 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/clang-14.0.6" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/clang-14.0.6" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-sioyszp7ze6fzubtdslxlpkxzojic7hq" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-eojdjy4bkke6p7mtj47tsbk35f3ag3us" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-2sgpgtnhas5crnwvexabyzuzouxgblc5" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-j75364eqyn3yxqzod7t4v3hpbaw3zqg4" CACHE PATH "") set(LUA_DIR "/usr" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-i7u43vvuic25rvjjhkeblvxeitkvzjwy" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-jhuql5fc2vhya4sdl7g4nlcrzaoycqai" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-ejjy6cua3jj5bnwbk3r6x46ffgqe6tip" CACHE PATH "") -set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-5edtc4k2wstti2dh4kp2tno7rmwr3lyd" CACHE PATH "") +set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-t7t35dyvwswfrk3lp2k4tcjpiyyylgr6" CACHE PATH "") -set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-4zcbvvaqpbkdt7xc4pbu7urlkdywjjd7" CACHE PATH "") +set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-3lkpy2ktv66bhbyxtg7r6xca2shap6sw" CACHE PATH "") -set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-u376uqcnt3y7ebu5ocfvk7bovkr2febv" CACHE PATH "") +set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-scoxi2onj4nu3g5em5dgc4imwzihgfjj" CACHE PATH "") -set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-gvlnzegcdph7ien3w4tjcxevblf2xe4r" CACHE PATH "") +set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-5ypljdbn6yf6ab3jabzpeeuxxvbm6vix" CACHE PATH "") -set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-t7yboywzjziqb3hbgidynhbk5vd33jc7" CACHE PATH "") +set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-dvovqn3v6stb27lftz5c2jv7ykyt74o3" CACHE PATH "") -set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-am6sfml4trdhzlds365vbepezgdvdocz" CACHE PATH "") +set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-rdvuqikm56okeru5jkroem5tpaybke3q" CACHE PATH "") -set(ER_DIR "${TPL_ROOT}/er-0.2.0-befo66qsdjjulpnhaxvhk4uil45ynd6u" CACHE PATH "") +set(ER_DIR "${TPL_ROOT}/er-0.2.0-pfk7tzcycgqnc73twpnleapauynyrmuo" CACHE PATH "") -set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-jkgwo3kyvegaapdtm67mg4aknu44foyn" CACHE PATH "") +set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-t7qtfe3uihx4s2ia5gft2rvwmbfsaqcz" CACHE PATH "") -set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-tllpyzklkik7oa32us3tigl7vdvil42o" CACHE PATH "") +set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-yg22aoerdpabedvtormddcankg4lkitu" CACHE PATH "") -set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-j5blkpa2h3keb562qb5pdnfiuzyaecfd" CACHE PATH "") +set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-lcyevsv6yv4cwtahb3kt5h4emqtfwwvb" CACHE PATH "") -set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-3joihut3xh67qmtalrqadzujfzxwpodj" CACHE PATH "") +set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-z45arsyuiqgmqeo3vnzdiosnbyksfypl" CACHE PATH "") #------------------------------------------------------------------------------ # Devtools @@ -119,6 +123,8 @@ set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/lat set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-6j5dc4xbppedseqpxhmnvdsvfm5nohqz/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake b/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake index c3db9218f3..a228744ea6 100644 --- a/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake +++ b/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/scr-3.0.1-znr5hvdmrpg2wwtcrepv3bzh32visddj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/spath-0.2.0-scp7lun3jtdgorfmd4mzhtieqkjko57q;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/libyogrt-1.33-riegwpsbfjywz6pumvit2eadroiosowy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/er-0.2.0-m7mypt2brwrodmfun3ya2cwpkuwpccnv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/shuffile-0.2.0-74ysb2qi6xkrx7u5vsa2jnmcqof3q4je;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/redset-0.2.0-7bhg5tua2jns5ob7r6stbgitzlfggdax;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/rankstr-0.1.0-yuunbkeetjd4y563p4dzxp23rsdcc6tr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/dtcmp-1.1.4-bk55ioptacxzxnpxcgu27vwk2nacb35s;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/lwgrp-1.0.5-zhpxnopjtpr5cchaqufivi2sn4crkgwn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/axl-0.7.1-b3zz33f7lmeal5thbfyuc6cmbdfek2vv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/kvtree-1.3.0-oeqjobwdjxemywgc77pfuv4nnpxk6buj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/hypre-2.24.0-lof7hdy7wsyuei436d6uhilprsgmr3ik;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/parmetis-4.0.3-lq6aryhur6qn3trc2qxizvz4nae5ngzf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/metis-5.1.0-pyrzcrzqvl6q27kk637o2nwi3j7ibseb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/gmake-4.4.1-y2kaxrqjbg3dcwo7dzfphztusfjqoowq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1/blt-0.5.3-iljv7wrfi4r5i4drs4yf65rgsuunaxjn;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/umpire-2024.02.0-2edi7papg24dx6cmzuu4cvli6gn5ula4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/fmt-10.2.1-vsppemwn4lv42jffltnu2m5wk7pa4mh4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/scr-3.0.1-nimozblni7qmgxh7m4lpclv4ducbwmd7;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/spath-0.2.0-vy4oatc22e4yhneh564uexojguzk64hl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/libyogrt-1.33-5ylxltz7yzkytfwjqsdy7alvfpvblpfa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/er-0.2.0-ssi5sg74fzuszg64bx4w36k74aylefbs;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/shuffile-0.2.0-2dqga6mipogmwwnegz6ruroxjjpuydns;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/redset-0.2.0-26dcmicvi4gl3n7bezyvvt6tzxgfhyt4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/rankstr-0.1.0-rtae4hecutfnw3p2c3pw2r23wel57wxe;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/dtcmp-1.1.4-fhlas27vbqequpdrt7hs4z5y7fu6fcux;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/lwgrp-1.0.5-xy2pfakxxt737yqixkijiopg5aqe6qy4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/axl-0.7.1-it2ovw5easrshsv2ii3y7ui7sykejtl3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/kvtree-1.3.0-ox6ll5w2vlux2gncxlxp6f7sduc5we3k;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/raja-2024.02.0-lgda75dl72dsc3fpkaboonrastlb533i;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/camp-2024.02.0-54ph6bxcskqc6vyj2yumw2c453rdw3ms;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/py-jsonschema-2.6.0-lxk3nz6n2wxarwsyghge5l6jio4pze63;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/mfem-4.6.0-72vdexr6wsfxessfqnjamz4yw7bbimzv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/hypre-2.24.0-fqukfipx623hwcdtl44ul6m7gf436bea;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/gmake-4.4.1-hnowwppvujezizfysc64xc2myqqulzcn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/conduit-0.9.1-2gxyktbxfdki7l62knbd2gcv2po5mnnz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/parmetis-4.0.3-olkucdyohy6nglxyp6yqvflfxhhtjji4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/metis-5.1.0-au7rbsfu6yv7cazug6635jzvb2gwy7st;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/hdf5-1.8.23-qdwxt3e3mv7bjt3xqcybad7beymgxcsn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/zlib-ng-2.1.5-shzp76r665h2g3lnqspfmluapd7jxtrt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/c2c-1.8.0-fahftlekwziw2ls4bezzaviuke4kvqyz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/blt-0.6.1.4-ee4ftwhz24yhie53n4ximxniibs3wair;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/gcc-runtime-10.3.1-yxmwjg76ccmk3rbqtfni7b56ykrldyrb;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/axom-develop-xiuioy7dxvykmlob3vudqstogdvorl4v/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/axom-develop-xiuioy7dxvykmlob3vudqstogdvorl4v/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/c2c-1.8.0-fahftlekwziw2ls4bezzaviuke4kvqyz/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/gcc-runtime-10.3.1-yxmwjg76ccmk3rbqtfni7b56ykrldyrb/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/conduit-0.9.1-2gxyktbxfdki7l62knbd2gcv2po5mnnz/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/hdf5-1.8.23-qdwxt3e3mv7bjt3xqcybad7beymgxcsn/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/zlib-ng-2.1.5-shzp76r665h2g3lnqspfmluapd7jxtrt/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/metis-5.1.0-au7rbsfu6yv7cazug6635jzvb2gwy7st/lib;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/parmetis-4.0.3-olkucdyohy6nglxyp6yqvflfxhhtjji4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/mfem-4.6.0-72vdexr6wsfxessfqnjamz4yw7bbimzv/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/hypre-2.24.0-fqukfipx623hwcdtl44ul6m7gf436bea/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/py-jsonschema-2.6.0-lxk3nz6n2wxarwsyghge5l6jio4pze63/lib;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/raja-2024.02.0-lgda75dl72dsc3fpkaboonrastlb533i/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/camp-2024.02.0-54ph6bxcskqc6vyj2yumw2c453rdw3ms/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/dtcmp-1.1.4-fhlas27vbqequpdrt7hs4z5y7fu6fcux/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/lwgrp-1.0.5-xy2pfakxxt737yqixkijiopg5aqe6qy4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/libyogrt-1.33-5ylxltz7yzkytfwjqsdy7alvfpvblpfa/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/scr-3.0.1-nimozblni7qmgxh7m4lpclv4ducbwmd7/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/axl-0.7.1-it2ovw5easrshsv2ii3y7ui7sykejtl3/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/kvtree-1.3.0-ox6ll5w2vlux2gncxlxp6f7sduc5we3k/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/er-0.2.0-ssi5sg74fzuszg64bx4w36k74aylefbs/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/rankstr-0.1.0-rtae4hecutfnw3p2c3pw2r23wel57wxe/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/redset-0.2.0-26dcmicvi4gl3n7bezyvvt6tzxgfhyt4/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/shuffile-0.2.0-2dqga6mipogmwwnegz6ruroxjjpuydns/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/spath-0.2.0-vy4oatc22e4yhneh564uexojguzk64hl/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/umpire-2024.02.0-2edi7papg24dx6cmzuu4cvli6gn5ula4/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/fmt-10.2.1-vsppemwn4lv42jffltnu2m5wk7pa4mh4/lib64;/collab/usr/global/tools/tce4/packages/gcc/gcc-10.3.1/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/axom-develop-xiuioy7dxvykmlob3vudqstogdvorl4v/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/axom-develop-xiuioy7dxvykmlob3vudqstogdvorl4v/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/c2c-1.8.0-fahftlekwziw2ls4bezzaviuke4kvqyz/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/gcc-runtime-10.3.1-yxmwjg76ccmk3rbqtfni7b56ykrldyrb/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/conduit-0.9.1-2gxyktbxfdki7l62knbd2gcv2po5mnnz/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/hdf5-1.8.23-qdwxt3e3mv7bjt3xqcybad7beymgxcsn/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/zlib-ng-2.1.5-shzp76r665h2g3lnqspfmluapd7jxtrt/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/metis-5.1.0-au7rbsfu6yv7cazug6635jzvb2gwy7st/lib;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/parmetis-4.0.3-olkucdyohy6nglxyp6yqvflfxhhtjji4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/mfem-4.6.0-72vdexr6wsfxessfqnjamz4yw7bbimzv/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/hypre-2.24.0-fqukfipx623hwcdtl44ul6m7gf436bea/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/py-jsonschema-2.6.0-lxk3nz6n2wxarwsyghge5l6jio4pze63/lib;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/raja-2024.02.0-lgda75dl72dsc3fpkaboonrastlb533i/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/camp-2024.02.0-54ph6bxcskqc6vyj2yumw2c453rdw3ms/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/dtcmp-1.1.4-fhlas27vbqequpdrt7hs4z5y7fu6fcux/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/lwgrp-1.0.5-xy2pfakxxt737yqixkijiopg5aqe6qy4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/libyogrt-1.33-5ylxltz7yzkytfwjqsdy7alvfpvblpfa/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/scr-3.0.1-nimozblni7qmgxh7m4lpclv4ducbwmd7/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/axl-0.7.1-it2ovw5easrshsv2ii3y7ui7sykejtl3/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/kvtree-1.3.0-ox6ll5w2vlux2gncxlxp6f7sduc5we3k/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/er-0.2.0-ssi5sg74fzuszg64bx4w36k74aylefbs/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/rankstr-0.1.0-rtae4hecutfnw3p2c3pw2r23wel57wxe/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/redset-0.2.0-26dcmicvi4gl3n7bezyvvt6tzxgfhyt4/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/shuffile-0.2.0-2dqga6mipogmwwnegz6ruroxjjpuydns/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/spath-0.2.0-vy4oatc22e4yhneh564uexojguzk64hl/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/umpire-2024.02.0-2edi7papg24dx6cmzuu4cvli6gn5ula4/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1/fmt-10.2.1-vsppemwn4lv42jffltnu2m5wk7pa4mh4/lib64;/collab/usr/global/tools/tce4/packages/gcc/gcc-10.3.1/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -31,8 +37,6 @@ else() endif() -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") #------------------------------------------------------------------------------ @@ -67,45 +71,45 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/gcc-10.3.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/gcc-10.3.1" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-2gxyktbxfdki7l62knbd2gcv2po5mnnz" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-fahftlekwziw2ls4bezzaviuke4kvqyz" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-72vdexr6wsfxessfqnjamz4yw7bbimzv" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-qdwxt3e3mv7bjt3xqcybad7beymgxcsn" CACHE PATH "") set(LUA_DIR "/usr" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-lgda75dl72dsc3fpkaboonrastlb533i" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-2edi7papg24dx6cmzuu4cvli6gn5ula4" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-54ph6bxcskqc6vyj2yumw2c453rdw3ms" CACHE PATH "") -set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-znr5hvdmrpg2wwtcrepv3bzh32visddj" CACHE PATH "") +set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-nimozblni7qmgxh7m4lpclv4ducbwmd7" CACHE PATH "") -set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-oeqjobwdjxemywgc77pfuv4nnpxk6buj" CACHE PATH "") +set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-ox6ll5w2vlux2gncxlxp6f7sduc5we3k" CACHE PATH "") -set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-bk55ioptacxzxnpxcgu27vwk2nacb35s" CACHE PATH "") +set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-fhlas27vbqequpdrt7hs4z5y7fu6fcux" CACHE PATH "") -set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-scp7lun3jtdgorfmd4mzhtieqkjko57q" CACHE PATH "") +set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-vy4oatc22e4yhneh564uexojguzk64hl" CACHE PATH "") -set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-b3zz33f7lmeal5thbfyuc6cmbdfek2vv" CACHE PATH "") +set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-it2ovw5easrshsv2ii3y7ui7sykejtl3" CACHE PATH "") -set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-zhpxnopjtpr5cchaqufivi2sn4crkgwn" CACHE PATH "") +set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-xy2pfakxxt737yqixkijiopg5aqe6qy4" CACHE PATH "") -set(ER_DIR "${TPL_ROOT}/er-0.2.0-m7mypt2brwrodmfun3ya2cwpkuwpccnv" CACHE PATH "") +set(ER_DIR "${TPL_ROOT}/er-0.2.0-ssi5sg74fzuszg64bx4w36k74aylefbs" CACHE PATH "") -set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-yuunbkeetjd4y563p4dzxp23rsdcc6tr" CACHE PATH "") +set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-rtae4hecutfnw3p2c3pw2r23wel57wxe" CACHE PATH "") -set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-7bhg5tua2jns5ob7r6stbgitzlfggdax" CACHE PATH "") +set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-26dcmicvi4gl3n7bezyvvt6tzxgfhyt4" CACHE PATH "") -set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-74ysb2qi6xkrx7u5vsa2jnmcqof3q4je" CACHE PATH "") +set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-2dqga6mipogmwwnegz6ruroxjjpuydns" CACHE PATH "") -set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-riegwpsbfjywz6pumvit2eadroiosowy" CACHE PATH "") +set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-5ylxltz7yzkytfwjqsdy7alvfpvblpfa" CACHE PATH "") #------------------------------------------------------------------------------ # Devtools @@ -117,6 +121,8 @@ set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/lat set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-lxk3nz6n2wxarwsyghge5l6jio4pze63/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake index 25164529ca..653b0e59b0 100644 --- a/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake +++ b/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/hypre-2.24.0-qdjyl5ibcpl4nxb6t5godfgvi5bb6hac;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/parmetis-4.0.3-nqxoj5gqogj32hfo5ognkcb6vg24zdlc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/metis-5.1.0-tb5bijmooj2d6d2npjpajcj4fyu4yd4y;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/gmake-4.4.1-e3r4ry6vgi7zp4mbwfokypkutqwpctek;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0/blt-0.5.3-i7qltms7ksyz4xltznzbtsafywrykq7b;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/usr/tce" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/umpire-2024.02.0-4nxnup6vxwkwkinxdzzinkxul6vk2lsj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/raja-2024.02.0-v5ckygwjzmo7e2rts5qxwgfswhhpeqta;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/py-jsonschema-2.6.0-scktpdojmezaljg2bxfbzmf5lx3nmwvc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/mfem-4.6.0-hma2wvr5tv3fkry6kdqfxmtsnqg6fv4d;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/hypre-2.24.0-czbxd2tmdjbl7v4nwommsh7xgw7ewgla;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/conduit-0.9.1-t745zbwmn5ffzo7whgwxmz5p5w2ym37z;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/parmetis-4.0.3-hattuaxqypmcfeqr3nvedmojwbgiora2;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/hdf5-1.8.23-2l37bduu2kjsgmhjxbfdgchsha2di2of;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/blt-0.6.1.4-3p2ecutmo7drpwwvvsgtcqxakxjoy573;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/fmt-10.2.1-jltnp6nb3minlrrafmdenoakubdzom57;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/camp-2024.02.0-xyur27wnppnansskdldrlqyzormhcr4e;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/zlib-ng-2.1.5-jtmqc4b5fqadcqbwagtun6kwe6geexbw;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/metis-5.1.0-hk6ipui6fnixwdyloqmqbsixqhtv5hxw;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/gmake-4.4.1-giduhrefimvdwblsuh6cmqipc474toi5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/c2c-1.8.0-ovky3pniupirnys6mtf24ke5sb64mkbr;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/axom-develop-ma6pw2s3obh5afi3kvbgksqemjcs3ty7/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/axom-develop-ma6pw2s3obh5afi3kvbgksqemjcs3ty7/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/c2c-1.8.0-ovky3pniupirnys6mtf24ke5sb64mkbr/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/conduit-0.9.1-t745zbwmn5ffzo7whgwxmz5p5w2ym37z/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/hdf5-1.8.23-2l37bduu2kjsgmhjxbfdgchsha2di2of/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/zlib-ng-2.1.5-jtmqc4b5fqadcqbwagtun6kwe6geexbw/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/metis-5.1.0-hk6ipui6fnixwdyloqmqbsixqhtv5hxw/lib;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/parmetis-4.0.3-hattuaxqypmcfeqr3nvedmojwbgiora2/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/mfem-4.6.0-hma2wvr5tv3fkry6kdqfxmtsnqg6fv4d/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/hypre-2.24.0-czbxd2tmdjbl7v4nwommsh7xgw7ewgla/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/py-jsonschema-2.6.0-scktpdojmezaljg2bxfbzmf5lx3nmwvc/lib;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/raja-2024.02.0-v5ckygwjzmo7e2rts5qxwgfswhhpeqta/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/camp-2024.02.0-xyur27wnppnansskdldrlqyzormhcr4e/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/umpire-2024.02.0-4nxnup6vxwkwkinxdzzinkxul6vk2lsj/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/fmt-10.2.1-jltnp6nb3minlrrafmdenoakubdzom57/lib64;/usr/tce/backend/installations/linux-rhel8-x86_64/gcc-10.3.1/intel-oneapi-compilers-2022.1.0-43xp3r52jx2q2rkf3ctzvskqu572xbky/compiler/2022.1.0/linux/compiler/lib/intel64_lin;/opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/axom-develop-ma6pw2s3obh5afi3kvbgksqemjcs3ty7/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/axom-develop-ma6pw2s3obh5afi3kvbgksqemjcs3ty7/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/c2c-1.8.0-ovky3pniupirnys6mtf24ke5sb64mkbr/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/conduit-0.9.1-t745zbwmn5ffzo7whgwxmz5p5w2ym37z/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/hdf5-1.8.23-2l37bduu2kjsgmhjxbfdgchsha2di2of/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/zlib-ng-2.1.5-jtmqc4b5fqadcqbwagtun6kwe6geexbw/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/metis-5.1.0-hk6ipui6fnixwdyloqmqbsixqhtv5hxw/lib;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/parmetis-4.0.3-hattuaxqypmcfeqr3nvedmojwbgiora2/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/mfem-4.6.0-hma2wvr5tv3fkry6kdqfxmtsnqg6fv4d/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/hypre-2.24.0-czbxd2tmdjbl7v4nwommsh7xgw7ewgla/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/py-jsonschema-2.6.0-scktpdojmezaljg2bxfbzmf5lx3nmwvc/lib;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/raja-2024.02.0-v5ckygwjzmo7e2rts5qxwgfswhhpeqta/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/camp-2024.02.0-xyur27wnppnansskdldrlqyzormhcr4e/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/umpire-2024.02.0-4nxnup6vxwkwkinxdzzinkxul6vk2lsj/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0/fmt-10.2.1-jltnp6nb3minlrrafmdenoakubdzom57/lib64;/usr/tce/backend/installations/linux-rhel8-x86_64/gcc-10.3.1/intel-oneapi-compilers-2022.1.0-43xp3r52jx2q2rkf3ctzvskqu572xbky/compiler/2022.1.0/linux/compiler/lib/intel64_lin;/opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/intel/icc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/spack/lib/spack/env/intel/icc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/intel/icpc" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/spack/lib/spack/env/intel/icpc" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/spack/lib/spack/env/intel/ifort" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/spack/lib/spack/env/intel/ifort" CACHE PATH "") else() @@ -31,8 +37,6 @@ else() endif() -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") #------------------------------------------------------------------------------ @@ -67,23 +71,23 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_31_08_54_50/intel-2022.1.0" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_06_16_55_14/intel-2022.1.0" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-t745zbwmn5ffzo7whgwxmz5p5w2ym37z" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-ovky3pniupirnys6mtf24ke5sb64mkbr" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-hma2wvr5tv3fkry6kdqfxmtsnqg6fv4d" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-2l37bduu2kjsgmhjxbfdgchsha2di2of" CACHE PATH "") set(LUA_DIR "/usr" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-v5ckygwjzmo7e2rts5qxwgfswhhpeqta" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-4nxnup6vxwkwkinxdzzinkxul6vk2lsj" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-xyur27wnppnansskdldrlqyzormhcr4e" CACHE PATH "") # scr not built @@ -97,6 +101,8 @@ set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/lat set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-scktpdojmezaljg2bxfbzmf5lx3nmwvc/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/tioga-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake b/host-configs/tioga-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake index a37c0d22c8..c64236a377 100644 --- a/host-configs/tioga-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake +++ b/host-configs/tioga-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0/umpire-2023.06.0-yeccv6q7zasapkqmulwukmay2xfq5hyu;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0/raja-2023.06.0-7y7neucz73mp5aidhw7kfbmqhwgsr4ww;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0/camp-2023.06.0-zu25serllpaiepsclsd3o7w4clj5k2bs;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0/mfem-4.5.2-znyrzghqsshldarhqa6gweqgukahiyjw;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0/hypre-2.24.0-hodcjhfvx7c6fupyaw5kgoiuazbxcaij;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0/lua-5.4.4-j446jxtxyu4x2byxkcvzv4ek4w5pr3fh;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0/ncurses-6.4-sqvzpcbeunczs72a55mzrqi7rpl7aojx;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0/conduit-0.8.8-nexjzr5p6zy3lb7kbkojaqbmvn64bwnf;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0/parmetis-4.0.3-l3yx62tarv37nnultafaw2q7yows6c22;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0/metis-5.1.0-gwyy4vhrzd77gbdxd4thjxtxwrjads4l;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0/hdf5-1.8.22-gph5gvans7w7rhb3acho7c3yydyxbck6;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0/c2c-1.8.0-oht7wdi5u5r4zlf7mcdk36xcuvt3y5j7;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0/blt-0.5.3-no74mmcw3sf324mpvpdzlu57kmg2xwby;/opt/rocm-5.6.0;/opt/rocm-5.6.0/llvm;/opt/rocm-5.6.0;/opt/rocm-5.6.0/hip;/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.6.0;/usr/tce" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/umpire-2024.02.0-rjjfznegq3beeahbio7h4voasmljpnef;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/raja-2024.02.0-2i63uxx4gs2hv6bseeo53vnvpqxvq53a;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/camp-2024.02.0-z6vcrbxgnq44voxaiplbkss7xkeuezam;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/mfem-4.6.0-rqn67zhr6wo6mgcfqjrb3kzzh4neg52v;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/hypre-2.24.0-ki5iqwndtm6rvb4nrb7ebbvl3x24q3vt;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/lua-5.4.4-k44ecokhewutosgyh3v4ifqejiqxxkwk;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/conduit-0.9.1-weyusx6lu3gczfg24vwaji4dy53ekfc5;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/parmetis-4.0.3-ll2czqc5pmp3olgjpu47krq4jgxksmdt;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/hdf5-1.8.23-iuu6knfssyy4j2uv6qo7oqmm2afqw5jv;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/blt-0.6.1.4-rsolo2redxjrxxepfboqczt24wsewi2r;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/fmt-10.2.1-nr2acfkfdgyihxps6ekcgfn4fk56v5rb;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/zlib-ng-2.1.5-c4toe533t23gocizsqebzf4s662hyxlt;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/metis-5.1.0-rjek5dokihv3f6afzrhphjgg6xcjrfvk;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/ncurses-6.4-ezqmnqki7vits7vrigam3pwcidzycnny;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/c2c-1.8.0-fg73ebtjbsm2kpd5s44vxa6jjsybwbbb;/opt/rocm-5.6.0/llvm;/opt/rocm-5.6.0;/opt/rocm-5.6.0/hip;/opt/rocm-5.6.0;/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.6.0;/usr/tce" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/axom-develop-uidv2vofjqx7373o6tz53up2jxpgkev4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/axom-develop-uidv2vofjqx7373o6tz53up2jxpgkev4/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/c2c-1.8.0-fg73ebtjbsm2kpd5s44vxa6jjsybwbbb/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/conduit-0.9.1-weyusx6lu3gczfg24vwaji4dy53ekfc5/lib;/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.6.0/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/hdf5-1.8.23-iuu6knfssyy4j2uv6qo7oqmm2afqw5jv/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/zlib-ng-2.1.5-c4toe533t23gocizsqebzf4s662hyxlt/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/metis-5.1.0-rjek5dokihv3f6afzrhphjgg6xcjrfvk/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/parmetis-4.0.3-ll2czqc5pmp3olgjpu47krq4jgxksmdt/lib;/opt/rocm-5.6.0/hip/lib;/opt/rocm-5.6.0/lib;/opt/rocm-5.6.0/llvm/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/lua-5.4.4-k44ecokhewutosgyh3v4ifqejiqxxkwk/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/ncurses-6.4-ezqmnqki7vits7vrigam3pwcidzycnny/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/mfem-4.6.0-rqn67zhr6wo6mgcfqjrb3kzzh4neg52v/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/hypre-2.24.0-ki5iqwndtm6rvb4nrb7ebbvl3x24q3vt/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/raja-2024.02.0-2i63uxx4gs2hv6bseeo53vnvpqxvq53a/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/camp-2024.02.0-z6vcrbxgnq44voxaiplbkss7xkeuezam/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/umpire-2024.02.0-rjjfznegq3beeahbio7h4voasmljpnef/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/fmt-10.2.1-nr2acfkfdgyihxps6ekcgfn4fk56v5rb/lib64;/opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/axom-develop-uidv2vofjqx7373o6tz53up2jxpgkev4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/axom-develop-uidv2vofjqx7373o6tz53up2jxpgkev4/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/c2c-1.8.0-fg73ebtjbsm2kpd5s44vxa6jjsybwbbb/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/conduit-0.9.1-weyusx6lu3gczfg24vwaji4dy53ekfc5/lib;/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.6.0/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/hdf5-1.8.23-iuu6knfssyy4j2uv6qo7oqmm2afqw5jv/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/zlib-ng-2.1.5-c4toe533t23gocizsqebzf4s662hyxlt/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/metis-5.1.0-rjek5dokihv3f6afzrhphjgg6xcjrfvk/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/parmetis-4.0.3-ll2czqc5pmp3olgjpu47krq4jgxksmdt/lib;/opt/rocm-5.6.0/hip/lib;/opt/rocm-5.6.0/lib;/opt/rocm-5.6.0/llvm/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/lua-5.4.4-k44ecokhewutosgyh3v4ifqejiqxxkwk/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/ncurses-6.4-ezqmnqki7vits7vrigam3pwcidzycnny/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/mfem-4.6.0-rqn67zhr6wo6mgcfqjrb3kzzh4neg52v/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/hypre-2.24.0-ki5iqwndtm6rvb4nrb7ebbvl3x24q3vt/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/raja-2024.02.0-2i63uxx4gs2hv6bseeo53vnvpqxvq53a/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/camp-2024.02.0-z6vcrbxgnq44voxaiplbkss7xkeuezam/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/umpire-2024.02.0-rjjfznegq3beeahbio7h4voasmljpnef/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0/fmt-10.2.1-nr2acfkfdgyihxps6ekcgfn4fk56v5rb/lib64;/opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/spack/lib/spack/env/clang/flang" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/spack/lib/spack/env/clang/flang" CACHE PATH "") else() @@ -33,8 +39,6 @@ endif() set(CMAKE_Fortran_FLAGS "-Mfreeform" CACHE STRING "") -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -DNDEBUG" CACHE STRING "") @@ -67,6 +71,8 @@ set(HIP_ROOT_DIR "/opt/rocm-5.6.0/hip" CACHE PATH "") set(HIP_CXX_COMPILER "/opt/rocm-5.6.0/hip/bin/hipcc" CACHE PATH "") +set(CMAKE_HIP_COMPILER "/opt/rocm-5.6.0/llvm/bin/clang++" CACHE FILEPATH "") + set(CMAKE_HIP_ARCHITECTURES "gfx90a" CACHE STRING "") set(AMDGPU_TARGETS "gfx90a" CACHE STRING "") @@ -98,23 +104,23 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_17_41_54/clang-16.0.0" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_06_20_25_59/clang-16.0.0" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-nexjzr5p6zy3lb7kbkojaqbmvn64bwnf" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-weyusx6lu3gczfg24vwaji4dy53ekfc5" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-oht7wdi5u5r4zlf7mcdk36xcuvt3y5j7" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-fg73ebtjbsm2kpd5s44vxa6jjsybwbbb" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-znyrzghqsshldarhqa6gweqgukahiyjw" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-rqn67zhr6wo6mgcfqjrb3kzzh4neg52v" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-gph5gvans7w7rhb3acho7c3yydyxbck6" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-iuu6knfssyy4j2uv6qo7oqmm2afqw5jv" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-j446jxtxyu4x2byxkcvzv4ek4w5pr3fh" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-k44ecokhewutosgyh3v4ifqejiqxxkwk" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-7y7neucz73mp5aidhw7kfbmqhwgsr4ww" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-2i63uxx4gs2hv6bseeo53vnvpqxvq53a" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-yeccv6q7zasapkqmulwukmay2xfq5hyu" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-rjjfznegq3beeahbio7h4voasmljpnef" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-zu25serllpaiepsclsd3o7w4clj5k2bs" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-z6vcrbxgnq44voxaiplbkss7xkeuezam" CACHE PATH "") # scr not built From a08a105f2576d0026a646ee9bf4f910ecdd0c191 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 7 Mar 2024 08:51:07 -0800 Subject: [PATCH 582/639] rz host-configs --- ...lueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake | 38 +++++++------ ..._3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake | 38 +++++++------ ...l-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake | 34 ++++++----- ...eos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake | 34 ++++++----- ...l-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake | 36 +++++++----- ...eos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake | 36 +++++++----- ...zgenie-toss_4_x86_64_ib-clang@14.0.6.cmake | 56 ++++++++++--------- .../rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake | 56 ++++++++++--------- ...enie-toss_4_x86_64_ib-intel@2022.1.0.cmake | 34 ++++++----- ...ss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake | 36 +++++++----- 10 files changed, 229 insertions(+), 169 deletions(-) diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake index f217ca7625..1186b7b47d 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/umpire-2023.06.0-h6wvcftrmg6w5e7etumawlsf5trgvsl7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/raja-2023.06.0-jra4z7ctml3mpzsuixtbegawg7g75cec;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/camp-2023.06.0-abpqpyhwsuhzu4csmdy2nejqzrkfqh7a;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/mfem-4.5.2-dbebdqverfh4lwgj5nal5d2vgmmvl4xb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/hypre-2.24.0-vrxf2vyvdlmylt5u2cu3vy4dqdc76yvq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/lua-5.4.4-o6kjgr3nt6ssvrj3mmonawxj3sbbcnel;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/conduit-0.8.8-6vxxfa5atbct57263kwixtpa5jz54kew;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/parmetis-4.0.3-aivfy5rovu5bwsiryry63apan5cdtc4m;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/metis-5.1.0-k7t53hncr4qxzqoyzhekte5rqrorclyh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/hdf5-1.8.22-x626yhzvwnx7ssrmgl3lnvncx7s5nbkf;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/zlib-1.2.13-aple3eiihvtvpurrdvosba4qab7rgdnr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/c2c-1.8.0-alkiietbi3stbihkzci37tecdzdyxpwh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1/blt-0.5.3-e5rbowq4pvwwuchttguahzyjcpa5zvgr;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/umpire-2024.02.0-3fzuqd3tqb3kh2lai5yqmgom24mlcior;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/raja-2024.02.0-btiwe3jepovgjlxdtuqm4xssselzimcx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/py-jsonschema-2.6.0-szvkvnsgmp3mys5qwxkzidfljbrx2lc4;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/mfem-4.6.0-izljwvlcbrcbcueewxc74qbs7l3vy3rk;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/hypre-2.24.0-euib2ua4oleljrkszmkexls4kw5cvrr7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/lua-5.4.4-aovjhut3d6o67vxccjkyhfbrxc2eg4de;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/conduit-0.9.1-dfi65iel4lwlrvhi2i7n2hbvxuzlf3fv;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/parmetis-4.0.3-djitip36l7hy2ubwbvrnqmfeodhnjtpk;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/hdf5-1.8.23-ifirj3a475sf7jrliip2tj7laqyidak6;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/blt-0.6.1.4-7qqqx4bcdk5wy7ycpymq6engsddxn4y2;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/fmt-10.2.1-sscbhyiiak2butrj6656mn7nfx37rpr6;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/camp-2024.02.0-zxgjohy7qy2v3nqg4eaba3azthsqhcga;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/metis-5.1.0-e5ov7trmcxxc4pa6cbysd525iyiswtkn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/c2c-1.8.0-vlmxcctikvg2swezpvdqweczpsueuyrl;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/usr/tcetmp;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/cmake/cmake-3.21.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/axom-develop-wpre5jwym4gwxknegvw5mdlqmnqxgv3b/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/axom-develop-wpre5jwym4gwxknegvw5mdlqmnqxgv3b/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/c2c-1.8.0-vlmxcctikvg2swezpvdqweczpsueuyrl/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/conduit-0.9.1-dfi65iel4lwlrvhi2i7n2hbvxuzlf3fv/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/hdf5-1.8.23-ifirj3a475sf7jrliip2tj7laqyidak6/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/metis-5.1.0-e5ov7trmcxxc4pa6cbysd525iyiswtkn/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/parmetis-4.0.3-djitip36l7hy2ubwbvrnqmfeodhnjtpk/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/lua-5.4.4-aovjhut3d6o67vxccjkyhfbrxc2eg4de/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/mfem-4.6.0-izljwvlcbrcbcueewxc74qbs7l3vy3rk/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/hypre-2.24.0-euib2ua4oleljrkszmkexls4kw5cvrr7/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/py-jsonschema-2.6.0-szvkvnsgmp3mys5qwxkzidfljbrx2lc4/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/raja-2024.02.0-btiwe3jepovgjlxdtuqm4xssselzimcx/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/camp-2024.02.0-zxgjohy7qy2v3nqg4eaba3azthsqhcga/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/umpire-2024.02.0-3fzuqd3tqb3kh2lai5yqmgom24mlcior/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/fmt-10.2.1-sscbhyiiak2butrj6656mn7nfx37rpr6/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8;/usr/tce/packages/clang/clang-ibm-10.0.1/release/lib;/usr/tce/packages/clang/clang-ibm-10.0.1-gcc-8.3.1/release/lib" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/axom-develop-wpre5jwym4gwxknegvw5mdlqmnqxgv3b/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/axom-develop-wpre5jwym4gwxknegvw5mdlqmnqxgv3b/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/c2c-1.8.0-vlmxcctikvg2swezpvdqweczpsueuyrl/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/conduit-0.9.1-dfi65iel4lwlrvhi2i7n2hbvxuzlf3fv/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/hdf5-1.8.23-ifirj3a475sf7jrliip2tj7laqyidak6/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/metis-5.1.0-e5ov7trmcxxc4pa6cbysd525iyiswtkn/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/parmetis-4.0.3-djitip36l7hy2ubwbvrnqmfeodhnjtpk/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/lua-5.4.4-aovjhut3d6o67vxccjkyhfbrxc2eg4de/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/mfem-4.6.0-izljwvlcbrcbcueewxc74qbs7l3vy3rk/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/hypre-2.24.0-euib2ua4oleljrkszmkexls4kw5cvrr7/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/py-jsonschema-2.6.0-szvkvnsgmp3mys5qwxkzidfljbrx2lc4/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/raja-2024.02.0-btiwe3jepovgjlxdtuqm4xssselzimcx/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/camp-2024.02.0-zxgjohy7qy2v3nqg4eaba3azthsqhcga/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/umpire-2024.02.0-3fzuqd3tqb3kh2lai5yqmgom24mlcior/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1/fmt-10.2.1-sscbhyiiak2butrj6656mn7nfx37rpr6/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8;/usr/tce/packages/clang/clang-ibm-10.0.1/release/lib;/usr/tce/packages/clang/clang-ibm-10.0.1-gcc-8.3.1/release/lib" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -37,8 +43,6 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "-lgfortran" CACHE STRING "") set(CMAKE_Fortran_STANDARD_LIBRARIES "-lgfortran" CACHE STRING "") -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") set(BLT_EXE_LINKER_FLAGS " -Wl,-rpath,/usr/tce/packages/clang/clang-ibm-10.0.1-gcc-8.3.1/lib" CACHE STRING "Adds a missing libstdc++ rpath") @@ -69,7 +73,7 @@ set(BLT_MPI_COMMAND_APPEND "mpibind" CACHE STRING "") # Hardware Specifics #------------------------------------------------ -set(ENABLE_OPENMP OFF CACHE BOOL "") +set(ENABLE_OPENMP ON CACHE BOOL "") set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") @@ -79,23 +83,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.1" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-6vxxfa5atbct57263kwixtpa5jz54kew" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-dfi65iel4lwlrvhi2i7n2hbvxuzlf3fv" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-alkiietbi3stbihkzci37tecdzdyxpwh" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-vlmxcctikvg2swezpvdqweczpsueuyrl" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-dbebdqverfh4lwgj5nal5d2vgmmvl4xb" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-izljwvlcbrcbcueewxc74qbs7l3vy3rk" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-x626yhzvwnx7ssrmgl3lnvncx7s5nbkf" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-ifirj3a475sf7jrliip2tj7laqyidak6" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-o6kjgr3nt6ssvrj3mmonawxj3sbbcnel" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-aovjhut3d6o67vxccjkyhfbrxc2eg4de" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-jra4z7ctml3mpzsuixtbegawg7g75cec" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-btiwe3jepovgjlxdtuqm4xssselzimcx" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-h6wvcftrmg6w5e7etumawlsf5trgvsl7" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-3fzuqd3tqb3kh2lai5yqmgom24mlcior" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-abpqpyhwsuhzu4csmdy2nejqzrkfqh7a" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-zxgjohy7qy2v3nqg4eaba3azthsqhcga" CACHE PATH "") # scr not built @@ -109,6 +113,8 @@ set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-forma set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-szvkvnsgmp3mys5qwxkzidfljbrx2lc4/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake index 4edf450acb..62f8d9ee4e 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/umpire-2023.06.0-mgplvx55qtfnxdwb4cicp2bpu4z2koxq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/raja-2023.06.0-itml4o7c6upowd3s2uvk5wj23cywocev;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/camp-2023.06.0-s2bfmphdqig3ci4pdvkfvygprydcppyl;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/cub-2.1.0-p5pq3qyp3tthknvf4evygd4yaoay32tu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/mfem-4.5.2-5aoi62ejerozb42y5awjlgucluokakho;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/hypre-2.24.0-cfxkqrgvzhhkau6afaoohfe3zvmxhr7l;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/lua-5.4.4-27btgrl45gsrfpectq4nqwg3uep2lbcn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/conduit-0.8.8-k25pxkfamv77gz7cplvupfseutwule7o;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/parmetis-4.0.3-ae4f6v6uuhhbv776uy73zl4zqoralhbc;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/metis-5.1.0-ttpdauwjjvuesdbpa2pzh2inam3xgg7u;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/hdf5-1.8.22-ix4txea5c6dbzixdj3ef6dstpnlt6xvb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/zlib-1.2.13-ywvuuomigfzzbq4fxcgkdrnvnnwkj7zt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/c2c-1.8.0-icsf7aewc7ocohld45ibjxvygujkq3zd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2/blt-0.5.3-pytnag7yitffjizxs6mtsgj6amwvpd4v;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/umpire-2024.02.0-gdid6sheotanplgeox4xo25w6gqqsztl;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/raja-2024.02.0-o7rjribikrvq6wydxxz22wdo544ai4z2;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/camp-2024.02.0-2jxkuw2qyj7egsho3lshh2ceoa6n3srm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/py-jsonschema-2.6.0-jzezi7fphud2hpmaepsb5s456tz2dqol;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/mfem-4.6.0-63jbjowv2dojriwkpag6ws3tbm4erk7v;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/hypre-2.24.0-olonyxmliyqz7gjwd5jkenyxuphjff2d;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/lua-5.4.4-5okbr3yhq4vyonc2yt22lich6jkdgp3i;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/conduit-0.9.1-mypcbb7eqvp4oqjftdvw53oql5f5wemd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/parmetis-4.0.3-gxoxo6iesczbj7ltl3he3vxlv2xb6bdo;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/hdf5-1.8.23-5n6b7og6vcevg2pkbjjrhf54ta4fhl2i;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/blt-0.6.1.4-niyj5uvj7qaxuceaoycpenida5z56ied;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/fmt-10.2.1-rvh2rhnae6757hi6saunbnnicoowhtns;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/cub-2.1.0-ib4hkd2iic3p7ni4lhz5bqd5yivtxo7r;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/metis-5.1.0-5t5rx3oakpli3ywkum4kfhzdiacrdkso;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/c2c-1.8.0-ouuns7euqd3fbobccnfh2zcfgxo2nsss;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0;/usr/tce/packages/cuda/cuda-11.2.0;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/usr/tcetmp;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/cmake/cmake-3.21.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/axom-develop-ndiry4fjmug7ogvh36noblti67rdegj2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/axom-develop-ndiry4fjmug7ogvh36noblti67rdegj2/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/c2c-1.8.0-ouuns7euqd3fbobccnfh2zcfgxo2nsss/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/conduit-0.9.1-mypcbb7eqvp4oqjftdvw53oql5f5wemd/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/hdf5-1.8.23-5n6b7og6vcevg2pkbjjrhf54ta4fhl2i/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/metis-5.1.0-5t5rx3oakpli3ywkum4kfhzdiacrdkso/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/parmetis-4.0.3-gxoxo6iesczbj7ltl3he3vxlv2xb6bdo/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/lua-5.4.4-5okbr3yhq4vyonc2yt22lich6jkdgp3i/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/mfem-4.6.0-63jbjowv2dojriwkpag6ws3tbm4erk7v/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/hypre-2.24.0-olonyxmliyqz7gjwd5jkenyxuphjff2d/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/py-jsonschema-2.6.0-jzezi7fphud2hpmaepsb5s456tz2dqol/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/raja-2024.02.0-o7rjribikrvq6wydxxz22wdo544ai4z2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/camp-2024.02.0-2jxkuw2qyj7egsho3lshh2ceoa6n3srm/lib;/usr/tce/packages/cuda/cuda-11.2.0/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/umpire-2024.02.0-gdid6sheotanplgeox4xo25w6gqqsztl/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/fmt-10.2.1-rvh2rhnae6757hi6saunbnnicoowhtns/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8;/usr/tce/packages/clang/clang-ibm-10.0.1/release/lib;/usr/tce/packages/clang/clang-ibm-10.0.1-gcc-8.3.1/release/lib" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/axom-develop-ndiry4fjmug7ogvh36noblti67rdegj2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/axom-develop-ndiry4fjmug7ogvh36noblti67rdegj2/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/c2c-1.8.0-ouuns7euqd3fbobccnfh2zcfgxo2nsss/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/conduit-0.9.1-mypcbb7eqvp4oqjftdvw53oql5f5wemd/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/hdf5-1.8.23-5n6b7og6vcevg2pkbjjrhf54ta4fhl2i/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/metis-5.1.0-5t5rx3oakpli3ywkum4kfhzdiacrdkso/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/parmetis-4.0.3-gxoxo6iesczbj7ltl3he3vxlv2xb6bdo/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/lua-5.4.4-5okbr3yhq4vyonc2yt22lich6jkdgp3i/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/mfem-4.6.0-63jbjowv2dojriwkpag6ws3tbm4erk7v/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/hypre-2.24.0-olonyxmliyqz7gjwd5jkenyxuphjff2d/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-gcc-7.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/py-jsonschema-2.6.0-jzezi7fphud2hpmaepsb5s456tz2dqol/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/raja-2024.02.0-o7rjribikrvq6wydxxz22wdo544ai4z2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/camp-2024.02.0-2jxkuw2qyj7egsho3lshh2ceoa6n3srm/lib;/usr/tce/packages/cuda/cuda-11.2.0/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/umpire-2024.02.0-gdid6sheotanplgeox4xo25w6gqqsztl/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2/fmt-10.2.1-rvh2rhnae6757hi6saunbnnicoowhtns/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8;/usr/tce/packages/clang/clang-ibm-10.0.1/release/lib;/usr/tce/packages/clang/clang-ibm-10.0.1-gcc-8.3.1/release/lib" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -37,8 +43,6 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "-lgfortran" CACHE STRING "") set(CMAKE_Fortran_STANDARD_LIBRARIES "-lgfortran" CACHE STRING "") -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") set(BLT_EXE_LINKER_FLAGS " -Xlinker -rpath -Xlinker /usr/tce/packages/clang/clang-ibm-10.0.1-gcc-8.3.1/lib" CACHE STRING "Adds a missing libstdc++ rpath") @@ -97,7 +101,7 @@ set(gtest_disable_pthreads ON CACHE BOOL "") # Hardware Specifics #------------------------------------------------ -set(ENABLE_OPENMP OFF CACHE BOOL "") +set(ENABLE_OPENMP ON CACHE BOOL "") set(ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "") @@ -107,23 +111,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/clang-10.0.1.2" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/clang-10.0.1.2" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-k25pxkfamv77gz7cplvupfseutwule7o" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-mypcbb7eqvp4oqjftdvw53oql5f5wemd" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-icsf7aewc7ocohld45ibjxvygujkq3zd" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-ouuns7euqd3fbobccnfh2zcfgxo2nsss" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-5aoi62ejerozb42y5awjlgucluokakho" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-63jbjowv2dojriwkpag6ws3tbm4erk7v" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-ix4txea5c6dbzixdj3ef6dstpnlt6xvb" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-5n6b7og6vcevg2pkbjjrhf54ta4fhl2i" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-27btgrl45gsrfpectq4nqwg3uep2lbcn" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-5okbr3yhq4vyonc2yt22lich6jkdgp3i" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-itml4o7c6upowd3s2uvk5wj23cywocev" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-o7rjribikrvq6wydxxz22wdo544ai4z2" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-mgplvx55qtfnxdwb4cicp2bpu4z2koxq" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-gdid6sheotanplgeox4xo25w6gqqsztl" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-s2bfmphdqig3ci4pdvkfvygprydcppyl" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-2jxkuw2qyj7egsho3lshh2ceoa6n3srm" CACHE PATH "") # scr not built @@ -137,6 +141,8 @@ set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-forma set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-jzezi7fphud2hpmaepsb5s456tz2dqol/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake index 1800c5111b..40c54cf48b 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/umpire-2023.06.0-g7qmb2qhubkm3azuvfmqs76otesjurcs;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/raja-2023.06.0-tvlbnpgx2hbiu3bjvx44ozxhvusclguk;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/camp-2023.06.0-civqzez47ip24ln7c5q6gofaniemdr54;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/lua-5.4.4-e7cdhkbaxuyqljoyozzxrt2n57erhszx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/conduit-0.8.8-3li2jcc2mecqbanoew5tznr4uzl2k2jg;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/parmetis-4.0.3-c2ub4mddqt7faykccls5eae7xogpi32w;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/metis-5.1.0-t6qk2khpceidsormndy6gj56qbnehxai;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/hdf5-1.8.22-nydokvym7klek6hqoyijbwf3tbmd32ux;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/zlib-1.2.13-zd2x25bmmjwxhw7siucfywjgk7oc262j;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/c2c-1.8.0-zgwmbota3vhdxcdjlwxbhomlwllwhvnc;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1/blt-0.5.3-zghdcshuqlqnbrezcylwnefie7pkvsab;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/umpire-2024.02.0-3fyzeztrclnysexhwf75pm2nxel77776;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/fmt-10.2.1-2vqr6w6s2qq7bt4iq7mdrfiqgfiw6f5l;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/raja-2024.02.0-e6tn6qcf3j2hqkz5ht3xrmlbddp3ngnn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/camp-2024.02.0-avtdwxn6q374o2nqe4rqkjzasuvmudta;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/py-jsonschema-2.6.0-me5qygs6iauo7miussleiado3nbnw5ot;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/lua-5.4.4-v5n5ab5npmyxguqaja6xdmyl6r3gsc5a;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/conduit-0.9.1-7fwf4minhh6ymveutjnb4zetvxwurm66;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/parmetis-4.0.3-p5pmp73u6nshwemscw43atzgaerk4ulu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/metis-5.1.0-devoja547pbzdundjnarm3hug2hhay2l;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/hdf5-1.8.23-7cjtcdwjrtfgcnqoiyfrufybdw5g6i6h;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/c2c-1.8.0-vj22dsxnnfc6hx73lfgpdmlhithbd5bq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/blt-0.6.1.4-6lng5thw5prsyymfu2yzy7xdwtwij6ij;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/gcc-runtime-8.3.1.1-pykxuo3lctv7fu6i325szadkdcwrrkim;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/usr/tcetmp;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/cmake/cmake-3.21.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/axom-develop-mrrvgirrsjrtdsyltswvulji3his36xi/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/axom-develop-mrrvgirrsjrtdsyltswvulji3his36xi/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/c2c-1.8.0-vj22dsxnnfc6hx73lfgpdmlhithbd5bq/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/gcc-runtime-8.3.1.1-pykxuo3lctv7fu6i325szadkdcwrrkim/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/conduit-0.9.1-7fwf4minhh6ymveutjnb4zetvxwurm66/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/hdf5-1.8.23-7cjtcdwjrtfgcnqoiyfrufybdw5g6i6h/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/metis-5.1.0-devoja547pbzdundjnarm3hug2hhay2l/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/parmetis-4.0.3-p5pmp73u6nshwemscw43atzgaerk4ulu/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/lua-5.4.4-v5n5ab5npmyxguqaja6xdmyl6r3gsc5a/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/py-jsonschema-2.6.0-me5qygs6iauo7miussleiado3nbnw5ot/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/raja-2024.02.0-e6tn6qcf3j2hqkz5ht3xrmlbddp3ngnn/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/camp-2024.02.0-avtdwxn6q374o2nqe4rqkjzasuvmudta/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/umpire-2024.02.0-3fyzeztrclnysexhwf75pm2nxel77776/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/fmt-10.2.1-2vqr6w6s2qq7bt4iq7mdrfiqgfiw6f5l/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/axom-develop-mrrvgirrsjrtdsyltswvulji3his36xi/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/axom-develop-mrrvgirrsjrtdsyltswvulji3his36xi/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/c2c-1.8.0-vj22dsxnnfc6hx73lfgpdmlhithbd5bq/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/gcc-runtime-8.3.1.1-pykxuo3lctv7fu6i325szadkdcwrrkim/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/conduit-0.9.1-7fwf4minhh6ymveutjnb4zetvxwurm66/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/hdf5-1.8.23-7cjtcdwjrtfgcnqoiyfrufybdw5g6i6h/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/metis-5.1.0-devoja547pbzdundjnarm3hug2hhay2l/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/parmetis-4.0.3-p5pmp73u6nshwemscw43atzgaerk4ulu/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/lua-5.4.4-v5n5ab5npmyxguqaja6xdmyl6r3gsc5a/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/py-jsonschema-2.6.0-me5qygs6iauo7miussleiado3nbnw5ot/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/raja-2024.02.0-e6tn6qcf3j2hqkz5ht3xrmlbddp3ngnn/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/camp-2024.02.0-avtdwxn6q374o2nqe4rqkjzasuvmudta/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/umpire-2024.02.0-3fyzeztrclnysexhwf75pm2nxel77776/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1/fmt-10.2.1-2vqr6w6s2qq7bt4iq7mdrfiqgfiw6f5l/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -31,8 +37,6 @@ else() endif() -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") #------------------------------------------------------------------------------ @@ -71,23 +75,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.1" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-3li2jcc2mecqbanoew5tznr4uzl2k2jg" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-7fwf4minhh6ymveutjnb4zetvxwurm66" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-zgwmbota3vhdxcdjlwxbhomlwllwhvnc" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-vj22dsxnnfc6hx73lfgpdmlhithbd5bq" CACHE PATH "") # MFEM not built -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-nydokvym7klek6hqoyijbwf3tbmd32ux" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-7cjtcdwjrtfgcnqoiyfrufybdw5g6i6h" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-e7cdhkbaxuyqljoyozzxrt2n57erhszx" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-v5n5ab5npmyxguqaja6xdmyl6r3gsc5a" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-tvlbnpgx2hbiu3bjvx44ozxhvusclguk" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-e6tn6qcf3j2hqkz5ht3xrmlbddp3ngnn" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-g7qmb2qhubkm3azuvfmqs76otesjurcs" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-3fyzeztrclnysexhwf75pm2nxel77776" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-civqzez47ip24ln7c5q6gofaniemdr54" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-avtdwxn6q374o2nqe4rqkjzasuvmudta" CACHE PATH "") # scr not built @@ -101,6 +105,8 @@ set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-forma set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-me5qygs6iauo7miussleiado3nbnw5ot/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake index 5667068ed6..67dab0234b 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/umpire-2023.06.0-rgprey5lhrxtjnaqmm56x5t4zfwv7n2f;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/raja-2023.06.0-aszr6mr5prbpfd3qqcb7ukntna6a3rfb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/camp-2023.06.0-54bzgyk2if7ilhc2saaia3flihlvkqhu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/cub-2.1.0-zpxcavwsek3eamis6c2ekyd4wpc2aff7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/lua-5.4.4-uzsm5gerahtqcinqqfwleer62mlgl6xt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/conduit-0.8.8-pslusbff27xjqw5sct3jnddyeqlyide3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/parmetis-4.0.3-bcniwrmmygfl3ngqqy4ogyuopuilgfy2;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/metis-5.1.0-tht2h2hqk4psrvunj7egarksgyayew3d;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/hdf5-1.8.22-h2labsbvwxgxwvphjb5i357an3dgjhqp;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/zlib-1.2.13-obyznlavcvoyytpvwwyi65s5ngcnpigv;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/c2c-1.8.0-snpbqgmnulnruetig5di7nef2gir354f;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2/blt-0.5.3-umf5hhz3yl7vspds2fejsjdbmy2npyqb;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/umpire-2024.02.0-ax6j3jggtgph2kx53njdclhij5457lnr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/fmt-10.2.1-zv6ntw5mnzrvvm2mfyyjjly7cmixmgqr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/raja-2024.02.0-qz732p5cbhzuecyyn47d67h55wir7owh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/camp-2024.02.0-drrgkykr3onmqdkoc2jg6hzxzszakj35;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/cub-2.1.0-i64fir4ytcl7w527jny2bj67irxva2pu;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/py-jsonschema-2.6.0-5rwlawwpfl75pzasnxiulrkcxmznmijx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/lua-5.4.4-saqxtlwqxhm5xszi6ohoalufvorkont7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/conduit-0.9.1-66pob6ova32wkqvnbdbskk5zk44tjbnk;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/parmetis-4.0.3-2h2xjxkc3qwi237ui476jgsqi2e4kpkh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/metis-5.1.0-3de4wffnqmwqslyiizuoheny6abmfkkn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/hdf5-1.8.23-ada6dnl7e76lppixolnsjy7gmi4adfoh;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/c2c-1.8.0-c76hxrgyy2igrclt6cnsvydrkd77ufvm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/blt-0.6.1.4-ldmftyubptq3py7xr6wirrg2eorm357z;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/gcc-runtime-8.3.1.2-7lxa2lyos6dnjfydj2ewpv4wlnnvp2hh;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0;/usr/tce/packages/cuda/cuda-11.2.0;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/usr/tcetmp;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/cmake/cmake-3.21.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/axom-develop-qewlj77x5de57xeii6pfarnsgahvapao/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/axom-develop-qewlj77x5de57xeii6pfarnsgahvapao/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/c2c-1.8.0-c76hxrgyy2igrclt6cnsvydrkd77ufvm/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/gcc-runtime-8.3.1.2-7lxa2lyos6dnjfydj2ewpv4wlnnvp2hh/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/conduit-0.9.1-66pob6ova32wkqvnbdbskk5zk44tjbnk/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/hdf5-1.8.23-ada6dnl7e76lppixolnsjy7gmi4adfoh/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/metis-5.1.0-3de4wffnqmwqslyiizuoheny6abmfkkn/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/parmetis-4.0.3-2h2xjxkc3qwi237ui476jgsqi2e4kpkh/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/lua-5.4.4-saqxtlwqxhm5xszi6ohoalufvorkont7/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/py-jsonschema-2.6.0-5rwlawwpfl75pzasnxiulrkcxmznmijx/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/raja-2024.02.0-qz732p5cbhzuecyyn47d67h55wir7owh/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/camp-2024.02.0-drrgkykr3onmqdkoc2jg6hzxzszakj35/lib;/usr/tce/packages/cuda/cuda-11.2.0/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/umpire-2024.02.0-ax6j3jggtgph2kx53njdclhij5457lnr/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/fmt-10.2.1-zv6ntw5mnzrvvm2mfyyjjly7cmixmgqr/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/axom-develop-qewlj77x5de57xeii6pfarnsgahvapao/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/axom-develop-qewlj77x5de57xeii6pfarnsgahvapao/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/c2c-1.8.0-c76hxrgyy2igrclt6cnsvydrkd77ufvm/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/gcc-runtime-8.3.1.2-7lxa2lyos6dnjfydj2ewpv4wlnnvp2hh/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/conduit-0.9.1-66pob6ova32wkqvnbdbskk5zk44tjbnk/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/hdf5-1.8.23-ada6dnl7e76lppixolnsjy7gmi4adfoh/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/metis-5.1.0-3de4wffnqmwqslyiizuoheny6abmfkkn/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/parmetis-4.0.3-2h2xjxkc3qwi237ui476jgsqi2e4kpkh/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/lua-5.4.4-saqxtlwqxhm5xszi6ohoalufvorkont7/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/py-jsonschema-2.6.0-5rwlawwpfl75pzasnxiulrkcxmznmijx/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/raja-2024.02.0-qz732p5cbhzuecyyn47d67h55wir7owh/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/camp-2024.02.0-drrgkykr3onmqdkoc2jg6hzxzszakj35/lib;/usr/tce/packages/cuda/cuda-11.2.0/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/umpire-2024.02.0-ax6j3jggtgph2kx53njdclhij5457lnr/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2/fmt-10.2.1-zv6ntw5mnzrvvm2mfyyjjly7cmixmgqr/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -31,8 +37,6 @@ else() endif() -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") #------------------------------------------------------------------------------ @@ -99,23 +103,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/gcc-8.3.1.2" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/gcc-8.3.1.2" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-pslusbff27xjqw5sct3jnddyeqlyide3" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-66pob6ova32wkqvnbdbskk5zk44tjbnk" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-snpbqgmnulnruetig5di7nef2gir354f" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-c76hxrgyy2igrclt6cnsvydrkd77ufvm" CACHE PATH "") # MFEM not built -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-h2labsbvwxgxwvphjb5i357an3dgjhqp" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-ada6dnl7e76lppixolnsjy7gmi4adfoh" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-uzsm5gerahtqcinqqfwleer62mlgl6xt" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-saqxtlwqxhm5xszi6ohoalufvorkont7" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-aszr6mr5prbpfd3qqcb7ukntna6a3rfb" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-qz732p5cbhzuecyyn47d67h55wir7owh" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-rgprey5lhrxtjnaqmm56x5t4zfwv7n2f" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-ax6j3jggtgph2kx53njdclhij5457lnr" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-54bzgyk2if7ilhc2saaia3flihlvkqhu" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-drrgkykr3onmqdkoc2jg6hzxzszakj35" CACHE PATH "") # scr not built @@ -129,6 +133,8 @@ set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-forma set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-5rwlawwpfl75pzasnxiulrkcxmznmijx/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake index 3e746045dc..0d74d794e8 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/umpire-2023.06.0-cmose4tqzlwsrjjhoklstt6ga3yym6ni;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/raja-2023.06.0-uqr6nybua6ic5xjwqd75hqtngiz6wjwb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/camp-2023.06.0-3k5jzo2qageywkgo7i65ybqksjqbu67j;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/mfem-4.5.2-5tpknd5eztbbomidbr3qcs75hyvdqegw;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/hypre-2.24.0-kgmrxqyc3pjlwgzvgbchceub5u4v4tgt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/lua-5.4.4-22nibaxxfzwid5jk3udivaptba2xtw4r;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/conduit-0.8.8-tnyxf6f7sh7kg3pzvt5acfp4btsprsp7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/parmetis-4.0.3-zsfvlzuxwixta5mjt4dqwikslhx6l6dd;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/metis-5.1.0-hpfbnba3mgk2opmqn3efr2mmda76yacg;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/hdf5-1.8.22-eduvgrxspycy6xfw2t6i6uogdtzgnygm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/zlib-1.2.13-tnpzx5nxltbrlx27lozjehkg2lkb7lew;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/c2c-1.8.0-vxyvicuyswybrekljpj7khd56uobpc62;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1/blt-0.5.3-zleps37vlw57krmv2zruxq6bpxpn6fik;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/umpire-2024.02.0-kglsalrxtcw2bh4hnsnc5gq5jevvv7bl;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/py-jsonschema-2.6.0-7skzmrvuuo6gtwscj6b6fbdyo7sioz5h;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/mfem-4.6.0-2qilfn4m5dmpxjm2evip6nusosmiqrsz;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/hypre-2.24.0-scxx626pb345r4bpsmn4idus6dt42jcs;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/lua-5.4.4-b43zhs5fpjqoog4hrtfrtxuetq7pwd4b;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/conduit-0.9.1-gds2atmvlsftghczkaxrbdi4fotbl2a3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/parmetis-4.0.3-unks4pi2gc6heogvv2m3cvjvgc2etfp4;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/hdf5-1.8.23-ur6rpcf7qqngwf25ezjwei6en7rcsnxq;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/blt-0.6.1.4-neovqnvk3tazh7clai422vfazmbjeaqp;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/fmt-10.2.1-iknryrusj34wtt4nk4pn2ybgwa77grms;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/camp-2024.02.0-a2mltgoskoemplkmkkup5cs4pmfn64j7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/raja-2024.02.0-kimeva5su2xhbqpy54xx5lnmvypbavab;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/metis-5.1.0-qww4ax3mkehdlf7akdbjzokbf4wxws5m;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/c2c-1.8.0-bbzy4skytx3akdcm2fvslpxn44vhsq2y;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/usr/tcetmp;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/cmake/cmake-3.21.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/axom-develop-mwe36w3aijwdbfu4ckdjv2wksrvqbsj2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/axom-develop-mwe36w3aijwdbfu4ckdjv2wksrvqbsj2/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/c2c-1.8.0-bbzy4skytx3akdcm2fvslpxn44vhsq2y/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/conduit-0.9.1-gds2atmvlsftghczkaxrbdi4fotbl2a3/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/hdf5-1.8.23-ur6rpcf7qqngwf25ezjwei6en7rcsnxq/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/metis-5.1.0-qww4ax3mkehdlf7akdbjzokbf4wxws5m/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/parmetis-4.0.3-unks4pi2gc6heogvv2m3cvjvgc2etfp4/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/lua-5.4.4-b43zhs5fpjqoog4hrtfrtxuetq7pwd4b/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/mfem-4.6.0-2qilfn4m5dmpxjm2evip6nusosmiqrsz/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/hypre-2.24.0-scxx626pb345r4bpsmn4idus6dt42jcs/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/py-jsonschema-2.6.0-7skzmrvuuo6gtwscj6b6fbdyo7sioz5h/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/raja-2024.02.0-kimeva5su2xhbqpy54xx5lnmvypbavab/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/camp-2024.02.0-a2mltgoskoemplkmkkup5cs4pmfn64j7/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/umpire-2024.02.0-kglsalrxtcw2bh4hnsnc5gq5jevvv7bl/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/fmt-10.2.1-iknryrusj34wtt4nk4pn2ybgwa77grms/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/axom-develop-mwe36w3aijwdbfu4ckdjv2wksrvqbsj2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/axom-develop-mwe36w3aijwdbfu4ckdjv2wksrvqbsj2/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/c2c-1.8.0-bbzy4skytx3akdcm2fvslpxn44vhsq2y/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/conduit-0.9.1-gds2atmvlsftghczkaxrbdi4fotbl2a3/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/hdf5-1.8.23-ur6rpcf7qqngwf25ezjwei6en7rcsnxq/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/metis-5.1.0-qww4ax3mkehdlf7akdbjzokbf4wxws5m/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/parmetis-4.0.3-unks4pi2gc6heogvv2m3cvjvgc2etfp4/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/lua-5.4.4-b43zhs5fpjqoog4hrtfrtxuetq7pwd4b/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/mfem-4.6.0-2qilfn4m5dmpxjm2evip6nusosmiqrsz/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/hypre-2.24.0-scxx626pb345r4bpsmn4idus6dt42jcs/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/py-jsonschema-2.6.0-7skzmrvuuo6gtwscj6b6fbdyo7sioz5h/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/raja-2024.02.0-kimeva5su2xhbqpy54xx5lnmvypbavab/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/camp-2024.02.0-a2mltgoskoemplkmkkup5cs4pmfn64j7/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/umpire-2024.02.0-kglsalrxtcw2bh4hnsnc5gq5jevvv7bl/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1/fmt-10.2.1-iknryrusj34wtt4nk4pn2ybgwa77grms/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/xl/xlc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/xl/xlc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/xl/xlc++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/xl/xlc++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/xl/xlf90" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/xl/xlf90" CACHE PATH "") else() @@ -37,8 +43,6 @@ set(CMAKE_CXX_FLAGS "--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1" CACHE STRI set(CMAKE_Fortran_FLAGS "--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1" CACHE STRING "") -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") #------------------------------------------------------------------------------ @@ -83,23 +87,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.1" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-tnyxf6f7sh7kg3pzvt5acfp4btsprsp7" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-gds2atmvlsftghczkaxrbdi4fotbl2a3" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-vxyvicuyswybrekljpj7khd56uobpc62" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-bbzy4skytx3akdcm2fvslpxn44vhsq2y" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-5tpknd5eztbbomidbr3qcs75hyvdqegw" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-2qilfn4m5dmpxjm2evip6nusosmiqrsz" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-eduvgrxspycy6xfw2t6i6uogdtzgnygm" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-ur6rpcf7qqngwf25ezjwei6en7rcsnxq" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-22nibaxxfzwid5jk3udivaptba2xtw4r" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-b43zhs5fpjqoog4hrtfrtxuetq7pwd4b" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-uqr6nybua6ic5xjwqd75hqtngiz6wjwb" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-kimeva5su2xhbqpy54xx5lnmvypbavab" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-cmose4tqzlwsrjjhoklstt6ga3yym6ni" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-kglsalrxtcw2bh4hnsnc5gq5jevvv7bl" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-3k5jzo2qageywkgo7i65ybqksjqbu67j" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-a2mltgoskoemplkmkkup5cs4pmfn64j7" CACHE PATH "") # scr not built @@ -113,6 +117,8 @@ set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-forma set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-7skzmrvuuo6gtwscj6b6fbdyo7sioz5h/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake index da2ae66dea..38742862c5 100644 --- a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake +++ b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/packages/cmake/cmake-3.21.1/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/umpire-2023.06.0-5pojmv2de7q5pimrh253hwamycx7jfl7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/raja-2023.06.0-7et5l25lkvvjz2r772uabj7hrstg3y2z;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/camp-2023.06.0-q4hulo6jzt2wnuzzj5jjmlvkdtu4ckdj;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/cub-2.1.0-45sgqog6spfots46rohzcokfoaxjil4p;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/mfem-4.5.2-264o4xkxhcafenixttd6lw5k466a62b3;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/hypre-2.24.0-x2zforves4hmpcuwjskxbvxu55i5kpfx;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/lua-5.4.4-6yyyruucztcz5p4w33mhydqn5kiywkjn;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/conduit-0.8.8-pil6joltz2jsp4vcdsfgndntfkqoi3na;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/parmetis-4.0.3-ogq2nkkjvarhjgaweb6b5lglfcmes3hm;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/metis-5.1.0-7ojc3lx2y6dk2g7gvl6m5n4fq5yewukb;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/hdf5-1.8.22-y23h3hgemr7s6terq2mvsz5if5u327sr;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/zlib-1.2.13-nd6r3ccnozxmd7jdwyxbgvqg5y2bn3ds;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/c2c-1.8.0-ckwviu4jwtot52xykd3kuryozuw5o35p;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2/blt-0.5.3-47zfyusaljp2e7x3lsq3iggqvapxox6t;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/usr/tce/packages/cuda/cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.2.0;/usr/tcetmp;/usr/tce/packages/cmake/cmake-3.21.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/umpire-2024.02.0-57lf4jwgiqrgzpeaj7uerwej3ht4wgyt;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/raja-2024.02.0-kghzomlpcrlcri3dky476kdizqatfe5c;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/camp-2024.02.0-ppwilytkx2rffmtiroong3ucsojgc2o7;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/py-jsonschema-2.6.0-qpksngigqtckjhj62aeckyiptsyrquwo;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/mfem-4.6.0-giwvzuwtccsd4dt3y6co4ul3x2lkgmpw;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/hypre-2.24.0-njvlsye4yxx7gzho7hpvfaiyugfztlef;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/lua-5.4.4-6jtix4lxlnmvpkuahs62qqbjk5yubmux;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/conduit-0.9.1-wh6qi5s3jncyggsy6w4dxdlcg3n3feag;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/parmetis-4.0.3-buyj5iliasgoeiauw335rdrvht4l46ut;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/hdf5-1.8.23-vlybikhncayldwo36udsi225qyan7dos;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/blt-0.6.1.4-lhkhl33mqna6lfzkqz5fbwzy6by5effo;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/fmt-10.2.1-fl5fgyfjfnworql33rfi4oufl2fyx2ec;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/cub-2.1.0-gk54nvuh77yqhzft2rlourfzd7aqvs6i;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/metis-5.1.0-wzyd4pwtce4c22uw3tq3dljdjpfjrd3z;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/c2c-1.8.0-jklapw7gpgw7rftjwecmk22p7wz4qpc2;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/collab/usr/gapps/shroud/public/blueos_3_ppc64le_ib_p9/shroud-0.13.0;/usr/tce/packages/cuda/cuda-11.2.0;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.2.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12;/usr/tce/packages/clang/clang-10.0.0;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/graphviz-7.1.0;/usr/tcetmp;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/cppcheck-2.9;/usr/tce/packages/cmake/cmake-3.21.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/axom-develop-woz7ol2eqtmsmfz3sckoddilap5hixzq/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/axom-develop-woz7ol2eqtmsmfz3sckoddilap5hixzq/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/c2c-1.8.0-jklapw7gpgw7rftjwecmk22p7wz4qpc2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/conduit-0.9.1-wh6qi5s3jncyggsy6w4dxdlcg3n3feag/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/hdf5-1.8.23-vlybikhncayldwo36udsi225qyan7dos/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/metis-5.1.0-wzyd4pwtce4c22uw3tq3dljdjpfjrd3z/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/parmetis-4.0.3-buyj5iliasgoeiauw335rdrvht4l46ut/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.2.0/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/lua-5.4.4-6jtix4lxlnmvpkuahs62qqbjk5yubmux/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/mfem-4.6.0-giwvzuwtccsd4dt3y6co4ul3x2lkgmpw/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/hypre-2.24.0-njvlsye4yxx7gzho7hpvfaiyugfztlef/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/py-jsonschema-2.6.0-qpksngigqtckjhj62aeckyiptsyrquwo/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/raja-2024.02.0-kghzomlpcrlcri3dky476kdizqatfe5c/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/camp-2024.02.0-ppwilytkx2rffmtiroong3ucsojgc2o7/lib;/usr/tce/packages/cuda/cuda-11.2.0/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/umpire-2024.02.0-57lf4jwgiqrgzpeaj7uerwej3ht4wgyt/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/fmt-10.2.1-fl5fgyfjfnworql33rfi4oufl2fyx2ec/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/axom-develop-woz7ol2eqtmsmfz3sckoddilap5hixzq/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/axom-develop-woz7ol2eqtmsmfz3sckoddilap5hixzq/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/c2c-1.8.0-jklapw7gpgw7rftjwecmk22p7wz4qpc2/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/conduit-0.9.1-wh6qi5s3jncyggsy6w4dxdlcg3n3feag/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/hdf5-1.8.23-vlybikhncayldwo36udsi225qyan7dos/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/metis-5.1.0-wzyd4pwtce4c22uw3tq3dljdjpfjrd3z/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/parmetis-4.0.3-buyj5iliasgoeiauw335rdrvht4l46ut/lib;/usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.2.0/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/lua-5.4.4-6jtix4lxlnmvpkuahs62qqbjk5yubmux/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/mfem-4.6.0-giwvzuwtccsd4dt3y6co4ul3x2lkgmpw/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/hypre-2.24.0-njvlsye4yxx7gzho7hpvfaiyugfztlef/lib;/usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.11.12/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/py-jsonschema-2.6.0-qpksngigqtckjhj62aeckyiptsyrquwo/lib;/collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/raja-2024.02.0-kghzomlpcrlcri3dky476kdizqatfe5c/lib;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/camp-2024.02.0-ppwilytkx2rffmtiroong3ucsojgc2o7/lib;/usr/tce/packages/cuda/cuda-11.2.0/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/umpire-2024.02.0-57lf4jwgiqrgzpeaj7uerwej3ht4wgyt/lib64;/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2/fmt-10.2.1-fl5fgyfjfnworql33rfi4oufl2fyx2ec/lib64;/usr/tce/packages/gcc/gcc-8.3.1/rh/usr/lib/gcc/ppc64le-redhat-linux/8" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/xl/xlc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/xl/xlc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/xl/xlc++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/xl/xlc++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/spack/lib/spack/env/xl/xlf90" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/spack/lib/spack/env/xl/xlf90" CACHE PATH "") else() @@ -37,8 +43,6 @@ set(CMAKE_CXX_FLAGS "--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1" CACHE STRI set(CMAKE_Fortran_FLAGS "--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1" CACHE STRING "") -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") #------------------------------------------------------------------------------ @@ -111,23 +115,23 @@ set(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE "/usr/tce/packages/gcc/gcc-4.9.3 # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2023_10_17_11_51_45/xl-16.1.1.2" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/blueos_3_ppc64le_ib_p9/2024_03_07_00_02_23/xl-16.1.1.2" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-pil6joltz2jsp4vcdsfgndntfkqoi3na" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-wh6qi5s3jncyggsy6w4dxdlcg3n3feag" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-ckwviu4jwtot52xykd3kuryozuw5o35p" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-jklapw7gpgw7rftjwecmk22p7wz4qpc2" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-264o4xkxhcafenixttd6lw5k466a62b3" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-giwvzuwtccsd4dt3y6co4ul3x2lkgmpw" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-y23h3hgemr7s6terq2mvsz5if5u327sr" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-vlybikhncayldwo36udsi225qyan7dos" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-6yyyruucztcz5p4w33mhydqn5kiywkjn" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-6jtix4lxlnmvpkuahs62qqbjk5yubmux" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-7et5l25lkvvjz2r772uabj7hrstg3y2z" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-kghzomlpcrlcri3dky476kdizqatfe5c" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-5pojmv2de7q5pimrh253hwamycx7jfl7" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-57lf4jwgiqrgzpeaj7uerwej3ht4wgyt" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-q4hulo6jzt2wnuzzj5jjmlvkdtu4ckdj" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-ppwilytkx2rffmtiroong3ucsojgc2o7" CACHE PATH "") # scr not built @@ -141,6 +145,8 @@ set(CLANGFORMAT_EXECUTABLE "/usr/tce/packages/clang/clang-10.0.0/bin/clang-forma set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-qpksngigqtckjhj62aeckyiptsyrquwo/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake index 477f33f7dc..31da21925c 100644 --- a/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake +++ b/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/scr-3.0.1-5edtc4k2wstti2dh4kp2tno7rmwr3lyd;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/spath-0.2.0-gvlnzegcdph7ien3w4tjcxevblf2xe4r;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/libyogrt-1.33-3joihut3xh67qmtalrqadzujfzxwpodj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/er-0.2.0-befo66qsdjjulpnhaxvhk4uil45ynd6u;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/shuffile-0.2.0-j5blkpa2h3keb562qb5pdnfiuzyaecfd;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/redset-0.2.0-tllpyzklkik7oa32us3tigl7vdvil42o;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/rankstr-0.1.0-jkgwo3kyvegaapdtm67mg4aknu44foyn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/dtcmp-1.1.4-u376uqcnt3y7ebu5ocfvk7bovkr2febv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/lwgrp-1.0.5-am6sfml4trdhzlds365vbepezgdvdocz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/axl-0.7.1-t7yboywzjziqb3hbgidynhbk5vd33jc7;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/kvtree-1.3.0-4zcbvvaqpbkdt7xc4pbu7urlkdywjjd7;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/hypre-2.24.0-bwh42bebp4hiuwzlwcthpgkawape6dp3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/parmetis-4.0.3-jthqwflsj5bpe6onwsb5r2zi5wbx6pq4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/metis-5.1.0-imzig3eih3itpztvvk4yildzgq6aeelo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/gmake-4.4.1-6lgy76r7dbvqm6mbwb2jkpcuycf7tb27;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6/blt-0.5.3-xa3bmu75nkolqiewb5ftk5tp2jpzw57n;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/umpire-2024.02.0-jhuql5fc2vhya4sdl7g4nlcrzaoycqai;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/scr-3.0.1-t7t35dyvwswfrk3lp2k4tcjpiyyylgr6;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/spath-0.2.0-5ypljdbn6yf6ab3jabzpeeuxxvbm6vix;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/er-0.2.0-pfk7tzcycgqnc73twpnleapauynyrmuo;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/shuffile-0.2.0-lcyevsv6yv4cwtahb3kt5h4emqtfwwvb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/redset-0.2.0-yg22aoerdpabedvtormddcankg4lkitu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/rankstr-0.1.0-t7qtfe3uihx4s2ia5gft2rvwmbfsaqcz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/dtcmp-1.1.4-scoxi2onj4nu3g5em5dgc4imwzihgfjj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/lwgrp-1.0.5-rdvuqikm56okeru5jkroem5tpaybke3q;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/axl-0.7.1-dvovqn3v6stb27lftz5c2jv7ykyt74o3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/kvtree-1.3.0-3lkpy2ktv66bhbyxtg7r6xca2shap6sw;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/raja-2024.02.0-i7u43vvuic25rvjjhkeblvxeitkvzjwy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/py-jsonschema-2.6.0-6j5dc4xbppedseqpxhmnvdsvfm5nohqz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/mfem-4.6.0-2o3e3zv4evsmrgwpwroyhpmj2pot7fgj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/hypre-2.24.0-k33flgav4be3pqx5hlzmgxqsege5er4p;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/conduit-0.9.1-sioyszp7ze6fzubtdslxlpkxzojic7hq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/parmetis-4.0.3-de7rslbjz6xchwd4jlec2iswp6yf4yt7;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/hdf5-1.8.23-j75364eqyn3yxqzod7t4v3hpbaw3zqg4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/blt-0.6.1.4-oouarzy7h3sj5quygkhjaduigaxbj4at;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/fmt-10.2.1-lfndxhuits6wwazxaoj5dxl3ix3hw2cc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/camp-2024.02.0-ejjy6cua3jj5bnwbk3r6x46ffgqe6tip;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/zlib-ng-2.1.5-lkg7eg7nky6w74eujzgmp6hnhkaf2w7p;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/libyogrt-1.33-z45arsyuiqgmqeo3vnzdiosnbyksfypl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/metis-5.1.0-ggcpxjmhkbi3nwtqmgu7dal2rsedyza5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/gmake-4.4.1-jimcbwsnakmlfui3jg7a4e6327ry222f;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/c2c-1.8.0-eojdjy4bkke6p7mtj47tsbk35f3ag3us;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6;/usr/tce/packages/clang/clang-14.0.6" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/axom-develop-5hpzhtmywppnpol3crmlzn4oxctfyukn/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/axom-develop-5hpzhtmywppnpol3crmlzn4oxctfyukn/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/c2c-1.8.0-eojdjy4bkke6p7mtj47tsbk35f3ag3us/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/conduit-0.9.1-sioyszp7ze6fzubtdslxlpkxzojic7hq/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/hdf5-1.8.23-j75364eqyn3yxqzod7t4v3hpbaw3zqg4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/zlib-ng-2.1.5-lkg7eg7nky6w74eujzgmp6hnhkaf2w7p/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/metis-5.1.0-ggcpxjmhkbi3nwtqmgu7dal2rsedyza5/lib;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/parmetis-4.0.3-de7rslbjz6xchwd4jlec2iswp6yf4yt7/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/mfem-4.6.0-2o3e3zv4evsmrgwpwroyhpmj2pot7fgj/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/hypre-2.24.0-k33flgav4be3pqx5hlzmgxqsege5er4p/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/py-jsonschema-2.6.0-6j5dc4xbppedseqpxhmnvdsvfm5nohqz/lib;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/raja-2024.02.0-i7u43vvuic25rvjjhkeblvxeitkvzjwy/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/camp-2024.02.0-ejjy6cua3jj5bnwbk3r6x46ffgqe6tip/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/dtcmp-1.1.4-scoxi2onj4nu3g5em5dgc4imwzihgfjj/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/lwgrp-1.0.5-rdvuqikm56okeru5jkroem5tpaybke3q/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/libyogrt-1.33-z45arsyuiqgmqeo3vnzdiosnbyksfypl/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/scr-3.0.1-t7t35dyvwswfrk3lp2k4tcjpiyyylgr6/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/axl-0.7.1-dvovqn3v6stb27lftz5c2jv7ykyt74o3/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/kvtree-1.3.0-3lkpy2ktv66bhbyxtg7r6xca2shap6sw/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/er-0.2.0-pfk7tzcycgqnc73twpnleapauynyrmuo/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/rankstr-0.1.0-t7qtfe3uihx4s2ia5gft2rvwmbfsaqcz/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/redset-0.2.0-yg22aoerdpabedvtormddcankg4lkitu/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/shuffile-0.2.0-lcyevsv6yv4cwtahb3kt5h4emqtfwwvb/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/spath-0.2.0-5ypljdbn6yf6ab3jabzpeeuxxvbm6vix/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/umpire-2024.02.0-jhuql5fc2vhya4sdl7g4nlcrzaoycqai/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/fmt-10.2.1-lfndxhuits6wwazxaoj5dxl3ix3hw2cc/lib64;/opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/axom-develop-5hpzhtmywppnpol3crmlzn4oxctfyukn/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/axom-develop-5hpzhtmywppnpol3crmlzn4oxctfyukn/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/c2c-1.8.0-eojdjy4bkke6p7mtj47tsbk35f3ag3us/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/conduit-0.9.1-sioyszp7ze6fzubtdslxlpkxzojic7hq/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/hdf5-1.8.23-j75364eqyn3yxqzod7t4v3hpbaw3zqg4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/zlib-ng-2.1.5-lkg7eg7nky6w74eujzgmp6hnhkaf2w7p/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/metis-5.1.0-ggcpxjmhkbi3nwtqmgu7dal2rsedyza5/lib;/usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/parmetis-4.0.3-de7rslbjz6xchwd4jlec2iswp6yf4yt7/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/mfem-4.6.0-2o3e3zv4evsmrgwpwroyhpmj2pot7fgj/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/hypre-2.24.0-k33flgav4be3pqx5hlzmgxqsege5er4p/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/py-jsonschema-2.6.0-6j5dc4xbppedseqpxhmnvdsvfm5nohqz/lib;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/raja-2024.02.0-i7u43vvuic25rvjjhkeblvxeitkvzjwy/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/camp-2024.02.0-ejjy6cua3jj5bnwbk3r6x46ffgqe6tip/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/dtcmp-1.1.4-scoxi2onj4nu3g5em5dgc4imwzihgfjj/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/lwgrp-1.0.5-rdvuqikm56okeru5jkroem5tpaybke3q/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/libyogrt-1.33-z45arsyuiqgmqeo3vnzdiosnbyksfypl/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/scr-3.0.1-t7t35dyvwswfrk3lp2k4tcjpiyyylgr6/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/axl-0.7.1-dvovqn3v6stb27lftz5c2jv7ykyt74o3/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/kvtree-1.3.0-3lkpy2ktv66bhbyxtg7r6xca2shap6sw/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/er-0.2.0-pfk7tzcycgqnc73twpnleapauynyrmuo/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/rankstr-0.1.0-t7qtfe3uihx4s2ia5gft2rvwmbfsaqcz/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/redset-0.2.0-yg22aoerdpabedvtormddcankg4lkitu/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/shuffile-0.2.0-lcyevsv6yv4cwtahb3kt5h4emqtfwwvb/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/spath-0.2.0-5ypljdbn6yf6ab3jabzpeeuxxvbm6vix/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/umpire-2024.02.0-jhuql5fc2vhya4sdl7g4nlcrzaoycqai/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6/fmt-10.2.1-lfndxhuits6wwazxaoj5dxl3ix3hw2cc/lib64;/opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/clang/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/spack/lib/spack/env/clang/gfortran" CACHE PATH "") else() @@ -31,8 +37,6 @@ else() endif() -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") set(BLT_EXE_LINKER_FLAGS " -Wl,-rpath,/usr/tce/packages/clang/clang-14.0.6/lib" CACHE STRING "Adds a missing libstdc++ rpath") @@ -69,45 +73,45 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/clang-14.0.6" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/clang-14.0.6" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-inqrhwboacvngevqbvavhpisx4aeqpvy" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-sioyszp7ze6fzubtdslxlpkxzojic7hq" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-5smd5ktj7yjc2egeyum4t5vlwmw3jktt" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-eojdjy4bkke6p7mtj47tsbk35f3ag3us" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-lwet4c3edrdvipij3r4itukmse2jklvy" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-2o3e3zv4evsmrgwpwroyhpmj2pot7fgj" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-5mfm2r7fo5krpj7vvmayz24qksnluryl" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-j75364eqyn3yxqzod7t4v3hpbaw3zqg4" CACHE PATH "") set(LUA_DIR "/usr" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-55ypap77cpmjgq24vaquanhsshjm3gqh" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-i7u43vvuic25rvjjhkeblvxeitkvzjwy" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-ubadmsj3l2zavunhkkt7nxevkpmssdvy" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-jhuql5fc2vhya4sdl7g4nlcrzaoycqai" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-e6mknahsrmbbifbfv3umemetvqzoh3he" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-ejjy6cua3jj5bnwbk3r6x46ffgqe6tip" CACHE PATH "") -set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-5edtc4k2wstti2dh4kp2tno7rmwr3lyd" CACHE PATH "") +set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-t7t35dyvwswfrk3lp2k4tcjpiyyylgr6" CACHE PATH "") -set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-4zcbvvaqpbkdt7xc4pbu7urlkdywjjd7" CACHE PATH "") +set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-3lkpy2ktv66bhbyxtg7r6xca2shap6sw" CACHE PATH "") -set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-u376uqcnt3y7ebu5ocfvk7bovkr2febv" CACHE PATH "") +set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-scoxi2onj4nu3g5em5dgc4imwzihgfjj" CACHE PATH "") -set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-gvlnzegcdph7ien3w4tjcxevblf2xe4r" CACHE PATH "") +set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-5ypljdbn6yf6ab3jabzpeeuxxvbm6vix" CACHE PATH "") -set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-t7yboywzjziqb3hbgidynhbk5vd33jc7" CACHE PATH "") +set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-dvovqn3v6stb27lftz5c2jv7ykyt74o3" CACHE PATH "") -set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-am6sfml4trdhzlds365vbepezgdvdocz" CACHE PATH "") +set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-rdvuqikm56okeru5jkroem5tpaybke3q" CACHE PATH "") -set(ER_DIR "${TPL_ROOT}/er-0.2.0-befo66qsdjjulpnhaxvhk4uil45ynd6u" CACHE PATH "") +set(ER_DIR "${TPL_ROOT}/er-0.2.0-pfk7tzcycgqnc73twpnleapauynyrmuo" CACHE PATH "") -set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-jkgwo3kyvegaapdtm67mg4aknu44foyn" CACHE PATH "") +set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-t7qtfe3uihx4s2ia5gft2rvwmbfsaqcz" CACHE PATH "") -set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-tllpyzklkik7oa32us3tigl7vdvil42o" CACHE PATH "") +set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-yg22aoerdpabedvtormddcankg4lkitu" CACHE PATH "") -set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-j5blkpa2h3keb562qb5pdnfiuzyaecfd" CACHE PATH "") +set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-lcyevsv6yv4cwtahb3kt5h4emqtfwwvb" CACHE PATH "") -set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-3joihut3xh67qmtalrqadzujfzxwpodj" CACHE PATH "") +set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-z45arsyuiqgmqeo3vnzdiosnbyksfypl" CACHE PATH "") #------------------------------------------------------------------------------ # Devtools @@ -119,6 +123,8 @@ set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/lat set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-6j5dc4xbppedseqpxhmnvdsvfm5nohqz/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake index 716c6c99ea..090c2f62dc 100644 --- a/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake +++ b/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/scr-3.0.1-znr5hvdmrpg2wwtcrepv3bzh32visddj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/spath-0.2.0-scp7lun3jtdgorfmd4mzhtieqkjko57q;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/libyogrt-1.33-riegwpsbfjywz6pumvit2eadroiosowy;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/er-0.2.0-m7mypt2brwrodmfun3ya2cwpkuwpccnv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/shuffile-0.2.0-74ysb2qi6xkrx7u5vsa2jnmcqof3q4je;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/redset-0.2.0-7bhg5tua2jns5ob7r6stbgitzlfggdax;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/rankstr-0.1.0-yuunbkeetjd4y563p4dzxp23rsdcc6tr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/dtcmp-1.1.4-bk55ioptacxzxnpxcgu27vwk2nacb35s;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/lwgrp-1.0.5-zhpxnopjtpr5cchaqufivi2sn4crkgwn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/axl-0.7.1-b3zz33f7lmeal5thbfyuc6cmbdfek2vv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/kvtree-1.3.0-oeqjobwdjxemywgc77pfuv4nnpxk6buj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/hypre-2.24.0-lof7hdy7wsyuei436d6uhilprsgmr3ik;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/parmetis-4.0.3-lq6aryhur6qn3trc2qxizvz4nae5ngzf;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/metis-5.1.0-pyrzcrzqvl6q27kk637o2nwi3j7ibseb;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/gmake-4.4.1-y2kaxrqjbg3dcwo7dzfphztusfjqoowq;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1/blt-0.5.3-iljv7wrfi4r5i4drs4yf65rgsuunaxjn;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/umpire-2024.02.0-2edi7papg24dx6cmzuu4cvli6gn5ula4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/fmt-10.2.1-vsppemwn4lv42jffltnu2m5wk7pa4mh4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/scr-3.0.1-53wid77fnqp54as4ssxj6yln3ebatfqc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/spath-0.2.0-vy4oatc22e4yhneh564uexojguzk64hl;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/libyogrt-1.33-5ylxltz7yzkytfwjqsdy7alvfpvblpfa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/er-0.2.0-ssi5sg74fzuszg64bx4w36k74aylefbs;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/shuffile-0.2.0-2dqga6mipogmwwnegz6ruroxjjpuydns;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/redset-0.2.0-26dcmicvi4gl3n7bezyvvt6tzxgfhyt4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/rankstr-0.1.0-rtae4hecutfnw3p2c3pw2r23wel57wxe;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/dtcmp-1.1.4-fhlas27vbqequpdrt7hs4z5y7fu6fcux;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/lwgrp-1.0.5-xy2pfakxxt737yqixkijiopg5aqe6qy4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/axl-0.7.1-it2ovw5easrshsv2ii3y7ui7sykejtl3;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/kvtree-1.3.0-ox6ll5w2vlux2gncxlxp6f7sduc5we3k;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/raja-2024.02.0-lgda75dl72dsc3fpkaboonrastlb533i;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/camp-2024.02.0-54ph6bxcskqc6vyj2yumw2c453rdw3ms;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/py-jsonschema-2.6.0-lxk3nz6n2wxarwsyghge5l6jio4pze63;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/mfem-4.6.0-72vdexr6wsfxessfqnjamz4yw7bbimzv;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/hypre-2.24.0-fqukfipx623hwcdtl44ul6m7gf436bea;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/gmake-4.4.1-hnowwppvujezizfysc64xc2myqqulzcn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/conduit-0.9.1-2gxyktbxfdki7l62knbd2gcv2po5mnnz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/parmetis-4.0.3-olkucdyohy6nglxyp6yqvflfxhhtjji4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/metis-5.1.0-au7rbsfu6yv7cazug6635jzvb2gwy7st;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/hdf5-1.8.23-qdwxt3e3mv7bjt3xqcybad7beymgxcsn;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/zlib-ng-2.1.5-shzp76r665h2g3lnqspfmluapd7jxtrt;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/c2c-1.8.0-fahftlekwziw2ls4bezzaviuke4kvqyz;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/blt-0.6.1.4-ee4ftwhz24yhie53n4ximxniibs3wair;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/gcc-runtime-10.3.1-yxmwjg76ccmk3rbqtfni7b56ykrldyrb;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce;/usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/axom-develop-7y7edht7m7fpp3mt27ogvq6ymbcldzmq/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/axom-develop-7y7edht7m7fpp3mt27ogvq6ymbcldzmq/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/c2c-1.8.0-fahftlekwziw2ls4bezzaviuke4kvqyz/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/gcc-runtime-10.3.1-yxmwjg76ccmk3rbqtfni7b56ykrldyrb/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/conduit-0.9.1-2gxyktbxfdki7l62knbd2gcv2po5mnnz/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/hdf5-1.8.23-qdwxt3e3mv7bjt3xqcybad7beymgxcsn/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/zlib-ng-2.1.5-shzp76r665h2g3lnqspfmluapd7jxtrt/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/metis-5.1.0-au7rbsfu6yv7cazug6635jzvb2gwy7st/lib;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/parmetis-4.0.3-olkucdyohy6nglxyp6yqvflfxhhtjji4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/mfem-4.6.0-72vdexr6wsfxessfqnjamz4yw7bbimzv/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/hypre-2.24.0-fqukfipx623hwcdtl44ul6m7gf436bea/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/py-jsonschema-2.6.0-lxk3nz6n2wxarwsyghge5l6jio4pze63/lib;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/raja-2024.02.0-lgda75dl72dsc3fpkaboonrastlb533i/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/camp-2024.02.0-54ph6bxcskqc6vyj2yumw2c453rdw3ms/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/dtcmp-1.1.4-fhlas27vbqequpdrt7hs4z5y7fu6fcux/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/lwgrp-1.0.5-xy2pfakxxt737yqixkijiopg5aqe6qy4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/libyogrt-1.33-5ylxltz7yzkytfwjqsdy7alvfpvblpfa/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/scr-3.0.1-53wid77fnqp54as4ssxj6yln3ebatfqc/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/axl-0.7.1-it2ovw5easrshsv2ii3y7ui7sykejtl3/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/kvtree-1.3.0-ox6ll5w2vlux2gncxlxp6f7sduc5we3k/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/er-0.2.0-ssi5sg74fzuszg64bx4w36k74aylefbs/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/rankstr-0.1.0-rtae4hecutfnw3p2c3pw2r23wel57wxe/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/redset-0.2.0-26dcmicvi4gl3n7bezyvvt6tzxgfhyt4/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/shuffile-0.2.0-2dqga6mipogmwwnegz6ruroxjjpuydns/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/spath-0.2.0-vy4oatc22e4yhneh564uexojguzk64hl/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/umpire-2024.02.0-2edi7papg24dx6cmzuu4cvli6gn5ula4/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/fmt-10.2.1-vsppemwn4lv42jffltnu2m5wk7pa4mh4/lib64;/collab/usr/global/tools/tce4/packages/gcc/gcc-10.3.1/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/axom-develop-7y7edht7m7fpp3mt27ogvq6ymbcldzmq/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/axom-develop-7y7edht7m7fpp3mt27ogvq6ymbcldzmq/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/c2c-1.8.0-fahftlekwziw2ls4bezzaviuke4kvqyz/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/gcc-runtime-10.3.1-yxmwjg76ccmk3rbqtfni7b56ykrldyrb/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/conduit-0.9.1-2gxyktbxfdki7l62knbd2gcv2po5mnnz/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/hdf5-1.8.23-qdwxt3e3mv7bjt3xqcybad7beymgxcsn/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/zlib-ng-2.1.5-shzp76r665h2g3lnqspfmluapd7jxtrt/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/metis-5.1.0-au7rbsfu6yv7cazug6635jzvb2gwy7st/lib;/usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/parmetis-4.0.3-olkucdyohy6nglxyp6yqvflfxhhtjji4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/mfem-4.6.0-72vdexr6wsfxessfqnjamz4yw7bbimzv/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/hypre-2.24.0-fqukfipx623hwcdtl44ul6m7gf436bea/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/py-jsonschema-2.6.0-lxk3nz6n2wxarwsyghge5l6jio4pze63/lib;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/raja-2024.02.0-lgda75dl72dsc3fpkaboonrastlb533i/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/camp-2024.02.0-54ph6bxcskqc6vyj2yumw2c453rdw3ms/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/dtcmp-1.1.4-fhlas27vbqequpdrt7hs4z5y7fu6fcux/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/lwgrp-1.0.5-xy2pfakxxt737yqixkijiopg5aqe6qy4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/libyogrt-1.33-5ylxltz7yzkytfwjqsdy7alvfpvblpfa/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/scr-3.0.1-53wid77fnqp54as4ssxj6yln3ebatfqc/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/axl-0.7.1-it2ovw5easrshsv2ii3y7ui7sykejtl3/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/kvtree-1.3.0-ox6ll5w2vlux2gncxlxp6f7sduc5we3k/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/er-0.2.0-ssi5sg74fzuszg64bx4w36k74aylefbs/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/rankstr-0.1.0-rtae4hecutfnw3p2c3pw2r23wel57wxe/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/redset-0.2.0-26dcmicvi4gl3n7bezyvvt6tzxgfhyt4/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/shuffile-0.2.0-2dqga6mipogmwwnegz6ruroxjjpuydns/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/spath-0.2.0-vy4oatc22e4yhneh564uexojguzk64hl/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/umpire-2024.02.0-2edi7papg24dx6cmzuu4cvli6gn5ula4/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1/fmt-10.2.1-vsppemwn4lv42jffltnu2m5wk7pa4mh4/lib64;/collab/usr/global/tools/tce4/packages/gcc/gcc-10.3.1/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/gcc/gcc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/spack/lib/spack/env/gcc/gcc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/gcc/g++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/spack/lib/spack/env/gcc/g++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/spack/lib/spack/env/gcc/gfortran" CACHE PATH "") else() @@ -31,8 +37,6 @@ else() endif() -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") #------------------------------------------------------------------------------ @@ -67,45 +71,45 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/gcc-10.3.1" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/gcc-10.3.1" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-wngwwhpllk2gjewlizsk4plakvdu4beu" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-2gxyktbxfdki7l62knbd2gcv2po5mnnz" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-bsohtsh5a73tmmxlndgjuhzz6lzoif5j" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-fahftlekwziw2ls4bezzaviuke4kvqyz" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-uyempb4k6nefxh36lxnbfb2dynpyaezr" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-72vdexr6wsfxessfqnjamz4yw7bbimzv" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-wikz2sxdo4zf76fdfl5do4mekkixf4yv" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-qdwxt3e3mv7bjt3xqcybad7beymgxcsn" CACHE PATH "") set(LUA_DIR "/usr" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-ca64lzglcihqwwjcmxuzfdvg7bhsd5rq" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-lgda75dl72dsc3fpkaboonrastlb533i" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-z2ts74flz56i67azbbp5zyiwvwgwucrr" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-2edi7papg24dx6cmzuu4cvli6gn5ula4" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-k4v6kc3zhnika36o2jvhncwiwcaifxqp" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-54ph6bxcskqc6vyj2yumw2c453rdw3ms" CACHE PATH "") -set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-znr5hvdmrpg2wwtcrepv3bzh32visddj" CACHE PATH "") +set(SCR_DIR "${TPL_ROOT}/scr-3.0.1-53wid77fnqp54as4ssxj6yln3ebatfqc" CACHE PATH "") -set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-oeqjobwdjxemywgc77pfuv4nnpxk6buj" CACHE PATH "") +set(KVTREE_DIR "${TPL_ROOT}/kvtree-1.3.0-ox6ll5w2vlux2gncxlxp6f7sduc5we3k" CACHE PATH "") -set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-bk55ioptacxzxnpxcgu27vwk2nacb35s" CACHE PATH "") +set(DTCMP_DIR "${TPL_ROOT}/dtcmp-1.1.4-fhlas27vbqequpdrt7hs4z5y7fu6fcux" CACHE PATH "") -set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-scp7lun3jtdgorfmd4mzhtieqkjko57q" CACHE PATH "") +set(SPATH_DIR "${TPL_ROOT}/spath-0.2.0-vy4oatc22e4yhneh564uexojguzk64hl" CACHE PATH "") -set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-b3zz33f7lmeal5thbfyuc6cmbdfek2vv" CACHE PATH "") +set(AXL_DIR "${TPL_ROOT}/axl-0.7.1-it2ovw5easrshsv2ii3y7ui7sykejtl3" CACHE PATH "") -set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-zhpxnopjtpr5cchaqufivi2sn4crkgwn" CACHE PATH "") +set(LWGRP_DIR "${TPL_ROOT}/lwgrp-1.0.5-xy2pfakxxt737yqixkijiopg5aqe6qy4" CACHE PATH "") -set(ER_DIR "${TPL_ROOT}/er-0.2.0-m7mypt2brwrodmfun3ya2cwpkuwpccnv" CACHE PATH "") +set(ER_DIR "${TPL_ROOT}/er-0.2.0-ssi5sg74fzuszg64bx4w36k74aylefbs" CACHE PATH "") -set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-yuunbkeetjd4y563p4dzxp23rsdcc6tr" CACHE PATH "") +set(RANKSTR_DIR "${TPL_ROOT}/rankstr-0.1.0-rtae4hecutfnw3p2c3pw2r23wel57wxe" CACHE PATH "") -set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-7bhg5tua2jns5ob7r6stbgitzlfggdax" CACHE PATH "") +set(REDSET_DIR "${TPL_ROOT}/redset-0.2.0-26dcmicvi4gl3n7bezyvvt6tzxgfhyt4" CACHE PATH "") -set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-74ysb2qi6xkrx7u5vsa2jnmcqof3q4je" CACHE PATH "") +set(SHUFFILE_DIR "${TPL_ROOT}/shuffile-0.2.0-2dqga6mipogmwwnegz6ruroxjjpuydns" CACHE PATH "") -set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-riegwpsbfjywz6pumvit2eadroiosowy" CACHE PATH "") +set(LIBYOGRT_DIR "${TPL_ROOT}/libyogrt-1.33-5ylxltz7yzkytfwjqsdy7alvfpvblpfa" CACHE PATH "") #------------------------------------------------------------------------------ # Devtools @@ -117,6 +121,8 @@ set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/lat set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-lxk3nz6n2wxarwsyghge5l6jio4pze63/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake index dc1b0324fc..69fe3de6c4 100644 --- a/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake +++ b/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/hypre-2.24.0-qdjyl5ibcpl4nxb6t5godfgvi5bb6hac;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/parmetis-4.0.3-nqxoj5gqogj32hfo5ognkcb6vg24zdlc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/metis-5.1.0-tb5bijmooj2d6d2npjpajcj4fyu4yd4y;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/gmake-4.4.1-e3r4ry6vgi7zp4mbwfokypkutqwpctek;/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0/blt-0.5.3-i7qltms7ksyz4xltznzbtsafywrykq7b;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/usr/tce" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/umpire-2024.02.0-4nxnup6vxwkwkinxdzzinkxul6vk2lsj;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/raja-2024.02.0-v5ckygwjzmo7e2rts5qxwgfswhhpeqta;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/py-jsonschema-2.6.0-scktpdojmezaljg2bxfbzmf5lx3nmwvc;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/mfem-4.6.0-hma2wvr5tv3fkry6kdqfxmtsnqg6fv4d;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/hypre-2.24.0-czbxd2tmdjbl7v4nwommsh7xgw7ewgla;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/conduit-0.9.1-t745zbwmn5ffzo7whgwxmz5p5w2ym37z;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/parmetis-4.0.3-hattuaxqypmcfeqr3nvedmojwbgiora2;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/hdf5-1.8.23-2l37bduu2kjsgmhjxbfdgchsha2di2of;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/blt-0.6.1.4-3p2ecutmo7drpwwvvsgtcqxakxjoy573;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/fmt-10.2.1-jltnp6nb3minlrrafmdenoakubdzom57;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/camp-2024.02.0-xyur27wnppnansskdldrlqyzormhcr4e;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/zlib-ng-2.1.5-jtmqc4b5fqadcqbwagtun6kwe6geexbw;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/metis-5.1.0-hk6ipui6fnixwdyloqmqbsixqhtv5hxw;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/gmake-4.4.1-giduhrefimvdwblsuh6cmqipc474toi5;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/c2c-1.8.0-ovky3pniupirnys6mtf24ke5sb64mkbr;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/collab/usr/gapps/shroud/public/toss_4_x86_64_ib/shroud-0.13.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/cppcheck-2.9;/usr/tce" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/axom-develop-ma6pw2s3obh5afi3kvbgksqemjcs3ty7/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/axom-develop-ma6pw2s3obh5afi3kvbgksqemjcs3ty7/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/c2c-1.8.0-ovky3pniupirnys6mtf24ke5sb64mkbr/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/conduit-0.9.1-t745zbwmn5ffzo7whgwxmz5p5w2ym37z/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/hdf5-1.8.23-2l37bduu2kjsgmhjxbfdgchsha2di2of/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/zlib-ng-2.1.5-jtmqc4b5fqadcqbwagtun6kwe6geexbw/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/metis-5.1.0-hk6ipui6fnixwdyloqmqbsixqhtv5hxw/lib;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/parmetis-4.0.3-hattuaxqypmcfeqr3nvedmojwbgiora2/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/mfem-4.6.0-hma2wvr5tv3fkry6kdqfxmtsnqg6fv4d/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/hypre-2.24.0-czbxd2tmdjbl7v4nwommsh7xgw7ewgla/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/py-jsonschema-2.6.0-scktpdojmezaljg2bxfbzmf5lx3nmwvc/lib;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/raja-2024.02.0-v5ckygwjzmo7e2rts5qxwgfswhhpeqta/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/camp-2024.02.0-xyur27wnppnansskdldrlqyzormhcr4e/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/umpire-2024.02.0-4nxnup6vxwkwkinxdzzinkxul6vk2lsj/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/fmt-10.2.1-jltnp6nb3minlrrafmdenoakubdzom57/lib64;/usr/tce/backend/installations/linux-rhel8-x86_64/gcc-10.3.1/intel-oneapi-compilers-2022.1.0-43xp3r52jx2q2rkf3ctzvskqu572xbky/compiler/2022.1.0/linux/compiler/lib/intel64_lin;/opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/axom-develop-ma6pw2s3obh5afi3kvbgksqemjcs3ty7/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/axom-develop-ma6pw2s3obh5afi3kvbgksqemjcs3ty7/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/c2c-1.8.0-ovky3pniupirnys6mtf24ke5sb64mkbr/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/conduit-0.9.1-t745zbwmn5ffzo7whgwxmz5p5w2ym37z/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/hdf5-1.8.23-2l37bduu2kjsgmhjxbfdgchsha2di2of/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/zlib-ng-2.1.5-jtmqc4b5fqadcqbwagtun6kwe6geexbw/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/metis-5.1.0-hk6ipui6fnixwdyloqmqbsixqhtv5hxw/lib;/usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/parmetis-4.0.3-hattuaxqypmcfeqr3nvedmojwbgiora2/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/mfem-4.6.0-hma2wvr5tv3fkry6kdqfxmtsnqg6fv4d/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/hypre-2.24.0-czbxd2tmdjbl7v4nwommsh7xgw7ewgla/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/py-jsonschema-2.6.0-scktpdojmezaljg2bxfbzmf5lx3nmwvc/lib;/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/raja-2024.02.0-v5ckygwjzmo7e2rts5qxwgfswhhpeqta/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/camp-2024.02.0-xyur27wnppnansskdldrlqyzormhcr4e/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/umpire-2024.02.0-4nxnup6vxwkwkinxdzzinkxul6vk2lsj/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0/fmt-10.2.1-jltnp6nb3minlrrafmdenoakubdzom57/lib64;/usr/tce/backend/installations/linux-rhel8-x86_64/gcc-10.3.1/intel-oneapi-compilers-2022.1.0-43xp3r52jx2q2rkf3ctzvskqu572xbky/compiler/2022.1.0/linux/compiler/lib/intel64_lin;/opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/intel/icc" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/spack/lib/spack/env/intel/icc" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/intel/icpc" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/spack/lib/spack/env/intel/icpc" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/spack/lib/spack/env/intel/ifort" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/spack/lib/spack/env/intel/ifort" CACHE PATH "") else() @@ -31,8 +37,6 @@ else() endif() -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") #------------------------------------------------------------------------------ @@ -67,23 +71,23 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2023_10_30_13_06_22/intel-2022.1.0" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib/2024_03_07_00_00_58/intel-2022.1.0" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-22refnw4twba4zznewcuczky2udimj7i" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-t745zbwmn5ffzo7whgwxmz5p5w2ym37z" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-gvlftgplgmtput3k4fy2nssecldmmlsa" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-ovky3pniupirnys6mtf24ke5sb64mkbr" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-dbvjel6jhwnwf6wzm76w6ghbjpy3v4gj" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-hma2wvr5tv3fkry6kdqfxmtsnqg6fv4d" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-6oeginq7kyyix35utjgsfxeghcnujtpg" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-2l37bduu2kjsgmhjxbfdgchsha2di2of" CACHE PATH "") set(LUA_DIR "/usr" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-urtfojwbjummyvyev7k4zn2oix53f4up" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-v5ckygwjzmo7e2rts5qxwgfswhhpeqta" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-6wmifjy5c2er4kkfqw7m5s4in7esiln5" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-4nxnup6vxwkwkinxdzzinkxul6vk2lsj" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-ovewmmz43udq34jrdlokh2zuzgkzrum4" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-xyur27wnppnansskdldrlqyzormhcr4e" CACHE PATH "") # scr not built @@ -97,6 +101,8 @@ set(CLANGFORMAT_EXECUTABLE "/collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/lat set(PYTHON_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/python3.10" CACHE PATH "") +set(JSONSCHEMA_EXECUTABLE "${TPL_ROOT}/py-jsonschema-2.6.0-scktpdojmezaljg2bxfbzmf5lx3nmwvc/bin/jsonschema" CACHE PATH "") + set(ENABLE_DOCS ON CACHE BOOL "") set(SPHINX_EXECUTABLE "${DEVTOOLS_ROOT}/python-3.10.10/bin/sphinx-build" CACHE PATH "") diff --git a/host-configs/rzvernal-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake b/host-configs/rzvernal-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake index ad11165834..2feecca36c 100644 --- a/host-configs/rzvernal-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake +++ b/host-configs/rzvernal-toss_4_x86_64_ib_cray-clang@16.0.0_hip.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/tce/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0/umpire-2023.06.0-yeccv6q7zasapkqmulwukmay2xfq5hyu;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0/raja-2023.06.0-7y7neucz73mp5aidhw7kfbmqhwgsr4ww;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0/camp-2023.06.0-zu25serllpaiepsclsd3o7w4clj5k2bs;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0/mfem-4.5.2-znyrzghqsshldarhqa6gweqgukahiyjw;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0/hypre-2.24.0-hodcjhfvx7c6fupyaw5kgoiuazbxcaij;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0/lua-5.4.4-j446jxtxyu4x2byxkcvzv4ek4w5pr3fh;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0/ncurses-6.4-sqvzpcbeunczs72a55mzrqi7rpl7aojx;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0/conduit-0.8.8-nexjzr5p6zy3lb7kbkojaqbmvn64bwnf;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0/parmetis-4.0.3-l3yx62tarv37nnultafaw2q7yows6c22;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0/metis-5.1.0-gwyy4vhrzd77gbdxd4thjxtxwrjads4l;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0/hdf5-1.8.22-gph5gvans7w7rhb3acho7c3yydyxbck6;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0/c2c-1.8.0-oht7wdi5u5r4zlf7mcdk36xcuvt3y5j7;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0/blt-0.5.3-no74mmcw3sf324mpvpdzlu57kmg2xwby;/opt/rocm-5.6.0;/opt/rocm-5.6.0/llvm;/opt/rocm-5.6.0;/opt/rocm-5.6.0/hip;/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.6.0;/usr/tce" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/umpire-2024.02.0-rjjfznegq3beeahbio7h4voasmljpnef;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/raja-2024.02.0-2i63uxx4gs2hv6bseeo53vnvpqxvq53a;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/camp-2024.02.0-z6vcrbxgnq44voxaiplbkss7xkeuezam;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/mfem-4.6.0-rqn67zhr6wo6mgcfqjrb3kzzh4neg52v;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/hypre-2.24.0-ki5iqwndtm6rvb4nrb7ebbvl3x24q3vt;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/lua-5.4.4-k44ecokhewutosgyh3v4ifqejiqxxkwk;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/conduit-0.9.1-weyusx6lu3gczfg24vwaji4dy53ekfc5;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/parmetis-4.0.3-ll2czqc5pmp3olgjpu47krq4jgxksmdt;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/hdf5-1.8.23-iuu6knfssyy4j2uv6qo7oqmm2afqw5jv;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/blt-0.6.1.4-rsolo2redxjrxxepfboqczt24wsewi2r;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/fmt-10.2.1-nr2acfkfdgyihxps6ekcgfn4fk56v5rb;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/zlib-ng-2.1.5-c4toe533t23gocizsqebzf4s662hyxlt;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/metis-5.1.0-rjek5dokihv3f6afzrhphjgg6xcjrfvk;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/ncurses-6.4-ezqmnqki7vits7vrigam3pwcidzycnny;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/c2c-1.8.0-fg73ebtjbsm2kpd5s44vxa6jjsybwbbb;/opt/rocm-5.6.0/llvm;/opt/rocm-5.6.0;/opt/rocm-5.6.0/hip;/opt/rocm-5.6.0;/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.6.0;/usr/tce" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/axom-develop-uidv2vofjqx7373o6tz53up2jxpgkev4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/axom-develop-uidv2vofjqx7373o6tz53up2jxpgkev4/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/c2c-1.8.0-fg73ebtjbsm2kpd5s44vxa6jjsybwbbb/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/conduit-0.9.1-weyusx6lu3gczfg24vwaji4dy53ekfc5/lib;/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.6.0/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/hdf5-1.8.23-iuu6knfssyy4j2uv6qo7oqmm2afqw5jv/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/zlib-ng-2.1.5-c4toe533t23gocizsqebzf4s662hyxlt/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/metis-5.1.0-rjek5dokihv3f6afzrhphjgg6xcjrfvk/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/parmetis-4.0.3-ll2czqc5pmp3olgjpu47krq4jgxksmdt/lib;/opt/rocm-5.6.0/hip/lib;/opt/rocm-5.6.0/lib;/opt/rocm-5.6.0/llvm/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/lua-5.4.4-k44ecokhewutosgyh3v4ifqejiqxxkwk/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/ncurses-6.4-ezqmnqki7vits7vrigam3pwcidzycnny/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/mfem-4.6.0-rqn67zhr6wo6mgcfqjrb3kzzh4neg52v/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/hypre-2.24.0-ki5iqwndtm6rvb4nrb7ebbvl3x24q3vt/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/raja-2024.02.0-2i63uxx4gs2hv6bseeo53vnvpqxvq53a/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/camp-2024.02.0-z6vcrbxgnq44voxaiplbkss7xkeuezam/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/umpire-2024.02.0-rjjfznegq3beeahbio7h4voasmljpnef/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/fmt-10.2.1-nr2acfkfdgyihxps6ekcgfn4fk56v5rb/lib64;/opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/axom-develop-uidv2vofjqx7373o6tz53up2jxpgkev4/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/axom-develop-uidv2vofjqx7373o6tz53up2jxpgkev4/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/c2c-1.8.0-fg73ebtjbsm2kpd5s44vxa6jjsybwbbb/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/conduit-0.9.1-weyusx6lu3gczfg24vwaji4dy53ekfc5/lib;/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.6.0/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/hdf5-1.8.23-iuu6knfssyy4j2uv6qo7oqmm2afqw5jv/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/zlib-ng-2.1.5-c4toe533t23gocizsqebzf4s662hyxlt/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/metis-5.1.0-rjek5dokihv3f6afzrhphjgg6xcjrfvk/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/parmetis-4.0.3-ll2czqc5pmp3olgjpu47krq4jgxksmdt/lib;/opt/rocm-5.6.0/hip/lib;/opt/rocm-5.6.0/lib;/opt/rocm-5.6.0/llvm/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/lua-5.4.4-k44ecokhewutosgyh3v4ifqejiqxxkwk/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/ncurses-6.4-ezqmnqki7vits7vrigam3pwcidzycnny/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/mfem-4.6.0-rqn67zhr6wo6mgcfqjrb3kzzh4neg52v/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/hypre-2.24.0-ki5iqwndtm6rvb4nrb7ebbvl3x24q3vt/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/raja-2024.02.0-2i63uxx4gs2hv6bseeo53vnvpqxvq53a/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/camp-2024.02.0-z6vcrbxgnq44voxaiplbkss7xkeuezam/lib;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/umpire-2024.02.0-rjjfznegq3beeahbio7h4voasmljpnef/lib64;/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0/fmt-10.2.1-nr2acfkfdgyihxps6ekcgfn4fk56v5rb/lib64;/opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-redhat-linux/10" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -15,11 +21,11 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") #------------------------------------------------------------------------------ if(DEFINED ENV{SPACK_CC}) - set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/spack/lib/spack/env/clang/clang" CACHE PATH "") + set(CMAKE_C_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/spack/lib/spack/env/clang/clang" CACHE PATH "") - set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/spack/lib/spack/env/clang/clang++" CACHE PATH "") + set(CMAKE_CXX_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/spack/lib/spack/env/clang/clang++" CACHE PATH "") - set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/spack/lib/spack/env/clang/flang" CACHE PATH "") + set(CMAKE_Fortran_COMPILER "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/spack/lib/spack/env/clang/flang" CACHE PATH "") else() @@ -33,8 +39,6 @@ endif() set(CMAKE_Fortran_FLAGS "-Mfreeform" CACHE STRING "") -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g -DNDEBUG" CACHE STRING "") @@ -67,6 +71,8 @@ set(HIP_ROOT_DIR "/opt/rocm-5.6.0/hip" CACHE PATH "") set(HIP_CXX_COMPILER "/opt/rocm-5.6.0/hip/bin/hipcc" CACHE PATH "") +set(CMAKE_HIP_COMPILER "/opt/rocm-5.6.0/llvm/bin/clang++" CACHE FILEPATH "") + set(CMAKE_HIP_ARCHITECTURES "gfx90a" CACHE STRING "") set(AMDGPU_TARGETS "gfx90a" CACHE STRING "") @@ -98,23 +104,23 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") # TPLs #------------------------------------------------------------------------------ -set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2023_07_26_18_12_45/clang-16.0.0" CACHE PATH "") +set(TPL_ROOT "/usr/WS1/axom/libs/toss_4_x86_64_ib_cray/2024_03_07_00_03_21/clang-16.0.0" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-nexjzr5p6zy3lb7kbkojaqbmvn64bwnf" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-weyusx6lu3gczfg24vwaji4dy53ekfc5" CACHE PATH "") -set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-oht7wdi5u5r4zlf7mcdk36xcuvt3y5j7" CACHE PATH "") +set(C2C_DIR "${TPL_ROOT}/c2c-1.8.0-fg73ebtjbsm2kpd5s44vxa6jjsybwbbb" CACHE PATH "") -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-znyrzghqsshldarhqa6gweqgukahiyjw" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-rqn67zhr6wo6mgcfqjrb3kzzh4neg52v" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-gph5gvans7w7rhb3acho7c3yydyxbck6" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-iuu6knfssyy4j2uv6qo7oqmm2afqw5jv" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-j446jxtxyu4x2byxkcvzv4ek4w5pr3fh" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-k44ecokhewutosgyh3v4ifqejiqxxkwk" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-7y7neucz73mp5aidhw7kfbmqhwgsr4ww" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-2i63uxx4gs2hv6bseeo53vnvpqxvq53a" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-yeccv6q7zasapkqmulwukmay2xfq5hyu" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-rjjfznegq3beeahbio7h4voasmljpnef" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-zu25serllpaiepsclsd3o7w4clj5k2bs" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-z6vcrbxgnq44voxaiplbkss7xkeuezam" CACHE PATH "") # scr not built From ae0ceec5e1e8de4f7af7340842710f8218674d1f Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 7 Mar 2024 08:27:14 -0800 Subject: [PATCH 583/639] Implement comments from code review and change some variable names for consistency. --- src/axom/primal/geometry/Vector.hpp | 42 ------------------- src/axom/quest/ArrayIndexer.hpp | 2 +- src/axom/quest/MeshViewUtil.hpp | 30 ++++++------- src/axom/quest/detail/MarchingCubesImpl.hpp | 23 +++++----- .../detail/MarchingCubesSingleDomain.hpp | 35 +++++----------- .../examples/quest_marching_cubes_example.cpp | 16 +++++-- src/axom/quest/tests/quest_mesh_view_util.cpp | 17 ++++---- 7 files changed, 60 insertions(+), 105 deletions(-) diff --git a/src/axom/primal/geometry/Vector.hpp b/src/axom/primal/geometry/Vector.hpp index 08b000ab67..9c00380b7f 100644 --- a/src/axom/primal/geometry/Vector.hpp +++ b/src/axom/primal/geometry/Vector.hpp @@ -133,24 +133,6 @@ AXOM_HOST_DEVICE Vector operator*(const T scalar, template Vector operator/(const Vector& vec, const T scalar); -/*! - * \brief Element-wise < operator. - * \param [in] vec vector instance - * \param [in] scalar user-supplied scalar. - * \return Whether all vector elements are < a scalar. - */ -template -bool operator<(const Vector& vec, const T scalar); - -/*! - * \brief Element-wise >= operator. - * \param [in] vec vector instance - * \param [in] scalar user-supplied scalar. - * \return Whether all vector elements are >= a scalar. - */ -template -bool operator>=(const Vector& vec, const T scalar); - /*! * \brief Overloaded output operator for vectors * \param [in] os C++ output stream @@ -716,30 +698,6 @@ std::ostream& operator<<(std::ostream& os, const Vector& vec) return os; } -//------------------------------------------------------------------------------ -template -inline bool operator<(const Vector& vec, const T scalar) -{ - bool result(true); - for(int d = 0; d < NDIMS; ++d) - { - result &= vec[d] < scalar; - } - return result; -} - -//------------------------------------------------------------------------------ -template -inline bool operator>=(const Vector& vec, const T scalar) -{ - bool result(true); - for(int d = 0; d < NDIMS; ++d) - { - result &= vec[d] >= scalar; - } - return result; -} - //------------------------------------------------------------------------------ template inline Vector Vector::make_vector(const T& x, diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index 760fcc9304..fb0cd32e9a 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -283,7 +283,7 @@ class ArrayIndexer return m_strides; } - //!@brief Whether a vector is a permutation vector + //!@brief Whether a StackArray represents a permutation. bool isPermutation(const axom::StackArray& v) { // v is a permutation if all its values are unique and in [0, DIM). diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index 9b64fab789..af6f02ebf8 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -381,8 +381,8 @@ class MeshViewUtil return axom::quest::internal::product(m_nodeShape); } - //! @brief Return the real (ghost-free) extents of mesh data. - const MdIndices& getRealExtents(const std::string& association) + //! @brief Return the real (ghost-free) shape of mesh data. + const MdIndices& getRealShape(const std::string& association) { if(association == "vertex") { @@ -676,11 +676,12 @@ class MeshViewUtil const MdIndices& strides, const MdIndices& offsets) { - SLIC_ERROR_IF(m_dom == nullptr, - axom::fmt::format( - "Cannot create field {}." - " MeshViewUtil was not constructed with a mutable domain.", - fieldName)); + SLIC_ERROR_IF( + m_dom == nullptr, + axom::fmt::format( + "Cannot create field {}." + " MeshViewUtil was not constructed with a non-const domain.", + fieldName)); SLIC_ERROR_IF( m_dom->has_path("fields/" + fieldName), axom::fmt::format("Cannot create field {}. It already exists.", fieldName)); @@ -690,7 +691,7 @@ class MeshViewUtil axom::fmt::format("MeshViewUtil doesn't support association '{}' yet.", association)); - const auto& realShape = getRealExtents(association); + const auto& realShape = getRealShape(association); MdIndices loPads, hiPads, paddedShape, strideOrder; axom::quest::internal::stridesAndOffsetsToShapes(realShape, offsets, @@ -758,11 +759,12 @@ class MeshViewUtil const MdIndices& hiPads, const MdIndices& strideOrder) { - SLIC_ERROR_IF(m_dom == nullptr, - axom::fmt::format( - "Cannot create field {}." - " MeshViewUtil was not constructed with a mutable domain.", - fieldName)); + SLIC_ERROR_IF( + m_dom == nullptr, + axom::fmt::format( + "Cannot create field {}." + " MeshViewUtil was not constructed with a non-const domain.", + fieldName)); SLIC_ERROR_IF( m_dom->has_path("fields/" + fieldName), axom::fmt::format("Cannot create field {}. It already exists.", fieldName)); @@ -774,7 +776,7 @@ class MeshViewUtil axom::StackArray offsets; axom::StackArray strides; axom::IndexType valuesCount; - const auto& realShape = getRealExtents(association); + const auto& realShape = getRealShape(association); axom::quest::internal::shapesToStridesAndOffsets(realShape, loPads, hiPads, diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 6e90497daa..84eb4ce167 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -72,16 +72,17 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase , m_caseIds() , m_caseIdsIndexer() , m_caseIdsFlat(caseIdsFlat) - , m_crossingCases(0, 0, m_allocatorID) , m_crossingFlags(crossingFlags) , m_scannedFlags(scannedFlags) + , m_facetIncrs(facetIncrs) + , m_crossingCases(0, 0, m_allocatorID) , m_crossingParentIds(0, 0, m_allocatorID) - , m_facetIncrs(facetIncrs) // (0, 0, m_allocatorID) , m_firstFacetIds(0, 0, m_allocatorID) { SLIC_ASSERT(caseIdsFlat.getAllocatorID() == allocatorID); SLIC_ASSERT(crossingFlags.getAllocatorID() == allocatorID); SLIC_ASSERT(scannedFlags.getAllocatorID() == allocatorID); + SLIC_ASSERT(facetIncrs.getAllocatorID() == allocatorID); } /*! @@ -123,13 +124,11 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase constexpr MarchingCubesDataParallelism autoPolicy = std::is_same::value ? MarchingCubesDataParallelism::hybridParallel - : #if defined(AXOM_USE_OPENMP) && defined(AXOM_USE_RAJA) - std::is_same::value + : std::is_same::value ? MarchingCubesDataParallelism::hybridParallel - : #endif - MarchingCubesDataParallelism::fullParallel; + : MarchingCubesDataParallelism::fullParallel; m_dataParallelism = dataPar; @@ -951,15 +950,15 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase //!@brief Crossing case for each computational mesh cell. axom::Array& m_caseIdsFlat; - //!@brief Case ids for found crossings. - axom::Array m_crossingCases; - //!@brief Whether a parent cell crosses the contour. axom::Array& m_crossingFlags; //!@brief Prefix sum of m_crossingFlags axom::Array& m_scannedFlags; + //!@brief Number of surface mesh facets added by each crossing. + axom::Array& m_facetIncrs; + //!@brief Number of parent cells crossing the contour surface. axom::IndexType m_crossingCount = 0; @@ -967,12 +966,12 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase axom::IndexType m_facetCount = 0; axom::IndexType getContourCellCount() const override { return m_facetCount; } + //!@brief Case ids for found crossings. + axom::Array m_crossingCases; + //!@brief Parent cell id (flat index into m_caseIds) for each crossing. axom::Array m_crossingParentIds; - //!@brief Number of surface mesh facets added by each crossing. - axom::Array& m_facetIncrs; - //!@brief First index of facets for each crossing. axom::Array m_firstFacetIds; diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp index 24045d2325..844b8f2507 100644 --- a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp @@ -41,26 +41,21 @@ template class MarchingCubesImpl; /*! - * \@brief Class implementing marching cubes algorithm for a single - * domain. - * - * \sa MarchingCubes - */ + \@brief Class implementing marching cubes algorithm for a single + domain. + + This class is an internal detail for multi-domain implementation + MarchinCubes class, and should not be used outside it. + + \sa MarchingCubes +*/ class MarchingCubesSingleDomain { public: using RuntimePolicy = axom::runtime_policy::Policy; /*! - * \brief Constructor for applying algorithm in a single domain. - * See MarchingCubes for the multi-domain implementation. - * - * \param [in] runtimePolicy A value from RuntimePolicy. - * The simplest policy is RuntimePolicy::seq, which specifies - * running sequentially on the CPU. - * \param [in] allocatorID Data allocator ID. Choose something compatible - * with \c runtimePolicy. See \c esecution_space. - * \param [in] dataPar Choice of data-parallel implementation. - */ + \brief Constructor for applying algorithm in a single domain. + */ MarchingCubesSingleDomain(MarchingCubes &mc); ~MarchingCubesSingleDomain() { } @@ -116,10 +111,6 @@ class MarchingCubesSingleDomain // Methods trivially delegated to implementation. void markCrossings() { m_impl->markCrossings(); } void scanCrossings() { m_impl->scanCrossings(); } - axom::IndexType getContourCellCount() - { - return m_impl->getContourCellCount(); - } void computeFacets() { m_impl->computeFacets(); } /*! @@ -131,11 +122,7 @@ class MarchingCubesSingleDomain //!@brief Get number of cells in the generated contour mesh. axom::IndexType getContourCellCount() const { - SLIC_ASSERT_MSG( - m_impl, - "There is no contour mesh until you call computeIsocontour()"); - axom::IndexType cellCount = m_impl->getContourCellCount(); - return cellCount; + return m_impl->getContourCellCount(); } //!@brief Get number of nodes in the generated contour mesh. diff --git a/src/axom/quest/examples/quest_marching_cubes_example.cpp b/src/axom/quest/examples/quest_marching_cubes_example.cpp index 09aaf29a2c..fb847068c9 100644 --- a/src/axom/quest/examples/quest_marching_cubes_example.cpp +++ b/src/axom/quest/examples/quest_marching_cubes_example.cpp @@ -1175,7 +1175,7 @@ struct ContourTestBase domainIdToContiguousId[domainId] = iDomain; } - // Indexers to transltate between flat and multidim indices. + // Indexers to translate between flat and multidim indices. axom::Array> indexers(domainCount); for(int d = 0; d < domainCount; ++d) { @@ -1187,6 +1187,16 @@ struct ContourTestBase .slowestDirs()); } + auto elementGreaterThan = [](const axom::primal::Vector& a, + double b) { + bool result(true); + for(int d = 0; d < DIM; ++d) + { + result &= a[d] < b; + } + return result; + }; + for(axom::IndexType iStrat = 0; iStrat < m_testStrategies.size(); ++iStrat) { auto contourCellBegin = m_strategyFacetPrefixSum[iStrat]; @@ -1221,7 +1231,7 @@ struct ContourTestBase big.expand(tol); axom::primal::BoundingBox small(parentCellBox); auto range = parentCellBox.range(); - bool checkSmall = range >= tol; + bool checkSmall = elementGreaterThan(range, tol); if(checkSmall) { small.expand(-tol); @@ -1347,7 +1357,7 @@ struct ContourTestBase axom::StackArray domLengths; computationalMesh.domainLengths(domId, domLengths); - assert(domLengths == domainView.getRealExtents("element")); + assert(domLengths == domainView.getRealShape("element")); const axom::IndexType parentCellCount = domainView.getCellCount(); // axom::Array hasContour(parentCellCount, parentCellCount); diff --git a/src/axom/quest/tests/quest_mesh_view_util.cpp b/src/axom/quest/tests/quest_mesh_view_util.cpp index 24c46d05c1..9769e0e5fe 100644 --- a/src/axom/quest/tests/quest_mesh_view_util.cpp +++ b/src/axom/quest/tests/quest_mesh_view_util.cpp @@ -427,22 +427,21 @@ int testByConduitExample(const IndexCoords& domainShape, elemShape)); } - if(!isEqual(mview.getRealExtents("element"), elemShape)) + if(!isEqual(mview.getRealShape("element"), elemShape)) { ++errCount; - SLIC_INFO_IF( - params.isVerbose(), - axom::fmt::format("Mismatched real element extents: {} vs {}", - mview.getRealExtents("element"), - elemShape)); + SLIC_INFO_IF(params.isVerbose(), + axom::fmt::format("Mismatched real element shape: {} vs {}", + mview.getRealShape("element"), + elemShape)); } - if(!isEqual(mview.getRealExtents("vertex"), vertShape)) + if(!isEqual(mview.getRealShape("vertex"), vertShape)) { ++errCount; SLIC_INFO_IF(params.isVerbose(), - axom::fmt::format("Mismatched real vertex extents: {} vs {}", - mview.getRealExtents("vertex"), + axom::fmt::format("Mismatched real vertex shape: {} vs {}", + mview.getRealShape("vertex"), vertShape)); } From dd7ca7eff61b737551e747e6a583cef00e4e83a2 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 7 Mar 2024 11:16:27 -0800 Subject: [PATCH 584/639] style --- .../sidre/examples/sidre_createdatastore.cpp | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/axom/sidre/examples/sidre_createdatastore.cpp b/src/axom/sidre/examples/sidre_createdatastore.cpp index 15becfd9c2..0f1328532c 100644 --- a/src/axom/sidre/examples/sidre_createdatastore.cpp +++ b/src/axom/sidre/examples/sidre_createdatastore.cpp @@ -216,11 +216,12 @@ void iterate_datastore(DataStore* ds) std::cout << "The datastore has the following attributes:\n"; for(auto& attr : ds->attributes()) { - std::cout << axom::fmt::format(" * [{}] '{}' of type {} and default value: {}\n", - attr.getIndex(), - attr.getName(), - conduit::DataType::id_to_name(attr.getTypeID()), - attr.getDefaultNodeRef().to_yaml()); + std::cout << axom::fmt::format( + " * [{}] '{}' of type {} and default value: {}\n", + attr.getIndex(), + attr.getName(), + conduit::DataType::id_to_name(attr.getTypeID()), + attr.getDefaultNodeRef().to_yaml()); } std::cout << fill_line << std::endl; @@ -244,11 +245,12 @@ void iterate_datastore(DataStore* ds) std::cout << "The root group has the following groups:\n"; for(auto& grp : ds->getRoot()->groups()) { - std::cout << axom::fmt::format(" * [{}] '{}' with {} groups and {} views\n", - grp.getIndex(), - grp.getName(), - grp.getNumGroups(), - grp.getNumViews()); + std::cout << axom::fmt::format( + " * [{}] '{}' with {} groups and {} views\n", + grp.getIndex(), + grp.getName(), + grp.getNumGroups(), + grp.getNumViews()); } std::cout << fill_line << std::endl; From 073b0573cc4510904754f68b3f36b4136ff02861 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 7 Mar 2024 11:19:20 -0800 Subject: [PATCH 585/639] temporarily turn off the slam_lulesh test so i can build the docker container --- .../slam/examples/lulesh2.0.3/CMakeLists.txt | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt b/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt index 7197612318..8b3cbfc5dd 100644 --- a/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt +++ b/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt @@ -35,22 +35,22 @@ axom_add_executable( DEPENDS_ON slam FOLDER axom/slam/examples ) -if(AXOM_ENABLE_TESTS) - if(AXOM_ENABLE_MPI) - - # CMake inserts Fortran flag that forces one OpenMP thread when - # compiling with MPI and xlf - if(ENABLE_FORTRAN) - list(REMOVE_ITEM CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES "xlomp_ser") - endif() - - axom_add_test(NAME slam_lulesh - COMMAND slam_lulesh_ex - NUM_MPI_TASKS 8 - NUM_OMP_THREADS 4 ) - else() - axom_add_test(NAME slam_lulesh - COMMAND slam_lulesh_ex - NUM_OMP_THREADS 4 ) - endif() -endif() +#if(AXOM_ENABLE_TESTS) +# if(AXOM_ENABLE_MPI) + +# # CMake inserts Fortran flag that forces one OpenMP thread when +# # compiling with MPI and xlf +# if(ENABLE_FORTRAN) +# list(REMOVE_ITEM CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES "xlomp_ser") +# endif() + +# axom_add_test(NAME slam_lulesh +# COMMAND slam_lulesh_ex +# NUM_MPI_TASKS 8 +# NUM_OMP_THREADS 4 ) +# else() +# axom_add_test(NAME slam_lulesh +# COMMAND slam_lulesh_ex +# NUM_OMP_THREADS 4 ) +# endif() +#endif() From 9cbdbb626d2dbda36fd2b9a8d5061666601b2f56 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 7 Mar 2024 12:00:44 -0800 Subject: [PATCH 586/639] Make ArrayStrideOrder an enum (and convert to int as needed for bit operations). --- src/axom/quest/ArrayIndexer.hpp | 39 +++++++++++--------- src/axom/quest/detail/MarchingCubesImpl.hpp | 4 +- src/axom/quest/tests/quest_array_indexer.cpp | 24 ++++++------ 3 files changed, 36 insertions(+), 31 deletions(-) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index fb0cd32e9a..95474c306e 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -22,12 +22,12 @@ namespace axom or some arbitrarily permuted order. Row and column major ordering are the same thing if the array is 1D. */ -struct ArrayStrideOrder +enum class ArrayStrideOrder : int { - static constexpr int ARBITRARY = 0; // Neither row nor column - static constexpr int ROW = 1; // Row-major - static constexpr int COLUMN = 2; // Column-major - static constexpr int BOTH = ROW | COLUMN; // 1D arrays are both + ARBITRARY = 0, // Neither row nor column + ROW = 1, // Row-major + COLUMN = 2, // Column-major + BOTH = ROW | COLUMN // 1D arrays are both }; /*! @@ -52,7 +52,7 @@ class ArrayIndexer direction. */ ArrayIndexer(const axom::StackArray& shape, - int arrayStrideOrder, + axom::ArrayStrideOrder arrayStrideOrder, int fastestStrideLength = 1) { initializeShape(shape, arrayStrideOrder, fastestStrideLength); @@ -117,7 +117,7 @@ class ArrayIndexer direction. */ inline AXOM_HOST_DEVICE void initializeShape(const axom::StackArray& shape, - int arrayStrideOrder, + ArrayStrideOrder arrayStrideOrder, int fastestStrideLength = 1) { SLIC_ASSERT(arrayStrideOrder == ArrayStrideOrder::COLUMN || @@ -227,7 +227,7 @@ class ArrayIndexer */ inline AXOM_HOST_DEVICE void initializeStrides( const axom::StackArray& strides, - int orderPref) + ArrayStrideOrder orderPref) { SLIC_ASSERT(orderPref == axom::ArrayStrideOrder::COLUMN || orderPref == axom::ArrayStrideOrder::ROW); @@ -296,12 +296,12 @@ class ArrayIndexer { if(v[d] < 0 || v[d] >= DIM) { - return false; - } // Out of range. + return false; // Out of range. + } if(found[v[d]] == true) { - return false; - } // Repeated indices + return false; // Repeated index. + } found[v[d]] = true; } return true; @@ -313,15 +313,20 @@ class ArrayIndexer @return Value from ArrayStrideOrder, indicating column order, row order, both column and row (1D only) or arbitrary order. */ - inline AXOM_HOST_DEVICE int getStrideOrder() const + inline AXOM_HOST_DEVICE ArrayStrideOrder getStrideOrder() const { - int ord = ArrayStrideOrder::BOTH; + int ord = int(ArrayStrideOrder::BOTH); for(int d = 0; d < DIM - 1; ++d) { - ord &= m_slowestDirs[d] < m_slowestDirs[d + 1] ? ArrayStrideOrder::COLUMN - : ArrayStrideOrder::ROW; + ord &= m_slowestDirs[d] < m_slowestDirs[d + 1] + ? int(ArrayStrideOrder::COLUMN) + : int(ArrayStrideOrder::ROW); } - return ord; + static ArrayStrideOrder s_intToOrder[4] = {ArrayStrideOrder::ARBITRARY, + ArrayStrideOrder::ROW, + ArrayStrideOrder::COLUMN, + ArrayStrideOrder::BOTH}; + return s_intToOrder[ord]; } //!@brief Convert multidimensional index to flat index. diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 84eb4ce167..ec737be931 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -192,7 +192,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase RAJA::RangeSegment iRange(0, m_bShape[0]); using EXEC_POL = typename axom::mint::internal::structured_exec::loop2d_policy; - if(order & axom::ArrayStrideOrder::ROW) + if(int(order) & int(axom::ArrayStrideOrder::ROW)) { RAJA::kernel( RAJA::make_tuple(iRange, jRange), @@ -246,7 +246,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase RAJA::RangeSegment iRange(0, m_bShape[0]); using EXEC_POL = typename axom::mint::internal::structured_exec::loop3d_policy; - if(order & axom::ArrayStrideOrder::ROW) + if(int(order) & int(axom::ArrayStrideOrder::ROW)) { RAJA::kernel( RAJA::make_tuple(iRange, jRange, kRange), diff --git a/src/axom/quest/tests/quest_array_indexer.cpp b/src/axom/quest/tests/quest_array_indexer.cpp index 70d6b601b2..d4e1a72a40 100644 --- a/src/axom/quest/tests/quest_array_indexer.cpp +++ b/src/axom/quest/tests/quest_array_indexer.cpp @@ -22,7 +22,7 @@ TEST(quest_array_indexer, quest_strides_and_permutations) axom::ArrayIndexer colIndexer( lengths, axom::ArrayStrideOrder::COLUMN); - EXPECT_EQ(colIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::BOTH)); + EXPECT_EQ(colIndexer.getStrideOrder(), axom::ArrayStrideOrder::BOTH); axom::StackArray colSlowestDirs {0}; axom::StackArray colStrides {1}; for(int d = 0; d < DIM; ++d) @@ -37,7 +37,7 @@ TEST(quest_array_indexer, quest_strides_and_permutations) axom::ArrayIndexer rowIndexer( lengths, axom::ArrayStrideOrder::ROW); - EXPECT_EQ(rowIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::BOTH)); + EXPECT_EQ(rowIndexer.getStrideOrder(), axom::ArrayStrideOrder::BOTH); axom::StackArray rowSlowestDirs {0}; axom::StackArray rowStrides {1}; for(int d = 0; d < DIM; ++d) @@ -57,7 +57,7 @@ TEST(quest_array_indexer, quest_strides_and_permutations) axom::ArrayIndexer colIndexer( lengths, axom::ArrayStrideOrder::COLUMN); - EXPECT_EQ(colIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); + EXPECT_EQ(colIndexer.getStrideOrder(), axom::ArrayStrideOrder::COLUMN); axom::StackArray colSlowestDirs {0, 1}; axom::StackArray colStrides {2, 1}; for(int d = 0; d < DIM; ++d) @@ -69,7 +69,7 @@ TEST(quest_array_indexer, quest_strides_and_permutations) axom::ArrayIndexer rowIndexer( lengths, axom::ArrayStrideOrder::ROW); - EXPECT_EQ(rowIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); + EXPECT_EQ(rowIndexer.getStrideOrder(), axom::ArrayStrideOrder::ROW); axom::StackArray rowSlowestDirs {1, 0}; axom::StackArray rowStrides {1, 3}; for(int d = 0; d < DIM; ++d) @@ -86,7 +86,7 @@ TEST(quest_array_indexer, quest_strides_and_permutations) axom::ArrayIndexer colIndexer( lengths, axom::ArrayStrideOrder::COLUMN); - EXPECT_EQ(colIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); + EXPECT_EQ(colIndexer.getStrideOrder(), axom::ArrayStrideOrder::COLUMN); axom::StackArray colSlowestDirs {0, 1, 2}; axom::StackArray colStrides {6, 2, 1}; for(int d = 0; d < DIM; ++d) @@ -98,7 +98,7 @@ TEST(quest_array_indexer, quest_strides_and_permutations) axom::ArrayIndexer rowIndexer( lengths, axom::ArrayStrideOrder::ROW); - EXPECT_EQ(rowIndexer.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); + EXPECT_EQ(rowIndexer.getStrideOrder(), axom::ArrayStrideOrder::ROW); axom::StackArray rowSlowestDirs {2, 1, 0}; axom::StackArray rowStrides {1, 5, 15}; for(int d = 0; d < DIM; ++d) @@ -118,7 +118,7 @@ TEST(quest_array_indexer, quest_col_major_offset) axom::StackArray lengths {3}; axom::ArrayIndexer ai(lengths, axom::ArrayStrideOrder::COLUMN); - EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::BOTH)); + EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::BOTH); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -134,7 +134,7 @@ TEST(quest_array_indexer, quest_col_major_offset) axom::StackArray lengths {3, 2}; axom::ArrayIndexer ai(lengths, axom::ArrayStrideOrder::COLUMN); - EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); + EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::COLUMN); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -152,7 +152,7 @@ TEST(quest_array_indexer, quest_col_major_offset) axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer ai(lengths, axom::ArrayStrideOrder::COLUMN); - EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::COLUMN)); + EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::COLUMN); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -179,7 +179,7 @@ TEST(quest_array_indexer, quest_row_major_offset) axom::StackArray lengths {3}; axom::ArrayIndexer ai(lengths, axom::ArrayStrideOrder::ROW); - EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::BOTH)); + EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::BOTH); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -195,7 +195,7 @@ TEST(quest_array_indexer, quest_row_major_offset) axom::StackArray lengths {3, 2}; axom::ArrayIndexer ai(lengths, axom::ArrayStrideOrder::ROW); - EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); + EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::ROW); axom::IndexType offset = 0; for(int j = 0; j < lengths[1]; ++j) { @@ -214,7 +214,7 @@ TEST(quest_array_indexer, quest_row_major_offset) axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer ai(lengths, axom::ArrayStrideOrder::ROW); - EXPECT_EQ(ai.getStrideOrder(), int(axom::ArrayStrideOrder::ROW)); + EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::ROW); axom::IndexType offset = 0; for(int k = 0; k < lengths[2]; ++k) { From ea6cc9a657f8f628ba73dd87ec106697f094cfa1 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 7 Mar 2024 12:24:46 -0800 Subject: [PATCH 587/639] update docker containers and turn back on test --- azure-pipelines.yml | 4 +- host-configs/docker/clang@10.0.0.cmake | 24 +++++++----- host-configs/docker/gcc@11.1.0.cmake | 24 +++++++----- .../slam/examples/lulesh2.0.3/CMakeLists.txt | 38 +++++++++---------- 4 files changed, 49 insertions(+), 41 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b9fc173e5a..77b746ff19 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,8 +9,8 @@ variables: DO_BUILD: 'yes' DO_TEST: 'yes' DO_CLEAN: 'no' - CLANG10_IMAGENAME: 'axom/tpls:clang-10_07-26-23_22h-58m' - GCC11_IMAGENAME: 'axom/tpls:gcc-11_07-26-23_22h-58m' + CLANG10_IMAGENAME: 'axom/tpls:clang-10_03-07-24_19h-20m' + GCC11_IMAGENAME: 'axom/tpls:gcc-11_03-07-24_19h-20m' system.debug: false jobs: diff --git a/host-configs/docker/clang@10.0.0.cmake b/host-configs/docker/clang@10.0.0.cmake index 0cafcdc86d..1cbb7a5753 100644 --- a/host-configs/docker/clang@10.0.0.cmake +++ b/host-configs/docker/clang@10.0.0.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/home/axom/axom_tpls/clang-10.0.0/umpire-2023.06.0-ffv2unko7ol7xkbswptn6reo5vkk4z36;/home/axom/axom_tpls/clang-10.0.0/raja-2023.06.0-7mjlmrtwawof7ahtizt2kh3m7pzpaa6r;/home/axom/axom_tpls/clang-10.0.0/camp-2023.06.0-cpcbuctxxtzpikmmjzt5u43oonrsqyag;/home/axom/axom_tpls/clang-10.0.0/mfem-4.5.2-vlkan3esoqo4ext3qsa6m3qiau3gcetk;/home/axom/axom_tpls/clang-10.0.0/hypre-2.24.0-a7pavarlyr7ao3qlmwxbayorpwhmoazm;/home/axom/axom_tpls/clang-10.0.0/lua-5.4.4-g77yiae3ob3q5p7bdgurcj76fgc4uxe6;/home/axom/axom_tpls/clang-10.0.0/readline-8.2-ssf54hxnbztmn4c3gekrqfmu5ovcsexe;/home/axom/axom_tpls/clang-10.0.0/ncurses-6.4-ug6qch6hz5ysjky6ebx76pzg4qumoijl;/home/axom/axom_tpls/clang-10.0.0/conduit-0.8.8-zzhc6p6w4eed6gfuu6nc6kf4uazzsy3z;/home/axom/axom_tpls/clang-10.0.0/parmetis-4.0.3-qb5ova7xrfnnjcnwjg277camap6xfu7d;/home/axom/axom_tpls/clang-10.0.0/metis-5.1.0-xlsz5xtc5npvrzlfkwjiho6uuotdmhv6;/home/axom/axom_tpls/clang-10.0.0/hdf5-1.8.22-bwa77phd2gdupwroibbaz7oa24i5s4mg;/home/axom/axom_tpls/clang-10.0.0/zlib-1.2.13-rgebxh4wloej77x6kjavjfh5cnjegtlj;/home/axom/axom_tpls/clang-10.0.0/gmake-4.4.1-ovbffagtyrtthibtg7dm4xghwjwejn2f;/home/axom/axom_tpls/clang-10.0.0/blt-0.5.3-6jop7ew6gg3noxponfcbnxswwckmjpyc" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/home/axom/axom_tpls/clang-10.0.0/umpire-2024.02.0-lhbuzui3h5a2qwqpogpsemqq5web7nai;/home/axom/axom_tpls/clang-10.0.0/raja-2024.02.0-jlkwrlbhqvm5z32lc3snswvia4ubmtzp;/home/axom/axom_tpls/clang-10.0.0/mfem-4.6.0-ftusbr7mglftqsxy32nmjzgau2ptdrsp;/home/axom/axom_tpls/clang-10.0.0/hypre-2.24.0-fzucmiugxgaiuljssnzc453bwuagxp6o;/home/axom/axom_tpls/clang-10.0.0/lua-5.4.4-c7monkarzpznammmzte52w57k4tul7rq;/home/axom/axom_tpls/clang-10.0.0/readline-8.2-pd6al5egorkcypr7h46odukuef5v6wea;/home/axom/axom_tpls/clang-10.0.0/conduit-0.9.1-ilr73n4bdpnhpsvwfc725alcwve2ubtp;/home/axom/axom_tpls/clang-10.0.0/parmetis-4.0.3-aq6l5hu42jvpds2zb7hc7in4pfgermvu;/home/axom/axom_tpls/clang-10.0.0/hdf5-1.8.23-vodh4tlps5o4frqcm37r7udmywen3viq;/home/axom/axom_tpls/clang-10.0.0/blt-0.6.1.4-fuytsx6iavxnc5gwfhb56i4ftfqfulnx;/home/axom/axom_tpls/clang-10.0.0/fmt-10.2.1-d2ptxbacnuhzfpxrdoxrj225apoeb7pb;/home/axom/axom_tpls/clang-10.0.0/camp-2024.02.0-bf47c6jhvwog6hnusaduhggzmfm46d24;/home/axom/axom_tpls/clang-10.0.0/zlib-ng-2.1.5-abmvhf2ybobwqltpe6zlskjxvxxtxcxq;/home/axom/axom_tpls/clang-10.0.0/metis-5.1.0-xjk3ehggqmdb7rbmht5l5el5wfau6vso;/home/axom/axom_tpls/clang-10.0.0/ncurses-6.4-y3oisa6sfw3llb5nsvrzh7efh6zn5unh;/home/axom/axom_tpls/clang-10.0.0/gmake-4.4.1-gzcsdny44nh45v3qhvshhpvvubmhc3jm" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/home/axom/axom_tpls/clang-10.0.0/axom-develop-tt2s343kb7b22xx46ufv5rkhhlkattnm/lib;/home/axom/axom_tpls/clang-10.0.0/axom-develop-tt2s343kb7b22xx46ufv5rkhhlkattnm/lib64;/home/axom/axom_tpls/clang-10.0.0/conduit-0.9.1-ilr73n4bdpnhpsvwfc725alcwve2ubtp/lib;/home/axom/axom_tpls/clang-10.0.0/hdf5-1.8.23-vodh4tlps5o4frqcm37r7udmywen3viq/lib;/home/axom/axom_tpls/clang-10.0.0/zlib-ng-2.1.5-abmvhf2ybobwqltpe6zlskjxvxxtxcxq/lib;/home/axom/axom_tpls/clang-10.0.0/metis-5.1.0-xjk3ehggqmdb7rbmht5l5el5wfau6vso/lib;/home/axom/axom_tpls/clang-10.0.0/parmetis-4.0.3-aq6l5hu42jvpds2zb7hc7in4pfgermvu/lib;/home/axom/axom_tpls/clang-10.0.0/lua-5.4.4-c7monkarzpznammmzte52w57k4tul7rq/lib;/home/axom/axom_tpls/clang-10.0.0/ncurses-6.4-y3oisa6sfw3llb5nsvrzh7efh6zn5unh/lib;/home/axom/axom_tpls/clang-10.0.0/readline-8.2-pd6al5egorkcypr7h46odukuef5v6wea/lib;/home/axom/axom_tpls/clang-10.0.0/mfem-4.6.0-ftusbr7mglftqsxy32nmjzgau2ptdrsp/lib;/home/axom/axom_tpls/clang-10.0.0/hypre-2.24.0-fzucmiugxgaiuljssnzc453bwuagxp6o/lib;/home/axom/axom_tpls/clang-10.0.0/raja-2024.02.0-jlkwrlbhqvm5z32lc3snswvia4ubmtzp/lib;/home/axom/axom_tpls/clang-10.0.0/camp-2024.02.0-bf47c6jhvwog6hnusaduhggzmfm46d24/lib;/home/axom/axom_tpls/clang-10.0.0/umpire-2024.02.0-lhbuzui3h5a2qwqpogpsemqq5web7nai/lib;/home/axom/axom_tpls/clang-10.0.0/fmt-10.2.1-d2ptxbacnuhzfpxrdoxrj225apoeb7pb/lib" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/home/axom/axom_tpls/clang-10.0.0/axom-develop-tt2s343kb7b22xx46ufv5rkhhlkattnm/lib;/home/axom/axom_tpls/clang-10.0.0/axom-develop-tt2s343kb7b22xx46ufv5rkhhlkattnm/lib64;/home/axom/axom_tpls/clang-10.0.0/conduit-0.9.1-ilr73n4bdpnhpsvwfc725alcwve2ubtp/lib;/home/axom/axom_tpls/clang-10.0.0/hdf5-1.8.23-vodh4tlps5o4frqcm37r7udmywen3viq/lib;/home/axom/axom_tpls/clang-10.0.0/zlib-ng-2.1.5-abmvhf2ybobwqltpe6zlskjxvxxtxcxq/lib;/home/axom/axom_tpls/clang-10.0.0/metis-5.1.0-xjk3ehggqmdb7rbmht5l5el5wfau6vso/lib;/home/axom/axom_tpls/clang-10.0.0/parmetis-4.0.3-aq6l5hu42jvpds2zb7hc7in4pfgermvu/lib;/home/axom/axom_tpls/clang-10.0.0/lua-5.4.4-c7monkarzpznammmzte52w57k4tul7rq/lib;/home/axom/axom_tpls/clang-10.0.0/ncurses-6.4-y3oisa6sfw3llb5nsvrzh7efh6zn5unh/lib;/home/axom/axom_tpls/clang-10.0.0/readline-8.2-pd6al5egorkcypr7h46odukuef5v6wea/lib;/home/axom/axom_tpls/clang-10.0.0/mfem-4.6.0-ftusbr7mglftqsxy32nmjzgau2ptdrsp/lib;/home/axom/axom_tpls/clang-10.0.0/hypre-2.24.0-fzucmiugxgaiuljssnzc453bwuagxp6o/lib;/home/axom/axom_tpls/clang-10.0.0/raja-2024.02.0-jlkwrlbhqvm5z32lc3snswvia4ubmtzp/lib;/home/axom/axom_tpls/clang-10.0.0/camp-2024.02.0-bf47c6jhvwog6hnusaduhggzmfm46d24/lib;/home/axom/axom_tpls/clang-10.0.0/umpire-2024.02.0-lhbuzui3h5a2qwqpogpsemqq5web7nai/lib;/home/axom/axom_tpls/clang-10.0.0/fmt-10.2.1-d2ptxbacnuhzfpxrdoxrj225apoeb7pb/lib" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -35,8 +41,6 @@ set(CMAKE_C_FLAGS "-pthread" CACHE STRING "") set(CMAKE_CXX_FLAGS "-pthread" CACHE STRING "") -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") set(BLT_EXE_LINKER_FLAGS " -Wl,-rpath,/usr/lib -Wl,-rpath,/usr/lib64" CACHE STRING "Adds a missing libstdc++ rpath") @@ -75,21 +79,21 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") set(TPL_ROOT "/home/axom/axom_tpls/clang-10.0.0" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-zzhc6p6w4eed6gfuu6nc6kf4uazzsy3z" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-ilr73n4bdpnhpsvwfc725alcwve2ubtp" CACHE PATH "") # C2C not built -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-vlkan3esoqo4ext3qsa6m3qiau3gcetk" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-ftusbr7mglftqsxy32nmjzgau2ptdrsp" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-bwa77phd2gdupwroibbaz7oa24i5s4mg" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-vodh4tlps5o4frqcm37r7udmywen3viq" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-g77yiae3ob3q5p7bdgurcj76fgc4uxe6" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-c7monkarzpznammmzte52w57k4tul7rq" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-7mjlmrtwawof7ahtizt2kh3m7pzpaa6r" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-jlkwrlbhqvm5z32lc3snswvia4ubmtzp" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-ffv2unko7ol7xkbswptn6reo5vkk4z36" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-lhbuzui3h5a2qwqpogpsemqq5web7nai" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-cpcbuctxxtzpikmmjzt5u43oonrsqyag" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-bf47c6jhvwog6hnusaduhggzmfm46d24" CACHE PATH "") # scr not built diff --git a/host-configs/docker/gcc@11.1.0.cmake b/host-configs/docker/gcc@11.1.0.cmake index 8211dc00cd..a7d9e80e4a 100644 --- a/host-configs/docker/gcc@11.1.0.cmake +++ b/host-configs/docker/gcc@11.1.0.cmake @@ -4,7 +4,13 @@ # CMake executable path: /usr/bin/cmake #------------------------------------------------------------------------------ -set(CMAKE_PREFIX_PATH "/home/axom/axom_tpls/gcc-11.1.0/umpire-2023.06.0-pdygmf4s7ggj4zqbrzy436omasf6eaee;/home/axom/axom_tpls/gcc-11.1.0/raja-2023.06.0-cyz2uqefpnhonaipzcnh4oiidyrfmnsx;/home/axom/axom_tpls/gcc-11.1.0/camp-2023.06.0-csawyq2dbktfyy7srozbr7lefkz2bjmc;/home/axom/axom_tpls/gcc-11.1.0/mfem-4.5.2-dhj56qfyq3zkqiyjapqitz3iaeyjiu3r;/home/axom/axom_tpls/gcc-11.1.0/hypre-2.24.0-xsefh67wzc7yga4wotgcn4nktzsr3dko;/home/axom/axom_tpls/gcc-11.1.0/lua-5.4.4-3iwzuwuvnrymxte2nik7uqwfksk7ui5p;/home/axom/axom_tpls/gcc-11.1.0/readline-8.2-3ghsag74tthrw7kycdjwbstrhxwhiics;/home/axom/axom_tpls/gcc-11.1.0/ncurses-6.4-bqojhx5e5yk7qwezjqzchqtufyegrff7;/home/axom/axom_tpls/gcc-11.1.0/conduit-0.8.8-yohx25l7etfwzetmtcu6erdh3qnbglrn;/home/axom/axom_tpls/gcc-11.1.0/parmetis-4.0.3-wqjpma4axfmudec4ncgxkhgeyquzzneh;/home/axom/axom_tpls/gcc-11.1.0/metis-5.1.0-a6gendzgkorlnu2x6ogz4tywd4yp4c7t;/home/axom/axom_tpls/gcc-11.1.0/hdf5-1.8.22-tdsth6jhlgwhvfscnkpb24lbvvdtgobe;/home/axom/axom_tpls/gcc-11.1.0/zlib-1.2.13-k4fzfbz45b6qs3ysphaxrdowxyvjrg5p;/home/axom/axom_tpls/gcc-11.1.0/gmake-4.4.1-xoqy3bpcm7lirebrxjt4qvp3p72t3dmu;/home/axom/axom_tpls/gcc-11.1.0/blt-0.5.3-zthngkscrkhniwcjsfur5rglm6bkmge3" CACHE PATH "") +set(CMAKE_PREFIX_PATH "/home/axom/axom_tpls/gcc-11.1.0/umpire-2024.02.0-enni4yeviruk7h5zfbmkroiox3xg3if3;/home/axom/axom_tpls/gcc-11.1.0/fmt-10.2.1-qvyqa6m3lunl3mt642hhztl3tbkze4sy;/home/axom/axom_tpls/gcc-11.1.0/raja-2024.02.0-gwrqm6xvkr3upgmhd77ie7rnzw6mtdts;/home/axom/axom_tpls/gcc-11.1.0/camp-2024.02.0-jzv34cutypmwj5drk65diases5ngmfq2;/home/axom/axom_tpls/gcc-11.1.0/mfem-4.6.0-x4tzg3vnrkck26vlduf2e2ayis2dfsr7;/home/axom/axom_tpls/gcc-11.1.0/hypre-2.24.0-w22uojfq5lainzap3vqxxbqjnhdynuhd;/home/axom/axom_tpls/gcc-11.1.0/lua-5.4.4-oxlydb36zseusohbrkaj34db5sz6jwad;/home/axom/axom_tpls/gcc-11.1.0/readline-8.2-ujrbpdblmke4uvalui3g242eounq56jf;/home/axom/axom_tpls/gcc-11.1.0/ncurses-6.4-biefcjrdgewfl6hygtwhakrjxiqpovbb;/home/axom/axom_tpls/gcc-11.1.0/gmake-4.4.1-657kbqwor2lcjpqz3clrhqam6khfzm2g;/home/axom/axom_tpls/gcc-11.1.0/conduit-0.9.1-uffsgbtewmhjj4utevbbpanarb5mahtl;/home/axom/axom_tpls/gcc-11.1.0/parmetis-4.0.3-pqylj3fddaoytfuej3ynedyz6pnitner;/home/axom/axom_tpls/gcc-11.1.0/metis-5.1.0-6zaty2e2as4n3b2lb5eaee7nxdkzfk2a;/home/axom/axom_tpls/gcc-11.1.0/hdf5-1.8.23-jikkc6tqhuwlhy42zrfmsvw55yrk63en;/home/axom/axom_tpls/gcc-11.1.0/zlib-ng-2.1.5-lxz6tnypfmbtf6xlp6wws3fcsvqxu5ug;/home/axom/axom_tpls/gcc-11.1.0/blt-0.6.1.4-uttgpnnmvo2rofs2lgoetd7zu4xnt3uu;/home/axom/axom_tpls/gcc-11.1.0/gcc-runtime-11.1.0-usjxs3hhp7yzd26bafjrzaqwqi43qleg" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE STRING "") + +set(CMAKE_BUILD_RPATH "/home/axom/axom_tpls/gcc-11.1.0/axom-develop-oddjd3i56sfj5qsy6r32mzyhr5fohopm/lib;/home/axom/axom_tpls/gcc-11.1.0/axom-develop-oddjd3i56sfj5qsy6r32mzyhr5fohopm/lib64;/home/axom/axom_tpls/gcc-11.1.0/conduit-0.9.1-uffsgbtewmhjj4utevbbpanarb5mahtl/lib;/home/axom/axom_tpls/gcc-11.1.0/gcc-runtime-11.1.0-usjxs3hhp7yzd26bafjrzaqwqi43qleg/lib;/home/axom/axom_tpls/gcc-11.1.0/hdf5-1.8.23-jikkc6tqhuwlhy42zrfmsvw55yrk63en/lib;/home/axom/axom_tpls/gcc-11.1.0/zlib-ng-2.1.5-lxz6tnypfmbtf6xlp6wws3fcsvqxu5ug/lib;/home/axom/axom_tpls/gcc-11.1.0/metis-5.1.0-6zaty2e2as4n3b2lb5eaee7nxdkzfk2a/lib;/home/axom/axom_tpls/gcc-11.1.0/parmetis-4.0.3-pqylj3fddaoytfuej3ynedyz6pnitner/lib;/home/axom/axom_tpls/gcc-11.1.0/lua-5.4.4-oxlydb36zseusohbrkaj34db5sz6jwad/lib;/home/axom/axom_tpls/gcc-11.1.0/ncurses-6.4-biefcjrdgewfl6hygtwhakrjxiqpovbb/lib;/home/axom/axom_tpls/gcc-11.1.0/readline-8.2-ujrbpdblmke4uvalui3g242eounq56jf/lib;/home/axom/axom_tpls/gcc-11.1.0/mfem-4.6.0-x4tzg3vnrkck26vlduf2e2ayis2dfsr7/lib;/home/axom/axom_tpls/gcc-11.1.0/hypre-2.24.0-w22uojfq5lainzap3vqxxbqjnhdynuhd/lib;/home/axom/axom_tpls/gcc-11.1.0/raja-2024.02.0-gwrqm6xvkr3upgmhd77ie7rnzw6mtdts/lib;/home/axom/axom_tpls/gcc-11.1.0/camp-2024.02.0-jzv34cutypmwj5drk65diases5ngmfq2/lib;/home/axom/axom_tpls/gcc-11.1.0/umpire-2024.02.0-enni4yeviruk7h5zfbmkroiox3xg3if3/lib;/home/axom/axom_tpls/gcc-11.1.0/fmt-10.2.1-qvyqa6m3lunl3mt642hhztl3tbkze4sy/lib" CACHE STRING "") + +set(CMAKE_INSTALL_RPATH "/home/axom/axom_tpls/gcc-11.1.0/axom-develop-oddjd3i56sfj5qsy6r32mzyhr5fohopm/lib;/home/axom/axom_tpls/gcc-11.1.0/axom-develop-oddjd3i56sfj5qsy6r32mzyhr5fohopm/lib64;/home/axom/axom_tpls/gcc-11.1.0/conduit-0.9.1-uffsgbtewmhjj4utevbbpanarb5mahtl/lib;/home/axom/axom_tpls/gcc-11.1.0/gcc-runtime-11.1.0-usjxs3hhp7yzd26bafjrzaqwqi43qleg/lib;/home/axom/axom_tpls/gcc-11.1.0/hdf5-1.8.23-jikkc6tqhuwlhy42zrfmsvw55yrk63en/lib;/home/axom/axom_tpls/gcc-11.1.0/zlib-ng-2.1.5-lxz6tnypfmbtf6xlp6wws3fcsvqxu5ug/lib;/home/axom/axom_tpls/gcc-11.1.0/metis-5.1.0-6zaty2e2as4n3b2lb5eaee7nxdkzfk2a/lib;/home/axom/axom_tpls/gcc-11.1.0/parmetis-4.0.3-pqylj3fddaoytfuej3ynedyz6pnitner/lib;/home/axom/axom_tpls/gcc-11.1.0/lua-5.4.4-oxlydb36zseusohbrkaj34db5sz6jwad/lib;/home/axom/axom_tpls/gcc-11.1.0/ncurses-6.4-biefcjrdgewfl6hygtwhakrjxiqpovbb/lib;/home/axom/axom_tpls/gcc-11.1.0/readline-8.2-ujrbpdblmke4uvalui3g242eounq56jf/lib;/home/axom/axom_tpls/gcc-11.1.0/mfem-4.6.0-x4tzg3vnrkck26vlduf2e2ayis2dfsr7/lib;/home/axom/axom_tpls/gcc-11.1.0/hypre-2.24.0-w22uojfq5lainzap3vqxxbqjnhdynuhd/lib;/home/axom/axom_tpls/gcc-11.1.0/raja-2024.02.0-gwrqm6xvkr3upgmhd77ie7rnzw6mtdts/lib;/home/axom/axom_tpls/gcc-11.1.0/camp-2024.02.0-jzv34cutypmwj5drk65diases5ngmfq2/lib;/home/axom/axom_tpls/gcc-11.1.0/umpire-2024.02.0-enni4yeviruk7h5zfbmkroiox3xg3if3/lib;/home/axom/axom_tpls/gcc-11.1.0/fmt-10.2.1-qvyqa6m3lunl3mt642hhztl3tbkze4sy/lib" CACHE STRING "") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") @@ -35,8 +41,6 @@ set(CMAKE_C_FLAGS "-pthread" CACHE STRING "") set(CMAKE_CXX_FLAGS "-pthread" CACHE STRING "") -set(CMAKE_GENERATOR "Unix Makefiles" CACHE STRING "") - set(ENABLE_FORTRAN ON CACHE BOOL "") #------------------------------------------------------------------------------ @@ -73,21 +77,21 @@ set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") set(TPL_ROOT "/home/axom/axom_tpls/gcc-11.1.0" CACHE PATH "") -set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.8-yohx25l7etfwzetmtcu6erdh3qnbglrn" CACHE PATH "") +set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.9.1-uffsgbtewmhjj4utevbbpanarb5mahtl" CACHE PATH "") # C2C not built -set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.2-dhj56qfyq3zkqiyjapqitz3iaeyjiu3r" CACHE PATH "") +set(MFEM_DIR "${TPL_ROOT}/mfem-4.6.0-x4tzg3vnrkck26vlduf2e2ayis2dfsr7" CACHE PATH "") -set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.22-tdsth6jhlgwhvfscnkpb24lbvvdtgobe" CACHE PATH "") +set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.23-jikkc6tqhuwlhy42zrfmsvw55yrk63en" CACHE PATH "") -set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-3iwzuwuvnrymxte2nik7uqwfksk7ui5p" CACHE PATH "") +set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-oxlydb36zseusohbrkaj34db5sz6jwad" CACHE PATH "") -set(RAJA_DIR "${TPL_ROOT}/raja-2023.06.0-cyz2uqefpnhonaipzcnh4oiidyrfmnsx" CACHE PATH "") +set(RAJA_DIR "${TPL_ROOT}/raja-2024.02.0-gwrqm6xvkr3upgmhd77ie7rnzw6mtdts" CACHE PATH "") -set(UMPIRE_DIR "${TPL_ROOT}/umpire-2023.06.0-pdygmf4s7ggj4zqbrzy436omasf6eaee" CACHE PATH "") +set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.02.0-enni4yeviruk7h5zfbmkroiox3xg3if3" CACHE PATH "") -set(CAMP_DIR "${TPL_ROOT}/camp-2023.06.0-csawyq2dbktfyy7srozbr7lefkz2bjmc" CACHE PATH "") +set(CAMP_DIR "${TPL_ROOT}/camp-2024.02.0-jzv34cutypmwj5drk65diases5ngmfq2" CACHE PATH "") # scr not built diff --git a/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt b/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt index 8b3cbfc5dd..7197612318 100644 --- a/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt +++ b/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt @@ -35,22 +35,22 @@ axom_add_executable( DEPENDS_ON slam FOLDER axom/slam/examples ) -#if(AXOM_ENABLE_TESTS) -# if(AXOM_ENABLE_MPI) - -# # CMake inserts Fortran flag that forces one OpenMP thread when -# # compiling with MPI and xlf -# if(ENABLE_FORTRAN) -# list(REMOVE_ITEM CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES "xlomp_ser") -# endif() - -# axom_add_test(NAME slam_lulesh -# COMMAND slam_lulesh_ex -# NUM_MPI_TASKS 8 -# NUM_OMP_THREADS 4 ) -# else() -# axom_add_test(NAME slam_lulesh -# COMMAND slam_lulesh_ex -# NUM_OMP_THREADS 4 ) -# endif() -#endif() +if(AXOM_ENABLE_TESTS) + if(AXOM_ENABLE_MPI) + + # CMake inserts Fortran flag that forces one OpenMP thread when + # compiling with MPI and xlf + if(ENABLE_FORTRAN) + list(REMOVE_ITEM CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES "xlomp_ser") + endif() + + axom_add_test(NAME slam_lulesh + COMMAND slam_lulesh_ex + NUM_MPI_TASKS 8 + NUM_OMP_THREADS 4 ) + else() + axom_add_test(NAME slam_lulesh + COMMAND slam_lulesh_ex + NUM_OMP_THREADS 4 ) + endif() +endif() From f46cf8172954ae119a4d9c6f477fbb6376252ff8 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 7 Mar 2024 13:06:17 -0800 Subject: [PATCH 588/639] Fix recent change breaking non-RAJA build. --- src/axom/quest/detail/MarchingCubesImpl.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index ec737be931..24ea18c872 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -209,7 +209,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase }); } #else - if(order & axom::ArrayStrideOrder::ROW) + if(int(order) & int(axom::ArrayStrideOrder::ROW)) { for(int j = 0; j < m_bShape[1]; ++j) { @@ -263,7 +263,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase }); } #else - if(order & axom::ArrayStrideOrder::ROW) + if(int(order) & int(axom::ArrayStrideOrder::ROW)) { for(int k = 0; k < m_bShape[2]; ++k) { From d62b5261a67e6e3d10632f522e888558f5779bdc Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 7 Mar 2024 13:38:08 -0800 Subject: [PATCH 589/639] lower parallelism for docker --- src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt b/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt index 7197612318..9ef9b6fd3f 100644 --- a/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt +++ b/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt @@ -46,8 +46,8 @@ if(AXOM_ENABLE_TESTS) axom_add_test(NAME slam_lulesh COMMAND slam_lulesh_ex - NUM_MPI_TASKS 8 - NUM_OMP_THREADS 4 ) + NUM_MPI_TASKS 4 + NUM_OMP_THREADS 2 ) else() axom_add_test(NAME slam_lulesh COMMAND slam_lulesh_ex From 7869433cbf3db3b748d441474568f2486fde4081 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 7 Mar 2024 13:49:06 -0800 Subject: [PATCH 590/639] make camp not a requirement cuz its not --- src/cmake/thirdparty/SetupAxomThirdParty.cmake | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/cmake/thirdparty/SetupAxomThirdParty.cmake b/src/cmake/thirdparty/SetupAxomThirdParty.cmake index 37c2f5490d..54e7a12012 100644 --- a/src/cmake/thirdparty/SetupAxomThirdParty.cmake +++ b/src/cmake/thirdparty/SetupAxomThirdParty.cmake @@ -34,9 +34,13 @@ if ((RAJA_DIR OR UMPIRE_DIR) AND NOT CAMP_DIR) message(FATAL_ERROR "CAMP_DIR is required if RAJA_DIR or UMPIRE_DIR is provided.") endif() -axom_assert_is_directory(VARIABLE_NAME CAMP_DIR) -find_dependency(camp REQUIRED PATHS "${CAMP_DIR}") -set(CAMP_FOUND TRUE CACHE BOOL "") +if(CAMP_DIR) + axom_assert_is_directory(VARIABLE_NAME CAMP_DIR) + find_dependency(camp REQUIRED PATHS "${CAMP_DIR}") + set(CAMP_FOUND TRUE CACHE BOOL "") +else() + set(CAMP_FOUND FALSE CACHE BOOL "") +endif() #------------------------------------------------------------------------------ # UMPIRE From 61692e8c622de4f2d65d7ed0a1d13ea554b5643e Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Mon, 4 Mar 2024 11:51:46 -0800 Subject: [PATCH 591/639] Fixes some `Wmaybe-uninitialized` warnings --- src/axom/primal/operators/detail/clip_impl.hpp | 2 +- src/axom/slam/mesh_struct/IA_impl.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/primal/operators/detail/clip_impl.hpp b/src/axom/primal/operators/detail/clip_impl.hpp index fadc142609..ecec7b3024 100644 --- a/src/axom/primal/operators/detail/clip_impl.hpp +++ b/src/axom/primal/operators/detail/clip_impl.hpp @@ -328,7 +328,7 @@ AXOM_HOST_DEVICE void poly_clip_fix_nbrs(Polyhedron& poly, } else { - int offset; + int offset {}; for(int oi = 0; oi < old_nbrs.getNumNeighbors(inext); oi++) { if(old_nbrs[inext][oi] == iprev) diff --git a/src/axom/slam/mesh_struct/IA_impl.hpp b/src/axom/slam/mesh_struct/IA_impl.hpp index 661d55f53f..1375776c7c 100644 --- a/src/axom/slam/mesh_struct/IA_impl.hpp +++ b/src/axom/slam/mesh_struct/IA_impl.hpp @@ -667,7 +667,7 @@ void IAMesh::fixVertexNeighborhood( { // Add all element-face associations to an array; // we'll update the adjacencies outside this loop - FaceLinkVerts face_link_verts; + FaceLinkVerts face_link_verts {}; for(int i = 0, idx = 0; i < TDIM; ++i) { if(i != vert_i && // i is a vertex in face_i From c01872d64ccca24e747f56572c1c1eb820ecc132 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 5 Mar 2024 16:15:41 -0800 Subject: [PATCH 592/639] Fixes memory leaks in sidre tests and examples --- .../sidre/examples/lulesh2/lulesh-init.cc | 88 +++---- src/axom/sidre/examples/lulesh2/lulesh.cc | 4 +- src/axom/sidre/examples/lulesh2/lulesh.h | 13 +- .../sidre/examples/sidre_createdatastore.cpp | 218 +++++++++--------- .../sidre/examples/sidre_generateindex.cpp | 40 ++-- src/axom/sidre/tests/sidre_collections.cpp | 1 + src/axom/sidre/tests/sidre_group.cpp | 4 +- src/axom/sidre/tests/sidre_group_C.cpp | 6 +- src/axom/sidre/tests/sidre_opaque_C.cpp | 2 + src/axom/sidre/tests/sidre_view.cpp | 4 + 10 files changed, 211 insertions(+), 169 deletions(-) diff --git a/src/axom/sidre/examples/lulesh2/lulesh-init.cc b/src/axom/sidre/examples/lulesh2/lulesh-init.cc index d7e9b14474..80828a3617 100644 --- a/src/axom/sidre/examples/lulesh2/lulesh-init.cc +++ b/src/axom/sidre/examples/lulesh2/lulesh-init.cc @@ -192,6 +192,23 @@ Domain::Domain(Int_t numRanks, Index_t colLoc, } // End constructor +Domain::~Domain() +{ +#ifdef AXOM_USE_MPI + delete [] commDataSend; + delete [] commDataRecv; +#endif + + delete [] m_regElemSize; + delete [] m_regNumList; + + for (Index_t i=0 ; i= regBinEnd[i]) - i++; + i++; //rotate the regions based on MPI rank. Rotation is Rank % NumRegions this makes each domain have a different region with //the highest representation - regionNum = ((i + myRank) % numReg()) + 1; - // make sure we don't pick the same region twice in a row + regionNum = ((i + myRank) % numReg()) + 1; + // make sure we don't pick the same region twice in a row while(regionNum == lastReg) { - regionVar = rand() % costDenominator; - i = 0; + regionVar = rand() % costDenominator; + i = 0; while(regionVar >= regBinEnd[i]) - i++; - regionNum = ((i + myRank) % numReg()) + 1; + i++; + regionNum = ((i + myRank) % numReg()) + 1; } - //Pick the bin size of the region and determine the number of elements. + + //Pick the bin size of the region and determine the number of elements. binSize = rand() % 1000; - if(binSize < 773) { - elements = rand() % 15 + 1; - } - else if(binSize < 937) { - elements = rand() % 16 + 16; - } - else if(binSize < 970) { - elements = rand() % 32 + 32; - } - else if(binSize < 974) { - elements = rand() % 64 + 64; - } - else if(binSize < 978) { - elements = rand() % 128 + 128; - } - else if(binSize < 981) { - elements = rand() % 256 + 256; - } - else - elements = rand() % 1537 + 512; - runto = elements + nextIndex; - //Store the elements. If we hit the end before we run out of elements then just stop. + if(binSize < 773) { elements = rand() % 15 + 1; } + else if(binSize < 937) { elements = rand() % 16 + 16; } + else if(binSize < 970) { elements = rand() % 32 + 32; } + else if(binSize < 974) { elements = rand() % 64 + 64; } + else if(binSize < 978) { elements = rand() % 128 + 128; } + else if(binSize < 981) { elements = rand() % 256 + 256; } + else { elements = rand() % 1537 + 512;} + + runto = elements + nextIndex; + //Store the elements. If we hit the end before we run out of elements then just stop. while (nextIndex < runto && nextIndex < numElem()) { - this->regNumList(nextIndex) = regionNum; - nextIndex++; - } - lastReg = regionNum; + this->regNumList(nextIndex) = regionNum; + nextIndex++; + } + lastReg = regionNum; } + + delete [] regBinEnd; } // Convert regNumList to region index sets // First, count size of each region @@ -507,6 +515,8 @@ Domain::CreateRegionIndexSets(Int_t nr, Int_t balance) Index_t regndx = regElemSize(r)++; // Note increment regElemlist(r,regndx) = i; } + + } diff --git a/src/axom/sidre/examples/lulesh2/lulesh.cc b/src/axom/sidre/examples/lulesh2/lulesh.cc index a01fe440d0..8a7b8f43e3 100644 --- a/src/axom/sidre/examples/lulesh2/lulesh.cc +++ b/src/axom/sidre/examples/lulesh2/lulesh.cc @@ -2776,7 +2776,7 @@ void LagrangeLeapFrog(Domain& domain) int main(int argc, char *argv[]) { - Domain *locDom ; + Domain *locDom ; Int_t numRanks ; Int_t myRank ; struct cmdLineOpts opts; @@ -2895,6 +2895,8 @@ int main(int argc, char *argv[]) VerifyAndWriteFinalOutput(elapsed_timeG, *locDom, opts.nx, numRanks); } + delete locDom; + #ifdef AXOM_USE_MPI MPI_Finalize() ; #endif diff --git a/src/axom/sidre/examples/lulesh2/lulesh.h b/src/axom/sidre/examples/lulesh2/lulesh.h index 5ce947a0de..8b4134c466 100644 --- a/src/axom/sidre/examples/lulesh2/lulesh.h +++ b/src/axom/sidre/examples/lulesh2/lulesh.h @@ -166,6 +166,9 @@ class Domain Index_t rowLoc, Index_t planeLoc, Index_t nx, Int_t tp, Int_t nr, Int_t balance, Int_t cost); + // Destructor + ~Domain(); + // // ALLOCATION // @@ -584,8 +587,8 @@ class Domain #ifdef AXOM_USE_MPI // Communication Work space - Real_t * commDataSend; - Real_t * commDataRecv; + Real_t * commDataSend {nullptr}; + Real_t * commDataRecv {nullptr}; // Maximum number of block neighbors MPI_Request recvRequest[26]; // 6 faces + 12 edges + 8 corners @@ -639,9 +642,9 @@ class Domain // Region information Int_t m_numReg; Int_t m_cost; //imbalance cost - Index_t * m_regElemSize; // Size of region sets - Index_t * m_regNumList; // Region number per domain element - Index_t * * m_regElemlist; // region indexset + Index_t * m_regElemSize {nullptr}; // Size of region sets + Index_t * m_regNumList {nullptr}; // Region number per domain element + Index_t * * m_regElemlist {nullptr}; // region indexset luleshIndexData m_nodelist; /* elemToNode connectivity */ diff --git a/src/axom/sidre/examples/sidre_createdatastore.cpp b/src/axom/sidre/examples/sidre_createdatastore.cpp index 1045c7edc0..06be92f44e 100644 --- a/src/axom/sidre/examples/sidre_createdatastore.cpp +++ b/src/axom/sidre/examples/sidre_createdatastore.cpp @@ -8,8 +8,7 @@ * Sidre classes to construct a hierarchical data store and save it to * a file. (This example does not use the parallel I/O facility.) * This also shows how to use Sidre with Conduit to generate and save a - * data store using the Mesh Blueprint, for easy data exchange and - * visualization. + * data store using the Mesh Blueprint, for easy data exchange and visualization. */ /* @@ -87,24 +86,23 @@ #include // "using" directives to simplify code -using namespace axom; -using namespace sidre; +namespace sidre = axom::sidre; -DataStore* create_datastore(int* region) +std::unique_ptr create_datastore(int* region) { // _first_example_creategroups_start // Create Sidre datastore object and get root group - DataStore* ds = new DataStore(); - Group* root = ds->getRoot(); + auto ds = std::unique_ptr {new sidre::DataStore()}; + sidre::Group* root = ds->getRoot(); // Create two attributes ds->createAttributeScalar("vis", 0); ds->createAttributeScalar("restart", 1); // Create group children of root group - Group* state = root->createGroup("state"); - Group* nodes = root->createGroup("nodes"); - Group* fields = root->createGroup("fields"); + sidre::Group* state = root->createGroup("state"); + sidre::Group* nodes = root->createGroup("nodes"); + sidre::Group* fields = root->createGroup("fields"); // _first_example_creategroups_end // _first_example_state_start @@ -125,7 +123,8 @@ DataStore* create_datastore(int* region) // holds 3 * nodecount doubles. These views might describe the location of // each node in a 16 x 16 x 16 hexahedron mesh. Each view is described by // number of elements, offset, and stride into that data. - Buffer* buff = ds->createBuffer(sidre::DOUBLE_ID, 3 * nodecount)->allocate(); + sidre::Buffer* buff = + ds->createBuffer(sidre::DOUBLE_ID, 3 * nodecount)->allocate(); nodes->createView("x", buff)->apply(sidre::DOUBLE_ID, nodecount, 0, 3); nodes->createView("y", buff)->apply(sidre::DOUBLE_ID, nodecount, 1, 3); nodes->createView("z", buff)->apply(sidre::DOUBLE_ID, nodecount, 2, 3); @@ -139,8 +138,10 @@ DataStore* create_datastore(int* region) // object. Likewise with "rho." Both Views have the default offset (0) // and stride (1). These Views could point to data associated with // each of the 15 x 15 x 15 hexahedron elements defined by the nodes above. - View* temp = fields->createViewAndAllocate("temp", sidre::DOUBLE_ID, eltcount); - View* rho = fields->createViewAndAllocate("rho", sidre::DOUBLE_ID, eltcount); + sidre::View* temp = + fields->createViewAndAllocate("temp", sidre::DOUBLE_ID, eltcount); + sidre::View* rho = + fields->createViewAndAllocate("rho", sidre::DOUBLE_ID, eltcount); // Explicitly set values for the "vis" Attribute on the "temp" and "rho" // buffers. @@ -150,7 +151,7 @@ DataStore* create_datastore(int* region) // The "fields" Group also contains a child Group "ext" which holds a pointer // to an externally owned integer array. Although Sidre does not own the // data, the data can still be described to Sidre. - Group* ext = fields->createGroup("ext"); + sidre::Group* ext = fields->createGroup("ext"); // int * region has been passed in as a function argument. As with "temp" // and "rho", view "region" has default offset and stride. ext->createView("region", region)->apply(sidre::INT_ID, eltcount); @@ -159,18 +160,18 @@ DataStore* create_datastore(int* region) return ds; } -void access_datastore(DataStore* ds) +void access_datastore(sidre::DataStore* ds) { // _first_example_access_start // Retrieve Group pointers - Group* root = ds->getRoot(); - Group* state = root->getGroup("state"); - Group* nodes = root->getGroup("nodes"); - Group* fields = root->getGroup("fields"); + sidre::Group* root = ds->getRoot(); + sidre::Group* state = root->getGroup("state"); + sidre::Group* nodes = root->getGroup("nodes"); + sidre::Group* fields = root->getGroup("fields"); // Accessing a Group that is not there gives a null pointer // Requesting a nonexistent View also gives a null pointer - Group* goofy = root->getGroup("goofy"); + sidre::Group* goofy = root->getGroup("goofy"); if(goofy == nullptr) { std::cout << "no such group: goofy" << std::endl; @@ -206,9 +207,9 @@ void access_datastore(DataStore* ds) AXOM_UNUSED_VAR(region); } -void iterate_datastore(DataStore* ds) +void iterate_datastore(sidre::DataStore* ds) { - const std::string fill_line = fmt::format("{:=^80}", ""); + const std::string fill_line = axom::fmt::format("{:=^80}", ""); std::cout << fill_line << std::endl; @@ -216,11 +217,12 @@ void iterate_datastore(DataStore* ds) std::cout << "The datastore has the following attributes:\n"; for(auto& attr : ds->attributes()) { - std::cout << fmt::format(" * [{}] '{}' of type {} and default value: {}\n", - attr.getIndex(), - attr.getName(), - conduit::DataType::id_to_name(attr.getTypeID()), - attr.getDefaultNodeRef().to_yaml()); + std::cout << axom::fmt::format( + " * [{}] '{}' of type {} and default value: {}\n", + attr.getIndex(), + attr.getName(), + conduit::DataType::id_to_name(attr.getTypeID()), + attr.getDefaultNodeRef().to_yaml()); } std::cout << fill_line << std::endl; @@ -229,7 +231,7 @@ void iterate_datastore(DataStore* ds) std::cout << "The datastore has the following buffers:\n"; for(auto& buff : ds->buffers()) { - std::cout << fmt::format( + std::cout << axom::fmt::format( " * [{}] {} buffer with {} elements of type {} with {} views\n", buff.getIndex(), buff.isAllocated() ? "Allocated" : "Unallocated", @@ -244,11 +246,12 @@ void iterate_datastore(DataStore* ds) std::cout << "The root group has the following groups:\n"; for(auto& grp : ds->getRoot()->groups()) { - std::cout << fmt::format(" * [{}] '{}' with {} groups and {} views\n", - grp.getIndex(), - grp.getName(), - grp.getNumGroups(), - grp.getNumViews()); + std::cout << axom::fmt::format( + " * [{}] '{}' with {} groups and {} views\n", + grp.getIndex(), + grp.getName(), + grp.getNumGroups(), + grp.getNumViews()); } std::cout << fill_line << std::endl; @@ -257,7 +260,7 @@ void iterate_datastore(DataStore* ds) std::cout << "The 'state' group has the following views:\n"; for(auto& view : ds->getRoot()->getGroup("state")->views()) { - std::cout << fmt::format( + std::cout << axom::fmt::format( " * [{}] '{}' -- {} view of type {} and {} elements\n", view.getIndex(), view.getName(), @@ -269,24 +272,27 @@ void iterate_datastore(DataStore* ds) std::cout << fill_line << std::endl; } -DataStore* create_tiny_datastore() +std::unique_ptr create_tiny_datastore() { // _tiny_create_start - DataStore* ds = new DataStore(); + auto ds = std::unique_ptr {new sidre::DataStore()}; int nodecount = 12; int elementcount = 2; // Create views and buffers to hold node positions and field values - Group* nodes = ds->getRoot()->createGroup("nodes"); - View* xs = nodes->createViewAndAllocate("xs", sidre::DOUBLE_ID, nodecount); - View* ys = nodes->createViewAndAllocate("ys", sidre::DOUBLE_ID, nodecount); - View* zs = nodes->createViewAndAllocate("zs", sidre::DOUBLE_ID, nodecount); - - Group* fields = ds->getRoot()->createGroup("fields"); - View* nodefield = + sidre::Group* nodes = ds->getRoot()->createGroup("nodes"); + sidre::View* xs = + nodes->createViewAndAllocate("xs", sidre::DOUBLE_ID, nodecount); + sidre::View* ys = + nodes->createViewAndAllocate("ys", sidre::DOUBLE_ID, nodecount); + sidre::View* zs = + nodes->createViewAndAllocate("zs", sidre::DOUBLE_ID, nodecount); + + sidre::Group* fields = ds->getRoot()->createGroup("fields"); + sidre::View* nodefield = fields->createViewAndAllocate("nodefield", sidre::INT_ID, nodecount); - View* eltfield = + sidre::View* eltfield = fields->createViewAndAllocate("eltfield", sidre::DOUBLE_ID, elementcount); // Set node position for two adjacent hexahedrons @@ -316,14 +322,14 @@ DataStore* create_tiny_datastore() // _tiny_create_end } -void setup_blueprint_coords(DataStore* ds, Group* coords) +void setup_blueprint_coords(sidre::DataStore* ds, sidre::Group* coords) { // _blueprint_restructure_coords_start // Set up the coordinates as Mesh Blueprint requires coords->createViewString("type", "explicit"); // We use prior knowledge of the layout of the original datastore - View* origv = ds->getRoot()->getView("nodes/xs"); - Group* conduitval = coords->createGroup("values"); + sidre::View* origv = ds->getRoot()->getView("nodes/xs"); + sidre::Group* conduitval = coords->createGroup("values"); conduitval->createView("x", sidre::DOUBLE_ID, origv->getNumElements(), @@ -341,14 +347,14 @@ void setup_blueprint_coords(DataStore* ds, Group* coords) // _blueprint_restructure_coords_end } -void setup_blueprint_external_coords(DataStore* ds, Group* coords) +void setup_blueprint_external_coords(sidre::DataStore* ds, sidre::Group* coords) { // _blueprint_external_coords_start // Set up the coordinates as Mesh Blueprint requires coords->createViewString("type", "explicit"); // We use prior knowledge of the layout of the original datastore - View* origv = ds->getRoot()->getView("nodes/xs"); - Group* conduitval = coords->createGroup("values"); + sidre::View* origv = ds->getRoot()->getView("nodes/xs"); + sidre::Group* conduitval = coords->createGroup("values"); conduitval->createView("x", sidre::DOUBLE_ID, origv->getNumElements(), @@ -366,18 +372,18 @@ void setup_blueprint_external_coords(DataStore* ds, Group* coords) // _blueprint_external_coords_end } -void setup_blueprint_topos(DataStore* ds, Group* topos) +void setup_blueprint_topos(sidre::DataStore* ds, sidre::Group* topos) { // _blueprint_restructure_topo_start // Sew the nodes together into the two hexahedra, using prior knowledge. - Group* connmesh = topos->createGroup("mesh"); + sidre::Group* connmesh = topos->createGroup("mesh"); connmesh->createViewString("type", "unstructured"); connmesh->createViewString("coordset", "coords"); - Group* elts = connmesh->createGroup("elements"); + sidre::Group* elts = connmesh->createGroup("elements"); elts->createViewString("shape", "hex"); // We have two eight-node hex elements, so we need 2 * 8 = 16 ints. - View* connectivity = + sidre::View* connectivity = elts->createViewAndAllocate("connectivity", sidre::INT_ID, 16); // The Mesh Blueprint connectivity array for a hexahedron lists four nodes on @@ -415,13 +421,13 @@ void setup_blueprint_topos(DataStore* ds, Group* topos) AXOM_UNUSED_VAR(ds); } -void setup_blueprint_fields(DataStore* ds, Group* fields) +void setup_blueprint_fields(sidre::DataStore* ds, sidre::Group* fields) { // _blueprint_restructure_field_start // Set up the node-centered field // Get the original data - View* origv = ds->getRoot()->getView("fields/nodefield"); - Group* nodefield = fields->createGroup("nodefield"); + sidre::View* origv = ds->getRoot()->getView("fields/nodefield"); + sidre::Group* nodefield = fields->createGroup("nodefield"); nodefield->createViewString("association", "vertex"); nodefield->createViewString("type", "scalar"); nodefield->createViewString("topology", "mesh"); @@ -433,7 +439,7 @@ void setup_blueprint_fields(DataStore* ds, Group* fields) // Set up the element-centered field // Get the original data origv = ds->getRoot()->getView("fields/eltfield"); - Group* eltfield = fields->createGroup("eltfield"); + sidre::Group* eltfield = fields->createGroup("eltfield"); eltfield->createViewString("association", "element"); eltfield->createViewString("type", "scalar"); eltfield->createViewString("topology", "mesh"); @@ -444,13 +450,13 @@ void setup_blueprint_fields(DataStore* ds, Group* fields) // _blueprint_restructure_field_end } -void setup_blueprint_external_fields(DataStore* ds, Group* fields) +void setup_blueprint_external_fields(sidre::DataStore* ds, sidre::Group* fields) { // _blueprint_external_field_start // Set up the node-centered field // Get the original data - View* origv = ds->getRoot()->getView("fields/nodefield"); - Group* nodefield = fields->createGroup("nodefield"); + sidre::View* origv = ds->getRoot()->getView("fields/nodefield"); + sidre::Group* nodefield = fields->createGroup("nodefield"); nodefield->createViewString("association", "vertex"); nodefield->createViewString("type", "scalar"); nodefield->createViewString("topology", "mesh"); @@ -462,7 +468,7 @@ void setup_blueprint_external_fields(DataStore* ds, Group* fields) // Set up the element-centered field // Get the original data origv = ds->getRoot()->getView("fields/eltfield"); - Group* eltfield = fields->createGroup("eltfield"); + sidre::Group* eltfield = fields->createGroup("eltfield"); eltfield->createViewString("association", "element"); eltfield->createViewString("type", "scalar"); eltfield->createViewString("topology", "mesh"); @@ -473,7 +479,7 @@ void setup_blueprint_external_fields(DataStore* ds, Group* fields) // _blueprint_external_field_end } -void save_as_blueprint(DataStore* ds) +void save_as_blueprint(sidre::DataStore* ds) { // _blueprint_restructure_toplevel_start // Conduit needs a specific hierarchy. @@ -482,11 +488,11 @@ void save_as_blueprint(DataStore* ds) std::string mesh_name = "tinymesh"; // The Conduit specifies top-level groups: - Group* mroot = ds->getRoot()->createGroup(mesh_name); - Group* coords = mroot->createGroup("coordsets/coords"); - Group* topos = mroot->createGroup("topologies"); + sidre::Group* mroot = ds->getRoot()->createGroup(mesh_name); + sidre::Group* coords = mroot->createGroup("coordsets/coords"); + sidre::Group* topos = mroot->createGroup("topologies"); // no material sets in this example - Group* fields = mroot->createGroup("fields"); + sidre::Group* fields = mroot->createGroup("fields"); // no adjacency sets in this (single-domain) example // _blueprint_restructure_toplevel_end @@ -532,7 +538,7 @@ void save_as_blueprint(DataStore* ds) // _blueprint_restructure_save_end } -void generate_blueprint(DataStore* ds) +void generate_blueprint(sidre::DataStore* ds) { // _blueprint_generate_toplevel_start // Conduit needs a specific hierarchy. @@ -543,11 +549,11 @@ void generate_blueprint(DataStore* ds) std::string mesh_name = "mesh"; std::string domain_mesh = domain_location + "/" + mesh_name; - Group* mroot = ds->getRoot()->createGroup(domain_location); - Group* coords = mroot->createGroup(mesh_name + "/coordsets/coords"); - Group* topos = mroot->createGroup(mesh_name + "/topologies"); + sidre::Group* mroot = ds->getRoot()->createGroup(domain_location); + sidre::Group* coords = mroot->createGroup(mesh_name + "/coordsets/coords"); + sidre::Group* topos = mroot->createGroup(mesh_name + "/topologies"); // no material sets in this example - Group* fields = mroot->createGroup(mesh_name + "/fields"); + sidre::Group* fields = mroot->createGroup(mesh_name + "/fields"); // no adjacency sets in this (single-domain) example // _blueprint_generate_toplevel_end @@ -567,7 +573,7 @@ void generate_blueprint(DataStore* ds) ds->generateBlueprintIndex(domain_mesh, mesh_name, bp, 1); - Group* rootfile_grp = ds->getRoot()->getGroup("rootfile_data"); + sidre::Group* rootfile_grp = ds->getRoot()->getGroup("rootfile_data"); rootfile_grp->createViewString("protocol/name", "json"); rootfile_grp->createViewString("protocol/version", "0.1"); rootfile_grp->createViewScalar("number_of_files", 1); @@ -587,7 +593,7 @@ void generate_blueprint(DataStore* ds) // _blueprint_generate_save_end } -void generate_blueprint_to_path(DataStore* ds) +void generate_blueprint_to_path(sidre::DataStore* ds) { // _blueprint_generate_path_start // Conduit needs a specific hierarchy. @@ -598,11 +604,11 @@ void generate_blueprint_to_path(DataStore* ds) std::string mesh_name = "pathmesh"; std::string domain_mesh = domain_location + "/" + mesh_name; - Group* mroot = ds->getRoot()->createGroup(domain_location); - Group* coords = mroot->createGroup(mesh_name + "/coordsets/coords"); - Group* topos = mroot->createGroup(mesh_name + "/topologies"); + sidre::Group* mroot = ds->getRoot()->createGroup(domain_location); + sidre::Group* coords = mroot->createGroup(mesh_name + "/coordsets/coords"); + sidre::Group* topos = mroot->createGroup(mesh_name + "/topologies"); // no material sets in this example - Group* fields = mroot->createGroup(mesh_name + "/fields"); + sidre::Group* fields = mroot->createGroup(mesh_name + "/fields"); // no adjacency sets in this (single-domain) example // _blueprint_generate_path_end @@ -622,7 +628,7 @@ void generate_blueprint_to_path(DataStore* ds) ds->generateBlueprintIndex(domain_mesh, mesh_name, bp, 1); - Group* rootfile_grp = ds->getRoot()->getGroup("rootfile_data"); + sidre::Group* rootfile_grp = ds->getRoot()->getGroup("rootfile_data"); rootfile_grp->createViewString("protocol/name", "json"); rootfile_grp->createViewString("protocol/version", "0.1"); rootfile_grp->createViewScalar("number_of_files", 1); @@ -643,7 +649,7 @@ void generate_blueprint_to_path(DataStore* ds) } #ifdef AXOM_USE_MPI -void generate_spio_blueprint(DataStore* ds) +void generate_spio_blueprint(sidre::DataStore* ds) { int comm_size; MPI_Comm_size(MPI_COMM_WORLD, &comm_size); @@ -654,11 +660,11 @@ void generate_spio_blueprint(DataStore* ds) std::string mesh_name = "mesh"; std::string domain_mesh = domain_location + "/" + mesh_name; - Group* mroot = ds->getRoot()->createGroup(domain_location); - Group* coords = mroot->createGroup(mesh_name + "/coordsets/coords"); - Group* topos = mroot->createGroup(mesh_name + "/topologies"); + sidre::Group* mroot = ds->getRoot()->createGroup(domain_location); + sidre::Group* coords = mroot->createGroup(mesh_name + "/coordsets/coords"); + sidre::Group* topos = mroot->createGroup(mesh_name + "/topologies"); // no material sets in this example - Group* fields = mroot->createGroup(mesh_name + "/fields"); + sidre::Group* fields = mroot->createGroup(mesh_name + "/fields"); // no adjacency sets in this (single-domain) example // _blueprint_spio_toplevel_end @@ -669,7 +675,7 @@ void generate_spio_blueprint(DataStore* ds) setup_blueprint_fields(ds, fields); // _blueprint_generate_spio_start - IOManager writer(MPI_COMM_WORLD); + sidre::IOManager writer(MPI_COMM_WORLD); conduit::Node info, mesh_node, root_node; ds->getRoot()->createNativeLayout(mesh_node); @@ -699,7 +705,7 @@ void generate_spio_blueprint(DataStore* ds) // _blueprint_generate_spio_end } -void generate_spio_blueprint_to_path(DataStore* ds) +void generate_spio_blueprint_to_path(sidre::DataStore* ds) { int comm_size; MPI_Comm_size(MPI_COMM_WORLD, &comm_size); @@ -710,11 +716,11 @@ void generate_spio_blueprint_to_path(DataStore* ds) std::string mesh_name = "spiopathmesh"; std::string domain_mesh = domain_location + "/" + mesh_name; - Group* mroot = ds->getRoot()->createGroup(domain_location); - Group* coords = mroot->createGroup(mesh_name + "/coordsets/coords"); - Group* topos = mroot->createGroup(mesh_name + "/topologies"); + sidre::Group* mroot = ds->getRoot()->createGroup(domain_location); + sidre::Group* coords = mroot->createGroup(mesh_name + "/coordsets/coords"); + sidre::Group* topos = mroot->createGroup(mesh_name + "/topologies"); // no material sets in this example - Group* fields = mroot->createGroup(mesh_name + "/fields"); + sidre::Group* fields = mroot->createGroup(mesh_name + "/fields"); // no adjacency sets in this (single-domain) example // _blueprint_spio_path_end @@ -725,7 +731,7 @@ void generate_spio_blueprint_to_path(DataStore* ds) setup_blueprint_external_fields(ds, fields); // _blueprint_generate_spio_path_start - IOManager writer(MPI_COMM_WORLD); + sidre::IOManager writer(MPI_COMM_WORLD); conduit::Node info, mesh_node, root_node; ds->getRoot()->createNativeLayout(mesh_node); @@ -759,7 +765,7 @@ void generate_spio_blueprint_to_path(DataStore* ds) } #endif -void serial_save_datastore_and_load_copy_lower(DataStore* ds) +void serial_save_datastore_and_load_copy_lower(sidre::DataStore* ds) { #if defined(AXOM_USE_HDF5) std::string protocol = "sidre_hdf5"; @@ -775,7 +781,7 @@ void serial_save_datastore_and_load_copy_lower(DataStore* ds) ds->getRoot()->save(filename, protocol); // Delete the data hierarchy under the root, then load it from the file ds->getRoot()->load(filename, protocol); - Group* additional = ds->getRoot()->createGroup("additional"); + sidre::Group* additional = ds->getRoot()->createGroup("additional"); additional->createGroup("yetanother"); // Load another copy of the data store into the "additional" group // without first clearing all its contents @@ -796,24 +802,24 @@ int main(int argc, char** argv) MPI_Init(&argc, &argv); #endif - DataStore* ds = create_datastore(region); - access_datastore(ds); - iterate_datastore(ds); + auto ds = create_datastore(region); + access_datastore(ds.get()); + iterate_datastore(ds.get()); - DataStore* tds = create_tiny_datastore(); - save_as_blueprint(tds); + auto tds = create_tiny_datastore(); + save_as_blueprint(tds.get()); - DataStore* bds = create_tiny_datastore(); - generate_blueprint(bds); + auto bds = create_tiny_datastore(); + generate_blueprint(bds.get()); - DataStore* pds = create_tiny_datastore(); - generate_blueprint_to_path(pds); + auto pds = create_tiny_datastore(); + generate_blueprint_to_path(pds.get()); #ifdef AXOM_USE_MPI - DataStore* sds = create_tiny_datastore(); - DataStore* spds = create_tiny_datastore(); - generate_spio_blueprint(sds); - generate_spio_blueprint_to_path(spds); + auto sds = create_tiny_datastore(); + auto spds = create_tiny_datastore(); + generate_spio_blueprint(sds.get()); + generate_spio_blueprint_to_path(spds.get()); MPI_Finalize(); #endif diff --git a/src/axom/sidre/examples/sidre_generateindex.cpp b/src/axom/sidre/examples/sidre_generateindex.cpp index 1db2c5b881..ceb77868ab 100644 --- a/src/axom/sidre/examples/sidre_generateindex.cpp +++ b/src/axom/sidre/examples/sidre_generateindex.cpp @@ -46,9 +46,9 @@ namespace sidre = axom::sidre; static int cart_nx = 5; // nodal domain x size for cartesian mesh example static int cart_ny = 5; // nodal domain y size for cartesian mesh example -sidre::DataStore* create_tiny_datastore() +std::unique_ptr create_tiny_datastore() { - sidre::DataStore* ds = new sidre::DataStore(); + auto ds = std::unique_ptr {new sidre::DataStore()}; int nodecount = 12; int elementcount = 2; @@ -518,50 +518,60 @@ int main(int argc, char** argv) MPI_Init(&argc, &argv); MPI_Comm_size(MPI_COMM_WORLD, &num_ranks); - sidre::DataStore* sds = create_tiny_datastore(); - sidre::DataStore* spds = create_tiny_datastore(); - generate_spio_blueprint(sds, true); //dense - generate_spio_blueprint(spds, false); //sparse + auto sds = create_tiny_datastore(); + generate_spio_blueprint(sds.get(), true); //dense + + auto spds = create_tiny_datastore(); + generate_spio_blueprint(spds.get(), false); //sparse spds->getRoot()->destroyGroups(); spds->getRoot()->destroyViews(); + spds = create_tiny_datastore(); - generate_multidomain_blueprint(spds, "multi1", 1, false); + generate_multidomain_blueprint(spds.get(), "multi1", 1, false); spds->getRoot()->destroyGroups(); spds->getRoot()->destroyViews(); + spds = create_tiny_datastore(); - generate_multidomain_blueprint(spds, "multi1_list", 1, true); + generate_multidomain_blueprint(spds.get(), "multi1_list", 1, true); if(num_ranks > 1) { spds->getRoot()->destroyGroups(); spds->getRoot()->destroyViews(); + spds = create_tiny_datastore(); - generate_multidomain_blueprint(spds, "multi2", 2, false); + generate_multidomain_blueprint(spds.get(), "multi2", 2, false); spds->getRoot()->destroyGroups(); spds->getRoot()->destroyViews(); + spds = create_tiny_datastore(); - generate_multidomain_blueprint(spds, "multi2_list", 2, true); + generate_multidomain_blueprint(spds.get(), "multi2_list", 2, true); spds->getRoot()->destroyGroups(); spds->getRoot()->destroyViews(); + spds = create_tiny_datastore(); - generate_multidomain_blueprint(spds, "multi_all", num_ranks, false); + generate_multidomain_blueprint(spds.get(), "multi_all", num_ranks, false); spds->getRoot()->destroyGroups(); spds->getRoot()->destroyViews(); + spds = create_tiny_datastore(); - generate_multidomain_blueprint(spds, "multi_all_list", num_ranks, true); + generate_multidomain_blueprint(spds.get(), "multi_all_list", num_ranks, true); } spds->getRoot()->destroyGroups(); spds->getRoot()->destroyViews(); - generate_cartesian_blueprint(spds, "cart1", 1); + + generate_cartesian_blueprint(spds.get(), "cart1", 1); if(num_ranks > 1) { spds->getRoot()->destroyGroups(); spds->getRoot()->destroyViews(); + spds = create_tiny_datastore(); - generate_cartesian_blueprint(spds, "cart2", 2); + generate_cartesian_blueprint(spds.get(), "cart2", 2); spds->getRoot()->destroyGroups(); spds->getRoot()->destroyViews(); + spds = create_tiny_datastore(); - generate_cartesian_blueprint(spds, "cart_all", num_ranks); + generate_cartesian_blueprint(spds.get(), "cart_all", num_ranks); } MPI_Finalize(); diff --git a/src/axom/sidre/tests/sidre_collections.cpp b/src/axom/sidre/tests/sidre_collections.cpp index c819292e17..3a7f395d56 100644 --- a/src/axom/sidre/tests/sidre_collections.cpp +++ b/src/axom/sidre/tests/sidre_collections.cpp @@ -934,6 +934,7 @@ TYPED_TEST(IndexedCollectionTest, insertBadIdx) if(idx < 0) { EXPECT_EQ(sidre::InvalidIndex, insertedIdx); + delete val; } else { diff --git a/src/axom/sidre/tests/sidre_group.cpp b/src/axom/sidre/tests/sidre_group.cpp index ab76b955c7..5a4194d436 100644 --- a/src/axom/sidre/tests/sidre_group.cpp +++ b/src/axom/sidre/tests/sidre_group.cpp @@ -1797,6 +1797,8 @@ TEST(sidre_group, copy_to_conduit_node) EXPECT_EQ(chld_views["d1/value"].as_string(), std::string("33.0")); } } + + delete ds1; } //------------------------------------------------------------------------------ TEST(sidre_group, save_restore_empty_datastore) @@ -3603,7 +3605,7 @@ TEST(sidre_group, get_data_info) Group* gp_D = gp_C->createGroup("D"); num_groups_chk += 1; - View* view_D1 = gp_D->createView("ext_D1", INT_ID, 10, &extdata + 10); + View* view_D1 = gp_D->createView("ext_D1", INT_ID, 10, extdata + 10); num_views_chk += 1; num_views_external_chk += 1; num_bytes_external_chk += view_D1->getTotalBytes(); diff --git a/src/axom/sidre/tests/sidre_group_C.cpp b/src/axom/sidre/tests/sidre_group_C.cpp index abf138540d..d859a230e0 100644 --- a/src/axom/sidre/tests/sidre_group_C.cpp +++ b/src/axom/sidre/tests/sidre_group_C.cpp @@ -791,6 +791,8 @@ TEST(C_sidre_group, rename_group) success = SIDRE_Group_rename(child3, "g_b"); EXPECT_FALSE(success); EXPECT_TRUE(strcmp(SIDRE_Group_get_name(child3), "g_c") == 0); + + SIDRE_DataStore_delete(ds); } //------------------------------------------------------------------------------ @@ -850,8 +852,8 @@ TEST(C_sidre_group, save_restore_complex) EXPECT_NEAR(SIDRE_View_get_data_double(d0_view), 3000.0, 1e-12); SIDRE_DataStore_print(ds2); +#endif - SIDRE_DataStore_delete(ds); SIDRE_DataStore_delete(ds2); -#endif + SIDRE_DataStore_delete(ds); } diff --git a/src/axom/sidre/tests/sidre_opaque_C.cpp b/src/axom/sidre/tests/sidre_opaque_C.cpp index 260d7485bc..cbbf7b7a6a 100644 --- a/src/axom/sidre/tests/sidre_opaque_C.cpp +++ b/src/axom/sidre/tests/sidre_opaque_C.cpp @@ -137,6 +137,8 @@ TEST(C_sidre_opaque, basic_inout) int test_ihi2 = test_extent2->ihi; EXPECT_EQ(test_ihi2, 2 * ihi_val); + + AA_extent_delete(ext2); #endif // clean up... diff --git a/src/axom/sidre/tests/sidre_view.cpp b/src/axom/sidre/tests/sidre_view.cpp index 2e77f02d89..4ccd1202d2 100644 --- a/src/axom/sidre/tests/sidre_view.cpp +++ b/src/axom/sidre/tests/sidre_view.cpp @@ -1720,6 +1720,8 @@ TEST(sidre_view, import_array_node) v4->importArrayNode(n_ints); EXPECT_TRUE(v4->isString()); + + delete ds; } //------------------------------------------------------------------------------ @@ -1820,6 +1822,8 @@ TEST(sidre_view, clear_view) view->clear(); EXPECT_TRUE(checkViewValues(view, EMPTY, false, false, false, 0)); } + + delete ds; } //------------------------------------------------------------------------------ From 4dfd02af11289b42172555a6b0892232f3634ce0 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 5 Mar 2024 16:22:17 -0800 Subject: [PATCH 593/639] Fixes memory leaks in lumberjack tests --- src/axom/lumberjack/Message.cpp | 3 +-- src/axom/lumberjack/Message.hpp | 7 +++++-- .../lumberjack/tests/lumberjack_BinaryCommunicator.hpp | 7 +++++++ src/axom/lumberjack/tests/lumberjack_Message.hpp | 10 ++++++++++ .../lumberjack/tests/lumberjack_RootCommunicator.hpp | 7 +++++++ 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/axom/lumberjack/Message.cpp b/src/axom/lumberjack/Message.cpp index b23ec0788d..c553ef2aeb 100644 --- a/src/axom/lumberjack/Message.cpp +++ b/src/axom/lumberjack/Message.cpp @@ -278,8 +278,7 @@ const char* packMessages(const std::vector& messages) int totalSize = 1; // include size for null terminator - //Calculate total size of char array after all messages are - // combined. + //Calculate total size of char array after all messages are combined. std::vector packedMessages; std::vector sizeStrings; int currSize = 0; diff --git a/src/axom/lumberjack/Message.hpp b/src/axom/lumberjack/Message.hpp index 09f99a29ab..50ada6568f 100644 --- a/src/axom/lumberjack/Message.hpp +++ b/src/axom/lumberjack/Message.hpp @@ -315,8 +315,7 @@ class Message /*! ***************************************************************************** - * \brief This packs all given Message classes into one const char - * buffer. + * \brief This packs all given Message classes into one const char buffer * * The messages are packed into the following format: * [**]... @@ -325,6 +324,7 @@ class Message * \param [in] messages Message classes to be packed for sending * * \return Packed char array of all given messages + * \note It is the caller's responsibility to deallocate the returned buffer ***************************************************************************** */ const char* packMessages(const std::vector& messages); @@ -339,6 +339,9 @@ const char* packMessages(const std::vector& messages); * This function only adds to the messages vector and does not alter the * packagedMessages parameter. * + * \note It is the caller's responsibility to deallocate the Message added + * to the \a messages vector + * * \param [in,out] messages Vector to append created messages to * \param [in] packedMessages Packed messages to be unpacked * \param [in] ranksLimit Limits how many ranks are tracked per Message. diff --git a/src/axom/lumberjack/tests/lumberjack_BinaryCommunicator.hpp b/src/axom/lumberjack/tests/lumberjack_BinaryCommunicator.hpp index d96124b52f..86a59c7650 100644 --- a/src/axom/lumberjack/tests/lumberjack_BinaryCommunicator.hpp +++ b/src/axom/lumberjack/tests/lumberjack_BinaryCommunicator.hpp @@ -113,6 +113,13 @@ TEST(lumberjack_BinaryCommunicator, basic) c.finalize(); MPI_Barrier(MPI_COMM_WORLD); + + // cleanup allocated memory from received messages + for(auto& rm : receivedPackedMessages) + { + delete rm; + } + receivedPackedMessages.clear(); } TEST(lumberjack_BinaryCommunicator, pushNothing) diff --git a/src/axom/lumberjack/tests/lumberjack_Message.hpp b/src/axom/lumberjack/tests/lumberjack_Message.hpp index 793dc80d3a..f1ee3b0ac2 100644 --- a/src/axom/lumberjack/tests/lumberjack_Message.hpp +++ b/src/axom/lumberjack/tests/lumberjack_Message.hpp @@ -637,6 +637,8 @@ TEST(lumberjack_Message, packMessagesIndividually) EXPECT_EQ(packedMessage, answer); + // cleanup + delete packedMessage; delete m; messages.clear(); } @@ -664,6 +666,14 @@ TEST(lumberjack_Message, packMessages) answer = std::to_string((int)testData.size()) + "*" + answer; EXPECT_EQ(packedMessages, answer); + + // cleanup + delete packedMessages; + for(auto* _m : messages) + { + delete _m; + } + messages.clear(); } TEST(lumberjack_Message, unpackMessagesIndividually) diff --git a/src/axom/lumberjack/tests/lumberjack_RootCommunicator.hpp b/src/axom/lumberjack/tests/lumberjack_RootCommunicator.hpp index df1dd5d4a1..9d815a8f44 100644 --- a/src/axom/lumberjack/tests/lumberjack_RootCommunicator.hpp +++ b/src/axom/lumberjack/tests/lumberjack_RootCommunicator.hpp @@ -87,6 +87,13 @@ TEST(lumberjack_RootCommunicator, basic) c.finalize(); MPI_Barrier(MPI_COMM_WORLD); + + // cleanup allocated memory from received messages + for(auto& rm : receivedPackedMessages) + { + delete rm; + } + receivedPackedMessages.clear(); } TEST(lumberjack_RootCommunicator, pushNothing) From 7f80d7b10d8e551645e63f53f1945741a1f45f2a Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 5 Mar 2024 17:40:10 -0800 Subject: [PATCH 594/639] Fixes memory leaks in quest tests --- src/axom/quest/tests/quest_c2c_reader.cpp | 22 +++++++++++-------- .../quest/tests/quest_inout_interface.cpp | 4 +++- .../quest/tests/quest_point_in_cell_mfem.cpp | 6 ++--- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/axom/quest/tests/quest_c2c_reader.cpp b/src/axom/quest/tests/quest_c2c_reader.cpp index 236c3a5926..9ef156f504 100644 --- a/src/axom/quest/tests/quest_c2c_reader.cpp +++ b/src/axom/quest/tests/quest_c2c_reader.cpp @@ -101,7 +101,7 @@ void writeSpline(const std::string& filename) TEST(quest_c2c_reader, basic_read) { - std::string fileName = C2C_CIRCLE_FILENAME; + const std::string fileName = C2C_CIRCLE_FILENAME; writeSimpleCircle(fileName); quest::C2CReader reader; @@ -113,7 +113,7 @@ TEST(quest_c2c_reader, basic_read) TEST(quest_c2c_reader, interpolate_circle) { - std::string fileName = C2C_CIRCLE_FILENAME; + const std::string fileName = C2C_CIRCLE_FILENAME; writeSimpleCircle(fileName); quest::C2CReader reader; @@ -122,7 +122,7 @@ TEST(quest_c2c_reader, interpolate_circle) reader.read(); reader.log(); - const int DIM = 2; + constexpr int DIM = 2; using MeshType = mint::UnstructuredMesh; MeshType* mesh = new MeshType(DIM, mint::SEGMENT); @@ -158,7 +158,7 @@ TEST(quest_c2c_reader, interpolate_circle) TEST(quest_c2c_reader, interpolate_square) { - std::string fileName = C2C_SQUARE_FILENAME; + const std::string fileName = C2C_SQUARE_FILENAME; writeSquare(fileName); quest::C2CReader reader; @@ -167,11 +167,11 @@ TEST(quest_c2c_reader, interpolate_square) reader.read(); reader.log(); - const int DIM = 2; + constexpr int DIM = 2; using MeshType = mint::UnstructuredMesh; MeshType* mesh = new MeshType(DIM, mint::SEGMENT); - int segmentsPerKnotSpan = 10; + const int segmentsPerKnotSpan = 10; reader.getLinearMeshUniform(mesh, segmentsPerKnotSpan); SLIC_INFO(axom::fmt::format("Mesh has {} nodes and {} cells", @@ -188,11 +188,13 @@ TEST(quest_c2c_reader, interpolate_square) EXPECT_EQ(expSegs, mesh->getNumberOfCells()); mint::write_vtk(mesh, "test_square.vtk"); + + delete mesh; } TEST(quest_c2c_reader, interpolate_spline) { - std::string fileName = C2C_SPLINE_FILENAME; + const std::string fileName = C2C_SPLINE_FILENAME; writeSpline(fileName); quest::C2CReader reader; @@ -201,11 +203,11 @@ TEST(quest_c2c_reader, interpolate_spline) reader.read(); reader.log(); - const int DIM = 2; + constexpr int DIM = 2; using MeshType = mint::UnstructuredMesh; MeshType* mesh = new MeshType(DIM, mint::SEGMENT); - int segmentsPerKnotSpan = 20; + const int segmentsPerKnotSpan = 20; reader.getLinearMeshUniform(mesh, segmentsPerKnotSpan); SLIC_INFO(axom::fmt::format("Mesh has {} nodes and {} cells", @@ -220,6 +222,8 @@ TEST(quest_c2c_reader, interpolate_spline) EXPECT_EQ(expSegs, mesh->getNumberOfCells()); mint::write_vtk(mesh, "test_spline.vtk"); + + delete mesh; } //------------------------------------------------------------------------------ diff --git a/src/axom/quest/tests/quest_inout_interface.cpp b/src/axom/quest/tests/quest_inout_interface.cpp index a2095f11b1..25d3e337d8 100644 --- a/src/axom/quest/tests/quest_inout_interface.cpp +++ b/src/axom/quest/tests/quest_inout_interface.cpp @@ -137,7 +137,7 @@ TYPED_TEST(InOutInterfaceTest, initialize_from_mesh) EXPECT_TRUE(axom::utilities::filesystem::pathExists(this->meshfile)); - axom::mint::Mesh* mesh = nullptr; + axom::mint::Mesh* mesh {nullptr}; int rc = failCode; @@ -179,6 +179,8 @@ TYPED_TEST(InOutInterfaceTest, initialize_from_mesh) // InOut should no longer be initialized EXPECT_FALSE(axom::quest::inout_initialized()); + + delete mesh; } TYPED_TEST(InOutInterfaceTest, query_properties) diff --git a/src/axom/quest/tests/quest_point_in_cell_mfem.cpp b/src/axom/quest/tests/quest_point_in_cell_mfem.cpp index 28946fb15d..fff5f72c5a 100644 --- a/src/axom/quest/tests/quest_point_in_cell_mfem.cpp +++ b/src/axom/quest/tests/quest_point_in_cell_mfem.cpp @@ -1093,11 +1093,11 @@ TYPED_TEST(PointInCell2DTest, pic_flat_single_quad) // Add a bilinear gridfunction mfem::Mesh& mesh = *this->getMesh(); - mfem::FiniteElementCollection* fec = - mfem::FiniteElementCollection::New("Linear"); - mfem::FiniteElementSpace* fes = new mfem::FiniteElementSpace(&mesh, fec, 1); + auto* fec = mfem::FiniteElementCollection::New("Linear"); + auto* fes = new mfem::FiniteElementSpace(&mesh, fec, 1); mfem::GridFunction gf(fes); + gf.MakeOwner(fec); gf(0) = gf(2) = 1.; gf(1) = gf(3) = 0.; From 7a172c009c315d644984a61be165e01f211133d8 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 5 Mar 2024 17:40:50 -0800 Subject: [PATCH 595/639] Fixes memory leaks in slam lulesh example --- src/axom/slam/examples/lulesh2.0.3/lulesh-init.cpp | 8 ++++++++ src/axom/slam/examples/lulesh2.0.3/lulesh.hpp | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/axom/slam/examples/lulesh2.0.3/lulesh-init.cpp b/src/axom/slam/examples/lulesh2.0.3/lulesh-init.cpp index 0e964002a4..a130ec7f6b 100644 --- a/src/axom/slam/examples/lulesh2.0.3/lulesh-init.cpp +++ b/src/axom/slam/examples/lulesh2.0.3/lulesh-init.cpp @@ -208,6 +208,14 @@ namespace slamLulesh { } // End constructor +Domain::~Domain() +{ +#ifdef AXOM_USE_MPI + delete [] commDataSend; + delete [] commDataRecv; +#endif +} + //////////////////////////////////////////////////////////////////////////////// void Domain::BuildMesh(Int_t nx, Int_t edgeNodes, Int_t edgeElems) diff --git a/src/axom/slam/examples/lulesh2.0.3/lulesh.hpp b/src/axom/slam/examples/lulesh2.0.3/lulesh.hpp index 369b55031d..77c45757b5 100644 --- a/src/axom/slam/examples/lulesh2.0.3/lulesh.hpp +++ b/src/axom/slam/examples/lulesh2.0.3/lulesh.hpp @@ -205,6 +205,10 @@ namespace slamLulesh { Index_t rowLoc, Index_t planeLoc, Index_t nx, Int_t tp, Int_t nr, Int_t balance, Int_t cost); + + // Destructor + ~Domain(); + // // ALLOCATION // @@ -497,8 +501,8 @@ namespace slamLulesh { #ifdef AXOM_USE_MPI // Communication Work space - Real_t *commDataSend; - Real_t *commDataRecv; + Real_t *commDataSend {nullptr}; + Real_t *commDataRecv {nullptr}; // Maximum number of block neighbors MPI_Request recvRequest[26]; // 6 faces + 12 edges + 8 corners From 0621ca3bb9578811221b2e67a09d50c53ef241a0 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 5 Mar 2024 19:25:39 -0800 Subject: [PATCH 596/639] Fixes memory leak in slic Related to new `addStreamToAllTags` function when no tags have been registered. --- src/axom/slic/core/Logger.cpp | 50 +++++++++++++++++------------------ src/axom/slic/core/Logger.hpp | 10 +++++-- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/src/axom/slic/core/Logger.cpp b/src/axom/slic/core/Logger.cpp index 46f5b6408b..cf4c820993 100644 --- a/src/axom/slic/core/Logger.cpp +++ b/src/axom/slic/core/Logger.cpp @@ -4,13 +4,11 @@ // SPDX-License-Identifier: (BSD-3-Clause) #include "axom/slic/core/Logger.hpp" - #include "axom/slic/core/LogStream.hpp" - -#include "axom/core/utilities/Utilities.hpp" // for utilities::processAbort() +#include "axom/core/utilities/Utilities.hpp" // C/C++ includes -#include // for std::cout, std::cerr +#include namespace axom { @@ -64,17 +62,15 @@ Logger::Logger(const std::string& name) //------------------------------------------------------------------------------ Logger::~Logger() { - std::map::iterator it = m_streamObjectsManager.begin(); - for(; it != m_streamObjectsManager.end(); ++it) + for(auto& kv : m_streamObjectsManager) { - delete it->second; - } // END for all logStreams + delete kv.second; + } for(int level = message::Error; level < message::Num_Levels; ++level) { m_logStreams[level].clear(); - - } // END for all levels + } m_taggedStreams.clear(); } @@ -160,7 +156,6 @@ void Logger::addStreamToTag(LogStream* ls, { m_taggedStreams[tag] = std::vector {ls}; } - else { m_taggedStreams[tag].push_back(ls); @@ -173,7 +168,7 @@ void Logger::addStreamToTag(LogStream* ls, } //------------------------------------------------------------------------------ -void Logger::addStreamToAllMsgLevels(LogStream* ls) +void Logger::addStreamToAllMsgLevels(LogStream* ls, bool pass_ownership) { if(ls == nullptr) { @@ -183,13 +178,14 @@ void Logger::addStreamToAllMsgLevels(LogStream* ls) for(int level = message::Error; level < message::Num_Levels; ++level) { - this->addStreamToMsgLevel(ls, static_cast(level)); - - } // END for all levels + this->addStreamToMsgLevel(ls, + static_cast(level), + pass_ownership); + } } //------------------------------------------------------------------------------ -void Logger::addStreamToAllTags(LogStream* ls) +void Logger::addStreamToAllTags(LogStream* ls, bool pass_ownership) { if(ls == nullptr) { @@ -197,17 +193,20 @@ void Logger::addStreamToAllTags(LogStream* ls) return; } - if(ls == nullptr) + if(m_taggedStreams.empty()) { std::cerr << "WARNING: no tags are available!\n"; + if(pass_ownership) + { + m_streamObjectsManager[ls] = ls; + } + return; } - std::map>::iterator it; - - for(it = m_taggedStreams.begin(); it != m_taggedStreams.end(); it++) + for(auto& kv : m_taggedStreams) { - this->addStreamToTag(ls, it->first); + this->addStreamToTag(ls, kv.first, pass_ownership); } } @@ -525,16 +524,15 @@ bool Logger::activateLogger(const std::string& name) void Logger::finalize() { Loggermap& loggers = getLoggers(); - for(Loggermap::iterator it = loggers.begin(); it != loggers.end(); ++it) + for(auto& kv : loggers) { - it->second->flushStreams(); + kv.second->flushStreams(); } - for(Loggermap::iterator it = loggers.begin(); it != loggers.end(); ++it) + for(auto& kv : loggers) { - delete it->second; + delete kv.second; } - loggers.clear(); getLogger() = nullptr; diff --git a/src/axom/slic/core/Logger.hpp b/src/axom/slic/core/Logger.hpp index 15922b552e..fd52dc4e85 100644 --- a/src/axom/slic/core/Logger.hpp +++ b/src/axom/slic/core/Logger.hpp @@ -156,11 +156,14 @@ class Logger * \brief Binds the given stream to all the levels for this Logger instance. * * \param [in] ls pointer to the user-supplied LogStream object. + * \param [in] pass_ownership flag that indicates whether the given logger + * instance owns the supplied LogStream object. This parameter is optional. + * Default is true. * * \note The Logger takes ownership of the LogStream object. * \pre ls != NULL. */ - void addStreamToAllMsgLevels(LogStream* ls); + void addStreamToAllMsgLevels(LogStream* ls, bool pass_ownership = true); /*! * \brief Returns the number of streams at the given level. @@ -204,11 +207,14 @@ class Logger * \brief Binds the given stream to all the tags for this Logger instance. * * \param [in] ls pointer to the user-supplied LogStream object. + * \param [in] pass_ownership flag that indicates whether the given logger + * instance owns the supplied LogStream object. This parameter is optional. + * Default is true. * * \note The Logger takes ownership of the LogStream object. * \pre ls != NULL. */ - void addStreamToAllTags(LogStream* ls); + void addStreamToAllTags(LogStream* ls, bool pass_ownership = true); /*! * \brief Returns the number of streams for a given tag. From a5e98e64d18a0bb323f7e04b6d5e276c44ec9800 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 7 Mar 2024 14:37:26 -0800 Subject: [PATCH 597/639] Fixes memory leaks in MFEMSidreDataCollection and associated tests The MFEMSidreDataCollection has a flag for whether it owns the data associated with the mesh, e.g. the high order fields. If so, it deallocates them upon destruction. It's base class has a separate flag for whether it owns the mfem mesh (`own_data`). MFEMSidreDataCollection's constructor was not setting the latter, which lead to some memory leaks in cases where users expected the data collection to deallocate the mesh. This commit fixes the problem by setting `mfem::DataCollection::own_data` to the same value as `owns_mesh_data` in the constructor, and fixes tests where this was not the desired behavior. --- .../sidre/core/MFEMSidreDataCollection.cpp | 15 +- .../sidre/core/MFEMSidreDataCollection.hpp | 48 +++--- .../sidre_mfem_datacollection_restart.cpp | 3 +- .../sidre/tests/sidre_mfem_datacollection.cpp | 143 +++++++++++------- src/tools/data_collection_util.cpp | 2 +- 5 files changed, 121 insertions(+), 90 deletions(-) diff --git a/src/axom/sidre/core/MFEMSidreDataCollection.cpp b/src/axom/sidre/core/MFEMSidreDataCollection.cpp index 9fa110a6d3..3b5806bebe 100644 --- a/src/axom/sidre/core/MFEMSidreDataCollection.cpp +++ b/src/axom/sidre/core/MFEMSidreDataCollection.cpp @@ -89,8 +89,6 @@ MFEMSidreDataCollection::MFEMSidreDataCollection(const std::string& collection_n : mfem::DataCollection(collection_name, the_mesh) , m_owns_datastore(true) , m_owns_mesh_data(own_mesh_data) - , m_meshNodesGFName("mesh_nodes") - , m_num_files(-1) { m_datastore_ptr = new sidre::DataStore(); @@ -105,6 +103,8 @@ MFEMSidreDataCollection::MFEMSidreDataCollection(const std::string& collection_n m_named_bufs_grp = domain_grp->createGroup("named_buffers"); + this->own_data = own_mesh_data; + if(the_mesh) { MFEMSidreDataCollection::SetMesh(the_mesh); @@ -130,9 +130,6 @@ MFEMSidreDataCollection::MFEMSidreDataCollection(const std::string& collection_n : mfem::DataCollection(collection_name) , m_owns_datastore(false) , m_owns_mesh_data(own_mesh_data) - , m_meshNodesGFName("mesh_nodes") - , m_num_files(-1) - , m_datastore_ptr(nullptr) , m_bp_index_grp(bp_index_grp) { m_bp_grp = domain_grp->createGroup("blueprint"); @@ -142,6 +139,8 @@ MFEMSidreDataCollection::MFEMSidreDataCollection(const std::string& collection_n #if defined(AXOM_USE_MPI) && defined(MFEM_USE_MPI) m_comm = MPI_COMM_NULL; #endif + + this->own_data = false; } MFEMSidreDataCollection::~MFEMSidreDataCollection() @@ -843,8 +842,8 @@ void MFEMSidreDataCollection::SetMesh(Mesh* new_mesh) void MFEMSidreDataCollection::SetMesh(MPI_Comm comm, Mesh* new_mesh) { // use MFEMSidreDataCollection's custom SetMesh, then set MPI info - SetMesh(new_mesh); - SetComm(comm); + this->SetMesh(new_mesh); + this->SetComm(comm); } #endif @@ -2648,7 +2647,7 @@ void MFEMSidreDataCollection::reconstructField(Group* field_grp) { // FiniteElementSpace - mesh ptr and FEColl ptr #if defined(AXOM_USE_MPI) && defined(MFEM_USE_MPI) - auto parmesh = dynamic_cast(mesh); + auto* parmesh = dynamic_cast(mesh); if(parmesh) { m_fespaces[fespace_id] = std::unique_ptr( diff --git a/src/axom/sidre/core/MFEMSidreDataCollection.hpp b/src/axom/sidre/core/MFEMSidreDataCollection.hpp index 0af0338335..d90d8ca0e4 100644 --- a/src/axom/sidre/core/MFEMSidreDataCollection.hpp +++ b/src/axom/sidre/core/MFEMSidreDataCollection.hpp @@ -193,9 +193,11 @@ class MFEMSidreDataCollection : public mfem::DataCollection collection (can be nullptr) @param[in] owns_mesh_data Does the SidreDC own the mesh vertices? - With this constructor, the MFEMSidreDataCollection owns the allocated - Sidre - DataStore. + With this constructor, the MFEMSidreDataCollection owns the allocated Sidre DataStore. + + @note This constructor also sets \a own_data in the base \a mfem::DataCollection + class to the value of \a owns_mesh_data. If this is not desired, the former + can be reset by calling \a this->SetOwnData() */ explicit MFEMSidreDataCollection(const std::string& collection_name, mfem::Mesh* the_mesh = nullptr, @@ -212,10 +214,13 @@ class MFEMSidreDataCollection : public mfem::DataCollection see the above schematic @param[in] owns_mesh_data Does the SidreDC own the mesh vertices? - With this constructor, the MFEMSidreDataCollection does not own the Sidre - DataStore. + With this constructor, the MFEMSidreDataCollection does not own the Sidre DataStore. + @note No mesh or fields are read from the given Groups. The mesh has to be set with SetMesh() and fields registered with RegisterField(). + + @note This constructor also sets \a own_data in the base \a mfem::DataCollection class + to false. If this is not desired, the former can be reset by calling \a this->SetOwnData(true) */ MFEMSidreDataCollection(const std::string& collection_name, Group* bp_index_grp, @@ -528,29 +533,25 @@ class MFEMSidreDataCollection : public mfem::DataCollection private: // Used if the Sidre data collection is providing the datastore itself. - const bool m_owns_datastore; + const bool m_owns_datastore {false}; - // TODO - Need to evaluate if this bool member can be combined with own_data - // in parent data collection class. m_owns_mesh_data indicates whether the - // Sidre dc owns the mesh element data and node positions gf. The DC base - // class own_data indicates if the dc owns the mesh object pointer itself and - // GF objects. Can we use one flag and just have DC own all objects vs none? - const bool m_owns_mesh_data; + // Note: m_owns_mesh_data indicates whether the Sidre dc owns + // the mesh element data and node positions gf. The DC base class \a own_data + // indicates if the dc owns the mesh object pointer itself and GF objects. + const bool m_owns_mesh_data {false}; - // Name to be used for registering the mesh nodes in the - // MFEMSidreDataCollection. + // Name to be used for registering the mesh nodes in the MFEMSidreDataCollection. // This name is used by SetMesh() and can be overwritten by the method - // SetMeshNodesName(). - // Default value: "mesh_nodes". - std::string m_meshNodesGFName; + // SetMeshNodesName(). Default value: "mesh_nodes". + std::string m_meshNodesGFName {"mesh_nodes"}; // For Parallel IO, the user can specify a number of files less than or equal to the // number of processors. - int m_num_files; + int m_num_files {-1}; // If the data collection owns the datastore, it will store a pointer to it. // Otherwise, this pointer is nullptr. - DataStore* m_datastore_ptr; + DataStore* m_datastore_ptr {nullptr}; protected: Group* named_buffers_grp() const; @@ -567,11 +568,11 @@ class MFEMSidreDataCollection : public mfem::DataCollection private: // If the data collection does not own the datastore, it will need pointers // to the blueprint and blueprint index group to use. - Group* m_bp_grp; - Group* m_bp_index_grp; + Group* m_bp_grp {nullptr}; + Group* m_bp_index_grp {nullptr}; // This is stored for convenience. - Group* m_named_bufs_grp; + Group* m_named_bufs_grp {nullptr}; // Used to retain ownership of components of reconstructed Meshes and GridFuncs // Instead of using flags to keep track of ownership between this class @@ -719,9 +720,6 @@ class MFEMSidreDataCollection : public mfem::DataCollection /// blueprint index. void addMaterialSetToIndex(); - // /// Verifies that the contents of the mesh blueprint data is valid. - // void verifyMeshBlueprint(); - // The names for the mesh and boundary topologies in the blueprint group, // and the suffix used to store their attributes (as fields) static const std::string s_mesh_topology_name; diff --git a/src/axom/sidre/examples/sidre_mfem_datacollection_restart.cpp b/src/axom/sidre/examples/sidre_mfem_datacollection_restart.cpp index f34f04c40c..73e96d33a9 100644 --- a/src/axom/sidre/examples/sidre_mfem_datacollection_restart.cpp +++ b/src/axom/sidre/examples/sidre_mfem_datacollection_restart.cpp @@ -198,8 +198,7 @@ int main(int argc, char* argv[]) #endif // Initialize the datacollection - // Needs to be configured to own the mesh data so all mesh data is saved to datastore/output file - const bool owns_mesh_data = true; + const bool owns_mesh_data = false; axom::sidre::MFEMSidreDataCollection dc("sidre_mfem_datacoll_restart_ex", nullptr, owns_mesh_data); diff --git a/src/axom/sidre/tests/sidre_mfem_datacollection.cpp b/src/axom/sidre/tests/sidre_mfem_datacollection.cpp index e490944e17..d3bb3601f2 100644 --- a/src/axom/sidre/tests/sidre_mfem_datacollection.cpp +++ b/src/axom/sidre/tests/sidre_mfem_datacollection.cpp @@ -4,6 +4,7 @@ // SPDX-License-Identifier: (BSD-3-Clause) #include "axom/config.hpp" +#include "axom/core.hpp" #include "axom/slic.hpp" #include "axom/sidre.hpp" #include "axom/fmt.hpp" @@ -22,7 +23,7 @@ using axom::sidre::Group; using axom::sidre::MFEMSidreDataCollection; -const double EPSILON = 1.0e-6; +constexpr double EPSILON = 1.0e-6; std::string testName() { @@ -38,9 +39,9 @@ TEST(sidre_datacollection, dc_alloc_no_mesh) TEST(sidre_datacollection, dc_alloc_owning_mesh) { // 1D mesh divided into 10 segments - auto mesh = mfem::Mesh::MakeCartesian1D(10); - bool owns_mesh = true; - MFEMSidreDataCollection sdc(testName(), &mesh, owns_mesh); + auto* mesh = new mfem::Mesh(mfem::Mesh::MakeCartesian1D(10)); + const bool owns_mesh_data = true; + MFEMSidreDataCollection sdc(testName(), mesh, owns_mesh_data); EXPECT_TRUE(sdc.verifyMeshBlueprint()); } @@ -48,8 +49,8 @@ TEST(sidre_datacollection, dc_alloc_nonowning_mesh) { // 1D mesh divided into 10 segments auto mesh = mfem::Mesh::MakeCartesian1D(10); - bool owns_mesh = false; - MFEMSidreDataCollection sdc(testName(), &mesh, owns_mesh); + const bool owns_mesh_data = false; + MFEMSidreDataCollection sdc(testName(), &mesh, owns_mesh_data); EXPECT_TRUE(sdc.verifyMeshBlueprint()); } @@ -155,22 +156,24 @@ TEST(sidre_datacollection, dc_reload_gf) { const std::string field_name = "test_field"; // 2D mesh divided into triangles - auto mesh = mfem::Mesh::MakeCartesian2D(10, 10, mfem::Element::TRIANGLE); - mfem::H1_FECollection fec(1, mesh.Dimension()); - mfem::FiniteElementSpace fes(&mesh, &fec); + auto* mesh = + new mfem::Mesh(mfem::Mesh::MakeCartesian2D(10, 10, mfem::Element::TRIANGLE)); + auto* fec = new mfem::H1_FECollection(1, mesh->Dimension()); + auto* fes = new mfem::FiniteElementSpace(mesh, fec); // The mesh and field(s) must be owned by Sidre to properly manage data in case of // a simulated restart (save -> load) - bool owns_mesh = true; - MFEMSidreDataCollection sdc_writer(testName(), &mesh, owns_mesh); - mfem::GridFunction gf_write(&fes, nullptr); + const bool owns_mesh_data = true; + MFEMSidreDataCollection sdc_writer(testName(), mesh, owns_mesh_data); + auto* gf_write = new mfem::GridFunction(fes, nullptr); + gf_write->MakeOwner(fec); // Register to allocate storage internally, then write to it - sdc_writer.RegisterField(field_name, &gf_write); + sdc_writer.RegisterField(field_name, gf_write); EXPECT_TRUE(sdc_writer.HasField(field_name)); mfem::ConstantCoefficient three_and_a_half(3.5); - gf_write.ProjectCoefficient(three_and_a_half); + gf_write->ProjectCoefficient(three_and_a_half); EXPECT_TRUE(sdc_writer.verifyMeshBlueprint()); @@ -192,7 +195,7 @@ TEST(sidre_datacollection, dc_reload_gf) EXPECT_TRUE(sdc_reader.HasField(field_name)); // No need to reregister, it already exists - auto gf_read = sdc_reader.GetField(field_name); + auto* gf_read = sdc_reader.GetField(field_name); // Make sure the gridfunction was actually read in EXPECT_LT(gf_read->ComputeL2Error(three_and_a_half), EPSILON); @@ -211,8 +214,11 @@ TEST(sidre_datacollection, dc_reload_gf_vdim) // The mesh and field(s) must be owned by Sidre to properly manage data in case of // a simulated restart (save -> load) - bool owns_mesh = true; - MFEMSidreDataCollection sdc_writer(testName(), &mesh, owns_mesh); + const bool owns_mesh_data = true; + MFEMSidreDataCollection sdc_writer(testName(), &mesh, owns_mesh_data); + // the following prevents mfem::DataCollection from deleting the mesh and gfs + // see 'dc_reload_gf' test for a case where the DataCollection also owns the mesh and gf data + sdc_writer.SetOwnData(false); mfem::GridFunction gf_write(&fes, nullptr); // Register to allocate storage internally, then write to it @@ -260,8 +266,9 @@ TEST(sidre_datacollection, dc_reload_mesh) // The mesh and field(s) must be owned by Sidre to properly manage data in case of // a simulated restart (save -> load) - bool owns_mesh = true; - MFEMSidreDataCollection sdc_writer(testName(), &mesh, owns_mesh); + const bool owns_mesh_data = true; + MFEMSidreDataCollection sdc_writer(testName(), &mesh, owns_mesh_data); + sdc_writer.SetOwnData(false); #if defined(AXOM_USE_MPI) && defined(MFEM_USE_MPI) sdc_writer.SetComm(MPI_COMM_WORLD); #endif @@ -317,8 +324,9 @@ TEST(sidre_datacollection, dc_reload_qf) // The mesh and field(s) must be owned by Sidre to properly manage data in case of // a simulated restart (save -> load) - bool owns_mesh = true; - MFEMSidreDataCollection sdc_writer(testName(), &mesh, owns_mesh); + const bool owns_mesh_data = true; + MFEMSidreDataCollection sdc_writer(testName(), &mesh, owns_mesh_data); + sdc_writer.SetOwnData(false); #if defined(AXOM_USE_MPI) && defined(MFEM_USE_MPI) sdc_writer.SetComm(MPI_COMM_WORLD); #endif @@ -639,24 +647,49 @@ TEST(sidre_datacollection, create_material_dependent_field_multi_fraction) #if defined(AXOM_USE_MPI) && defined(MFEM_USE_MPI) -TEST(sidre_datacollection, dc_alloc_owning_parmesh) +TEST(sidre_datacollection, dc_alloc_parmesh) { - // 1D mesh divided into 10 segments - auto mesh = mfem::Mesh::MakeCartesian1D(10); - mfem::ParMesh parmesh(MPI_COMM_WORLD, mesh); - bool owns_mesh = true; - MFEMSidreDataCollection sdc(testName(), &parmesh, owns_mesh); - EXPECT_TRUE(sdc.verifyMeshBlueprint()); -} + // case 1: serial and parallel mesh are not pointers + { + constexpr bool owns_mesh_data = true; -TEST(sidre_datacollection, dc_alloc_nonowning_parmesh) -{ - // 1D mesh divided into 10 segments - auto mesh = mfem::Mesh::MakeCartesian1D(10); - mfem::ParMesh parmesh(MPI_COMM_WORLD, mesh); - bool owns_mesh = false; - MFEMSidreDataCollection sdc(testName(), &parmesh, owns_mesh); - EXPECT_TRUE(sdc.verifyMeshBlueprint()); + // 1D mesh divided into 10 segments + auto mesh = mfem::Mesh::MakeCartesian1D(10); + mfem::ParMesh parmesh(MPI_COMM_WORLD, mesh); + MFEMSidreDataCollection sdc(testName(), &parmesh, owns_mesh_data); + + // Must set this to avoid mfem's DataCollection from deleting the parmesh + sdc.SetOwnData(false); + + EXPECT_TRUE(sdc.verifyMeshBlueprint()); + } + + // case 2: serial and parallel meshes are pointers + // data collection owns and deletes parmesh + { + constexpr bool owns_mesh_data = true; + + // 1D mesh divided into 10 segments + auto* mesh = new mfem::Mesh(mfem::Mesh::MakeCartesian1D(10)); + auto* parmesh = new mfem::ParMesh(MPI_COMM_WORLD, *mesh); + delete mesh; + + MFEMSidreDataCollection sdc(testName(), parmesh, owns_mesh_data); + + EXPECT_TRUE(sdc.verifyMeshBlueprint()); + } + + // case 3: data collection doesn't own mesh/data + { + constexpr bool owns_mesh_data = false; + + // 1D mesh divided into 10 segments + auto mesh = mfem::Mesh::MakeCartesian1D(10); + mfem::ParMesh parmesh(MPI_COMM_WORLD, mesh); + + MFEMSidreDataCollection sdc(testName(), &parmesh, owns_mesh_data); + EXPECT_TRUE(sdc.verifyMeshBlueprint()); + } } struct ParMeshGroupData @@ -705,16 +738,13 @@ static std::vector getGroupData(const mfem::ParMesh& parmesh) static void testParallelMeshReload(mfem::Mesh& base_mesh, const int part_method = 1) { - mfem::ParMesh parmesh(MPI_COMM_WORLD, base_mesh, nullptr, part_method); - - // Use second-order elements to ensure that the nodal gridfunction gets set up properly as well - mfem::H1_FECollection fec(2, base_mesh.Dimension()); - mfem::ParFiniteElementSpace parfes(&parmesh, &fec); + auto* parmesh = + new mfem::ParMesh(MPI_COMM_WORLD, base_mesh, nullptr, part_method); // The mesh must be owned by Sidre to properly manage data in case of // a simulated restart (save -> load) - const bool owns_mesh = true; - MFEMSidreDataCollection sdc_writer(testName(), &parmesh, owns_mesh); + const bool owns_mesh_data = true; + MFEMSidreDataCollection sdc_writer(testName(), parmesh, owns_mesh_data); // Save some basic info about the mesh const int n_verts = sdc_writer.GetMesh()->GetNV(); @@ -731,6 +761,8 @@ static void testParallelMeshReload(mfem::Mesh& base_mesh, // Group-specific info auto writer_group_data = getGroupData(*writer_pmesh); + EXPECT_TRUE(sdc_writer.verifyMeshBlueprint()); + sdc_writer.SetCycle(0); sdc_writer.Save(); @@ -772,7 +804,7 @@ static void testParallelMeshReload(mfem::Mesh& base_mesh, static void testParallelMeshReloadAllPartitionings(mfem::Mesh& base_mesh) { // MFEM supports partition methods [0, 5] - static constexpr int MAX_PART_METHOD = 5; + constexpr int MAX_PART_METHOD = 5; for(int part_method = 0; part_method <= MAX_PART_METHOD; part_method++) { testParallelMeshReload(base_mesh, part_method); @@ -791,8 +823,9 @@ TEST(sidre_datacollection, dc_par_reload_gf) // The mesh must be owned by Sidre to properly manage data in case of // a simulated restart (save -> load) - bool owns_mesh = true; - MFEMSidreDataCollection sdc_writer(testName(), &parmesh, owns_mesh); + bool owns_mesh_data = true; + MFEMSidreDataCollection sdc_writer(testName(), &parmesh, owns_mesh_data); + sdc_writer.SetOwnData(false); // The mesh and field(s) must be owned by Sidre to properly manage data in case of // a simulated restart (save -> load) @@ -848,8 +881,9 @@ TEST(sidre_datacollection, dc_par_reload_gf_ordering) // The mesh must be owned by Sidre to properly manage data in case of // a simulated restart (save -> load) - bool owns_mesh = true; - MFEMSidreDataCollection sdc_writer(testName(), &parmesh, owns_mesh); + bool owns_mesh_data = true; + MFEMSidreDataCollection sdc_writer(testName(), &parmesh, owns_mesh_data); + sdc_writer.SetOwnData(false); // The mesh and field(s) must be owned by Sidre to properly manage data in case of // a simulated restart (save -> load) @@ -908,6 +942,7 @@ TEST(sidre_datacollection, dc_par_reload_multi_datastore) const std::string second_coll_name = testName() + "second"; const std::string field_name = "test_field"; const std::string useless_view_name = "useless_view"; + // 3D tet mesh auto mesh = mfem::Mesh::MakeCartesian3D(2, 2, 2, mfem::Element::TETRAHEDRON); mfem::ParMesh first_parmesh(MPI_COMM_WORLD, mesh); @@ -937,18 +972,18 @@ TEST(sidre_datacollection, dc_par_reload_multi_datastore) // The mesh must be owned by Sidre to properly manage data in case of // a simulated restart (save -> load) - bool owns_mesh = true; + bool owns_mesh_data = true; MFEMSidreDataCollection first_sdc_writer(first_coll_name, first_bp_index_grp, first_domain_grp, - owns_mesh); + owns_mesh_data); first_sdc_writer.SetComm(MPI_COMM_WORLD); first_sdc_writer.SetMesh(&first_parmesh); MFEMSidreDataCollection second_sdc_writer(second_coll_name, second_bp_index_grp, second_domain_grp, - owns_mesh); + owns_mesh_data); second_sdc_writer.SetComm(MPI_COMM_WORLD); second_sdc_writer.SetMesh(&second_parmesh); @@ -991,11 +1026,11 @@ TEST(sidre_datacollection, dc_par_reload_multi_datastore) MFEMSidreDataCollection first_sdc_reader(first_coll_name, first_bp_index_grp, first_domain_grp, - owns_mesh); + owns_mesh_data); MFEMSidreDataCollection second_sdc_reader(second_coll_name, second_bp_index_grp, second_domain_grp, - owns_mesh); + owns_mesh_data); // Needs to be set "manually" in order for everything to be loaded in properly first_sdc_reader.SetComm(MPI_COMM_WORLD); diff --git a/src/tools/data_collection_util.cpp b/src/tools/data_collection_util.cpp index 7e9716dfda..db4d877124 100644 --- a/src/tools/data_collection_util.cpp +++ b/src/tools/data_collection_util.cpp @@ -570,7 +570,7 @@ int main(int argc, char** argv) sidre::MFEMSidreDataCollection dc(params.dcName, nullptr, true); // Create or load the serial mfem mesh - mfem::Mesh* mesh = nullptr; + mfem::Mesh* mesh {nullptr}; switch(params.meshForm) { case MeshForm::Box: From 19f26f1e301896117fbe2fbbd36a05680a41005d Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 7 Mar 2024 14:42:04 -0800 Subject: [PATCH 598/639] Fixes memory leaks in spio tests and examples --- src/axom/sidre/tests/spio/spio_basic.hpp | 18 ++++++-------- src/axom/sidre/tests/spio/spio_main.cpp | 7 ++---- src/axom/sidre/tests/spio/spio_parallel.hpp | 13 ++++------ src/axom/sidre/tests/spio/spio_serial.hpp | 27 +++++++++------------ 4 files changed, 27 insertions(+), 38 deletions(-) diff --git a/src/axom/sidre/tests/spio/spio_basic.hpp b/src/axom/sidre/tests/spio/spio_basic.hpp index 0020172de6..161f13a426 100644 --- a/src/axom/sidre/tests/spio/spio_basic.hpp +++ b/src/axom/sidre/tests/spio/spio_basic.hpp @@ -7,6 +7,7 @@ #include "axom/sidre/spio/IOManager.hpp" #include "axom/sidre/spio/IOBaton.hpp" +#include "axom/fmt.hpp" #include "mpi.h" @@ -29,13 +30,12 @@ TEST(spio_basic, root_name) protocolMap["json"] = "json"; protocolMap["sidre_conduit_json"] = "conduit_json"; - using MapIt = std::map::const_iterator; - for(MapIt it = protocolMap.begin(); it != protocolMap.end(); ++it) + for(const auto& kv : protocolMap) { - const std::string& sidreProtocol = it->first; - const std::string& expRelayProtocol = it->second; + const std::string& sidreProtocol = kv.first; + const std::string& expRelayProtocol = kv.second; - std::string relayProtocol = + const std::string relayProtocol = IOManager::correspondingRelayProtocol(sidreProtocol); EXPECT_EQ(expRelayProtocol, relayProtocol); @@ -117,11 +117,9 @@ TEST(spio_basic, baton) // Test baton for different numbers of files for(int nFiles = 1; nFiles <= num_ranks; ++nFiles) { - std::stringstream sstr; - sstr << "Checking baton for " << nFiles << " files " - << " with " << num_ranks << " ranks"; - - SCOPED_TRACE(sstr.str()); + SCOPED_TRACE(axom::fmt::format("Checking baton for {} files with {} ranks", + nFiles, + num_ranks)); checkBaton(nFiles, num_ranks, my_rank); } } diff --git a/src/axom/sidre/tests/spio/spio_main.cpp b/src/axom/sidre/tests/spio/spio_main.cpp index 8f9bf1bed0..a3c7b57ca7 100644 --- a/src/axom/sidre/tests/spio/spio_main.cpp +++ b/src/axom/sidre/tests/spio/spio_main.cpp @@ -9,14 +9,11 @@ #include "axom/config.hpp" #include "axom/slic.hpp" +#include "axom/sidre.hpp" namespace { -#ifdef AXOM_USE_HDF5 -const std::string PROTOCOL = "sidre_hdf5"; -#else -const std::string PROTOCOL = "sidre_json"; -#endif +const std::string PROTOCOL = axom::sidre::Group::getDefaultIOProtocol(); const std::string ROOT_EXT = ".root"; } // namespace diff --git a/src/axom/sidre/tests/spio/spio_parallel.hpp b/src/axom/sidre/tests/spio/spio_parallel.hpp index d90f91eddc..974e7d5241 100644 --- a/src/axom/sidre/tests/spio/spio_parallel.hpp +++ b/src/axom/sidre/tests/spio/spio_parallel.hpp @@ -19,12 +19,10 @@ #include "gtest/gtest.h" // _parallel_io_headers_start -#include "axom/config.hpp" // for AXOM_USE_HDF5 +#include "axom/config.hpp" #include "conduit_blueprint.hpp" - #include "conduit_relay.hpp" - #ifdef AXOM_USE_HDF5 #include "conduit_relay_io_hdf5.hpp" #endif @@ -250,10 +248,7 @@ TEST(spio_parallel, write_read_write) MPI_Comm_size(MPI_COMM_WORLD, &num_ranks); const int num_files = numOutputFiles(num_ranks); - - std::stringstream sstr; - sstr << "out_spio_WRW_" << num_ranks; - std::string filename = sstr.str(); + const std::string filename = axom::fmt::format("out_spio_WRW_{}", num_ranks); // Initialize a datastore and dump to disk DataStore* ds = new DataStore(); @@ -280,6 +275,8 @@ TEST(spio_parallel, write_read_write) // minor: Unable to open file IOManager writer_b(MPI_COMM_WORLD); writer_b.write(ds_r.getRoot(), num_files, filename, PROTOCOL); + + delete ds; } //------------------------------------------------------------------------------ @@ -329,7 +326,7 @@ TEST(spio_parallel, external_writeread) /* * Contents of the DataStore written to files with IOManager. */ - int num_files = num_output; + const int num_files = num_output; IOManager writer(MPI_COMM_WORLD); const std::string file_name = "out_spio_external_write_read"; diff --git a/src/axom/sidre/tests/spio/spio_serial.hpp b/src/axom/sidre/tests/spio/spio_serial.hpp index 81ee8a6354..ccbb74d17b 100644 --- a/src/axom/sidre/tests/spio/spio_serial.hpp +++ b/src/axom/sidre/tests/spio/spio_serial.hpp @@ -5,9 +5,10 @@ #include "gtest/gtest.h" -#include "axom/config.hpp" // for AXOM_USE_HDF5 -#include "axom/core/Types.hpp" // for common::std::int64_t +#include "axom/config.hpp" #include "axom/sidre.hpp" +#include "axom/fmt.hpp" + #include #include "mpi.h" @@ -16,8 +17,6 @@ using axom::sidre::DataStore; using axom::sidre::Group; using axom::sidre::IOManager; -using std::int64_t; - //------------------------------------------------------------------------------ TEST(spio_serial, basic_writeread) @@ -36,7 +35,7 @@ TEST(spio_serial, basic_writeread) ga->createViewScalar("i0", 101); gb->createViewScalar("i1", 404); - int num_files = 1; + const int num_files = 1; IOManager writer(MPI_COMM_WORLD); const std::string file_name = "out_spio_basic_write_read"; @@ -83,12 +82,8 @@ TEST(spio_serial, basic_writeread_protocols) protocols.push_back("sidre_conduit_json"); protocols.push_back("sidre_json"); - for(std::list::const_iterator itr = protocols.begin(); - itr != protocols.end(); - ++itr) + for(const auto& protocol : protocols) { - const std::string& protocol = *itr; - DataStore* ds1 = new DataStore(); Group* root1 = ds1->getRoot(); @@ -103,7 +98,7 @@ TEST(spio_serial, basic_writeread_protocols) ga->createViewScalar("i0", 101); gb->createViewScalar("i1", 404); - int num_files = 1; + const int num_files = 1; IOManager writer(MPI_COMM_WORLD); const std::string file_name = "out_spio_basic_write_read" + protocol; @@ -144,10 +139,8 @@ TEST(spio_serial, write_read_write) MPI_Comm_rank(MPI_COMM_WORLD, &my_rank); MPI_Comm_size(MPI_COMM_WORLD, &num_ranks); - int num_files = std::max(num_ranks / 2, 1); - std::stringstream sstr; - sstr << "out_spio_WRW_" << num_ranks; - std::string filename = sstr.str(); + const int num_files = std::max(num_ranks / 2, 1); + const std::string filename = axom::fmt::format("out_spio_WRW_{}", num_ranks); // Initialize a datastore and dump to disk DataStore* ds = new DataStore(); @@ -174,6 +167,8 @@ TEST(spio_serial, write_read_write) // minor: Unable to open file IOManager writer_b(MPI_COMM_WORLD); writer_b.write(ds_r.getRoot(), num_files, filename, PROTOCOL); + + delete ds; } //------------------------------------------------------------------------------ @@ -221,5 +216,7 @@ TEST(spio_serial, rootfile_suffix) ds->getRoot()->getView("grp/i")->getData()); EXPECT_EQ(ds_suffix.getRoot()->getView("grp/i")->getData(), ds_nosuffix.getRoot()->getView("grp/i")->getData()); + + delete ds; } #endif // AXOM_USE_HDF5 From 727afc4380dd6e3deb4ccc522a6336f377dd74c9 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 7 Mar 2024 15:55:52 -0800 Subject: [PATCH 599/639] Fixes a memory leak on axom::Array with move assignment Thanks Max Yang for the suggestion Co-authored-by: Max Yang --- src/axom/core/Array.hpp | 1 + src/axom/primal/tests/primal_curved_polygon.cpp | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index 4b0269832c..3accf2081c 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -286,6 +286,7 @@ class Array : public ArrayBase> { if(this != &other) { + this->clear(); if(m_data != nullptr) { axom::deallocate(m_data); diff --git a/src/axom/primal/tests/primal_curved_polygon.cpp b/src/axom/primal/tests/primal_curved_polygon.cpp index 2a52a4b7be..46f23d88a9 100644 --- a/src/axom/primal/tests/primal_curved_polygon.cpp +++ b/src/axom/primal/tests/primal_curved_polygon.cpp @@ -81,8 +81,7 @@ primal::CurvedPolygon createPolygon( subCP[i] = ControlPoints[i + iter]; } - BezierCurveType addCurve(subCP, orders[j]); - bPolygon.addEdge(addCurve); + bPolygon.addEdge(BezierCurveType {subCP, orders[j]}); iter += (orders[j]); } @@ -101,7 +100,7 @@ TEST(primal_curvedpolygon, constructor) SLIC_INFO("Testing default CurvedPolygon constructor "); CurvedPolygonType bPolygon; - int expNumEdges = 0; + const int expNumEdges = 0; EXPECT_EQ(expNumEdges, bPolygon.numEdges()); EXPECT_EQ(expNumEdges, bPolygon.getEdges().size()); EXPECT_EQ(axom::Array(), bPolygon.getEdges()); @@ -111,7 +110,7 @@ TEST(primal_curvedpolygon, constructor) SLIC_INFO("Testing CurvedPolygon numEdges constructor "); CurvedPolygonType bPolygon(1); - int expNumEdges = 1; + const int expNumEdges = 1; EXPECT_EQ(expNumEdges, bPolygon.numEdges()); EXPECT_EQ(expNumEdges, static_cast(bPolygon.getEdges().size())); } From 8c1bbfe33a12a4f7ba1127fbf54f546de7b50635 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 7 Mar 2024 16:35:25 -0800 Subject: [PATCH 600/639] Fixes some additional memory leaks in unit tests --- src/axom/mint/tests/mint_fem_single_fe.cpp | 1 + .../tests/mint_mesh_connectivity_array.cpp | 1 + src/axom/spin/tests/spin_bvh.cpp | 20 ++++++++----------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/axom/mint/tests/mint_fem_single_fe.cpp b/src/axom/mint/tests/mint_fem_single_fe.cpp index a95854f2a9..ac7e76e2ee 100644 --- a/src/axom/mint/tests/mint_fem_single_fe.cpp +++ b/src/axom/mint/tests/mint_fem_single_fe.cpp @@ -802,6 +802,7 @@ void check_interp(double TOL = 1.e-9) // STEP 6: clean up delete fe; delete[] xc; + delete[] f; delete[] wgts; } diff --git a/src/axom/mint/tests/mint_mesh_connectivity_array.cpp b/src/axom/mint/tests/mint_mesh_connectivity_array.cpp index 19fddb174e..6d25ce5bfd 100644 --- a/src/axom/mint/tests/mint_mesh_connectivity_array.cpp +++ b/src/axom/mint/tests/mint_mesh_connectivity_array.cpp @@ -1399,6 +1399,7 @@ TEST(mint_connectivity_array, IndirectionExternalSet) /* Check that the external constructor functions properly. */ internal::checkExternalConstructor(ext_mixed); + delete[] initial_values; delete[] values; delete[] offsets; delete[] types; diff --git a/src/axom/spin/tests/spin_bvh.cpp b/src/axom/spin/tests/spin_bvh.cpp index d48f29d9bd..a998a7cd16 100644 --- a/src/axom/spin/tests/spin_bvh.cpp +++ b/src/axom/spin/tests/spin_bvh.cpp @@ -1173,9 +1173,9 @@ void check_find_points_zip3d() BoxType* aabbs = nullptr; generate_aabbs_and_centroids(&mesh, aabbs, centroids); - FloatType* xs = axom::allocate(ncells); - FloatType* ys = axom::allocate(ncells); - FloatType* zs = axom::allocate(ncells); + axom::Array xs(ncells, ncells); + axom::Array ys(ncells, ncells); + axom::Array zs(ncells, ncells); for(int icell = 0; icell < ncells; icell++) { @@ -1184,7 +1184,7 @@ void check_find_points_zip3d() zs[icell] = centroids[icell][2]; } - primal::ZipIndexable zip_test {{xs, ys, zs}}; + primal::ZipIndexable zip_test {{xs.data(), ys.data(), zs.data()}}; // construct the BVH spin::BVH bvh; @@ -1213,11 +1213,8 @@ void check_find_points_zip3d() const int donorCellIdx = ug.getBinIndex(q); EXPECT_EQ(counts[i], 1); EXPECT_EQ(donorCellIdx, candidates[offsets[i]]); - } // END for all cell centroids + } - axom::deallocate(xs); - axom::deallocate(ys); - axom::deallocate(zs); axom::deallocate(aabbs); axom::setDefaultAllocator(current_allocator); @@ -1265,9 +1262,8 @@ void check_find_points_zip2d() BoxType* aabbs = nullptr; generate_aabbs_and_centroids(&mesh, aabbs, centroids); - FloatType* xs = axom::allocate(ncells); - FloatType* ys = axom::allocate(ncells); - FloatType* zs = nullptr; + axom::Array xs(ncells, ncells); + axom::Array ys(ncells, ncells); for(int icell = 0; icell < ncells; icell++) { @@ -1275,7 +1271,7 @@ void check_find_points_zip2d() ys[icell] = centroids[icell][1]; } - primal::ZipIndexable zip_test {{xs, ys, zs}}; + primal::ZipIndexable zip_test {{xs.data(), ys.data(), nullptr}}; // construct the BVH spin::BVH bvh; From 669220ad4e55373879004a79a2796b144f5e7814 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 7 Mar 2024 16:36:20 -0800 Subject: [PATCH 601/639] Stop using namespace std in multimap --- src/axom/multimat/multimat.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/axom/multimat/multimat.cpp b/src/axom/multimat/multimat.cpp index 7ffdccf3a5..c51cdf9c50 100644 --- a/src/axom/multimat/multimat.cpp +++ b/src/axom/multimat/multimat.cpp @@ -27,7 +27,6 @@ #include "RAJA/RAJA.hpp" #endif -using namespace std; using namespace axom::multimat; namespace @@ -354,8 +353,9 @@ void MultiMat::setAllocatorID(int alloc_id) void MultiMat::setSlamAllocatorID(int alloc_id) { - bool hasCellDomRelation = hasValidStaticRelation(DataLayout::CELL_DOM); - bool hasMatDomRelation = hasValidStaticRelation(DataLayout::MAT_DOM); + const bool hasCellDomRelation = hasValidStaticRelation(DataLayout::CELL_DOM); + const bool hasMatDomRelation = hasValidStaticRelation(DataLayout::MAT_DOM); + m_slamAllocatorId = alloc_id; m_sets = axom::Array(m_sets, m_slamAllocatorId); @@ -365,6 +365,7 @@ void MultiMat::setSlamAllocatorID(int alloc_id) IndBufferType(m_cellMatRel_indicesVec, m_slamAllocatorId); m_cellMatRel_firstIndicesVec = IndBufferType(m_cellMatRel_firstIndicesVec, m_slamAllocatorId); + m_matCellRel_beginsVec = IndBufferType(m_matCellRel_beginsVec, m_slamAllocatorId); m_matCellRel_indicesVec = @@ -433,7 +434,7 @@ void MultiMat::setFieldAllocatorID(int alloc_id) } } -void MultiMat::setCellMatRel(const vector& vecarr, DataLayout layout) +void MultiMat::setCellMatRel(const std::vector& vecarr, DataLayout layout) { //Setup the SLAM cell to mat relation //This step is necessary if the volfrac field is sparse @@ -1802,7 +1803,7 @@ void MultiMat::print() const } sstr << "\n\n"; - cout << sstr.str() << endl; + std::cout << sstr.str() << std::endl; } bool MultiMat::isValid(bool verboseOutput) const From e4e6f3d4e13a024fd2abac5477a033631d1cea4f Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 7 Mar 2024 20:26:41 -0800 Subject: [PATCH 602/639] Fixes compilation error in spin_bvh test w/ msvc and nvcc compilers --- src/axom/spin/tests/spin_bvh.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/axom/spin/tests/spin_bvh.cpp b/src/axom/spin/tests/spin_bvh.cpp index a998a7cd16..d62de37cf7 100644 --- a/src/axom/spin/tests/spin_bvh.cpp +++ b/src/axom/spin/tests/spin_bvh.cpp @@ -1264,6 +1264,7 @@ void check_find_points_zip2d() axom::Array xs(ncells, ncells); axom::Array ys(ncells, ncells); + FloatType* zs {nullptr}; for(int icell = 0; icell < ncells; icell++) { @@ -1271,7 +1272,7 @@ void check_find_points_zip2d() ys[icell] = centroids[icell][1]; } - primal::ZipIndexable zip_test {{xs.data(), ys.data(), nullptr}}; + primal::ZipIndexable zip_test {{xs.data(), ys.data(), zs}}; // construct the BVH spin::BVH bvh; From eba4cfb1bc9f4944de3201a55fbc3a81c38118b1 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Fri, 8 Mar 2024 10:04:56 -0800 Subject: [PATCH 603/639] Fix a mix-up of row and column ordering. The errors canceled out, so no diff in performance. --- src/axom/quest/ArrayIndexer.hpp | 6 +-- src/axom/quest/detail/MarchingCubesImpl.hpp | 8 ++-- src/axom/quest/tests/quest_array_indexer.cpp | 48 ++++++++++---------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/axom/quest/ArrayIndexer.hpp b/src/axom/quest/ArrayIndexer.hpp index 95474c306e..fbd53e7681 100644 --- a/src/axom/quest/ArrayIndexer.hpp +++ b/src/axom/quest/ArrayIndexer.hpp @@ -123,7 +123,7 @@ class ArrayIndexer SLIC_ASSERT(arrayStrideOrder == ArrayStrideOrder::COLUMN || arrayStrideOrder == ArrayStrideOrder::ROW || (DIM == 1 && arrayStrideOrder == ArrayStrideOrder::BOTH)); - if(arrayStrideOrder == ArrayStrideOrder::ROW) + if(arrayStrideOrder == ArrayStrideOrder::COLUMN) { for(int d = 0; d < DIM; ++d) { @@ -319,8 +319,8 @@ class ArrayIndexer for(int d = 0; d < DIM - 1; ++d) { ord &= m_slowestDirs[d] < m_slowestDirs[d + 1] - ? int(ArrayStrideOrder::COLUMN) - : int(ArrayStrideOrder::ROW); + ? int(ArrayStrideOrder::ROW) + : int(ArrayStrideOrder::COLUMN); } static ArrayStrideOrder s_intToOrder[4] = {ArrayStrideOrder::ARBITRARY, ArrayStrideOrder::ROW, diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 24ea18c872..5582b3efec 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -192,7 +192,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase RAJA::RangeSegment iRange(0, m_bShape[0]); using EXEC_POL = typename axom::mint::internal::structured_exec::loop2d_policy; - if(int(order) & int(axom::ArrayStrideOrder::ROW)) + if(int(order) & int(axom::ArrayStrideOrder::COLUMN)) { RAJA::kernel( RAJA::make_tuple(iRange, jRange), @@ -209,7 +209,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase }); } #else - if(int(order) & int(axom::ArrayStrideOrder::ROW)) + if(int(order) & int(axom::ArrayStrideOrder::COLUMN)) { for(int j = 0; j < m_bShape[1]; ++j) { @@ -246,7 +246,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase RAJA::RangeSegment iRange(0, m_bShape[0]); using EXEC_POL = typename axom::mint::internal::structured_exec::loop3d_policy; - if(int(order) & int(axom::ArrayStrideOrder::ROW)) + if(int(order) & int(axom::ArrayStrideOrder::COLUMN)) { RAJA::kernel( RAJA::make_tuple(iRange, jRange, kRange), @@ -263,7 +263,7 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase }); } #else - if(int(order) & int(axom::ArrayStrideOrder::ROW)) + if(int(order) & int(axom::ArrayStrideOrder::COLUMN)) { for(int k = 0; k < m_bShape[2]; ++k) { diff --git a/src/axom/quest/tests/quest_array_indexer.cpp b/src/axom/quest/tests/quest_array_indexer.cpp index d4e1a72a40..a84430b68d 100644 --- a/src/axom/quest/tests/quest_array_indexer.cpp +++ b/src/axom/quest/tests/quest_array_indexer.cpp @@ -58,8 +58,8 @@ TEST(quest_array_indexer, quest_strides_and_permutations) lengths, axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(colIndexer.getStrideOrder(), axom::ArrayStrideOrder::COLUMN); - axom::StackArray colSlowestDirs {0, 1}; - axom::StackArray colStrides {2, 1}; + axom::StackArray colSlowestDirs {1, 0}; + axom::StackArray colStrides {1, 3}; for(int d = 0; d < DIM; ++d) { EXPECT_EQ(colIndexer.slowestDirs()[d], colSlowestDirs[d]); @@ -70,8 +70,8 @@ TEST(quest_array_indexer, quest_strides_and_permutations) lengths, axom::ArrayStrideOrder::ROW); EXPECT_EQ(rowIndexer.getStrideOrder(), axom::ArrayStrideOrder::ROW); - axom::StackArray rowSlowestDirs {1, 0}; - axom::StackArray rowStrides {1, 3}; + axom::StackArray rowSlowestDirs {0, 1}; + axom::StackArray rowStrides {2, 1}; for(int d = 0; d < DIM; ++d) { EXPECT_EQ(rowIndexer.slowestDirs()[d], rowSlowestDirs[d]); @@ -87,8 +87,8 @@ TEST(quest_array_indexer, quest_strides_and_permutations) lengths, axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(colIndexer.getStrideOrder(), axom::ArrayStrideOrder::COLUMN); - axom::StackArray colSlowestDirs {0, 1, 2}; - axom::StackArray colStrides {6, 2, 1}; + axom::StackArray colSlowestDirs {2, 1, 0}; + axom::StackArray colStrides {1, 5, 15}; for(int d = 0; d < DIM; ++d) { EXPECT_EQ(colIndexer.slowestDirs()[d], colSlowestDirs[d]); @@ -99,8 +99,8 @@ TEST(quest_array_indexer, quest_strides_and_permutations) lengths, axom::ArrayStrideOrder::ROW); EXPECT_EQ(rowIndexer.getStrideOrder(), axom::ArrayStrideOrder::ROW); - axom::StackArray rowSlowestDirs {2, 1, 0}; - axom::StackArray rowStrides {1, 5, 15}; + axom::StackArray rowSlowestDirs {0, 1, 2}; + axom::StackArray rowStrides {6, 2, 1}; for(int d = 0; d < DIM; ++d) { EXPECT_EQ(rowIndexer.slowestDirs()[d], rowSlowestDirs[d]); @@ -109,15 +109,15 @@ TEST(quest_array_indexer, quest_strides_and_permutations) } } -// Test column-major offsets. -TEST(quest_array_indexer, quest_col_major_offset) +// Test row-major offsets. +TEST(quest_array_indexer, quest_row_major_offset) { { // 1D constexpr int DIM = 1; axom::StackArray lengths {3}; axom::ArrayIndexer ai(lengths, - axom::ArrayStrideOrder::COLUMN); + axom::ArrayStrideOrder::ROW); EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::BOTH); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) @@ -133,8 +133,8 @@ TEST(quest_array_indexer, quest_col_major_offset) constexpr int DIM = 2; axom::StackArray lengths {3, 2}; axom::ArrayIndexer ai(lengths, - axom::ArrayStrideOrder::COLUMN); - EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::COLUMN); + axom::ArrayStrideOrder::ROW); + EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::ROW); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -151,8 +151,8 @@ TEST(quest_array_indexer, quest_col_major_offset) // 3D axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer ai(lengths, - axom::ArrayStrideOrder::COLUMN); - EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::COLUMN); + axom::ArrayStrideOrder::ROW); + EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::ROW); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) { @@ -170,15 +170,15 @@ TEST(quest_array_indexer, quest_col_major_offset) } } -// Test row-major offsets. -TEST(quest_array_indexer, quest_row_major_offset) +// Test column-major offsets. +TEST(quest_array_indexer, quest_col_major_offset) { { // 1D constexpr int DIM = 1; axom::StackArray lengths {3}; axom::ArrayIndexer ai(lengths, - axom::ArrayStrideOrder::ROW); + axom::ArrayStrideOrder::COLUMN); EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::BOTH); axom::IndexType offset = 0; for(int i = 0; i < lengths[0]; ++i) @@ -194,8 +194,8 @@ TEST(quest_array_indexer, quest_row_major_offset) constexpr int DIM = 2; axom::StackArray lengths {3, 2}; axom::ArrayIndexer ai(lengths, - axom::ArrayStrideOrder::ROW); - EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::ROW); + axom::ArrayStrideOrder::COLUMN); + EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::COLUMN); axom::IndexType offset = 0; for(int j = 0; j < lengths[1]; ++j) { @@ -213,8 +213,8 @@ TEST(quest_array_indexer, quest_row_major_offset) constexpr int DIM = 3; axom::StackArray lengths {5, 3, 2}; axom::ArrayIndexer ai(lengths, - axom::ArrayStrideOrder::ROW); - EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::ROW); + axom::ArrayStrideOrder::COLUMN); + EXPECT_EQ(ai.getStrideOrder(), axom::ArrayStrideOrder::COLUMN); axom::IndexType offset = 0; for(int k = 0; k < lengths[2]; ++k) { @@ -403,7 +403,7 @@ TEST(quest_array_indexer, quest_array_match) axom::StackArray lengths {3, 2}; axom::Array a(lengths); axom::ArrayIndexer ai(lengths, - axom::ArrayStrideOrder::COLUMN); + axom::ArrayStrideOrder::ROW); for(axom::IndexType i = 0; i < lengths[0]; ++i) { for(axom::IndexType j = 0; j < lengths[1]; ++j) @@ -418,7 +418,7 @@ TEST(quest_array_indexer, quest_array_match) axom::StackArray lengths {5, 3, 2}; axom::Array a(lengths); axom::ArrayIndexer ai(lengths, - axom::ArrayStrideOrder::COLUMN); + axom::ArrayStrideOrder::ROW); for(axom::IndexType i = 0; i < lengths[0]; ++i) { for(axom::IndexType j = 0; j < lengths[1]; ++j) From ae8e8c7a62cd2507ff8645d03d8b0010c6f7d54d Mon Sep 17 00:00:00 2001 From: Max Yang Date: Mon, 11 Mar 2024 12:55:39 -0700 Subject: [PATCH 604/639] Bufix: Default-initializing axom::Array elements before overwriting them --- src/axom/core/Array.hpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/axom/core/Array.hpp b/src/axom/core/Array.hpp index 3accf2081c..f54797edb3 100644 --- a/src/axom/core/Array.hpp +++ b/src/axom/core/Array.hpp @@ -257,12 +257,12 @@ class Array : public ArrayBase> { if(this != &other) { + this->clear(); static_cast>&>(*this) = other; m_allocator_id = other.m_allocator_id; m_resize_ratio = other.m_resize_ratio; - initialize(other.size(), other.capacity()); - // Use fill_range to ensure that copy constructors are invoked for each - // element. + setCapacity(other.capacity()); + // Use fill_range to ensure that copy constructors are invoked for each element MemorySpace srcSpace = SPACE; if(srcSpace == MemorySpace::Dynamic) { @@ -270,10 +270,11 @@ class Array : public ArrayBase> } OpHelper::fill_range(m_data, 0, - m_num_elements, + other.size(), m_allocator_id, other.data(), srcSpace); + updateNumElements(other.size()); } return *this; @@ -1474,15 +1475,15 @@ inline void Array::initialize_from_other( #endif m_allocator_id = axom::detail::getAllocatorID(); } - initialize(num_elements, num_elements); - // Use fill_range to ensure that copy constructors are invoked for each - // element. + this->setCapacity(num_elements); + // Use fill_range to ensure that copy constructors are invoked for each element OpHelper::fill_range(m_data, 0, - m_num_elements, + num_elements, m_allocator_id, other_data, other_data_space); + this->updateNumElements(num_elements); } //------------------------------------------------------------------------------ From 6e6dd1dce2e0e2011efa36914081cc0e44163e08 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Mon, 11 Mar 2024 14:38:05 -0700 Subject: [PATCH 605/639] Slight dox comment clarification. --- src/axom/quest/MarchingCubes.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index bd8b459aea..bc4c2db0ab 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -162,9 +162,9 @@ class MarchingCubes */ void computeIsocontour(double contourVal = 0.0); - //!@brief Get number of cells in the generated contour mesh. + //!@brief Get number of cells (facets) in the generated contour mesh. axom::IndexType getContourCellCount() const { return m_facetCount; } - //!@brief Get number of cells in the generated contour mesh. + //!@brief Get number of cells (facets) in the generated contour mesh. axom::IndexType getContourFacetCount() const { return m_facetCount; } //!@brief Get number of nodes in the generated contour mesh. From cb203ceb6b05e505d7f29b3d6e381aff388a4b90 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Mon, 11 Mar 2024 18:59:25 -0700 Subject: [PATCH 606/639] Adds equality operator to axom::Matrix --- src/axom/core/numerics/Matrix.hpp | 60 +++++++++++++++++-- src/axom/core/tests/numerics_matrix.hpp | 79 +++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 5 deletions(-) diff --git a/src/axom/core/numerics/Matrix.hpp b/src/axom/core/numerics/Matrix.hpp index 4b3b6253ca..f60f410564 100644 --- a/src/axom/core/numerics/Matrix.hpp +++ b/src/axom/core/numerics/Matrix.hpp @@ -4,15 +4,15 @@ // SPDX-License-Identifier: (BSD-3-Clause) #include "axom/config.hpp" -#include "axom/core/utilities/Utilities.hpp" // for utilities::swap() -#include "axom/core/memory_management.hpp" // for alloc(), free() +#include "axom/core/utilities/Utilities.hpp" +#include "axom/core/memory_management.hpp" #include "axom/fmt.hpp" // C/C++ includes -#include // for assert() -#include // for memcpy() -#include // for std::ostream +#include +#include +#include #ifndef AXOM_MATRIX_HPP_ #define AXOM_MATRIX_HPP_ @@ -39,6 +39,25 @@ class Matrix; template std::ostream& operator<<(std::ostream& os, const Matrix& A); +/*! + * \brief Checks if two matrices are component-wise equal + * + * \param [in] lhs first matrix + * \param [in] rhs second matrix + * \return status true if lhs==rhs, otherwise, false. + */ +template +bool operator==(const Matrix& lhs, const Matrix& rhs); + +/*! + * \brief Checks if two matrices are not component-wise equal + * + * \param [in] lhs first matrix + * \param [in] rhs second matrix + * \return status true if lhs!=rhs, otherwise, false. + */ +template +bool operator!=(const Matrix& lhs, const Matrix& rhs); /// @} /// \name Matrix Operators @@ -949,6 +968,37 @@ AXOM_HOST_DEVICE void Matrix::clear() // FREE METHODS //----------------------------------------------------------------------------- +template +bool operator==(const Matrix& lhs, const Matrix& rhs) +{ + const int R = lhs.getNumRows(); + const int C = lhs.getNumColumns(); + + if(R != rhs.getNumRows() || C != rhs.getNumColumns()) + { + return false; + } + + using axom::utilities::isNearlyEqual; + constexpr double EPS = 1e-12; + + for(int i = 0; i < R * C; ++i) + { + if(!isNearlyEqual(lhs.data()[i], rhs.data()[i], EPS)) + { + return false; + } + } + + return true; +} + +template +bool operator!=(const Matrix& lhs, const Matrix& rhs) +{ + return !(lhs == rhs); +} + //----------------------------------------------------------------------------- template Matrix lower_triangular(const Matrix& A, bool unit_diagonal) diff --git a/src/axom/core/tests/numerics_matrix.hpp b/src/axom/core/tests/numerics_matrix.hpp index a4292eb433..6e646e8c9c 100644 --- a/src/axom/core/tests/numerics_matrix.hpp +++ b/src/axom/core/tests/numerics_matrix.hpp @@ -246,6 +246,85 @@ TEST(numerics_matrix, is_square) EXPECT_TRUE(A.isSquare()); } +//------------------------------------------------------------------------------ +TEST(numerics_matrix, equality) +{ + using Mtx = axom::numerics::Matrix; + constexpr double val = 2.2; + + { + Mtx a, b; + EXPECT_EQ(a, b); + EXPECT_EQ(b, a); + } + + { + Mtx a, b(5, 7); + EXPECT_NE(a, b); + + EXPECT_NE(b, a); + } + + { + Mtx a(5, 7, val), b(5, 7, val); + EXPECT_EQ(a, b); + EXPECT_EQ(b, a); + + a(3, 4) = 1; + EXPECT_NE(a, b); + EXPECT_NE(b, a); + } + + { + Mtx a = Mtx::identity(3); + Mtx b = Mtx::identity(4); + EXPECT_NE(a, b); + EXPECT_NE(b, a); + } + + { + Mtx a = Mtx::identity(3); + Mtx b = Mtx::identity(3); + EXPECT_EQ(a, b); + EXPECT_EQ(b, a); + } + + { + Mtx a = Mtx::zeros(3, 3); + Mtx b = Mtx::ones(3, 3); + EXPECT_NE(a, b); + EXPECT_NE(b, a); + } + + { + Mtx a = Mtx::identity(3); + Mtx b = Mtx::zeros(3, 3); + b(0, 0) = 1.; + b(1, 1) = 1.; + b(2, 2) = 1.; + + EXPECT_EQ(a, b); + EXPECT_EQ(b, a); + } + + { + Mtx a(7, 5); + Mtx b(5, 7); + EXPECT_NE(a, b); + EXPECT_NE(b, a); + + a(3, 4) = val; + b(4, 3) = val; + EXPECT_NE(a, b); + EXPECT_NE(b, a); + + Mtx a_tr(5, 7); + axom::numerics::matrix_transpose(a, a_tr); + EXPECT_EQ(a_tr, b); + EXPECT_EQ(b, a_tr); + } +} + //------------------------------------------------------------------------------ TEST(numerics_matrix, random_access_operators) { From 278be0953ad94a14e68f9476b4c822d5bc2e72d1 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Mon, 11 Mar 2024 20:36:45 -0700 Subject: [PATCH 607/639] Fixes compilation error with KleeMatchers in gcc@10.3.1 lsan build --- src/axom/klee/tests/KleeMatchers.hpp | 48 +++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/src/axom/klee/tests/KleeMatchers.hpp b/src/axom/klee/tests/KleeMatchers.hpp index e37745d0db..c25de3bfd0 100644 --- a/src/axom/klee/tests/KleeMatchers.hpp +++ b/src/axom/klee/tests/KleeMatchers.hpp @@ -61,13 +61,24 @@ class AlmostEqMatrixMatcher void DescribeTo(std::ostream*) const { } void DescribeNegationTo(std::ostream*) const { } + friend bool operator==(const AlmostEqMatrixMatcher& lhs, + const axom::numerics::Matrix& rhs) + { + return lhs.MatchAndExplain(rhs, nullptr); + } + + friend bool operator==(const axom::numerics::Matrix& lhs, + const AlmostEqMatrixMatcher& rhs) + { + return rhs == lhs; + } + private: const axom::numerics::Matrix m_mat; }; template -inline ::testing::Matcher&> AlmostEqMatrix( - const axom::numerics::Matrix& mat) +inline auto AlmostEqMatrix(const axom::numerics::Matrix& mat) { return AlmostEqMatrixMatcher(mat); } @@ -99,20 +110,30 @@ class AlmostEqArrMatcher void DescribeTo(std::ostream*) const { } void DescribeNegationTo(std::ostream*) const { } + friend bool operator==(const AlmostEqArrMatcher& lhs, const T& rhs) + { + return lhs.MatchAndExplain(rhs, nullptr); + } + + friend bool operator==(const T& lhs, const AlmostEqArrMatcher& rhs) + { + return rhs == lhs; + } + + explicit operator const T() const { return m_arr; } + private: const T m_arr; }; template -inline ::testing::Matcher&> AlmostEqVector( - const primal::Vector& vec) +inline auto AlmostEqVector(const primal::Vector& vec) { return AlmostEqArrMatcher>(vec); } template -inline ::testing::Matcher&> AlmostEqPoint( - const primal::Point& pt) +inline auto AlmostEqPoint(const primal::Point& pt) { return AlmostEqArrMatcher>(pt); } @@ -142,12 +163,23 @@ class AlmostEqSliceMatcher void DescribeTo(std::ostream*) const { } void DescribeNegationTo(std::ostream*) const { } + friend bool operator==(const AlmostEqSliceMatcher& lhs, + const klee::SliceOperator& rhs) + { + return lhs.MatchAndExplain(rhs, nullptr); + } + + friend bool operator==(const klee::SliceOperator& lhs, + const AlmostEqSliceMatcher& rhs) + { + return rhs == lhs; + } + private: const klee::SliceOperator m_slice; }; -inline ::testing::Matcher AlmostEqSlice( - const klee::SliceOperator& slice) +inline auto AlmostEqSlice(const klee::SliceOperator& slice) { return AlmostEqSliceMatcher(slice); } From aff1ba9da4d94a7e80beb4ebd0efa562780f595b Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Tue, 12 Mar 2024 09:32:05 -0700 Subject: [PATCH 608/639] Silence warning about shadow variable. --- src/axom/quest/MeshViewUtil.hpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/axom/quest/MeshViewUtil.hpp b/src/axom/quest/MeshViewUtil.hpp index af6f02ebf8..7c3098c6e5 100644 --- a/src/axom/quest/MeshViewUtil.hpp +++ b/src/axom/quest/MeshViewUtil.hpp @@ -541,14 +541,7 @@ class MeshViewUtil } } - MdIndices offsets = conduitIndicesToStackArray(fieldNode, "offsets"); - if(!fieldNode.has_child("offsets")) - { - for(int d = 0; d < DIM; ++d) - { - offsets[d] = 0; - } - } + MdIndices offsets = conduitIndicesToStackArray(fieldNode, "offsets", 0); MdIndices loPads, hiPads, paddedShape, strideOrder; axom::quest::internal::stridesAndOffsetsToShapes(realShape, @@ -565,7 +558,6 @@ class MeshViewUtil if(withGhosts == false) { - MdIndices offsets = conduitIndicesToStackArray(fieldNode, "offsets", 0); auto rval1 = rval; rval = rval1.subspan(offsets, realShape); } From c20a91c0b7d307e3283941e30c14ac18e9783780 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 12 Mar 2024 10:08:10 -0700 Subject: [PATCH 609/639] restore 8 mpi tasks --- src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt b/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt index 9ef9b6fd3f..ec5b092071 100644 --- a/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt +++ b/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt @@ -46,7 +46,7 @@ if(AXOM_ENABLE_TESTS) axom_add_test(NAME slam_lulesh COMMAND slam_lulesh_ex - NUM_MPI_TASKS 4 + NUM_MPI_TASKS 8 NUM_OMP_THREADS 2 ) else() axom_add_test(NAME slam_lulesh From 5d6fccd812c66118c1a8f4773ac1474ce41826b1 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 12 Mar 2024 10:54:08 -0700 Subject: [PATCH 610/639] Fixes some warnings from gcc@10.3.1 --- src/axom/inlet/VariantKey.hpp | 2 +- src/axom/mint/examples/user_guide/mint_getting_started.cpp | 4 ++-- src/axom/mint/execution/internal/for_all_cells.hpp | 6 ++++++ src/axom/quest/interface/internal/QuestHelpers.hpp | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/axom/inlet/VariantKey.hpp b/src/axom/inlet/VariantKey.hpp index 7b5320a666..adf6314c2b 100644 --- a/src/axom/inlet/VariantKey.hpp +++ b/src/axom/inlet/VariantKey.hpp @@ -126,7 +126,7 @@ class VariantKey // Integer and string keys // With only two possible types a union is overkill - int m_int; + int m_int {}; std::string m_string; // Active key type diff --git a/src/axom/mint/examples/user_guide/mint_getting_started.cpp b/src/axom/mint/examples/user_guide/mint_getting_started.cpp index 2f6b593356..6a3603dba8 100644 --- a/src/axom/mint/examples/user_guide/mint_getting_started.cpp +++ b/src/axom/mint/examples/user_guide/mint_getting_started.cpp @@ -195,7 +195,7 @@ mint::Mesh* getUniformMesh() const double lo[] = {-5.0, -5.0}; const double hi[] = {5.0, 5.0}; mint::Mesh* m = new mint::UniformMesh(lo, hi, Arguments.res, Arguments.res); - return (m); + return m; } // sphinx_tutorial_walkthrough_construct_umesh_end @@ -278,7 +278,7 @@ mint::Mesh* getUnstructuredMesh() delete umesh; umesh = nullptr; - return (m); + return m; } // sphinx_tutorial_basic_example_end diff --git a/src/axom/mint/execution/internal/for_all_cells.hpp b/src/axom/mint/execution/internal/for_all_cells.hpp index da0df50032..6eef970aea 100644 --- a/src/axom/mint/execution/internal/for_all_cells.hpp +++ b/src/axom/mint/execution/internal/for_all_cells.hpp @@ -187,6 +187,9 @@ inline void for_all_cells_impl(xargs::nodeids, const IndexType nodeKp = m.nodeKp(); const StackArray& offsets = m.getCellNodeOffsetsArray(); + // Note: gcc@10.3.1 emits a '-Warray-bounds' warning in callers of this function + // about the sizes of nodeIds and coords not matching due to the runtime switch on dimension + if(dimension == 1) { for_all_cells_impl( @@ -453,6 +456,9 @@ inline void for_all_cells_impl(xargs::coords, const double z0 = origin[2]; const double dz = spacing[2]; + // Note: gcc@10.3.1 emits a '-Warray-bounds' warning in callers of this function + // about the sizes of nodeIds and coords not matching due to the runtime switch on dimension + if(dimension == 1) { for_all_cells_impl( diff --git a/src/axom/quest/interface/internal/QuestHelpers.hpp b/src/axom/quest/interface/internal/QuestHelpers.hpp index 73455f4ab9..12e6411abe 100644 --- a/src/axom/quest/interface/internal/QuestHelpers.hpp +++ b/src/axom/quest/interface/internal/QuestHelpers.hpp @@ -57,7 +57,7 @@ class ScopedLogLevelChanger } private: - slic::message::Level m_previousLevel; + slic::message::Level m_previousLevel {slic::message::Level::Debug}; }; /// \name MPI Helper/Wrapper Methods From 2f0c7e5f39c74ebae1afb0fa444739d9c558d656 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 12 Mar 2024 11:18:51 -0700 Subject: [PATCH 611/639] try 1 omp thread --- src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt b/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt index ec5b092071..ad9b2d6ecb 100644 --- a/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt +++ b/src/axom/slam/examples/lulesh2.0.3/CMakeLists.txt @@ -47,7 +47,7 @@ if(AXOM_ENABLE_TESTS) axom_add_test(NAME slam_lulesh COMMAND slam_lulesh_ex NUM_MPI_TASKS 8 - NUM_OMP_THREADS 2 ) + NUM_OMP_THREADS 1 ) else() axom_add_test(NAME slam_lulesh COMMAND slam_lulesh_ex From 3e9b1de92f153b68a7ddc6d00fa3eba57ba0012a Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 12 Mar 2024 14:08:07 -0700 Subject: [PATCH 612/639] Fixes memory leak in quest's SamplingShaper --- src/axom/quest/SamplingShaper.hpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/axom/quest/SamplingShaper.hpp b/src/axom/quest/SamplingShaper.hpp index 5ccf0337ef..215c05ad7c 100644 --- a/src/axom/quest/SamplingShaper.hpp +++ b/src/axom/quest/SamplingShaper.hpp @@ -320,6 +320,18 @@ class SamplingShaper : public Shaper : Shaper(shapeSet, dc) { } + ~SamplingShaper() + { + m_inoutShapeQFuncs.DeleteData(true); + m_inoutShapeQFuncs.clear(); + + m_inoutMaterialQFuncs.DeleteData(true); + m_inoutMaterialQFuncs.clear(); + + m_inoutDofs.DeleteData(true); + m_inoutDofs.clear(); + } + //@{ //! @name Functions to get and set shaping parameters related to sampling; supplements parameters in base class From 7a40f4d1dc379b5785140408e53df0597ac36bf2 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 12 Mar 2024 15:20:23 -0700 Subject: [PATCH 613/639] Fixes memory leak in axom::Map unit tests --- src/axom/core/tests/core_map.hpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/axom/core/tests/core_map.hpp b/src/axom/core/tests/core_map.hpp index 255b08f058..22bbf1eb41 100644 --- a/src/axom/core/tests/core_map.hpp +++ b/src/axom/core/tests/core_map.hpp @@ -396,7 +396,11 @@ TEST(core_map, bucket_return_value) EXPECT_EQ(0, bucket.get_size()); EXPECT_EQ(length, bucket.get_capacity()); + + // Note: Bucket's not intended to be used on its own; explicitly free the memory + axom::deallocate(bucket.m_list); } + { const int length = 5; auto fn = [](Key i) { return i * i; }; @@ -411,6 +415,9 @@ TEST(core_map, bucket_return_value) EXPECT_EQ(i, node.key); EXPECT_EQ(fn(i), node.value); } + + // Note: Bucket's not intended to be used on its own; explicitly free the memory + axom::deallocate(bucket.m_list); } { @@ -427,6 +434,9 @@ TEST(core_map, bucket_return_value) EXPECT_EQ(i, node.key); EXPECT_EQ(fn(i), node.value); } + + // Note: Bucket's not intended to be used on its own; explicitly free the memory + axom::deallocate(bucket.m_list); } } @@ -468,4 +478,4 @@ TEST(core_map, hashmap_return_value) } } } -} \ No newline at end of file +} From 8e244c758a67ffedc73b06ed78a3d30879510a4b Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 12 Mar 2024 20:44:49 -0700 Subject: [PATCH 614/639] Adds a memory leak regression test case for axom::Array --- src/axom/core/tests/core_array.hpp | 100 +++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/src/axom/core/tests/core_array.hpp b/src/axom/core/tests/core_array.hpp index 35b7a525d7..af59a54541 100644 --- a/src/axom/core/tests/core_array.hpp +++ b/src/axom/core/tests/core_array.hpp @@ -2359,3 +2359,103 @@ TEST(core_array, reserve_nontrivial_reloc_um) } } #endif + +// Regression test for a memory leak in axom::Array's copy/move/initialization +template +auto make_arr_data(int SZ1, int SZ2) + -> std::pair>, axom::Array>> +{ + using Arr1 = axom::Array>; + using Arr2 = axom::Array>; + + T1 val1 {}; + T2 val2 {}; + + Arr1 arr1(SZ1, 2 * SZ1); + for(int i = 0; i < SZ1; ++i) + { + arr1[i].resize(i + 10); + arr1[i].shrink(); + arr1[i].push_back(val1); + } + + Arr2 arr2(SZ2, 2 * SZ2); + for(int i = 0; i < SZ2; ++i) + { + arr2[i].resize(i + 10); + arr2[i].shrink(); + arr2[i].push_back(val2); + } + arr2.shrink(); + + return {std::move(arr1), std::move(arr2)}; +} + +TEST(core_array, regression_array_move) +{ + using T1 = int; + using Arr1 = axom::Array>; + + using T2 = NonTriviallyRelocatable; + using Arr2 = axom::Array>; + + using PArrArr = std::pair; + + constexpr int SZ1 = 20; + constexpr int SZ2 = 30; + + { + PArrArr pr; + pr = make_arr_data(SZ1, SZ2); + + EXPECT_EQ(SZ1, pr.first.size()); + EXPECT_EQ(2 * SZ1, pr.first.capacity()); + + EXPECT_EQ(SZ2, pr.second.size()); + EXPECT_EQ(SZ2, pr.second.capacity()); + } + + { + auto pr = make_arr_data(SZ1, SZ2); + + EXPECT_EQ(SZ1, pr.first.size()); + EXPECT_EQ(2 * SZ1, pr.first.capacity()); + + EXPECT_EQ(SZ2, pr.second.size()); + EXPECT_EQ(SZ2, pr.second.capacity()); + } + + { + auto pr = make_arr_data(SZ1, SZ2); + EXPECT_EQ(SZ1, pr.first.size()); + EXPECT_EQ(2 * SZ1, pr.first.capacity()); + EXPECT_EQ(SZ2, pr.second.size()); + EXPECT_EQ(SZ2, pr.second.capacity()); + + pr = make_arr_data(SZ2, SZ1); + EXPECT_EQ(SZ2, pr.first.size()); + EXPECT_EQ(2 * SZ2, pr.first.capacity()); + EXPECT_EQ(SZ1, pr.second.size()); + EXPECT_EQ(SZ1, pr.second.capacity()); + } + + // lots of copy and move assignments and constructions + { + auto pr = make_arr_data(SZ1, SZ2); + pr = make_arr_data(5, 7); + + auto pr2 = std::move(pr); + auto pr3 = pr2; + + pr2 = make_arr_data(13, 17); + + auto pr4 {make_arr_data(33, 44)}; + + auto pr5(std::move(pr4)); + + EXPECT_EQ(33, pr5.first.size()); + EXPECT_EQ(66, pr5.first.capacity()); + EXPECT_EQ(44, pr5.second.size()); + EXPECT_EQ(44, pr5.second.capacity()); + } +} \ No newline at end of file From a61b8b734d0e2fc5c6baa5a5f5b2c74986cd8c82 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Tue, 12 Mar 2024 20:45:51 -0700 Subject: [PATCH 615/639] Updates RELEASE-NOTES --- RELEASE-NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index e11aaefd22..7c1f825ebc 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -66,6 +66,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - Fixed a bug when loading Sidre groups with attributes that already exist - Fixed `std::locale` error when when compiling `src/axom/core/utilities/System.cpp` using nvcc - Include `cstdint` for higher gcc version support (e.g. gcc-13) +- Fixed several memory leaks in `axom::Array`, `quest::Shaping` and `sidre::MFEMSidreDataCollection` ## [Version 0.8.1] - Release date 2023-08-16 From 2a57e127a96cf72a86a0cedef3f66963d43437a4 Mon Sep 17 00:00:00 2001 From: Arlie Capps <48997041+agcapps@users.noreply.github.com> Date: Wed, 13 Mar 2024 16:15:39 -0700 Subject: [PATCH 616/639] Add ability to subset ProE tet mesh reading Fixes #1210 . Adds the ability to read in a subset of a ProE mesh. The user supplies a lambda function to accept or reject tetrahedra. The PR also adds convenience functions to build a lambda from a user-specified bounding box. --- RELEASE-NOTES.md | 3 + src/axom/quest/docs/sphinx/read_mesh.rst | 64 +++- src/axom/quest/examples/CMakeLists.txt | 9 + src/axom/quest/examples/quest_proe_bbox.cpp | 167 ++++++++++ src/axom/quest/readers/ProEReader.cpp | 62 +++- src/axom/quest/readers/ProEReader.hpp | 67 ++++ src/axom/quest/tests/quest_pro_e_reader.cpp | 298 +++++++++++++++++- .../tests/quest_pro_e_reader_parallel.cpp | 146 ++++++++- 8 files changed, 801 insertions(+), 15 deletions(-) create mode 100644 src/axom/quest/examples/quest_proe_bbox.cpp diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 7c1f825ebc..87f6828417 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -34,6 +34,9 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - Adds initial support for using Slic streams with tags - Adds an example that finds intersection candidate pairs between two Silo hexahedral meshes using either a BVH or Implicit Grid spatial index +- Quest: Adds `setTetPredFromBoundingBox()` and `setTetPred()` functions to + `quest::ProEReader` and `PProEReader` that set a tet predicate, allowing + user code to read in a subset of a Pro/E ASCII tetrahedron mesh file. ### Changed - `DistributedClosestPoint` outputs are now controlled by the `setOutput` method. diff --git a/src/axom/quest/docs/sphinx/read_mesh.rst b/src/axom/quest/docs/sphinx/read_mesh.rst index ed68be9a80..58a6abea3a 100644 --- a/src/axom/quest/docs/sphinx/read_mesh.rst +++ b/src/axom/quest/docs/sphinx/read_mesh.rst @@ -13,10 +13,17 @@ Applications commonly need to read a mesh file from disk. Quest provides the ``STLReader`` class, which can read binary or ASCII `STL`_ files, as well as the ``PSTLReader`` class for use in parallel codes. STL (stereolithography) is a common file format for triangle surface meshes. The STL reader classes -will read the file from disk and build a ``mint::Mesh`` object. +will read the file from disk and build a ``mint::Mesh`` object. Quest also +provides the ``ProEReader`` class, for ASCII Pro/E files containing tetrahedra, +and the ``PProEReader`` class for use in parallel codes. PTC Creo is a modeling +application formerly known as Pro/ENGINEER, and its file format is in use among +Axom's users. .. _STL: https://en.wikipedia.org/wiki/STL_(file_format) +Reading an STL file +------------------- + The code examples are excerpts from the file ``/src/tools/mesh_tester.cpp``. We include the STL reader header @@ -50,3 +57,58 @@ The following example shows usage of the STLReader class: After reading the STL file, the ``STLReader::getMesh`` method gives access to the underlying mesh data. The reader may then be deleted. +Reading a Pro/E file +-------------------- + +As read by Axom, an ASCII Pro/E tet file contains: + +- Zero or more comment lines starting with a ``#`` character +- One line with two integers: the number of nodes ``n`` and the number of + tetrahedra ``t`` +- ``n`` lines, one for each node; each line contains a contiguous integer ID + starting at 1 and three floating-point numbers specifying the node location +- ``t`` lines, one for each tetrahedron; each line contains a contiguous + integer ID starting at 1 and four integers specifying the tet's nodes + +Reading an ASCII Pro/E tet file is similar to reading an STL file. The code +examples are excerpts from the file ``/src/axom/quest/examples/quest_proe_bbox.cpp``. +The Pro/E reader has the ability to read a subset of the mesh in the file, +defined by a user-supplied predicate function. The example code shows how +to use a convenience function to specify a predicate that keeps only tets +fully included in a user-supplied bounding box. + +We include the ProEReader header + +.. literalinclude:: ../../examples/quest_proe_bbox.cpp + :start-after: _read_proe_include1_start + :end-before: _read_proe_include1_end + :language: C++ + +and also the mint Mesh and UnstructuredMesh headers. + +.. literalinclude:: ../../examples/quest_proe_bbox.cpp + :start-after: _read_proe_include2_start + :end-before: _read_proe_include2_end + :language: C++ + +For convenience, we specify some type aliases. + +.. literalinclude:: ../../examples/quest_proe_bbox.cpp + :start-after: _read_proe_typealiases_start + :end-before: _read_proe_typealiases_end + :language: C++ + +The following example shows how to use the ProEReader class. +Calling ``reader.setTetPredFromBoundingBox(bbox, false)``, as shown in the +code, makes a tetrahedron predicate that accepts tets with all four nodes +falling in ``bbox`` and rejects others. Alternately, the user can specify +an arbitrary predicate function with ``setTetPred()``. If the user specifies +no tetrahedron predicate, the reader reads all tets in the file. + +.. literalinclude:: ../../examples/quest_proe_bbox.cpp + :start-after: _read_proe_file_start + :end-before: _read_proe_file_end + :language: C++ + +After reading the Pro/E file, the ``ProEReader::getMesh`` method gives access +to the underlying mesh data. The reader may then be deleted. diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index 4b680d9b3d..eba431531f 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -33,6 +33,15 @@ if (RAJA_FOUND AND UMPIRE_FOUND) ) endif() +# Read ProE example ----------------------------------------------------------- +axom_add_executable( + NAME quest_proe_bbox_ex + SOURCES quest_proe_bbox.cpp + OUTPUT_DIR ${EXAMPLE_OUTPUT_DIRECTORY} + DEPENDS_ON ${quest_example_depends} + FOLDER axom/quest/examples + ) + # BVH silo example ------------------------------------------------------------ if (CONDUIT_FOUND AND RAJA_FOUND AND UMPIRE_FOUND) axom_add_executable( diff --git a/src/axom/quest/examples/quest_proe_bbox.cpp b/src/axom/quest/examples/quest_proe_bbox.cpp new file mode 100644 index 0000000000..6d24f24d30 --- /dev/null +++ b/src/axom/quest/examples/quest_proe_bbox.cpp @@ -0,0 +1,167 @@ +// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// other Axom Project Developers. See the top-level LICENSE file for details. +// +// SPDX-License-Identifier: (BSD-3-Clause) + +/*! \file quest_proe_bbox.cpp + * \brief This example code demonstrates how to read a subset of a ProE (Creo) + * text-format tetrahedron mesh using a bounding box. It reads a file + * specified with the -f argument and writes the mesh contained therein + * into a file specified with the -o argument. + */ + +// Axom includes +#include "axom/config.hpp" +#include "axom/core.hpp" +#include "axom/slic.hpp" + +#include "axom/CLI11.hpp" +#include "axom/fmt.hpp" + +// _read_proe_include2_start +#include "axom/mint/mesh/Mesh.hpp" +#include "axom/mint/mesh/UnstructuredMesh.hpp" +#include "axom/mint/utils/vtk_utils.hpp" // for write_vtk +// _read_proe_include2_end + +// _read_proe_include1_start +#include "axom/quest/readers/ProEReader.hpp" +// _read_proe_include1_end + +// _read_proe_typealiases_start +namespace mint = axom::mint; +namespace primal = axom::primal; +namespace slic = axom::slic; + +using IndexType = axom::IndexType; +using UMesh = mint::UnstructuredMesh; +// _read_proe_typealiases_end + +//------------------------------------------------------------------------------ +void initialize_logger() +{ + // initialize logger + slic::initialize(); + slic::setLoggingMsgLevel(slic::message::Info); + + // setup the logstreams + std::string fmt = ""; + slic::LogStream* logStream = nullptr; + + fmt = "[]: \n"; + logStream = new slic::GenericOutputStream(&std::cout, fmt); + + // register stream objects with the logger + slic::addStreamToAllMsgLevels(logStream); +} + +//------------------------------------------------------------------------------ +void finalize_logger() +{ + slic::flushStreams(); + slic::finalize(); +} + +struct Arguments +{ + std::string file_name; + std::string outfile_name; + std::vector bbox_min; + std::vector bbox_max; + + Arguments() + { + bbox_min.resize(3); + bbox_max.resize(3); + } + + void parse(int argc, char** argv, axom::CLI::App& app) + { + app + .add_option("-i,--input", this->file_name, "specifies the input mesh file") + ->check(axom::CLI::ExistingFile) + ->required(); + + app + .add_option("-o,--outfile", + this->outfile_name, + "specifies the output mesh file") + ->required(); + + app + .add_option("--min", + this->bbox_min, + "specifies the minimum of the bounding box") + ->expected(3) + ->required(); + + app + .add_option("--max", + this->bbox_max, + "specifies the maximum of the bounding box") + ->expected(3) + ->required(); + + app.get_formatter()->column_width(40); + + // could throw an exception + app.parse(argc, argv); + + slic::flushStreams(); + } +}; + +int main(int argc, char** argv) +{ + initialize_logger(); + Arguments args; + axom::CLI::App app {"Example showing how to read a Pro/E mesh"}; + + try + { + args.parse(argc, argv, app); + } + catch(const axom::CLI::ParseError& e) + { + int retval = -1; + retval = app.exit(e); + finalize_logger(); + return retval; + } + + // The constructor of args resizes bbox_min and bbox_max to three elements. + double* bbox_min = args.bbox_min.data(); + double* bbox_max = args.bbox_max.data(); + + SLIC_INFO("Reading file: '" << args.file_name << "'...\n"); + // _read_proe_file_start + // Read file + axom::quest::ProEReader reader; + reader.setFileName(args.file_name); + + // Set up a bounding box to keep only certain tets. + // bbox_min and bbox_max are pointers to double. + axom::quest::ProEReader::BBox3D bbox; + bbox.addPoint(axom::quest::ProEReader::Point3D {bbox_min, 3}); + bbox.addPoint(axom::quest::ProEReader::Point3D {bbox_max, 3}); + // Keep only tets with all four nodes inside the bounding box. + reader.setTetPredFromBoundingBox(bbox, false); + // Pass true as the second argument of setTetPredFromBoundingBox() to + // keep tets with at least one node inside the bounding box. + // To keep all tets, do not set a TetPred. + + // Read in the file. + reader.read(); + + // Get surface mesh + UMesh mesh(3, axom::mint::TET); + reader.getMesh(&mesh); + // _read_proe_file_end + + SLIC_INFO("Mesh has " << mesh.getNumberOfNodes() << " vertices and " + << mesh.getNumberOfCells() << " triangles."); + + axom::mint::write_vtk(&mesh, args.outfile_name); + + finalize_logger(); +} diff --git a/src/axom/quest/readers/ProEReader.cpp b/src/axom/quest/readers/ProEReader.cpp index 190f47d297..644381f777 100644 --- a/src/axom/quest/readers/ProEReader.cpp +++ b/src/axom/quest/readers/ProEReader.cpp @@ -9,6 +9,7 @@ #include "axom/core/utilities/Utilities.hpp" #include "axom/mint/mesh/CellTypes.hpp" #include "axom/slic/interface/slic.hpp" +#include "axom/primal/geometry/Point.hpp" // C/C++ includes #include @@ -38,9 +39,6 @@ void ProEReader::clear() //------------------------------------------------------------------------------ int ProEReader::read() { - constexpr int NUM_NODES_PER_TET = 4; - constexpr int NUM_COMPS_PER_NODE = 3; - std::string junk; int id; int tet_nodes[NUM_NODES_PER_TET]; @@ -69,7 +67,6 @@ int ProEReader::read() ifs >> m_num_nodes >> m_num_tets; m_nodes.reserve(m_num_nodes * NUM_COMPS_PER_NODE); - m_tets.reserve(m_num_tets * NUM_NODES_PER_TET); // Initialize nodes for(int i = 0; i < m_num_nodes; i++) @@ -83,21 +80,72 @@ int ProEReader::read() } // Initialize tets + int tet_count = 0; for(int i = 0; i < m_num_tets; i++) { ifs >> id >> tet_nodes[0] >> tet_nodes[1] >> tet_nodes[2] >> tet_nodes[3]; - for(int j = 0; j < NUM_NODES_PER_TET; j++) + if(!m_tetPredicate || m_tetPredicate(tet_nodes, i, m_nodes)) { - // Node IDs start at 1 instead of 0, adjust to 0 for indexing - m_tets.push_back(tet_nodes[j] - 1); + tet_count += 1; + for(int j = 0; j < NUM_NODES_PER_TET; j++) + { + // Node IDs start at 1 instead of 0, adjust to 0 for indexing + m_tets.push_back(tet_nodes[j] - 1); + } } } ifs.close(); + + compact_arrays(tet_count); + return (0); } +//------------------------------------------------------------------------------ +void ProEReader::setTetPredFromBoundingBox(BBox3D& box, bool inclusive) +{ + if(box.isValid()) + { + if(!inclusive) + { + auto pred = [box](int tet_nodes[4], int, std::vector& nodes) { + bool retval = true; + for(int i = 0; i < ProEReader::NUM_NODES_PER_TET; ++i) + { + // Node IDs start at 1 instead of 0, adjust to 0 for indexing + Point3D p(&nodes[3 * (tet_nodes[i] - 1)], 3); + retval = retval && box.contains(p); + } + return retval; + }; + setTetPred(pred); + } + else + { + auto pred = [box](int tet_nodes[4], int, std::vector& nodes) { + bool retval = false; + for(int i = 0; i < ProEReader::NUM_NODES_PER_TET; ++i) + { + // Node IDs start at 1 instead of 0, adjust to 0 for indexing + Point3D p(&nodes[3 * (tet_nodes[i] - 1)], 3); + retval = retval || box.contains(p); + } + return retval; + }; + setTetPred(pred); + } + } +} + +//------------------------------------------------------------------------------ +void ProEReader::compact_arrays(int elt_count) +{ + m_tets.resize(elt_count * NUM_NODES_PER_TET); + m_num_tets = elt_count; +} + //------------------------------------------------------------------------------ void ProEReader::getMesh(axom::mint::UnstructuredMesh* mesh) { diff --git a/src/axom/quest/readers/ProEReader.hpp b/src/axom/quest/readers/ProEReader.hpp index d12743f59a..27b00a1c2a 100644 --- a/src/axom/quest/readers/ProEReader.hpp +++ b/src/axom/quest/readers/ProEReader.hpp @@ -10,6 +10,7 @@ #include "axom/config.hpp" #include "axom/core/Macros.hpp" #include "axom/mint/mesh/UnstructuredMesh.hpp" +#include "axom/primal/geometry/BoundingBox.hpp" // C/C++ includes #include // for std::string @@ -27,11 +28,44 @@ namespace quest * * Pro/Engineer (also known as Creo) is a modeling application. * + * To read an ASCII Pro/E tet file, + * - instantiate a ProEReader, + * - set the file name, + * - optionally set a tetrahedron predicate to specify a subset of the mesh, + * - call \a read(), + * - optionally, query the number of nodes or tets, + * - retrieve the mesh with \a getMesh(). + * + * The tetrahedron predicate is optional. If none is specified using + * either \a setTetPredFromBoundingBox or \a setTetPred, the reader + * retains all tets. In any case, the reader retains all nodes in the + * Pro/E file, even those not referenced by any tets. + * + * The tetrahedron predicate is intended to save memory by retaining tets + * for which the predicate returns true and discarding all others. A code + * can use the convenience function \a setTetPredFromBoundingBox() to + * discard all tets outside a bounding box, or specify an arbitrary + * function (\a TetPred) for more complicated decisions. + * * \note Pro/E node IDs start at 1. ProEReader adjusts and stores * node IDs to start at 0 for indexing. */ class ProEReader { +public: + constexpr static int NUM_NODES_PER_TET = 4; + constexpr static int NUM_COMPS_PER_NODE = 3; + using Point3D = primal::Point; + using BBox3D = primal::BoundingBox; + /*! \brief Specify tets to keep. + * + * - First argument: Pro/E node IDs for the current tet (1-based) + * - Second argument: Pro/E tet ID for the current tet (1-based) + * - Third argument: The node locations, stored interleaved + * (x1, y1, z1, x2, y2, z2, ... ) + */ + using TetPred = std::function&)>; + public: /*! * \brief Constructor. @@ -73,6 +107,28 @@ class ProEReader */ virtual int read(); + /// \name Set tetrahedron predicate to read mesh subset + /// @{ + /*! + * The reader calls the \a TetPred \a p after reading each tet, + * retaining tets where p returns true and discarding the rest. + * If a TetPred is not set, the reader retains all tets. + */ + virtual void setTetPred(const TetPred& p) { m_tetPredicate = p; } + + /*! + * Convenience function to set a \a TetPred from a bounding box. + * + * \param box The TetPred will be defined in terms of the provided + * bounding box. If the box is invalid, no TetPred is constructed + * and all tets are retained. + * \param inclusive If true (the default), the TetPred will keep all tets + * with at least one node in the box. If false, the TetPred will + * discard any tet with at least one node outside the box. + */ + virtual void setTetPredFromBoundingBox(BBox3D& box, bool inclusive = true); + /// @} + /*! * \brief Stores the Pro/E data in the supplied unstructured mesh object. * \param [in,out] mesh pointer to the unstructured mesh. @@ -89,6 +145,17 @@ class ProEReader std::vector m_nodes; std::vector m_tets; + TetPred m_tetPredicate; + + /*! + * \brief Compact internal mesh storage arrays + * \param [in] elt_count Number of elements stored in array + * + * This method compacts the vertex array and resizes the vertex and the + * element arrays to their minimum sizes. + */ + void compact_arrays(int elt_count); + private: DISABLE_COPY_AND_ASSIGNMENT(ProEReader); DISABLE_MOVE_AND_ASSIGNMENT(ProEReader); diff --git a/src/axom/quest/tests/quest_pro_e_reader.cpp b/src/axom/quest/tests/quest_pro_e_reader.cpp index 10ab54f82b..52f21f00d9 100644 --- a/src/axom/quest/tests/quest_pro_e_reader.cpp +++ b/src/axom/quest/tests/quest_pro_e_reader.cpp @@ -141,7 +141,231 @@ TEST(quest_pro_e_reader, read_pro_e) std::numeric_limits::epsilon()); } // END for all nodes - // STEP 4: remove temporary Pro?E file + // STEP 4: remove temporary Pro/E file + axom::utilities::filesystem::removeFile(filename); +} + +//------------------------------------------------------------------------------ +TEST(quest_pro_e_reader, read_pro_e_invbbox) +{ + const double x_expected[] = {-1.0, 1.0, 0.0, 0.0}; + const double y_expected[] = {0.0, 0.0, 1.0, 0.0}; + const double z_expected[] = {0.0, 0.0, 0.0, 1.0}; + + const std::string filename = "tet.proe"; + + // STEP 0: generate a temporary Pro/E file for testing + generate_pro_e_file(filename); + + // STEP 1: create an Pro/E reader and read-in the mesh data + axom::quest::ProEReader reader; + // invalid bounding box is the same as no bounding box: keep everything + axom::quest::ProEReader::BBox3D invbbox; + reader.setTetPredFromBoundingBox(invbbox, false); + reader.setFileName(filename); + int status = reader.read(); + EXPECT_EQ(status, 0); + + // STEP 2: reading the Pro/E mesh data into a axom::mint::Mesh + axom::mint::UnstructuredMesh mesh(3, axom::mint::TET); + reader.getMesh(&mesh); + + // STEP 3: ensure the mesh is what is expected + EXPECT_EQ(mesh.getNumberOfCells(), 1); + EXPECT_EQ(mesh.getNumberOfNodes(), 4); + + const double* x = mesh.getCoordinateArray(axom::mint::X_COORDINATE); + const double* y = mesh.getCoordinateArray(axom::mint::Y_COORDINATE); + const double* z = mesh.getCoordinateArray(axom::mint::Z_COORDINATE); + EXPECT_TRUE(x != nullptr); + EXPECT_TRUE(y != nullptr); + EXPECT_TRUE(z != nullptr); + + axom::IndexType numNodes = mesh.getNumberOfNodes(); + for(axom::IndexType inode = 0; inode < numNodes; ++inode) + { + EXPECT_NEAR(x[inode], + x_expected[inode], + std::numeric_limits::epsilon()); + EXPECT_NEAR(y[inode], + y_expected[inode], + std::numeric_limits::epsilon()); + EXPECT_NEAR(z[inode], + z_expected[inode], + std::numeric_limits::epsilon()); + } // END for all nodes + + // STEP 4: remove temporary Pro/E file + axom::utilities::filesystem::removeFile(filename); +} + +//------------------------------------------------------------------------------ +TEST(quest_pro_e_reader, read_pro_e_bbox_all) +{ + const double x_expected[] = {-1.0, 1.0, 0.0, 0.0}; + const double y_expected[] = {0.0, 0.0, 1.0, 0.0}; + const double z_expected[] = {0.0, 0.0, 0.0, 1.0}; + + const std::string filename = "tet.proe"; + + // STEP 0: generate a temporary Pro/E file for testing + generate_pro_e_file(filename); + + // STEP 1: create an Pro/E reader and read-in the mesh data + axom::quest::ProEReader reader; + // A bounding box that catches all the points + axom::quest::ProEReader::BBox3D bbox; + bbox.addPoint(axom::quest::ProEReader::Point3D {-1.5, -0.5, -0.5}); + bbox.addPoint(axom::quest::ProEReader::Point3D {1.5, 1.5, 1.5}); + reader.setTetPredFromBoundingBox(bbox, false); + reader.setFileName(filename); + int status = reader.read(); + EXPECT_EQ(status, 0); + + // STEP 2: reading the Pro/E mesh data into a axom::mint::Mesh + axom::mint::UnstructuredMesh mesh(3, axom::mint::TET); + reader.getMesh(&mesh); + + // STEP 3: ensure the mesh is what is expected + EXPECT_EQ(mesh.getNumberOfCells(), 1); + EXPECT_EQ(mesh.getNumberOfNodes(), 4); + + const double* x = mesh.getCoordinateArray(axom::mint::X_COORDINATE); + const double* y = mesh.getCoordinateArray(axom::mint::Y_COORDINATE); + const double* z = mesh.getCoordinateArray(axom::mint::Z_COORDINATE); + EXPECT_TRUE(x != nullptr); + EXPECT_TRUE(y != nullptr); + EXPECT_TRUE(z != nullptr); + + axom::IndexType numNodes = mesh.getNumberOfNodes(); + for(axom::IndexType inode = 0; inode < numNodes; ++inode) + { + EXPECT_NEAR(x[inode], + x_expected[inode], + std::numeric_limits::epsilon()); + EXPECT_NEAR(y[inode], + y_expected[inode], + std::numeric_limits::epsilon()); + EXPECT_NEAR(z[inode], + z_expected[inode], + std::numeric_limits::epsilon()); + } // END for all nodes + + // STEP 4: remove temporary Pro/E file + axom::utilities::filesystem::removeFile(filename); +} + +//------------------------------------------------------------------------------ +TEST(quest_pro_e_reader, read_pro_e_bbox_some) +{ + const double x_expected[] = {-1.0, 1.0, 0.0, 0.0}; + const double y_expected[] = {0.0, 0.0, 1.0, 0.0}; + const double z_expected[] = {0.0, 0.0, 0.0, 1.0}; + + const std::string filename = "tet.proe"; + + // STEP 0: generate a temporary Pro/E file for testing + generate_pro_e_file(filename); + + // STEP 1: create an Pro/E reader and read-in the mesh data + axom::quest::ProEReader reader; + // A bounding box that catches some of the points, so the single + // tet does not get added. + axom::quest::ProEReader::BBox3D bbox; + bbox.addPoint(axom::quest::ProEReader::Point3D {-1.5, -0.5, -0.5}); + bbox.addPoint(axom::quest::ProEReader::Point3D {0, 1.5, 1.5}); + reader.setTetPredFromBoundingBox(bbox, false); + reader.setFileName(filename); + int status = reader.read(); + EXPECT_EQ(status, 0); + + // STEP 2: reading the Pro/E mesh data into a axom::mint::Mesh + axom::mint::UnstructuredMesh mesh(3, axom::mint::TET); + reader.getMesh(&mesh); + + // STEP 3: ensure the mesh is what is expected + EXPECT_EQ(mesh.getNumberOfCells(), 0); + EXPECT_EQ(mesh.getNumberOfNodes(), 4); + + const double* x = mesh.getCoordinateArray(axom::mint::X_COORDINATE); + const double* y = mesh.getCoordinateArray(axom::mint::Y_COORDINATE); + const double* z = mesh.getCoordinateArray(axom::mint::Z_COORDINATE); + EXPECT_TRUE(x != nullptr); + EXPECT_TRUE(y != nullptr); + EXPECT_TRUE(z != nullptr); + + axom::IndexType numNodes = mesh.getNumberOfNodes(); + for(axom::IndexType inode = 0; inode < numNodes; ++inode) + { + EXPECT_NEAR(x[inode], + x_expected[inode], + std::numeric_limits::epsilon()); + EXPECT_NEAR(y[inode], + y_expected[inode], + std::numeric_limits::epsilon()); + EXPECT_NEAR(z[inode], + z_expected[inode], + std::numeric_limits::epsilon()); + } // END for all nodes + + // STEP 4: remove temporary Pro/E file + axom::utilities::filesystem::removeFile(filename); +} + +//------------------------------------------------------------------------------ +TEST(quest_pro_e_reader, read_pro_e_bbox_some_incl) +{ + const double x_expected[] = {-1.0, 1.0, 0.0, 0.0}; + const double y_expected[] = {0.0, 0.0, 1.0, 0.0}; + const double z_expected[] = {0.0, 0.0, 0.0, 1.0}; + + const std::string filename = "tet.proe"; + + // STEP 0: generate a temporary Pro/E file for testing + generate_pro_e_file(filename); + + // STEP 1: create an Pro/E reader and read-in the mesh data + axom::quest::ProEReader reader; + // A bounding box that catches some of the points. We'll catch + // all tets that have at least one corner in the bbox. + axom::quest::ProEReader::BBox3D bbox; + bbox.addPoint(axom::quest::ProEReader::Point3D {-1.5, -0.5, -0.5}); + bbox.addPoint(axom::quest::ProEReader::Point3D {0, 1.5, 1.5}); + reader.setTetPredFromBoundingBox(bbox); + reader.setFileName(filename); + int status = reader.read(); + EXPECT_EQ(status, 0); + + // STEP 2: reading the Pro/E mesh data into a axom::mint::Mesh + axom::mint::UnstructuredMesh mesh(3, axom::mint::TET); + reader.getMesh(&mesh); + + // STEP 3: ensure the mesh is what is expected + EXPECT_EQ(mesh.getNumberOfCells(), 1); + EXPECT_EQ(mesh.getNumberOfNodes(), 4); + + const double* x = mesh.getCoordinateArray(axom::mint::X_COORDINATE); + const double* y = mesh.getCoordinateArray(axom::mint::Y_COORDINATE); + const double* z = mesh.getCoordinateArray(axom::mint::Z_COORDINATE); + EXPECT_TRUE(x != nullptr); + EXPECT_TRUE(y != nullptr); + EXPECT_TRUE(z != nullptr); + + axom::IndexType numNodes = mesh.getNumberOfNodes(); + for(axom::IndexType inode = 0; inode < numNodes; ++inode) + { + EXPECT_NEAR(x[inode], + x_expected[inode], + std::numeric_limits::epsilon()); + EXPECT_NEAR(y[inode], + y_expected[inode], + std::numeric_limits::epsilon()); + EXPECT_NEAR(z[inode], + z_expected[inode], + std::numeric_limits::epsilon()); + } // END for all nodes + + // STEP 4: remove temporary Pro/E file axom::utilities::filesystem::removeFile(filename); } @@ -204,8 +428,8 @@ TEST(quest_pro_e_reader, read_pro_e_external) axom::utilities::filesystem::removeFile(filename); } -//------------------------------------------------------------------------------ #ifdef AXOM_DATA_DIR +//------------------------------------------------------------------------------ TEST(quest_pro_e_reader, cup_pro_e) { constexpr int NUM_NODES = 171; @@ -315,6 +539,76 @@ TEST(quest_pro_e_reader, cup_pro_e) // Step 5: Dump mesh file axom::mint::write_vtk(&mesh, "cup.vtk"); } + +//------------------------------------------------------------------------------ +TEST(quest_pro_e_reader, cup_pro_e_some) +{ + constexpr int NUM_NODES = 171; + constexpr int NUM_BBOX_TETS = 52; + + // STEP 0: Get Pro/E cup example file for testing + namespace fs = axom::utilities::filesystem; + std::string cup = fs::joinPath(AXOM_DATA_DIR, "quest/cup.proe"); + + // STEP 1: create a Pro/E reader and read-in the mesh data + axom::quest::ProEReader reader; + reader.setFileName(cup); + // STEP 1a: specify a bounding box to include + // A bounding box that catches some of the points: only tets that + // fall completely within the bbox are retained. + axom::quest::ProEReader::BBox3D bbox; + bbox.addPoint(axom::quest::ProEReader::Point3D {-30, -160, -200}); + bbox.addPoint(axom::quest::ProEReader::Point3D {90, 160, -35}); + reader.setTetPredFromBoundingBox(bbox, false); + int status = reader.read(); + EXPECT_EQ(status, 0); + + // STEP 2: reading the Pro/E mesh data into a axom::mint::Mesh + axom::mint::UnstructuredMesh mesh(3, axom::mint::TET); + reader.getMesh(&mesh); + + // STEP 3: ensure the mesh is what is expected + EXPECT_EQ(mesh.getNumberOfCells(), NUM_BBOX_TETS); + EXPECT_EQ(mesh.getNumberOfNodes(), NUM_NODES); + + // Step 5: Dump mesh file + axom::mint::write_vtk(&mesh, "exclusivebboxcup.vtk"); +} + +//------------------------------------------------------------------------------ +TEST(quest_pro_e_reader, cup_pro_e_some_incl) +{ + constexpr int NUM_NODES = 171; + constexpr int NUM_BBOX_INCL_TETS = 298; + + // STEP 0: Get Pro/E cup example file for testing + namespace fs = axom::utilities::filesystem; + std::string cup = fs::joinPath(AXOM_DATA_DIR, "quest/cup.proe"); + + // STEP 1: create a Pro/E reader and read-in the mesh data + axom::quest::ProEReader reader; + reader.setFileName(cup); + // STEP 1a: specify a bounding box to include + // A bounding box that catches some of the points: tets having at + // least one corner falling within the bbox are retained. + axom::quest::ProEReader::BBox3D bbox; + bbox.addPoint(axom::quest::ProEReader::Point3D {-30, -160, -200}); + bbox.addPoint(axom::quest::ProEReader::Point3D {90, 160, -35}); + reader.setTetPredFromBoundingBox(bbox); + int status = reader.read(); + EXPECT_EQ(status, 0); + + // STEP 2: reading the Pro/E mesh data into a axom::mint::Mesh + axom::mint::UnstructuredMesh mesh(3, axom::mint::TET); + reader.getMesh(&mesh); + + // STEP 3: ensure the mesh is what is expected + EXPECT_EQ(mesh.getNumberOfCells(), NUM_BBOX_INCL_TETS); + EXPECT_EQ(mesh.getNumberOfNodes(), NUM_NODES); + + // Step 5: Dump mesh file + axom::mint::write_vtk(&mesh, "inclusivebboxcup.vtk"); +} #endif //------------------------------------------------------------------------------ diff --git a/src/axom/quest/tests/quest_pro_e_reader_parallel.cpp b/src/axom/quest/tests/quest_pro_e_reader_parallel.cpp index 84c169c4e9..fcc9f1912b 100644 --- a/src/axom/quest/tests/quest_pro_e_reader_parallel.cpp +++ b/src/axom/quest/tests/quest_pro_e_reader_parallel.cpp @@ -34,16 +34,18 @@ void generate_pro_e_file(const std::string& file) ofs << "# Another comment" << std::endl; // Number of nodes followed by number of tetrahedra - ofs << "4 1" << std::endl; + ofs << "5 2" << std::endl; // Node ID followed by xyz coordinates ofs << "1 -1.0 0.0 0.0" << std::endl; ofs << "2 1.0 0.0 0.0" << std::endl; ofs << "3 0.0 1.0 0.0" << std::endl; ofs << "4 0.0 0.0 1.0" << std::endl; + ofs << "5 3.0 3.0 3.0" << std::endl; // Tetrahedron ID followed by corresponding Node IDs ofs << "1 1 2 3 4" << std::endl; + ofs << "2 2 3 4 5" << std::endl; ofs.close(); } @@ -66,9 +68,9 @@ TEST(quest_pro_e_reader_parallel, read_file) int rank; MPI_Comm_rank(MPI_COMM_WORLD, &rank); - const double x_expected[] = {-1.0, 1.0, 0.0, 0.0}; - const double y_expected[] = {0.0, 0.0, 1.0, 0.0}; - const double z_expected[] = {0.0, 0.0, 0.0, 1.0}; + const double x_expected[] = {-1.0, 1.0, 0.0, 0.0, 3.0}; + const double y_expected[] = {0.0, 0.0, 1.0, 0.0, 3.0}; + const double z_expected[] = {0.0, 0.0, 0.0, 1.0, 3.0}; const std::string filename = "tet.proe"; @@ -88,9 +90,143 @@ TEST(quest_pro_e_reader_parallel, read_file) axom::mint::UnstructuredMesh mesh(3, axom::mint::TET); reader.getMesh(&mesh); + // STEP 3: ensure the mesh is what is expected + EXPECT_EQ(mesh.getNumberOfCells(), 2); + EXPECT_EQ(mesh.getNumberOfNodes(), 5); + + const double* x = mesh.getCoordinateArray(axom::mint::X_COORDINATE); + const double* y = mesh.getCoordinateArray(axom::mint::Y_COORDINATE); + const double* z = mesh.getCoordinateArray(axom::mint::Z_COORDINATE); + EXPECT_TRUE(x != nullptr); + EXPECT_TRUE(y != nullptr); + EXPECT_TRUE(z != nullptr); + + axom::IndexType numNodes = mesh.getNumberOfNodes(); + for(axom::IndexType inode = 0; inode < numNodes; ++inode) + { + EXPECT_NEAR(x[inode], + x_expected[inode], + std::numeric_limits::epsilon()); + EXPECT_NEAR(y[inode], + y_expected[inode], + std::numeric_limits::epsilon()); + EXPECT_NEAR(z[inode], + z_expected[inode], + std::numeric_limits::epsilon()); + } // END for all nodes + + // // STEP 4: remove temporary Pro/E file + if(rank == 0) + { + std::remove(filename.c_str()); + } +} + +//------------------------------------------------------------------------------ +TEST(quest_pro_e_reader_parallel, read_file_bbox) +{ + int rank; + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + + const double x_expected[] = {-1.0, 1.0, 0.0, 0.0, 3.0}; + const double y_expected[] = {0.0, 0.0, 1.0, 0.0, 3.0}; + const double z_expected[] = {0.0, 0.0, 0.0, 1.0, 3.0}; + + const std::string filename = "tet.proe"; + + // STEP 0: generate a temporary Pro/E file for testing + if(rank == 0) + { + generate_pro_e_file(filename); + } + + // STEP 1: create an Pro/E reader and read-in the mesh data + axom::quest::PProEReader reader(MPI_COMM_WORLD); + reader.setFileName(filename); + + // STEP 1a: create a bounding box. Only tets where all four nodes + // fall in the bbox will be retained. + axom::quest::ProEReader::BBox3D bbox; + bbox.addPoint(axom::quest::ProEReader::Point3D {-1.1, -0.1, -0.1}); + bbox.addPoint(axom::quest::ProEReader::Point3D {1.1, 1.1, 1.1}); + reader.setTetPredFromBoundingBox(bbox, false); + int status = reader.read(); + EXPECT_EQ(status, 0); + + // STEP 2: reading the Pro/E mesh data into a axom::mint::Mesh + axom::mint::UnstructuredMesh mesh(3, axom::mint::TET); + reader.getMesh(&mesh); + // STEP 3: ensure the mesh is what is expected EXPECT_EQ(mesh.getNumberOfCells(), 1); - EXPECT_EQ(mesh.getNumberOfNodes(), 4); + EXPECT_EQ(mesh.getNumberOfNodes(), 5); + + const double* x = mesh.getCoordinateArray(axom::mint::X_COORDINATE); + const double* y = mesh.getCoordinateArray(axom::mint::Y_COORDINATE); + const double* z = mesh.getCoordinateArray(axom::mint::Z_COORDINATE); + EXPECT_TRUE(x != nullptr); + EXPECT_TRUE(y != nullptr); + EXPECT_TRUE(z != nullptr); + + axom::IndexType numNodes = mesh.getNumberOfNodes(); + for(axom::IndexType inode = 0; inode < numNodes; ++inode) + { + EXPECT_NEAR(x[inode], + x_expected[inode], + std::numeric_limits::epsilon()); + EXPECT_NEAR(y[inode], + y_expected[inode], + std::numeric_limits::epsilon()); + EXPECT_NEAR(z[inode], + z_expected[inode], + std::numeric_limits::epsilon()); + } // END for all nodes + + // // STEP 4: remove temporary Pro/E file + if(rank == 0) + { + std::remove(filename.c_str()); + } +} + +//------------------------------------------------------------------------------ +TEST(quest_pro_e_reader_parallel, read_file_bbox_incl) +{ + int rank; + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + + const double x_expected[] = {-1.0, 1.0, 0.0, 0.0, 3.0}; + const double y_expected[] = {0.0, 0.0, 1.0, 0.0, 3.0}; + const double z_expected[] = {0.0, 0.0, 0.0, 1.0, 3.0}; + + const std::string filename = "tet.proe"; + + // STEP 0: generate a temporary Pro/E file for testing + if(rank == 0) + { + generate_pro_e_file(filename); + } + + // STEP 1: create an Pro/E reader and read-in the mesh data + axom::quest::PProEReader reader(MPI_COMM_WORLD); + reader.setFileName(filename); + + // STEP 1a: create a bounding box. Only tets where all four nodes + // fall in the bbox will be retained. + axom::quest::ProEReader::BBox3D bbox; + bbox.addPoint(axom::quest::ProEReader::Point3D {-1.1, -0.1, -0.1}); + bbox.addPoint(axom::quest::ProEReader::Point3D {1.1, 1.1, 1.1}); + reader.setTetPredFromBoundingBox(bbox); + int status = reader.read(); + EXPECT_EQ(status, 0); + + // STEP 2: reading the Pro/E mesh data into a axom::mint::Mesh + axom::mint::UnstructuredMesh mesh(3, axom::mint::TET); + reader.getMesh(&mesh); + + // STEP 3: ensure the mesh is what is expected + EXPECT_EQ(mesh.getNumberOfCells(), 2); + EXPECT_EQ(mesh.getNumberOfNodes(), 5); const double* x = mesh.getCoordinateArray(axom::mint::X_COORDINATE); const double* y = mesh.getCoordinateArray(axom::mint::Y_COORDINATE); From d202839822ac798a1a11c1669daa78df9228a973 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Wed, 13 Mar 2024 18:35:30 -0700 Subject: [PATCH 617/639] Bugfix for intermittent failure of quest_inout_interface Fortran example --- src/axom/quest/interface/inout.cpp | 26 +++++++++++++++++--------- src/axom/quest/interface/inout.hpp | 6 +++--- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/axom/quest/interface/inout.cpp b/src/axom/quest/interface/inout.cpp index a6062c268f..af2521b840 100644 --- a/src/axom/quest/interface/inout.cpp +++ b/src/axom/quest/interface/inout.cpp @@ -58,7 +58,7 @@ struct InOutHelper void setDefault() { *this = State {}; } }; - InOutHelper() : m_surfaceMesh(nullptr), m_inoutTree(nullptr) + InOutHelper() { m_params.setDefault(); m_state.setDefault(); @@ -214,14 +214,14 @@ struct InOutHelper // deal with spatial index if(m_inoutTree != nullptr) { - delete(m_inoutTree); + delete m_inoutTree; m_inoutTree = nullptr; } // deal with mesh if(m_state.m_should_delete_mesh) { - delete(m_surfaceMesh); + delete m_surfaceMesh; } m_surfaceMesh = nullptr; @@ -294,8 +294,8 @@ struct InOutHelper } private: - mint::Mesh* m_surfaceMesh; - InOutOctree* m_inoutTree; + mint::Mesh* m_surfaceMesh {nullptr}; + InOutOctree* m_inoutTree {nullptr}; GeometricBoundingBox m_meshBoundingBox; SpacePt m_meshCenterOfMass; @@ -401,13 +401,21 @@ int inout_init(mint::Mesh*& mesh, MPI_Comm comm) int inout_finalize() { const int dim = inout_get_dimension(); + SLIC_ASSERT(dim == 2 || dim == 3); - // Finalize the 2D and 3D structures and reset the params - int rc2 = s_inoutHelper2D.finalize(); - int rc3 = s_inoutHelper3D.finalize(); + // Finalize the inout structures and reset the params + int rc = QUEST_INOUT_FAILED; + if(dim == 2) + { + rc = s_inoutHelper2D.finalize(); + } + else // dim == 3 + { + rc = s_inoutHelper3D.finalize(); + } s_inoutParams.setDefault(); - return (dim == 2) ? rc2 : rc3; + return rc; } //------------------------------------------------------------------------------ diff --git a/src/axom/quest/interface/inout.hpp b/src/axom/quest/interface/inout.hpp index 63381a4c00..e2d8284a3b 100644 --- a/src/axom/quest/interface/inout.hpp +++ b/src/axom/quest/interface/inout.hpp @@ -7,13 +7,13 @@ #define QUEST_INOUT_INTERFACE_HPP_ // Axom includes -#include "axom/config.hpp" // for compile-time configuration options +#include "axom/config.hpp" // Quest includes -#include "axom/quest/interface/internal/mpicomm_wrapper.hpp" // MPI_COMM_SELF +#include "axom/quest/interface/internal/mpicomm_wrapper.hpp" // C/C++ includes -#include // for std::string +#include /*! * \file inout.hpp From 77932165620dd8414183b6a325f38df12afb17f9 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Wed, 13 Mar 2024 19:54:33 -0700 Subject: [PATCH 618/639] Adjust length of format string in quest_inout_interface_F example --- src/axom/quest/examples/quest_inout_interface.F | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/axom/quest/examples/quest_inout_interface.F b/src/axom/quest/examples/quest_inout_interface.F index ac646a0ccd..244d7b8f44 100644 --- a/src/axom/quest/examples/quest_inout_interface.F +++ b/src/axom/quest/examples/quest_inout_interface.F @@ -76,7 +76,7 @@ subroutine run_inout_queries() real(C_DOUBLE) :: x, y, z real(C_DOUBLE) :: EPS = 1E-7 real(C_DOUBLE) :: mesh_bb_min(3), mesh_bb_max(3), mesh_center_of_mass(3) - character(LEN=40) :: Format = "(I4, F8.2, F8.2, F8.2, L3)" + character(LEN=60) :: Format = "(I4, I4, F8.2, F8.2, F8.2, L3)" !...set parameters for the inout query rc = quest_inout_set_verbose(is_verbose) @@ -109,7 +109,7 @@ subroutine run_inout_queries() if (rank == 0) then write(*,*) "** Running containment queries using quest fortran interface" - write(*,*) "[rank, ( x, y, z), inside?]" + write(*,*) "[rank, id, ( x, y, z), inside?]" end if !...run the inout query at some fixed and random points @@ -126,7 +126,7 @@ subroutine run_inout_queries() ins = quest_inout_evaluate(x,y,z) - write(*,Format) rank, x, y, z, ins + write(*,Format) rank, i-1, x, y, z, ins end do !...finalize quest_inout query From ef3376abd6387471fda5857b2897157b183ef4aa Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 14 Mar 2024 13:52:25 -0700 Subject: [PATCH 619/639] add another turn off case --- src/axom/quest/examples/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index 4b680d9b3d..25e0fb81df 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -459,9 +459,12 @@ if (ENABLE_FORTRAN) set(quest_fortran_examples quest_signed_distance_interface) - # The inout Fortran example fails to compile with hipcc/amdflang in debug configurations - if("${CMAKE_Fortran_COMPILER}" MATCHES "amdflang$" AND + if("${AXOM_CONFIG_NAME}" STREQUAL "GNU-Debug-shared-mpi-openmp") + # The gcc-11 docker image does not work, turning off for now + set(_has_inout_fortran_example FALSE) + elif("${CMAKE_Fortran_COMPILER}" MATCHES "amdflang$" AND CMAKE_BUILD_TYPE MATCHES "(Debug|RelWithDebInfo)") + # The inout Fortran example fails to compile with hipcc/amdflang in debug configurations set(_has_inout_fortran_example FALSE) else() set(_has_inout_fortran_example TRUE) From 5269b275b0e70c7137deb154cb04b6e848527283 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 14 Mar 2024 15:02:53 -0700 Subject: [PATCH 620/639] fix typo --- src/axom/quest/examples/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index e4db2bd668..7d4d9bf74b 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -471,7 +471,8 @@ if (ENABLE_FORTRAN) if("${AXOM_CONFIG_NAME}" STREQUAL "GNU-Debug-shared-mpi-openmp") # The gcc-11 docker image does not work, turning off for now set(_has_inout_fortran_example FALSE) - elif("${CMAKE_Fortran_COMPILER}" MATCHES "amdflang$" AND + message("~~~~~~~~~~~~ DEBUG REMOVE AFTER") + elseif("${CMAKE_Fortran_COMPILER}" MATCHES "amdflang$" AND CMAKE_BUILD_TYPE MATCHES "(Debug|RelWithDebInfo)") # The inout Fortran example fails to compile with hipcc/amdflang in debug configurations set(_has_inout_fortran_example FALSE) From 631969115fcd658e662188f7d1b76be3fa362f7e Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 14 Mar 2024 15:04:16 -0700 Subject: [PATCH 621/639] guard fmt headers Co-authored-by: Peter B. Robinson --- src/thirdparty/axom/fmt.hpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/thirdparty/axom/fmt.hpp b/src/thirdparty/axom/fmt.hpp index 2ee5e54eee..7315055c68 100644 --- a/src/thirdparty/axom/fmt.hpp +++ b/src/thirdparty/axom/fmt.hpp @@ -10,19 +10,19 @@ #include "axom/config.hpp" // Include all fmt header files -#include "fmt/core.h" -#include "fmt/format.h" +#include "axom/fmt/core.h" +#include "axom/fmt/format.h" -#include "fmt/args.h" -#include "fmt/chrono.h" -#include "fmt/color.h" -#include "fmt/compile.h" -#include "fmt/os.h" -#include "fmt/ostream.h" -#include "fmt/printf.h" -#include "fmt/ranges.h" -#include "fmt/std.h" -#include "fmt/xchar.h" +#include "axom/fmt/args.h" +#include "axom/fmt/chrono.h" +#include "axom/fmt/color.h" +#include "axom/fmt/compile.h" +#include "axom/fmt/os.h" +#include "axom/fmt/ostream.h" +#include "axom/fmt/printf.h" +#include "axom/fmt/ranges.h" +#include "axom/fmt/std.h" +#include "axom/fmt/xchar.h" #endif // AXOM_FMT_H_ From beb9b24c371bbfe8f0a1771edcd22a305925586a Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 14 Mar 2024 16:16:40 -0700 Subject: [PATCH 622/639] more mailmap fun --- .mailmap | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index bc5dda36ae..e366e891f9 100644 --- a/.mailmap +++ b/.mailmap @@ -2,6 +2,7 @@ Aaron Black Aaron C. Black Adam J. Kunen Adrien M. Bernede Adrien Bernede <51493078+adrienbernede@users.noreply.github.com> Aesha Parekh Aesha Parekh <29237123+aeshapar@users.noreply.github.com> +Alan Dayton Alan Dayton <6393677+adayton1@users.noreply.github.com> Arlie Capps Arlie Capps Arlie Capps Arlie Capps Arlie Capps Arlie Capps <48997041+agcapps@users.noreply.github.com> @@ -13,6 +14,7 @@ Benjamin Curtice Corbett Benjamin Curtice Corbett Ben Corbett Benjamin Curtice Corbett Benjamin Corbett Benjamin Curtice Corbett Ben Corbett <32752943+corbett5@users.noreply.github.com> +Brad J. Whitlock Brad Whitlock Brian Manh Hien Han Brian Han Brian Manh Hien Han Brian Manh Hien Han Brian T.N. Gunney Brian Gunney <45609916+gunney1@users.noreply.github.com> @@ -24,7 +26,10 @@ Daniel Taller Danny Taller <66029857+dtaller@u Esteban Pauli Esteban Pauli <40901502+estebanpauli@users.noreply.github.com> Evan Taylor Desantola Evan Taylor DeSantola George Zagaris George Zagaris -Jacob Spainhour jcs15c +Jacob Spainhour jcs15c +Jacob Spainhour Jacob Spainhour +Jacob Spainhour Jacob Spainhour +Jamie A. Bramwell Jamie Bramwell Joe Hennis Hennis Joe Hennis hennis1 <73615573+hennis1@users.noreply.github.com> Josh Essman Josh Essman <68349992+joshessman-llnl@users.noreply.github.com> @@ -59,7 +64,6 @@ Robert Carson Robert Robert Carson rcarson3 Robert Cohn rscohn2 Samuel P. Mish samuelpmishLLNL <61714427+samuelpmishLLNL@users.noreply.github.com> -Brad J. Whitlock Brad Whitlock Axom Shared User Asctoolkit Shared User Axom Shared User Asctoolkit Shared User From 41c36b3fa3cbe097f250834c781c481669cef298 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 14 Mar 2024 16:16:48 -0700 Subject: [PATCH 623/639] remove debug statement --- src/axom/quest/examples/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt index 7d4d9bf74b..550f8d5cc1 100644 --- a/src/axom/quest/examples/CMakeLists.txt +++ b/src/axom/quest/examples/CMakeLists.txt @@ -471,7 +471,6 @@ if (ENABLE_FORTRAN) if("${AXOM_CONFIG_NAME}" STREQUAL "GNU-Debug-shared-mpi-openmp") # The gcc-11 docker image does not work, turning off for now set(_has_inout_fortran_example FALSE) - message("~~~~~~~~~~~~ DEBUG REMOVE AFTER") elseif("${CMAKE_Fortran_COMPILER}" MATCHES "amdflang$" AND CMAKE_BUILD_TYPE MATCHES "(Debug|RelWithDebInfo)") # The inout Fortran example fails to compile with hipcc/amdflang in debug configurations From 663b90472e80dbab54115aaf8868044a42346452 Mon Sep 17 00:00:00 2001 From: "Brian T.N. Gunney" Date: Thu, 14 Mar 2024 18:39:32 -0700 Subject: [PATCH 624/639] Documenting comments and diagnostic output changes from code review. --- src/axom/quest/MarchingCubes.cpp | 2 -- src/axom/quest/MarchingCubes.hpp | 32 +++++++++---------- src/axom/quest/detail/MarchingCubesImpl.hpp | 9 ++---- .../detail/MarchingCubesSingleDomain.cpp | 6 ++-- .../detail/MarchingCubesSingleDomain.hpp | 2 +- 5 files changed, 23 insertions(+), 28 deletions(-) diff --git a/src/axom/quest/MarchingCubes.cpp b/src/axom/quest/MarchingCubes.cpp index 6aa7e49815..50fec43b75 100644 --- a/src/axom/quest/MarchingCubes.cpp +++ b/src/axom/quest/MarchingCubes.cpp @@ -191,8 +191,6 @@ void MarchingCubes::populateContourMesh( // Reserve space once for all local domains. const axom::IndexType contourCellCount = getContourCellCount(); const axom::IndexType contourNodeCount = getContourNodeCount(); - // Temporarily disable reservation due to unknown bug. - // See https://github.com/LLNL/axom/pull/1271 mesh.reserveCells(contourCellCount); mesh.reserveNodes(contourNodeCount); diff --git a/src/axom/quest/MarchingCubes.hpp b/src/axom/quest/MarchingCubes.hpp index bc4c2db0ab..bc053915a8 100644 --- a/src/axom/quest/MarchingCubes.hpp +++ b/src/axom/quest/MarchingCubes.hpp @@ -36,8 +36,6 @@ namespace detail { namespace marching_cubes { -template -class MarchingCubesImpl; // TODO: Delete this. class MarchingCubesSingleDomain; } // namespace marching_cubes } // namespace detail @@ -101,6 +99,10 @@ enum class MarchingCubesDataParallelism * specify ids for the domains. If "state/domain_id" exists in the * domains, it is used as the domain id. Otherwise, the domain's * iteration index within the multidomain mesh is used. + * + * Output arrays use the allocator id specified in the constructor. + * However, the output mint mesh currently uses host data. The data + * output interfaces are interim and subject to change) */ class MarchingCubes { @@ -129,18 +131,13 @@ class MarchingCubes \param [in] maskField Cell-based std::int32_t mask field. If provided, cells where this field evaluates to false are skipped. - Array data in \a dom must be accessible in the \a runtimePolicy + Array data in \a bpMesh must be accessible in the \a runtimePolicy environment specified in the constructor. It's an error if not, e.g., using CPU memory with a GPU policy. Some metadata from \a bpMesh may be cached. Any change to it after setMesh() leads to undefined behavior. - Blueprint allows users to specify ids for the domains. If - "state/domain_id" exists in the domains, it is used as the domain - id. Otherwise, the domain's interation index within the - multidomain mesh is used. - @see clearMesh() */ void setMesh(const conduit::Node &bpMesh, @@ -171,7 +168,7 @@ class MarchingCubes axom::IndexType getContourNodeCount() const; //@{ - //!@name Output methods (interim interfaces, subject to change) + //!@name Access to output contour mesh /*! @brief Put generated contour in a mint::UnstructuredMesh. @param mesh Output contour mesh @@ -200,8 +197,6 @@ class MarchingCubes The array shape is (getContourCellCount(), ), where the second index is index of the facet corner. - - Memory space of data corresponds to allocator set in the constructor. */ axom::ArrayView getContourFacetCorners() const { @@ -213,8 +208,6 @@ class MarchingCubes The array shape is (getContourNodeCount(), ), where the second index is the spatial index. - - Memory space of data corresponds to allocator set in the constructor. */ axom::ArrayView getContourNodeCoords() const { @@ -227,8 +220,6 @@ class MarchingCubes The buffer size is getContourCellCount(). The parent ID is the column-major ordered flat index of the cell in the parent domain (see ArrayIndexer), not counting ghost cells. - - Memory space of data corresponds to allocator set in the constructor. */ axom::ArrayView getContourFacetParents() const { @@ -250,9 +241,18 @@ class MarchingCubes /*! @brief Give caller posession of the contour data. - This efficiently turns the generated contour data to the caller, + This efficiently gives the generated contour data to the caller, to stay in scope after the MarchingCubes object is deleted. + @param [i] facetNodeIds Node ids for the node at the corners of + each facet. @see getContourFacetCorners(). + @param [i] facetNodeCoords Coordinates of each facet node. + @see getContourNodeCoords(). + @param [i] facetParentIds Parent cell id of each facet. + @see getContourFacetParents(). + @param [i] facetDomainIds Domain id of each facet. + @see getContourFacetDomainIds(). + @pre computeIsocontour() must have been called. @post outputs can no longer be accessed from object, as though clearOutput() has been called. diff --git a/src/axom/quest/detail/MarchingCubesImpl.hpp b/src/axom/quest/detail/MarchingCubesImpl.hpp index 5582b3efec..eb46623177 100644 --- a/src/axom/quest/detail/MarchingCubesImpl.hpp +++ b/src/axom/quest/detail/MarchingCubesImpl.hpp @@ -32,14 +32,12 @@ namespace marching_cubes /*! @brief Computations for MarchingCubesSingleDomain - Spatial dimension templating is here, to keep out of higher level - classes MarchCubes and MarchingCubesSingleDomain. + Spatial dimension and execution space are here as template + parameters, to keep out of higher level classes MarchingCubes and + MarchingCubesSingleDomain. ExecSpace is the general execution space, like axom::SEQ_EXEC and axom::CUDA_EXEC<256>. - - See MarchingCubesImpl for the difference between that class and - MarchingCubesImpl. */ template class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase @@ -186,7 +184,6 @@ class MarchingCubesImpl : public MarchingCubesSingleDomain::ImplBase MarkCrossings_Util mcu(m_caseIds, m_fcnView, m_maskView, m_contourVal); auto order = m_caseIdsIndexer.getStrideOrder(); - // order ^= axom::ArrayStrideOrder::BOTH; // Pick wrong ordering to test behavior. #if defined(AXOM_USE_RAJA) RAJA::RangeSegment jRange(0, m_bShape[1]); RAJA::RangeSegment iRange(0, m_bShape[0]); diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.cpp b/src/axom/quest/detail/MarchingCubesSingleDomain.cpp index ae711c8462..b450a3774c 100644 --- a/src/axom/quest/detail/MarchingCubesSingleDomain.cpp +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.cpp @@ -46,9 +46,9 @@ void MarchingCubesSingleDomain::setDomain(const conduit::Node& dom, { m_topologyName = topologyName; - SLIC_ASSERT_MSG( - !conduit::blueprint::mesh::is_multi_domain(dom), - "MarchingCubesSingleDomain is single-domain only. Try MarchingCubes."); + SLIC_ASSERT_MSG(!conduit::blueprint::mesh::is_multi_domain(dom), + "Internal error. Attempt to set a multi-domain mesh in " + "MarchingCubesSingleDomain."); SLIC_ASSERT( dom.fetch_existing("topologies/" + m_topologyName + "/type").as_string() == "structured"); diff --git a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp index 844b8f2507..007e3ce7dd 100644 --- a/src/axom/quest/detail/MarchingCubesSingleDomain.hpp +++ b/src/axom/quest/detail/MarchingCubesSingleDomain.hpp @@ -203,7 +203,7 @@ class MarchingCubesSingleDomain ImplBase &getImpl() { return *m_impl; } private: - //!@brief Multi-somain implementation this object is under. + //!@brief Multi-domain implementation this object is under. MarchingCubes &m_mc; RuntimePolicy m_runtimePolicy; From e16364c0e7a41f9061007442b8ef8a9e5b41568b Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 14 Mar 2024 19:25:43 -0700 Subject: [PATCH 625/639] Renames axom::utilities::popCount() -> popcount() This matches the function name in the C++20 standard. --- src/axom/core/tests/core_bit_utilities.hpp | 20 ++++++++++---------- src/axom/core/utilities/BitUtilities.hpp | 2 +- src/axom/slam/BitSet.cpp | 2 +- src/axom/spin/ImplicitGrid.hpp | 18 ++++++++---------- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/axom/core/tests/core_bit_utilities.hpp b/src/axom/core/tests/core_bit_utilities.hpp index e020d9fcc0..dacb58f25b 100644 --- a/src/axom/core/tests/core_bit_utilities.hpp +++ b/src/axom/core/tests/core_bit_utilities.hpp @@ -77,7 +77,7 @@ TEST(core_bit_utilities, trailingZeroes) } } -TEST(core_bit_utilities, popCount) +TEST(core_bit_utilities, popcount) { constexpr std::uint64_t ZERO = std::uint64_t(0); constexpr int BITS = axom::utilities::BitTraits::BITS_PER_WORD; @@ -85,16 +85,16 @@ TEST(core_bit_utilities, popCount) // Test pop count when zero bits are set { - EXPECT_EQ(0, axom::utilities::popCount(ZERO)); - EXPECT_EQ(BITS, axom::utilities::popCount(~ZERO)); + EXPECT_EQ(0, axom::utilities::popcount(ZERO)); + EXPECT_EQ(BITS, axom::utilities::popcount(~ZERO)); } // Test pop count when one bit is set for(int i = 0; i < BITS; ++i) { std::uint64_t val = ::shifted(i); - EXPECT_EQ(1, axom::utilities::popCount(val)); - EXPECT_EQ(BITS - 1, axom::utilities::popCount(~val)); + EXPECT_EQ(1, axom::utilities::popcount(val)); + EXPECT_EQ(BITS - 1, axom::utilities::popcount(~val)); } // Test pop count when two bits are set @@ -103,8 +103,8 @@ TEST(core_bit_utilities, popCount) for(int j = 0; j < i; ++j) { std::uint64_t val = shifted(i) + shifted(j); - EXPECT_EQ(2, axom::utilities::popCount(val)); - EXPECT_EQ(BITS - 2, axom::utilities::popCount(~val)); + EXPECT_EQ(2, axom::utilities::popcount(val)); + EXPECT_EQ(BITS - 2, axom::utilities::popcount(~val)); } } @@ -116,8 +116,8 @@ TEST(core_bit_utilities, popCount) for(int k = 0; k < j; ++k) { std::uint64_t val = shifted(i) + shifted(j) + shifted(k); - EXPECT_EQ(3, axom::utilities::popCount(val)); - EXPECT_EQ(BITS - 3, axom::utilities::popCount(~val)); + EXPECT_EQ(3, axom::utilities::popcount(val)); + EXPECT_EQ(BITS - 3, axom::utilities::popcount(~val)); } } } @@ -136,7 +136,7 @@ TEST(core_bit_utilities, popCount) } } - EXPECT_EQ(bits, axom::utilities::popCount(val)); + EXPECT_EQ(bits, axom::utilities::popcount(val)); } } diff --git a/src/axom/core/utilities/BitUtilities.hpp b/src/axom/core/utilities/BitUtilities.hpp index 079cb2ce92..8516051802 100644 --- a/src/axom/core/utilities/BitUtilities.hpp +++ b/src/axom/core/utilities/BitUtilities.hpp @@ -121,7 +121,7 @@ AXOM_HOST_DEVICE inline int trailingZeros(std::uint64_t word) * \accelerated * \return number of bits in \a word that are set to 1 */ -AXOM_HOST_DEVICE inline int popCount(std::uint64_t word) +AXOM_HOST_DEVICE inline constexpr int popcount(std::uint64_t word) noexcept { /* clang-format off */ #if defined(__CUDA_ARCH__) && defined(AXOM_USE_CUDA) diff --git a/src/axom/slam/BitSet.cpp b/src/axom/slam/BitSet.cpp index f1e8a173b6..761cb853b7 100644 --- a/src/axom/slam/BitSet.cpp +++ b/src/axom/slam/BitSet.cpp @@ -59,7 +59,7 @@ int BitSet::count() const for(int i = 0; i < m_data.size(); ++i) { - ctr += axom::utilities::popCount(m_data[i]); + ctr += axom::utilities::popcount(m_data[i]); } return ctr; } diff --git a/src/axom/spin/ImplicitGrid.hpp b/src/axom/spin/ImplicitGrid.hpp index 7cc4fffddc..99ed179386 100644 --- a/src/axom/spin/ImplicitGrid.hpp +++ b/src/axom/spin/ImplicitGrid.hpp @@ -7,13 +7,13 @@ #define AXOM_SPIN_IMPLICIT_GRID__HPP_ #include "axom/config.hpp" -#include "axom/core.hpp" // for clamp functions +#include "axom/core.hpp" #include "axom/slic.hpp" #include "axom/slam.hpp" -#include "axom/core/execution/execution_space.hpp" // for execution spaces -#include "axom/core/memory_management.hpp" // for setDefaultAllocator() -#include "axom/core/utilities/BitUtilities.hpp" // for popCount() +#include "axom/core/execution/execution_space.hpp" +#include "axom/core/memory_management.hpp" +#include "axom/core/utilities/BitUtilities.hpp" #include "axom/primal/geometry/BoundingBox.hpp" #include "axom/primal/geometry/Point.hpp" @@ -953,9 +953,8 @@ ImplicitGrid::QueryObject::countCandidates( { continue; } - // currWord now contains the resulting candidacy information - // for our given point - ncandidates += axom::utilities::popCount(currWord); + // currWord now contains the resulting candidacy information for our given point + ncandidates += axom::utilities::popcount(currWord); } return ncandidates; } @@ -1009,9 +1008,8 @@ ImplicitGrid::QueryObject::countCandidates( { continue; } - // currWord now contains the resulting candidacy information - // for our given point - ncandidates += axom::utilities::popCount(currWord); + // currWord now contains the resulting candidacy information for our given point + ncandidates += axom::utilities::popcount(currWord); } return ncandidates; } From a948ee44efca2db18c8bdeb43cecd09ec6301909 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 14 Mar 2024 19:45:56 -0700 Subject: [PATCH 626/639] Renames axom::utilities::leadingZeros() -> countl_zero() This matches the function name in the C++20 standard. --- src/axom/core/FlatMap.hpp | 4 ++-- src/axom/core/tests/core_bit_utilities.hpp | 14 +++++++------- src/axom/core/utilities/BitUtilities.hpp | 2 +- .../spin/internal/linear_bvh/build_radix_tree.hpp | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/axom/core/FlatMap.hpp b/src/axom/core/FlatMap.hpp index aff1ac0209..db0bb4e345 100644 --- a/src/axom/core/FlatMap.hpp +++ b/src/axom/core/FlatMap.hpp @@ -669,11 +669,11 @@ FlatMap::FlatMap(IndexType bucket_count) bucket_count = axom::utilities::max(minBuckets, bucket_count); // Get the smallest power-of-two number of groups satisfying: // N * GroupSize - 1 >= minBuckets - // TODO: we should add a leadingZeros overload for 64-bit integers + // TODO: we should add a countl_zero overload for 64-bit integers { std::int32_t numGroups = std::ceil((bucket_count + 1) / (double)BucketsPerGroup); - m_numGroups2 = 31 - (axom::utilities::leadingZeros(numGroups)); + m_numGroups2 = 31 - (axom::utilities::countl_zero(numGroups)); } IndexType numGroupsRounded = 1 << m_numGroups2; diff --git a/src/axom/core/tests/core_bit_utilities.hpp b/src/axom/core/tests/core_bit_utilities.hpp index dacb58f25b..2b7b37c92a 100644 --- a/src/axom/core/tests/core_bit_utilities.hpp +++ b/src/axom/core/tests/core_bit_utilities.hpp @@ -140,26 +140,26 @@ TEST(core_bit_utilities, popcount) } } -TEST(core_bit_utilities, leadingZeros) +TEST(core_bit_utilities, countl_zero) { constexpr std::int32_t ZERO = std::int32_t(0); constexpr int BITS = axom::utilities::BitTraits::BITS_PER_WORD; ASSERT_EQ(32, BITS); - // Axom's leadingZeros will return 32 when given 0 - EXPECT_EQ(BITS, axom::utilities::leadingZeros(ZERO)); + // Axom's countl_zero will return 32 when given 0 + EXPECT_EQ(BITS, axom::utilities::countl_zero(ZERO)); for(int i = 0; i < BITS; ++i) { std::int32_t val = ::shifted(i); - EXPECT_EQ(BITS - i - 1, axom::utilities::leadingZeros(val)); + EXPECT_EQ(BITS - i - 1, axom::utilities::countl_zero(val)); // Value doesn't change if you set bits to right of leading zero for(int j = 0; j < i; ++j) { std::int32_t val2 = ::shifted(i) + ::shifted(j); - EXPECT_EQ(axom::utilities::leadingZeros(val), - axom::utilities::leadingZeros(val2)); + EXPECT_EQ(axom::utilities::countl_zero(val), + axom::utilities::countl_zero(val2)); } } @@ -177,6 +177,6 @@ TEST(core_bit_utilities, leadingZeros) break; } } - EXPECT_EQ(bit, axom::utilities::leadingZeros(rand_val)); + EXPECT_EQ(bit, axom::utilities::countl_zero(rand_val)); } } diff --git a/src/axom/core/utilities/BitUtilities.hpp b/src/axom/core/utilities/BitUtilities.hpp index 8516051802..e2753fa8cb 100644 --- a/src/axom/core/utilities/BitUtilities.hpp +++ b/src/axom/core/utilities/BitUtilities.hpp @@ -160,7 +160,7 @@ AXOM_HOST_DEVICE inline constexpr int popcount(std::uint64_t word) noexcept * \return The number of zeros to the left of the first set bit in \word, * starting with the least significant bit. */ -AXOM_HOST_DEVICE inline std::int32_t leadingZeros(std::int32_t word) +AXOM_HOST_DEVICE inline constexpr std::int32_t countl_zero(std::int32_t word) noexcept { /* clang-format off */ #if defined(__CUDA_ARCH__) && defined(AXOM_USE_CUDA) diff --git a/src/axom/spin/internal/linear_bvh/build_radix_tree.hpp b/src/axom/spin/internal/linear_bvh/build_radix_tree.hpp index b4728f94fa..14c1c4e093 100644 --- a/src/axom/spin/internal/linear_bvh/build_radix_tree.hpp +++ b/src/axom/spin/internal/linear_bvh/build_radix_tree.hpp @@ -6,12 +6,12 @@ #ifndef AXOM_SPIN_BUILD_RADIX_TREE_H_ #define AXOM_SPIN_BUILD_RADIX_TREE_H_ -#include "axom/config.hpp" // for axom compile-time definitions +#include "axom/config.hpp" #include "axom/core/execution/execution_space.hpp" #include "axom/core/execution/for_all.hpp" -#include "axom/core/utilities/AnnotationMacros.hpp" // for annotations +#include "axom/core/utilities/AnnotationMacros.hpp" #include "axom/primal/geometry/BoundingBox.hpp" #include "axom/primal/geometry/Point.hpp" @@ -20,16 +20,16 @@ #include "axom/spin/MortonIndex.hpp" -#include "axom/core/utilities/Utilities.hpp" // for isNearlyEqual() -#include "axom/core/utilities/BitUtilities.hpp" // for leadingZeros() -#include "axom/slic/interface/slic.hpp" // for slic +#include "axom/core/utilities/Utilities.hpp" +#include "axom/core/utilities/BitUtilities.hpp" +#include "axom/slic/interface/slic.hpp" #if defined(AXOM_USE_RAJA) // RAJA includes #include "RAJA/RAJA.hpp" #endif -#include // For std::atomic_thread_fence +#include #if defined(AXOM_USE_CUDA) && defined(AXOM_USE_RAJA) // NOTE: uses the cub installation that is bundled with RAJA @@ -300,7 +300,7 @@ AXOM_HOST_DEVICE IntType delta(const IntType& a, tie = (exor == 0); //break the tie, a and b must always differ exor = tie ? std::uint32_t(a) ^ std::uint32_t(bb) : exor; - std::int32_t count = axom::utilities::leadingZeros(exor); + std::int32_t count = axom::utilities::countl_zero(exor); if(tie) { count += 32; From 2a4fd7fc088af946b6237fca81422fa29538312b Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 14 Mar 2024 19:52:56 -0700 Subject: [PATCH 627/639] Renames axom::utilities::trailingZeros() -> countr_zero() This matches the function name in the C++20 standard. --- src/axom/core/tests/core_bit_utilities.hpp | 12 ++++++------ src/axom/core/utilities/BitUtilities.hpp | 2 +- src/axom/slam/BitSet.cpp | 4 ++-- src/axom/spin/ImplicitGrid.hpp | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/axom/core/tests/core_bit_utilities.hpp b/src/axom/core/tests/core_bit_utilities.hpp index 2b7b37c92a..af3cc03934 100644 --- a/src/axom/core/tests/core_bit_utilities.hpp +++ b/src/axom/core/tests/core_bit_utilities.hpp @@ -39,23 +39,23 @@ TEST(core_bit_utilities, trailingZeroes) constexpr int BITS = axom::utilities::BitTraits::BITS_PER_WORD; ASSERT_EQ(64, BITS); - // Axom's trailingZeros will return 64 when given 0 + // Axom's countr_zero will return 64 when given 0 { - EXPECT_EQ(BITS, axom::utilities::trailingZeros(ZERO)); + EXPECT_EQ(BITS, axom::utilities::countr_zero(ZERO)); } // Test with a known trailing bit for(int i = 0; i < BITS; ++i) { std::uint64_t val = ::shifted(i); - EXPECT_EQ(i, axom::utilities::trailingZeros(val)); + EXPECT_EQ(i, axom::utilities::countr_zero(val)); // Value doesn't change when you set bits to left of trailing bit for(int j = i + 1; j < BITS; ++j) { std::uint64_t val2 = ::shifted(i) + ::shifted(j); - EXPECT_EQ(axom::utilities::trailingZeros(val), - axom::utilities::trailingZeros(val2)); + EXPECT_EQ(axom::utilities::countr_zero(val), + axom::utilities::countr_zero(val2)); } } @@ -73,7 +73,7 @@ TEST(core_bit_utilities, trailingZeroes) break; } } - EXPECT_EQ(bit, axom::utilities::trailingZeros(rand_val)); + EXPECT_EQ(bit, axom::utilities::countr_zero(rand_val)); } } diff --git a/src/axom/core/utilities/BitUtilities.hpp b/src/axom/core/utilities/BitUtilities.hpp index e2753fa8cb..8422e93158 100644 --- a/src/axom/core/utilities/BitUtilities.hpp +++ b/src/axom/core/utilities/BitUtilities.hpp @@ -84,7 +84,7 @@ struct BitTraits * \return The number of zeros to the right of the first set bit in \word, * starting with the least significant bit, or 64 if \a word == 0. */ -AXOM_HOST_DEVICE inline int trailingZeros(std::uint64_t word) +AXOM_HOST_DEVICE inline constexpr int countr_zero(std::uint64_t word) noexcept { /* clang-format off */ #if defined(__CUDA_ARCH__) && defined(AXOM_USE_CUDA) diff --git a/src/axom/slam/BitSet.cpp b/src/axom/slam/BitSet.cpp index 761cb853b7..92bc87587c 100644 --- a/src/axom/slam/BitSet.cpp +++ b/src/axom/slam/BitSet.cpp @@ -130,7 +130,7 @@ BitSet::Index BitSet::find_next(Index idx) const if(startWord != Word(0)) { return (startWordIdx * BitsPerWord) + - axom::utilities::trailingZeros(startWord << startOffset); + axom::utilities::countr_zero(startWord << startOffset); } ++startWordIdx; @@ -142,7 +142,7 @@ BitSet::Index BitSet::find_next(Index idx) const const Word& w = m_data[i]; if(w != Word(0)) { - return (i * BitsPerWord) + axom::utilities::trailingZeros(w); + return (i * BitsPerWord) + axom::utilities::countr_zero(w); } } return BitSet::npos; diff --git a/src/axom/spin/ImplicitGrid.hpp b/src/axom/spin/ImplicitGrid.hpp index 99ed179386..2ef576f3d0 100644 --- a/src/axom/spin/ImplicitGrid.hpp +++ b/src/axom/spin/ImplicitGrid.hpp @@ -1061,13 +1061,13 @@ ImplicitGrid::QueryObject::visitCandidates( // currWord now contains the resulting candidacy information // for our given point int numBits = axom::utilities::min(bitsPerWord, nbits - (iword * 64)); - int currBit = axom::utilities::trailingZeros(currWord); + int currBit = axom::utilities::countr_zero(currWord); while(currBit < numBits) { bool found = getVisitResult(candidatePredicate, iword * BitsetType::BitsPerWord + currBit); currBit++; - currBit += axom::utilities::trailingZeros(currWord >> currBit); + currBit += axom::utilities::countr_zero(currWord >> currBit); if(found) { return; @@ -1131,13 +1131,13 @@ ImplicitGrid::QueryObject::visitCandidates( // currWord now contains the resulting candidacy information // for our given point int numBits = axom::utilities::min(bitsPerWord, nbits - (iword * 64)); - int currBit = axom::utilities::trailingZeros(currWord); + int currBit = axom::utilities::countr_zero(currWord); while(currBit < numBits) { bool found = getVisitResult(candidatePredicate, iword * BitsetType::BitsPerWord + currBit); currBit++; - currBit += axom::utilities::trailingZeros(currWord >> currBit); + currBit += axom::utilities::countr_zero(currWord >> currBit); if(found) { return; From ebba18bac6bea6fd622ab64ff31c8ba5e9b26f52 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 14 Mar 2024 20:53:24 -0700 Subject: [PATCH 628/639] Renames axom::utilities::swapEndian() -> byteswap() This matches the function name in the C++23 standard. --- src/axom/core/tests/CMakeLists.txt | 1 + src/axom/core/tests/utils_endianness.hpp | 131 +++++++++++++++-------- src/axom/core/utilities/Utilities.hpp | 18 ++-- src/axom/quest/readers/STLReader.cpp | 6 +- src/axom/spin/ImplicitGrid.hpp | 3 +- 5 files changed, 98 insertions(+), 61 deletions(-) diff --git a/src/axom/core/tests/CMakeLists.txt b/src/axom/core/tests/CMakeLists.txt index c9eb08bb5c..8d6ffc0e7e 100644 --- a/src/axom/core/tests/CMakeLists.txt +++ b/src/axom/core/tests/CMakeLists.txt @@ -52,6 +52,7 @@ set(core_serial_tests set(core_test_depends core gtest + fmt ) #------------------------------------------------------------------------------ diff --git a/src/axom/core/tests/utils_endianness.hpp b/src/axom/core/tests/utils_endianness.hpp index 50dd9491e1..0579f1191b 100644 --- a/src/axom/core/tests/utils_endianness.hpp +++ b/src/axom/core/tests/utils_endianness.hpp @@ -8,6 +8,8 @@ #include "axom/config.hpp" #include "axom/core/utilities/Utilities.hpp" +#include "axom/fmt.hpp" + #include #include @@ -21,6 +23,62 @@ TEST(utils_endianness, print_endianness) << std::endl; } +TEST(utils_endianness, basic) +{ + // compare and print the hex value and that of its swapped bytes + auto compare_and_dump = [](auto type, auto val) { + const auto rev = axom::utilities::byteswap(val); + const auto revrev = axom::utilities::byteswap(rev); + EXPECT_EQ(val, revrev); + + std::cout << axom::fmt::format("[{}], orig: '0x{:X}'; swapped '0x{:X}'\n", + type, + val, + rev); + }; + + { + constexpr auto orig = std::uint8_t(0xa); + compare_and_dump("U8", orig); + EXPECT_EQ(orig, axom::utilities::byteswap(orig)); + } + + { + constexpr auto orig = std::uint16_t(0xCAFE); + compare_and_dump("U16", orig); + EXPECT_NE(orig, axom::utilities::byteswap(orig)); + } + + { + constexpr auto orig = std::uint32_t(0xDEADBEEFu); + compare_and_dump("U32", orig); + EXPECT_NE(orig, axom::utilities::byteswap(orig)); + } + + { + constexpr auto orig = std::uint64_t {0x0123456789ABCDEFull}; + compare_and_dump("U64", orig); + EXPECT_NE(orig, axom::utilities::byteswap(orig)); + } +} + +TEST(utils_endianness, endianness_8) +{ + { + std::int8_t v1 = 5; + std::int8_t v2 = axom::utilities::byteswap(v1); + + EXPECT_EQ(v1, v2); + } + + { + std::uint8_t v1 = 5; + std::uint8_t v2 = axom::utilities::byteswap(v1); + + EXPECT_EQ(v1, v2); + } +} + TEST(utils_endianness, endianness_16) { union SixteenBit @@ -38,8 +96,8 @@ TEST(utils_endianness, endianness_16) // Test short { short v1 = valOrig.short_val; - short v2 = axom::utilities::swapEndian(v1); - short v3 = axom::utilities::swapEndian(v2); + short v2 = axom::utilities::byteswap(v1); + short v3 = axom::utilities::byteswap(v2); EXPECT_EQ(valOrig.short_val, v1); EXPECT_EQ(valSwap.short_val, v2); @@ -49,8 +107,8 @@ TEST(utils_endianness, endianness_16) // Test unsigned short { unsigned short v1 = valOrig.ushort_val; - unsigned short v2 = axom::utilities::swapEndian(v1); - unsigned short v3 = axom::utilities::swapEndian(v2); + unsigned short v2 = axom::utilities::byteswap(v1); + unsigned short v3 = axom::utilities::byteswap(v2); EXPECT_EQ(valOrig.ushort_val, v1); EXPECT_EQ(valSwap.ushort_val, v2); @@ -60,8 +118,8 @@ TEST(utils_endianness, endianness_16) // Test int16 { std::int16_t v1 = valOrig.i_val; - std::int16_t v2 = axom::utilities::swapEndian(v1); - std::int16_t v3 = axom::utilities::swapEndian(v2); + std::int16_t v2 = axom::utilities::byteswap(v1); + std::int16_t v3 = axom::utilities::byteswap(v2); EXPECT_EQ(valOrig.i_val, v1); EXPECT_EQ(valSwap.i_val, v2); @@ -71,8 +129,8 @@ TEST(utils_endianness, endianness_16) // Test uint16 { std::uint16_t v1 = valOrig.i_val; - std::uint16_t v2 = axom::utilities::swapEndian(v1); - std::uint16_t v3 = axom::utilities::swapEndian(v2); + std::uint16_t v2 = axom::utilities::byteswap(v1); + std::uint16_t v3 = axom::utilities::byteswap(v2); EXPECT_EQ(valOrig.ui_val, v1); EXPECT_EQ(valSwap.ui_val, v2); @@ -98,8 +156,8 @@ TEST(utils_endianness, endianness_32) // Test int { int v1 = valOrig.int_val; - int v2 = axom::utilities::swapEndian(v1); - int v3 = axom::utilities::swapEndian(v2); + int v2 = axom::utilities::byteswap(v1); + int v3 = axom::utilities::byteswap(v2); EXPECT_EQ(valOrig.int_val, v1); EXPECT_EQ(valSwap.int_val, v2); @@ -109,8 +167,8 @@ TEST(utils_endianness, endianness_32) // Test unsigned int { unsigned int v1 = valOrig.uint_val; - unsigned int v2 = axom::utilities::swapEndian(v1); - unsigned int v3 = axom::utilities::swapEndian(v2); + unsigned int v2 = axom::utilities::byteswap(v1); + unsigned int v3 = axom::utilities::byteswap(v2); EXPECT_EQ(valOrig.uint_val, v1); EXPECT_EQ(valSwap.uint_val, v2); @@ -120,8 +178,8 @@ TEST(utils_endianness, endianness_32) // Test int32 { std::int32_t v1 = valOrig.i_val; - std::int32_t v2 = axom::utilities::swapEndian(v1); - std::int32_t v3 = axom::utilities::swapEndian(v2); + std::int32_t v2 = axom::utilities::byteswap(v1); + std::int32_t v3 = axom::utilities::byteswap(v2); EXPECT_EQ(valOrig.i_val, v1); EXPECT_EQ(valSwap.i_val, v2); @@ -131,8 +189,8 @@ TEST(utils_endianness, endianness_32) // Test uint32 { std::uint32_t v1 = valOrig.i_val; - std::uint32_t v2 = axom::utilities::swapEndian(v1); - std::uint32_t v3 = axom::utilities::swapEndian(v2); + std::uint32_t v2 = axom::utilities::byteswap(v1); + std::uint32_t v3 = axom::utilities::byteswap(v2); EXPECT_EQ(valOrig.ui_val, v1); EXPECT_EQ(valSwap.ui_val, v2); @@ -142,8 +200,8 @@ TEST(utils_endianness, endianness_32) // Test float { float v1 = valOrig.f_val; - float v2 = axom::utilities::swapEndian(v1); - float v3 = axom::utilities::swapEndian(v2); + float v2 = axom::utilities::byteswap(v1); + float v3 = axom::utilities::byteswap(v2); EXPECT_EQ(valOrig.f_val, v1); EXPECT_EQ(valSwap.f_val, v2); @@ -170,8 +228,8 @@ TEST(utils_endianness, endianness_64) // Test int64 { std::int64_t v1 = valOrig.i_val; - std::int64_t v2 = axom::utilities::swapEndian(v1); - std::int64_t v3 = axom::utilities::swapEndian(v2); + std::int64_t v2 = axom::utilities::byteswap(v1); + std::int64_t v3 = axom::utilities::byteswap(v2); EXPECT_EQ(valOrig.i_val, v1); EXPECT_EQ(valSwap.i_val, v2); @@ -181,8 +239,8 @@ TEST(utils_endianness, endianness_64) // Test uint64 { std::uint64_t v1 = valOrig.i_val; - std::uint64_t v2 = axom::utilities::swapEndian(v1); - std::uint64_t v3 = axom::utilities::swapEndian(v2); + std::uint64_t v2 = axom::utilities::byteswap(v1); + std::uint64_t v3 = axom::utilities::byteswap(v2); EXPECT_EQ(valOrig.ui_val, v1); EXPECT_EQ(valSwap.ui_val, v2); @@ -193,8 +251,8 @@ TEST(utils_endianness, endianness_64) // Test double { double v1 = valOrig.d_val; - double v2 = axom::utilities::swapEndian(v1); - double v3 = axom::utilities::swapEndian(v2); + double v2 = axom::utilities::byteswap(v1); + double v3 = axom::utilities::byteswap(v2); EXPECT_EQ(valOrig.d_val, v1); EXPECT_EQ(valSwap.d_val, v2); @@ -203,28 +261,7 @@ TEST(utils_endianness, endianness_64) } #if 0 -// Note: Checks that swapEndian static_asserts for types within invalid sizes. -// Commented out since it should lead to a compile error -TEST(utils_endianness,invalid_byte_width) -{ - { - std::int8_t v1 = 5; - std::int8_t v2 = axom::utilities::swapEndian(v1); - - EXPECT_EQ(v1, v2); - } - - { - std::uint8_t v1 = 5; - std::uint8_t v2 = axom::utilities::swapEndian(v1); - - EXPECT_EQ(v1, v2); - } -} -#endif - -#if 0 -// Note: Checks that swapEndian static_asserts for non-native types. +// Note: Checks that byteswap static_asserts for non-native types. // Commented out since it should lead to a compile error. TEST(utils_endianness,invalid_non_native_types) { @@ -238,7 +275,7 @@ TEST(utils_endianness,invalid_non_native_types) v1.a = 5; v1.b = 12; - AxomUtilsTestsNonNative v2 = axom::utilities::swapEndian(v1); + AxomUtilsTestsNonNative v2 = axom::utilities::byteswap(v1); EXPECT_NE(v1.a, v2.a); EXPECT_NE(v1.b, v2.b); diff --git a/src/axom/core/utilities/Utilities.hpp b/src/axom/core/utilities/Utilities.hpp index f6428d22d3..a33cf61ce9 100644 --- a/src/axom/core/utilities/Utilities.hpp +++ b/src/axom/core/utilities/Utilities.hpp @@ -265,24 +265,24 @@ inline bool isLittleEndian() } /*! - * \brief Swaps the endianness of the input value. - * \param [in] val The input value. - * \return The value with endianness swapped. + * \brief Reverses the bytes of the input value. + * \param [in] val The input value + * \return The value with swapped bytes * \note Assumes endianness is either little or big (not PDP). * \pre T is a native arithmetic type (i.e. integral or floating point). - * \pre sizeof(T) must be 2, 4, or 8 bytes. + * \pre sizeof(T) must be 1, 2, 4, or 8 bytes. */ template -T swapEndian(T val) +constexpr T byteswap(T val) noexcept { - const int NBYTES = sizeof(T); + constexpr int NBYTES = sizeof(T); AXOM_STATIC_ASSERT_MSG( - NBYTES == 2 || NBYTES == 4 || NBYTES == 8, - "swapEndian only valid for types of size 2, 4 or 8 bytes."); + NBYTES == 1 || NBYTES == 2 || NBYTES == 4 || NBYTES == 8, + "byteswap only valid for types of size 1, 2, 4 or 8 bytes."); AXOM_STATIC_ASSERT_MSG(std::is_arithmetic::value, - "swapEndian only valid for native arithmetic types"); + "byteswap only valid for native arithmetic types"); union { diff --git a/src/axom/quest/readers/STLReader.cpp b/src/axom/quest/readers/STLReader.cpp index 8d5b001ec4..a76de874a1 100644 --- a/src/axom/quest/readers/STLReader.cpp +++ b/src/axom/quest/readers/STLReader.cpp @@ -74,7 +74,7 @@ bool STLReader::isAsciiFormat() const if(!utilities::isLittleEndian()) { - numTris = utilities::swapEndian(numTris); + numTris = utilities::byteswap(numTris); } // Check if the size matches our expectation @@ -166,7 +166,7 @@ int STLReader::readBinarySTL() if(!isLittleEndian) { - m_num_faces = utilities::swapEndian(m_num_faces); + m_num_faces = utilities::byteswap(m_num_faces); } m_num_nodes = m_num_faces * 3; @@ -180,7 +180,7 @@ int STLReader::readBinarySTL() for(int j = 0; j < 9; ++j) { float coord = isLittleEndian ? tri.data.vert[j] - : utilities::swapEndian(tri.data.vert[j]); + : utilities::byteswap(tri.data.vert[j]); m_nodes.push_back(static_cast(coord)); } diff --git a/src/axom/spin/ImplicitGrid.hpp b/src/axom/spin/ImplicitGrid.hpp index 2ef576f3d0..54a0ed0c4d 100644 --- a/src/axom/spin/ImplicitGrid.hpp +++ b/src/axom/spin/ImplicitGrid.hpp @@ -1058,8 +1058,7 @@ ImplicitGrid::QueryObject::visitCandidates( { continue; } - // currWord now contains the resulting candidacy information - // for our given point + // currWord now contains the resulting candidacy information for our given point int numBits = axom::utilities::min(bitsPerWord, nbits - (iword * 64)); int currBit = axom::utilities::countr_zero(currWord); while(currBit < numBits) From 6156da1655ad8de67937aec292a8833ec1bb322f Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 14 Mar 2024 20:56:51 -0700 Subject: [PATCH 629/639] Updates RELEASE-NOTES --- RELEASE-NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 87f6828417..b60b5810f5 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -59,6 +59,9 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ - Primal: `intersection_volume()` operators changed from returning a signed volume to an unsigned volume. - Primal's `BoundingBox::contains(BoundingBox)` now returns `true` when the input is empty +- Renamed axom's bit utility functions to conform to `C++20` standard: `popCount() -> popcount()`, + `trailingZeros() -> countr_zero()` and `leadingZeros() -> countl_zero()` +- Renamed `axom::utilities::swapEndian() -> byteswap()` to conform to `C++23` standard ### Fixed - quest's `SamplingShaper` now properly handles material names containing underscores From efe1def1d667d666c8ec3ef402c391281706eb87 Mon Sep 17 00:00:00 2001 From: Axom Shared User Date: Thu, 14 Mar 2024 21:10:43 -0700 Subject: [PATCH 630/639] Updates copyright year for some files --- src/axom/lumberjack/TextTagCombiner.hpp | 2 +- src/axom/lumberjack/tests/lumberjack_TextTagCombiner.hpp | 2 +- src/axom/quest/examples/quest_proe_bbox.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/axom/lumberjack/TextTagCombiner.hpp b/src/axom/lumberjack/TextTagCombiner.hpp index b0b963187b..9e0f52a3e1 100644 --- a/src/axom/lumberjack/TextTagCombiner.hpp +++ b/src/axom/lumberjack/TextTagCombiner.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/lumberjack/tests/lumberjack_TextTagCombiner.hpp b/src/axom/lumberjack/tests/lumberjack_TextTagCombiner.hpp index 0769837a7f..cd21074d13 100644 --- a/src/axom/lumberjack/tests/lumberjack_TextTagCombiner.hpp +++ b/src/axom/lumberjack/tests/lumberjack_TextTagCombiner.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) diff --git a/src/axom/quest/examples/quest_proe_bbox.cpp b/src/axom/quest/examples/quest_proe_bbox.cpp index 6d24f24d30..169820b638 100644 --- a/src/axom/quest/examples/quest_proe_bbox.cpp +++ b/src/axom/quest/examples/quest_proe_bbox.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and +// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and // other Axom Project Developers. See the top-level LICENSE file for details. // // SPDX-License-Identifier: (BSD-3-Clause) From a657a50b293a9b123c3bbb221198a716a48ea8b2 Mon Sep 17 00:00:00 2001 From: Kenneth Weiss Date: Thu, 14 Mar 2024 22:42:33 -0700 Subject: [PATCH 631/639] Removes constexpr from bit utility functions due to msvc errors --- src/axom/core/utilities/BitUtilities.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/axom/core/utilities/BitUtilities.hpp b/src/axom/core/utilities/BitUtilities.hpp index 8422e93158..2ed603983f 100644 --- a/src/axom/core/utilities/BitUtilities.hpp +++ b/src/axom/core/utilities/BitUtilities.hpp @@ -84,7 +84,7 @@ struct BitTraits * \return The number of zeros to the right of the first set bit in \word, * starting with the least significant bit, or 64 if \a word == 0. */ -AXOM_HOST_DEVICE inline constexpr int countr_zero(std::uint64_t word) noexcept +AXOM_HOST_DEVICE inline int countr_zero(std::uint64_t word) noexcept { /* clang-format off */ #if defined(__CUDA_ARCH__) && defined(AXOM_USE_CUDA) @@ -121,7 +121,7 @@ AXOM_HOST_DEVICE inline constexpr int countr_zero(std::uint64_t word) noexcept * \accelerated * \return number of bits in \a word that are set to 1 */ -AXOM_HOST_DEVICE inline constexpr int popcount(std::uint64_t word) noexcept +AXOM_HOST_DEVICE inline int popcount(std::uint64_t word) noexcept { /* clang-format off */ #if defined(__CUDA_ARCH__) && defined(AXOM_USE_CUDA) @@ -160,7 +160,7 @@ AXOM_HOST_DEVICE inline constexpr int popcount(std::uint64_t word) noexcept * \return The number of zeros to the left of the first set bit in \word, * starting with the least significant bit. */ -AXOM_HOST_DEVICE inline constexpr std::int32_t countl_zero(std::int32_t word) noexcept +AXOM_HOST_DEVICE inline std::int32_t countl_zero(std::int32_t word) noexcept { /* clang-format off */ #if defined(__CUDA_ARCH__) && defined(AXOM_USE_CUDA) @@ -172,7 +172,7 @@ AXOM_HOST_DEVICE inline constexpr std::int32_t countl_zero(std::int32_t word) no #elif defined(_AXOM_CORE_USE_INTRINSICS_GCC) || defined(_AXOM_CORE_USE_INTRINSICS_PPC) return word != std::int32_t(0) ? __builtin_clz(word) : 32; #else - std::int32_t y; + std::int32_t y {}; std::int32_t n = 32; y = word >> 16; if(y != 0) { n -= 16; word = y;} y = word >> 8; if(y != 0) { n -= 8; word = y;} From 16863c35e111a1f00c62a6a10f65c3ae9fa27722 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 18 Mar 2024 07:47:51 -0700 Subject: [PATCH 632/639] Increase minimum required cmake, remove mpi hack for using with cmake example --- src/examples/using-with-cmake/CMakeLists.txt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/examples/using-with-cmake/CMakeLists.txt b/src/examples/using-with-cmake/CMakeLists.txt index 14142882f0..40a893d6f6 100644 --- a/src/examples/using-with-cmake/CMakeLists.txt +++ b/src/examples/using-with-cmake/CMakeLists.txt @@ -20,7 +20,7 @@ # #------------------------------------------------------------------------------ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.18) project(using_with_cmake) @@ -70,14 +70,6 @@ if(BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE) ${BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE}) endif() -# HACK: Define the `mpi` target as an alias to `axom::mpi` if/when necessary -# Details: An axom dependency has a link dependency to `mpi`, but it might -# not be a target. Need to mark axom::mpi as global to use it for an alias. -if(NOT TARGET mpi AND TARGET axom::mpi) - set_target_properties(axom::mpi PROPERTIES IMPORTED_GLOBAL TRUE) - add_library(mpi ALIAS axom::mpi) -endif() - #------------------------------------------------------------------------------ # Set up example target that depends on axom #------------------------------------------------------------------------------ From 05a04f088bf51c5a951be8c1afea528da60173ac Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 18 Mar 2024 11:31:50 -0700 Subject: [PATCH 633/639] Bump cmake version --- src/examples/using-with-cmake/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/examples/using-with-cmake/CMakeLists.txt b/src/examples/using-with-cmake/CMakeLists.txt index 40a893d6f6..e9b19d7f31 100644 --- a/src/examples/using-with-cmake/CMakeLists.txt +++ b/src/examples/using-with-cmake/CMakeLists.txt @@ -20,7 +20,7 @@ # #------------------------------------------------------------------------------ -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.20) project(using_with_cmake) From abdeab05a4859427adcce86e894e2f2583987f21 Mon Sep 17 00:00:00 2001 From: Brian Manh Hien Han Date: Mon, 18 Mar 2024 13:28:08 -0700 Subject: [PATCH 634/639] Make 3.21 the minimum requirement for CUDA/HIP, 3.18 otherwise for example --- .gitlab/build_rzansel.yml | 2 +- src/examples/using-with-cmake/CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab/build_rzansel.yml b/.gitlab/build_rzansel.yml index 37ad6b482b..390c387dbe 100644 --- a/.gitlab/build_rzansel.yml +++ b/.gitlab/build_rzansel.yml @@ -12,7 +12,7 @@ - rzansel before_script: - module load cuda/11.2.0 - - module load cmake/3.18.0 + - module load cmake/3.21.1 #### # Template diff --git a/src/examples/using-with-cmake/CMakeLists.txt b/src/examples/using-with-cmake/CMakeLists.txt index e9b19d7f31..63eeca1150 100644 --- a/src/examples/using-with-cmake/CMakeLists.txt +++ b/src/examples/using-with-cmake/CMakeLists.txt @@ -20,7 +20,11 @@ # #------------------------------------------------------------------------------ -cmake_minimum_required(VERSION 3.20) +if (ENABLE_HIP OR AXOM_ENABLE_HIP OR ENABLE_CUDA OR AXOM_ENABLE_CUDA) + cmake_minimum_required(VERSION 3.21) +else() + cmake_minimum_required(VERSION 3.18) +endif() project(using_with_cmake) From 26ac35d5997dea9baed08dc5f65fdeabc2eaf0b2 Mon Sep 17 00:00:00 2001 From: Chris White Date: Mon, 18 Mar 2024 16:00:44 -0700 Subject: [PATCH 635/639] pull in change from spack --- scripts/spack/packages/axom/package.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py index b5cd2a296e..697e070ef2 100644 --- a/scripts/spack/packages/axom/package.py +++ b/scripts/spack/packages/axom/package.py @@ -419,21 +419,21 @@ def initconfig_mpi_entries(self): entries.append(cmake_cache_option("ENABLE_MPI", True)) if spec["mpi"].name == "spectrum-mpi": entries.append(cmake_cache_string("BLT_MPI_COMMAND_APPEND", "mpibind")) + + # Replace /usr/bin/srun path with srun flux wrapper path on TOSS 4 + # TODO: Remove this logic by adding `using_flux` case in + # spack/lib/spack/spack/build_systems/cached_cmake.py:196 and remove hard-coded + # path to srun in same file. + if "toss_4" in self._get_sys_type(spec): + srun_wrapper = which_string("srun") + mpi_exec_index = [ + index for index, entry in enumerate(entries) if "MPIEXEC_EXECUTABLE" in entry + ] + del entries[mpi_exec_index[0]] + entries.append(cmake_cache_path("MPIEXEC_EXECUTABLE", srun_wrapper)) else: entries.append(cmake_cache_option("ENABLE_MPI", False)) - # Replace /usr/bin/srun path with srun flux wrapper path on TOSS 4 - # TODO: Remove this logic by adding `using_flux` case in - # spack/lib/spack/spack/build_systems/cached_cmake.py:196 and remove hard-coded - # path to srun in same file. - if "toss_4" in self._get_sys_type(spec): - srun_wrapper = which_string("srun") - mpi_exec_index = [ - index for index, entry in enumerate(entries) if "MPIEXEC_EXECUTABLE" in entry - ] - del entries[mpi_exec_index[0]] - entries.append(cmake_cache_path("MPIEXEC_EXECUTABLE", srun_wrapper)) - return entries def find_path_replacement(self, path1, path2, path_replacements, name, entries): From b13cc80068457c920b42414e9e0d5a8e653d5458 Mon Sep 17 00:00:00 2001 From: Chris White Date: Mon, 18 Mar 2024 16:55:25 -0700 Subject: [PATCH 636/639] bump radiuss-spack-configs --- scripts/spack/radiuss-spack-configs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spack/radiuss-spack-configs b/scripts/spack/radiuss-spack-configs index c5854178b6..6c5c6362bb 160000 --- a/scripts/spack/radiuss-spack-configs +++ b/scripts/spack/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit c5854178b618b882386dd5f3c82fd34528b85522 +Subproject commit 6c5c6362bb7cdbf16ce826ffd95146ed5ff14cab From fcb02aefd94a70876c15f7ac2e8c762604c9a0c5 Mon Sep 17 00:00:00 2001 From: Chris White Date: Mon, 18 Mar 2024 18:26:53 -0700 Subject: [PATCH 637/639] add new version constraints to the next release (TBD 0.9.0 --- scripts/spack/packages/axom/package.py | 3 +++ scripts/spack/packages/blt/package.py | 11 ----------- 2 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 scripts/spack/packages/blt/package.py diff --git a/scripts/spack/packages/axom/package.py b/scripts/spack/packages/axom/package.py index 697e070ef2..cd85f139a0 100644 --- a/scripts/spack/packages/axom/package.py +++ b/scripts/spack/packages/axom/package.py @@ -105,6 +105,7 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("blt", type="build") depends_on("blt@0.5.1:", type="build", when="@0.6.1:") + depends_on("blt@0.6.2:", type="build", when="@0.9:") depends_on("mpi", when="+mpi") @@ -122,12 +123,14 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("scr~fortran", when="+scr~fortran") with when("+umpire"): + depends_on("umpire@2024.02.0:", when="@0.9:") depends_on("umpire@2022.03.0:", when="@0.7.0:") depends_on("umpire@6.0.0", when="@0.6.0") depends_on("umpire@5:5.0.1", when="@:0.5.0") depends_on("umpire +openmp", when="+openmp") with when("+raja"): + depends_on("raja@2024.02.0:", when="@0.9:") depends_on("raja@2022.03.0:", when="@0.7.0:") depends_on("raja@0.14.0", when="@0.6.0") depends_on("raja@:0.13.0", when="@:0.5.0") diff --git a/scripts/spack/packages/blt/package.py b/scripts/spack/packages/blt/package.py deleted file mode 100644 index a4872d865e..0000000000 --- a/scripts/spack/packages/blt/package.py +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.pkg.llnl.radiuss.blt import Blt as RadiussBlt - -class Blt(RadiussBlt): - # Note: This just points at a commit in the bugfix/white238/openmp branch. - # It also has a made up version - version("0.6.1.4", commit="c98f320835d71f778fbffcc48f07675142c08635") From 3bce6c5f7244965ef8455aabb2c48102b54b7be7 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 19 Mar 2024 13:22:33 -0700 Subject: [PATCH 638/639] put radiuss spack configs to main --- scripts/spack/radiuss-spack-configs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spack/radiuss-spack-configs b/scripts/spack/radiuss-spack-configs index 6c5c6362bb..d43946bed0 160000 --- a/scripts/spack/radiuss-spack-configs +++ b/scripts/spack/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 6c5c6362bb7cdbf16ce826ffd95146ed5ff14cab +Subproject commit d43946bed028933a8b8770adca3dde78987f6626 From 1dda8f120f72f9d2ec76fc78ae272a7ad6be0de3 Mon Sep 17 00:00:00 2001 From: Chris White Date: Tue, 19 Mar 2024 16:07:30 -0700 Subject: [PATCH 639/639] update version numbers --- RELEASE | 2 +- RELEASE-NOTES.md | 5 ++++- src/cmake/AxomVersion.cmake | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/RELEASE b/RELEASE index 725fd3d051..ec1babb39d 100644 --- a/RELEASE +++ b/RELEASE @@ -1,6 +1,6 @@ ******************************************************************************* -Axom: ................................, version 0.8.1 +Axom: ................................, version 0.9.0 Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory. diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index d4a7702065..8e6d1f08ab 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -19,6 +19,8 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/ ## [Unreleased] - Release date yyyy-mm-dd +## [Version 0.9.0] - Release date 2024-03-19 + ### Added - Primal: Adds a `Quadrilateral` primitive - Primal: Adds a `compute_bounding_box()` operator for computing the bounding @@ -1029,7 +1031,8 @@ fractions for the associated materials must be supplied before shaping. - Use this section in case of vulnerabilities -[Unreleased]: https://github.com/LLNL/axom/compare/v0.8.1...develop +[Unreleased]: https://github.com/LLNL/axom/compare/v0.9.0...develop +[Version 0.9.0]: https://github.com/LLNL/axom/compare/v0.8.1...v0.9.0 [Version 0.8.1]: https://github.com/LLNL/axom/compare/v0.8.0...v0.8.1 [Version 0.8.0]: https://github.com/LLNL/axom/compare/v0.7.0...v0.8.0 [Version 0.7.0]: https://github.com/LLNL/axom/compare/v0.6.1...v0.7.0 diff --git a/src/cmake/AxomVersion.cmake b/src/cmake/AxomVersion.cmake index 2e1db64172..64e3554110 100644 --- a/src/cmake/AxomVersion.cmake +++ b/src/cmake/AxomVersion.cmake @@ -9,8 +9,8 @@ # otherwise, the hard-coded values will go in to the config. #------------------------------------------------------------------------------ set(AXOM_VERSION_MAJOR 0) -set(AXOM_VERSION_MINOR 8) -set(AXOM_VERSION_PATCH 1) +set(AXOM_VERSION_MINOR 9) +set(AXOM_VERSION_PATCH 0) string(CONCAT AXOM_VERSION_FULL "v${AXOM_VERSION_MAJOR}" ".${AXOM_VERSION_MINOR}"