Skip to content
Browse files

remove tao-private include directory, private goes into petsc-private

  • Loading branch information...
1 parent e1cc520 commit 5b0d99aef51158554e42172a250c96a448fd1e2b @BarrySmith BarrySmith committed Jan 29, 2014
Showing with 52 additions and 70 deletions.
  1. +1 −1 include/makefile
  2. +0 −1 include/{tao-private/taodm_impl.h → petsc-private/taodmimpl.h}
  3. +0 −2 include/{tao-private/taolinesearch_impl.h → petsc-private/taolinesearchimpl.h}
  4. 0 include/{tao-private/taosolver_impl.h → petsc-private/taosolverimpl.h}
  5. +0 −14 include/tao-private/makefile
  6. +1 −1 include/tao_util.h
  7. +0 −2 include/taodm.h
  8. +5 −6 include/taolinesearch.h
  9. +1 −1 src/tao/bound/impls/blmvm/blmvm.h
  10. +1 −1 src/tao/bound/impls/bqpip/bqpip.h
  11. +1 −1 src/tao/bound/impls/gpcg/gpcg.h
  12. +1 −1 src/tao/bound/impls/tron/tron.h
  13. +1 −1 src/tao/complementarity/impls/ssls/ssls.h
  14. +1 −1 src/tao/constrained/impls/ipm/ipm.h
  15. +2 −2 src/tao/interface/dlregistao.c
  16. +1 −1 src/tao/interface/fdiff.c
  17. +1 −1 src/tao/interface/fdtest.c
  18. +1 −1 src/tao/interface/ftn-custom/ztaosolverf.c
  19. +2 −2 src/tao/interface/taosolver.c
  20. +1 −1 src/tao/interface/taosolver_bounds.c
  21. +1 −1 src/tao/interface/taosolver_fg.c
  22. +1 −1 src/tao/interface/taosolver_hj.c
  23. +1 −1 src/tao/interface/taosolverregi.c
  24. +1 −1 src/tao/leastsquares/impls/pounders/pounders.h
  25. +1 −1 src/tao/leastsquares/impls/poundersb/pounders_util.c
  26. +1 −1 src/tao/leastsquares/impls/poundersb/poundersb.h
  27. +1 −1 src/tao/linesearch/impls/armijo/armijo.c
  28. +1 −1 src/tao/linesearch/impls/armijo/armijo.h
  29. +1 −1 src/tao/linesearch/impls/gpcglinesearch/gpcglinesearch.c
  30. +1 −1 src/tao/linesearch/impls/morethuente/morethuente.c
  31. +1 −1 src/tao/linesearch/impls/owarmijo/owarmijo.c
  32. +1 −1 src/tao/linesearch/impls/owarmijo/owarmijo.h
  33. +1 −1 src/tao/linesearch/impls/unit/unit.c
  34. +1 −1 src/tao/linesearch/interface/dlregis_taolinesearch.c
  35. +1 −1 src/tao/linesearch/interface/ftn-custom/ztaolinesearchf.c
  36. +1 −1 src/tao/linesearch/interface/taolinesearch.c
  37. +2 −0 src/tao/makefile
  38. +1 −1 src/tao/pde_constrained/examples/tutorials/elliptic.c
  39. +1 −1 src/tao/pde_constrained/examples/tutorials/parabolic.c
  40. +1 −1 src/tao/pde_constrained/impls/lcl/lcl.h
  41. +1 −1 src/tao/pde_constrained/impls/sqpcon/sqpcon.h
  42. +2 −2 src/tao/unconstrained/impls/bmrm/bmrm.h
  43. +1 −1 src/tao/unconstrained/impls/cg/taocg.h
  44. +1 −1 src/tao/unconstrained/impls/lmvm/lmvm.h
  45. +1 −1 src/tao/unconstrained/impls/neldermead/neldermead.h
  46. +1 −1 src/tao/unconstrained/impls/nls/nls.h
  47. +1 −1 src/tao/unconstrained/impls/ntl/ntl.h
  48. +1 −1 src/tao/unconstrained/impls/ntr/ntr.h
  49. +1 −1 src/tao/unconstrained/impls/owlqn/owlqn.h
View
2 include/makefile
@@ -5,7 +5,7 @@ SOURCEC =
SOURCEF =
SOURCEH = petscsys.h
LIBBASE = libpetscvec
-DIRS = finclude petsc-private tao-private
+DIRS = finclude petsc-private
LOCDIR = include/
MANSEC = Sys
View
1 include/tao-private/taodm_impl.h → include/petsc-private/taodmimpl.h
@@ -47,7 +47,6 @@ struct _p_TaoDM {
PetscErrorCode (*postlevelmonitor[MAXTAODMMONITORS])(TaoDM,PetscInt,void*);
PetscInt npremonitors;
PetscInt npostmonitors;
-
};
#endif
View
2 include/tao-private/taolinesearch_impl.h → include/petsc-private/taolinesearchimpl.h
@@ -5,7 +5,6 @@
#include "taosolver.h"
#include "taolinesearch.h"
-
typedef struct _TaoLineSearchOps *TaoLineSearchOps;
struct _TaoLineSearchOps {
PetscErrorCode (*computeobjective)(TaoLineSearch, Vec, PetscReal*, void*);
@@ -64,7 +63,6 @@ struct _p_TaoLineSearch {
PetscBool viewls; /* print out information if true */
TaoSolver taosolver;
-
};
extern PetscLogEvent TaoLineSearch_ApplyEvent, TaoLineSearch_EvalEvent;
View
0 include/tao-private/taosolver_impl.h → include/petsc-private/taosolverimpl.h
File renamed without changes.
View
14 include/tao-private/makefile
@@ -1,14 +0,0 @@
-
-CFLAGS =
-FFLAGS =
-SOURCEC =
-SOURCEF =
-SOURCEH = taodm_impl.h taolinesearch_impl.h taosolver_impl.h
-LIBBASE = libpetscvec
-DIRS =
-LOCDIR = include/tao-private/
-MANSEC = Sys
-
-include ${PETSC_DIR}/conf/variables
-include ${PETSC_DIR}/conf/rules
-include ${PETSC_DIR}/conf/test
View
2 include/tao_util.h
@@ -28,7 +28,7 @@ PetscErrorCode VecStepMax(Vec, Vec, PetscReal *);
TAO will directly alter the hessian operator.
E*/
-typedef enum {TAO_SUBSET_SUBVEC,TAO_SUBSET_MASK,TAO_SUBSET_MATRIXFREE,TAO_SUBSET_TYPES} TaoSubsetType;
+typedef enum {TAO_SUBSET_SUBVEC,TAO_SUBSET_MASK,TAO_SUBSET_MATRIXFREE} TaoSubsetType;
PETSC_EXTERN const char *const TaoSubsetTypes[];
PetscErrorCode VecWhichBetween(Vec, Vec, Vec, IS *);
View
2 include/taodm.h
@@ -4,7 +4,6 @@
#include "petscdm.h"
#include "tao.h"
-
typedef struct _p_TaoDM* TaoDM;
PETSC_EXTERN PetscClassId TAODM_CLASSID;
@@ -38,7 +37,6 @@ PETSC_EXTERN PetscErrorCode TaoDMSetLocalGradientRoutine(TaoDM*,PetscErrorCode(*
PETSC_EXTERN PetscErrorCode TaoDMSetLocalObjectiveAndGradientRoutine(TaoDM*,PetscErrorCode(*)(DMDALocalInfo*,PetscReal**,PetscReal*,PetscReal**,void*));
PETSC_EXTERN PetscErrorCode TaoDMSetLocalHessianRoutine(TaoDM*,PetscErrorCode(*)(DMDALocalInfo*,PetscReal**,Mat,void*));
-
PETSC_EXTERN PetscErrorCode TaoDMFormFunctionLocal(TaoSolver, Vec, PetscReal *, void*);
PETSC_EXTERN PetscErrorCode TaoDMFormGradientLocal(TaoSolver, Vec, Vec, void*);
PETSC_EXTERN PetscErrorCode TaoDMFormFunctionGradientLocal(TaoSolver, Vec, PetscReal *, Vec, void*);
View
11 include/taolinesearch.h
@@ -18,14 +18,13 @@ typedef enum {
TAOLINESEARCH_HALTED_USER = 8
} TaoLineSearchTerminationReason;
-
#define TaoLineSearchType char*
-#define TAOLINESEARCH_UNIT "unit"
-#define TAOLINESEARCH_MT "more-thuente"
-#define TAOLINESEARCH_GPCG "gpcg"
-#define TAOLINESEARCH_ARMIJO "armijo"
+#define TAOLINESEARCH_UNIT "unit"
+#define TAOLINESEARCH_MT "more-thuente"
+#define TAOLINESEARCH_GPCG "gpcg"
+#define TAOLINESEARCH_ARMIJO "armijo"
#define TAOLINESEARCH_OWARMIJO "owarmijo"
-#define TAOLINESEARCH_IPM "ipm"
+#define TAOLINESEARCH_IPM "ipm"
PETSC_EXTERN PetscClassId TAOLINESEARCH_CLASSID;
PETSC_EXTERN PetscFunctionList TaoLineSearchList;
View
2 src/tao/bound/impls/blmvm/blmvm.h
@@ -1,6 +1,6 @@
#ifndef __TAO_BLMVM_H
#define __TAO_BLMVM_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
/*
Context for limited memory variable metric method for bound constrained
View
2 src/tao/bound/impls/bqpip/bqpip.h
@@ -1,7 +1,7 @@
#ifndef __TAO_BQPIP_H
#define __TAO_BQPIP_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
typedef struct{
View
2 src/tao/bound/impls/gpcg/gpcg.h
@@ -1,6 +1,6 @@
#ifndef __TAO_GPCG_H
#define __TAO_GPCG_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
#include "taolinesearch.h"
#include "tao_util.h"
View
2 src/tao/bound/impls/tron/tron.h
@@ -1,7 +1,7 @@
#ifndef __TAO_TRON_H
#define __TAO_TRON_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
#include "petscis.h"
typedef struct {
View
2 src/tao/complementarity/impls/ssls/ssls.h
@@ -50,7 +50,7 @@
#ifndef __TAO_SSLS_H
#define __TAO_SSLS_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
typedef struct {
Vec ff; /* fischer function */
View
2 src/tao/constrained/impls/ipm/ipm.h
@@ -1,6 +1,6 @@
#ifndef __TAO_IPM_H
#define __TAO_IPM_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
/*
Context for Interior-Point Method
View
4 src/tao/interface/dlregistao.c
@@ -1,7 +1,7 @@
#define TAOSOLVER_DLL
-#include "tao-private/taosolver_impl.h"
-#include "tao-private/taodm_impl.h"
+#include "petsc-private/taosolverimpl.h"
+#include "petsc-private/taodmimpl.h"
static PetscBool TaoPackageInitialized = PETSC_FALSE;
View
2 src/tao/interface/fdiff.c
@@ -1,5 +1,5 @@
#include "taosolver.h" /*I "taosolver.h" I*/
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
#include "petscsnes.h"
View
2 src/tao/interface/fdtest.c
@@ -1,4 +1,4 @@
-#include "tao-private/taosolver_impl.h" /*I "taosolver.h" I*/
+#include "petsc-private/taosolverimpl.h" /*I "taosolver.h" I*/
typedef struct {
PetscBool check_gradient;
View
2 src/tao/interface/ftn-custom/ztaosolverf.c
@@ -1,5 +1,5 @@
#include "petsc-private/fortranimpl.h"
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
#if defined(PETSC_HAVE_FORTRAN_CAPS)
View
4 src/tao/interface/taosolver.c
@@ -1,14 +1,14 @@
#define TAOSOLVER_DLL
-#include "tao-private/taosolver_impl.h" /*I "taosolver.h" I*/
+#include "petsc-private/taosolverimpl.h" /*I "taosolver.h" I*/
PetscBool TaoSolverRegisterAllCalled = PETSC_FALSE;
PetscFunctionList TaoSolverList = NULL;
PetscClassId TAOSOLVER_CLASSID;
PetscLogEvent TaoSolver_Solve, TaoSolver_ObjectiveEval, TaoSolver_GradientEval, TaoSolver_ObjGradientEval, TaoSolver_HessianEval, TaoSolver_ConstraintsEval, TaoSolver_JacobianEval;
-const char *TaoSubSetTypes[] = { "subvec","mask","matrixfree","TaoSubSetType""TAO_SUBSET",0};
+const char *TaoSubSetTypes[] = { "subvec","mask","matrixfree","TaoSubSetType","TAO_SUBSET_",0};
#undef __FUNCT__
#define __FUNCT__ "TaoCreate"
View
2 src/tao/interface/taosolver_bounds.c
@@ -1,4 +1,4 @@
-#include "tao-private/taosolver_impl.h" /*I "taosolver.h" I*/
+#include "petsc-private/taosolverimpl.h" /*I "taosolver.h" I*/
#undef __FUNCT__
#define __FUNCT__ "TaoSetVariableBounds"
View
2 src/tao/interface/taosolver_fg.c
@@ -1,4 +1,4 @@
-#include "tao-private/taosolver_impl.h" /*I "taosolver.h" I*/
+#include "petsc-private/taosolverimpl.h" /*I "taosolver.h" I*/
#undef __FUNCT__
#define __FUNCT__ "TaoSetInitialVector"
View
2 src/tao/interface/taosolver_hj.c
@@ -1,4 +1,4 @@
-#include "tao-private/taosolver_impl.h" /*I "taosolver.h" I*/
+#include "petsc-private/taosolverimpl.h" /*I "taosolver.h" I*/
#undef __FUNCT__
#define __FUNCT__ "TaoSetHessianRoutine"
View
2 src/tao/interface/taosolverregi.c
@@ -1,6 +1,6 @@
#define TAOSOLVER_DLL
-#include "tao-private/taosolver_impl.h" /*I "taosolver.h" I*/
+#include "petsc-private/taosolverimpl.h" /*I "taosolver.h" I*/
PETSC_EXTERN PetscErrorCode TaoCreate_LMVM(TaoSolver);
View
2 src/tao/leastsquares/impls/pounders/pounders.h
@@ -1,6 +1,6 @@
#ifndef __TAO_MFQNLS_H
#define __TAO_MFQNLS_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
#include "petsc.h"
#include "petscblaslapack.h"
#include "taolapack.h"
View
2 src/tao/leastsquares/impls/poundersb/pounders_util.c
@@ -1,4 +1,4 @@
-#include "private/taosolver_impl.h"
+#include "private/taosolverimpl.h"
#include "poundersb.h"
#undef __FUNCT__
#define __FUNCT__ "TaoPounders_formquad"
View
2 src/tao/leastsquares/impls/poundersb/poundersb.h
@@ -1,6 +1,6 @@
#ifndef __TAO_MFQNLS_H
#define __TAO_MFQNLS_H
-#include "include/private/taosolver_impl.h"
+#include "include/private/taosolverimpl.h"
#include "petsc.h"
#include "petscblaslapack.h"
#include "taolapack.h"
View
2 src/tao/linesearch/impls/armijo/armijo.c
@@ -1,6 +1,6 @@
#include "petscvec.h"
#include "taosolver.h"
-#include "tao-private/taolinesearch_impl.h"
+#include "petsc-private/taolinesearchimpl.h"
#include "armijo.h"
#define REPLACE_FIFO 1
View
2 src/tao/linesearch/impls/armijo/armijo.h
@@ -60,7 +60,7 @@
Grippo, Lampariello, and Lucidi, "A Class of Nonmonotone Stabilization
Methods in Unconstrained Optimization," Numerische Mathematik, volume 59,
pages 779-805, 1991. */
-#include "tao-private/taolinesearch_impl.h"
+#include "petsc-private/taolinesearchimpl.h"
typedef struct {
PetscReal *memory;
View
2 src/tao/linesearch/impls/gpcglinesearch/gpcglinesearch.c
@@ -1,4 +1,4 @@
-#include "tao-private/taolinesearch_impl.h"
+#include "petsc-private/taolinesearchimpl.h"
#include "gpcglinesearch.h"
/* ---------------------------------------------------------- */
View
2 src/tao/linesearch/impls/morethuente/morethuente.c
@@ -1,6 +1,6 @@
#include "petscvec.h"
#include "taosolver.h"
-#include "tao-private/taolinesearch_impl.h"
+#include "petsc-private/taolinesearchimpl.h"
#include "morethuente.h"
/*
View
2 src/tao/linesearch/impls/owarmijo/owarmijo.c
@@ -1,6 +1,6 @@
#include "petscvec.h"
#include "taosolver.h"
-#include "tao-private/taolinesearch_impl.h"
+#include "petsc-private/taolinesearchimpl.h"
#include "owarmijo.h"
#define REPLACE_FIFO 1
View
2 src/tao/linesearch/impls/owarmijo/owarmijo.h
@@ -60,7 +60,7 @@
Grippo, Lampariello, and Lucidi, "A Class of Nonmonotone Stabilization
Methods in Unconstrained Optimization," Numerische Mathematik, volume 59,
pages 779-805, 1991. */
-#include "tao-private/taolinesearch_impl.h"
+#include "petsc-private/taolinesearchimpl.h"
typedef struct {
PetscReal *memory;
View
2 src/tao/linesearch/impls/unit/unit.c
@@ -1,6 +1,6 @@
#include "petscvec.h"
#include "taosolver.h"
-#include "tao-private/taolinesearch_impl.h"
+#include "petsc-private/taolinesearchimpl.h"
#undef __FUNCT__
#define __FUNCT__ "TaoLineSearchDestroy_Unit"
View
2 src/tao/linesearch/interface/dlregis_taolinesearch.c
@@ -1,5 +1,5 @@
#define TAOLINESEARCH_DLL
-#include "tao-private/taolinesearch_impl.h"
+#include "petsc-private/taolinesearchimpl.h"
PETSC_EXTERN PetscErrorCode TaoLineSearchCreate_Unit(TaoLineSearch);
View
2 src/tao/linesearch/interface/ftn-custom/ztaolinesearchf.c
@@ -1,5 +1,5 @@
#include "petsc-private/fortranimpl.h"
-#include "tao-private/taolinesearch_impl.h"
+#include "petsc-private/taolinesearchimpl.h"
#if defined(PETSC_HAVE_FORTRAN_CAPS)
#define taolinesearchsetobjectiveroutine_ TAOLINESEARCHSETOBJECTIVEROUTINE
View
2 src/tao/linesearch/interface/taolinesearch.c
@@ -1,6 +1,6 @@
#include "taosolver.h"
#include "taolinesearch.h" /*I "taolinesearch.h" I*/
-#include "tao-private/taolinesearch_impl.h"
+#include "petsc-private/taolinesearchimpl.h"
PetscBool TaoLineSearchInitialized = PETSC_FALSE;
PetscFunctionList TaoLineSearchList = NULL;
View
2 src/tao/makefile
@@ -1,4 +1,6 @@
#requiresscalar real
+
+SOURCEH = ../../include/petsc-private/taosolverimpl.h ../../include/taolinesearchimpl.h ../../include/taodmimpl.h
DIRS = interface util unconstrained constrained bound complementarity linesearch matrix leastsquares pde_constrained
LOCDIR = src/tao/
View
2 src/tao/pde_constrained/examples/tutorials/elliptic.c
@@ -1,4 +1,4 @@
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
#include "../src/tao/pde_constrained/impls/lcl/lcl.h"
#include "petsctime.h"
View
2 src/tao/pde_constrained/examples/tutorials/parabolic.c
@@ -1,4 +1,4 @@
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
#include "../src/tao/pde_constrained/impls/lcl/lcl.h"
#include "petsctime.h"
View
2 src/tao/pde_constrained/impls/lcl/lcl.h
@@ -1,7 +1,7 @@
#ifndef __TAO_LCL_H
#define __TAO_LCL_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
#include "petscis.h"
#define LCL_FORWARD1 0
#define LCL_ADJOINT1 1
View
2 src/tao/pde_constrained/impls/sqpcon/sqpcon.h
@@ -1,7 +1,7 @@
#ifndef __TAO_SQPCON_H
#define __TAO_SQPCON_H
-#include "private/taosolver_impl.h"
+#include "private/taosolverimpl.h"
#include "petscis.h"
typedef struct {
View
4 src/tao/unconstrained/impls/bmrm/bmrm.h
@@ -1,8 +1,8 @@
#ifndef __TAO_BMRM_H
#define __TAO_BMRM_H
-#include "tao-private/taosolver_impl.h"
-#include "math.h"
+#include "petsc-private/taosolverimpl.h"
+#include "petscmath.h"
#define BMRM_INFTY 1e30 /* single precision: ~\pm 10^{38.53}; PetscReal precision: ~\pm 10^{308.25} */
#define ALPHA_MIN 1e-10
View
2 src/tao/unconstrained/impls/cg/taocg.h
@@ -6,7 +6,7 @@
#ifndef __TAO_CG_H
#define __TAO_CG_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
typedef struct {
Vec G_old;
View
2 src/tao/unconstrained/impls/lmvm/lmvm.h
@@ -5,7 +5,7 @@
#ifndef __TAO_LMVM_H
#define __TAO_LMVM_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
typedef struct {
Mat M;
View
2 src/tao/unconstrained/impls/neldermead/neldermead.h
@@ -1,6 +1,6 @@
#ifndef __TAO_NELDERMEAD_H
#define __TAO_NELDERMEAD_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
typedef struct {
View
2 src/tao/unconstrained/impls/nls/nls.h
@@ -4,7 +4,7 @@ Context for a Newton line search method (unconstrained minimization)
#ifndef __TAO_NLS_H
#define __TAO_NLS_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
typedef struct {
Mat M;
View
2 src/tao/unconstrained/impls/ntl/ntl.h
@@ -5,7 +5,7 @@
#ifndef __TAO_NTL_H
#define __TAO_NTL_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
typedef struct {
Mat M;
View
2 src/tao/unconstrained/impls/ntr/ntr.h
@@ -4,7 +4,7 @@
#ifndef __TAO_NTR_H
#define __TAO_NTR_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
typedef struct {
Mat M;
View
2 src/tao/unconstrained/impls/owlqn/owlqn.h
@@ -5,7 +5,7 @@
#ifndef __TAO_OWLQN_H
#define __TAO_OWLQN_H
-#include "tao-private/taosolver_impl.h"
+#include "petsc-private/taosolverimpl.h"
typedef struct {
Mat M;

0 comments on commit 5b0d99a

Please sign in to comment.
Something went wrong with that request. Please try again.