Skip to content

Commit

Permalink
Remove all whitespace from end-of-line
Browse files Browse the repository at this point in the history
Remove all whitespace from end-of-line
  • Loading branch information
rljacob committed Jan 25, 2017
1 parent d757b65 commit 8c02275
Show file tree
Hide file tree
Showing 32 changed files with 259 additions and 259 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ LIB = lib$(MODULE).a
#RULES

.SUFFIXES:
.SUFFIXES: .F90 .c .o
.SUFFIXES: .F90 .c .o

.c.o:
$(CC) -c $(INCPATH) $(DEFS) $(CPPDEFS) $(CFLAGS) $<
Expand Down
2 changes: 1 addition & 1 deletion NOTES
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
cart.c - new file, cleaned
collective.c - done
comm.c - done
copy.c - new file, cleaned
copy.c - new file, cleaned
getcount.c - new file, cleaned
group.c - copied over git updates
handles.c - nothing to merge, svn updates OK
Expand Down
8 changes: 4 additions & 4 deletions cart.c
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "mpiP.h"

/*
/*
* MPI_Cart_create
*
* create a new communicator,
* create a new communicator,
*/


Expand Down Expand Up @@ -53,7 +53,7 @@ FC_FUNC( mpi_cart_get , MPI_CART_GET )


int MPI_Cart_get(MPI_Comm comm, int maxdims, int *dims,
int *periods, int *coords)
int *periods, int *coords)
{
int i;
for (i=0;i<maxdims;i++)
Expand All @@ -80,7 +80,7 @@ FC_FUNC( mpi_cart_coords , MPI_CART_COORDS)
}


int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int *coords)
int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int *coords)
{
int i;

Expand Down
36 changes: 18 additions & 18 deletions collective.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ FC_FUNC( mpi_gatherv , MPI_GATHERV )
}


int MPI_Gatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype,
int MPI_Gatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype,
void* recvbuf, int *recvcounts, int *displs,
MPI_Datatype recvtype, int root, MPI_Comm comm)
{
Expand Down Expand Up @@ -200,7 +200,7 @@ int MPI_Allgatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype,

/*********/

/* MPI_Scatter
/* MPI_Scatter
* Scattering to one proc involves only one copy operation, so copy
* data from source to dest pointer
*/
Expand Down Expand Up @@ -233,7 +233,7 @@ int MPI_Scatter(void * sendbuf, int sendcount, MPI_Datatype sendtype,

copy_data2(sendbuf, sendcount, sendtype,
recvbuf, recvcount, recvtype);

return(MPI_SUCCESS);
}

Expand All @@ -251,11 +251,11 @@ FC_FUNC( mpi_scatterv , MPI_SCATTERV )
*sendtype, mpi_c_in_place(recvbuf), *recvcount,
*recvtype, *root, *comm);
}



int MPI_Scatterv(void* sendbuf, int *sendcounts, int *displs,
MPI_Datatype sendtype, void* recvbuf, int recvcount,


int MPI_Scatterv(void* sendbuf, int *sendcounts, int *displs,
MPI_Datatype sendtype, void* recvbuf, int recvcount,
MPI_Datatype recvtype, int root, MPI_Comm comm)
{
int offset;
Expand All @@ -278,7 +278,7 @@ int MPI_Scatterv(void* sendbuf, int *sendcounts, int *displs,
copy_data2((char*)sendbuf+offset, sendcounts[0], sendtype,
recvbuf, recvcount, recvtype);
// memcpy(recvbuf,(char *)sendbuf+offset,sendcounts[0] * sendtype);

return(MPI_SUCCESS);
}

Expand All @@ -298,7 +298,7 @@ FC_FUNC( mpi_reduce , MPI_REDUCE )



int MPI_Reduce(void* sendbuf, void* recvbuf, int count,
int MPI_Reduce(void* sendbuf, void* recvbuf, int count,
MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm)

{
Expand Down Expand Up @@ -328,7 +328,7 @@ FC_FUNC( mpi_allreduce , MPI_ALLREDUCE )
}


int MPI_Allreduce(void* sendbuf, void* recvbuf, int count,
int MPI_Allreduce(void* sendbuf, void* recvbuf, int count,
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
{
if (sendbuf==MPI_IN_PLACE)
Expand All @@ -345,7 +345,7 @@ int MPI_Allreduce(void* sendbuf, void* recvbuf, int count,
/*********/


/* MPI_Reduce_scatter
/* MPI_Reduce_scatter
* Performs reduction of n*sum(recvcounts) and distributes to all members
* in a group. We do this to only one proc, so recvcounts[0] is only used.
*/
Expand All @@ -358,8 +358,8 @@ FC_FUNC(mpi_reduce_scatter, MPI_REDUCE_SCATTER)
}


int MPI_Reduce_scatter(void* sendbuf, void* recvbuf, int *recvcounts,
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
int MPI_Reduce_scatter(void* sendbuf, void* recvbuf, int *recvcounts,
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
{
copy_data2(sendbuf, recvcounts[0], datatype, recvbuf, recvcounts[0], datatype);
}
Expand All @@ -379,7 +379,7 @@ FC_FUNC( mpi_scan , MPI_SCAN)



int MPI_Scan(void* sendbuf, void* recvbuf, int count,
int MPI_Scan(void* sendbuf, void* recvbuf, int count,
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm )
{
copy_data2(sendbuf, count, datatype, recvbuf, count, datatype);
Expand Down Expand Up @@ -431,7 +431,7 @@ int MPI_Alltoallv(void *sendbuf, int *sendcounts,
int *sdispls, MPI_Datatype sendtype,
void *recvbuf, int *recvcounts,
int *rdispls, MPI_Datatype recvtype,
MPI_Comm comm)
MPI_Comm comm)

{
int send_offset;
Expand All @@ -447,7 +447,7 @@ int MPI_Alltoallv(void *sendbuf, int *sendcounts,

copy_data2((char*)sendbuf+send_offset, sendcounts[0], sendtype,
(char*)recvbuf+recv_offset, recvcounts[0], recvtype);

// memcpy( (char *)recvbuf+recv_offset, (char *)sendbuf+send_offset,
// sendcounts[0] * sendtype);

Expand Down Expand Up @@ -476,13 +476,13 @@ int MPI_Alltoallw(void *sendbuf, int *sendcounts,
int *sdispls, MPI_Datatype *sendtypes,
void *recvbuf, int *recvcounts,
int *rdispls, MPI_Datatype *recvtypes,
MPI_Comm comm)
MPI_Comm comm)

{

copy_data2((char*)sendbuf+sdispls[0], sendcounts[0], sendtypes[0],
(char*)recvbuf+rdispls[0], recvcounts[0], recvtypes[0]);


return(MPI_SUCCESS);
}
Expand Down
6 changes: 3 additions & 3 deletions comm.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,10 @@ int MPI_Comm_group(MPI_Comm comm, MPI_Group *group)
*group= MPI_GROUP_ONE;

return(MPI_SUCCESS);
}
}

/* Intercomm_create
*
*
*/

FC_FUNC(mpi_intercomm_create, MPI_INTERCOMM_CREATE)(
Expand All @@ -220,7 +220,7 @@ FC_FUNC(mpi_intercomm_create, MPI_INTERCOMM_CREATE)(

int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader,
MPI_Comm peer_comm, int remote_leader,
int tag, MPI_Comm *newintercomm)
int tag, MPI_Comm *newintercomm)
{
if (local_comm==MPI_COMM_NULL && peer_comm==MPI_COMM_NULL)
*newintercomm = MPI_COMM_NULL;
Expand Down
10 changes: 5 additions & 5 deletions copy.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* fix this issue later...
*/

extern int Pcopy_data2(void *source, int src_count, Datatype src_type,
extern int Pcopy_data2(void *source, int src_count, Datatype src_type,
void *dest, int dest_count, Datatype dest_type);


Expand All @@ -39,7 +39,7 @@ int copy_data2(void *source, int src_count, MPI_Datatype src_type,



int Pcopy_data2(void *source, int src_count, Datatype src_type,
int Pcopy_data2(void *source, int src_count, Datatype src_type,
void *dest, int dest_count, Datatype dest_type)
{
int i;
Expand All @@ -55,7 +55,7 @@ int Pcopy_data2(void *source, int src_count, Datatype src_type,
exit(-1);
}

// A receive of less elements than sent
// A receive of less elements than sent
// is valid, but the reverse is a violation

if (src_type->count * src_count < dest_type->count * dest_count)
Expand All @@ -71,7 +71,7 @@ int Pcopy_data2(void *source, int src_count, Datatype src_type,
{

#ifdef TYPE_CHECKING
if ( src_type->pairs[i % src_type->count].type !=
if ( src_type->pairs[i % src_type->count].type !=
dest_type->pairs[i % dest_type->count].type)
{
printf("copy_data: Types don't match.\n");
Expand All @@ -80,7 +80,7 @@ int Pcopy_data2(void *source, int src_count, Datatype src_type,
#endif

soffset = src_type->pairs[i % src_type->count].disp + ((i / src_type->count) * src_extent);
doffset = dest_type->pairs[i % dest_type->count].disp + ((i / dest_type->count) * dest_extent);
doffset = dest_type->pairs[i % dest_type->count].disp + ((i / dest_type->count) * dest_extent);

memcpy(dest+doffset, source+soffset, Simpletype_length(dest_type->pairs[i % dest_type->count].type));
}
Expand Down
2 changes: 1 addition & 1 deletion error.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

/*
* Error handling code
* Just a stub for now to support the MPI interface without actually
* Just a stub for now to support the MPI interface without actually
* doing anything
*/

Expand Down
12 changes: 6 additions & 6 deletions group.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ FC_FUNC( mpi_group_range_incl, MPI_GROUP_RANGE_INCL )
{
*ierror= MPI_Group_range_incl(*group, *n, ranges, newgroup);
}


int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3],
MPI_Group *newgroup)
Expand Down Expand Up @@ -100,7 +100,7 @@ int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup)
fprintf(stderr,"MPI_Group_union: null group passed in\n");
abort();
}

if (group1==MPI_GROUP_ONE || group2==MPI_GROUP_ONE)
*newgroup=MPI_GROUP_ONE;
else
Expand Down Expand Up @@ -131,7 +131,7 @@ int MPI_Group_intersection(MPI_Group group1, MPI_Group group2,
fprintf(stderr,"MPI_Group_intersection: null group passed in\n");
abort();
}

if (group1==MPI_GROUP_ONE && group2==MPI_GROUP_ONE)
*newgroup=MPI_GROUP_ONE;
else
Expand Down Expand Up @@ -163,7 +163,7 @@ int MPI_Group_difference(MPI_Group group1, MPI_Group group2,
fprintf(stderr,"MPI_Group_intersection: null group passed in\n");
abort();
}

if (group1==MPI_GROUP_EMPTY || group2==MPI_GROUP_ONE)
*newgroup=MPI_GROUP_EMPTY;
else
Expand Down Expand Up @@ -222,7 +222,7 @@ int MPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1,
{
fprintf(stderr,"MPI_Group_translate_ranks: empty input group\n");
abort();
}
}

for (i=0; i<n; i++)
{
Expand All @@ -238,7 +238,7 @@ int MPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1,
else
ranks2[i]=MPI_UNDEFINED;
}


return(MPI_SUCCESS);

Expand Down
12 changes: 6 additions & 6 deletions handles.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
* based on code from mpich-1.x/ptrcvt.c
* --> simplified and store item directly in the struct
* rather than as pointer to separately allocated object.
*
*
* CAVEAT:
* as in mpich-1, storage will grow as needed and will
* as in mpich-1, storage will grow as needed and will
* remain at the high water mark since it is likely that
* the user code will repeat the use.
*
*/
*/


typedef struct _Handleitem
Expand Down Expand Up @@ -87,7 +87,7 @@ void *mpi_malloc(int size)
fprintf(stderr,"mpi_malloc: failed to allocate %d bytes\n",size);
abort();
}

return(ret);
}

Expand Down Expand Up @@ -151,7 +151,7 @@ static void init_handles(void)

for (i=1; i<MAX_BLOCKS; i++)
blocks[i]=NULL;


need_to_init=0;
}
Expand Down Expand Up @@ -288,7 +288,7 @@ void mpi_free_handle(int handle)
#ifdef CHECKS
verify_handle(handle,block,index);
#endif

item=&(blocks[block][index]);

#ifdef CHECKS
Expand Down
2 changes: 1 addition & 1 deletion ic_merge.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/*
* MPI_Intercomm_merge - Creates an intracommunicator from an intercommunicator
* This is just a stub for now to support mpi function calls even in Serial
* applications. In the case of a serial program, this function is a no-op and
* applications. In the case of a serial program, this function is a no-op and
* only ever returns MPI_SUCCESS
*/

Expand Down
Loading

0 comments on commit 8c02275

Please sign in to comment.