Use spmScalMat and spmScal

Always set runtime path for Pastix
octave-user · Aug 18, 2024 · 00f321b · 00f321b
1 parent 3f6be23
commit 00f321b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/configure.ac b/src/configure.ac
@@ -63,7 +63,7 @@ LAPACK_LIBS="${LAPACK_LIBS:-`${PKG_CONFIG} --libs lapack`}"
 LAPACK_LIBS="${LAPACK_LIBS:--llapack}"
 STRUMPACK_LIBS="${STRUMPACK_LIBS:--lstrumpack -lscotch -lmetis -lscotcherr -lscotcherrexit -lopenblas -lgomp -lz}"
 PASTIX_INC="${PASTIX_INC:-`${PKG_CONFIG} --cflags pastix`}"
-PASTIX_LIBS="${PASTIX_LIBS:-`${PKG_CONFIG} --libs pastix`}"
+PASTIX_LIBS="${PASTIX_LIBS:-`${PKG_CONFIG} --libs pastix` `${PKG_CONFIG} --libs-only-L pastix | sed 's/-L\//-Wl,-rpath=\//g'`}"
 PASTIX_LIBS="${PASTIX_LIBS:--lpastix -lpastix_kernels -lspm -lhwloc}"
 PARDISO_INC="${PARDISO_INC:-`${PKG_CONFIG} --cflags mkl-dynamic-lp64-gomp`}"
 PARDISO_LIBS="${PARDISO_LIBS:-`${PKG_CONFIG} --libs mkl-dynamic-lp64-gomp`}"

diff --git a/src/pastix.cc b/src/pastix.cc
@@ -371,7 +371,7 @@ PastixObject<T>::PastixObject(const SparseMatrixType& A, const Options& options)
 
      normA = spmNorm(SpmFrobeniusNorm, &spm);
 
-     spmScalMatrix(1. / normA, &spm);
+     spmScal(1. / normA, &spm);
 
      rc = pastix_task_numfact(pastix_data, &spm);
 
@@ -429,7 +429,7 @@ bool PastixObject<T>::solve(DenseMatrixType& b, DenseMatrixType& x, pastix_trans
           return false;
      }
 
-     spmScalVector(spm.flttype, 1. / normA, b.numel(), b.fortran_vec(), 1);
+     spmScalMat(1. / normA, &spm, b.columns(), b.fortran_vec(), b.rows());
 
      x = b;