From 32e8a8e0342fcb65f7d33bdcb630aad20d87902e Mon Sep 17 00:00:00 2001 From: Eric Lunderberg Date: Wed, 7 Sep 2022 09:12:02 -0700 Subject: [PATCH] [Build] Update C++ standard to C++17 for AOT, iOS, VTA (#12712) Follow-up from https://github.com/apache/tvm/pull/12337 and https://github.com/apache/tvm/pull/12693, updating a few additional locations that specified C++14. --- apps/ios_rpc/tvmrpc.xcodeproj/project.pbxproj | 4 ++-- include/tvm/support/span.h | 2 +- tests/python/relay/aot/test_cpp_aot.py | 2 +- vta/python/vta/exec/rpc_server.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/ios_rpc/tvmrpc.xcodeproj/project.pbxproj b/apps/ios_rpc/tvmrpc.xcodeproj/project.pbxproj index 61427d0ca248..ccc61707d3f2 100644 --- a/apps/ios_rpc/tvmrpc.xcodeproj/project.pbxproj +++ b/apps/ios_rpc/tvmrpc.xcodeproj/project.pbxproj @@ -255,7 +255,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -308,7 +308,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; diff --git a/include/tvm/support/span.h b/include/tvm/support/span.h index 689a48dee788..768252f77ce9 100644 --- a/include/tvm/support/span.h +++ b/include/tvm/support/span.h @@ -36,7 +36,7 @@ namespace support { /*! * \brief A partial implementation of the C++20 std::span. * - * At the time of writing, TVM must compile against C++14. + * At the time of writing, TVM must compile against C++17. */ template class Span { diff --git a/tests/python/relay/aot/test_cpp_aot.py b/tests/python/relay/aot/test_cpp_aot.py index 4ffe302763f8..b67bc90d34fd 100644 --- a/tests/python/relay/aot/test_cpp_aot.py +++ b/tests/python/relay/aot/test_cpp_aot.py @@ -138,7 +138,7 @@ def test_mobilenet(enable_usmp, target_kind): temp_dir = tvm.contrib.utils.TempDirectory() test_so_path = temp_dir / "test.so" - mod.export_library(test_so_path, cc="c++", options=["-std=gnu++14", "-g3", "-O0"]) + mod.export_library(test_so_path, cc="c++", options=["-std=gnu++17", "-g3", "-O0"]) loaded_mod = tvm.runtime.load_module(test_so_path) runner = tvm.runtime.executor.AotModule(loaded_mod["default"](tvm.cpu(0))) runner.set_input(**inputs) diff --git a/vta/python/vta/exec/rpc_server.py b/vta/python/vta/exec/rpc_server.py index dcf564dd0314..1abad98b2216 100644 --- a/vta/python/vta/exec/rpc_server.py +++ b/vta/python/vta/exec/rpc_server.py @@ -106,7 +106,7 @@ def reconfig_runtime(cfg_json): if pkg.same_config(old_cfg): logging.info("Skip reconfig_runtime due to same config.") return - cflags = ["-O2", "-std=c++14"] + cflags = ["-O2", "-std=c++17"] cflags += pkg.cflags ldflags = pkg.ldflags lib_name = dll_path