scnc
/
intel-qs
mirror of https://github.com/intel/intel-qs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BigMPI compatibility 

BigMPI support for very large jobs
See https://github.com/jeffhammond/BigMPI for details
This commit is contained in:
Vladimir Mironov 2018-02-04 08:55:52 -05:00
parent f3aa5526f8
commit 4b63363679
7 changed files with 85 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
interface/makefile
View File

@ -18,6 +18,10 @@ include ../make.inc
LDFLAGS = -L${MKLROOT}/lib/intel64 -lmkl_cdft_core -lmkl_intel_ilp64 -lmkl_core -lmkl_intel_thread -lmkl_blacs_intelmpi_ilp64 -lpthread
ifdef bigmpi
LDFLAGS := ${BIGMPI_LIB} ${LDFLAGS}
endif
SRC = $(wildcard *.cpp)
OBJS = $(addsuffix .o, $(basename $(SRC)))
EXEC = qasm_interface.exe
@ -27,7 +31,7 @@ EXEC = qasm_interface.exe
all: $(EXEC)
$(EXEC): ${OBJS} makefile ../qureg/qHiPSTER.a
$(CC) ${CFLAGS} ${LDFLAGS} ${OBJS} ../qureg/qHiPSTER.a -o $(EXEC)
$(CC) ${CFLAGS} ${OBJS} ../qureg/qHiPSTER.a ${LDFLAGS} -o $(EXEC)
clean:
rm -f *.o *.s *.d *~ $(EXEC)

12
make.inc
View File

@ -14,6 +14,8 @@
## limitations under the License.
##------------------------------------------------------------------------------
bigmpi = 1
HOST = $(shell hostname)
CC = g++
@ -21,11 +23,13 @@ CC = CC -mkl -no-ipo
CC = mpicxx
CC = mpiicpc
OPTS = -g
OPTS = -O3
OPTS = -g -O3
VECS = -qopt-report-phase=vec -qopt-report=2
DEFS = -DUSE_MM_MALLOC -DSTANDALONE -DOPENQU_HAVE_MPI -DMKL_ILP64
BIGMPI_LIB = /opt/bigmpi/lib/libbigmpi.a
BIGMPI_INC = -I/opt/bigmpi/include
CFLAGS = ${OPTS} ${DEFS} \
-Wall -std=c++11 -qopenmp #-restrict \
# -fasm-blocks
@ -34,6 +38,10 @@ CFLAGS += ${OPTFLAGS}
INC = -I./ -I../
ifdef bigmpi
DEFS := ${DEFS} -DBIGMPI
INC := ${INC} ${BIGMPI_INC}
endif
########### Modified for the ccefw-desktop.jf.intel.com environment ############
ifeq ($(HOST),ccefw-desktop)

2
qureg/qureg_apply1qubitgate.cpp
View File

@ -106,7 +106,7 @@ double QbitRegister<Type>::HP_Distrpair(unsigned pos, TM2x2<Type> const&m)
Type *tmpstate = tmpspace();
std::size_t lcl_size_half = localSize() / 2L;
assert(lcl_size_half <= std::numeric_limits<int>::max());
assert(lcl_size_half <= std::numeric_limits<size_t>::max());
if (lcl_chunk > lcl_size_half)
lcl_chunk = lcl_size_half;

5
qureg/qureg_permute.cpp
View File

@ -42,8 +42,13 @@ void QbitRegister<Type>::Permute(std::vector<std::size_t> permutation_new_vec)
// Dummy multi-node permutation code
std::vector<Type> glb_state(globalSize(), 0);
#ifdef BIGMPI
MPIX_Allgather_x(&(state[0]), localSize(), MPI_DOUBLE_COMPLEX, &(glb_state[0]), localSize(),
MPI_DOUBLE_COMPLEX, comm);
#else
MPI_Allgather(&(state[0]), localSize(), MPI_DOUBLE_COMPLEX, &(glb_state[0]), localSize(),
MPI_DOUBLE_COMPLEX, comm);
#endif //BIGMPI
for (std::size_t i = 0; i < glb_state.size(); i++) {
std::size_t glbind =
permutation_old.bin2dec(permutation_new.perm2lin(permutation_old.lin2perm(i)));

13
qureg/qureg_utils.cpp
View File

@ -366,9 +366,17 @@ void QbitRegister<Type>::Print(std::string x, std::vector<std::size_t> qbits)
#ifdef OPENQU_HAVE_MPI
for (std::size_t i = 1; i < nprocs; i++) {
std::size_t len;
#ifdef BIGMPI
MPIX_Recv_x(&len, 1, MPI_LONG, i, 1000 + i, comm, MPI_STATUS_IGNORE);
#else
MPI_Recv(&len, 1, MPI_LONG, i, 1000 + i, comm, MPI_STATUS_IGNORE);
#endif //BIGMPI
s.resize(len);
#ifdef BIGMPI
MPIX_Recv_x((void *)(s.c_str()), len, MPI_CHAR, i, i, comm, MPI_STATUS_IGNORE);
#else
MPI_Recv((void *)(s.c_str()), len, MPI_CHAR, i, i, comm, MPI_STATUS_IGNORE);
#endif //BIGMPI
printf("%s", s.c_str());
}
#endif
@ -377,8 +385,13 @@ void QbitRegister<Type>::Print(std::string x, std::vector<std::size_t> qbits)
#ifdef OPENQU_HAVE_MPI
std::string s = printvec(state, localSize(), nqbits, pcum, permutation);
std::size_t len = s.length() + 1;
#ifdef BIGMPI
MPIX_Send_x(&len, 1, MPI_LONG, 0, 1000 + rank, comm);
MPIX_Send_x(const_cast<char *>(s.c_str()), len, MPI_CHAR, 0, rank, comm);
#else
MPI_Send(&len, 1, MPI_LONG, 0, 1000 + rank, comm);
MPI_Send(const_cast<char *>(s.c_str()), len, MPI_CHAR, 0, rank, comm);
#endif //BIGMPI
#endif
}

16
tests/makefile
View File

@ -17,12 +17,14 @@ include ../make.inc
LDFLAGS = -L${MKLROOT}/lib/intel64 -lmkl_cdft_core -lmkl_intel_ilp64 -lmkl_core -lmkl_intel_thread -lmkl_blacs_intelmpi_ilp64 -lpthread
LDFLAGS = -L$(MKLROOT)lib/intel64 -lmkl_cdft_core -lmkl_intel_lp64 -lmkl_core -lmkl_intel_thread -lmkl_blacs_intelmpi_lp64 -lpthread \
ifdef memcheck
LDFLAGS := ${LDFLAGS} /home/msmelyan/valgrind-3.11.0/installed/lib/valgrind/libmpiwrap-amd64-linux.so
endif
ifdef bigmpi
LDFLAGS := ${BIGMPI_LIB} ${LDFLAGS}
endif
EXECS := benchgates.exe\
testgates.exe\
qft_test.exe\
@ -32,15 +34,15 @@ EXECS := benchgates.exe\
all: ${EXECS}
benchgates.exe: benchgates.o makefile ../qureg/qHiPSTER.a
$(CC) -o benchgates.exe ${CFLAGS} benchgates.o ${LDFLAGS} ../qureg/qHiPSTER.a
$(CC) -o benchgates.exe ${CFLAGS} benchgates.o ../qureg/qHiPSTER.a ${LDFLAGS}
testgates.exe: testgates.o makefile ../qureg/qHiPSTER.a
$(CC) -o testgates.exe ${CFLAGS} testgates.o ${LDFLAGS} ../qureg/qHiPSTER.a
$(CC) -o testgates.exe ${CFLAGS} testgates.o ../qureg/qHiPSTER.a ${LDFLAGS}
qft_test.exe: qft_test.o makefile ../qureg/qHiPSTER.a
$(CC) -o qft_test.exe ${CFLAGS} qft_test.o ${LDFLAGS} ../qureg/qHiPSTER.a
$(CC) -o qft_test.exe ${CFLAGS} qft_test.o ../qureg/qHiPSTER.a ${LDFLAGS}
expect_value_test.exe: expect_value_test.o makefile ../qureg/qHiPSTER.a
$(CC) -o expect_value_test.exe ${CFLAGS} expect_value_test.o ${LDFLAGS} ../qureg/qHiPSTER.a
$(CC) -o expect_value_test.exe ${CFLAGS} expect_value_test.o ../qureg/qHiPSTER.a ${LDFLAGS}
noisy_circuit_test.exe: noisy_circuit_test.o makefile ../qureg/qHiPSTER.a
$(CC) -o noisy_circuit_test.exe ${CFLAGS} noisy_circuit_test.o ${LDFLAGS} ../qureg/qHiPSTER.a
$(CC) -o noisy_circuit_test.exe ${CFLAGS} noisy_circuit_test.o ../qureg/qHiPSTER.a ${LDFLAGS}
%.o : %.cpp makefile
$(CC) ${CFLAGS} ${INC} ${LDFLAGS} -c $< -o $@

48
util/utils.hpp
View File

@ -26,6 +26,11 @@
#include <functional>
#include <string>
#ifdef BIGMPI
#include "mpi.hpp"
#include "bigmpi.h"
#endif //BIGMPI
// defines
#define DO_PRAGMA(x) _Pragma(#x)
@ -65,38 +70,63 @@ int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
static int MPI_Allreduce_x(float *sendbuf, float *recvbuf,
MPI_Op op, MPI_Comm comm)
{
#ifdef BIGMPI
return MPIX_Allreduce_x((void*)sendbuf, (void *)recvbuf, 1,
MPI_FLOAT, op, comm);
#else
return MPI_Allreduce((void*)sendbuf, (void *)recvbuf, 1,
MPI_FLOAT, op, comm);
#endif //BIGMPI
}
static int MPI_Allreduce_x(double *sendbuf, double *recvbuf,
MPI_Op op, MPI_Comm comm)
{
#ifdef BIGMPI
return MPIX_Allreduce_x((void*)sendbuf, (void *)recvbuf, 1,
MPI_DOUBLE, op, comm);
#else
return MPI_Allreduce((void*)sendbuf, (void *)recvbuf, 1,
MPI_DOUBLE, op, comm);
#endif //BIGMPI
}
static
int MPI_Sendrecv_x(ComplexSP *sendbuf, int sendcount,
int dest, int sendtag,
ComplexSP *recvbuf, int recvcount,
int source, int recvtag,
int MPI_Sendrecv_x(ComplexSP *sendbuf, size_t sendcount,
size_t dest, size_t sendtag,
ComplexSP *recvbuf, size_t recvcount,
size_t source, size_t recvtag,
MPI_Comm comm, MPI_Status *status)
#ifdef BIGMPI
{
return
MPIX_Sendrecv_x((void *)sendbuf, sendcount, MPI_COMPLEX, dest, sendtag,
(void *)recvbuf, recvcount, MPI_COMPLEX, source, recvtag, comm, status);
}
#else
{
return
MPI_Sendrecv((void *)sendbuf, sendcount, MPI_COMPLEX, dest, sendtag,
(void *)recvbuf, recvcount, MPI_COMPLEX, source, recvtag, comm, status);
}
#endif //BIGMPI
static
int MPI_Sendrecv_x(ComplexDP *sendbuf, int sendcount,
int dest, int sendtag,
ComplexDP *recvbuf, int recvcount,
int source, int recvtag,
int MPI_Sendrecv_x(ComplexDP *sendbuf, size_t sendcount,
size_t dest, size_t sendtag,
ComplexDP *recvbuf, size_t recvcount,
size_t source, size_t recvtag,
MPI_Comm comm, MPI_Status *status)
#ifdef BIGMPI
{
return
MPIX_Sendrecv_x((void *)sendbuf, sendcount, MPI_DOUBLE_COMPLEX, dest, sendtag,
(void *)recvbuf, recvcount, MPI_DOUBLE_COMPLEX, source, recvtag, comm, status);
}
#else
{
return
MPI_Sendrecv((void *)sendbuf, sendcount, MPI_DOUBLE_COMPLEX, dest, sendtag,
(void *)recvbuf, recvcount, MPI_DOUBLE_COMPLEX, source, recvtag, comm, status);
}
#endif //BIGMPI