From d26f9454883b14d9c9a3442f8541864eb4270614 Mon Sep 17 00:00:00 2001 From: RaulPPealez Date: Tue, 14 Nov 2023 08:53:45 +0100 Subject: [PATCH] Add correct std to setup.py too --- python/CMakeLists.txt | 1 + python/setup.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index ee0c19dd..65593c5f 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -23,6 +23,7 @@ add_custom_command( add_custom_target(PythonInstall DEPENDS "${WRAP_FILE}" "${CMAKE_CURRENT_SOURCE_DIR}/setup.py") set(NN_PLUGIN_HEADER_DIR "${CMAKE_SOURCE_DIR}/openmmapi/include") set(NN_PLUGIN_LIBRARY_DIR "${CMAKE_BINARY_DIR}") +set(EXTENSION_CXX_STANDARD ${CMAKE_CXX_STANDARD}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py ${CMAKE_CURRENT_BINARY_DIR}/setup.py) add_custom_command(TARGET PythonInstall COMMAND "${PYTHON_EXECUTABLE}" -m pip install . diff --git a/python/setup.py b/python/setup.py index 4d03efe2..6748a57a 100644 --- a/python/setup.py +++ b/python/setup.py @@ -6,10 +6,11 @@ torch_include_dirs = '@TORCH_INCLUDE_DIRS@'.split(';') nn_plugin_header_dir = '@NN_PLUGIN_HEADER_DIR@' nn_plugin_library_dir = '@NN_PLUGIN_LIBRARY_DIR@' +cpp_std = '@EXTENSION_CXX_STANDARD@' torch_dir, _ = os.path.split('@TORCH_LIBRARY@') # setup extra compile and link arguments on Mac -extra_compile_args = ['-std=c++14'] +extra_compile_args = ['-std=c++' + cpp_std] extra_link_args = [] if platform.system() == 'Darwin':