From d69836ef71fa7986584f87a3ce3c8741e32491a1 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Mon, 20 Jun 2016 11:06:39 -0400
Subject: [PATCH] Backport a bunch of changes from hmat to start 2D updates
---
CMakeLists.txt | 4 ++--
z_spm_genrhs.c | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0d102d7..4dbd384a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,11 +43,11 @@ add_custom_target(spm_headers_tgt
DEPENDS ${spm_headers} )
set_source_files_properties(
- spm/spm.c
+ spm.c
PROPERTIES DEPENDS spm_headers_tgt
)
set(PASTIX_LIB_SRCS
${PASTIX_LIB_SRCS}
${spm_sources}
- )
\ No newline at end of file
+ )
diff --git a/z_spm_genrhs.c b/z_spm_genrhs.c
index f0f6ee19..dc099b0e 100644
--- a/z_spm_genrhs.c
+++ b/z_spm_genrhs.c
@@ -374,7 +374,9 @@ z_spmCheckAxb( int nrhs,
*/
if ( x0 != NULL ) {
normX0 = LAPACKE_zlange( LAPACK_COL_MAJOR, 'I', spm->n, nrhs, x0, ldx0 );
- core_zgeadd( PastixNoTrans, spm->n, nrhs, -1., x, ldx, x0, ldx0 );
+ core_zgeadd( PastixNoTrans, spm->n, nrhs,
+ -1., x, ldx,
+ 1., x0, ldx0 );
normR = LAPACKE_zlange( LAPACK_COL_MAJOR, 'I', spm->n, nrhs, x0, ldx0 );
forward = normR / normX0;
--
GitLab