diff --git a/dolfin/nls/PETScTAOSolver.cpp b/dolfin/nls/PETScTAOSolver.cpp index 96ecf55..55318bb 100644 --- a/dolfin/nls/PETScTAOSolver.cpp +++ b/dolfin/nls/PETScTAOSolver.cpp @@ -96,8 +96,13 @@ PETScTAOSolver::PETScTAOSolver(MPI_Comm comm, if (ierr != 0) petsc_error(ierr, __FILE__, "TaoCreate"); // Set Hessian and preconditioner only once + #if PETSC_VERSION_MAJOR == 3 && PETSC_VERSION_MINOR >= 17 + ierr = TaoSetHessian(_tao, _matH.mat(), _matP.mat(), nullptr, nullptr); + if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetHessian"); + #else ierr = TaoSetHessianRoutine(_tao, _matH.mat(), _matP.mat(), nullptr, nullptr); if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetHessianRoutine"); + #endif // Set parameter values parameters = default_parameters(); @@ -223,8 +228,13 @@ void PETScTAOSolver::init(OptimisationProblem& optimisation_problem, set_ksp_options(); // Set initial vector + #if PETSC_VERSION_MAJOR == 3 && PETSC_VERSION_MINOR >= 17 + ierr = TaoSetSolution(_tao, x.vec()); + if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetSolution"); + #else ierr = TaoSetInitialVector(_tao, x.vec()); if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetInitialVector"); + #endif // Set the bounds in case of a bound-constrained minimisation problem if (_has_bounds) @@ -234,10 +244,17 @@ void PETScTAOSolver::init(OptimisationProblem& optimisation_problem, } // Set the objective function, gradient and Hessian evaluation routines + #if PETSC_VERSION_MAJOR == 3 && PETSC_VERSION_MINOR >= 17 + ierr = TaoSetObjectiveAndGradient(_tao, nullptr, FormFunctionGradient, &_tao_ctx); + if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetObjectiveAndGradient"); + ierr = TaoSetHessian(_tao, nullptr, nullptr, FormHessian, &_tao_ctx); + if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetHessian"); + #else ierr = TaoSetObjectiveAndGradientRoutine(_tao, FormFunctionGradient, &_tao_ctx); if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetObjectiveAndGradientRoutine"); ierr = TaoSetHessianRoutine(_tao, nullptr, nullptr, FormHessian, &_tao_ctx); if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetHessianRoutine"); + #endif // Clear previous monitors ierr = TaoCancelMonitors(_tao); @@ -388,9 +405,15 @@ PetscErrorCode PETScTAOSolver::FormHessian(Tao tao, Vec x, Mat H, Mat P, if (P_wrap.empty()) { log(TRACE, "TAO FormHessian: using Hessian as preconditioner matrix"); + #if PETSC_VERSION_MAJOR == 3 && PETSC_VERSION_MINOR >= 17 + PetscErrorCode ierr = TaoSetHessian(tao, nullptr, H, + nullptr, nullptr); + if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetHessian"); + #else PetscErrorCode ierr = TaoSetHessianRoutine(tao, nullptr, H, nullptr, nullptr); if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetHessianRoutine"); + #endif } return 0; diff --git a/dolfin/nls/TAOLinearBoundSolver.cpp b/dolfin/nls/TAOLinearBoundSolver.cpp index 78fa1e7..bc2c384 100644 --- a/dolfin/nls/TAOLinearBoundSolver.cpp +++ b/dolfin/nls/TAOLinearBoundSolver.cpp @@ -172,8 +172,13 @@ std::size_t TAOLinearBoundSolver::solve(const PETScMatrix& A1, // Set initial vector dolfin_assert(_tao); + #if PETSC_VERSION_MAJOR == 3 && PETSC_VERSION_MINOR >= 17 + ierr = TaoSetSolution(_tao, x.vec()); + if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetSolution"); + #else ierr = TaoSetInitialVector(_tao, x.vec()); if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetInitialVector"); + #endif // Set the bound on the variables ierr = TaoSetVariableBounds(_tao, xl.vec(), xu.vec()); @@ -181,6 +186,15 @@ std::size_t TAOLinearBoundSolver::solve(const PETScMatrix& A1, // Set the user function, gradient, hessian evaluation routines and // data structures + #if PETSC_VERSION_MAJOR == 3 && PETSC_VERSION_MINOR >= 17 + ierr = TaoSetObjectiveAndGradient(_tao, nullptr, + __TAOFormFunctionGradientQuadraticProblem, this); + if (ierr != 0) petsc_error(ierr, __FILE__, + "TaoSetObjectiveAndGradient"); + ierr = TaoSetHessian(_tao, A->mat(), A->mat(), + __TAOFormHessianQuadraticProblem, this); + if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetHessian"); + #else ierr = TaoSetObjectiveAndGradientRoutine(_tao, __TAOFormFunctionGradientQuadraticProblem, this); if (ierr != 0) petsc_error(ierr, __FILE__, @@ -188,6 +202,7 @@ std::size_t TAOLinearBoundSolver::solve(const PETScMatrix& A1, ierr = TaoSetHessianRoutine(_tao, A->mat(), A->mat(), __TAOFormHessianQuadraticProblem, this); if (ierr != 0) petsc_error(ierr, __FILE__, "TaoSetHessianRoutine"); + #endif // Set parameters from local parameters, including ksp parameters read_parameters();