Unverified Commit 89d23d6f authored by Eisenhauer, Greg's avatar Eisenhauer, Greg Committed by GitHub
Browse files

Merge pull request #1022 from philip-davis/master 

Add support for no MPI build for RDMA DP
parents d8f3529f 07959c79

examples/heatTransfer/TestSSTBPRDMAMxN.cmake

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ add_test(NAME HeatTransfer.SST.BP.RDMA.Dump.MxN 
    -DARGS=-d 

    -DINPUT_FILE=HeatTransfer.SST.BP.RDMA.Read.MxN.bp

    -DOUTPUT_FILE=HeatTransfer.SST.BP.RDMA.Dump.MxN.txt

    -P "${PROJECT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bpls.cmake"

    -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"

)

set_property(TEST HeatTransfer.SST.BP.RDMA.Dump.MxN

  PROPERTY DEPENDS HeatTransfer.SST.BP.RDMA.Read.MxN

examples/heatTransfer/TestSSTFFSRDMAMxN.cmake

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ add_test(NAME HeatTransfer.SST.FFS.RDMA.Dump.MxN 
    -DARGS=-d 

    -DINPUT_FILE=HeatTransfer.SST.FFS.RDMA.Read.MxN.bp

    -DOUTPUT_FILE=HeatTransfer.SST.FFS.RDMA.Dump.MxN.txt

    -P "${PROJECT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bpls.cmake"

    -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"

)

set_property(TEST HeatTransfer.SST.FFS.RDMA.Dump.MxN

  PROPERTY DEPENDS HeatTransfer.SST.FFS.RDMA.Read.MxN

source/adios2/toolkit/sst/dp/rdma_dp.c

+5 −0
Original line number Diff line number Diff line
@@ -4,9 +4,14 @@ 
#include <stdlib.h>

#include <string.h>



#include "adios2/ADIOSConfig.h"

#include <atl.h>

#include <evpath.h>

#ifdef ADIOS2_HAVE_MPI

#include <mpi.h>

#else

#include "sstmpidummy.h"

#endif



#include <SSTConfig.h>

source/adios2/toolkit/sst/sstmpidummy.h

+15 −0
Original line number Diff line number Diff line 
#ifndef SSTMPIDUMMY_H_

#define SSTMPIDUMMY_H_



#include <sys/time.h>



typedef int MPI_Comm;

typedef int MPI_Status;

typedef int MPI_request;
@@ -218,4 +220,17 @@ static int MPI_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, 
    return MPI_SUCCESS;

}



static double MPI_Wtime()

{

    struct timeval tv;



    if (gettimeofday(&tv, NULL) < 0)

    {

        perror("could not get time");

        return (0.);

    }



    return (tv.tv_sec + ((double)tv.tv_usec / 1000000.));

}



#endif