Skip to content

Commit

Permalink
[hypre] do not skip hypre and superlu in CI
Browse files Browse the repository at this point in the history
Hypre does not include a SuperLU distribution since version 2.13.0 and so they libraries should no longer be in conflict.
  • Loading branch information
albertziegenhagel committed Aug 31, 2020
1 parent ea26c6c commit 81818e9
Showing 1 changed file with 4 additions and 23 deletions.
27 changes: 4 additions & 23 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -568,9 +568,6 @@ hpx:x64-linux=fail
hwloc:arm64-windows=fail
hwloc:arm-uwp=fail
hwloc:x64-uwp=fail
# hypre has a conflict with 'superlu' port
hypre:x64-linux=skip
hypre:x64-osx=skip
icu:arm64-windows=fail
icu:arm-uwp=fail
icu:x64-uwp=fail
Expand Down Expand Up @@ -1655,26 +1652,10 @@ stxxl:x64-uwp=fail
sundials:arm64-windows=fail
sundials:x64-windows=fail
sundials:x86-windows=fail
# Conflicts between ports:
#The following files are already installed in C:/agent/_work/1/s/installed/x64-windows-static
# and are in conflict with superlu:x64-windows-static
#
#Installed by hypre:x64-windows-static
# include/slu_Cnames.h
# include/slu_cdefs.h
# include/slu_dcomplex.h
# include/slu_ddefs.h
# include/slu_scomplex.h
# include/slu_sdefs.h
# include/slu_util.h
# include/slu_zdefs.h
# include/supermatrix.h
superlu:arm-uwp=skip
superlu:arm-windows=skip
superlu:arm64-windows=skip
superlu:x64-uwp=skip
superlu:x64-windows-static=skip
superlu:x64-windows=skip
superlu:arm-uwp=fail
superlu:arm-windows=fail
superlu:arm64-windows=fail
superlu:x64-uwp=fail
systemc:arm64-windows=fail
systemc:arm-uwp=fail
systemc:x64-uwp=fail
Expand Down

0 comments on commit 81818e9

Please sign in to comment.