-
Notifications
You must be signed in to change notification settings - Fork 100
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #196 from LLNL/release/0.2.4
Release version 0.2.4
- Loading branch information
Showing
58 changed files
with
1,988 additions
and
1,561 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains 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 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 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 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,85 @@ | ||
| macro(raja_add_executable) | ||
|
|
||
| set(options ) | ||
| set(singleValueArgs NAME) | ||
| set(multiValueArgs SOURCES DEPENDS_ON) | ||
|
|
||
| cmake_parse_arguments(arg | ||
| "${options}" "${singleValueArgs}" "${multiValueArgs}" ${ARGN}) | ||
|
|
||
| if (RAJA_ENABLE_CUDA) | ||
| if (RAJA_ENABLE_CLANG_CUDA) | ||
| add_executable(${arg_NAME} ${arg_SOURCES}) | ||
| target_compile_options(${arg_NAME} PRIVATE | ||
| -x cuda --cuda-gpu-arch=${RAJA_CUDA_ARCH} --cuda-path=${CUDA_TOOLKIT_ROOT_DIR}) | ||
| target_include_directories(${arg_NAME} | ||
| PUBLIC ${EXPT_CUDA_INCLUDE_LOCATION}) | ||
| target_link_libraries(${arg_NAME} ${CUDA_LIBRARIES} RAJA ${arg_DEPENDS_ON}) | ||
| else () | ||
| set_source_files_properties( | ||
| ${arg_SOURCES} | ||
| PROPERTIES | ||
| CUDA_SOURCE_PROPERTY_FORMAT OBJ) | ||
| cuda_add_executable(${arg_NAME} ${arg_SOURCES}) | ||
| target_link_libraries(${arg_NAME} RAJA ${arg_DEPENDS_ON}) | ||
| endif() | ||
| else () | ||
| add_executable(${arg_NAME} ${arg_SOURCES}) | ||
| target_link_libraries(${arg_NAME} RAJA ${arg_DEPENDS_ON}) | ||
| endif() | ||
| endmacro(raja_add_executable) | ||
|
|
||
| macro(raja_add_library) | ||
| set(options ) | ||
| set(singleValueArgs NAME) | ||
| set(multiValueArgs SOURCES DEPENDS_ON) | ||
|
|
||
| cmake_parse_arguments(arg | ||
| "${options}" "${singleValueArgs}" "${multiValueArgs}" ${ARGN}) | ||
|
|
||
| if (RAJA_ENABLE_CUDA) | ||
| if (RAJA_ENABLE_CLANG_CUDA) | ||
|
|
||
| add_library(${arg_NAME} ${arg_SOURCES}) | ||
| target_compile_options(${arg_NAME} PRIVATE | ||
| -x cuda --cuda-gpu-arch=${RAJA_CUDA_ARCH} --cuda-path=${CUDA_TOOLKIT_ROOT_DIR}) | ||
| target_include_directories(${arg_NAME} | ||
| PUBLIC ${EXPT_CUDA_INCLUDE_LOCATION}) | ||
| target_link_libraries(${arg_NAME} ${CUDA_LIBRARIES}) | ||
|
|
||
| else () | ||
| set_source_files_properties( | ||
| ${arg_SOURCES} | ||
| PROPERTIES | ||
| CUDA_SOURCE_PROPERTY_FORMAT OBJ) | ||
|
|
||
| cuda_add_library(${arg_NAME} ${arg_SOURCES}) | ||
| endif () | ||
| else () | ||
| add_library(${arg_NAME} ${arg_SOURCES}) | ||
| endif () | ||
|
|
||
| if (NOT (CMAKE_CXX_COMPILER_ID MATCHES Intel OR RAJA_ENABLE_CLANG_CUDA) ) | ||
| set_target_properties(${arg_NAME} | ||
| PROPERTIES | ||
| CXX_STANDARD 11 | ||
| CXX_STANDARD_REQUIRED YES) | ||
| endif() | ||
| endmacro(raja_add_library) | ||
|
|
||
| macro(raja_add_test) | ||
| set(options ) | ||
| set(singleValueArgs NAME) | ||
| set(multiValueArgs SOURCES DEPENDS_ON) | ||
|
|
||
| cmake_parse_arguments(arg | ||
| "${options}" "${singleValueArgs}" "${multiValueArgs}" ${ARGN}) | ||
|
|
||
| raja_add_executable( | ||
| NAME ${arg_NAME}.exe | ||
| SOURCES ${arg_SOURCES} | ||
| DEPENDS_ON ${arg_DEPENDS_ON}) | ||
|
|
||
| add_test(NAME ${arg_NAME} | ||
| COMMAND ${TEST_DRIVER} $<TARGET_FILE:${arg_NAME}>) | ||
| endmacro(raja_add_test) |
This file contains 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 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 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 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,10 @@ | ||
| find_program(SPHINX_EXECUTABLE | ||
| NAMES sphinx-build sphinx-build2 | ||
| DOC "Path to sphinx-build executable") | ||
|
|
||
| # Handle REQUIRED and QUIET arguments | ||
| # this will also set SPHINX_FOUND to true if SPHINX_EXECUTABLE exists | ||
| include(FindPackageHandleStandardArgs) | ||
| find_package_handle_standard_args(Sphinx | ||
| "Failed to locate sphinx-build executable" | ||
| SPHINX_EXECUTABLE) |
This file contains 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 @@ | ||
| add_subdirectory(sphinx) |
This file contains 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,16 @@ | ||
| set(SPHINX_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/_build") | ||
| set(SPHINX_HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/html") | ||
|
|
||
| configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py" | ||
| "${SPHINX_BUILD_DIR}/conf.py" | ||
| @ONLY) | ||
|
|
||
| add_custom_target(docs | ||
| ${SPHINX_EXECUTABLE} | ||
| -q -b html | ||
| "${CMAKE_CURRENT_SOURCE_DIR}" | ||
| "${SPHINX_HTML_DIR}" | ||
| COMMENT "Building HTML documentation with Sphinx") | ||
|
|
||
| install(DIRECTORY "${SPHINX_HTML_DIR}" | ||
| DESTINATION "docs/sphinx/" OPTIONAL) |
Oops, something went wrong.