From 23287ab141f9318e79a73ad0dade57a16f746b12 Mon Sep 17 00:00:00 2001
From: aamijar <aamijar230@gmail.com>
Date: Fri, 13 Feb 2026 17:24:04 +0000
Subject: [PATCH 1/4] ci-test-raft

---
 cpp/cmake/thirdparty/get_raft.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake
index 11bcbe5e69..e8452d42f3 100644
--- a/cpp/cmake/thirdparty/get_raft.cmake
+++ b/cpp/cmake/thirdparty/get_raft.cmake
@@ -1,5 +1,5 @@
 # cmake-format: off
-# SPDX-FileCopyrightText: Copyright (c) 2021-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 # cmake-format: on
 
@@ -39,7 +39,7 @@ endfunction()
 # To use a different RAFT locally, set the CMake variable
 # CPM_raft_SOURCE=/path/to/local/raft
 find_and_configure_raft(VERSION ${CUOPT_MIN_VERSION_raft}
-    FORK rapidsai
-    PINNED_TAG ${rapids-cmake-checkout-tag}
+    FORK aamijar
+    PINNED_TAG raft-deprecated-headers
     CLONE_ON_PIN ON
 )

From 71f66f23de9624c203bc590d585a413a8fef5f64 Mon Sep 17 00:00:00 2001
From: aamijar <aamijar230@gmail.com>
Date: Fri, 13 Feb 2026 23:37:41 +0000
Subject: [PATCH 2/4] fix raft headers

---
 benchmarks/linear_programming/cuopt/benchmark_helper.hpp      | 4 ++--
 benchmarks/linear_programming/cuopt/run_pdlp.cu               | 2 +-
 cpp/src/barrier/barrier.cu                                    | 2 +-
 cpp/src/barrier/cusparse_info.hpp                             | 2 +-
 cpp/src/barrier/cusparse_view.cu                              | 2 +-
 cpp/src/barrier/sparse_cholesky.cuh                           | 2 +-
 cpp/src/branch_and_bound/branch_and_bound.cpp                 | 2 +-
 cpp/src/branch_and_bound/pseudo_costs.cpp                     | 2 +-
 cpp/src/dual_simplex/basis_solves.cpp                         | 2 +-
 cpp/src/dual_simplex/basis_updates.cpp                        | 2 +-
 cpp/src/dual_simplex/crossover.cpp                            | 2 +-
 cpp/src/dual_simplex/initial_basis.cpp                        | 2 +-
 cpp/src/dual_simplex/phase2.cpp                               | 2 +-
 cpp/src/dual_simplex/right_looking_lu.cpp                     | 2 +-
 cpp/src/dual_simplex/solve.cpp                                | 2 +-
 cpp/src/math_optimization/solution_writer.cu                  | 2 +-
 cpp/src/mip_heuristics/feasibility_jump/fj_cpu.cu             | 2 +-
 .../local_search/feasibility_pump/feasibility_pump.cu         | 2 +-
 .../presolve/conditional_bound_strengthening.cu               | 2 +-
 .../mip_heuristics/presolve/load_balanced_bounds_presolve.cu  | 2 +-
 cpp/src/mip_heuristics/presolve/third_party_presolve.cpp      | 2 +-
 cpp/src/mip_heuristics/relaxed_lp/relaxed_lp.cu               | 2 +-
 cpp/src/mip_heuristics/solve.cu                               | 4 ++--
 cpp/src/mip_heuristics/solver.cu                              | 2 +-
 cpp/src/mip_heuristics/solver_solution.cu                     | 2 +-
 cpp/src/pdlp/cusparse_view.cu                                 | 2 +-
 cpp/src/pdlp/cusparse_view.hpp                                | 2 +-
 cpp/src/pdlp/initial_scaling_strategy/initial_scaling.cu      | 2 +-
 .../optimal_batch_size_handler/optimal_batch_size_handler.cu  | 2 +-
 cpp/src/pdlp/optimization_problem.cu                          | 2 +-
 cpp/src/pdlp/pdhg.cu                                          | 4 ++--
 cpp/src/pdlp/pdlp.cu                                          | 4 ++--
 cpp/src/pdlp/restart_strategy/pdlp_restart_strategy.cu        | 2 +-
 cpp/src/pdlp/solve.cu                                         | 4 ++--
 cpp/src/pdlp/solver_solution.cu                               | 2 +-
 .../pdlp/step_size_strategy/adaptive_step_size_strategy.cu    | 4 ++--
 cpp/src/pdlp/termination_strategy/convergence_information.cu  | 2 +-
 .../pdlp/termination_strategy/infeasibility_information.cu    | 2 +-
 cpp/src/pdlp/termination_strategy/termination_strategy.cu     | 2 +-
 cpp/src/pdlp/utilities/cython_solve.cu                        | 2 +-
 cpp/src/routing/crossovers/eax_recombiner.hpp                 | 2 +-
 .../routing/local_search/move_candidates/move_candidates.cuh  | 2 +-
 cpp/src/routing/utilities/cython.cu                           | 2 +-
 cpp/tests/dual_simplex/unit_tests/solve_barrier.cu            | 2 +-
 cpp/tests/linear_programming/pdlp_test.cu                     | 2 +-
 45 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/benchmarks/linear_programming/cuopt/benchmark_helper.hpp b/benchmarks/linear_programming/cuopt/benchmark_helper.hpp
index c9a8a15028..a8221c587e 100644
--- a/benchmarks/linear_programming/cuopt/benchmark_helper.hpp
+++ b/benchmarks/linear_programming/cuopt/benchmark_helper.hpp
@@ -13,9 +13,9 @@
 #include <cuopt/linear_programming/solve.hpp>
 #include <mps_parser/parser.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/core/handle.hpp>
 #include <raft/sparse/linalg/transpose.cuh>
 
diff --git a/benchmarks/linear_programming/cuopt/run_pdlp.cu b/benchmarks/linear_programming/cuopt/run_pdlp.cu
index 229c72a49b..ddeca5096d 100644
--- a/benchmarks/linear_programming/cuopt/run_pdlp.cu
+++ b/benchmarks/linear_programming/cuopt/run_pdlp.cu
@@ -11,7 +11,7 @@
 #include <cuopt/linear_programming/solver_settings.hpp>
 #include <mps_parser/parser.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
 #include <raft/core/handle.hpp>
 
diff --git a/cpp/src/barrier/barrier.cu b/cpp/src/barrier/barrier.cu
index 386e654488..015e97cf14 100644
--- a/cpp/src/barrier/barrier.cu
+++ b/cpp/src/barrier/barrier.cu
@@ -36,7 +36,7 @@
 #include <numeric>
 
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/linalg/dot.cuh>
 
 #include <thrust/iterator/permutation_iterator.h>
diff --git a/cpp/src/barrier/cusparse_info.hpp b/cpp/src/barrier/cusparse_info.hpp
index b5a60aa940..846b8fcbcb 100644
--- a/cpp/src/barrier/cusparse_info.hpp
+++ b/cpp/src/barrier/cusparse_info.hpp
@@ -9,7 +9,7 @@
 
 #include <utilities/macros.cuh>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
 #include <raft/core/handle.hpp>
 
diff --git a/cpp/src/barrier/cusparse_view.cu b/cpp/src/barrier/cusparse_view.cu
index 05488e77e2..db43237155 100644
--- a/cpp/src/barrier/cusparse_view.cu
+++ b/cpp/src/barrier/cusparse_view.cu
@@ -16,7 +16,7 @@
 
 #include <cuopt/error.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
 #include <raft/sparse/linalg/transpose.cuh>
 
diff --git a/cpp/src/barrier/sparse_cholesky.cuh b/cpp/src/barrier/sparse_cholesky.cuh
index 51d936c4b1..f7938fb989 100644
--- a/cpp/src/barrier/sparse_cholesky.cuh
+++ b/cpp/src/barrier/sparse_cholesky.cuh
@@ -16,7 +16,7 @@
 #include <cuda_runtime.h>
 #include <utilities/driver_helpers.cuh>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 
 #include "cudss.h"
 
diff --git a/cpp/src/branch_and_bound/branch_and_bound.cpp b/cpp/src/branch_and_bound/branch_and_bound.cpp
index b48c8f89eb..b9a34eb815 100644
--- a/cpp/src/branch_and_bound/branch_and_bound.cpp
+++ b/cpp/src/branch_and_bound/branch_and_bound.cpp
@@ -22,7 +22,7 @@
 #include <dual_simplex/tic_toc.hpp>
 #include <dual_simplex/user_problem.hpp>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <utilities/hashing.hpp>
 
 #include <omp.h>
diff --git a/cpp/src/branch_and_bound/pseudo_costs.cpp b/cpp/src/branch_and_bound/pseudo_costs.cpp
index 2ddc672750..db72bbb323 100644
--- a/cpp/src/branch_and_bound/pseudo_costs.cpp
+++ b/cpp/src/branch_and_bound/pseudo_costs.cpp
@@ -14,7 +14,7 @@
 
 #include <cuopt/linear_programming/solve.hpp>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 
 #include <omp.h>
 
diff --git a/cpp/src/dual_simplex/basis_solves.cpp b/cpp/src/dual_simplex/basis_solves.cpp
index 17f997f4a9..d246261bb9 100644
--- a/cpp/src/dual_simplex/basis_solves.cpp
+++ b/cpp/src/dual_simplex/basis_solves.cpp
@@ -13,7 +13,7 @@
 #include <dual_simplex/tic_toc.hpp>
 #include <dual_simplex/triangle_solve.hpp>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 
 namespace cuopt::linear_programming::dual_simplex {
 
diff --git a/cpp/src/dual_simplex/basis_updates.cpp b/cpp/src/dual_simplex/basis_updates.cpp
index 71dce2e39c..6ddc903644 100644
--- a/cpp/src/dual_simplex/basis_updates.cpp
+++ b/cpp/src/dual_simplex/basis_updates.cpp
@@ -9,7 +9,7 @@
 #include <dual_simplex/basis_updates.hpp>
 #include <dual_simplex/initial_basis.hpp>
 #include <dual_simplex/triangle_solve.hpp>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 
 #include <cmath>
 #include <limits>
diff --git a/cpp/src/dual_simplex/crossover.cpp b/cpp/src/dual_simplex/crossover.cpp
index 597628e735..04a31a72d9 100644
--- a/cpp/src/dual_simplex/crossover.cpp
+++ b/cpp/src/dual_simplex/crossover.cpp
@@ -15,7 +15,7 @@
 #include <dual_simplex/solve.hpp>
 #include <dual_simplex/tic_toc.hpp>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 
 #include <array>
 
diff --git a/cpp/src/dual_simplex/initial_basis.cpp b/cpp/src/dual_simplex/initial_basis.cpp
index 5da8449040..1127ab77f2 100644
--- a/cpp/src/dual_simplex/initial_basis.cpp
+++ b/cpp/src/dual_simplex/initial_basis.cpp
@@ -11,7 +11,7 @@
 #include <dual_simplex/singletons.hpp>
 #include <dual_simplex/tic_toc.hpp>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 
 #include <cassert>
 #include <cmath>
diff --git a/cpp/src/dual_simplex/phase2.cpp b/cpp/src/dual_simplex/phase2.cpp
index 1e057a16b8..3f4ff0381f 100644
--- a/cpp/src/dual_simplex/phase2.cpp
+++ b/cpp/src/dual_simplex/phase2.cpp
@@ -21,7 +21,7 @@
 #include <utilities/version_info.hpp>
 #include <utilities/work_limit_context.hpp>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 
 // #define PHASE2_NVTX_RANGES
 
diff --git a/cpp/src/dual_simplex/right_looking_lu.cpp b/cpp/src/dual_simplex/right_looking_lu.cpp
index cb9834705c..baa5fd8cae 100644
--- a/cpp/src/dual_simplex/right_looking_lu.cpp
+++ b/cpp/src/dual_simplex/right_looking_lu.cpp
@@ -9,7 +9,7 @@
 #include <dual_simplex/tic_toc.hpp>
 #include <utilities/memory_instrumentation.hpp>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 
 #include <cassert>
 #include <cmath>
diff --git a/cpp/src/dual_simplex/solve.cpp b/cpp/src/dual_simplex/solve.cpp
index 1e825b5e49..c49ce2be69 100644
--- a/cpp/src/dual_simplex/solve.cpp
+++ b/cpp/src/dual_simplex/solve.cpp
@@ -26,7 +26,7 @@
 #include <dual_simplex/types.hpp>
 #include <dual_simplex/user_problem.hpp>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 
 #include <cstdio>
 #include <cstdlib>
diff --git a/cpp/src/math_optimization/solution_writer.cu b/cpp/src/math_optimization/solution_writer.cu
index 01e9c1838e..f516238324 100644
--- a/cpp/src/math_optimization/solution_writer.cu
+++ b/cpp/src/math_optimization/solution_writer.cu
@@ -5,7 +5,7 @@
  */
 /* clang-format on */
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <utilities/logger.hpp>
 #include "solution_writer.hpp"
 
diff --git a/cpp/src/mip_heuristics/feasibility_jump/fj_cpu.cu b/cpp/src/mip_heuristics/feasibility_jump/fj_cpu.cu
index 9d79f34620..4d567c9ecb 100644
--- a/cpp/src/mip_heuristics/feasibility_jump/fj_cpu.cu
+++ b/cpp/src/mip_heuristics/feasibility_jump/fj_cpu.cu
@@ -13,7 +13,7 @@
 
 #include <utilities/seed_generator.cuh>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 
 #include <chrono>
 #include <iomanip>
diff --git a/cpp/src/mip_heuristics/local_search/feasibility_pump/feasibility_pump.cu b/cpp/src/mip_heuristics/local_search/feasibility_pump/feasibility_pump.cu
index 55f2742393..74d225c1e8 100644
--- a/cpp/src/mip_heuristics/local_search/feasibility_pump/feasibility_pump.cu
+++ b/cpp/src/mip_heuristics/local_search/feasibility_pump/feasibility_pump.cu
@@ -20,7 +20,7 @@
 #include <utilities/copy_helpers.hpp>
 #include <utilities/timer.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
 #include <raft/linalg/binary_op.cuh>
 #include <utilities/seed_generator.cuh>
diff --git a/cpp/src/mip_heuristics/presolve/conditional_bound_strengthening.cu b/cpp/src/mip_heuristics/presolve/conditional_bound_strengthening.cu
index 3a3980e950..8bde60a432 100644
--- a/cpp/src/mip_heuristics/presolve/conditional_bound_strengthening.cu
+++ b/cpp/src/mip_heuristics/presolve/conditional_bound_strengthening.cu
@@ -11,7 +11,7 @@
 #include <utilities/cuda_helpers.cuh>
 #include <utilities/vector_helpers.cuh>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
 #include <raft/sparse/linalg/transpose.cuh>
 #include "cusparse.h"
diff --git a/cpp/src/mip_heuristics/presolve/load_balanced_bounds_presolve.cu b/cpp/src/mip_heuristics/presolve/load_balanced_bounds_presolve.cu
index d2d2acce61..0d16c26cae 100644
--- a/cpp/src/mip_heuristics/presolve/load_balanced_bounds_presolve.cu
+++ b/cpp/src/mip_heuristics/presolve/load_balanced_bounds_presolve.cu
@@ -19,7 +19,7 @@
 #include <utilities/device_utils.cuh>
 
 #include <cub/cub.cuh>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include "load_balanced_bounds_presolve.cuh"
 #include "load_balanced_bounds_presolve_helpers.cuh"
 
diff --git a/cpp/src/mip_heuristics/presolve/third_party_presolve.cpp b/cpp/src/mip_heuristics/presolve/third_party_presolve.cpp
index cb4b3ff807..5a89393a6a 100644
--- a/cpp/src/mip_heuristics/presolve/third_party_presolve.cpp
+++ b/cpp/src/mip_heuristics/presolve/third_party_presolve.cpp
@@ -26,7 +26,7 @@
 #include <utilities/macros.cuh>
 #include <utilities/timer.hpp>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 
 namespace cuopt::linear_programming::detail {
 
diff --git a/cpp/src/mip_heuristics/relaxed_lp/relaxed_lp.cu b/cpp/src/mip_heuristics/relaxed_lp/relaxed_lp.cu
index 235745c607..56b3753877 100644
--- a/cpp/src/mip_heuristics/relaxed_lp/relaxed_lp.cu
+++ b/cpp/src/mip_heuristics/relaxed_lp/relaxed_lp.cu
@@ -15,7 +15,7 @@
 
 #include <pdlp/pdlp.cuh>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
 #include <raft/linalg/binary_op.cuh>
 
diff --git a/cpp/src/mip_heuristics/solve.cu b/cpp/src/mip_heuristics/solve.cu
index 1d29cba4d1..18bae838f9 100644
--- a/cpp/src/mip_heuristics/solve.cu
+++ b/cpp/src/mip_heuristics/solve.cu
@@ -32,9 +32,9 @@
 
 #include <mps_parser/mps_data_model.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/core/handle.hpp>
 
 #include <cuda_profiler_api.h>
diff --git a/cpp/src/mip_heuristics/solver.cu b/cpp/src/mip_heuristics/solver.cu
index 6300114c07..c27b6982be 100644
--- a/cpp/src/mip_heuristics/solver.cu
+++ b/cpp/src/mip_heuristics/solver.cu
@@ -18,7 +18,7 @@
 #include <dual_simplex/simplex_solver_settings.hpp>
 #include <dual_simplex/solve.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
 
 #include <cmath>
diff --git a/cpp/src/mip_heuristics/solver_solution.cu b/cpp/src/mip_heuristics/solver_solution.cu
index 7284fea8af..60556884c9 100644
--- a/cpp/src/mip_heuristics/solver_solution.cu
+++ b/cpp/src/mip_heuristics/solver_solution.cu
@@ -11,7 +11,7 @@
 
 #include <limits>
 #include <math_optimization/solution_writer.hpp>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/util/cudart_utils.hpp>
 #include <vector>
 
diff --git a/cpp/src/pdlp/cusparse_view.cu b/cpp/src/pdlp/cusparse_view.cu
index a20774e37a..f8a225b1ea 100644
--- a/cpp/src/pdlp/cusparse_view.cu
+++ b/cpp/src/pdlp/cusparse_view.cu
@@ -13,7 +13,7 @@
 #include <pdlp/pdlp_climber_strategy.hpp>
 #include <pdlp/utils.cuh>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
 #include <raft/sparse/linalg/transpose.cuh>
 
diff --git a/cpp/src/pdlp/cusparse_view.hpp b/cpp/src/pdlp/cusparse_view.hpp
index d013748373..5bfa9c7d70 100644
--- a/cpp/src/pdlp/cusparse_view.hpp
+++ b/cpp/src/pdlp/cusparse_view.hpp
@@ -15,7 +15,7 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_uvector.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
 
 #include <cusparse_v2.h>
diff --git a/cpp/src/pdlp/initial_scaling_strategy/initial_scaling.cu b/cpp/src/pdlp/initial_scaling_strategy/initial_scaling.cu
index 031cd9c3b6..0adbc3809f 100644
--- a/cpp/src/pdlp/initial_scaling_strategy/initial_scaling.cu
+++ b/cpp/src/pdlp/initial_scaling_strategy/initial_scaling.cu
@@ -15,7 +15,7 @@
 #include <pdlp/pdlp_constants.hpp>
 #include <pdlp/utils.cuh>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/linalg/binary_op.cuh>
 #include <raft/linalg/eltwise.cuh>
 #include <raft/util/cuda_utils.cuh>
diff --git a/cpp/src/pdlp/optimal_batch_size_handler/optimal_batch_size_handler.cu b/cpp/src/pdlp/optimal_batch_size_handler/optimal_batch_size_handler.cu
index deb0b41cc9..deb6b759aa 100644
--- a/cpp/src/pdlp/optimal_batch_size_handler/optimal_batch_size_handler.cu
+++ b/cpp/src/pdlp/optimal_batch_size_handler/optimal_batch_size_handler.cu
@@ -11,7 +11,7 @@
 
 #include <utilities/event_handler.cuh>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 
 #include <mip_heuristics/mip_constants.hpp>
 
diff --git a/cpp/src/pdlp/optimization_problem.cu b/cpp/src/pdlp/optimization_problem.cu
index fedab96300..abe969b3f6 100644
--- a/cpp/src/pdlp/optimization_problem.cu
+++ b/cpp/src/pdlp/optimization_problem.cu
@@ -13,7 +13,7 @@
 #include <mip_heuristics/mip_constants.hpp>
 #include <utilities/copy_helpers.hpp>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/util/cuda_utils.cuh>
 #include <raft/util/cudart_utils.hpp>
 
diff --git a/cpp/src/pdlp/pdhg.cu b/cpp/src/pdlp/pdhg.cu
index 9a44bd31e3..153642463a 100644
--- a/cpp/src/pdlp/pdhg.cu
+++ b/cpp/src/pdlp/pdhg.cu
@@ -21,9 +21,9 @@
 #include <utilities/copy_helpers.hpp>
 #endif
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/linalg/binary_op.cuh>
 #include <raft/linalg/eltwise.cuh>
 #include <raft/linalg/ternary_op.cuh>
diff --git a/cpp/src/pdlp/pdlp.cu b/cpp/src/pdlp/pdlp.cu
index 67e001db29..649970a4b7 100644
--- a/cpp/src/pdlp/pdlp.cu
+++ b/cpp/src/pdlp/pdlp.cu
@@ -21,9 +21,9 @@
 #include <utilities/copy_helpers.hpp>
 #include <utilities/macros.cuh>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/linalg/eltwise.cuh>
 #include <raft/linalg/ternary_op.cuh>
 
diff --git a/cpp/src/pdlp/restart_strategy/pdlp_restart_strategy.cu b/cpp/src/pdlp/restart_strategy/pdlp_restart_strategy.cu
index bc12fb360f..0617dcea17 100644
--- a/cpp/src/pdlp/restart_strategy/pdlp_restart_strategy.cu
+++ b/cpp/src/pdlp/restart_strategy/pdlp_restart_strategy.cu
@@ -20,7 +20,7 @@
 #endif
 
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/core/device_span.hpp>
 #include <raft/linalg/binary_op.cuh>
 #include <raft/linalg/detail/cublas_wrappers.hpp>
diff --git a/cpp/src/pdlp/solve.cu b/cpp/src/pdlp/solve.cu
index a2766be98a..67a6260538 100644
--- a/cpp/src/pdlp/solve.cu
+++ b/cpp/src/pdlp/solve.cu
@@ -39,9 +39,9 @@
 #include <dual_simplex/tic_toc.hpp>
 #include <pdlp/utilities/problem_checking.cuh>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/core/device_setter.hpp>
 #include <raft/core/handle.hpp>
 
diff --git a/cpp/src/pdlp/solver_solution.cu b/cpp/src/pdlp/solver_solution.cu
index e0170afc67..a8001b91c1 100644
--- a/cpp/src/pdlp/solver_solution.cu
+++ b/cpp/src/pdlp/solver_solution.cu
@@ -14,7 +14,7 @@
 #include <utilities/logger.hpp>
 #include <utilities/macros.cuh>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/util/cudart_utils.hpp>
 
 #include <limits>
diff --git a/cpp/src/pdlp/step_size_strategy/adaptive_step_size_strategy.cu b/cpp/src/pdlp/step_size_strategy/adaptive_step_size_strategy.cu
index 3c1b85aeac..cc72f2e14d 100644
--- a/cpp/src/pdlp/step_size_strategy/adaptive_step_size_strategy.cu
+++ b/cpp/src/pdlp/step_size_strategy/adaptive_step_size_strategy.cu
@@ -17,9 +17,9 @@
 
 #include <utilities/unique_pinned_ptr.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/core/operators.hpp>
 #include <raft/linalg/binary_op.cuh>
 #include <raft/linalg/detail/cublas_wrappers.hpp>
diff --git a/cpp/src/pdlp/termination_strategy/convergence_information.cu b/cpp/src/pdlp/termination_strategy/convergence_information.cu
index 97e0e9c0e9..464178e40b 100644
--- a/cpp/src/pdlp/termination_strategy/convergence_information.cu
+++ b/cpp/src/pdlp/termination_strategy/convergence_information.cu
@@ -17,7 +17,7 @@
 #include <cuopt/linear_programming/pdlp/solver_settings.hpp>
 
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/linalg/binary_op.cuh>
 #include <raft/linalg/detail/cublas_wrappers.hpp>
 #include <raft/linalg/eltwise.cuh>
diff --git a/cpp/src/pdlp/termination_strategy/infeasibility_information.cu b/cpp/src/pdlp/termination_strategy/infeasibility_information.cu
index feefa0c8e8..14114d306f 100644
--- a/cpp/src/pdlp/termination_strategy/infeasibility_information.cu
+++ b/cpp/src/pdlp/termination_strategy/infeasibility_information.cu
@@ -16,7 +16,7 @@
 #include <mip_heuristics/mip_constants.hpp>
 
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/linalg/detail/cublas_wrappers.hpp>
 #include <raft/linalg/eltwise.cuh>
 #include <raft/linalg/map_then_reduce.cuh>
diff --git a/cpp/src/pdlp/termination_strategy/termination_strategy.cu b/cpp/src/pdlp/termination_strategy/termination_strategy.cu
index b79336f2bd..033cbdbfda 100644
--- a/cpp/src/pdlp/termination_strategy/termination_strategy.cu
+++ b/cpp/src/pdlp/termination_strategy/termination_strategy.cu
@@ -16,7 +16,7 @@
 #include <cuopt/linear_programming/pdlp/pdlp_warm_start_data.hpp>
 #include <cuopt/linear_programming/pdlp/solver_settings.hpp>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/util/cuda_utils.cuh>
 #include <raft/util/cudart_utils.hpp>
 
diff --git a/cpp/src/pdlp/utilities/cython_solve.cu b/cpp/src/pdlp/utilities/cython_solve.cu
index d238e62570..12972bc58f 100644
--- a/cpp/src/pdlp/utilities/cython_solve.cu
+++ b/cpp/src/pdlp/utilities/cython_solve.cu
@@ -16,7 +16,7 @@
 #include <mps_parser/writer.hpp>
 #include <utilities/copy_helpers.hpp>
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/core/handle.hpp>
 
 #include <rmm/device_buffer.hpp>
diff --git a/cpp/src/routing/crossovers/eax_recombiner.hpp b/cpp/src/routing/crossovers/eax_recombiner.hpp
index d0fc7eaa63..32a953df99 100644
--- a/cpp/src/routing/crossovers/eax_recombiner.hpp
+++ b/cpp/src/routing/crossovers/eax_recombiner.hpp
@@ -12,7 +12,7 @@
 #include "../diversity/helpers.hpp"
 #include "ab_cycle.hpp"
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 
 #include <climits>
 #include <cmath>
diff --git a/cpp/src/routing/local_search/move_candidates/move_candidates.cuh b/cpp/src/routing/local_search/move_candidates/move_candidates.cuh
index ba17d4f624..cb162e4df2 100644
--- a/cpp/src/routing/local_search/move_candidates/move_candidates.cuh
+++ b/cpp/src/routing/local_search/move_candidates/move_candidates.cuh
@@ -22,7 +22,7 @@
 #include "scross_move_candidates.cuh"
 #include "vrp_move_candidates.cuh"
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/random/rng_device.cuh>
 
 #include <rmm/device_scalar.hpp>
diff --git a/cpp/src/routing/utilities/cython.cu b/cpp/src/routing/utilities/cython.cu
index 60bc3495f2..3b99f826de 100644
--- a/cpp/src/routing/utilities/cython.cu
+++ b/cpp/src/routing/utilities/cython.cu
@@ -7,7 +7,7 @@
 
 #include <cuopt/routing/cython/cython.hpp>
 #include <cuopt/routing/solve.hpp>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/core/handle.hpp>
 #include <rmm/device_buffer.hpp>
 #include <routing/generator/generator.hpp>
diff --git a/cpp/tests/dual_simplex/unit_tests/solve_barrier.cu b/cpp/tests/dual_simplex/unit_tests/solve_barrier.cu
index 991f1c016a..c30b2663ca 100644
--- a/cpp/tests/dual_simplex/unit_tests/solve_barrier.cu
+++ b/cpp/tests/dual_simplex/unit_tests/solve_barrier.cu
@@ -16,7 +16,7 @@
 #include <dual_simplex/tic_toc.hpp>
 #include <dual_simplex/user_problem.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
 
 #include <mps_parser/parser.hpp>
diff --git a/cpp/tests/linear_programming/pdlp_test.cu b/cpp/tests/linear_programming/pdlp_test.cu
index 9764d542fc..34a58f3412 100644
--- a/cpp/tests/linear_programming/pdlp_test.cu
+++ b/cpp/tests/linear_programming/pdlp_test.cu
@@ -26,7 +26,7 @@
 #include <utilities/copy_helpers.hpp>
 #include <utilities/error.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
 #include <raft/core/handle.hpp>
 #include <raft/util/cudart_utils.hpp>

From b845aab15bf3b717d29f6b7e5514eed2bce7673d Mon Sep 17 00:00:00 2001
From: aamijar <aamijar230@gmail.com>
Date: Fri, 13 Feb 2026 23:47:40 +0000
Subject: [PATCH 3/4] fix style

---
 benchmarks/linear_programming/cuopt/benchmark_helper.hpp      | 4 ++--
 benchmarks/linear_programming/cuopt/run_pdlp.cu               | 2 +-
 cpp/src/barrier/cusparse_info.hpp                             | 4 ++--
 cpp/src/barrier/cusparse_view.cu                              | 2 +-
 cpp/src/math_optimization/solution_writer.cu                  | 2 +-
 .../local_search/feasibility_pump/feasibility_pump.cu         | 2 +-
 .../presolve/conditional_bound_strengthening.cu               | 2 +-
 cpp/src/mip_heuristics/relaxed_lp/relaxed_lp.cu               | 2 +-
 cpp/src/mip_heuristics/solve.cu                               | 4 ++--
 cpp/src/mip_heuristics/solver.cu                              | 2 +-
 cpp/src/pdlp/cusparse_view.cu                                 | 2 +-
 cpp/src/pdlp/cusparse_view.hpp                                | 2 +-
 cpp/src/pdlp/pdhg.cu                                          | 2 +-
 cpp/src/pdlp/pdlp.cu                                          | 2 +-
 cpp/src/pdlp/restart_strategy/pdlp_restart_strategy.cu        | 2 +-
 cpp/src/pdlp/solve.cu                                         | 4 ++--
 .../pdlp/step_size_strategy/adaptive_step_size_strategy.cu    | 2 +-
 cpp/src/pdlp/utilities/cython_solve.cu                        | 2 +-
 cpp/src/routing/crossovers/eax_recombiner.hpp                 | 2 +-
 .../routing/local_search/move_candidates/move_candidates.cuh  | 2 +-
 cpp/src/routing/utilities/cython.cu                           | 2 +-
 cpp/tests/dual_simplex/unit_tests/solve_barrier.cu            | 4 ++--
 cpp/tests/linear_programming/pdlp_test.cu                     | 2 +-
 23 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/benchmarks/linear_programming/cuopt/benchmark_helper.hpp b/benchmarks/linear_programming/cuopt/benchmark_helper.hpp
index a8221c587e..2fb945feef 100644
--- a/benchmarks/linear_programming/cuopt/benchmark_helper.hpp
+++ b/benchmarks/linear_programming/cuopt/benchmark_helper.hpp
@@ -13,10 +13,10 @@
 #include <cuopt/linear_programming/solve.hpp>
 #include <mps_parser/parser.hpp>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/core/nvtx.hpp>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/core/handle.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/sparse/linalg/transpose.cuh>
 
 #include <rmm/device_scalar.hpp>
diff --git a/benchmarks/linear_programming/cuopt/run_pdlp.cu b/benchmarks/linear_programming/cuopt/run_pdlp.cu
index ddeca5096d..d04979080a 100644
--- a/benchmarks/linear_programming/cuopt/run_pdlp.cu
+++ b/benchmarks/linear_programming/cuopt/run_pdlp.cu
@@ -11,8 +11,8 @@
 #include <cuopt/linear_programming/solver_settings.hpp>
 #include <mps_parser/parser.hpp>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/core/handle.hpp>
 
 #include <argparse/argparse.hpp>
diff --git a/cpp/src/barrier/cusparse_info.hpp b/cpp/src/barrier/cusparse_info.hpp
index 846b8fcbcb..105c470cd7 100644
--- a/cpp/src/barrier/cusparse_info.hpp
+++ b/cpp/src/barrier/cusparse_info.hpp
@@ -1,6 +1,6 @@
 /* clang-format off */
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 /* clang-format on */
@@ -9,8 +9,8 @@
 
 #include <utilities/macros.cuh>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/core/handle.hpp>
 
 #include <rmm/device_scalar.hpp>
diff --git a/cpp/src/barrier/cusparse_view.cu b/cpp/src/barrier/cusparse_view.cu
index db43237155..d762fbc009 100644
--- a/cpp/src/barrier/cusparse_view.cu
+++ b/cpp/src/barrier/cusparse_view.cu
@@ -16,8 +16,8 @@
 
 #include <cuopt/error.hpp>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/linalg/transpose.cuh>
 
 #include <dlfcn.h>
diff --git a/cpp/src/math_optimization/solution_writer.cu b/cpp/src/math_optimization/solution_writer.cu
index f516238324..273b8e989c 100644
--- a/cpp/src/math_optimization/solution_writer.cu
+++ b/cpp/src/math_optimization/solution_writer.cu
@@ -1,6 +1,6 @@
 /* clang-format off */
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 /* clang-format on */
diff --git a/cpp/src/mip_heuristics/local_search/feasibility_pump/feasibility_pump.cu b/cpp/src/mip_heuristics/local_search/feasibility_pump/feasibility_pump.cu
index 74d225c1e8..f28faec249 100644
--- a/cpp/src/mip_heuristics/local_search/feasibility_pump/feasibility_pump.cu
+++ b/cpp/src/mip_heuristics/local_search/feasibility_pump/feasibility_pump.cu
@@ -20,8 +20,8 @@
 #include <utilities/copy_helpers.hpp>
 #include <utilities/timer.hpp>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/linalg/binary_op.cuh>
 #include <utilities/seed_generator.cuh>
 
diff --git a/cpp/src/mip_heuristics/presolve/conditional_bound_strengthening.cu b/cpp/src/mip_heuristics/presolve/conditional_bound_strengthening.cu
index 8bde60a432..13412614b8 100644
--- a/cpp/src/mip_heuristics/presolve/conditional_bound_strengthening.cu
+++ b/cpp/src/mip_heuristics/presolve/conditional_bound_strengthening.cu
@@ -11,8 +11,8 @@
 #include <utilities/cuda_helpers.cuh>
 #include <utilities/vector_helpers.cuh>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/linalg/transpose.cuh>
 #include "cusparse.h"
 
diff --git a/cpp/src/mip_heuristics/relaxed_lp/relaxed_lp.cu b/cpp/src/mip_heuristics/relaxed_lp/relaxed_lp.cu
index 56b3753877..e2bbc8feb1 100644
--- a/cpp/src/mip_heuristics/relaxed_lp/relaxed_lp.cu
+++ b/cpp/src/mip_heuristics/relaxed_lp/relaxed_lp.cu
@@ -15,8 +15,8 @@
 
 #include <pdlp/pdlp.cuh>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/linalg/binary_op.cuh>
 
 #include <thrust/tabulate.h>
diff --git a/cpp/src/mip_heuristics/solve.cu b/cpp/src/mip_heuristics/solve.cu
index 18bae838f9..41e2729927 100644
--- a/cpp/src/mip_heuristics/solve.cu
+++ b/cpp/src/mip_heuristics/solve.cu
@@ -32,10 +32,10 @@
 
 #include <mps_parser/mps_data_model.hpp>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/core/nvtx.hpp>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/core/handle.hpp>
+#include <raft/core/nvtx.hpp>
 
 #include <cuda_profiler_api.h>
 
diff --git a/cpp/src/mip_heuristics/solver.cu b/cpp/src/mip_heuristics/solver.cu
index c27b6982be..425afee462 100644
--- a/cpp/src/mip_heuristics/solver.cu
+++ b/cpp/src/mip_heuristics/solver.cu
@@ -18,8 +18,8 @@
 #include <dual_simplex/simplex_solver_settings.hpp>
 #include <dual_simplex/solve.hpp>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 
 #include <cmath>
 #include <future>
diff --git a/cpp/src/pdlp/cusparse_view.cu b/cpp/src/pdlp/cusparse_view.cu
index f8a225b1ea..ca36dde421 100644
--- a/cpp/src/pdlp/cusparse_view.cu
+++ b/cpp/src/pdlp/cusparse_view.cu
@@ -13,8 +13,8 @@
 #include <pdlp/pdlp_climber_strategy.hpp>
 #include <pdlp/utils.cuh>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/linalg/transpose.cuh>
 
 #include <cuda_runtime.h>
diff --git a/cpp/src/pdlp/cusparse_view.hpp b/cpp/src/pdlp/cusparse_view.hpp
index 5bfa9c7d70..cbbc856924 100644
--- a/cpp/src/pdlp/cusparse_view.hpp
+++ b/cpp/src/pdlp/cusparse_view.hpp
@@ -15,8 +15,8 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_uvector.hpp>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 
 #include <cusparse_v2.h>
 
diff --git a/cpp/src/pdlp/pdhg.cu b/cpp/src/pdlp/pdhg.cu
index 153642463a..a92ce8e8ef 100644
--- a/cpp/src/pdlp/pdhg.cu
+++ b/cpp/src/pdlp/pdhg.cu
@@ -21,8 +21,8 @@
 #include <utilities/copy_helpers.hpp>
 #endif
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/core/nvtx.hpp>
 #include <raft/linalg/binary_op.cuh>
 #include <raft/linalg/eltwise.cuh>
diff --git a/cpp/src/pdlp/pdlp.cu b/cpp/src/pdlp/pdlp.cu
index 649970a4b7..012b987eea 100644
--- a/cpp/src/pdlp/pdlp.cu
+++ b/cpp/src/pdlp/pdlp.cu
@@ -21,8 +21,8 @@
 #include <utilities/copy_helpers.hpp>
 #include <utilities/macros.cuh>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/core/nvtx.hpp>
 #include <raft/linalg/eltwise.cuh>
 #include <raft/linalg/ternary_op.cuh>
diff --git a/cpp/src/pdlp/restart_strategy/pdlp_restart_strategy.cu b/cpp/src/pdlp/restart_strategy/pdlp_restart_strategy.cu
index 0617dcea17..bc14fd0e51 100644
--- a/cpp/src/pdlp/restart_strategy/pdlp_restart_strategy.cu
+++ b/cpp/src/pdlp/restart_strategy/pdlp_restart_strategy.cu
@@ -20,8 +20,8 @@
 #endif
 
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/core/nvtx.hpp>
 #include <raft/core/device_span.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/linalg/binary_op.cuh>
 #include <raft/linalg/detail/cublas_wrappers.hpp>
 #include <raft/linalg/eltwise.cuh>
diff --git a/cpp/src/pdlp/solve.cu b/cpp/src/pdlp/solve.cu
index 67a6260538..fa0c79e391 100644
--- a/cpp/src/pdlp/solve.cu
+++ b/cpp/src/pdlp/solve.cu
@@ -39,11 +39,11 @@
 #include <dual_simplex/tic_toc.hpp>
 #include <pdlp/utilities/problem_checking.cuh>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/core/nvtx.hpp>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/core/device_setter.hpp>
 #include <raft/core/handle.hpp>
+#include <raft/core/nvtx.hpp>
 
 #include <thread>  // For std::thread
 
diff --git a/cpp/src/pdlp/step_size_strategy/adaptive_step_size_strategy.cu b/cpp/src/pdlp/step_size_strategy/adaptive_step_size_strategy.cu
index cc72f2e14d..329a1ec465 100644
--- a/cpp/src/pdlp/step_size_strategy/adaptive_step_size_strategy.cu
+++ b/cpp/src/pdlp/step_size_strategy/adaptive_step_size_strategy.cu
@@ -17,8 +17,8 @@
 
 #include <utilities/unique_pinned_ptr.hpp>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/core/nvtx.hpp>
 #include <raft/core/operators.hpp>
 #include <raft/linalg/binary_op.cuh>
diff --git a/cpp/src/pdlp/utilities/cython_solve.cu b/cpp/src/pdlp/utilities/cython_solve.cu
index 12972bc58f..7e98703dac 100644
--- a/cpp/src/pdlp/utilities/cython_solve.cu
+++ b/cpp/src/pdlp/utilities/cython_solve.cu
@@ -16,8 +16,8 @@
 #include <mps_parser/writer.hpp>
 #include <utilities/copy_helpers.hpp>
 
-#include <raft/core/nvtx.hpp>
 #include <raft/core/handle.hpp>
+#include <raft/core/nvtx.hpp>
 
 #include <rmm/device_buffer.hpp>
 
diff --git a/cpp/src/routing/crossovers/eax_recombiner.hpp b/cpp/src/routing/crossovers/eax_recombiner.hpp
index 32a953df99..14da4ef3f6 100644
--- a/cpp/src/routing/crossovers/eax_recombiner.hpp
+++ b/cpp/src/routing/crossovers/eax_recombiner.hpp
@@ -1,6 +1,6 @@
 /* clang-format off */
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2023-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2023-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 /* clang-format on */
diff --git a/cpp/src/routing/local_search/move_candidates/move_candidates.cuh b/cpp/src/routing/local_search/move_candidates/move_candidates.cuh
index cb162e4df2..1fb6ab1bba 100644
--- a/cpp/src/routing/local_search/move_candidates/move_candidates.cuh
+++ b/cpp/src/routing/local_search/move_candidates/move_candidates.cuh
@@ -1,6 +1,6 @@
 /* clang-format off */
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 /* clang-format on */
diff --git a/cpp/src/routing/utilities/cython.cu b/cpp/src/routing/utilities/cython.cu
index 3b99f826de..faba787399 100644
--- a/cpp/src/routing/utilities/cython.cu
+++ b/cpp/src/routing/utilities/cython.cu
@@ -7,8 +7,8 @@
 
 #include <cuopt/routing/cython/cython.hpp>
 #include <cuopt/routing/solve.hpp>
-#include <raft/core/nvtx.hpp>
 #include <raft/core/handle.hpp>
+#include <raft/core/nvtx.hpp>
 #include <rmm/device_buffer.hpp>
 #include <routing/generator/generator.hpp>
 
diff --git a/cpp/tests/dual_simplex/unit_tests/solve_barrier.cu b/cpp/tests/dual_simplex/unit_tests/solve_barrier.cu
index c30b2663ca..abfe37c9fd 100644
--- a/cpp/tests/dual_simplex/unit_tests/solve_barrier.cu
+++ b/cpp/tests/dual_simplex/unit_tests/solve_barrier.cu
@@ -1,6 +1,6 @@
 /* clang-format off */
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 /* clang-format on */
@@ -16,8 +16,8 @@
 #include <dual_simplex/tic_toc.hpp>
 #include <dual_simplex/user_problem.hpp>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 
 #include <mps_parser/parser.hpp>
 
diff --git a/cpp/tests/linear_programming/pdlp_test.cu b/cpp/tests/linear_programming/pdlp_test.cu
index 34a58f3412..8bf759367e 100644
--- a/cpp/tests/linear_programming/pdlp_test.cu
+++ b/cpp/tests/linear_programming/pdlp_test.cu
@@ -26,8 +26,8 @@
 #include <utilities/copy_helpers.hpp>
 #include <utilities/error.hpp>
 
-#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/core/handle.hpp>
 #include <raft/util/cudart_utils.hpp>
 

From cfb8bbb511ca8caf5288a7eaed21831a683616a7 Mon Sep 17 00:00:00 2001
From: aamijar <aamijar230@gmail.com>
Date: Sat, 14 Feb 2026 19:15:14 +0000
Subject: [PATCH 4/4] unpin raft

---
 cpp/cmake/thirdparty/get_raft.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake
index e8452d42f3..11bcbe5e69 100644
--- a/cpp/cmake/thirdparty/get_raft.cmake
+++ b/cpp/cmake/thirdparty/get_raft.cmake
@@ -1,5 +1,5 @@
 # cmake-format: off
-# SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2021-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 # cmake-format: on
 
@@ -39,7 +39,7 @@ endfunction()
 # To use a different RAFT locally, set the CMake variable
 # CPM_raft_SOURCE=/path/to/local/raft
 find_and_configure_raft(VERSION ${CUOPT_MIN_VERSION_raft}
-    FORK aamijar
-    PINNED_TAG raft-deprecated-headers
+    FORK rapidsai
+    PINNED_TAG ${rapids-cmake-checkout-tag}
     CLONE_ON_PIN ON
 )