Merge branch 'fix-2526' into hi-pdlp

Author: Yanyu000

highs/lp_data/HConst.h

@@ -365,6 +365,11 @@ const int8_t kPivotRowSingleton = 2;
 const int8_t kPivotColSingleton = 3;
 const int8_t kPivotMarkowitz = 4;
 
+// For converting general LPs to form for PDLP
+//
+// Requires non-conforming names for cuPDLP-C
+enum ConstraintType { EQ = 0, LEQ, GEQ, BOUND, FREE };
+
 // Mask for switching off PDLP features
 enum PdlpFeaturesOff {
   kPdlpAllFeaturesOn = 0,

highs/pdlp/CupdlpWrapper.h

@@ -30,8 +30,6 @@
 //     }                                                                   \
 //   }
 
-typedef enum CONSTRAINT_TYPE { EQ = 0, LEQ, GEQ, BOUND } constraint_type;
-
 #define cupdlp_init_int(var, size) \
   { (var) = (int*)malloc((size) * sizeof(int)); }
 

highs/pdlp/hipdlp/pdhg.cc

@@ -25,7 +25,6 @@ void PDLPSolver::PreprocessLp(const HighsLp& original_lp,
   int nRows_orig = original_lp.num_row_;
   int nCols_orig = original_lp.num_col_;
 
-  // std::vector<ConstraintType> constraint_types(nRows_orig);
   int num_new_cols = 0;
   int nEqs = 0;
   constraint_types_.resize(nRows_orig);

highs/pdlp/hipdlp/pdhg.hpp

@@ -32,8 +32,6 @@
 #define USE_GPU 1
 // Debug mode
 #define DEBUG_MODE 1
-enum ConstraintType { EQ, GEQ, LEQ, BOUND, FREE };
-
 // --- Classes ---
 class PDLPSolver {
  public: