From 1c58473b43ea3d3c8e1ffeee1fd1e7f2a3aea2d3 Mon Sep 17 00:00:00 2001 From: Nathaniel Graham Date: Tue, 21 Jul 2015 16:14:51 -0600 Subject: [PATCH 1/4] Java bindings for alltoallw functions. Includes bindings for MPI_ALLTOALLW and MPI_IALLTOALLW. Signed-off-by: Nathaniel Graham --- ompi/mpi/java/c/mpiJava.h | 9 +++- ompi/mpi/java/c/mpi_Comm.c | 76 ++++++++++++++++++++++++++++++ ompi/mpi/java/c/mpi_MPI.c | 24 ++++++++++ ompi/mpi/java/java/Comm.java | 91 ++++++++++++++++++++++++++++++++++++ 4 files changed, 199 insertions(+), 1 deletion(-) diff --git a/ompi/mpi/java/c/mpiJava.h b/ompi/mpi/java/c/mpiJava.h index 3b9303ac86..80ba1d491c 100644 --- a/ompi/mpi/java/c/mpiJava.h +++ b/ompi/mpi/java/c/mpiJava.h @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -95,7 +97,7 @@ void ompi_java_releaseReadPtr( /* Gets a buffer pointer for writing. */ void ompi_java_getWritePtr( void **ptr, ompi_java_buffer_t **item, JNIEnv *env, - jobject buf, jboolean db, int count, MPI_Datatype type); + jobject buf, jboolean db, int count, MPI_Datatype type); /* Gets a buffer pointer for writing. * 'size' is the number of processes. */ @@ -133,6 +135,11 @@ void ompi_java_releaseIntArray( void ompi_java_forgetIntArray( JNIEnv *env, jintArray array, jint *jptr, int *cptr); +void ompi_java_getDatatypeArray( + JNIEnv *env, jlongArray array, jlong **jptr, MPI_Datatype **cptr); +void ompi_java_forgetDatatypeArray( + JNIEnv *env, jlongArray array, jlong *jptr, MPI_Datatype *cptr); + void ompi_java_getBooleanArray( JNIEnv *env, jbooleanArray array, jboolean **jptr, int **cptr); void ompi_java_releaseBooleanArray( diff --git a/ompi/mpi/java/c/mpi_Comm.c b/ompi/mpi/java/c/mpi_Comm.c index edabfed97b..acfc0d0afc 100644 --- a/ompi/mpi/java/c/mpi_Comm.c +++ b/ompi/mpi/java/c/mpi_Comm.c @@ -1581,6 +1581,82 @@ JNIEXPORT jlong JNICALL Java_mpi_Comm_iAllToAllv( return (jlong)request; } +JNIEXPORT void JNICALL Java_mpi_Comm_allToAllw( + JNIEnv *env, jobject jthis, jlong jComm, + jobject sendBuf, jintArray sCount, jintArray sDispls, jlongArray sTypes, + jobject recvBuf, jintArray rCount, jintArray rDispls, jlongArray rTypes) +{ + MPI_Comm comm = (MPI_Comm)jComm; + + jlong* jSTypes, *jRTypes; + MPI_Datatype *cSTypes, *cRTypes; + + ompi_java_getDatatypeArray(env, sTypes, &jSTypes, &cSTypes); + ompi_java_getDatatypeArray(env, rTypes, &jRTypes, &cRTypes); + + jint *jSCount, *jRCount, *jSDispls, *jRDispls; + int *cSCount, *cRCount, *cSDispls, *cRDispls; + ompi_java_getIntArray(env, sCount, &jSCount, &cSCount); + ompi_java_getIntArray(env, rCount, &jRCount, &cRCount); + ompi_java_getIntArray(env, sDispls, &jSDispls, &cSDispls); + ompi_java_getIntArray(env, rDispls, &jRDispls, &cRDispls); + + void *sPtr = ompi_java_getDirectBufferAddress(env, sendBuf), + *rPtr = ompi_java_getDirectBufferAddress(env, recvBuf); + + int rc = MPI_Alltoallw( + sPtr, cSCount, cSDispls, cSTypes, + rPtr, cRCount, cRDispls, cRTypes, comm); + + ompi_java_exceptionCheck(env, rc); + ompi_java_forgetIntArray(env, sCount, jSCount, cSCount); + ompi_java_forgetIntArray(env, rCount, jRCount, cRCount); + ompi_java_forgetIntArray(env, sDispls, jSDispls, cSDispls); + ompi_java_forgetIntArray(env, rDispls, jRDispls, cRDispls); + ompi_java_forgetDatatypeArray(env, sTypes, jSTypes, cSTypes); + ompi_java_forgetDatatypeArray(env, rTypes, jRTypes, cRTypes); +} + +JNIEXPORT jlong JNICALL Java_mpi_Comm_iAllToAllw( + JNIEnv *env, jobject jthis, jlong jComm, + jobject sendBuf, jintArray sCount, jintArray sDispls, jlongArray sTypes, + jobject recvBuf, jintArray rCount, jintArray rDispls, jlongArray rTypes) +{ + MPI_Comm comm = (MPI_Comm)jComm; + + jlong* jSTypes, *jRTypes; + MPI_Datatype *cSTypes, *cRTypes; + + ompi_java_getDatatypeArray(env, sTypes, &jSTypes, &cSTypes); + ompi_java_getDatatypeArray(env, rTypes, &jRTypes, &cRTypes); + + jint *jSCount, *jRCount, *jSDispls, *jRDispls; + int *cSCount, *cRCount, *cSDispls, *cRDispls; + ompi_java_getIntArray(env, sCount, &jSCount, &cSCount); + ompi_java_getIntArray(env, rCount, &jRCount, &cRCount); + ompi_java_getIntArray(env, sDispls, &jSDispls, &cSDispls); + ompi_java_getIntArray(env, rDispls, &jRDispls, &cRDispls); + + void *sPtr = ompi_java_getDirectBufferAddress(env, sendBuf), + *rPtr = ompi_java_getDirectBufferAddress(env, recvBuf); + + MPI_Request request; + + int rc = MPI_Ialltoallw( + sPtr, cSCount, cSDispls, cSTypes, + rPtr, cRCount, cRDispls, cRTypes, comm, &request); + + ompi_java_exceptionCheck(env, rc); + ompi_java_forgetIntArray(env, sCount, jSCount, cSCount); + ompi_java_forgetIntArray(env, rCount, jRCount, cRCount); + ompi_java_forgetIntArray(env, sDispls, jSDispls, cSDispls); + ompi_java_forgetIntArray(env, rDispls, jRDispls, cRDispls); + ompi_java_forgetDatatypeArray(env, sTypes, jSTypes, cSTypes); + ompi_java_forgetDatatypeArray(env, rTypes, jRTypes, cRTypes); + + return (jlong)request; +} + JNIEXPORT void JNICALL Java_mpi_Comm_neighborAllGather( JNIEnv *env, jobject jthis, jlong jComm, jobject sBuf, jboolean sdb, jint sOff, diff --git a/ompi/mpi/java/c/mpi_MPI.c b/ompi/mpi/java/c/mpi_MPI.c index e856bbfa3b..f2f0ff62e5 100644 --- a/ompi/mpi/java/c/mpi_MPI.c +++ b/ompi/mpi/java/c/mpi_MPI.c @@ -979,6 +979,30 @@ void ompi_java_forgetIntArray(JNIEnv *env, jintArray array, (*env)->ReleaseIntArrayElements(env, array, jptr, JNI_ABORT); } +void ompi_java_getDatatypeArray(JNIEnv *env, jlongArray array, + jlong **jptr, MPI_Datatype **cptr) +{ + jlong *jLongs = (*env)->GetLongArrayElements(env, array, NULL); + *jptr = jLongs; + + int i, length = (*env)->GetArrayLength(env, array); + MPI_Datatype *cDatatypes = calloc(length, sizeof(MPI_Datatype)); + + for(i = 0; i < length; i++){ + cDatatypes[i] = (MPI_Datatype)jLongs[i]; + } + *cptr = cDatatypes; +} + +void ompi_java_forgetDatatypeArray(JNIEnv *env, jlongArray array, + jlong *jptr, MPI_Datatype *cptr) +{ + if(jptr != cptr) + free(cptr); + + (*env)->ReleaseLongArrayElements(env, array, jptr, JNI_ABORT); +} + void ompi_java_getBooleanArray(JNIEnv *env, jbooleanArray array, jboolean **jptr, int **cptr) { diff --git a/ompi/mpi/java/java/Comm.java b/ompi/mpi/java/java/Comm.java index 060402f233..081e69be65 100644 --- a/ompi/mpi/java/java/Comm.java +++ b/ompi/mpi/java/java/Comm.java @@ -229,6 +229,7 @@ public static int compare(Comm comm1, Comm comm2) throws MPIException /** * Test if communicator object is null (has been freed). + * Java binding of {@code MPI_COMM_NULL}. * @return true if the comm object is null, false otherwise */ public final boolean isNull() @@ -2307,6 +2308,79 @@ private native long iAllToAllv(long comm, Buffer recvbuf, int[] recvcount, int[] rdispls, long recvtype) throws MPIException; +/** + * Adds flexibility to {@code allToAll}: location of data for send is //here + * specified by {@code sDispls} and location to place data on receive + * side is specified by {@code rDispls}. + *

Java binding of the MPI operation {@code MPI_ALLTOALLW}. + * @param sendBuf send buffer + * @param sendCount number of items sent to each buffer + * @param sDispls displacements from which to take outgoing data + * @param sendTypes datatypes of send buffer items + * @param recvBuf receive buffer + * @param recvCount number of elements received from each process + * @param rDispls displacements at which to place incoming data + * @param recvTypes datatype of each item in receive buffer + * @throws MPIException Signals that an MPI exception of some sort has occurred. + */ +public final void allToAllw( + Buffer sendBuf, int[] sendCount, int[] sDispls, Datatype[] sendTypes, + Buffer recvBuf, int[] recvCount, int[] rDispls, Datatype[] recvTypes) + throws MPIException +{ + MPI.check(); + assertDirectBuffer(sendBuf, recvBuf); + + long[] sendHandles = convertTypeArray(sendTypes); + long[] recvHandles = convertTypeArray(recvTypes); + + allToAllw(handle, sendBuf, sendCount, sDispls, + sendHandles, recvBuf, recvCount, rDispls, + recvHandles); +} + +private native void allToAllw(long comm, + Buffer sendBuf, int[] sendCount, int[] sDispls, long[] sendTypes, + Buffer recvBuf, int[] recvCount, int[] rDispls, long[] recvTypes) + throws MPIException; + +/** + * Adds flexibility to {@code iAllToAll}: location of data for send is + * specified by {@code sDispls} and location to place data on receive + * side is specified by {@code rDispls}. + *

Java binding of the MPI operation {@code MPI_IALLTOALLW}. + * @param sendBuf send buffer + * @param sendCount number of items sent to each buffer + * @param sDispls displacements from which to take outgoing data + * @param sendTypes datatype send buffer items + * @param recvBuf receive buffer + * @param recvCount number of elements received from each process + * @param rDispls displacements at which to place incoming data + * @param recvTypes datatype of each item in receive buffer + * @return communication request + * @throws MPIException Signals that an MPI exception of some sort has occurred. + */ +public final Request iAllToAllw( + Buffer sendBuf, int[] sendCount, int[] sDispls, Datatype[] sendTypes, + Buffer recvBuf, int[] recvCount, int[] rDispls, Datatype[] recvTypes) + throws MPIException +{ + MPI.check(); + assertDirectBuffer(sendBuf, recvBuf); + + long[] sendHandles = convertTypeArray(sendTypes); + long[] recvHandles = convertTypeArray(recvTypes); + + return new Request(iAllToAllw( + handle, sendBuf, sendCount, sDispls, sendHandles, + recvBuf, recvCount, rDispls, recvHandles)); +} + +private native long iAllToAllw(long comm, + Buffer sendBuf, int[] sendCount, int[] sDispls, long[] sendTypes, + Buffer recvBuf, int[] recvCount, int[] rDispls, long[] recvTypes) + throws MPIException; + /** * Java binding of {@code MPI_NEIGHBOR_ALLGATHER}. * @param sendbuf send buffer @@ -3232,4 +3306,21 @@ public final String getName() throws MPIException private native String getName(long handle) throws MPIException; +/** + * A helper method to convert an array of Datatypes to + * an array of longs (handles). + * @param dArray Array of Datatypes + * @return converted Datatypes + */ +private long[] convertTypeArray(Datatype[] dArray) { + long[] lArray = new long[dArray.length]; + + for(int i = 0; i < lArray.length; i++) { + if(dArray[i] != null) { + lArray[i] = dArray[i].handle; + } + } + return lArray; +} + } // Comm From 512ded2eaea2b4284dd63b893e77ae7a8b74564b Mon Sep 17 00:00:00 2001 From: Nathaniel Graham Date: Tue, 21 Jul 2015 16:39:59 -0600 Subject: [PATCH 2/4] White space fixes Signed-off-by: Nathaniel Graham --- ompi/mpi/java/c/mpiJava.h | 2 +- ompi/mpi/java/c/mpi_Comm.c | 8 ++++---- ompi/mpi/java/java/Comm.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ompi/mpi/java/c/mpiJava.h b/ompi/mpi/java/c/mpiJava.h index 80ba1d491c..48c4e3e6ee 100644 --- a/ompi/mpi/java/c/mpiJava.h +++ b/ompi/mpi/java/c/mpiJava.h @@ -97,7 +97,7 @@ void ompi_java_releaseReadPtr( /* Gets a buffer pointer for writing. */ void ompi_java_getWritePtr( void **ptr, ompi_java_buffer_t **item, JNIEnv *env, - jobject buf, jboolean db, int count, MPI_Datatype type); + jobject buf, jboolean db, int count, MPI_Datatype type); /* Gets a buffer pointer for writing. * 'size' is the number of processes. */ diff --git a/ompi/mpi/java/c/mpi_Comm.c b/ompi/mpi/java/c/mpi_Comm.c index acfc0d0afc..f5e756bab7 100644 --- a/ompi/mpi/java/c/mpi_Comm.c +++ b/ompi/mpi/java/c/mpi_Comm.c @@ -1605,8 +1605,8 @@ JNIEXPORT void JNICALL Java_mpi_Comm_allToAllw( *rPtr = ompi_java_getDirectBufferAddress(env, recvBuf); int rc = MPI_Alltoallw( - sPtr, cSCount, cSDispls, cSTypes, - rPtr, cRCount, cRDispls, cRTypes, comm); + sPtr, cSCount, cSDispls, cSTypes, + rPtr, cRCount, cRDispls, cRTypes, comm); ompi_java_exceptionCheck(env, rc); ompi_java_forgetIntArray(env, sCount, jSCount, cSCount); @@ -1643,8 +1643,8 @@ JNIEXPORT jlong JNICALL Java_mpi_Comm_iAllToAllw( MPI_Request request; int rc = MPI_Ialltoallw( - sPtr, cSCount, cSDispls, cSTypes, - rPtr, cRCount, cRDispls, cRTypes, comm, &request); + sPtr, cSCount, cSDispls, cSTypes, + rPtr, cRCount, cRDispls, cRTypes, comm, &request); ompi_java_exceptionCheck(env, rc); ompi_java_forgetIntArray(env, sCount, jSCount, cSCount); diff --git a/ompi/mpi/java/java/Comm.java b/ompi/mpi/java/java/Comm.java index 081e69be65..2bf8071601 100644 --- a/ompi/mpi/java/java/Comm.java +++ b/ompi/mpi/java/java/Comm.java @@ -2336,7 +2336,7 @@ public final void allToAllw( allToAllw(handle, sendBuf, sendCount, sDispls, sendHandles, recvBuf, recvCount, rDispls, - recvHandles); + recvHandles); } private native void allToAllw(long comm, From 32f2d209837163baa6d98f5c41da0fa512d87a51 Mon Sep 17 00:00:00 2001 From: Nathaniel Graham Date: Wed, 22 Jul 2015 11:04:41 -0600 Subject: [PATCH 3/4] Adding missed copyrights. I did not add the LANL copyrights to the files I touched while fixing the javadoc errors. Signed-off-by: Nathaniel Graham --- ompi/mpi/java/java/CartComm.java | 2 ++ ompi/mpi/java/java/Datatype.java | 2 ++ ompi/mpi/java/java/DoubleInt.java | 2 ++ ompi/mpi/java/java/File.java | 2 ++ ompi/mpi/java/java/FloatInt.java | 2 ++ ompi/mpi/java/java/Freeable.java | 2 ++ ompi/mpi/java/java/GraphComm.java | 2 ++ ompi/mpi/java/java/Group.java | 2 ++ ompi/mpi/java/java/Info.java | 2 ++ ompi/mpi/java/java/Int2.java | 2 ++ ompi/mpi/java/java/Intercomm.java | 2 ++ ompi/mpi/java/java/LongInt.java | 2 ++ ompi/mpi/java/java/Message.java | 2 ++ ompi/mpi/java/java/Op.java | 2 ++ ompi/mpi/java/java/Prequest.java | 2 ++ ompi/mpi/java/java/Request.java | 2 ++ ompi/mpi/java/java/ShortInt.java | 2 ++ ompi/mpi/java/java/Status.java | 2 ++ ompi/mpi/java/java/Struct.java | 2 ++ ompi/mpi/java/java/UserFunction.java | 2 ++ 20 files changed, 40 insertions(+) diff --git a/ompi/mpi/java/java/CartComm.java b/ompi/mpi/java/java/CartComm.java index e5c8ca970f..665e5ff35a 100644 --- a/ompi/mpi/java/java/CartComm.java +++ b/ompi/mpi/java/java/CartComm.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/Datatype.java b/ompi/mpi/java/java/Datatype.java index 5a96889140..be3c9b80e4 100644 --- a/ompi/mpi/java/java/Datatype.java +++ b/ompi/mpi/java/java/Datatype.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/DoubleInt.java b/ompi/mpi/java/java/DoubleInt.java index eb6ada66fb..b122afc68b 100644 --- a/ompi/mpi/java/java/DoubleInt.java +++ b/ompi/mpi/java/java/DoubleInt.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/File.java b/ompi/mpi/java/java/File.java index 5a2b453066..9777895af2 100644 --- a/ompi/mpi/java/java/File.java +++ b/ompi/mpi/java/java/File.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/FloatInt.java b/ompi/mpi/java/java/FloatInt.java index 5950440c93..b2c0a584f3 100644 --- a/ompi/mpi/java/java/FloatInt.java +++ b/ompi/mpi/java/java/FloatInt.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/Freeable.java b/ompi/mpi/java/java/Freeable.java index 7b9c0697e7..e889720ccf 100644 --- a/ompi/mpi/java/java/Freeable.java +++ b/ompi/mpi/java/java/Freeable.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/GraphComm.java b/ompi/mpi/java/java/GraphComm.java index 65639334f8..d40d21422d 100644 --- a/ompi/mpi/java/java/GraphComm.java +++ b/ompi/mpi/java/java/GraphComm.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/Group.java b/ompi/mpi/java/java/Group.java index 0b225cd98b..1eaf3042af 100644 --- a/ompi/mpi/java/java/Group.java +++ b/ompi/mpi/java/java/Group.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/Info.java b/ompi/mpi/java/java/Info.java index 04ff3acfbe..3d1b2f7a67 100644 --- a/ompi/mpi/java/java/Info.java +++ b/ompi/mpi/java/java/Info.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/Int2.java b/ompi/mpi/java/java/Int2.java index 73c93a6fec..2f3a585405 100644 --- a/ompi/mpi/java/java/Int2.java +++ b/ompi/mpi/java/java/Int2.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/Intercomm.java b/ompi/mpi/java/java/Intercomm.java index f36f21295c..1b206f5e6a 100644 --- a/ompi/mpi/java/java/Intercomm.java +++ b/ompi/mpi/java/java/Intercomm.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/LongInt.java b/ompi/mpi/java/java/LongInt.java index fcde87c236..fd5f85cf0a 100644 --- a/ompi/mpi/java/java/LongInt.java +++ b/ompi/mpi/java/java/LongInt.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/Message.java b/ompi/mpi/java/java/Message.java index 2a429bd46e..b4efbec6f7 100644 --- a/ompi/mpi/java/java/Message.java +++ b/ompi/mpi/java/java/Message.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/Op.java b/ompi/mpi/java/java/Op.java index f680449a44..ffd3ffbf6d 100644 --- a/ompi/mpi/java/java/Op.java +++ b/ompi/mpi/java/java/Op.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/Prequest.java b/ompi/mpi/java/java/Prequest.java index 2ddd018d16..fd7b88706b 100644 --- a/ompi/mpi/java/java/Prequest.java +++ b/ompi/mpi/java/java/Prequest.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/Request.java b/ompi/mpi/java/java/Request.java index afe2a80091..dd86880ca7 100644 --- a/ompi/mpi/java/java/Request.java +++ b/ompi/mpi/java/java/Request.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/ShortInt.java b/ompi/mpi/java/java/ShortInt.java index 6e81f9baa1..c335e10c6e 100644 --- a/ompi/mpi/java/java/ShortInt.java +++ b/ompi/mpi/java/java/ShortInt.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/Status.java b/ompi/mpi/java/java/Status.java index 4830e05e5f..81ed8efebf 100644 --- a/ompi/mpi/java/java/Status.java +++ b/ompi/mpi/java/java/Status.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/Struct.java b/ompi/mpi/java/java/Struct.java index e7d4fa1a90..65695cb9d6 100644 --- a/ompi/mpi/java/java/Struct.java +++ b/ompi/mpi/java/java/Struct.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/ompi/mpi/java/java/UserFunction.java b/ompi/mpi/java/java/UserFunction.java index 65e4cf2f6f..e3630413d8 100644 --- a/ompi/mpi/java/java/UserFunction.java +++ b/ompi/mpi/java/java/UserFunction.java @@ -9,6 +9,8 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2015 Los Alamos National Security, LLC. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow From 340c84fe01d9d3d02f3dabec48d70fed23ab7020 Mon Sep 17 00:00:00 2001 From: Nathaniel Graham Date: Thu, 30 Jul 2015 15:39:03 -0600 Subject: [PATCH 4/4] White space fix Github revealed some weird spacing. --- ompi/mpi/java/c/mpi_Comm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ompi/mpi/java/c/mpi_Comm.c b/ompi/mpi/java/c/mpi_Comm.c index f5e756bab7..b086f23a46 100644 --- a/ompi/mpi/java/c/mpi_Comm.c +++ b/ompi/mpi/java/c/mpi_Comm.c @@ -1619,8 +1619,8 @@ JNIEXPORT void JNICALL Java_mpi_Comm_allToAllw( JNIEXPORT jlong JNICALL Java_mpi_Comm_iAllToAllw( JNIEnv *env, jobject jthis, jlong jComm, - jobject sendBuf, jintArray sCount, jintArray sDispls, jlongArray sTypes, - jobject recvBuf, jintArray rCount, jintArray rDispls, jlongArray rTypes) + jobject sendBuf, jintArray sCount, jintArray sDispls, jlongArray sTypes, + jobject recvBuf, jintArray rCount, jintArray rDispls, jlongArray rTypes) { MPI_Comm comm = (MPI_Comm)jComm;