Skip to content

Commit 1d9f11a

Browse files
Run graspnet-demo in our devcontainer (#205)
* Install cuda. Signed-off-by: Jelmer de Wolde <[email protected]> * Make script executable. Signed-off-by: Jelmer de Wolde <[email protected]> * Rename. Signed-off-by: Jelmer de Wolde <[email protected]> * Clone graspnet-baseline repo in docker. Signed-off-by: Jelmer de Wolde <[email protected]> * Switch to our graspnet fork. Signed-off-by: Jelmer de Wolde <[email protected]> * Fix dependencies. Signed-off-by: Jelmer de Wolde <[email protected]> * Update dependencies. Signed-off-by: Jelmer de Wolde <[email protected]> * Add demo. Signed-off-by: Jelmer de Wolde <[email protected]> * Create ros node. Signed-off-by: Jelmer de Wolde <[email protected]> * Remove demo. Signed-off-by: Jelmer de Wolde <[email protected]> * Fix ty. Signed-off-by: Jelmer de Wolde <[email protected]> * Update dependencies to fix deprecated sklearn. Signed-off-by: Jelmer de Wolde <[email protected]> * Add ros2-numpy to uv. Signed-off-by: Jelmer de Wolde <[email protected]> * Use base frame instead of world frame. Signed-off-by: Jelmer de Wolde <[email protected]> * Place rviz marker on generated grasp pose. Signed-off-by: Jelmer de Wolde <[email protected]> * Set fr3_hand_tcp asp end-effector link. Signed-off-by: Jelmer de Wolde <[email protected]> * Add scipy-stubs to uv. Signed-off-by: Jelmer de Wolde <[email protected]> * Use graspnet pose as goal_pose. Signed-off-by: Jelmer de Wolde <[email protected]> * remove cuda from container Signed-off-by: Max Waterhout <[email protected]> * WIP Signed-off-by: Max Waterhout <[email protected]> * Remove rcdt_grasping package and update moveit_manager to change frame references Signed-off-by: Max Waterhout <[email protected]> * Refactor dependencies: move graspnet-related packages to a separate group and clean up unused entries Signed-off-by: Max Waterhout <[email protected]> * Refactor code structure for improved readability and maintainability Signed-off-by: Max Waterhout <[email protected]> --------- Signed-off-by: Jelmer de Wolde <[email protected]> Signed-off-by: Max Waterhout <[email protected]> Co-authored-by: Max Waterhout <[email protected]> Signed-off-by: Jelmer de Wolde <[email protected]>
1 parent 9967f71 commit 1d9f11a

File tree

3 files changed

+1428
-214
lines changed

3 files changed

+1428
-214
lines changed

pyproject.toml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ dependencies = [
4343
"transforms3d>=0.4.2",
4444
"waitress>=3.0.2",
4545
"xmltodict>=1.0.2",
46+
"pandas>=2.2.0",
47+
"trimesh>=4.8.2",
4648
]
4749

4850
[dependency-groups]
@@ -52,7 +54,12 @@ dev = [
5254
"ruff>=0.11.12",
5355
"ty>=0.0.1a7",
5456
]
57+
graspnet = [
58+
"graspnetpy",
59+
]
5560

61+
[tool.uv.sources]
62+
graspnetpy = { git = "https://github.com/alliander-opensource/graspnet-baseline" }
5663

5764
[tool.ruff.lint.isort]
5865
split-on-trailing-comma = false
@@ -95,4 +102,4 @@ select = "DOC"
95102
style = "google"
96103
skip-checking-short-docstrings = false
97104
allow-init-docstring = true
98-
check-style-mismatch = true
105+
check-style-mismatch = true

ros2_ws/src/rcdt_utilities/rcdt_utilities/register.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,17 @@ def on_log(
240240

241241
return register.insert_action(action, event_handler, context)
242242

243-
def process_io(self, event: ProcessIO) -> None:
243+
def process_io(self, event: ProcessIO) -> None | LaunchDescription:
244244
"""Returns the next register to start if the defined log is captured.
245245
246246
This method is called when a log message is captured from the action's stderr.
247247
If the log message contains the defined log, it sets the started flag to True and returns the next action to start.
248248
249249
Args:
250250
event (ProcessIO): The event containing the log message.
251+
252+
Returns:
253+
None | LaunchDescription: None if the action is already started, otherwise a launch description containing the next action to start.
251254
"""
252255
if self.is_started:
253256
return

0 commit comments

Comments
 (0)