Support Clad as an interpreter external plugin #830
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| include(ExternalProject) | ||
|
|
||
| set(clad_install_dir ${CMAKE_BINARY_DIR}/plugins/clad/) | ||
| # Specify include dirs for clad | ||
| set(CLAD_INCLUDE_DIRS ${clad_install_dir}) | ||
| # Clad Libraries | ||
| set(CLAD_CXX_FLAGS ${CMAKE_CXX_FLAGS}) | ||
| set(_clad_build_type ${CLAD_BUILD_TYPE}) | ||
| if(MSVC AND NOT CMAKE_GENERATOR MATCHES Ninja) | ||
| if (winrtdebug) | ||
| set(_clad_build_type Debug) | ||
| else() | ||
| set(_clad_build_type Release) | ||
| endif() | ||
| if(asan) | ||
| set(CLAD_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ASAN_EXTRA_CXX_FLAGS}") | ||
| endif() | ||
| set(EXTRA_BUILD_ARGS --config ${_clad_build_type}) | ||
| endif() | ||
| if(NOT _clad_build_type STREQUAL "" AND NOT _clad_build_type STREQUAL ".") | ||
| set(EXTRA_BUILD_ARGS --config ${_clad_build_type}) | ||
| endif() | ||
|
|
||
| set(_CLAD_LIBRARY_PATH ${CMAKE_CURRENT_BINARY_DIR}/clad-prefix/src/clad-build/lib/) | ||
|
|
||
| # build byproducts only needed by Ninja | ||
| if(CMAKE_GENERATOR MATCHES Ninja) | ||
| set(CLAD_BYPRODUCTS | ||
| ${_CLAD_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}cladPlugin${CMAKE_STATIC_LIBRARY_SUFFIX} | ||
| ${_CLAD_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}cladDifferentiator${CMAKE_STATIC_LIBRARY_SUFFIX} | ||
| ) | ||
| endif() | ||
|
|
||
| if(APPLE) | ||
| set(_clad_extra_cmake_args -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}) | ||
| endif() | ||
|
|
||
| if (CMAKE_CXX_STANDARD) | ||
| list(APPEND _clad_extra_cmake_args -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}) | ||
| endif(CMAKE_CXX_STANDARD) | ||
|
|
||
| if (LLVM_FORCE_USE_OLD_TOOLCHAIN) | ||
| list(APPEND _clad_extra_cmake_args -DLLVM_FORCE_USE_OLD_TOOLCHAIN=${LLVM_FORCE_USE_OLD_TOOLCHAIN}) | ||
| endif(LLVM_FORCE_USE_OLD_TOOLCHAIN) | ||
|
|
||
| list(APPEND _clad_extra_cmake_args -DCLAD_BUILD_STATIC_ONLY=ON) | ||
|
|
||
| # Wrap download, configure and build steps in a script to log output | ||
| set(_clad_extra_settings | ||
| LOG_DOWNLOAD ON | ||
| LOG_CONFIGURE ON | ||
| LOG_BUILD ON | ||
| LOG_INSTALL ON | ||
| LOG_OUTPUT_ON_FAILURE ON | ||
| ) | ||
|
|
||
| if (DEFINED CLAD_SOURCE_DIR) | ||
| message(STATUS "Using local clad source directory: ${CLAD_SOURCE_DIR}") | ||
| list(APPEND _clad_extra_settings SOURCE_DIR ${CLAD_SOURCE_DIR}) | ||
| else() | ||
| list(APPEND _clad_extra_settings GIT_REPOSITORY https://github.com/vgvassilev/clad.git) | ||
| list(APPEND _clad_extra_settings GIT_TAG v2.2) | ||
| endif() | ||
|
|
||
| message(STATUS "CMAKE_COMMAND: ${CMAKE_COMMAND}") | ||
| message(STATUS "EXTRA_BUILD_ARGS: ${EXTRA_BUILD_ARGS}") | ||
|
|
||
| ExternalProject_Add( | ||
| clad | ||
| UPDATE_COMMAND "" | ||
| CMAKE_ARGS -G ${CMAKE_GENERATOR} | ||
| -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} | ||
| -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} | ||
| -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} | ||
| -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} | ||
| -DCMAKE_CXX_FLAGS=${CLAD_CXX_FLAGS} | ||
| -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} | ||
| -DCMAKE_INSTALL_PREFIX=${clad_install_dir} | ||
| -DLLVM_DIR=${LLVM_DIR} | ||
| -DClang_DIR=${CLANG_CMAKE_DIR} | ||
| ${_clad_extra_cmake_args} | ||
| BUILD_COMMAND ${CMAKE_COMMAND} --build . ${EXTRA_BUILD_ARGS} --parallel | ||
| INSTALL_COMMAND ${CMAKE_COMMAND} --build . ${EXTRA_BUILD_ARGS} --target install | ||
| BUILD_BYPRODUCTS ${CLAD_BYPRODUCTS} | ||
| ${_clad_extra_settings} | ||
| ) | ||
|
|
||
| # Register cladPlugin, cladDifferentiator | ||
| foreach (lib cladPlugin cladDifferentiator) | ||
| add_library(${lib} IMPORTED STATIC GLOBAL) | ||
| add_dependencies(${lib} clad) | ||
| endforeach() | ||
|
|
||
| set_property(TARGET cladPlugin PROPERTY IMPORTED_LOCATION ${_CLAD_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}cladPlugin${CMAKE_STATIC_LIBRARY_SUFFIX}) | ||
| set_property(TARGET cladDifferentiator PROPERTY IMPORTED_LOCATION ${_CLAD_LIBRARY_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}cladDifferentiator${CMAKE_STATIC_LIBRARY_SUFFIX}) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,32 @@ | ||||||
| #include "Utils.h" | ||||||
|
|
||||||
| #include "CppInterOp/CppInterOp.h" | ||||||
| #include "gtest/gtest.h" | ||||||
|
|
||||||
| using namespace TestUtils; | ||||||
| using namespace llvm; | ||||||
| using namespace clang; | ||||||
|
|
||||||
| // This should work | ||||||
| // TYPED_TEST(CppInterOpTest, CladTestSanity) { | ||||||
| // std::string code = R"( | ||||||
| // #include "CppInterOp/CppInterOp.h" | ||||||
| // )"; | ||||||
|
|
||||||
| // auto I = Cpp::CreateInterpreter(); | ||||||
| // Cpp::Declare(code.c_str()); | ||||||
| // } | ||||||
|
|
||||||
| TYPED_TEST(CPPINTEROP_TEST_MODE, CladTest_Sanity) { | ||||||
| std::vector<Decl*> Decls; | ||||||
|
Contributor
There was a problem hiding this comment. warning: no header providing "std::vector" is directly included [misc-include-cleaner] unittests/CppInterOp/CladTest.cpp:1: + #include <vector> |
||||||
| std::string code = R"( | ||||||
|
Contributor
There was a problem hiding this comment. warning: no header providing "std::string" is directly included [misc-include-cleaner] unittests/CppInterOp/CladTest.cpp:1: + #include <string> |
||||||
| #include "clad/Differentiator/Differentiator.h" | ||||||
| static double pow2(double x) { return x * x; } | ||||||
| )"; | ||||||
|
|
||||||
| auto I = Cpp::CreateInterpreter({"-std=c++17"}, {}); | ||||||
|
Contributor
There was a problem hiding this comment. warning: 'auto I' can be declared as 'auto *I' [llvm-qualified-auto]
Suggested change
Contributor
There was a problem hiding this comment. warning: unused variable 'I' [clang-diagnostic-unused-variable] auto I = Cpp::CreateInterpreter({"-std=c++17"}, {});
^ |
||||||
| Cpp::Declare(code.c_str() DFLT_FALSE); | ||||||
|
|
||||||
| std::string code_diff = "clad::differentiate(pow2, 0).execute(3)"; | ||||||
| ASSERT_EQ(Cpp::Evaluate(code_diff.c_str() DFLT_NULLPTR), 6); | ||||||
| } | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No real work has been done so far to enable building Clad using Emscripten, so you probably want the configure to error out if CPPINTEROP_ENABLE_CLAD is set to on, and EMSCRIPTEN is true.