Backport a bunch of changes from hmat to start 2D updates

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
+  )

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;