Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
1a0e06c
update snapshot and build number
Mar 26, 2026
5cd3a1b
update patch
Mar 26, 2026
242596e
update patch
Mar 26, 2026
fc0ba66
full rebuild
Mar 26, 2026
e22526e
pinning rattler-build 0.57
wep21 Mar 27, 2026
14e209d
update vinca
Mar 27, 2026
f9a074b
map vcstool to vcs2l
Mar 27, 2026
a6c04d3
update patch
Mar 27, 2026
be8d5bc
update patch
Mar 27, 2026
2dfd39f
tl-expected migration
Mar 27, 2026
f54e373
add patch
Mar 28, 2026
d545f17
update patch
Mar 28, 2026
8b55a72
save cache
Mar 28, 2026
265b2e1
patch update
Mar 28, 2026
a74ec3b
update
Mar 28, 2026
7de4cba
update
Mar 28, 2026
3b59792
update
Mar 28, 2026
5f32680
update patch
Mar 28, 2026
8f617e6
update
Mar 29, 2026
1cde7cd
delete patch
Mar 29, 2026
488ae74
add workaround
Mar 29, 2026
e4b0f4d
update patch
Mar 29, 2026
11ff1b2
fix deps
Mar 30, 2026
4b4df2e
patch deps
Mar 30, 2026
f9c3f07
revert patch
Mar 30, 2026
17533b4
use cache
wep21 Mar 30, 2026
03b672b
temp remove
wep21 Mar 30, 2026
d317404
temp remove
wep21 Mar 30, 2026
535fb22
temp remove
Mar 30, 2026
636c378
add patch
Mar 30, 2026
3c321b7
add patch
Mar 31, 2026
f02e9c8
urdfdom_headers constraint
Mar 31, 2026
92ede3c
update
Mar 31, 2026
c50b53f
pin urdfdom_headers
Mar 31, 2026
7c6ea15
update
Mar 31, 2026
c2d5783
update
Mar 31, 2026
5baef63
update
Mar 31, 2026
71fed44
fix
Mar 31, 2026
ed74148
fix
Mar 31, 2026
66661b2
add patch
Mar 31, 2026
ade9412
update AGENTS.md
Mar 31, 2026
41c6f4e
comment out
Mar 31, 2026
d2346c0
add patch
Mar 31, 2026
cd017f8
add patch
Mar 31, 2026
6e311ba
update AGENTS.md
Mar 31, 2026
290ef07
patch update
Mar 31, 2026
3c83bf4
ignore cache
Mar 31, 2026
e99283e
temp ignore
Mar 31, 2026
b3a44fa
feat: add rosgraph monitor
TomCC7 Mar 25, 2026
e8d3aa6
Update macOS standard library version to 11.0
Tobias-Fischer Mar 25, 2026
8fb4c6b
fix: make rosgraph monitor build patches portable
TomCC7 Mar 27, 2026
0da54f9
fix: strip apple no-undefined linker flag
TomCC7 Mar 27, 2026
310b1d5
fix: override graph monitor linker flags on macOS
TomCC7 Mar 27, 2026
1b95d9a
fix: drop macos-only graph monitor linker deps
TomCC7 Mar 27, 2026
cc5093d
fix: limit rosgraph monitor to linux builds
TomCC7 Mar 28, 2026
cd51a3d
feat: Add additional recipe for cm_executors
rshanor Mar 31, 2026
bd69963
Revert "temp ignore"
Mar 31, 2026
2e042cd
temp ignore
Mar 31, 2026
701cdf3
restore
wep21 Apr 1, 2026
5b8cf02
use cache
wep21 Apr 1, 2026
041d416
bump protobuf
wep21 Apr 2, 2026
17900e6
temp ignore
wep21 Apr 2, 2026
46562da
full rebuild
wep21 Apr 2, 2026
e4300f0
update opencv
wep21 Apr 2, 2026
d423d6b
more package
Apr 2, 2026
1a9fff8
use cache
Apr 2, 2026
9b203ee
restore
Apr 2, 2026
b2756e7
update vtk
wep21 Apr 2, 2026
db00616
full rebuild
wep21 Apr 2, 2026
8cb6006
check desktop first
wep21 Apr 2, 2026
9c4e623
vtk
wep21 Apr 3, 2026
6d73172
temp ignore
wep21 Apr 3, 2026
bb72929
restore
wep21 Apr 3, 2026
0a5638c
use cache
wep21 Apr 3, 2026
9b34d23
temp ignore
wep21 Apr 3, 2026
0a265a5
restore
Apr 4, 2026
db1782f
restore
Apr 4, 2026
364915d
temp ignore
Apr 4, 2026
57f9f64
temp remove
Apr 4, 2026
8b2dde5
update patch
Apr 4, 2026
3f64d84
restore
Apr 4, 2026
46e91ad
update
Apr 4, 2026
f4a336a
temp ignore
Apr 4, 2026
fb3177b
update autoware cmake
Apr 4, 2026
e3f30bd
fix
Apr 4, 2026
c19c57f
update
Apr 4, 2026
bf83e14
restore
Apr 4, 2026
d8303af
temp ignore
Apr 4, 2026
f6bca1f
remove patch
Apr 4, 2026
31ac6f9
restore
Apr 4, 2026
1630945
Merge branch 'main' into fullrebuild-202603
wep21 Apr 4, 2026
dffbffe
restore
Apr 5, 2026
95ed5ff
add package
Apr 5, 2026
c46d40b
add patch
Apr 5, 2026
e46f74b
temp
Apr 5, 2026
95de9a2
update
Apr 5, 2026
90c0a75
update
Apr 5, 2026
1d6dc07
update patch deps
Apr 5, 2026
bf5d974
Add eigen-abi-devel dependency to package that need it and pin eigen-…
traversaro Apr 5, 2026
00fcecb
fullrebuild
Apr 5, 2026
4e345cb
restore
wep21 Apr 5, 2026
7eef7c9
use cache
wep21 Apr 5, 2026
bc7c360
temp ignore
wep21 Apr 6, 2026
7fb720c
restore all
wep21 Apr 6, 2026
e067a3a
add patch
wep21 Apr 6, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/testpr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
- name: Delete specific outdated cache entries
shell: bash -l {0}
run: |
# rm -rf ${{ matrix.folder_cache }}/ros-kilted-autoware-trajectory* 2>/dev/null || true
# rm -rf ${{ matrix.folder_cache }}/ros-kilted-rosx* 2>/dev/null || true
mkdir -p ${{ matrix.folder_cache }}
pixi run rattler-index fs ${{ matrix.folder_cache }}/.. --force

Expand Down
4 changes: 2 additions & 2 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Working notes for future coding agents in a RoboStack repo. Replace $DISTRO with

```bash
# single package (preferred for debugging)
pixi run build-one --package ros-$DISTRO-<pkg>
pixi run build-one ros-$DISTRO-<pkg>

# broad pass when needed
pixi run build_continue_on_failure
Expand Down Expand Up @@ -91,7 +91,7 @@ bash -x conda_build.sh 2>&1 | less
### 7. Rebuild package

```bash
pixi run build-one --package ros-$DISTRO-<pkg>
pixi run build-one ros-$DISTRO-<pkg>
```

## Create a patch from build-directory edits
Expand Down
17 changes: 14 additions & 3 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ numpy:
assimp:
- 5
libprotobuf:
- 6.31.1
- 6.33.5
protobuf:
- 6.31.1
- 6.33.5
spdlog:
- 1.17
pugixml:
- '1.15'
libopencv:
- 4.12.0
- 4.13.0
libxml2:
- 2.14.*
graphviz:
Expand All @@ -33,6 +33,12 @@ tbb_devel:
cmake:
- 3.*

# as of early April 2026 key robotics packages like pinocchio still required eigen 3.4.0.*,
# see https://github.com/conda-forge/eigenpy-feedstock/pull/184
eigen_abi_devel:
- 3.4.0


cdt_name: # [linux]
- conda # [linux]

Expand Down Expand Up @@ -71,3 +77,8 @@ libzenohcxx:

libhwloc:
- 2.12.2

urdfdom:
- 4.0.1
urdfdom-headers:
Comment thread
wep21 marked this conversation as resolved.
- 1.1.2
23 changes: 18 additions & 5 deletions patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ foxglove_bridge:
ros_ign_interfaces:
add_host: ["ros-kilted-rcl-interfaces"]
cartographer_ros:
add_host: ["cartographer 2.*", "libboost-devel"]
add_host: ["cartographer 2.*", "libboost-devel", "ceres-solver * cpu*"]
libyaml_vendor:
add_host: ["yaml-cpp", "yaml"]
add_run: ["yaml-cpp", "yaml"]
Expand Down Expand Up @@ -39,7 +39,7 @@ rviz_ogre_vendor:
add_build: ["vcstool"]
add_run: ["assimp"]
pcl_conversions:
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "libboost-devel"]
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "libboost-devel", "eigen-abi-devel"]
pcl_ros:
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "libboost-devel"]
rviz_rendering:
Expand Down Expand Up @@ -96,7 +96,7 @@ nav2_smac_planner:
nav2_util:
add_host: ["libboost-devel"]
nav2_constrained_smoother:
add_host: ["${{ 'openblas' if win }}"]
add_host: ["${{ 'openblas' if win }}", "ceres-solver * cpu*"]
nav2_mppi_controller:
add_build: ["${{ 'clang <19' if osx }}"]
ompl:
Expand Down Expand Up @@ -133,6 +133,8 @@ rviz2:
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
plotjuggler_ros:
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
moveit_core:
add_host: ["eigen-abi-devel"]
moveit_setup_framework:
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
moveit_setup_core_plugins:
Expand Down Expand Up @@ -161,7 +163,7 @@ rqt_image_overlay:
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
slam_toolbox:
add_build: ["${{ 'qt-main' if (build_platform != target_platform) }}"]
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "blas-devel"]
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "blas-devel", "ceres-solver * cpu*"]
vision_msgs_rviz_plugins:
add_build: ["${{ 'qt-main' if (build_platform != target_platform) }}"]
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
Expand Down Expand Up @@ -220,11 +222,14 @@ gz_transport_vendor:
gz_utils_vendor:
add_host: ["gz-utils3"]
add_run: ["gz-utils3"]
sdformat_urdf:
add_host: ["sdformat15"]
add_run: ["sdformat15"]
sdformat_vendor:
add_host: ["sdformat15"]
add_run: ["sdformat15"]
gz_dartsim_vendor:
add_host: ["dartsim-cpp"]
add_host: ["dartsim-cpp", "eigen-abi-devel"]
add_run: ["dartsim-cpp"]
gz_ogre_next_vendor:
add_host: ["ogre-next"]
Expand All @@ -247,6 +252,8 @@ autoware_utils_pcl:
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
autoware_utils_debug:
add_host: ["fmt"]
autoware_trajectory:
add_host: ["fmt"]
rclpy:
add_host: ["typing_extensions"]
add_run: ["typing_extensions"]
Expand Down Expand Up @@ -275,3 +282,9 @@ py_trees_ros:
add_host: ["poetry-core"]
py_trees_ros_viewer:
add_host: ["poetry-core"]
tf2_eigen_kdl:
add_host: ["eigen-abi-devel"]
pinocchio:
add_host: ["eigen-abi-devel"]
eigenpy:
add_host: ["eigen-abi-devel"]
12 changes: 12 additions & 0 deletions patch/ros-kilted-apriltag-ros.patch
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,15 @@ index c906851..b48600f 100644
endif()

option(ASAN "use AddressSanitizer to detect memory issues" OFF)
diff --git a/src/conversion.cpp b/src/conversion.cpp
--- a/src/conversion.cpp
+++ b/src/conversion.cpp
@@ -56,7 +56,7 @@ tf2::toMsg(const std::pair<cv::Mat_<double>, cv::Mat_<double>>& pose)

// convert compact rotation vector to angle-axis to quaternion
const Eigen::Map<const Eigen::Vector3d> rvec(reinterpret_cast<double*>(pose.second.data));
- const Eigen::Quaterniond q({rvec.norm(), rvec.normalized()});
+ const Eigen::Quaterniond q(Eigen::AngleAxisd(rvec.norm(), rvec.normalized()));

geometry_msgs::msg::Transform t;
tf2::convert(pose.first, t.translation);
32 changes: 0 additions & 32 deletions patch/ros-kilted-autoware-adapi-adaptors.patch

This file was deleted.

58 changes: 0 additions & 58 deletions patch/ros-kilted-autoware-default-adapi.patch

This file was deleted.

19 changes: 19 additions & 0 deletions patch/ros-kilted-autoware-kalman-filter.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bf9d1d..3333333 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,12 @@
cmake_minimum_required(VERSION 3.14)
project(autoware_kalman_filter)

+find_package(eigen3_cmake_module REQUIRED)
+find_package(Eigen3 REQUIRED)
+get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
find_package(autoware_cmake REQUIRED)
autoware_package()

-find_package(eigen3_cmake_module REQUIRED)
-find_package(Eigen3 REQUIRED)

include_directories(
SYSTEM
44 changes: 0 additions & 44 deletions patch/ros-kilted-autoware-map-height-fitter.patch

This file was deleted.

19 changes: 0 additions & 19 deletions patch/ros-kilted-autoware-ndt-scan-matcher.patch
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,3 @@ index 57c25aa..01eb4e7 100644

#include <limits>
#include <map>
diff --git a/src/ndt_scan_matcher_core.cpp b/src/ndt_scan_matcher_core.cpp
index 24d3c6b..bedde26 100644
--- a/src/ndt_scan_matcher_core.cpp
+++ b/src/ndt_scan_matcher_core.cpp
@@ -195,12 +195,12 @@ NDTScanMatcher::NDTScanMatcher(const rclcpp::NodeOptions & options)
"ndt_align_srv",
std::bind(
&NDTScanMatcher::service_ndt_align, this, std::placeholders::_1, std::placeholders::_2),
- rclcpp::ServicesQoS().get_rmw_qos_profile(), sensor_callback_group);
+ rclcpp::ServicesQoS(), sensor_callback_group);
service_trigger_node_ = this->create_service<std_srvs::srv::SetBool>(
"trigger_node_srv",
std::bind(
&NDTScanMatcher::service_trigger_node, this, std::placeholders::_1, std::placeholders::_2),
- rclcpp::ServicesQoS().get_rmw_qos_profile(), sensor_callback_group);
+ rclcpp::ServicesQoS(), sensor_callback_group);

ndt_ptr_->setParams(param_.ndt);

43 changes: 43 additions & 0 deletions patch/ros-kilted-autoware-osqp-interface.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72ba975..3333333 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,11 @@
cmake_minimum_required(VERSION 3.14)
project(autoware_osqp_interface)

+find_package(Eigen3 REQUIRED)
+get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
find_package(autoware_cmake REQUIRED)
autoware_package()

-find_package(Eigen3 REQUIRED)
-
# after find_package(osqp_vendor) in ament_auto_find_build_dependencies
find_package(osqp REQUIRED)
get_target_property(OSQP_INCLUDE_SUB_DIR osqp::osqp INTERFACE_INCLUDE_DIRECTORIES)
diff --git a/src/csc_matrix_conv.cpp b/src/csc_matrix_conv.cpp
index 8f77f8c..2222222 100644
--- a/src/csc_matrix_conv.cpp
+++ b/src/csc_matrix_conv.cpp
@@ -22,9 +22,9 @@ namespace autoware::osqp_interface
{
CSC_Matrix calCSCMatrix(const Eigen::MatrixXd & mat)
{
- const size_t elem = static_cast<size_t>(mat.nonZeros());
const Eigen::Index rows = mat.rows();
const Eigen::Index cols = mat.cols();
+ const size_t elem = static_cast<size_t>(rows * cols);

std::vector<c_float> vals;
vals.reserve(elem);
@@ -63,8 +63,8 @@ CSC_Matrix calCSCMatrix(const Eigen::MatrixXd & mat)
CSC_Matrix calCSCMatrixTrapezoidal(const Eigen::MatrixXd & mat)
{
- const size_t elem = static_cast<size_t>(mat.nonZeros());
const Eigen::Index rows = mat.rows();
const Eigen::Index cols = mat.cols();
+ const size_t elem = static_cast<size_t>(rows * (rows + 1) / 2);

if (rows != cols) {
throw std::invalid_argument("Matrix must be square (n, n)");
Loading
Loading