Date: Sat, 18 Jan 2025 09:52:31 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e76b073e86ab - main - science/axom: update 0.7.0 =?utf-8?Q?=E2=86=92?= 0.10.1 Message-ID: <202501180952.50I9qVHE099034@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=e76b073e86ab92d001703be835a0b72f99c30a92 commit e76b073e86ab92d001703be835a0b72f99c30a92 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2025-01-18 09:51:03 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2025-01-18 09:52:24 +0000 science/axom: update 0.7.0 → 0.10.1 --- science/axom/Makefile | 24 +++---- science/axom/distinfo | 18 +++--- .../files/patch-cmake_thirdparty_FindLUA.cmake | 24 ------- science/axom/pkg-plist | 73 +++++++++++++++++++--- science/serac/Makefile | 2 + 5 files changed, 87 insertions(+), 54 deletions(-) diff --git a/science/axom/Makefile b/science/axom/Makefile index 715c158bd2cc..35f116e96434 100644 --- a/science/axom/Makefile +++ b/science/axom/Makefile @@ -1,12 +1,12 @@ PORTNAME= axom DISTVERSIONPREFIX= v -DISTVERSION= 0.7.0 -PORTREVISION= 2 +DISTVERSION= 0.10.1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org COMMENT= Infrastructure for development of multi-physics applications and tools -WWW= https://github.com/LLNL/axom +WWW= https://github.com/LLNL/axom \ + https://axom.readthedocs.io/en/develop LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/../LICENSE @@ -17,21 +17,23 @@ BROKEN_powerpc= use of overloaded operator '[]' is ambiguous, see https://github LIB_DEPENDS= libconduit.so:science/conduit \ libhdf5.so:science/hdf5 \ - libsiloh5.so:science/silo \ - libsz.so:science/libaec + libHYPRE.so:science/hypre \ + libmetis.so:math/metis \ + libsiloh5.so:science/silo RUN_DEPENDS= sparsehash>0:devel/sparsehash -USES= cmake:testing compiler:c++11-lang +USES= cmake:testing,noninja compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= LLNL -GH_TUPLE= LLNL:axom_data:185f28f:axom_data/../data \ - LLNL:blt:7c8ac7e:blt/cmake/blt \ - LLNL:uberenv:f46566f:uberenv/../scripts/uberenv +GH_TUPLE= LLNL:axom_data:1bff47e:axom_data/../data \ + LLNL:blt:9cfe8ae:blt/cmake/blt \ + LLNL:uberenv:e7dd3d9:uberenv/../scripts/uberenv CMAKE_OFF= AXOM_ENABLE_DOCS AXOM_ENABLE_EXAMPLES AXOM_ENABLE_TESTS AXOM_ENABLE_EXAMPLES CMAKE_ON= BUILD_SHARED_LIBS -CMAKE_TESTING_ON= AXOM_ENABLE_TESTS +CMAKE_TESTING_ON= AXOM_ENABLE_TESTS AXOM_ENABLE_EXAMPLES +CMAKE_TESTING_TARGET= all test CMAKE_ARGS= -DCONDUIT_DIR=${LOCALBASE} \ -DHDF5_DIR=${LOCALBASE} \ -DBLT_CXX_STD=c++14 # BLT_CXX_STD=c++14 is required for LLNL/serac @@ -73,6 +75,6 @@ post-install: # installs headers of a third party library sparsehash: https://gi @${RM} -r ${STAGEDIR}${PREFIX}/include/sparsehash # 2 tests are known to fail, see https://github.com/LLNL/axom/issues/912 -# tests don't run in newer revisions, see https://github.com/LLNL/axom/issues/915 +# tests don't run in newer revisions, see https://github.com/LLNL/axom/issues/1492 .include <bsd.port.mk> diff --git a/science/axom/distinfo b/science/axom/distinfo index d389c29ae954..61e054c0cac6 100644 --- a/science/axom/distinfo +++ b/science/axom/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1662268915 -SHA256 (LLNL-axom-v0.7.0_GH0.tar.gz) = 5bfb8335ec349e6a9bad1520376acd64522c48f9a5c4c5e0f32fbd517af667c5 -SIZE (LLNL-axom-v0.7.0_GH0.tar.gz) = 12483734 -SHA256 (LLNL-axom_data-185f28f_GH0.tar.gz) = 0d81b346213199a3c965a160e91e20bc5f7326c557fb3ab941f6434890c9ceb4 -SIZE (LLNL-axom_data-185f28f_GH0.tar.gz) = 47110721 -SHA256 (LLNL-blt-7c8ac7e_GH0.tar.gz) = 39ff145123dc25cbe646323b027078000c6c96323a573ba2a09dda5e34dec815 -SIZE (LLNL-blt-7c8ac7e_GH0.tar.gz) = 1216179 -SHA256 (LLNL-uberenv-f46566f_GH0.tar.gz) = 8a425cfd7dc885f22080841c5adee67b053221d7335d8c2ba4575bcfa007f3f3 -SIZE (LLNL-uberenv-f46566f_GH0.tar.gz) = 25555 +TIMESTAMP = 1737171595 +SHA256 (LLNL-axom-v0.10.1_GH0.tar.gz) = 39f34b195512fc37d145f401104bcd0542a2852fcd39f0369593eaf3dd9e0cdb +SIZE (LLNL-axom-v0.10.1_GH0.tar.gz) = 13200213 +SHA256 (LLNL-axom_data-1bff47e_GH0.tar.gz) = 27fe63cba2003e122796d1abae7e24f2fd7fd9b20e4d9e6382f4ffecb44eaf69 +SIZE (LLNL-axom_data-1bff47e_GH0.tar.gz) = 47741799 +SHA256 (LLNL-blt-9cfe8ae_GH0.tar.gz) = feb6859991140c8735ae153a2448e7566abc1c006544dc2372f4e1185759da9a +SIZE (LLNL-blt-9cfe8ae_GH0.tar.gz) = 1281957 +SHA256 (LLNL-uberenv-e7dd3d9_GH0.tar.gz) = 4d5f4e1b354c5792e8c46992ebad2ca942e5473ad2c65ee666a198d5b2c8e04f +SIZE (LLNL-uberenv-e7dd3d9_GH0.tar.gz) = 41341 diff --git a/science/axom/files/patch-cmake_thirdparty_FindLUA.cmake b/science/axom/files/patch-cmake_thirdparty_FindLUA.cmake deleted file mode 100644 index 50702987762e..000000000000 --- a/science/axom/files/patch-cmake_thirdparty_FindLUA.cmake +++ /dev/null @@ -1,24 +0,0 @@ -- Lua related path adjustments - ---- cmake/thirdparty/FindLUA.cmake.orig 2022-08-21 08:14:54 UTC -+++ cmake/thirdparty/FindLUA.cmake -@@ -23,7 +23,7 @@ endif() - # Find includes directory - find_path( LUA_INCLUDE_DIR lua.hpp - PATHS ${LUA_DIR}/include/ -- ${LUA_DIR}/include/lua -+ ${LUA_DIR}/include/lua${FREEBSD_LUA_VER_STR} - NO_DEFAULT_PATH - NO_CMAKE_ENVIRONMENT_PATH - NO_CMAKE_PATH -@@ -31,8 +31,8 @@ find_path( LUA_INCLUDE_DIR lua.hpp - NO_CMAKE_SYSTEM_PATH) - - # Find libraries --find_library( LUA_LIBRARY NAMES lua liblua -- PATHS ${LUA_DIR}/lib -+find_library( LUA_LIBRARY NAMES lua-${FREEBSD_LUA_VER} liblua -+ PATHS ${LUA_DIR}/lib - NO_DEFAULT_PATH - NO_CMAKE_ENVIRONMENT_PATH - NO_CMAKE_PATH diff --git a/science/axom/pkg-plist b/science/axom/pkg-plist index 7259d01e6201..8c781f6152b5 100644 --- a/science/axom/pkg-plist +++ b/science/axom/pkg-plist @@ -4,22 +4,31 @@ bin/mesh_tester include/axom/CLI11.hpp include/axom/config.hpp include/axom/core.hpp +include/axom/core/AnnotationMacros.hpp include/axom/core/Array.hpp include/axom/core/ArrayBase.hpp include/axom/core/ArrayIteratorBase.hpp include/axom/core/ArrayView.hpp +include/axom/core/FlatMap.hpp include/axom/core/IteratorBase.hpp +include/axom/core/MDMapping.hpp include/axom/core/Macros.hpp include/axom/core/Map.hpp +include/axom/core/NumericLimits.hpp include/axom/core/Path.hpp +include/axom/core/RangeAdapter.hpp include/axom/core/StackArray.hpp +include/axom/core/StaticArray.hpp include/axom/core/Types.hpp +include/axom/core/detail/FlatTable.hpp include/axom/core/execution/execution_space.hpp include/axom/core/execution/for_all.hpp include/axom/core/execution/internal/cuda_exec.hpp include/axom/core/execution/internal/hip_exec.hpp include/axom/core/execution/internal/omp_exec.hpp include/axom/core/execution/internal/seq_exec.hpp +include/axom/core/execution/nested_for_exec.hpp +include/axom/core/execution/runtime_policy.hpp include/axom/core/execution/synchronize.hpp include/axom/core/memory_management.hpp include/axom/core/numerics/Determinants.hpp @@ -34,16 +43,25 @@ include/axom/core/numerics/linear_solve.hpp include/axom/core/numerics/matvecops.hpp include/axom/core/numerics/polynomial_solvers.hpp include/axom/core/utilities/About.hpp -include/axom/core/utilities/AnnotationMacros.hpp +include/axom/core/utilities/Annotations.hpp include/axom/core/utilities/BitUtilities.hpp +include/axom/core/utilities/CommandLineUtilities.hpp include/axom/core/utilities/FileUtilities.hpp +include/axom/core/utilities/RAII.hpp include/axom/core/utilities/StringUtilities.hpp include/axom/core/utilities/System.hpp include/axom/core/utilities/Timer.hpp include/axom/core/utilities/Utilities.hpp -include/axom/core/utilities/nvtx/Macros.hpp -include/axom/core/utilities/nvtx/Range.hpp -include/axom/core/utilities/nvtx/interface.hpp +include/axom/export/core.h +include/axom/export/inlet.h +include/axom/export/klee.h +include/axom/export/lumberjack.h +include/axom/export/mint.h +include/axom/export/multimat.h +include/axom/export/quest.h +include/axom/export/sidre.h +include/axom/export/slam.h +include/axom/export/slic.h include/axom/fmt.hpp include/axom/fmt/LICENSE.rst include/axom/fmt/README @@ -51,15 +69,18 @@ include/axom/fmt/args.h include/axom/fmt/chrono.h include/axom/fmt/color.h include/axom/fmt/compile.h -include/axom/fmt/compile.h.patch include/axom/fmt/core.h include/axom/fmt/format-inl.h include/axom/fmt/format.h -include/axom/fmt/locale.h +include/axom/fmt/hipcc_long_double.patch include/axom/fmt/os.h include/axom/fmt/ostream.h include/axom/fmt/printf.h include/axom/fmt/ranges.h +include/axom/fmt/runtime_error.patch +include/axom/fmt/std.h +include/axom/fmt/xchar.h +include/axom/fmt/xl_printf.patch include/axom/inlet.hpp include/axom/inlet/ConduitReader.hpp include/axom/inlet/Container.hpp @@ -97,6 +118,7 @@ include/axom/klee/Units.hpp %%NO_NOMPI%%include/axom/lumberjack/Message.hpp %%NO_NOMPI%%include/axom/lumberjack/RootCommunicator.hpp %%NO_NOMPI%%include/axom/lumberjack/TextEqualityCombiner.hpp +%%NO_NOMPI%%include/axom/lumberjack/TextTagCombiner.hpp include/axom/mint.hpp include/axom/mint/config.hpp include/axom/mint/deprecated/MCArray.hpp @@ -106,7 +128,6 @@ include/axom/mint/execution/internal/for_all_cells.hpp include/axom/mint/execution/internal/for_all_faces.hpp include/axom/mint/execution/internal/for_all_nodes.hpp include/axom/mint/execution/internal/helpers.hpp -include/axom/mint/execution/internal/structured_exec.hpp include/axom/mint/execution/xargs.hpp include/axom/mint/fem/FEBasis.hpp include/axom/mint/fem/FEBasisTypes.hpp @@ -151,8 +172,10 @@ include/axom/multimat/multimat.hpp include/axom/primal.hpp include/axom/primal/constants.hpp include/axom/primal/geometry/BezierCurve.hpp +include/axom/primal/geometry/BezierPatch.hpp include/axom/primal/geometry/BoundingBox.hpp include/axom/primal/geometry/CurvedPolygon.hpp +include/axom/primal/geometry/Hexahedron.hpp include/axom/primal/geometry/NumericArray.hpp include/axom/primal/geometry/Octahedron.hpp include/axom/primal/geometry/OrientationResult.hpp @@ -161,6 +184,7 @@ include/axom/primal/geometry/Plane.hpp include/axom/primal/geometry/Point.hpp include/axom/primal/geometry/Polygon.hpp include/axom/primal/geometry/Polyhedron.hpp +include/axom/primal/geometry/Quadrilateral.hpp include/axom/primal/geometry/Ray.hpp include/axom/primal/geometry/Segment.hpp include/axom/primal/geometry/Sphere.hpp @@ -174,20 +198,24 @@ include/axom/primal/operators/compute_moments.hpp include/axom/primal/operators/detail/clip_impl.hpp include/axom/primal/operators/detail/compute_moments_impl.hpp %%MFEM%%include/axom/primal/operators/detail/evaluate_integral_impl.hpp -include/axom/primal/operators/detail/in_curved_polygon_impl.hpp +include/axom/primal/operators/detail/fuzzy_comparators.hpp include/axom/primal/operators/detail/intersect_bezier_impl.hpp include/axom/primal/operators/detail/intersect_bounding_box_impl.hpp include/axom/primal/operators/detail/intersect_impl.hpp include/axom/primal/operators/detail/intersect_ray_impl.hpp +%%MFEM%%include/axom/primal/operators/detail/winding_number_impl.hpp %%MFEM%%include/axom/primal/operators/evaluate_integral.hpp include/axom/primal/operators/in_curved_polygon.hpp include/axom/primal/operators/in_polygon.hpp +include/axom/primal/operators/in_polyhedron.hpp include/axom/primal/operators/in_sphere.hpp include/axom/primal/operators/intersect.hpp +include/axom/primal/operators/intersection_volume.hpp include/axom/primal/operators/is_convex.hpp include/axom/primal/operators/orientation.hpp include/axom/primal/operators/split.hpp include/axom/primal/operators/squared_distance.hpp +include/axom/primal/operators/winding_number.hpp include/axom/primal/utils/ZipBoundingBox.hpp include/axom/primal/utils/ZipIndexable.hpp include/axom/primal/utils/ZipPoint.hpp @@ -200,7 +228,9 @@ include/axom/quest/Discretize.hpp %%NO_NOMPI%%include/axom/quest/DistributedClosestPoint.hpp include/axom/quest/InOutOctree.hpp %%MFEM%%include/axom/quest/IntersectionShaper.hpp +%%MFEM%%include/axom/quest/MarchingCubes.hpp include/axom/quest/MeshTester.hpp +include/axom/quest/MeshViewUtil.hpp include/axom/quest/PointInCell.hpp %%MFEM%%include/axom/quest/SamplingShaper.hpp include/axom/quest/ScatteredInterpolation.hpp @@ -208,6 +238,9 @@ include/axom/quest/ScatteredInterpolation.hpp include/axom/quest/SignedDistance.hpp include/axom/quest/detail/AllNearestNeighbors_detail.hpp include/axom/quest/detail/Discretize_detail.hpp +include/axom/quest/detail/DistributedClosestPointImpl.hpp +include/axom/quest/detail/MarchingCubesImpl.hpp +include/axom/quest/detail/MarchingCubesSingleDomain.hpp include/axom/quest/detail/MeshTester_detail.hpp include/axom/quest/detail/PointFinder.hpp include/axom/quest/detail/PointInCellMeshWrapper_mfem.hpp @@ -221,8 +254,11 @@ include/axom/quest/interface/inout.hpp include/axom/quest/interface/internal/QuestHelpers.hpp include/axom/quest/interface/internal/mpicomm_wrapper.hpp include/axom/quest/interface/signed_distance.hpp -%%NO_NOMPI%%include/axom/quest/readers/PSTLReader.hpp +include/axom/quest/readers/PProEReader.hpp +include/axom/quest/readers/PSTLReader.hpp +include/axom/quest/readers/ProEReader.hpp include/axom/quest/readers/STLReader.hpp +include/axom/quest/util/mesh_helpers.hpp include/axom/sidre.hpp include/axom/sidre/core/Array.hpp include/axom/sidre/core/AttrValues.hpp @@ -265,10 +301,14 @@ include/axom/slam/SubMap.hpp include/axom/slam/Utilities.hpp include/axom/slam/mesh_struct/IA.hpp include/axom/slam/mesh_struct/IA_impl.hpp +include/axom/slam/policies/BivariateSetInterfacePolicies.hpp include/axom/slam/policies/CardinalityPolicies.hpp include/axom/slam/policies/IndirectionPolicies.hpp +include/axom/slam/policies/InterfacePolicies.hpp +include/axom/slam/policies/MapInterfacePolicies.hpp include/axom/slam/policies/OffsetPolicies.hpp include/axom/slam/policies/PolicyTraits.hpp +include/axom/slam/policies/SetInterfacePolicies.hpp include/axom/slam/policies/SizePolicies.hpp include/axom/slam/policies/StridePolicies.hpp include/axom/slam/policies/SubsettingPolicies.hpp @@ -318,8 +358,21 @@ include/axom/spin/internal/linear_bvh/bvh_traverse.hpp include/axom/spin/internal/linear_bvh/bvh_vtkio.hpp include/axom/spin/policy/LinearBVH.hpp include/axom/spin/policy/UniformGridStorage.hpp +lib/cmake/BLTInstallableMacros.cmake +lib/cmake/BLTSetupTargets.cmake +lib/cmake/BLTThirdPartyConfigFlags.cmake lib/cmake/axom-config-version.cmake lib/cmake/axom-config.cmake lib/cmake/axom-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/axom-targets.cmake -lib/libaxom.so +lib/cmake/thirdparty/BLTSetupMPI.cmake +lib/libaxom_core.so +lib/libaxom_inlet.so +lib/libaxom_klee.so +lib/libaxom_lumberjack.so +lib/libaxom_mint.so +lib/libaxom_multimat.so +lib/libaxom_quest.so +lib/libaxom_sidre.so +lib/libaxom_slam.so +lib/libaxom_slic.so diff --git a/science/serac/Makefile b/science/serac/Makefile index fade1138216d..119956a9df76 100644 --- a/science/serac/Makefile +++ b/science/serac/Makefile @@ -10,6 +10,8 @@ WWW= https://github.com/LLNL/serac LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN= fails to build with axom-0.10.1, see https://github.com/LLNL/serac/issues/1313 + LIB_DEPENDS= libaxom.so:science/axom \ libconduit.so:science/conduit \ libhdf5.so:science/hdf5 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501180952.50I9qVHE099034>