zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commented out the add_x_from_string methods since we don't need to worry about it. Also, changed the way architecture is set. Todd wanted to have users be able to input just frontend and/or backend in the architecture spec. This will be able to parse those inputs.

Browse Source
This commit is contained in:
Mario Melara 2016-04-08 12:46:44 -07:00
parent 01a36ab333
commit 3a281b2399
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/spack/spack/spec.py
View File

@ -465,7 +465,7 @@ def _set_architecture(self, architecture):
if '-' in architecture: if '-' in architecture:
os, target = architecture.split('-') os, target = architecture.split('-')
elif architecture == 'frontend' or architecture == 'backend': elif architecture in ['frontend','backend','fe','be']:
os = architecture os = architecture
target = architecture target = architecture
else: else:
@ -1302,28 +1302,17 @@ def _autospec(self, spec_like):
except SpecError: except SpecError:
return parse_anonymous_spec(spec_like, self.name) return parse_anonymous_spec(spec_like, self.name)
def _is_valid_platform(self, platform, platform_list): #def add_target_from_string(self, target):
if platform in platform_list: # if target is None:
return True # self.architecture.target = self.architecture.platform.target('default_target')
return False # else:
# self.architecture.target = self.architecture.platform.target(target)
def _is_valid_target(self, target, platform): #def add_operating_system_from_string(self, os):
return target in platform.targets # if os is None:
# self.architecture.platform_os = self.architecture.platform.operating_system('default_os')
def _is_valid_os(self, os_string, platform): # else:
return os_string in platform.operating_sys # self.architecture.platform_os = self.architecture.platform.operating_system(os)
def add_target_from_string(self, target):
if target is None:
self.architecture.target = self.architecture.platform.target('default_target')
else:
self.architecture.target = self.architecture.platform.target(target)
def add_operating_system_from_string(self, os):
if os is None:
self.architecture.platform_os = self.architecture.platform.operating_system('default_os')
else:
self.architecture.platform_os = self.architecture.platform.operating_system(os)
def satisfies(self, other, deps=True, strict=False): def satisfies(self, other, deps=True, strict=False):