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
a233ed2d
Commit
a233ed2d
authored
8 years ago
by
Nicolas Richart
Browse files
Options
Downloads
Patches
Plain Diff
changes scotch package to make he coverage test pass
parent
a51566ec
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
var/spack/repos/builtin/packages/scotch/package.py
+8
-10
8 additions, 10 deletions
var/spack/repos/builtin/packages/scotch/package.py
with
8 additions
and
10 deletions
var/spack/repos/builtin/packages/scotch/package.py
+
8
−
10
View file @
a233ed2d
...
@@ -23,7 +23,6 @@
...
@@ -23,7 +23,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
##############################################################################
import
os
import
os
import
re
from
spack
import
*
from
spack
import
*
...
@@ -60,11 +59,9 @@ class Scotch(Package):
...
@@ -60,11 +59,9 @@ class Scotch(Package):
def
url_for_version
(
self
,
version
):
def
url_for_version
(
self
,
version
):
return
super
(
Scotch
,
self
).
url_for_version
(
version
)
return
super
(
Scotch
,
self
).
url_for_version
(
version
)
@when
(
"
:6.0.0
"
)
def
url_for_version
(
self
,
version
):
def
url_for_version
(
self
,
version
):
if
version
<=
Version
(
'
6.0.0
'
):
return
'
%s/scotch_%s_esmumps.tar.gz
'
%
(
Scotch
.
base_url
,
version
)
return
'
%s/scotch_%s_esmumps.tar.gz
'
%
(
Scotch
.
base_url
,
version
)
else
:
return
super
(
Scotch
,
self
).
url_for_version
(
version
)
def
patch
(
self
):
def
patch
(
self
):
self
.
configure
()
self
.
configure
()
...
@@ -168,15 +165,16 @@ def install(self, spec, prefix):
...
@@ -168,15 +165,16 @@ def install(self, spec, prefix):
# version prior to 6.0.0 there is no separated targets force
# version prior to 6.0.0 there is no separated targets force
# ptesmumps, this library is built by the ptscotch target. This
# ptesmumps, this library is built by the ptscotch target. This
# should explain the test for the can_make_parallel variable
# should explain the test for the can_make_parallel variable
can_make_parallel
=
not
(
target
==
'
ptesmumps
'
can_make_parallel
=
\
or
(
self
.
spec
.
version
<
Version
(
'
6.0.0
'
)
not
(
target
==
'
ptesmumps
'
or
and
target
==
'
ptscotch
'
))
(
self
.
spec
.
version
<
Version
(
'
6.0.0
'
)
and
target
==
'
ptscotch
'
))
make
(
target
,
parallel
=
can_make_parallel
)
make
(
target
,
parallel
=
can_make_parallel
)
# todo change this to take into account darwin systems
# todo change this to take into account darwin systems
lib_ext
=
'
.so
'
if
'
+shared
'
in
self
.
spec
else
'
.a
'
lib_ext
=
'
.so
'
if
'
+shared
'
in
self
.
spec
else
'
.a
'
# It seams easier to remove metis wrappers from the folder that will be
installed than
# It seams easier to remove metis wrappers from the folder that will be
# to tweak the Makefiles
#
installed than
to tweak the Makefiles
if
'
+metis
'
not
in
self
.
spec
:
if
'
+metis
'
not
in
self
.
spec
:
with
working_dir
(
'
lib
'
):
with
working_dir
(
'
lib
'
):
lib_ext
=
'
.so
'
if
'
+shared
'
in
self
.
spec
else
'
.a
'
lib_ext
=
'
.so
'
if
'
+shared
'
in
self
.
spec
else
'
.a
'
...
...
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