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
17a58ee0
Commit
17a58ee0
authored
9 years ago
by
Ben Boeckel
Browse files
Options
Downloads
Patches
Plain Diff
architecture: use uname if available
parent
f76b3890
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/spack/spack/architecture.py
+14
-1
14 additions, 1 deletion
lib/spack/spack/architecture.py
with
14 additions
and
1 deletion
lib/spack/spack/architecture.py
+
14
−
1
View file @
17a58ee0
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
##############################################################################
##############################################################################
import
os
import
os
import
platform
as
py_platform
import
platform
as
py_platform
import
subprocess
from
llnl.util.lang
import
memoized
from
llnl.util.lang
import
memoized
...
@@ -69,12 +70,24 @@ def get_mac_sys_type():
...
@@ -69,12 +70,24 @@ def get_mac_sys_type():
Version
(
mac_ver
).
up_to
(
2
),
py_platform
.
machine
())
Version
(
mac_ver
).
up_to
(
2
),
py_platform
.
machine
())
def
get_sys_type_from_uname
():
"""
Return the architecture from uname.
"""
try
:
arch_proc
=
subprocess
.
Popen
([
'
uname
'
,
'
-i
'
],
stdout
=
subprocess
.
PIPE
)
arch
,
_
=
arch_proc
.
communicate
()
return
arch
.
strip
()
except
:
return
None
@memoized
@memoized
def
sys_type
():
def
sys_type
():
"""
Returns a SysType for the current machine.
"""
"""
Returns a SysType for the current machine.
"""
methods
=
[
get_sys_type_from_spack_globals
,
methods
=
[
get_sys_type_from_spack_globals
,
get_sys_type_from_environment
,
get_sys_type_from_environment
,
get_mac_sys_type
]
get_mac_sys_type
,
get_sys_type_from_uname
]
# search for a method that doesn't return None
# search for a method that doesn't return None
sys_type
=
None
sys_type
=
None
...
...
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