Merge branch 'features/newarch' of https://github.com/NERSC/spack into features/newarch
This commit is contained in:
Mario Melara
commit
340ecf6e9a
2 changed files with 6 additions and 82 deletions
|
|
@ -210,13 +210,6 @@ def concretize_version(self, spec):
|
|||
|
||||
return True # Things changed
|
||||
|
||||
def _concretize_platform(self, arch, platform):
|
||||
if issubclass(arch.platform.__class__, spack.architecture.Platform):
|
||||
return False
|
||||
else:
|
||||
arch.platform = platform
|
||||
return True
|
||||
|
||||
def _concretize_operating_system(self, spec, platform):
|
||||
if spec.architecture.platform_os is not None:
|
||||
if isinstance(spec.architecture.platform_os,spack.architecture.OperatingSystem):
|
||||
|
|
@ -279,13 +272,9 @@ def concretize_architecture(self, spec):
|
|||
DAG has an architecture, then use the root otherwise use the defaults
|
||||
on the platform.
|
||||
"""
|
||||
|
||||
platform = spack.architecture.sys_type()
|
||||
|
||||
if spec.architecture is None:
|
||||
# Set the architecture to all defaults
|
||||
spec.architecture = spack.architecture.Arch(platform=platform, platform_os=None,
|
||||
target=None)
|
||||
spec.architecture = spack.architecture.Arch()
|
||||
return True
|
||||
#If there is a target and it is a tuple and has both filled return
|
||||
#False
|
||||
|
|
@ -294,7 +283,6 @@ def concretize_architecture(self, spec):
|
|||
print spec.architecture
|
||||
|
||||
ret = any((
|
||||
self._concretize_platform(spec.architecture, platform),
|
||||
self._concretize_operating_system(spec, platform),
|
||||
self._concretize_target(spec, platform)))
|
||||
|
||||
|
|
|
|||
|
|
@ -468,7 +468,7 @@ def _set_architecture(self, architecture):
|
|||
else:
|
||||
os = None
|
||||
target = architecture
|
||||
self.architecture = spack.architecture.Arch(platform, os, target)
|
||||
self.architecture = spack.architecture.Arch(os, target)
|
||||
|
||||
|
||||
def _add_dependency(self, spec):
|
||||
|
|
@ -1250,13 +1250,10 @@ def _is_valid_platform(self, platform, platform_list):
|
|||
return False
|
||||
|
||||
def _is_valid_target(self, target, platform):
|
||||
if target in platform.targets:
|
||||
return True
|
||||
return False
|
||||
return target in platform.targets
|
||||
|
||||
def _is_valid_os(self, os_string, platform):
|
||||
if os_string in platform.operating_sys:
|
||||
return True
|
||||
return False
|
||||
return os_string in platform.operating_sys
|
||||
|
||||
def add_target_from_string(self, target):
|
||||
if target is None:
|
||||
|
|
@ -1270,69 +1267,7 @@ def add_operating_system_from_string(self, os):
|
|||
else:
|
||||
self.architecture.platform_os = self.architecture.platform.operating_system(os)
|
||||
|
||||
#def add_architecture_from_string(self, arch):
|
||||
# """ The user is able to provide a architecture string of the form
|
||||
# platform-os-target. This string will be parsed by this function
|
||||
# and turn the architecture string into an architecture tuple of
|
||||
# platform, operating system and target processor classes.
|
||||
# The platform-os-target triplet can be delimited by a '-'. If any
|
||||
# portion of the architecture triplet is empty, spack will supply
|
||||
# the default. If the entire architecture field is blank then
|
||||
# defaults will be provided based off of the platform.
|
||||
# This happens in the concretize_architecture method in concretize.py
|
||||
|
||||
# e.g
|
||||
# =linux-ubuntu10-x84_64 -> (linux, ubuntu10, x86_64)
|
||||
|
||||
# =cray_xc-SuSE11-haswell -> (cray_xc, SuSE11, haswell)
|
||||
|
||||
# =bgq -> (bgq,
|
||||
# default_os,
|
||||
# default_target)
|
||||
|
||||
# =elcapitan -> (darwin, elcapitan, x86_64)
|
||||
|
||||
# =x86_64 -> (autodetected platform,
|
||||
# default_os,
|
||||
# x86_64)
|
||||
# """
|
||||
# if arch is None: return
|
||||
#
|
||||
# platform_list = spack.architecture.all_platforms()
|
||||
# platform_names = {plat.__name__.lower():plat for plat in platform_list}
|
||||
# Arch = spack.architecture.Arch
|
||||
# arch_list = arch.split("-")
|
||||
#
|
||||
# # Create instance of current platform, gets overwritten if user
|
||||
# # provided a platform spec.
|
||||
# platform = spack.architecture.sys_type()
|
||||
# target = None
|
||||
# platform_os = None
|
||||
|
||||
# for entry in arch_list:
|
||||
# if self._is_valid_platform(entry, platform_names):
|
||||
# # If entry is different from platform name then create it.
|
||||
# # else just keep the already instantiated platform class
|
||||
# if entry != platform.name:
|
||||
# platform = platform_dict[entry]() # Create instance of platform
|
||||
# elif self._is_valid_target(entry, platform):
|
||||
# target = platform.target(entry)
|
||||
# # check if os is valid by checking platform operating sys dict
|
||||
# elif self._is_valid_os(entry, platform):
|
||||
# platform_os = platform.operating_system(entry)
|
||||
# else:
|
||||
# # throw error since entry is unknown
|
||||
# raise UnknownArchitectureSpecError(entry)
|
||||
|
||||
# if target is None:
|
||||
# target = platform.target('default')
|
||||
# if platform_os is None:
|
||||
# platform_os = platform.operating_system('default_os')
|
||||
|
||||
# self.architecture = Arch(platform=platform,
|
||||
# platform_os=platform_os,
|
||||
# target=target)
|
||||
#
|
||||
def satisfies(self, other, deps=True, strict=False):
|
||||
"""determine if this spec satisfies all constraints of another.
|
||||
|
||||
|
|
@ -1378,6 +1313,7 @@ def satisfies(self, other, deps=True, strict=False):
|
|||
if not self.variants.satisfies(other.variants, strict=strict):
|
||||
return False
|
||||
|
||||
|
||||
# Target satisfaction is currently just class equality.
|
||||
# If not strict, None means unconstrained.
|
||||
if isinstance(self.architecture, basestring):
|
||||
|
|
|
|||
Loading…
Reference in a new issue