From 6cf1994ad72915433c0c690acb734e62c33746d0 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Wed, 17 Jun 2015 09:00:42 +0000
Subject: [PATCH] mtl4 included in svn tree and patch for umfpack added
---
AMDiS/src/solver/UmfPackSolver.h | 10 +++++-----
AMDiS/src/solver/itl/umfpack2_solve.hpp | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/AMDiS/src/solver/UmfPackSolver.h b/AMDiS/src/solver/UmfPackSolver.h
index 76159128..8c51c8eb 100644
--- a/AMDiS/src/solver/UmfPackSolver.h
+++ b/AMDiS/src/solver/UmfPackSolver.h
@@ -28,7 +28,7 @@
#include <iostream>
#include <boost/numeric/mtl/operation/two_norm.hpp>
-#include "solver/itl/umfpack2_solve.hpp"
+#include <boost/numeric/mtl/interface/umfpack_solve.hpp>
#include "solver/LinearSolver.h"
namespace AMDiS {
@@ -60,8 +60,8 @@ namespace AMDiS {
}
try {
- solver = new mtl::matrix::umfpack2::solver<MatrixType>(fullMatrix, symmetric_strategy, alloc_init);
- } catch (mtl::matrix::umfpack2::error& e) {
+ solver = new mtl::matrix::umfpack::solver<MatrixType>(fullMatrix, symmetric_strategy, alloc_init);
+ } catch (mtl::matrix::umfpack::error& e) {
ERROR_EXIT("UMFPACK_ERROR(factorize, %d) = %s\n", e.code, e.what());
}
}
@@ -75,7 +75,7 @@ namespace AMDiS {
int code = 0;
try {
code = (*solver)(x, b);
- } catch (mtl::matrix::umfpack2::error& e) {
+ } catch (mtl::matrix::umfpack::error& e) {
ERROR_EXIT("UMFPACK_ERROR(solve, %d) = %s\n", e.code, e.what());
}
@@ -103,7 +103,7 @@ namespace AMDiS {
LinearSolverInterface& oem;
private:
- mtl::matrix::umfpack2::solver<MatrixType> *solver;
+ mtl::matrix::umfpack::solver<MatrixType> *solver;
int store_symbolic;
diff --git a/AMDiS/src/solver/itl/umfpack2_solve.hpp b/AMDiS/src/solver/itl/umfpack2_solve.hpp
index 76943ee2..86b95abb 100644
--- a/AMDiS/src/solver/itl/umfpack2_solve.hpp
+++ b/AMDiS/src/solver/itl/umfpack2_solve.hpp
@@ -37,7 +37,7 @@ extern "C" {
namespace mtl { namespace matrix {
/// Namespace for Umfpack solver
- namespace umfpack2 {
+ namespace umfpack {
// conversion for value_type needed if not double or complex<double> (where possible)
template <typename Value> struct value {};
@@ -556,7 +556,7 @@ namespace mtl { namespace matrix {
template <typename Value, typename Parameters, typename VectorX, typename VectorB>
int umfpack2_solve(const compressed2D<Value, Parameters>& A, VectorX& x, const VectorB& b)
{
- umfpack2::solver<compressed2D<Value, Parameters> > solver(A);
+ umfpack::solver<compressed2D<Value, Parameters> > solver(A);
return solver(x, b);
}
--
GitLab