Update raft headers

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>

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>

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>
 

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 {
 

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>

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>
 

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>

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
 

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>

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>

cpp/src/math_optimization/solution_writer.cu

@@ -1,11 +1,11 @@
 /* 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 */
 
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <utilities/logger.hpp>
 #include "solution_writer.hpp"
 

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>

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/sparse/detail/cusparse_macros.h>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/linalg/binary_op.cuh>
 #include <utilities/seed_generator.cuh>
 

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/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 "cusparse.h"
 

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"
 

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 {
 

cpp/src/mip_heuristics/relaxed_lp/relaxed_lp.cu

@@ -15,8 +15,8 @@
 
 #include <pdlp/pdlp.cuh>
 
-#include <raft/sparse/detail/cusparse_macros.h>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 #include <raft/linalg/binary_op.cuh>
 
 #include <thrust/tabulate.h>

cpp/src/mip_heuristics/solve.cu

@@ -32,10 +32,10 @@
 
 #include <mps_parser/mps_data_model.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 <cuda_profiler_api.h>
 

cpp/src/mip_heuristics/solver.cu

@@ -18,8 +18,8 @@
 #include <dual_simplex/simplex_solver_settings.hpp>
 #include <dual_simplex/solve.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 
 #include <cmath>
 #include <future>

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>
 

cpp/src/pdlp/cusparse_view.cu

@@ -13,8 +13,8 @@
 #include <pdlp/pdlp_climber_strategy.hpp>
 #include <pdlp/utils.cuh>
 
-#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 <cuda_runtime.h>

cpp/src/pdlp/cusparse_view.hpp

@@ -15,8 +15,8 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_uvector.hpp>
 
-#include <raft/sparse/detail/cusparse_macros.h>
 #include <raft/sparse/detail/cusparse_wrappers.h>
+#include <raft/core/cusparse_macros.hpp>
 
 #include <cusparse_v2.h>
 

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>

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>
 

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>
 

cpp/src/pdlp/pdhg.cu

@@ -21,9 +21,9 @@
 #include <utilities/copy_helpers.hpp>
 #endif
 
-#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/nvtx.hpp>
 #include <raft/linalg/binary_op.cuh>
 #include <raft/linalg/eltwise.cuh>
 #include <raft/linalg/ternary_op.cuh>

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/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/cusparse_macros.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/linalg/eltwise.cuh>
 #include <raft/linalg/ternary_op.cuh>
 

cpp/src/pdlp/restart_strategy/pdlp_restart_strategy.cu

@@ -20,8 +20,8 @@
 #endif
 
 #include <raft/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/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>

cpp/src/pdlp/solve.cu

@@ -39,11 +39,11 @@
 #include <dual_simplex/tic_toc.hpp>
 #include <pdlp/utilities/problem_checking.cuh>
 
-#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/device_setter.hpp>
 #include <raft/core/handle.hpp>
+#include <raft/core/nvtx.hpp>
 
 #include <thread>  // For std::thread
 

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>

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/sparse/detail/cusparse_wrappers.h>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/cusparse_macros.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/core/operators.hpp>
 #include <raft/linalg/binary_op.cuh>
 #include <raft/linalg/detail/cublas_wrappers.hpp>

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>

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>

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>