diff --git a/science/conduit/Makefile b/science/conduit/Makefile index c12aadfbdc46..3f6eb679a4f8 100644 --- a/science/conduit/Makefile +++ b/science/conduit/Makefile @@ -1,51 +1,54 @@ PORTNAME= conduit DISTVERSIONPREFIX= v -DISTVERSION= 0.9.5 -PORTREVISION= 2 +DISTVERSION= 0.9.6 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org COMMENT= Simplified data exchange for HPC simulations WWW= https://github.com/LLNL/conduit LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/../LICENSE LIB_DEPENDS= libhdf5.so:science/hdf5 \ libsiloh5.so:science/silo USES= cmake:testing compiler:c++11-lang fortran USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= LLNL GH_TUPLE= LLNL:blt:058b312:blt/blt \ Alpine-DAV:spack_configs:26a5d10:spack_configs/../scripts/uberenv_configs/spack_configs \ LLNL:uberenv:5430066:LLNL_uberenv/../scripts/uberenv WRKSRC_SUBDIR= src CMAKE_ON= ENABLE_FORTRAN CMAKE_OFF= CONDUIT_ENABLE_TESTS ENABLE_DOCS ENABLE_EXAMPLES ENABLE_GIT ENABLE_TESTS ENABLE_VALGRIND CMAKE_ARGS= -DHDF5_DIR=${LOCALBASE} \ -DSILO_DIR=${LOCALBASE} \ -DFREEBSD_EXAMPLESDIR=${EXAMPLESDIR} # complete list of optional dependencies (enabled with *_DIR): https://llnl-conduit.readthedocs.io/en/latest/building.html #CMAKE_ARGS+= -DADIOS_DIR=${LOCALBASE} # broken, see https://github.com/LLNL/conduit/issues/841 CMAKE_TESTING_ON= ENABLE_TESTS OPTIONS_SINGLE= MPI OPTIONS_SINGLE_MPI= NOMPI MPICH OPENMPI OPTIONS_DEFAULT= MPICH OPTIONS_SUB= yes NOMPI_DESC= Build without parallel processing support MPICH_USES= mpi:mpich MPICH_CMAKE_ON= -DENABLE_MPI=ON OPENMPI_USES= mpi:openmpi OPENMPI_CMAKE_ON= -DENABLE_MPI=ON +# workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=297240: +OPENMPI_CMAKE_ON+= -DMPI_C_COMPILER:PATH=${MPICC} \ + -DMPI_CXX_COMPILER:PATH=${MPICXX} \ + -DMPI_CXX_HEADER_DIR:PATH=${MPI_HOME}/include # tests as of 0.9.5: 100% tests passed, 0 tests failed out of 3 .include diff --git a/science/conduit/distinfo b/science/conduit/distinfo index 959302ee4603..28ef309c43ed 100644 --- a/science/conduit/distinfo +++ b/science/conduit/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1760810723 -SHA256 (LLNL-conduit-v0.9.5_GH0.tar.gz) = 1a635050670644ffd3ef55351f96ac0f6bb15789b23643557e7ddacbcbf5460f -SIZE (LLNL-conduit-v0.9.5_GH0.tar.gz) = 107725385 +TIMESTAMP = 1778514580 +SHA256 (LLNL-conduit-v0.9.6_GH0.tar.gz) = d5331c6c69d2de7dff733d43342d69f7ec6333702f8a0166a77617b6511a2833 +SIZE (LLNL-conduit-v0.9.6_GH0.tar.gz) = 107904374 SHA256 (LLNL-blt-058b312_GH0.tar.gz) = 93dd61bf6c52c17ce6a383687ccc7e589c250ab5997608e37623695a772d7e3d SIZE (LLNL-blt-058b312_GH0.tar.gz) = 1281374 SHA256 (Alpine-DAV-spack_configs-26a5d10_GH0.tar.gz) = 16e382c4054a21ddc6acd4319ec14e3f3c68921fe879ee470d011cc96e6a98b1 SIZE (Alpine-DAV-spack_configs-26a5d10_GH0.tar.gz) = 16755 SHA256 (LLNL-uberenv-5430066_GH0.tar.gz) = 7006065d78cbaa2c775c508b854fe8543b785078ee48889c9906f02ce2f37f0d SIZE (LLNL-uberenv-5430066_GH0.tar.gz) = 43575 diff --git a/science/conduit/files/patch-config_ConduitConfig.cmake.in b/science/conduit/files/patch-config_ConduitConfig.cmake.in new file mode 100644 index 000000000000..d3e061f083fa --- /dev/null +++ b/science/conduit/files/patch-config_ConduitConfig.cmake.in @@ -0,0 +1,11 @@ +--- config/ConduitConfig.cmake.in.orig 2026-05-11 14:45:51.851143000 -0400 ++++ config/ConduitConfig.cmake.in 2026-05-11 14:46:43.772858000 -0400 +@@ -56,6 +56,8 @@ + include(${CONDUIT_CMAKE_CONFIG_DIR}/conduit_setup_deps.cmake) + + # include targets exported by cmake ++include(CMakeFindDependencyMacro) ++find_dependency(MPI COMPONENTS C) + include(${CONDUIT_CMAKE_CONFIG_DIR}/conduit.cmake) + + # finally setup our final imported targets diff --git a/science/conduit/pkg-plist b/science/conduit/pkg-plist index 0fa96dbf5a20..c894872f1305 100644 --- a/science/conduit/pkg-plist +++ b/science/conduit/pkg-plist @@ -1,161 +1,168 @@ bin/conduit_adjset_validate bin/conduit_blueprint_verify bin/conduit_generate_data %%MPICH%%bin/conduit_generate_data_mpi %%OPENMPI%%bin/conduit_generate_data_mpi bin/conduit_relay_entangle.py bin/conduit_relay_io_convert bin/conduit_relay_io_ls bin/conduit_relay_node_viewer include/conduit/conduit.h include/conduit/conduit.hpp include/conduit/conduit.mod include/conduit/conduit_annotations.hpp include/conduit/conduit_bitwidth_style_types.h include/conduit/conduit_blueprint.h include/conduit/conduit_blueprint.hpp include/conduit/conduit_blueprint.mod include/conduit/conduit_blueprint_config.h include/conduit/conduit_blueprint_curves.hpp include/conduit/conduit_blueprint_exports.h include/conduit/conduit_blueprint_mcarray.h include/conduit/conduit_blueprint_mcarray.hpp include/conduit/conduit_blueprint_mcarray.mod include/conduit/conduit_blueprint_mcarray_examples.hpp include/conduit/conduit_blueprint_mesh.h include/conduit/conduit_blueprint_mesh.hpp include/conduit/conduit_blueprint_mesh.mod include/conduit/conduit_blueprint_mesh_examples.hpp include/conduit/conduit_blueprint_mesh_examples_generate.hpp include/conduit/conduit_blueprint_mesh_examples_gyre.hpp include/conduit/conduit_blueprint_mesh_examples_julia.hpp include/conduit/conduit_blueprint_mesh_examples_polystar.hpp include/conduit/conduit_blueprint_mesh_examples_related_boundary.hpp include/conduit/conduit_blueprint_mesh_examples_rz_cylinder.hpp include/conduit/conduit_blueprint_mesh_examples_tiled.hpp include/conduit/conduit_blueprint_mesh_examples_venn.hpp include/conduit/conduit_blueprint_mesh_flatten.hpp include/conduit/conduit_blueprint_mesh_kdtree.hpp +include/conduit/conduit_blueprint_mesh_matset_accessor.hpp include/conduit/conduit_blueprint_mesh_topology_metadata.hpp include/conduit/conduit_blueprint_mesh_utils.hpp +include/conduit/conduit_blueprint_mesh_utils_iterate_elements.hpp %%NO_NOMPI%%include/conduit/conduit_blueprint_mpi.hpp %%NO_NOMPI%%include/conduit/conduit_blueprint_mpi_mesh.h %%NO_NOMPI%%include/conduit/conduit_blueprint_mpi_mesh.hpp %%NO_NOMPI%%include/conduit/conduit_blueprint_mpi_mesh_examples.hpp %%NO_NOMPI%%include/conduit/conduit_blueprint_mpi_mesh_flatten.hpp %%NO_NOMPI%%include/conduit/conduit_blueprint_mpi_mesh_partition.hpp %%NO_NOMPI%%include/conduit/conduit_blueprint_mpi_mesh_utils.hpp include/conduit/conduit_blueprint_ndarray_index.hpp include/conduit/conduit_blueprint_o2mrelation.hpp include/conduit/conduit_blueprint_o2mrelation_examples.hpp include/conduit/conduit_blueprint_o2mrelation_index.hpp include/conduit/conduit_blueprint_o2mrelation_iterator.hpp include/conduit/conduit_blueprint_o2mrelation_utils.hpp include/conduit/conduit_blueprint_table.h include/conduit/conduit_blueprint_table.hpp include/conduit/conduit_blueprint_table.mod include/conduit/conduit_blueprint_table_examples.hpp include/conduit/conduit_blueprint_zfparray.hpp include/conduit/conduit_config.h include/conduit/conduit_config.hpp include/conduit/conduit_core.hpp include/conduit/conduit_cpp_to_c.hpp include/conduit/conduit_data_accessor.hpp include/conduit/conduit_data_array.hpp include/conduit/conduit_data_type.hpp include/conduit/conduit_datatype.h include/conduit/conduit_endianness.hpp include/conduit/conduit_endianness_enum.mod include/conduit/conduit_endianness_types.h include/conduit/conduit_error.hpp include/conduit/conduit_execution.hpp include/conduit/conduit_execution_omp.hpp include/conduit/conduit_execution_serial.hpp include/conduit/conduit_exports.h +include/conduit/conduit_fixed_size_map.hpp +include/conduit/conduit_fixed_size_vector.hpp +include/conduit/conduit_fmt/args.h +include/conduit/conduit_fmt/base.h include/conduit/conduit_fmt/chrono.h include/conduit/conduit_fmt/color.h include/conduit/conduit_fmt/compile.h include/conduit/conduit_fmt/conduit_fmt.h include/conduit/conduit_fmt/core.h include/conduit/conduit_fmt/format-inl.h include/conduit/conduit_fmt/format.h -include/conduit/conduit_fmt/locale.h include/conduit/conduit_fmt/os.h include/conduit/conduit_fmt/ostream.h -include/conduit/conduit_fmt/posix.h include/conduit/conduit_fmt/printf.h include/conduit/conduit_fmt/ranges.h +include/conduit/conduit_fmt/std.h +include/conduit/conduit_fmt/xchar.h include/conduit/conduit_generator.hpp +include/conduit/conduit_geometry_vector.hpp include/conduit/conduit_log.hpp include/conduit/conduit_node.h include/conduit/conduit_node.hpp include/conduit/conduit_node_iterator.hpp include/conduit/conduit_obj.mod include/conduit/conduit_range_vector.hpp include/conduit/conduit_relay.h include/conduit/conduit_relay.hpp include/conduit/conduit_relay.mod include/conduit/conduit_relay_config.h include/conduit/conduit_relay_exports.h include/conduit/conduit_relay_hdf5.hpp include/conduit/conduit_relay_io.h include/conduit/conduit_relay_io.hpp include/conduit/conduit_relay_io_blueprint.hpp include/conduit/conduit_relay_io_csv.hpp include/conduit/conduit_relay_io_handle.hpp include/conduit/conduit_relay_io_handle_api.hpp include/conduit/conduit_relay_io_handle_sidre.hpp include/conduit/conduit_relay_io_handle_sidre_api.hpp include/conduit/conduit_relay_io_hdf5.hpp include/conduit/conduit_relay_io_hdf5_api.hpp include/conduit/conduit_relay_io_identify_protocol.hpp include/conduit/conduit_relay_io_identify_protocol_api.hpp include/conduit/conduit_relay_io_silo.hpp include/conduit/conduit_relay_io_silo_api.hpp %%NO_NOMPI%%include/conduit/conduit_relay_mpi.hpp %%NO_NOMPI%%include/conduit/conduit_relay_mpi_io.h %%NO_NOMPI%%include/conduit/conduit_relay_mpi_io.hpp %%NO_NOMPI%%include/conduit/conduit_relay_mpi_io_blueprint.hpp %%NO_NOMPI%%include/conduit/conduit_relay_mpi_io_hdf5.hpp %%NO_NOMPI%%include/conduit/conduit_relay_mpi_io_silo.hpp include/conduit/conduit_relay_silo.hpp include/conduit/conduit_relay_web.hpp include/conduit/conduit_relay_web_node_viewer_server.hpp include/conduit/conduit_schema.hpp include/conduit/conduit_utils.h include/conduit/conduit_utils.hpp include/conduit/conduit_vector_view.hpp lib/cmake/conduit/ConduitConfig.cmake lib/cmake/conduit/ConduitConfigVersion.cmake lib/cmake/conduit/conduit-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/conduit/conduit.cmake lib/cmake/conduit/conduit_setup_deps.cmake lib/cmake/conduit/conduit_setup_targets.cmake lib/libconduit.so lib/libconduit_blueprint.so %%NO_NOMPI%%lib/libconduit_blueprint_mpi.so lib/libconduit_relay.so %%NO_NOMPI%%lib/libconduit_relay_mpi.so %%NO_NOMPI%%lib/libconduit_relay_mpi_io.so %%DATADIR%%/conduit_config.mk %%DATADIR%%/web_clients/node_viewer/index.html %%DATADIR%%/web_clients/node_viewer/resources/d3/LICENSE %%DATADIR%%/web_clients/node_viewer/resources/d3/d3.v3.min.js %%DATADIR%%/web_clients/node_viewer/resources/fattable/LICENSE %%DATADIR%%/web_clients/node_viewer/resources/fattable/Makefile %%DATADIR%%/web_clients/node_viewer/resources/fattable/README.md %%DATADIR%%/web_clients/node_viewer/resources/fattable/bower.json %%DATADIR%%/web_clients/node_viewer/resources/fattable/fattable.css %%DATADIR%%/web_clients/node_viewer/resources/fattable/fattable.js %%DATADIR%%/web_clients/node_viewer/resources/fattable/fattable.min.js %%DATADIR%%/web_clients/node_viewer/resources/launcher.js %%DATADIR%%/web_clients/node_viewer/resources/pure/LICENSE.md %%DATADIR%%/web_clients/node_viewer/resources/pure/pure-0.5.0-min.css %%DATADIR%%/web_clients/node_viewer/resources/pure/pure-0.6.0-min.css %%DATADIR%%/web_clients/node_viewer/resources/search-table.js %%DATADIR%%/web_clients/node_viewer/resources/tree.js %%DATADIR%%/web_clients/node_viewer/resources/treemap.js %%DATADIR%%/web_clients/node_viewer/resources/value-table.js %%DATADIR%%/web_clients/node_viewer/resources/visualizer-utils.js %%DATADIR%%/web_clients/node_viewer/resources/visualizer.js %%DATADIR%%/web_clients/node_viewer/visualizer.css