change function namel; remive pnnl ci tests

LLNL · Jun 6, 2024 · e9f8cc5 · e9f8cc5
1 parent 49094a9
commit e9f8cc5
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 192 deletions.
diff --git a/.gitlab/pnnl-ci.yml b/.gitlab/pnnl-ci.yml
diff --git a/src/Interface/hiopInterface.hpp b/src/Interface/hiopInterface.hpp
@@ -485,14 +485,14 @@ class hiopInterfaceBase
    * can be then used in host memory space (without the need to rely on or use Umpire).
    * 
    */
-  virtual bool ws_iterate_callback(const double* x,
-                                   const double* z_L,
-                                   const double* z_U,
-                                   const double* yc,
-                                   const double* yd,
-                                   const double* s,
-                                   const double* v_L,
-                                   const double* v_U)
+  virtual bool iterate_full_callback(const double* x,
+                                     const double* z_L,
+                                     const double* z_U,
+                                     const double* yc,
+                                     const double* yd,
+                                     const double* s,
+                                     const double* v_L,
+                                     const double* v_U)
   {
     return true;
   }

diff --git a/src/Optimization/hiopNlpFormulation.cpp b/src/Optimization/hiopNlpFormulation.cpp
@@ -1271,14 +1271,14 @@ bool hiopNlpFormulation::user_callback_iterate(int iter,
   return bret; 
 }
 
-bool hiopNlpFormulation::user_callback_ws_iterate(hiopVector& x,
-                                                  hiopVector& z_L,
-                                                  hiopVector& z_U,
-                                                  hiopVector& y_c,
-                                                  hiopVector& y_d,
-                                                  hiopVector& s,
-                                                  hiopVector& v_L,
-                                                  hiopVector& v_U)
+bool hiopNlpFormulation::user_callback_full_iterate(hiopVector& x,
+                                                    hiopVector& z_L,
+                                                    hiopVector& z_U,
+                                                    hiopVector& y_c,
+                                                    hiopVector& y_d,
+                                                    hiopVector& s,
+                                                    hiopVector& v_L,
+                                                    hiopVector& v_U)
 {
   assert(x.get_size()==n_vars_);
   assert(y_c.get_size() == n_cons_eq_);
@@ -1316,23 +1316,23 @@ bool hiopNlpFormulation::user_callback_ws_iterate(hiopVector& x,
     hiopVectorPar vu_host(n_cons_ineq_, vec_distrib_, comm_);
     v_U.copy_to_vectorpar(zu_host);    
 
-    bret = interface_base.ws_iterate_callback(x_host.local_data_const(),
-                                              zl_host.local_data_const(),
-                                              zu_host.local_data_const(),
-                                              yc_host.local_data_const(),
-                                              yd_host.local_data_const(),
-                                              s_host.local_data_const(),
-                                              vl_host.local_data_const(),
-                                              vu_host.local_data_const());
+    bret = interface_base.iterate_full_callback(x_host.local_data_const(),
+                                                zl_host.local_data_const(),
+                                                zu_host.local_data_const(),
+                                                yc_host.local_data_const(),
+                                                yd_host.local_data_const(),
+                                                s_host.local_data_const(),
+                                                vl_host.local_data_const(),
+                                                vu_host.local_data_const());
   } else {
-    bret = interface_base.ws_iterate_callback(x.local_data_const(),
-                                              z_L.local_data_const(),
-                                              z_U.local_data_const(),
-                                              y_c.local_data_const(),
-                                              y_d.local_data_const(),
-                                              s.local_data_const(),
-                                              v_L.local_data_const(),
-                                              v_U.local_data_const());
+    bret = interface_base.iterate_full_callback(x.local_data_const(),
+                                                z_L.local_data_const(),
+                                                z_U.local_data_const(),
+                                                y_c.local_data_const(),
+                                                y_d.local_data_const(),
+                                                s.local_data_const(),
+                                                v_L.local_data_const(),
+                                                v_U.local_data_const());
   }   
   return bret; 
 }

diff --git a/src/Optimization/hiopNlpFormulation.hpp b/src/Optimization/hiopNlpFormulation.hpp
@@ -193,14 +193,14 @@ class hiopNlpFormulation
                              int ls_trials);
 
   virtual
-  bool user_callback_ws_iterate(hiopVector& x,
-                                hiopVector& z_L,
-                                hiopVector& z_U,
-                                hiopVector& y_c,
-                                hiopVector& y_d,
-                                hiopVector& s,
-                                hiopVector& v_L,
-                                hiopVector& v_U);
+  bool user_callback_full_iterate(hiopVector& x,
+                                  hiopVector& z_L,
+                                  hiopVector& z_U,
+                                  hiopVector& y_c,
+                                  hiopVector& y_d,
+                                  hiopVector& s,
+                                  hiopVector& v_L,
+                                  hiopVector& v_U);
 
   virtual
   bool user_force_update(int iter,