force pdlp local termination for GPU for the moment

ERGO-Code · Jan 17, 2025 · 2d29f1d · 2d29f1d
1 parent 64e8a41
commit 2d29f1d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -290,4 +290,7 @@ highs-unit-tests
 highs-problem-set
 
 # debug nvidia
-build-cpu
+build-cpu
+
+# Generated HiGHS options file
+Options.md
diff --git a/src/pdlp/CupdlpWrapper.cpp b/src/pdlp/CupdlpWrapper.cpp
@@ -704,8 +704,17 @@ void getUserParamsFromOptions(const HighsOptions& options,
   ifChangeIntParam[E_RESTART_METHOD] = true;
   intParam[E_RESTART_METHOD] = int(options.pdlp_e_restart_method);
   //
+
+  // for the moment only native termination is allowed with GPU
+#ifdef CUPDLP_CPU
   ifChangeIntParam[I_INF_NORM_ABS_LOCAL_TERMINATION] = true;
   intParam[I_INF_NORM_ABS_LOCAL_TERMINATION] = !options.pdlp_native_termination;
+#else
+  ifChangeIntParam[I_INF_NORM_ABS_LOCAL_TERMINATION] = false;
+  if (!options.pdlp_native_termination) {
+    printf("Warning: GPU only supports pdlp_native_termination=on. Ignoring parameter.\n");
+  }
+#endif
 }
 
 void analysePdlpSolution(const HighsOptions& options, const HighsLp& lp,

diff --git a/src/pdlp/cupdlp/cupdlp_linalg.c b/src/pdlp/cupdlp/cupdlp_linalg.c
@@ -799,7 +799,7 @@ double get_fabs_value(double* vec, int index, int N) {
   // get_gpu_vec_element(vec, index, &result, &success);
 
   double * b;
-  b = (float *)malloc (N * sizeof (*b));
+  b = (double *)malloc (N * sizeof (*b));
   get_gpu_vec(vec, index, b, &success);
 
   if (!success)