Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Spack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eic_tools
Spack
Commits
8c165494
Unverified
Commit
8c165494
authored
6 years ago
by
Satish Balay
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
hypre: add superlu-dist variant (#10985)
- add a patch to fix build error with superlu-dist
parent
d7e984bc
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
var/spack/repos/builtin/packages/hypre/package.py
+11
-0
11 additions, 0 deletions
var/spack/repos/builtin/packages/hypre/package.py
var/spack/repos/builtin/packages/hypre/superlu-dist-link.patch
+13
-0
13 additions, 0 deletions
...pack/repos/builtin/packages/hypre/superlu-dist-link.patch
with
24 additions
and
0 deletions
var/spack/repos/builtin/packages/hypre/package.py
+
11
−
0
View file @
8c165494
...
@@ -38,6 +38,8 @@ class Hypre(Package):
...
@@ -38,6 +38,8 @@ class Hypre(Package):
# SuperluDist have conflicting headers with those in Hypre
# SuperluDist have conflicting headers with those in Hypre
variant
(
'
internal-superlu
'
,
default
=
True
,
variant
(
'
internal-superlu
'
,
default
=
True
,
description
=
"
Use internal Superlu routines
"
)
description
=
"
Use internal Superlu routines
"
)
variant
(
'
superlu-dist
'
,
default
=
True
,
description
=
'
Activates support for SuperluDist
'
)
variant
(
'
int64
'
,
default
=
False
,
variant
(
'
int64
'
,
default
=
False
,
description
=
"
Use 64bit integers
"
)
description
=
"
Use 64bit integers
"
)
variant
(
'
mpi
'
,
default
=
True
,
description
=
'
Enable MPI support
'
)
variant
(
'
mpi
'
,
default
=
True
,
description
=
'
Enable MPI support
'
)
...
@@ -50,10 +52,12 @@ class Hypre(Package):
...
@@ -50,10 +52,12 @@ class Hypre(Package):
# Patch to build shared libraries on Darwin
# Patch to build shared libraries on Darwin
patch
(
'
darwin-shared-libs-for-hypre-2.13.0.patch
'
,
when
=
'
+shared@2.13.0 platform=darwin
'
)
patch
(
'
darwin-shared-libs-for-hypre-2.13.0.patch
'
,
when
=
'
+shared@2.13.0 platform=darwin
'
)
patch
(
'
darwin-shared-libs-for-hypre-2.14.0.patch
'
,
when
=
'
+shared@2.14.0 platform=darwin
'
)
patch
(
'
darwin-shared-libs-for-hypre-2.14.0.patch
'
,
when
=
'
+shared@2.14.0 platform=darwin
'
)
patch
(
'
superlu-dist-link.patch
'
)
depends_on
(
"
mpi
"
,
when
=
'
+mpi
'
)
depends_on
(
"
mpi
"
,
when
=
'
+mpi
'
)
depends_on
(
"
blas
"
)
depends_on
(
"
blas
"
)
depends_on
(
"
lapack
"
)
depends_on
(
"
lapack
"
)
depends_on
(
'
superlu-dist
'
,
when
=
'
+superlu-dist+mpi
'
)
# Patch to build shared libraries on Darwin does not apply to
# Patch to build shared libraries on Darwin does not apply to
# versions before 2.13.0
# versions before 2.13.0
...
@@ -100,6 +104,13 @@ def install(self, spec, prefix):
...
@@ -100,6 +104,13 @@ def install(self, spec, prefix):
configure_args
.
append
(
"
--without-mli
"
)
configure_args
.
append
(
"
--without-mli
"
)
configure_args
.
append
(
"
--without-fei
"
)
configure_args
.
append
(
"
--without-fei
"
)
if
'
superlu-dist
'
in
self
.
spec
:
configure_args
.
append
(
'
--with-dsuperlu-include=%s
'
%
spec
[
'
superlu-dist
'
].
prefix
.
include
)
configure_args
.
append
(
'
--with-dsuperlu-lib=%s
'
%
spec
[
'
superlu-dist
'
].
libs
)
configure_args
.
append
(
'
--with-dsuperlu
'
)
if
'
+debug
'
in
self
.
spec
:
if
'
+debug
'
in
self
.
spec
:
configure_args
.
append
(
"
--enable-debug
"
)
configure_args
.
append
(
"
--enable-debug
"
)
else
:
else
:
...
...
This diff is collapsed.
Click to expand it.
var/spack/repos/builtin/packages/hypre/superlu-dist-link.patch
0 → 100644
+
13
−
0
View file @
8c165494
diff --git a/src/lib/Makefile b/src/lib/Makefile
index f49d1683..615947b0 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -58,7 +58,7 @@
$(BLASFILES)\
$(LAPACKFILES)
SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX}
-SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\
+SOLIBS = ${DSUPERLU_LIBS} ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\
${BLASLIBDIRS} ${BLASLIBS} ${LIBS} ${FLIBS}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment