diff options
| author | Sylvain Jeaugey <sjeaugey@nvidia.com> | 2016-09-15 19:45:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 19:45:52 +0300 |
| commit | 9ee6189bf92e0d73e75343a958cdf4e8de0c0114 (patch) | |
| tree | c9517e3342a079be53563cddb9f0e622c91e21d3 | |
| parent | 939b0a42978372287cfe7ca88865a0e97ac9f79b (diff) | |
| parent | 47b0797fe1f1b00cf2edfe449ac59370eea45032 (diff) | |
Merge pull request #41 from jia-kai/master
Some minor fixes for compile/usage
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/core.cu | 2 | ||||
| -rw-r--r-- | src/nccl.h | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -22,7 +22,7 @@ NVCC_GENCODE ?= -gencode=arch=compute_35,code=sm_35 \ CXXFLAGS := -I$(CUDA_INC) -fPIC -fvisibility=hidden NVCUFLAGS := -ccbin $(CXX) $(NVCC_GENCODE) -lineinfo -std=c++11 -maxrregcount 96 # Use addprefix so that we can specify more than one path -LDFLAGS := $(addprefix -L,${CUDA_LIB}) -lcudart +LDFLAGS := $(addprefix -L,${CUDA_LIB}) -lcudart -lrt ifeq ($(DEBUG), 0) NVCUFLAGS += -O3 diff --git a/src/core.cu b/src/core.cu index b5733cd..2eca735 100644 --- a/src/core.cu +++ b/src/core.cu @@ -728,7 +728,7 @@ ncclResult_t ncclCommInitRank(ncclComm_t* newcomm, int ndev, ncclUniqueId commId } extern "C" DSOGLOBAL -ncclResult_t ncclCommInitAll(ncclComm_t* comms, int ndev, int* devlist) { +ncclResult_t ncclCommInitAll(ncclComm_t* comms, int ndev, const int* devlist) { initDebug(); showVersion(); @@ -63,7 +63,7 @@ ncclResult_t ncclCommInitRank(ncclComm_t* comm, int ndev, ncclUniqueId commId, i * comm should be pre-allocated with size at least ndev*sizeof(ncclComm_t). * If devlist is NULL, the first ndev CUDA devices are used. * Order of devlist defines user-order of processors within the communicator. */ -ncclResult_t ncclCommInitAll(ncclComm_t* comm, int ndev, int* devlist); +ncclResult_t ncclCommInitAll(ncclComm_t* comm, int ndev, const int* devlist); /* Frees resources associated with communicator object. */ void ncclCommDestroy(ncclComm_t comm); |