SST Master Branch Merger: Auto Create Pull Request to Promote from devel to master - All Tests Ran Clean

src/sst/elements/iris/Makefile.am

@@ -0,0 +1,112 @@
+# -*- Makefile -*-
+#
+#
+
+SUBDIRS = libfabric
+
+AM_CPPFLAGS += \
+	$(MPI_CPPFLAGS) \
+        -I$(top_srcdir)/src/sst/elements/iris \
+        -I$(top_srcdir)/src/sst/elements/mercury \
+        -I$(top_srcdir)/src/sst/elements
+
+# unpleasant hack to make vintage automake (e.g. 1.13.4) work
+AM_LIBTOOLFLAGS = --tag=CXX
+
+compdir = $(pkglibdir)
+comp_LTLIBRARIES = libsumi.la
+libsumi_la_SOURCES = \
+  sumi/allgather.cc \
+  sumi/allgatherv.cc  \
+  sumi/allreduce.cc \
+  sumi/alltoall.cc \
+  sumi/alltoallv.cc \
+  sumi/bcast.cc \
+  sumi/collective.cc \
+  sumi/collective_actor.cc \
+  sumi/collective_message.cc \
+  sumi/communicator.cc \
+  sumi/dense_rank_map.cc \
+  sumi/gather.cc \
+  sumi/gatherv.cc \
+  sumi/message.cc \
+  sumi/monitor.cc \
+  sumi/reduce.cc \
+  sumi/reduce_scatter.cc \
+  sumi/scan.cc \
+  sumi/scatter.cc \
+  sumi/scatterv.cc  \
+  sumi/sim_transport.cc \
+  sumi/sumi.cc \
+  sumi/sumi_thread.cc
+
+library_includedir=$(includedir)/sst/elements/iris
+
+nobase_library_include_HEADERS = \
+  sumi/allgather.h \
+  sumi/allgatherv.h \
+  sumi/allreduce.h \
+  sumi/alltoall.h \
+  sumi/alltoallv.h \
+  sumi/bcast.h \
+  sumi/collective.h \
+  sumi/collective_actor.h \
+  sumi/collective_actor_fwd.h \
+  sumi/collective_message.h \
+  sumi/collective_message_fwd.h \
+  sumi/comm_functions.h \
+  sumi/communicator.h \
+  sumi/communicator_fwd.h \
+  sumi/dense_rank_map.h \
+  sumi/gather.h \
+  sumi/gatherv.h \
+  sumi/message.h \
+  sumi/message_fwd.h \
+  sumi/monitor.h \
+  sumi/network_id.h \
+  sumi/null_buffer.h \
+  sumi/options.h \
+  sumi/reduce.h \
+  sumi/reduce_scatter.h \
+  sumi/scan.h \
+  sumi/scatter.h \
+  sumi/scatterv.h \
+  sumi/sim_transport.h \
+  sumi/sumi.h \
+  sumi/sumi_thread.h \
+  sumi/timeout.h \
+  sumi/transport.h \
+  sumi/transport_fwd.h
+
+if !SST_ENABLE_PREVIEW_BUILD
+libsumi_la_SOURCES += $(deprecated_libsumi_sources)
+endif
+
+EXTRA_DIST =
+deprecated_EXTRA_DIST =
+
+if !SST_ENABLE_PREVIEW_BUILD
+EXTRA_DIST += $(deprecated_EXTRA_DIST)
+endif
+
+libsumi_la_LDFLAGS = -module -avoid-version
+
+install-exec-hook:
+	$(SST_REGISTER_TOOL) SST_ELEMENT_SOURCE     iris=$(abs_srcdir)
+
+# This sed script converts 'od' output to a comma-separated list of byte-
+# values, suitable for #include'ing into an array definition.
+# This can be done much more simply with xxd or hexdump, but those tools
+# are not installed by default on all supported platforms.
+#
+# od:   -v:             Print all data
+#               -t x1:  Print as byte-values, in hex
+# sed:  Script 1:  Remove base-address column from od output
+#               Script 2:  Remove trailing blank line resulting from script 1
+#               Script 3:  Add '0x' prefix, and ',' suffix to each value
+%.inc: %.py
+	od -v -t x1 < $< | sed -e 's/^[^ ]*[ ]*//g' -e '/^\s*$$/d' -e 's/\([0-9a-f]*\)[ $$]*/0x\1,/g' > $@
+
+##########################################################################
+##########################################################################
+##########################################################################

src/sst/elements/iris/configure.m4

@@ -0,0 +1,8 @@
+dnl -*- Autoconf -*-
+
+AC_DEFUN([SST_iris_CONFIG],
+[
+  sst_check_iris="yes"
+  AS_IF([test "$sst_check_iris" = "yes"], [$1], [$2])
+  AC_CONFIG_FILES([src/sst/elements/iris/libfabric/Makefile])
+])

src/sst/elements/iris/libfabric/Makefile.am

@@ -0,0 +1,163 @@
+# -*- Makefile -*-
+#
+#
+
+sstmac_sources = \
+  prov/sstmac/src/sstmac_av.cc \
+  prov/sstmac/src/sstmac_cm.cc \
+  prov/sstmac/src/sstmac_cntr.cc \
+  prov/sstmac/src/sstmac_cq.cc \
+  prov/sstmac/src/sstmac_dom.cc \
+  prov/sstmac/src/sstmac_ep.cc \
+  prov/sstmac/src/sstmac_eq.cc \
+  prov/sstmac/src/sstmac_fabric.cc \
+  prov/sstmac/src/sstmac_mr.cc \
+  prov/sstmac/src/sstmac_poll.cc \
+  prov/sstmac/src/sstmac_sep.cc \
+  prov/sstmac/src/sstmac_wait.cc \
+  prov/sstmac/src/sstmac_sumi.cpp
+
+sstmac_headers = \
+  prov/sstmac/include/fi_ext_sstmac.h \
+  prov/sstmac/include/fi_ext_sstmac.h \
+  prov/sstmac/include/sstmac.h \
+  prov/sstmac/include/sstmac_av.h \
+  prov/sstmac/include/sstmac_ep.h \
+  prov/sstmac/include/sstmac_poll.h \
+  prov/sstmac/include/sstmac_wait.h
+
+sstmac_rdma_headers = \
+  prov/sstmac/include/rdma/fi_direct.h \
+  prov/sstmac/include/rdma/fi_direct_atomic.h \
+  prov/sstmac/include/rdma/fi_direct_atomic_def.h \
+  prov/sstmac/include/rdma/fi_direct_cm.h \
+  prov/sstmac/include/rdma/fi_direct_domain.h \
+  prov/sstmac/include/rdma/fi_direct_endpoint.h \
+  prov/sstmac/include/rdma/fi_direct_eq.h \
+  prov/sstmac/include/rdma/fi_direct_rma.h \
+  prov/sstmac/include/rdma/fi_direct_tagged.h \
+  prov/sstmac/include/rdma/fi_direct_trigger.h
+
+common_sources = \
+  src/log.c \
+  src/common.c \
+  src/rbtree.c \
+  src/indexer.c \
+  src/perf.c \
+  src/mem.c \
+  src/iov.c \
+  src/shared/ofi_str.c \
+  src/abi_1_0.c \
+  src/unix/osd.c \
+  src/enosys.c \
+  src/fabric.c \
+  src/fasthash.c \
+  src/var.c \
+  src/fi_tostr.c \
+  src/tree.c \
+  prov/util/src/util_atomic.c \
+  prov/util/src/util_attr.c \
+  prov/util/src/util_av.c \
+  prov/util/src/util_cq.c \
+  prov/util/src/util_cntr.c \
+  prov/util/src/util_domain.c \
+  prov/util/src/util_ep.c \
+  prov/util/src/util_pep.c \
+  prov/util/src/util_eq.c \
+  prov/util/src/util_fabric.c \
+  prov/util/src/util_main.c \
+  prov/util/src/util_poll.c \
+  prov/util/src/util_wait.c \
+  prov/util/src/util_buf.c \
+  prov/util/src/util_mr_map.c \
+  prov/util/src/util_ns.c \
+  prov/util/src/util_shm.c \
+  prov/util/src/util_mem_monitor.c \
+  prov/util/src/util_mem_hooks.c \
+  prov/util/src/util_mr_cache.c \
+  prov/util/src/util_coll.c
+
+libfabric_sources = \
+  prov/hook/src/hook_cm.c \
+  prov/hook/src/hook_cq.c \
+  prov/hook/src/hook_xfer.c \
+  prov/hook/src/hook_ep.c \
+  prov/hook/src/hook_cntr.c \
+  prov/hook/src/hook_av.c \
+  prov/hook/src/hook.c \
+  prov/hook/src/hook_wait.c \
+  prov/hook/src/hook_domain.c \
+  prov/hook/src/hook_eq.c
+
+libfabric_headers = \
+  include/ofi.h \
+  include/ofi_abi.h \
+  include/ofi_atom.h \
+  include/ofi_enosys.h \
+  include/ofi_file.h \
+  include/ofi_hook.h \
+  include/ofi_indexer.h \
+  include/ofi_iov.h \
+  include/ofi_list.h \
+  include/ofi_bitmask.h \
+  include/shared/ofi_str.h \
+  include/ofi_lock.h \
+  include/ofi_mem.h \
+  include/ofi_osd.h \
+  include/ofi_proto.h \
+  include/ofi_recvwin.h \
+  include/ofi_rbuf.h \
+  include/ofi_shm.h \
+  include/ofi_signal.h \
+  include/ofi_epoll.h \
+  include/ofi_tree.h \
+  include/ofi_util.h \
+  include/ofi_atomic.h \
+  include/ofi_mr.h \
+  include/ofi_net.h \
+  include/ofi_perf.h \
+  include/ofi_coll.h \
+  include/fasthash.h \
+  include/rbtree.h \
+  include/uthash.h \
+  include/ofi_prov.h \
+  include/rdma/providers/fi_log.h \
+  include/rdma/providers/fi_prov.h 
+
+rdmainclude_headers = \
+  prov/sstmac/include/fi_ext_sstmac.h \
+  include/rdma/fabric.h \
+  include/rdma/fi_atomic.h \
+  include/rdma/fi_cm.h \
+  include/rdma/fi_collective.h \
+  include/rdma/fi_domain.h \
+  include/rdma/fi_eq.h \
+  include/rdma/fi_rma.h \
+  include/rdma/fi_endpoint.h \
+  include/rdma/fi_errno.h \
+  include/rdma/fi_tagged.h \
+  include/rdma/fi_trigger.h
+
+nodist_rdmainclude_headers = \
+  prov/sstmac/include/rdma/fi_direct_domain.h \
+  prov/sstmac/include/rdma/fi_direct_endpoint.h \
+  prov/sstmac/include/rdma/fi_direct_tagged.h \
+  prov/sstmac/include/rdma/fi_direct_rma.h \
+  prov/sstmac/include/rdma/fi_direct_atomic_def.h \
+  prov/sstmac/include/rdma/fi_direct_atomic.h \
+  prov/sstmac/include/rdma/fi_direct_cm.h \
+  prov/sstmac/include/rdma/fi_direct_eq.h \
+  prov/sstmac/include/rdma/fi_direct_trigger.h \
+  prov/sstmac/include/rdma/fi_direct.h
+
+#compdir = $(pkglibdir)
+#comp_LTLIBRARIES = libfabric.la
+#libfabric_la_SOURCES = \
+#  $(sstmac_sources) \
+#  $(sstmac_headers) \
+#  $(sstmac_rdma_headers) \
+#  $(common_sources) \
+#  $(libfabric_sources) \
+#  $(libfabric_headers) \
+#  $(rdmainclude_headers) \
+#  $(nodist_rdmainclude_headers)

src/sst/elements/iris/libfabric/include/fasthash.h

@@ -0,0 +1,56 @@
+/* The MIT License
+
+   Copyright (C) 2012 Zilong Tan (eric.zltan@gmail.com)
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation
+   files (the "Software"), to deal in the Software without
+   restriction, including without limitation the rights to use, copy,
+   modify, merge, publish, distribute, sublicense, and/or sell copies
+   of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+*/
+
+#ifndef _FASTHASH_H
+#define _FASTHASH_H
+
+#include <stdint.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * fasthash32 - 32-bit implementation of fasthash
+ * @buf:  data buffer
+ * @len:  data size
+ * @seed: the seed
+ */
+	uint32_t fasthash32(const void *buf, size_t len, uint32_t seed);
+
+/**
+ * fasthash64 - 64-bit implementation of fasthash
+ * @buf:  data buffer
+ * @len:  data size
+ * @seed: the seed
+ */
+	uint64_t fasthash64(const void *buf, size_t len, uint64_t seed);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif