Skip to content

Commit f524808

Browse files
committed
Remove less effective parameters
Signed-off-by: yuwenchen95 <yuwchen@nvidia.com>
1 parent 7eefdf2 commit f524808

14 files changed

Lines changed: 12 additions & 151 deletions

File tree

cpp/include/cuopt/mathematical_optimization/constants.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@
5454
#define CUOPT_ELIMINATE_DENSE_COLUMNS "eliminate_dense_columns"
5555
#define CUOPT_CUDSS_DETERMINISTIC "cudss_deterministic"
5656
#define CUOPT_CUDSS_ND_NLEVELS "cudss_nd_nlevels"
57-
#define CUOPT_CUDSS_HYBRID_MODE "cudss_hybrid_mode"
58-
#define CUOPT_CUDSS_HYBRID_EXECUTE_MODE "cudss_hybrid_execute_mode"
59-
#define CUOPT_CUDSS_HOST_NTHREADS "cudss_host_nthreads"
6057
#define CUOPT_PRESOLVE "presolve"
6158
#define CUOPT_MIP_PROBING "mip_probing"
6259
#define CUOPT_DUAL_POSTSOLVE "dual_postsolve"

cpp/include/cuopt/mathematical_optimization/pdlp/solver_settings.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,6 @@ class pdlp_solver_settings_t {
291291
bool crossover{false};
292292
bool cudss_deterministic{false};
293293
i_t cudss_nd_nlevels{-1};
294-
bool cudss_hybrid_mode{false};
295-
bool cudss_hybrid_execute_mode{false};
296-
i_t cudss_host_nthreads{-1};
297294
i_t folding{-1};
298295
i_t augmented{-1};
299296
i_t dualize{-1};

cpp/src/barrier/sparse_cholesky.cuh

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -306,33 +306,6 @@ class sparse_cholesky_cudss_t : public sparse_cholesky_base_t<i_t, f_t> {
306306
"cudssConfigSet for nd nlevels");
307307
}
308308

309-
if (settings_.cudss_hybrid_mode) {
310-
settings_.log.printf("cuDSS hybrid mode : enabled\n");
311-
int32_t hybrid_mode = 1;
312-
CUDSS_CALL_AND_CHECK_EXIT(
313-
cudssConfigSet(solverConfig, CUDSS_CONFIG_HYBRID_MODE, &hybrid_mode, sizeof(int32_t)),
314-
status,
315-
"cudssConfigSet for hybrid mode");
316-
}
317-
318-
if (settings_.cudss_hybrid_execute_mode) {
319-
settings_.log.printf("cuDSS hybrid execute mode : enabled\n");
320-
int32_t hybrid_execute_mode = 1;
321-
CUDSS_CALL_AND_CHECK_EXIT(
322-
cudssConfigSet(
323-
solverConfig, CUDSS_CONFIG_HYBRID_EXECUTE_MODE, &hybrid_execute_mode, sizeof(int32_t)),
324-
status,
325-
"cudssConfigSet for hybrid execute mode");
326-
}
327-
328-
if (settings_.cudss_host_nthreads >= 0) {
329-
settings_.log.printf("cuDSS host nthreads : %d\n", settings_.cudss_host_nthreads);
330-
int32_t host_nthreads = settings_.cudss_host_nthreads;
331-
CUDSS_CALL_AND_CHECK_EXIT(
332-
cudssConfigSet(solverConfig, CUDSS_CONFIG_HOST_NTHREADS, &host_nthreads, sizeof(int32_t)),
333-
status,
334-
"cudssConfigSet for host nthreads");
335-
}
336309
#endif
337310

338311
#if USE_ITERATIVE_REFINEMENT

cpp/src/dual_simplex/simplex_solver_settings.hpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ struct simplex_solver_settings_t {
6767
barrier_presolve(false),
6868
cudss_deterministic(false),
6969
cudss_nd_nlevels(-1),
70-
cudss_hybrid_mode(false),
71-
cudss_hybrid_execute_mode(false),
72-
cudss_host_nthreads(-1),
7370
deterministic(false),
7471
barrier(false),
7572
eliminate_dense_columns(true),
@@ -166,12 +163,7 @@ struct simplex_solver_settings_t {
166163
bool barrier_presolve; // true to use barrier presolve
167164
bool cudss_deterministic; // true to use cuDSS deterministic mode, false for non-deterministic
168165
i_t cudss_nd_nlevels; // -1 automatic/unset, else METIS nested-dissection depth for cuDSS
169-
bool cudss_hybrid_mode; // true for hybrid CPU/GPU factor storage in cuDSS
170-
bool cudss_hybrid_execute_mode; // true to overlap CPU/GPU work in cuDSS (only meaningful when
171-
// cudss_hybrid_mode is true)
172-
i_t cudss_host_nthreads; // -1 automatic/unset, else host worker thread count for cuDSS
173-
// (only takes effect when a cuDSS threading layer is loaded)
174-
bool barrier; // true to use barrier method, false to use dual simplex method
166+
bool barrier; // true to use barrier method, false to use dual simplex method
175167
bool deterministic; // true to use B&B deterministic mode, false to use non-deterministic mode
176168
bool eliminate_dense_columns; // true to eliminate dense columns from A*D*A^T
177169
bool barrier_iterative_refinement; // true to use iterative refinement for barrier method

cpp/src/grpc/codegen/field_registry.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -563,16 +563,8 @@ pdlp_settings:
563563
field_num: 34
564564
type: int32
565565
optional: true
566-
- cudss_hybrid_mode:
567-
field_num: 35
568-
type: bool
569-
- cudss_hybrid_execute_mode:
570-
field_num: 36
571-
type: bool
572-
- cudss_host_nthreads:
573-
field_num: 37
574-
type: int32
575-
optional: true
566+
# field_num 35-37 previously used by cudss_hybrid_mode/cudss_hybrid_execute_mode/
567+
# cudss_host_nthreads, removed — do not reuse these numbers.
576568
- barrier_iterative_refinement_method:
577569
field_num: 38
578570
type: int32

cpp/src/grpc/codegen/generated/cuopt_remote_data.proto

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,6 @@ message PDLPSolverSettings {
195195
optional double barrier_step_scale = 32;
196196
optional int32 postsolve_info = 33;
197197
optional int32 cudss_nd_nlevels = 34;
198-
bool cudss_hybrid_mode = 35;
199-
bool cudss_hybrid_execute_mode = 36;
200-
optional int32 cudss_host_nthreads = 37;
201198
optional int32 barrier_iterative_refinement_method = 38;
202199
PDLPWarmStartData warm_start_data = 50;
203200
}

cpp/src/grpc/codegen/generated/generated_pdlp_settings_to_proto.inc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737
pb_settings->set_barrier_step_scale(settings.barrier_step_scale);
3838
pb_settings->set_postsolve_info(settings.postsolve_info);
3939
pb_settings->set_cudss_nd_nlevels(settings.cudss_nd_nlevels);
40-
pb_settings->set_cudss_hybrid_mode(settings.cudss_hybrid_mode);
41-
pb_settings->set_cudss_hybrid_execute_mode(settings.cudss_hybrid_execute_mode);
42-
pb_settings->set_cudss_host_nthreads(settings.cudss_host_nthreads);
4340
pb_settings->set_barrier_iterative_refinement_method(settings.barrier_iterative_refinement_method);
4441
pb_settings->set_save_best_primal_so_far(settings.save_best_primal_so_far);
4542
pb_settings->set_first_primal_feasible(settings.first_primal_feasible);

cpp/src/grpc/codegen/generated/generated_proto_to_pdlp_settings.inc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@
8585
if (pb_settings.has_cudss_nd_nlevels()) {
8686
settings.cudss_nd_nlevels = pb_settings.cudss_nd_nlevels();
8787
}
88-
settings.cudss_hybrid_mode = pb_settings.cudss_hybrid_mode();
89-
settings.cudss_hybrid_execute_mode = pb_settings.cudss_hybrid_execute_mode();
90-
if (pb_settings.has_cudss_host_nthreads()) {
91-
settings.cudss_host_nthreads = pb_settings.cudss_host_nthreads();
92-
}
9388
if (pb_settings.has_barrier_iterative_refinement_method()) {
9489
settings.barrier_iterative_refinement_method = pb_settings.barrier_iterative_refinement_method();
9590
}

cpp/src/math_optimization/solver_settings.cu

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ solver_settings_t<i_t, f_t>::solver_settings_t() : pdlp_settings(), mip_settings
137137
{CUOPT_DUALIZE, &pdlp_settings.dualize, -1, 1, -1},
138138
{CUOPT_ORDERING, &pdlp_settings.ordering, -1, 1, -1},
139139
{CUOPT_CUDSS_ND_NLEVELS, &pdlp_settings.cudss_nd_nlevels, -1, std::numeric_limits<i_t>::max(), -1},
140-
{CUOPT_CUDSS_HOST_NTHREADS, &pdlp_settings.cudss_host_nthreads, -1, std::numeric_limits<i_t>::max(), -1},
141140
{CUOPT_BARRIER_ITERATIVE_REFINEMENT_METHOD, &pdlp_settings.barrier_iterative_refinement_method, 0, 1, 1},
142141
{CUOPT_BARRIER_DUAL_INITIAL_POINT, &pdlp_settings.barrier_dual_initial_point, -1, 1, -1},
143142
{CUOPT_POSTSOLVE_INFO, &pdlp_settings.postsolve_info, -1, 1, -1},
@@ -207,8 +206,6 @@ solver_settings_t<i_t, f_t>::solver_settings_t() : pdlp_settings(), mip_settings
207206
{CUOPT_CROSSOVER, &pdlp_settings.crossover, false},
208207
{CUOPT_ELIMINATE_DENSE_COLUMNS, &pdlp_settings.eliminate_dense_columns, true},
209208
{CUOPT_CUDSS_DETERMINISTIC, &pdlp_settings.cudss_deterministic, false},
210-
{CUOPT_CUDSS_HYBRID_MODE, &pdlp_settings.cudss_hybrid_mode, false},
211-
{CUOPT_CUDSS_HYBRID_EXECUTE_MODE, &pdlp_settings.cudss_hybrid_execute_mode, false},
212209
{CUOPT_DUAL_POSTSOLVE, &pdlp_settings.dual_postsolve, true},
213210
{CUOPT_BARRIER_ITERATIVE_REFINEMENT, &pdlp_settings.barrier_iterative_refinement, true},
214211
{CUOPT_MIP_PROBING, &mip_settings.probing, true},

cpp/src/pdlp/solve.cu

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,9 +520,6 @@ std::tuple<simplex::lp_solution_t<i_t, f_t>, simplex::lp_status_t, f_t, f_t, f_t
520520
barrier_settings.qcqp_ruiz_equilibration = settings.qcqp_ruiz_equilibration;
521521
barrier_settings.cudss_deterministic = settings.cudss_deterministic;
522522
barrier_settings.cudss_nd_nlevels = settings.cudss_nd_nlevels;
523-
barrier_settings.cudss_hybrid_mode = settings.cudss_hybrid_mode;
524-
barrier_settings.cudss_hybrid_execute_mode = settings.cudss_hybrid_execute_mode;
525-
barrier_settings.cudss_host_nthreads = settings.cudss_host_nthreads;
526523
barrier_settings.barrier_relaxed_feasibility_tol = settings.tolerances.relative_primal_tolerance;
527524
barrier_settings.barrier_relaxed_optimality_tol = settings.tolerances.relative_dual_tolerance;
528525
barrier_settings.barrier_relaxed_complementarity_tol = settings.tolerances.relative_gap_tolerance;

0 commit comments

Comments
 (0)