Skip to content

Commit

Permalink
Parallelize constraint group solving
Browse files Browse the repository at this point in the history
  • Loading branch information
jslee02 committed Jun 30, 2024
1 parent b956bde commit 8679669
Show file tree
Hide file tree
Showing 14 changed files with 716 additions and 341 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jobs:
opengl
osg
pagmo2
taskflow
tinyxml2
tracy
urdfdom
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish_dartpy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ jobs:
opengl
osg
pagmo2
taskflow
tinyxml2
urdfdom
triplet: x64-windows
Expand Down
3 changes: 3 additions & 0 deletions cmake/DARTFindDependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ else()
)
endif()

# Taskflow
dart_find_package(Taskflow)

#=======================
# Optional dependencies
#=======================
Expand Down
9 changes: 9 additions & 0 deletions cmake/DARTFindTaskflow.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copyright (c) 2011-2024, The DART development contributors
# All rights reserved.
#
# The list of contributors can be found at:
# https://github.com/dartsim/dart/blob/main/LICENSE
#
# This file is provided under the "BSD-style" License

find_package(Taskflow)
14 changes: 14 additions & 0 deletions dart/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,20 @@ if(spdlog_FOUND)
add_component_dependency_packages(${PROJECT_NAME} dart spdlog)
endif()

# Taskflow settings
if(Taskflow_FOUND)
if(TARGET spdlog::spdlog_header_only)
add_component_dependency_packages(${PROJECT_NAME} dart Taskflow)
target_link_libraries(dart PUBLIC Taskflow::Taskflow)
target_compile_definitions(dart PUBLIC -DDART_HAVE_Taskflow=1)
else()
message(WARNING "Taskflow found, but no target is found. Expected Taskflow::Taskflow")
target_compile_definitions(dart PUBLIC -DDART_HAVE_Taskflow=0)
endif()
else()
target_compile_definitions(dart PUBLIC -DDART_HAVE_Taskflow=0)
endif()

if(MSVC)
set_target_properties(
dart PROPERTIES
Expand Down
Loading

0 comments on commit 8679669

Please sign in to comment.