Fix for CXX=clang USE=rocm error: invalid argument '-std=c++17' not allowed with 'C' https://github.com/pytorch/pytorch/issues/103222 --- a/c10/hip/CMakeLists.txt +++ b/c10/hip/CMakeLists.txt @@ -37,6 +37,7 @@ if(NOT BUILD_LIBTORCHLESS) # Propagate HIP_CXX_FLAGS that were set from Dependencies.cmake target_compile_options(c10_hip PRIVATE ${HIP_CXX_FLAGS}) + set_target_properties(c10_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) # caffe2_hip adds a bunch of dependencies like rocsparse, but c10/hip is supposed to be # minimal. I'm not sure if we need hip_hcc or not; for now leave it out --- a/caffe2/CMakeLists.txt +++ b/caffe2/CMakeLists.txt @@ -1774,6 +1774,7 @@ if(USE_ROCM) # Since PyTorch files contain HIP headers, these flags are required for the necessary definitions to be added. target_compile_options(torch_hip PUBLIC ${HIP_CXX_FLAGS}) # experiment + set_target_properties(torch_hip PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) target_link_libraries(torch_hip PUBLIC c10_hip) @@ -2003,6 +2004,7 @@ if(BUILD_TEST) target_include_directories(${test_name} PRIVATE $) target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE} ${Caffe2_HIP_INCLUDE}) target_compile_options(${test_name} PRIVATE ${HIP_CXX_FLAGS}) + set_target_properties(${test_name} PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) add_test(NAME ${test_name} COMMAND $) if(INSTALL_TEST) set_target_properties(${test_name} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:${_rpath_portable_origin}/../lib") --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -1014,7 +1014,6 @@ list(APPEND HIP_CXX_FLAGS -DUSE_ROCM_CK_GEMM) endif() list(APPEND HIP_HIPCC_FLAGS --offload-compress) - list(APPEND HIP_HIPCC_FLAGS -std=c++17) # Pass device library path for theRock nightly builds if(DEFINED ENV{HIP_DEVICE_LIB_PATH}) file(TO_CMAKE_PATH "$ENV{HIP_DEVICE_LIB_PATH}" _hip_device_lib_path) --- a/cmake/public/utils.cmake +++ b/cmake/public/utils.cmake @@ -254,6 +254,7 @@ function(caffe2_hip_binary_target target_name_or_src) caffe2_binary_target(${target_name_or_src}) target_compile_options(${__target} PRIVATE ${HIP_CXX_FLAGS}) + set_target_properties(${__target} PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) target_include_directories(${__target} PRIVATE ${Caffe2_HIP_INCLUDE}) endfunction()