Merge branch 'improve-notebooks' into 'master'

Simplify jupyter notebooks and add way to use Debian packages

See merge request ros-tracing/tracetools_analysis!108
This commit is contained in:
Christophe Bedard 2021-09-28 17:47:05 +00:00
commit 92544235d8
3 changed files with 30 additions and 21 deletions

View file

@ -10,10 +10,7 @@
"#\n",
"# Get trace data using the provided launch file:\n",
"# $ ros2 launch tracetools_analysis pingpong.launch.py\n",
"# (wait a few seconds, then kill with Ctrl+C)\n",
"#\n",
"# (optional) convert trace data:\n",
"# $ ros2 run tracetools_analysis convert ~/.ros/tracing/pingpong/ust\n",
"# (wait at least a few seconds, then kill with Ctrl+C)\n",
"#\n",
"# OR\n",
"#\n",
@ -38,11 +35,16 @@
"outputs": [],
"source": [
"import sys\n",
"# Assuming a workspace with:\n",
"# Add paths to tracetools_analysis and tracetools_read.\n",
"# There are two options:\n",
"# 1. from source, assuming a workspace with:\n",
"# src/tracetools_analysis/\n",
"# src/ros-tracing/ros2_tracing/tracetools_read/\n",
"sys.path.insert(0, '../')\n",
"sys.path.insert(0, '../../../ros-tracing/ros2_tracing/tracetools_read/')\n",
"# 2. from Debian packages, setting the right ROS 2 distro:\n",
"#ROS_DISTRO = 'rolling'\n",
"#sys.path.insert(0, f'/opt/ros/{ROS_DISTRO}/lib/python3.8/site-packages')\n",
"import datetime as dt\n",
"\n",
"from bokeh.plotting import figure\n",
@ -225,7 +227,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.5"
"version": "3.8.10"
}
},
"nbformat": 4,

View file

@ -28,11 +28,16 @@
"outputs": [],
"source": [
"import sys\n",
"# Assuming a workspace with:\n",
"# Add paths to tracetools_analysis and tracetools_read.\n",
"# There are two options:\n",
"# 1. from source, assuming a workspace with:\n",
"# src/tracetools_analysis/\n",
"# src/micro-ROS/ros_tracing/ros2_tracing/tracetools_read/\n",
"# src/ros-tracing/ros2_tracing/tracetools_read/\n",
"sys.path.insert(0, '../')\n",
"sys.path.insert(0, '../../../micro-ROS/ros_tracing/ros2_tracing/tracetools_read/')\n",
"sys.path.insert(0, '../../../ros-tracing/ros2_tracing/tracetools_read/')\n",
"# 2. from Debian packages, setting the right ROS 2 distro:\n",
"#ROS_DISTRO = 'rolling'\n",
"#sys.path.insert(0, f'/opt/ros/{ROS_DISTRO}/lib/python3.8/site-packages')\n",
"import datetime as dt\n",
"\n",
"from bokeh.palettes import Category10\n",
@ -154,7 +159,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.2"
"version": "3.8.10"
}
},
"nbformat": 4,

View file

@ -10,10 +10,7 @@
"#\n",
"# Get trace data using the provided launch file:\n",
"# $ ros2 launch tracetools_analysis memory_usage.launch.py\n",
"# (wait a few seconds, then kill with Ctrl+C)\n",
"#\n",
"# (optional) convert trace data:\n",
"# $ ros2 trace-analysis convert ~/.ros/tracing/memory-usage"
"# (wait at least a few seconds, then kill with Ctrl+C)"
]
},
{
@ -32,11 +29,16 @@
"outputs": [],
"source": [
"import sys\n",
"# Assuming a workspace with:\n",
"# Add paths to tracetools_analysis and tracetools_read.\n",
"# There are two options:\n",
"# 1. from source, assuming a workspace with:\n",
"# src/tracetools_analysis/\n",
"# src/ros-tracing/ros2_tracing/tracetools_read/\n",
"sys.path.insert(0, '../')\n",
"sys.path.insert(0, '../../../ros-tracing/ros2_tracing/tracetools_read/')\n",
"# 2. from Debian packages, setting the right ROS 2 distro:\n",
"#ROS_DISTRO = 'rolling'\n",
"#sys.path.insert(0, f'/opt/ros/{ROS_DISTRO}/lib/python3.8/site-packages')\n",
"import datetime as dt\n",
"\n",
"from bokeh.palettes import viridis\n",
@ -165,7 +167,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.9"
"version": "3.8.10"
}
},
"nbformat": 4,