Skip to content

Commit d95058f

Browse files
Rhett-Yingmfbalin
andauthored
[Dev] Change CXX standard to 17 (#6138) (#6151)
Co-authored-by: Muhammed Fatih BALIN <[email protected]>
1 parent b64940b commit d95058f

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.5)
55
project(dgl C CXX)
66
message(STATUS "Start configuring project ${PROJECT_NAME}")
77

8+
set(CMAKE_CXX_STANDARD 17)
9+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
10+
811
# cmake utils
912
include(cmake/util/Util.cmake)
1013
include(cmake/util/MshadowUtil.cmake)
@@ -162,8 +165,6 @@ else(USE_CUDA)
162165
add_library(dgl SHARED ${DGL_SRC})
163166
endif(USE_CUDA)
164167

165-
set_property(TARGET dgl PROPERTY CXX_STANDARD 14)
166-
167168
# include directories
168169
target_include_directories(dgl PRIVATE "include")
169170
target_include_directories(dgl PRIVATE "third_party/dlpack/include")

cmake/modules/CUDA.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ endif()
88
###### Borrowed from MSHADOW project
99

1010
include(CheckCXXCompilerFlag)
11-
check_cxx_compiler_flag("-std=c++14" SUPPORT_CXX14)
11+
check_cxx_compiler_flag("-std=c++17" SUPPORT_CXX17)
1212

1313
set(dgl_known_gpu_archs "35" "50" "60" "70")
1414
set(dgl_cuda_arch_ptx "70")
@@ -248,7 +248,7 @@ macro(dgl_config_cuda out_variable)
248248
list(APPEND CUDA_NVCC_FLAGS ${NVCC_FLAGS_ARCH})
249249

250250
# 2. flags in third_party/moderngpu
251-
list(APPEND CUDA_NVCC_FLAGS "--expt-extended-lambda;-Wno-deprecated-declarations;-std=c++14")
251+
list(APPEND CUDA_NVCC_FLAGS "--expt-extended-lambda;-Wno-deprecated-declarations;-std=c++17")
252252

253253
message(STATUS "CUDA_NVCC_FLAGS: ${CUDA_NVCC_FLAGS}")
254254

python/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def config_cython():
145145
library_dirs=library_dirs,
146146
libraries=libraries,
147147
# Crashes without this flag with GCC 5.3.1
148-
extra_compile_args=["-std=c++14"],
148+
extra_compile_args=["-std=c++17"],
149149
language="c++",
150150
)
151151
)

0 commit comments

Comments
 (0)