Skip to content

Commit 628bc49

Browse files
committed
Fix superlu_dist install so PETSc detects it
This simplifies the logic in petsc.py and makes the superlu_dist install a bit more portable/usable
1 parent a2c124c commit 628bc49

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

pkgs/petsc/petsc.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,9 @@ def configure(ctx, stage_args):
108108
conf_lines.append('--with-suitesparse-include=${SUITESPARSE_DIR}/include/suitesparse')
109109
conf_lines.append('--with-suitesparse-lib=[${SUITESPARSE_DIR}/lib/libumfpack.a,libklu.a,libcholmod.a,libbtf.a,libccolamd.a,libcolamd.a,libcamd.a,libamd.a,libsuitesparseconfig.a]')
110110

111-
if 'SUPERLU_DIST' in ctx.dependency_dir_vars:
112-
conf_lines.append('--with-superlu_dist=1')
113-
conf_lines.append('--with-superlu_dist-include=${SUPERLU_DIST_DIR}/include/superlu_dist')
114-
conf_lines.append('--with-superlu_dist-lib=[${SUPERLU_DIST_DIR}/lib/libsuperlu_dist.a]')
115-
116111
for dep_var in ctx.dependency_dir_vars:
117112
if dep_var in ['BLAS', 'LAPACK', 'OPENBLAS', 'PARMETIS',
118-
'SCOTCH', 'TRILINOS', 'SUITESPARSE', 'SUPERLU_DIST']:
113+
'SCOTCH', 'TRILINOS', 'SUITESPARSE']:
119114
continue
120115
if dep_var == 'MPI':
121116
conf_lines.append('--with-mpi-compilers')

pkgs/superlu_dist/superlu_dist.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ build_stages:
4343
bash: |
4444
mkdir -p ${ARTIFACT}/lib/
4545
mkdir -p ${ARTIFACT}/include/superlu_dist
46-
cp -f lib/*.a ${ARTIFACT}/lib/
46+
cp -f lib/libsuperlu_dist.a ${ARTIFACT}/lib/
47+
ln -s ./libsuperlu_dist.a ${ARTIFACT}/lib/libsuperlu_dist_3.3.a
4748
cp -f SRC/*.h ${ARTIFACT}/include/superlu_dist/
49+
cp -f SRC/*.h ${ARTIFACT}/include/
4850
4951
- when: not without_check
5052
name: check

0 commit comments

Comments
 (0)