|
version 1.11, 2013/11/19 23:41:02
|
version 1.12, 2013/11/22 01:58:25
|
| Line 554 def configureComps(defs, mDefs): |
|
| Line 554 def configureComps(defs, mDefs): |
|
| hasgfort = bool(0) | hasgfort = bool(0) |
| | |
| # Try icc. | # Try icc. |
| cmd = 'icc -V 2>&1' |
cmd = 'icc --version 2>&1' |
| try: | try: |
| ret = check_output(cmd, shell=True) | ret = check_output(cmd, shell=True) |
| ret = ret.decode("utf-8") | ret = ret.decode("utf-8") |
| Line 563 def configureComps(defs, mDefs): |
|
| Line 563 def configureComps(defs, mDefs): |
|
| rv = bool(1) | rv = bool(1) |
| | |
| if not rv: | if not rv: |
| regexp = re.compile(r".+Version\s+(\d+)[.](\d+)", re.DOTALL) |
regexp = re.compile(r"\s*\S+\s+\S+\s+(\d+)[.](\d+)", re.DOTALL) |
| matchobj = regexp.match(ret) | matchobj = regexp.match(ret) |
| if matchobj is None: | if matchobj is None: |
| raise Exception('unexpectedIccRet', ret) | raise Exception('unexpectedIccRet', ret) |
| Line 595 def configureComps(defs, mDefs): |
|
| Line 595 def configureComps(defs, mDefs): |
|
| hasgcc = bool(1) | hasgcc = bool(1) |
| | |
| # Try ifort. | # Try ifort. |
| cmd = 'ifort -V 2>&1' |
cmd = 'ifort --version 2>&1' |
| try: | try: |
| ret = check_output(cmd, shell=True) | ret = check_output(cmd, shell=True) |
| ret = ret.decode("utf-8") | ret = ret.decode("utf-8") |
| Line 604 def configureComps(defs, mDefs): |
|
| Line 604 def configureComps(defs, mDefs): |
|
| rv = bool(1) | rv = bool(1) |
| | |
| if not rv: | if not rv: |
| regexp = re.compile(r".+Version\s+(\d+)\.(\d+)", re.DOTALL) |
regexp = re.compile(r"\s*\S+\s+\S+\s+(\d+)\.(\d+)", re.DOTALL) |
| matchobj = regexp.match(ret) | matchobj = regexp.match(ret) |
| if matchobj is None: | if matchobj is None: |
| raise Exception('unexpectedIfortRet', ret) | raise Exception('unexpectedIfortRet', ret) |
Return to
localize.py
CVS log
Up to [Development] / JSOC