Commit e18b4ac5 authored by Martin Marinov's avatar Martin Marinov
Browse files

Fixed some CoMISo issues with the latest merge from VCI.

parent e773b81a
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
#define COMISO_HSL_AVAILABLE 0 #define COMISO_HSL_AVAILABLE 0
#define COMISO_PETSC_AVAILABLE 0 #define COMISO_PETSC_AVAILABLE 0
#define COMISO_TAO_AVAILABLE 0 #define COMISO_TAO_AVAILABLE 0
#define COMISO_IPOPT_AVAILABLE 0 #define COMISO_IPOPT_AVAILABLE 1
#define COMISO_IPOPTLEAN_AVAILABLE 1
#define COMISO_MUMPS_AVAILABLE 1 #define COMISO_MUMPS_AVAILABLE 1
#define COMISO_METIS_AVAILABLE 1 #define COMISO_METIS_AVAILABLE 1
#define COMISO_CGAL_AVAILABLE 1 #define COMISO_CGAL_AVAILABLE 1
......
...@@ -26,6 +26,7 @@ SET(my_headers ...@@ -26,6 +26,7 @@ SET(my_headers
${CMAKE_CURRENT_SOURCE_DIR}/NProblemInterface.hh ${CMAKE_CURRENT_SOURCE_DIR}/NProblemInterface.hh
${CMAKE_CURRENT_SOURCE_DIR}/NProblemInterfaceADOLC.hh ${CMAKE_CURRENT_SOURCE_DIR}/NProblemInterfaceADOLC.hh
${CMAKE_CURRENT_SOURCE_DIR}/NProblemInterfaceDCO.hh ${CMAKE_CURRENT_SOURCE_DIR}/NProblemInterfaceDCO.hh
${CMAKE_CURRENT_SOURCE_DIR}/NProblemIPOPT.hh
${CMAKE_CURRENT_SOURCE_DIR}/NPTiming.hh ${CMAKE_CURRENT_SOURCE_DIR}/NPTiming.hh
${CMAKE_CURRENT_SOURCE_DIR}/QuadraticProblem.hh ${CMAKE_CURRENT_SOURCE_DIR}/QuadraticProblem.hh
${CMAKE_CURRENT_SOURCE_DIR}/SuperSparseMatrixT.hh ${CMAKE_CURRENT_SOURCE_DIR}/SuperSparseMatrixT.hh
...@@ -67,6 +68,7 @@ SET(my_sources ...@@ -67,6 +68,7 @@ SET(my_sources
${CMAKE_CURRENT_SOURCE_DIR}/NPDerivativeChecker.cc ${CMAKE_CURRENT_SOURCE_DIR}/NPDerivativeChecker.cc
${CMAKE_CURRENT_SOURCE_DIR}/NPLinearConstraints.cc ${CMAKE_CURRENT_SOURCE_DIR}/NPLinearConstraints.cc
${CMAKE_CURRENT_SOURCE_DIR}/NProblemInterface.cc ${CMAKE_CURRENT_SOURCE_DIR}/NProblemInterface.cc
${CMAKE_CURRENT_SOURCE_DIR}/NProblemIPOPTc.cc
${CMAKE_CURRENT_SOURCE_DIR}/NPTiming.cc ${CMAKE_CURRENT_SOURCE_DIR}/NPTiming.cc
${CMAKE_CURRENT_SOURCE_DIR}/TAOSolver.cc ${CMAKE_CURRENT_SOURCE_DIR}/TAOSolver.cc
${CMAKE_CURRENT_SOURCE_DIR}/TapeIDSingleton.cc ${CMAKE_CURRENT_SOURCE_DIR}/TapeIDSingleton.cc
......
...@@ -17,6 +17,7 @@ SET(my_t_impls ...@@ -17,6 +17,7 @@ SET(my_t_impls
${CMAKE_CURRENT_SOURCE_DIR}/ConstrainedSolverT.cc ${CMAKE_CURRENT_SOURCE_DIR}/ConstrainedSolverT.cc
${CMAKE_CURRENT_SOURCE_DIR}/EigenLDLTSolverT.cc ${CMAKE_CURRENT_SOURCE_DIR}/EigenLDLTSolverT.cc
${CMAKE_CURRENT_SOURCE_DIR}/Eigen_ToolsT.cc ${CMAKE_CURRENT_SOURCE_DIR}/Eigen_ToolsT.cc
${CMAKE_CURRENT_SOURCE_DIR}/GMM_ToolsT.cc
${CMAKE_CURRENT_SOURCE_DIR}/IterativeSolverT.cc ${CMAKE_CURRENT_SOURCE_DIR}/IterativeSolverT.cc
${CMAKE_CURRENT_SOURCE_DIR}/SparseQRSolverT.cc ${CMAKE_CURRENT_SOURCE_DIR}/SparseQRSolverT.cc
${CMAKE_CURRENT_SOURCE_DIR}/MISolverT.cc ${CMAKE_CURRENT_SOURCE_DIR}/MISolverT.cc
......
This diff is collapsed.
...@@ -1281,34 +1281,3 @@ void gmm_to_cholmod( const MatrixT& _A, cholmod_sparse* &_AC, cholmod_common* _c ...@@ -1281,34 +1281,3 @@ void gmm_to_cholmod( const MatrixT& _A, cholmod_sparse* &_AC, cholmod_common* _c
//============================================================================= //=============================================================================
} // namespace COMISO_GMM } // namespace COMISO_GMM
//============================================================================= //=============================================================================
#include <CoMISo/Config/GmmTypes.hh>
#include <CoMISo/Config/StdTypes.hh>
// explicit instantiation
namespace COMISO_GMM
{
using namespace COMISO_STD;
template void factored_to_quadratic(WSRowMatrix&, WSColMatrix&, DoubleVector&);
template void factored_to_quadratic(WSRowMatrix&, RSColMatrix&, DoubleVector&);
template void factored_to_quadratic(RSRowMatrix&, RSColMatrix&, DoubleVector&);
template void eliminate_csc_vars(const IntVector&, const DoubleVector&,
CSCMatrix&, DoubleVector&, DoubleVector&);
template void eliminate_csc_vars2(const IntVector&, const DoubleVector&,
CSCMatrix&, DoubleVector&, DoubleVector&);
template void eliminate_csc_vars2(const UIntVector&, const DoubleVector&,
CSCMatrix&, DoubleVector&, DoubleVector&);
template double residuum_norm(CSCMatrix& , DoubleVector&, DoubleVector&);
template void fix_var_csc_symmetric(const unsigned int, const double,
CSCMatrix&, DoubleVector&, DoubleVector&);
template void eliminate_vars_idx(const IntVector&, IntVector&, int, int);
}//namespace COMISO_GMM
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment