Merge branch 'main' into air05_fix

Author: chris-maes

benchmarks/linear_programming/cuopt/benchmark_helper.hpp

@@ -13,10 +13,10 @@
 #include <cuopt/linear_programming/solve.hpp>
 #include <mps_parser/parser.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/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>

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/sparse/detail/cusparse_macros.h>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/core/handle.hpp>
 
 #include <argparse/argparse.hpp>

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>
@@ -1390,7 +1390,7 @@ class iteration_data_t {
     // v = alpha * A * w + beta * v = alpha * A * Dinv * A^T * y + beta * v
     matrix_vector_multiply(A, alpha, w, beta, v);
     if (debug) {
-      printf("||A|| = %.16e\n", vector_norm2<i_t, f_t>(A.x.underlying()));
+      printf("||A|| = %.16e\n", vector_norm2<i_t, f_t>(A.x));
       printf("||w|| = %.16e\n", vector_norm2<i_t, f_t>(w));
       printf("||v|| = %.16e\n", vector_norm2<i_t, f_t>(v));
     }

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/sparse/detail/cusparse_macros.h>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/core/handle.hpp>
 
 #include <rmm/device_scalar.hpp>

cpp/src/barrier/cusparse_view.cu

@@ -16,8 +16,8 @@
 
 #include <cuopt/error.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/sparse/linalg/transpose.cuh>
 
 #include <dlfcn.h>
@@ -159,9 +159,9 @@ cusparse_view_t<i_t, f_t>::cusparse_view_t(raft::handle_t const* handle_ptr,
   A_indices_ = device_copy(indices, handle_ptr->get_stream());
   A_data_    = device_copy(data, handle_ptr->get_stream());
 
-  A_T_offsets_ = device_copy(A.col_start.underlying(), handle_ptr->get_stream());
-  A_T_indices_ = device_copy(A.i.underlying(), handle_ptr->get_stream());
-  A_T_data_    = device_copy(A.x.underlying(), handle_ptr->get_stream());
+  A_T_offsets_ = device_copy(A.col_start, handle_ptr->get_stream());
+  A_T_indices_ = device_copy(A.i, handle_ptr->get_stream());
+  A_T_data_    = device_copy(A.x, handle_ptr->get_stream());
 
   cusparseCreateCsr(&A_,
                     rows,

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"
 

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>

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>