regression test
This commit is contained in:
Ruipeng Li
parent
f3aad09d80
commit
f0ed0085a3
@ -98,6 +98,11 @@ co="--with-device-openmp --enable-debug --with-extra-CFLAGS=\\'-qmaxmem=-1 -qsup
|
||||
./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $rost
|
||||
./renametest.sh basic $output_dir/basic-deviceomp-nonum-debug-struct
|
||||
|
||||
# CUDA with UM without MPI
|
||||
co="--with-cuda --enable-unified-memory --without-MPI --with-extra-CXXFLAGS=\\'-qmaxmem=-1 -qsuppress=1500-029\\'"
|
||||
./test.sh basic.sh $src_dir -co: $co -mo: $mo
|
||||
./renametest.sh basic $output_dir/basic-cuda-um-without-MPI
|
||||
|
||||
# Echo to stderr all nonempty error files in $output_dir
|
||||
for errfile in $( find $output_dir ! -size 0 -name "*.err" )
|
||||
do
|
||||
|
||||
@ -1680,6 +1680,10 @@ then
|
||||
HYPRE_CUDA_GENCODE="-gencode arch=compute_${HYPRE_CUDA_SM},\"code=sm_${HYPRE_CUDA_SM}\""
|
||||
|
||||
CUFLAGS+="-O2 -ccbin=$NVCCBIN ${HYPRE_CUDA_GENCODE} -expt-extended-lambda -dc -std=c++11 -Xcompiler -Wno-deprecated-register --x cu"
|
||||
if test "$hypre_using_debug" = "yes"
|
||||
then
|
||||
CUFLAGS="-g ${CUFLAGS}"
|
||||
fi
|
||||
CXXFLAGS="${CUFLAGS} -Xcompiler \"${CXXFLAGS}\""
|
||||
CFLAGS=${CXXFLAGS}
|
||||
LDFLAGS="-ccbin=$NVCCBIN ${HYPRE_CUDA_GENCODE} -Xcompiler \"${LDFLAGS}\""
|
||||
|
||||
4
src/configure
vendored
4
src/configure
vendored
@ -8368,6 +8368,10 @@ done
|
||||
HYPRE_CUDA_GENCODE="-gencode arch=compute_${HYPRE_CUDA_SM},\"code=sm_${HYPRE_CUDA_SM}\""
|
||||
|
||||
CUFLAGS+="-O2 -ccbin=$NVCCBIN ${HYPRE_CUDA_GENCODE} -expt-extended-lambda -dc -std=c++11 -Xcompiler -Wno-deprecated-register --x cu"
|
||||
if test "$hypre_using_debug" = "yes"
|
||||
then
|
||||
CUFLAGS="-g ${CUFLAGS}"
|
||||
fi
|
||||
CXXFLAGS="${CUFLAGS} -Xcompiler \"${CXXFLAGS}\""
|
||||
CFLAGS=${CXXFLAGS}
|
||||
LDFLAGS="-ccbin=$NVCCBIN ${HYPRE_CUDA_GENCODE} -Xcompiler \"${LDFLAGS}\""
|
||||
|
||||
@ -125,83 +125,84 @@ extern "C" {
|
||||
#define MPI_BOTTOM hypre_MPI_BOTTOM
|
||||
|
||||
#define MPI_FLOAT hypre_MPI_FLOAT
|
||||
#define MPI_DOUBLE hypre_MPI_DOUBLE
|
||||
#define MPI_DOUBLE hypre_MPI_DOUBLE
|
||||
#define MPI_LONG_DOUBLE hypre_MPI_LONG_DOUBLE
|
||||
#define MPI_INT hypre_MPI_INT
|
||||
#define MPI_LONG_LONG_INT hypre_MPI_INT
|
||||
#define MPI_CHAR hypre_MPI_CHAR
|
||||
#define MPI_LONG hypre_MPI_LONG
|
||||
#define MPI_BYTE hypre_MPI_BYTE
|
||||
#define MPI_INT hypre_MPI_INT
|
||||
#define MPI_LONG_LONG_INT hypre_MPI_INT
|
||||
#define MPI_CHAR hypre_MPI_CHAR
|
||||
#define MPI_LONG hypre_MPI_LONG
|
||||
#define MPI_BYTE hypre_MPI_BYTE
|
||||
#define MPI_C_DOUBLE_COMPLEX hypre_MPI_COMPLEX
|
||||
|
||||
#define MPI_SUM hypre_MPI_SUM
|
||||
#define MPI_MIN hypre_MPI_MIN
|
||||
#define MPI_MAX hypre_MPI_MAX
|
||||
#define MPI_LOR hypre_MPI_LOR
|
||||
#define MPI_LAND hypre_MPI_LAND
|
||||
#define MPI_SUM hypre_MPI_SUM
|
||||
#define MPI_MIN hypre_MPI_MIN
|
||||
#define MPI_MAX hypre_MPI_MAX
|
||||
#define MPI_LOR hypre_MPI_LOR
|
||||
#define MPI_LAND hypre_MPI_LAND
|
||||
#define MPI_SUCCESS hypre_MPI_SUCCESS
|
||||
#define MPI_STATUSES_IGNORE hypre_MPI_STATUSES_IGNORE
|
||||
|
||||
#define MPI_UNDEFINED hypre_MPI_UNDEFINED
|
||||
#define MPI_REQUEST_NULL hypre_MPI_REQUEST_NULL
|
||||
#define MPI_ANY_SOURCE hypre_MPI_ANY_SOURCE
|
||||
#define MPI_UNDEFINED hypre_MPI_UNDEFINED
|
||||
#define MPI_REQUEST_NULL hypre_MPI_REQUEST_NULL
|
||||
#define MPI_INFO_NULL hypre_MPI_INFO_NULL
|
||||
#define MPI_ANY_SOURCE hypre_MPI_ANY_SOURCE
|
||||
#define MPI_ANY_TAG hypre_MPI_ANY_TAG
|
||||
#define MPI_SOURCE hypre_MPI_SOURCE
|
||||
#define MPI_TAG hypre_MPI_TAG
|
||||
|
||||
#define MPI_Init hypre_MPI_Init
|
||||
#define MPI_Finalize hypre_MPI_Finalize
|
||||
#define MPI_Abort hypre_MPI_Abort
|
||||
#define MPI_Wtime hypre_MPI_Wtime
|
||||
#define MPI_Wtick hypre_MPI_Wtick
|
||||
#define MPI_Barrier hypre_MPI_Barrier
|
||||
#define MPI_Comm_create hypre_MPI_Comm_create
|
||||
#define MPI_Comm_dup hypre_MPI_Comm_dup
|
||||
#define MPI_Init hypre_MPI_Init
|
||||
#define MPI_Finalize hypre_MPI_Finalize
|
||||
#define MPI_Abort hypre_MPI_Abort
|
||||
#define MPI_Wtime hypre_MPI_Wtime
|
||||
#define MPI_Wtick hypre_MPI_Wtick
|
||||
#define MPI_Barrier hypre_MPI_Barrier
|
||||
#define MPI_Comm_create hypre_MPI_Comm_create
|
||||
#define MPI_Comm_dup hypre_MPI_Comm_dup
|
||||
#define MPI_Comm_f2c hypre_MPI_Comm_f2c
|
||||
#define MPI_Comm_group hypre_MPI_Comm_group
|
||||
#define MPI_Comm_size hypre_MPI_Comm_size
|
||||
#define MPI_Comm_rank hypre_MPI_Comm_rank
|
||||
#define MPI_Comm_free hypre_MPI_Comm_free
|
||||
#define MPI_Comm_split hypre_MPI_Comm_split
|
||||
#define MPI_Comm_group hypre_MPI_Comm_group
|
||||
#define MPI_Comm_size hypre_MPI_Comm_size
|
||||
#define MPI_Comm_rank hypre_MPI_Comm_rank
|
||||
#define MPI_Comm_free hypre_MPI_Comm_free
|
||||
#define MPI_Comm_split hypre_MPI_Comm_split
|
||||
#define MPI_Comm_split_type hypre_MPI_Comm_split_type
|
||||
#define MPI_Group_incl hypre_MPI_Group_incl
|
||||
#define MPI_Group_free hypre_MPI_Group_free
|
||||
#define MPI_Address hypre_MPI_Address
|
||||
#define MPI_Get_count hypre_MPI_Get_count
|
||||
#define MPI_Alltoall hypre_MPI_Alltoall
|
||||
#define MPI_Allgather hypre_MPI_Allgather
|
||||
#define MPI_Allgatherv hypre_MPI_Allgatherv
|
||||
#define MPI_Gather hypre_MPI_Gather
|
||||
#define MPI_Gatherv hypre_MPI_Gatherv
|
||||
#define MPI_Scatter hypre_MPI_Scatter
|
||||
#define MPI_Scatterv hypre_MPI_Scatterv
|
||||
#define MPI_Bcast hypre_MPI_Bcast
|
||||
#define MPI_Send hypre_MPI_Send
|
||||
#define MPI_Recv hypre_MPI_Recv
|
||||
#define MPI_Isend hypre_MPI_Isend
|
||||
#define MPI_Irecv hypre_MPI_Irecv
|
||||
#define MPI_Send_init hypre_MPI_Send_init
|
||||
#define MPI_Recv_init hypre_MPI_Recv_init
|
||||
#define MPI_Irsend hypre_MPI_Irsend
|
||||
#define MPI_Startall hypre_MPI_Startall
|
||||
#define MPI_Probe hypre_MPI_Probe
|
||||
#define MPI_Iprobe hypre_MPI_Iprobe
|
||||
#define MPI_Test hypre_MPI_Test
|
||||
#define MPI_Group_incl hypre_MPI_Group_incl
|
||||
#define MPI_Group_free hypre_MPI_Group_free
|
||||
#define MPI_Address hypre_MPI_Address
|
||||
#define MPI_Get_count hypre_MPI_Get_count
|
||||
#define MPI_Alltoall hypre_MPI_Alltoall
|
||||
#define MPI_Allgather hypre_MPI_Allgather
|
||||
#define MPI_Allgatherv hypre_MPI_Allgatherv
|
||||
#define MPI_Gather hypre_MPI_Gather
|
||||
#define MPI_Gatherv hypre_MPI_Gatherv
|
||||
#define MPI_Scatter hypre_MPI_Scatter
|
||||
#define MPI_Scatterv hypre_MPI_Scatterv
|
||||
#define MPI_Bcast hypre_MPI_Bcast
|
||||
#define MPI_Send hypre_MPI_Send
|
||||
#define MPI_Recv hypre_MPI_Recv
|
||||
#define MPI_Isend hypre_MPI_Isend
|
||||
#define MPI_Irecv hypre_MPI_Irecv
|
||||
#define MPI_Send_init hypre_MPI_Send_init
|
||||
#define MPI_Recv_init hypre_MPI_Recv_init
|
||||
#define MPI_Irsend hypre_MPI_Irsend
|
||||
#define MPI_Startall hypre_MPI_Startall
|
||||
#define MPI_Probe hypre_MPI_Probe
|
||||
#define MPI_Iprobe hypre_MPI_Iprobe
|
||||
#define MPI_Test hypre_MPI_Test
|
||||
#define MPI_Testall hypre_MPI_Testall
|
||||
#define MPI_Wait hypre_MPI_Wait
|
||||
#define MPI_Waitall hypre_MPI_Waitall
|
||||
#define MPI_Waitany hypre_MPI_Waitany
|
||||
#define MPI_Allreduce hypre_MPI_Allreduce
|
||||
#define MPI_Reduce hypre_MPI_Reduce
|
||||
#define MPI_Scan hypre_MPI_Scan
|
||||
#define MPI_Request_free hypre_MPI_Request_free
|
||||
#define MPI_Type_contiguous hypre_MPI_Type_contiguous
|
||||
#define MPI_Type_vector hypre_MPI_Type_vector
|
||||
#define MPI_Type_hvector hypre_MPI_Type_hvector
|
||||
#define MPI_Type_struct hypre_MPI_Type_struct
|
||||
#define MPI_Wait hypre_MPI_Wait
|
||||
#define MPI_Waitall hypre_MPI_Waitall
|
||||
#define MPI_Waitany hypre_MPI_Waitany
|
||||
#define MPI_Allreduce hypre_MPI_Allreduce
|
||||
#define MPI_Reduce hypre_MPI_Reduce
|
||||
#define MPI_Scan hypre_MPI_Scan
|
||||
#define MPI_Request_free hypre_MPI_Request_free
|
||||
#define MPI_Type_contiguous hypre_MPI_Type_contiguous
|
||||
#define MPI_Type_vector hypre_MPI_Type_vector
|
||||
#define MPI_Type_hvector hypre_MPI_Type_hvector
|
||||
#define MPI_Type_struct hypre_MPI_Type_struct
|
||||
#define MPI_Type_commit hypre_MPI_Type_commit
|
||||
#define MPI_Type_free hypre_MPI_Type_free
|
||||
#define MPI_Op_free hypre_MPI_Op_free
|
||||
#define MPI_Type_free hypre_MPI_Type_free
|
||||
#define MPI_Op_free hypre_MPI_Op_free
|
||||
#define MPI_Op_create hypre_MPI_Op_create
|
||||
#define MPI_User_function hypre_MPI_User_function
|
||||
#define MPI_Info_create hypre_MPI_Info_create
|
||||
@ -255,6 +256,7 @@ typedef HYPRE_Int hypre_MPI_Info;
|
||||
|
||||
#define hypre_MPI_UNDEFINED -9999
|
||||
#define hypre_MPI_REQUEST_NULL 0
|
||||
#define hypre_MPI_INFO_NULL 0
|
||||
#define hypre_MPI_ANY_SOURCE 1
|
||||
#define hypre_MPI_ANY_TAG 1
|
||||
|
||||
@ -278,7 +280,7 @@ typedef MPI_User_function hypre_MPI_User_function;
|
||||
#define hypre_MPI_COMM_NULL MPI_COMM_NULL
|
||||
#define hypre_MPI_BOTTOM MPI_BOTTOM
|
||||
#define hypre_MPI_COMM_SELF MPI_COMM_SELF
|
||||
#define hypre_MPI_COMM_TYPE_SHARED MPI_COMM_TYPE_SHARED
|
||||
#define hypre_MPI_COMM_TYPE_SHARED MPI_COMM_TYPE_SHARED
|
||||
|
||||
#define hypre_MPI_FLOAT MPI_FLOAT
|
||||
#define hypre_MPI_DOUBLE MPI_DOUBLE
|
||||
@ -300,9 +302,10 @@ typedef MPI_User_function hypre_MPI_User_function;
|
||||
#define hypre_MPI_SUCCESS MPI_SUCCESS
|
||||
#define hypre_MPI_STATUSES_IGNORE MPI_STATUSES_IGNORE
|
||||
|
||||
#define hypre_MPI_UNDEFINED MPI_UNDEFINED
|
||||
#define hypre_MPI_UNDEFINED MPI_UNDEFINED
|
||||
#define hypre_MPI_REQUEST_NULL MPI_REQUEST_NULL
|
||||
#define hypre_MPI_ANY_SOURCE MPI_ANY_SOURCE
|
||||
#define hypre_MPI_INFO_NULL MPI_INFO_NULL
|
||||
#define hypre_MPI_ANY_SOURCE MPI_ANY_SOURCE
|
||||
#define hypre_MPI_ANY_TAG MPI_ANY_TAG
|
||||
#define hypre_MPI_SOURCE MPI_SOURCE
|
||||
#define hypre_MPI_TAG MPI_TAG
|
||||
@ -1934,7 +1937,7 @@ hypre_SyncCudaComputeStream(hypre_Handle *hypre_handle)
|
||||
#include "nvToolsExtCudaRt.h"
|
||||
|
||||
static const uint32_t colors[] = { 0x0000ff00, 0x000000ff, 0x00ffff00, 0x00ff00ff, 0x0000ffff, 0x00ff0000, 0x00ffffff };
|
||||
static const int num_colors = sizeof(colors)/sizeof(uint32_t);
|
||||
static const hypre_int num_colors = sizeof(colors)/sizeof(uint32_t);
|
||||
|
||||
#define PUSH_RANGE(name,cid) { \
|
||||
hypre_int color_id = cid; \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user