From nobody Sun Aug 21 10:11:43 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M9WVl6mQvz4ZQJF; Sun, 21 Aug 2022 10:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M9WVl6KVQz3ptj; Sun, 21 Aug 2022 10:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661076703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s7h4xwBzUk2wuu6JrpQsdEMljcGtTuK3fUzjb5hKjBQ=; b=oXnjpBgF3ogW7Riubs1Cg8TAZZskLtzQ4O9XCWoodzeDo36JfJ6CdzSfgZsWP6EbbyWxJq sFUg1wBpINIL8I3F8z+3QKy0sTUF4NJTQ0+w5buFte0UzecvqjXBuPAbEm6u8s6JLFw6QW aAf9L7AP6Ns3KodDpD4FuA/lTLIQqIvMgE+duFC110Hs1GjuZE/wIdEPPz4UTXyiOKPobT pxwxBRoeF7GMAESVJoETReqOcr1xPzCpcZo5/Hy6sTWPzXNnazoJrzA4uB88U8eZJYSvKr xI3GnGUah/tG+SfVj1regSJqkicGXCiq9eSdRQ/83QEHS2gCF1Q6YNGuZTgkOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M9WVl5Mrsz16Qq; Sun, 21 Aug 2022 10:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27LABh0l004640; Sun, 21 Aug 2022 10:11:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27LABhXH004639; Sun, 21 Aug 2022 10:11:43 GMT (envelope-from git) Date: Sun, 21 Aug 2022 10:11:43 GMT Message-Id: <202208211011.27LABhXH004639@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: d3f13fc91cf0 - main - science/axom: Add options LUA MFEM MPI OPENMP; Simplify tests List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3f13fc91cf0c08177b8a1731b053be89145b39a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661076703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s7h4xwBzUk2wuu6JrpQsdEMljcGtTuK3fUzjb5hKjBQ=; b=D2Iocu3982etXZmhGpokpr6JRaRKBZfh+eeyIUq5J4hB0s3rHmGeRjOzPuOshruV/AhSuN DXuCKqHARb03AZdTcR+7o8eF6Mzs7DixOks1uPRd+pxIGRpbsOaSjtdXFxbnpEiU1gay0v G4WnCAFsmjdp7Rw9VfI3obaJBuiVRLBxRICYv3KME54Qh5IrAJoX5SM8uGcSQhuCCFwKH0 GZPeft3ebZodclU6BY8XmdF84U3qIk4vstWvf80C55f1N3dEWgYQlyzMC/8RNZimiQQdVq tuacf4Ju+yUYA65QDHQgsry9mvrScOQfSYHD9UIisBP1rWmC1sK2EdtE5tVkUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661076703; a=rsa-sha256; cv=none; b=OD39T93FPS/gYbOF6wy/Bf/hIanJBhvWBMbyDnp2o1KhxTi9Q8FMl2QvYl/jzpyql7tzlm Kg4EXDRMTyIGXo+mKWk3dKFJ4GnywfyIHT3PJlg6htHIoVUb8hh4uknMku4v/mSxA/2OmU PQHuB6hrKxIjbqDd2AvRBcaI6rUFuaO8hyPpOTZOzN/JySRKLRTwFebsk+owMmVwvi+LOs HwI5O/460CWNw2d1NnzQYJ9U1wv/RSuJZfQT4e2ihK3pjr3UcImpMO4uUqW9WF6Xig83+S yeHwV07TWtkpFndOUSp6kZGm4RvZfainIVdMPMHALhyBZw7xUEk2qUJI9l6/2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3f13fc91cf0c08177b8a1731b053be89145b39a commit d3f13fc91cf0c08177b8a1731b053be89145b39a Author: Yuri Victorovich AuthorDate: 2022-08-21 10:10:56 +0000 Commit: Yuri Victorovich CommitDate: 2022-08-21 10:11:41 +0000 science/axom: Add options LUA MFEM MPI OPENMP; Simplify tests --- science/axom/Makefile | 34 +++++++++++++++++----- .../files/patch-cmake_thirdparty_FindLUA.cmake | 24 +++++++++++++++ science/axom/pkg-plist | 23 +++++++++++++++ 3 files changed, 73 insertions(+), 8 deletions(-) diff --git a/science/axom/Makefile b/science/axom/Makefile index f88950d32194..bea2ec1af391 100644 --- a/science/axom/Makefile +++ b/science/axom/Makefile @@ -1,7 +1,7 @@ PORTNAME= axom DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -20,7 +20,7 @@ LIB_DEPENDS= libconduit.so:science/conduit \ libsz.so:science/libaec RUN_DEPENDS= sparsehash>0:devel/sparsehash -USES= cmake compiler:c++11-lang +USES= cmake:testing compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= LLNL @@ -30,8 +30,10 @@ GH_TUPLE= LLNL:axom_data:b3d8e6f:axom_data/../data \ CMAKE_OFF= AXOM_ENABLE_DOCS AXOM_ENABLE_EXAMPLES AXOM_ENABLE_TESTS FREEBSD_ENABLE_EXAMPLES CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_TESTING_ON= AXOM_ENABLE_TESTS CMAKE_ARGS= -DCONDUIT_DIR=${LOCALBASE} \ - -DHDF5_DIR=${LOCALBASE} + -DHDF5_DIR=${LOCALBASE} \ + -DBLT_CXX_STD=c++14 # BLT_CXX_STD=c++14 is required for LLNL/serac LDFLAGS+= -lexecinfo @@ -39,13 +41,29 @@ WRKSRC_SUBDIR= src CONFLICTS_INSTALL= libfmt # bundles and installs an incompatible libfmt version: https://github.com/LLNL/axom/issues/561, axom headers include fmt unnecessarily +OPTIONS_DEFINE= LUA MFEM MPI OPENMP +OPTIONS_DEFAULT= LUA MFEM MPI #OPENMP LUA,MFEM,MPI are required for LLNL/serac +OPTIONS_SUB= yes + +LUA_USES= lua:54 +LUA_CMAKE_ON= -DLUA_DIR=${LUA_BASE} \ + -DFREEBSD_LUA_VER_STR=${LUA_VER_STR} \ + -DFREEBSD_LUA_VER=${LUA_VER} + +MFEM_DESC= Use mfem - library for finite element methods +MFEM_CMAKE_ON= -DMFEM_DIR=${LOCALBASE} +MFEM_LIB_DEPENDS= libmfem.so:math/mfem + +MPI_CMAKE_BOOL= ENABLE_MPI +MPI_BUILD_DEPENDS= openmpi>0:net/openmpi +MPI_RUN_DEPENDS= openmpi>0:net/openmpi + +OPENMP_CMAKE_BOOL= ENABLE_OPENMP +OPENMP_BROKEN= https://github.com/LLNL/axom/issues/911 + post-install: # installs headers of a third party library sparsehash: https://github.com/LLNL/axom/issues/365 @${RM} -r ${STAGEDIR}${PREFIX}/include/sparsehash -do-test: - @cd ${BUILD_WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DAXOM_ENABLE_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test +# 2 tests are known to fail, see https://github.com/LLNL/axom/issues/912 .include diff --git a/science/axom/files/patch-cmake_thirdparty_FindLUA.cmake b/science/axom/files/patch-cmake_thirdparty_FindLUA.cmake new file mode 100644 index 000000000000..50702987762e --- /dev/null +++ b/science/axom/files/patch-cmake_thirdparty_FindLUA.cmake @@ -0,0 +1,24 @@ +- 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 00f1e37e0cde..0e65c4994e67 100644 --- a/science/axom/pkg-plist +++ b/science/axom/pkg-plist @@ -1,3 +1,5 @@ +%%MPI%%bin/convert_sidre_protocol +%%MFEM%%bin/data_collection_util bin/mesh_tester include/axom/CLI11.hpp include/axom/config.hpp @@ -65,6 +67,7 @@ include/axom/inlet/Inlet.hpp include/axom/inlet/InletVector.hpp include/axom/inlet/JSONReader.hpp include/axom/inlet/JSONSchemaWriter.hpp +%%LUA%%include/axom/inlet/LuaReader.hpp include/axom/inlet/Proxy.hpp include/axom/inlet/Reader.hpp include/axom/inlet/SphinxWriter.hpp @@ -83,6 +86,15 @@ include/axom/klee/KleeError.hpp include/axom/klee/Shape.hpp include/axom/klee/ShapeSet.hpp include/axom/klee/Units.hpp +%%MPI%%include/axom/lumberjack.hpp +%%MPI%%include/axom/lumberjack/BinaryTreeCommunicator.hpp +%%MPI%%include/axom/lumberjack/Combiner.hpp +%%MPI%%include/axom/lumberjack/Communicator.hpp +%%MPI%%include/axom/lumberjack/Lumberjack.hpp +%%MPI%%include/axom/lumberjack/MPIUtility.hpp +%%MPI%%include/axom/lumberjack/Message.hpp +%%MPI%%include/axom/lumberjack/RootCommunicator.hpp +%%MPI%%include/axom/lumberjack/TextEqualityCombiner.hpp include/axom/mint.hpp include/axom/mint/config.hpp include/axom/mint/deprecated/MCArray.hpp @@ -169,8 +181,11 @@ include/axom/quest.hpp include/axom/quest/AllNearestNeighbors.hpp include/axom/quest/Discretize.hpp include/axom/quest/InOutOctree.hpp +%%MFEM%%include/axom/quest/IntersectionShaper.hpp include/axom/quest/MeshTester.hpp include/axom/quest/PointInCell.hpp +%%MFEM%%include/axom/quest/SamplingShaper.hpp +%%MFEM%%include/axom/quest/Shaper.hpp include/axom/quest/SignedDistance.hpp include/axom/quest/detail/AllNearestNeighbors_detail.hpp include/axom/quest/detail/Discretize_detail.hpp @@ -181,10 +196,12 @@ include/axom/quest/detail/inout/InOutOctreeMeshDumper.hpp include/axom/quest/detail/inout/InOutOctreeStats.hpp include/axom/quest/detail/inout/InOutOctreeValidator.hpp include/axom/quest/detail/inout/MeshWrapper.hpp +%%MFEM%%include/axom/quest/detail/shaping/shaping_helpers.hpp 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 +%%MPI%%include/axom/quest/readers/PSTLReader.hpp include/axom/quest/readers/STLReader.hpp include/axom/sidre.hpp include/axom/sidre/core/Array.hpp @@ -196,11 +213,14 @@ include/axom/sidre/core/Group.hpp include/axom/sidre/core/ItemCollection.hpp include/axom/sidre/core/Iterator.hpp include/axom/sidre/core/ListCollection.hpp +%%MFEM%%include/axom/sidre/core/MFEMSidreDataCollection.hpp include/axom/sidre/core/MapCollection.hpp include/axom/sidre/core/SidreDataTypeIds.h include/axom/sidre/core/SidreTypes.hpp include/axom/sidre/core/View.hpp include/axom/sidre/core/sidre.hpp +%%MPI%%include/axom/sidre/spio/IOBaton.hpp +%%MPI%%include/axom/sidre/spio/IOManager.hpp include/axom/slam.hpp include/axom/slam/BitSet.hpp include/axom/slam/BivariateMap.hpp @@ -241,6 +261,9 @@ include/axom/slic/interface/slic.hpp include/axom/slic/interface/slic_macros.hpp include/axom/slic/internal/stacktrace.hpp include/axom/slic/streams/GenericOutputStream.hpp +%%MPI%%include/axom/slic/streams/LumberjackStream.hpp +%%MPI%%include/axom/slic/streams/SynchronizedStream.hpp +%%LUA%%include/axom/sol.hpp include/axom/sparsehash/README include/axom/sparsehash/dense_hash_map include/axom/sparsehash/dense_hash_set