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
0840ffa3
Commit
0840ffa3
authored
9 years ago
by
Todd Gamblin
Browse files
Options
Downloads
Plain Diff
Merge pull request #698 from UCL-RITS/espresso
Fixes install issues on OS/X for Quantum Espresso
parents
e2a7b7e5
7430f914
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
var/spack/repos/builtin/packages/espresso/package.py
+10
-7
10 additions, 7 deletions
var/spack/repos/builtin/packages/espresso/package.py
with
10 additions
and
7 deletions
var/spack/repos/builtin/packages/espresso/package.py
+
10
−
7
View file @
0840ffa3
...
@@ -24,7 +24,7 @@ class Espresso(Package):
...
@@ -24,7 +24,7 @@ class Espresso(Package):
depends_on
(
'
fftw~mpi
'
,
when
=
'
~mpi
'
)
depends_on
(
'
fftw~mpi
'
,
when
=
'
~mpi
'
)
depends_on
(
'
fftw+mpi
'
,
when
=
'
+mpi
'
)
depends_on
(
'
fftw+mpi
'
,
when
=
'
+mpi
'
)
depends_on
(
'
scalapack
'
,
when
=
'
+scalapack+mpi
'
)
# TODO : + mpi needed to avoid false dependencies installation
depends_on
(
'
scalapack
'
,
when
=
'
+scalapack+mpi
'
)
# TODO : + mpi needed to avoid false dependencies installation
def
check_variants
(
self
,
spec
):
def
check_variants
(
self
,
spec
):
error
=
'
you cannot ask for
\'
+{variant}
\'
when
\'
+mpi
\'
is not active
'
error
=
'
you cannot ask for
\'
+{variant}
\'
when
\'
+mpi
\'
is not active
'
if
'
+scalapack
'
in
spec
and
'
~mpi
'
in
spec
:
if
'
+scalapack
'
in
spec
and
'
~mpi
'
in
spec
:
...
@@ -32,14 +32,11 @@ def check_variants(self, spec):
...
@@ -32,14 +32,11 @@ def check_variants(self, spec):
if
'
+elpa
'
in
spec
and
(
'
~mpi
'
in
spec
or
'
~scalapack
'
in
spec
):
if
'
+elpa
'
in
spec
and
(
'
~mpi
'
in
spec
or
'
~scalapack
'
in
spec
):
raise
RuntimeError
(
error
.
format
(
variant
=
'
elpa
'
))
raise
RuntimeError
(
error
.
format
(
variant
=
'
elpa
'
))
def
setup_environment
(
self
,
spack_env
,
run_env
):
# Espresso copies every executable in prefix without creating sub-folders
run_env
.
prepend_path
(
'
PATH
'
,
self
.
prefix
)
def
install
(
self
,
spec
,
prefix
):
def
install
(
self
,
spec
,
prefix
):
from
glob
import
glob
self
.
check_variants
(
spec
)
self
.
check_variants
(
spec
)
options
=
[
'
-prefix=%s
'
%
prefix
]
options
=
[
'
-prefix=%s
'
%
prefix
.
bin
]
if
'
+mpi
'
in
spec
:
if
'
+mpi
'
in
spec
:
options
.
append
(
'
--enable-parallel
'
)
options
.
append
(
'
--enable-parallel
'
)
...
@@ -65,5 +62,11 @@ def install(self, spec, prefix):
...
@@ -65,5 +62,11 @@ def install(self, spec, prefix):
configure
(
*
options
)
configure
(
*
options
)
make
(
'
all
'
)
make
(
'
all
'
)
make
(
'
install
'
)
if
spec
.
architecture
.
startswith
(
'
darwin
'
):
mkdirp
(
prefix
.
bin
)
for
filename
in
glob
(
"
bin/*.x
"
):
install
(
filename
,
prefix
.
bin
)
else
:
make
(
'
install
'
)
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