clean up, fixed warnings

Author: cnpetra

src/Optimization/hiopAlgFilterIPM.cpp

@@ -652,10 +652,7 @@ bool hiopAlgFilterIPMBase::evalNlpAndLogErrors(const hiopIterate& it,
 {
   nlp->runStats.tmSolverInternal.start();
 
-  size_type n = nlp->n_complem(), m = nlp->m();
-  // the one norms
-  // double nrmDualBou=it.normOneOfBoundDuals();
-  // double nrmDualEqu=it.normOneOfEqualityDuals();
+  size_type n = nlp->n_complem();
   double sc;
   double sd;
   double nrmDualBou;
@@ -738,7 +735,7 @@ bool hiopAlgFilterIPMBase::evalNlpAndLogErrors2(const hiopIterate& it,
 {
   nlp->runStats.tmSolverInternal.start();
 
-  size_type n = nlp->n_complem(), m = nlp->m();
+  size_type n = nlp->n_complem();
   double sc;
   double sd;
   double nrmDualBou;

src/Optimization/hiopIterate.cpp

@@ -196,45 +196,45 @@ void hiopIterate::setEqualityDualsToConstant(const double& v)
   yd->setToConstant(v);
 }
 
-double hiopIterate::normOneOfBoundDuals() const
-{
-#ifdef HIOP_DEEPCHECKS
-  assert(zl->matchesPattern(nlp->get_ixl()));
-  assert(zu->matchesPattern(nlp->get_ixu()));
-  assert(vl->matchesPattern(nlp->get_idl()));
-  assert(vu->matchesPattern(nlp->get_idu()));
-#endif
-  // work locally with all the vectors. This will result in only one MPI_Allreduce call instead of two.
-  double nrm1 = zl->onenorm_local() + zu->onenorm_local();
-#ifdef HIOP_USE_MPI
-  double nrm1_global;
-  int ierr = MPI_Allreduce(&nrm1, &nrm1_global, 1, MPI_DOUBLE, MPI_SUM, nlp->get_comm());
-  assert(MPI_SUCCESS == ierr);
-  nrm1 = nrm1_global;
-#endif
-  nrm1 += vl->onenorm_local() + vu->onenorm_local();
-  return nrm1;
-}
+// double hiopIterate::normOneOfBoundDuals() const
+// {
+// #ifdef HIOP_DEEPCHECKS
+//   assert(zl->matchesPattern(nlp->get_ixl()));
+//   assert(zu->matchesPattern(nlp->get_ixu()));
+//   assert(vl->matchesPattern(nlp->get_idl()));
+//   assert(vu->matchesPattern(nlp->get_idu()));
+// #endif
+//   // work locally with all the vectors. This will result in only one MPI_Allreduce call instead of two.
+//   double nrm1 = zl->onenorm_local() + zu->onenorm_local();
+// #ifdef HIOP_USE_MPI
+//   double nrm1_global;
+//   int ierr = MPI_Allreduce(&nrm1, &nrm1_global, 1, MPI_DOUBLE, MPI_SUM, nlp->get_comm());
+//   assert(MPI_SUCCESS == ierr);
+//   nrm1 = nrm1_global;
+// #endif
+//   nrm1 += vl->onenorm_local() + vu->onenorm_local();
+//   return nrm1;
+// }
 
-double hiopIterate::normOneOfEqualityDuals() const
-{
-#ifdef HIOP_DEEPCHECKS
-  assert(zl->matchesPattern(nlp->get_ixl()));
-  assert(zu->matchesPattern(nlp->get_ixu()));
-  assert(vl->matchesPattern(nlp->get_idl()));
-  assert(vu->matchesPattern(nlp->get_idu()));
-#endif
-  // work locally with all the vectors. This will result in only one MPI_Allreduce call instead of two.
-  double nrm1 = zl->onenorm_local() + zu->onenorm_local();
-#ifdef HIOP_USE_MPI
-  double nrm1_global;
-  int ierr = MPI_Allreduce(&nrm1, &nrm1_global, 1, MPI_DOUBLE, MPI_SUM, nlp->get_comm());
-  assert(MPI_SUCCESS == ierr);
-  nrm1 = nrm1_global;
-#endif
-  nrm1 += vl->onenorm_local() + vu->onenorm_local() + yc->onenorm_local() + yd->onenorm_local();
-  return nrm1;
-}
+// double hiopIterate::normOneOfEqualityDuals() const
+// {
+// #ifdef HIOP_DEEPCHECKS
+//   assert(zl->matchesPattern(nlp->get_ixl()));
+//   assert(zu->matchesPattern(nlp->get_ixu()));
+//   assert(vl->matchesPattern(nlp->get_idl()));
+//   assert(vu->matchesPattern(nlp->get_idu()));
+// #endif
+//   // work locally with all the vectors. This will result in only one MPI_Allreduce call instead of two.
+//   double nrm1 = zl->onenorm_local() + zu->onenorm_local();
+// #ifdef HIOP_USE_MPI
+//   double nrm1_global;
+//   int ierr = MPI_Allreduce(&nrm1, &nrm1_global, 1, MPI_DOUBLE, MPI_SUM, nlp->get_comm());
+//   assert(MPI_SUCCESS == ierr);
+//   nrm1 = nrm1_global;
+// #endif
+//   nrm1 += vl->onenorm_local() + vu->onenorm_local() + yc->onenorm_local() + yd->onenorm_local();
+//   return nrm1;
+// }
 
 // void hiopIterate::normOneOfDuals(double& nrm1Eq, double& nrm1Bnd) const
 // {

src/Optimization/hiopIterate.hpp

@@ -139,8 +139,8 @@ class hiopIterate
                                             hiopVector& grad_d) const;
 
   /** norms for individual parts of the iterate (on demand computation) */
-  virtual double normOneOfBoundDuals() const;
-  virtual double normOneOfEqualityDuals() const;
+  //virtual double normOneOfBoundDuals() const;
+  //virtual double normOneOfEqualityDuals() const;
   /* same as above but computed in one shot to save on communication and computation */
   //virtual void normOneOfDuals(double& nrm1Eq, double& nrm1Bnd) const;