Skip to content

OSHMEM v1.3: adds fetch and set amos and c11 generic #2123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

alex-mikheev
Copy link
Contributor

@jladd-mlnx @igor-ivanov
based on #2122 with changes for the v2.x branch

@alex-mikheev alex-mikheev added this to the v2.1.0 milestone Sep 26, 2016
@jsquyres
Copy link
Member

@alex-mikheev Same comments I just made in #2122 (comment)

@jsquyres jsquyres changed the title OSHMEM v1.3: adds fetch and set amos and c11 generic OSHMEM v1.3: adds fetch and set amos and c11 generic (DNM before #2122) Sep 26, 2016
@jsquyres
Copy link
Member

This is not merged on master yet -- wait until #2122 is merged and tested.

@jladd-mlnx
Copy link
Member

#2122 has been merged.

Copy link
Member

@igor-ivanov igor-ivanov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine for me. Please update the file headers.

* All rights reserved.
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alex-mikheev please update the header

* All rights reserved.
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alex-mikheev please update the header

* $COPYRIGHT$
*
* Additional copyrights may follow
*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alex-mikheev please update the header

* All rights reserved.
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alex-mikheev please update the header

* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alex-mikheev please update the header

* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alex-mikheev please update the header

* All rights reserved.
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alex-mikheev please update the header

* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alex-mikheev please update the header

@jsquyres
Copy link
Member

@igor-ivanov @alex-mikheev FWIW: I use a git hook to verify that I've updated my copyrights; it blocks my commits until I've updated the copyrights properly. In my .git/hooks directory, I have a script named pre-commit that looks like this:

#!/bin/sh
#
# Called by "git commit" with no arguments.  The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.

function die() {
    rc=$1
    shift;
    printf "*** GIT PRE-COMMIT HOOK FAILED ***:\n"
    echo "$@"
    exit $rc
}

if git rev-parse --verify HEAD >/dev/null 2>&1
then
        against=HEAD
else
        # Initial commit: diff against an empty tree object
        against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
fi

# Redirect output to stderr.
exec 1>&2

# If there are whitespace errors, print the offending file names and fail.
echo "=== Checking for whitespace errors..."
git diff-index --check --cached $against -- || die $? "whitespace errors"

# If we have a copyright-checking script, run it
if test -x ./contrib/update-my-copyright.pl; then
    echo "=== Checking copyrights..."
    ./contrib/update-my-copyright.pl --check-only --quiet || die $? "Copyrights are not up to date"
else
    echo "=== No update-my-copyright.pl script -- skipping"
fi

@jsquyres jsquyres changed the title OSHMEM v1.3: adds fetch and set amos and c11 generic (DNM before #2122) OSHMEM v1.3: adds fetch and set amos and c11 generic Sep 27, 2016
Copy link
Member

@jladd-mlnx jladd-mlnx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is ready,

@jsquyres
Copy link
Member

@jladd-mlnx @igor-ivanov @alex-mikheev The copyrights still aren't updated, and this PR now has conflicts. I suspect it needs to be rebased now that #2095 (the first of the OSHMEM PRs) was merged.

The commit adds atomic set and fetch functions as described in
oshmem 1.3 spec.

(cherry picked from commit 3a03435)
add missing put*/get* functions. Move *put|get16 functions from shmemx.h to
shmem.h as required by 1.3 spec.

(cherry picked from commit 9a21392)

removes fortran shmem_put() because v1.3 does not have it
@alex-mikheev alex-mikheev force-pushed the topic/oshmem_c11_generics_v2.x branch from 390f496 to f5297cc Compare October 1, 2016 15:49
@alex-mikheev
Copy link
Contributor Author

@jladd-mlnx @igor-ivanov please take a look

@igor-ivanov
Copy link
Member

👍

1 similar comment
@jladd-mlnx
Copy link
Member

👍

@hppritcha hppritcha merged commit 94bfabc into open-mpi:v2.x Oct 3, 2016
@jsquyres jsquyres mentioned this pull request Oct 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants