clean up remaining infnorms

ERGO-Code · Oct 28, 2024 · 7b0c482 · 7b0c482
1 parent 95e8716
commit 7b0c482
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/src/pdlp/cupdlp/cupdlp_defs.h b/src/pdlp/cupdlp/cupdlp_defs.h
@@ -103,10 +103,8 @@ typedef enum {
   N_LOG_LEVEL,
   N_LOG_INTERVAL,
   IF_PRESOLVE,
-  I_INF_NORM_ABS_LOCAL_TERMINATION,
   N_INT_USER_PARAM
 } CUPDLP_INT_USER_PARAM_INDEX;
-  //#define N_INT_USER_PARAM 12
 typedef enum {
   D_SCALING_LIMIT = 0,
   D_PRIMAL_TOL,
@@ -116,7 +114,6 @@ typedef enum {
   D_TIME_LIM,
   N_FLOAT_USER_PARAM
 } CUPDLP_FLOAT_USER_PARAM_INDEX;
-  //#define N_FLOAT_USER_PARAM 6
 
 // used in sparse matrix-dense vector multiplication
 struct CUPDLP_CUDA_DENSE_VEC {
@@ -182,7 +179,6 @@ struct CUPDLP_SETTINGS {
   cupdlp_float dPrimalTol;
   cupdlp_float dDualTol;
   cupdlp_float dGapTol;
-  cupdlp_int iInfNormAbsLocalTermination;
 
   // max iter and time
   cupdlp_int nIterLim;

diff --git a/src/pdlp/cupdlp/cupdlp_linalg.h b/src/pdlp/cupdlp/cupdlp_linalg.h
@@ -111,9 +111,6 @@ cupdlp_int cupdlp_dot(CUPDLPwork *w, const cupdlp_int n, const cupdlp_float *x,
 cupdlp_int cupdlp_twoNorm(CUPDLPwork *w, const cupdlp_int n,
                           const cupdlp_float *x, cupdlp_float *res);
 
-cupdlp_int cupdlp_infNorm(CUPDLPwork *w, const cupdlp_int n,
-                          const cupdlp_float *x, cupdlp_float *res);
-
 cupdlp_int cupdlp_scaleVector(CUPDLPwork *w, const cupdlp_float weight,
                               cupdlp_float *x, const cupdlp_int n);
 

diff --git a/src/pdlp/cupdlp/cupdlp_utils.c b/src/pdlp/cupdlp/cupdlp_utils.c
@@ -676,10 +676,6 @@ cupdlp_retcode settings_SetUserParam(CUPDLPsettings *settings,
     settings->eRestartMethod = intParam[E_RESTART_METHOD];
   }
 
-  if (ifChangeIntParam[I_INF_NORM_ABS_LOCAL_TERMINATION]) {
-    settings->iInfNormAbsLocalTermination = intParam[I_INF_NORM_ABS_LOCAL_TERMINATION];
-  }
-
 exit_cleanup:
   return retcode;
 }
@@ -803,7 +799,6 @@ cupdlp_retcode settings_Alloc(CUPDLPsettings *settings) {
   settings->iScalingMethod = 3;  // no use
   settings->dScalingLimit = 5;   // no use
   settings->eRestartMethod = PDHG_GPU_RESTART;
-  settings->iInfNormAbsLocalTermination = 0;
 
   // termination criteria
   settings->dPrimalTol = 1e-4;