Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions opal/mca/pmix/pmix112/pmix/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# All rights reserved.
# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand Down Expand Up @@ -60,24 +60,39 @@ include src/server/Makefile.am
include src/sec/Makefile.am
include src/common/Makefile.am

include src/atomics/asm/Makefile.am
include src/atomics/sys/Makefile.include

if WANT_DSTORE
include src/sm/Makefile.am
include src/dstore/Makefile.am
endif

if PMIX_EMBEDDED_MODE
noinst_LTLIBRARIES = libpmix.la
noinst_LTLIBRARIES = libpmix.la libasm.la
libpmix_la_SOURCES = $(headers) $(sources)
libpmix_la_LDFLAGS =

else

lib_LTLIBRARIES = libpmix.la
lib_LTLIBRARIES = libpmix.la libasm.la
libpmix_la_SOURCES = $(headers) $(sources)
libpmix_la_LDFLAGS = -version-info $(libpmix_so_version)
SUBDIRS = . test examples
SUBDIRS = . test examples src/atomics/asm
endif

# ASM Start
if PMIX_HAVE_ASM_FILE
nodist_libasm_la_SOURCES = src/atomics/asm/atomic-asm.S
libasm_la_DEPENDENCIES = src/atomics/asm/generated/@PMIX_ASM_FILE@
else
nodist_libasm_la_SOURCES =
libasm_la_DEPENDENCIES =
endif

dist_libasm_la_SOURCES = src/atomics/asm/asm.c
# ASM End

if WANT_INSTALL_HEADERS
pmixdir = $(pmixincludedir)/$(subdir)
nobase_pmix_HEADERS = $(headers)
Expand All @@ -99,9 +114,27 @@ EXTRA_DIST += README INSTALL VERSION LICENSE autogen.sh \
test/test_common.h test/cli_stages.h \
test/server_callbacks.h test/test_fence.h \
test/test_publish.h test/test_resolve_peers.h \
test/test_spawn.h test/utils.h test/test_cd.h
test/test_spawn.h test/utils.h test/test_cd.h \
src/atomics/asm/asm-data.txt \
src/atomics/asm/generate-asm.pl \
src/atomics/asm/generate-all-asm.pl \
src/atomics/asm/base/aix.conf \
src/atomics/asm/base/default.conf \
src/atomics/asm/base/X86_64.asm \
src/atomics/asm/base/ARM.asm \
src/atomics/asm/base/IA32.asm \
src/atomics/asm/base/IA64.asm \
src/atomics/asm/base/MIPS.asm \
src/atomics/asm/base/POWERPC32.asm \
src/atomics/asm/base/POWERPC64.asm \
src/atomics/asm/base/SPARCV9_32.asm \
src/atomics/asm/base/SPARCV9_64.asm


#
# Copy over all the generated files
#
dist-hook:
mkdir "${distdir}/src/atomics/asm/generated"
$(PERL) "$(top_srcdir)/src/atomics/asm/generate-all-asm.pl" "$(PERL)" "$(srcdir)/src/atomics/asm" "$(distdir)/src/atomics/asm"
env LS_COLORS= sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(PMIX_VERSION)" "$(PMIX_REPO_REV)"

22 changes: 17 additions & 5 deletions opal/mca/pmix/pmix112/pmix/NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015-2016 Intel, Inc. All rights reserved.
# Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
$COPYRIGHT$

Expand All @@ -20,17 +20,29 @@ other, a single NEWS-worthy item might apply to different series. For
example, a bug might be fixed in the master, and then moved to the
current release as well as the "stable" bug fix release branch.

1.2.1
-----
1.2.3 -- TBD
----------------------


1.2.2 -- 21 March 2017
----------------------
- Compiler fix for Sun/Oracle CC (PR #322)
- Fix missing include (PR #326)
- Improve error checking around posix_fallocate (PR #329)
- Fix possible memory corruption (PR #331)


1.2.1 -- 21 Feb. 2017
----------------------
- dstore: Fix data corruption bug in key overwrite cases
- dstore: Performance and scalability fixes
- sm: Use posix_fallocate() before mmap
- pmi1/pmi2: Restore support
- dstore: Fix extension slot size allocation (Issue #280)


1.2.0
-----
1.2.0 -- 14 Dec. 2016
----------------------
- Add shared memory data storage (dstore) option. Default: enabled
Configure option: --disable-dstore
- PMIx_Commit performance improvements
Expand Down
6 changes: 3 additions & 3 deletions opal/mca/pmix/pmix112/pmix/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

major=1
minor=2
release=1
release=3

# greek is used for alpha or beta release tags. If it is non-empty,
# it will be appended to the version number. It does not have to be
Expand All @@ -31,7 +31,7 @@ greek=
# command, or with the date (if "git describe" fails) in the form of
# "date<date>".

repo_rev=gitef61cf0a
repo_rev=git445f882

# If tarball_version is not empty, it is used as the version string in
# the tarball filename, regardless of all other versions listed in
Expand All @@ -45,7 +45,7 @@ tarball_version=

# The date when this release was created

date="Feb 21, 2017"
date="Aug 10, 2017"

# The shared library version of each of PMIx's public libraries.
# These versions are maintained in accordance with the "Library
Expand Down
40 changes: 33 additions & 7 deletions opal/mca/pmix/pmix112/pmix/config/pmix.m4
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ AC_DEFUN([PMIX_SETUP_CORE],[
AC_CHECK_TYPES(uint32_t)
AC_CHECK_TYPES(int64_t)
AC_CHECK_TYPES(uint64_t)
AC_CHECK_TYPES(__int128)
AC_CHECK_TYPES(uint128_t)
AC_CHECK_TYPES(long long)

AC_CHECK_TYPES(intptr_t)
Expand Down Expand Up @@ -303,6 +305,17 @@ AC_DEFUN([PMIX_SETUP_CORE],[
PMIX_CHECK_ATTRIBUTES
PMIX_CHECK_COMPILER_VERSION_ID

##################################
# Assembler Configuration
##################################

pmix_show_subtitle "Assembler"

AM_PROG_AS
AC_PATH_PROG(PERL, perl, perl)
PMIX_CONFIG_ASM


##################################
# Header files
##################################
Expand Down Expand Up @@ -555,6 +568,16 @@ AC_DEFUN([PMIX_SETUP_CORE],[
AC_C_BIGENDIAN
PMIX_CHECK_BROKEN_QSORT

#
# What is the local equivalent of "ln -s"
#

AC_PROG_LN_S

AC_PROG_GREP
AC_PROG_EGREP


##################################
# Visibility
##################################
Expand Down Expand Up @@ -643,7 +666,10 @@ AC_DEFUN([PMIX_SETUP_CORE],[

pmix_show_subtitle "Final output"

AC_CONFIG_FILES(pmix_config_prefix[Makefile])
AC_CONFIG_FILES(
pmix_config_prefix[Makefile]
pmix_config_prefix[src/atomics/asm/Makefile]
)

# Success
$2
Expand Down Expand Up @@ -848,15 +874,15 @@ AC_DEFINE_UNQUOTED([PMIX_ENABLE_TIMING], [$WANT_TIMING],
# Install backward compatibility support for PMI-1 and PMI-2
#
AC_MSG_CHECKING([if want backward compatibility for PMI-1 and PMI-2])
AC_ARG_ENABLE(pmix-backward-compatibility,
AC_HELP_STRING([--enable-pmix-backward-compatibility],
AC_ARG_ENABLE(pmi-backward-compatibility,
AC_HELP_STRING([--enable-pmi-backward-compatibility],
[enable PMIx support for PMI-1 and PMI-2 (default: enabled)]))
if test "$enable_pmix_backward_compatibility" = "no"; then
if test "$enable_pmi_backward_compatibility" = "no"; then
AC_MSG_RESULT([no])
WANT_PMIX_BACKWARD=0
WANT_PMI_BACKWARD=0
else
AC_MSG_RESULT([yes])
WANT_PMIX_BACKWARD=1
WANT_PMI_BACKWARD=1
fi

])dnl
Expand All @@ -875,7 +901,7 @@ AC_DEFUN([PMIX_DO_AM_CONDITIONALS],[
AM_CONDITIONAL([PMIX_WANT_MUNGE], [test "$pmix_munge_support" = "1"])
AM_CONDITIONAL([PMIX_WANT_SASL], [test "$pmix_sasl_support" = "1"])
AM_CONDITIONAL([WANT_DSTORE],[test "x$enable_dstore" != "xno"])
AM_CONDITIONAL(WANT_PMIX_BACKWARD, test "$WANT_PMIX_BACKWARD" = 1)
AM_CONDITIONAL(WANT_PMI_BACKWARD, test "$WANT_PMI_BACKWARD" = 1)
])
pmix_did_am_conditionals=yes
])dnl
3 changes: 2 additions & 1 deletion opal/mca/pmix/pmix112/pmix/config/pmix_check_visibility.m4
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# All rights reserved.
# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2009-2011 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand Down Expand Up @@ -86,7 +87,7 @@ AC_DEFUN([PMIX_CHECK_VISIBILITY],[
unset pmix_add
fi

AC_DEFINE_UNQUOTED([PMIX_C_HAVE_VISIBILITY], [$WANT_VISIBILITY],
AC_DEFINE_UNQUOTED([PMIX_HAVE_VISIBILITY], [$WANT_VISIBILITY],
[Whether C compiler supports symbol visibility or not])
AM_CONDITIONAL([WANT_HIDDEN],[test "$WANT_VISIBILITY" = "1"])
])
Loading