diff --git a/3rdparty/mshadow/make/mshadow.mk b/3rdparty/mshadow/make/mshadow.mk index c647fa342ed2..8ccfad10d256 100644 --- a/3rdparty/mshadow/make/mshadow.mk +++ b/3rdparty/mshadow/make/mshadow.mk @@ -172,7 +172,7 @@ PS_LIB = $(addprefix $(PS_PATH)/build/, libps.a libps_main.a) \ $(addprefix $(PS_THIRD_PATH)/lib/, libgflags.a libzmq.a libprotobuf.a \ libglog.a libz.a libsnappy.a) # -L$(PS_THIRD_PATH)/lib -lgflags -lzmq -lprotobuf -lglog -lz -lsnappy -MSHADOW_NVCCFLAGS += --std=c++14 +MSHADOW_NVCCFLAGS += --std=c++17 else MSHADOW_CFLAGS+= -DMSHADOW_DIST_PS=0 endif diff --git a/Makefile b/Makefile index 8d3e6f5bb50d..8f484912ae2d 100644 --- a/Makefile +++ b/Makefile @@ -131,9 +131,9 @@ endif # -L/usr/local/lib ifeq ($(DEBUG), 1) - NVCCFLAGS += -std=c++14 -Xcompiler -D_FORCE_INLINES -g -G -O0 -ccbin $(CXX) $(MSHADOW_NVCCFLAGS) + NVCCFLAGS += -std=c++17 -Xcompiler -D_FORCE_INLINES -g -G -O0 -ccbin $(CXX) $(MSHADOW_NVCCFLAGS) else - NVCCFLAGS += -std=c++14 -Xcompiler -D_FORCE_INLINES -O3 -ccbin $(CXX) $(MSHADOW_NVCCFLAGS) + NVCCFLAGS += -std=c++17 -Xcompiler -D_FORCE_INLINES -O3 -ccbin $(CXX) $(MSHADOW_NVCCFLAGS) endif # CFLAGS for segfault logger @@ -693,7 +693,7 @@ build/libtransposerowsp_lib.so: build/libcustomop_gpu_lib.so: @mkdir -p $(@D) $(NVCC) -shared -std=c++11 -Xcompiler -fPIC example/extensions/lib_custom_op/relu_lib.cu -o /dev/null -I include/mxnet - $(NVCC) -shared -std=c++14 -Xcompiler -fPIC example/extensions/lib_custom_op/relu_lib.cu -o $@ -I include/mxnet + $(NVCC) -shared -std=c++17 -Xcompiler -fPIC example/extensions/lib_custom_op/relu_lib.cu -o $@ -I include/mxnet build/libsubgraph_lib.so: @mkdir -p $(@D) $(CXX) -shared -fPIC -std=c++11 example/extensions/lib_subgraph/subgraph_lib.cc -o /dev/null -I include/mxnet diff --git a/src/common/cuda/rtc.cc b/src/common/cuda/rtc.cc index 5a0ee562f7cc..1a931ab3e20b 100644 --- a/src/common/cuda/rtc.cc +++ b/src/common/cuda/rtc.cc @@ -147,7 +147,7 @@ CUfunction get_function(const std::string &code, std::string gpu_arch_arg = "--gpu-architecture=compute_" + std::to_string(sm_arch); const char *opts[] = {gpu_arch_arg.c_str(), - "--std=c++11"}; + "--std=c++14"}; const std::string kernel_name_demangled = kernel_name; NVRTC_CALL(nvrtcAddNameExpression(program, (kernel_name_demangled).c_str()));