Skip to content
Snippets Groups Projects
Commit 5879f820 authored by Adam J. Stewart's avatar Adam J. Stewart
Browse files

Flake8 formatting changes

parent ee7ec4fa
No related branches found
No related tags found
No related merge requests found
...@@ -46,7 +46,7 @@ def set_up_license(pkg): ...@@ -46,7 +46,7 @@ def set_up_license(pkg):
# If not a file or variable, suggest a website for further info # If not a file or variable, suggest a website for further info
elif pkg.license_url: elif pkg.license_url:
tty.warn("A license is required to use %s. See %s for details" % tty.warn("A license is required to use %s. See %s for details" %
(pkg.name, pkg.license_url)) (pkg.name, pkg.license_url))
# If all else fails, you're on your own # If all else fails, you're on your own
else: else:
...@@ -132,4 +132,6 @@ def symlink_license(pkg): ...@@ -132,4 +132,6 @@ def symlink_license(pkg):
link_name = join_path(pkg.prefix, filename) link_name = join_path(pkg.prefix, filename)
if os.path.exists(target): if os.path.exists(target):
os.symlink(target, link_name) os.symlink(target, link_name)
tty.msg("Added local symlink %s to global license file" % link_name) tty.msg("Added local symlink %s to global license file" %
link_name)
from spack import * from spack import *
class AllineaForge(Package): class AllineaForge(Package):
"""Allinea Forge is the complete toolsuite for software development - with """Allinea Forge is the complete toolsuite for software development - with
everything needed to debug, profile, optimize, edit and build C, C++ and everything needed to debug, profile, optimize, edit and build C, C++ and
...@@ -17,13 +18,11 @@ class AllineaForge(Package): ...@@ -17,13 +18,11 @@ class AllineaForge(Package):
license_vars = ['ALLINEA_LICENCE_FILE', 'ALLINEA_LICENSE_FILE'] license_vars = ['ALLINEA_LICENCE_FILE', 'ALLINEA_LICENSE_FILE']
license_url = 'http://www.allinea.com/user-guide/forge/Installation.html' license_url = 'http://www.allinea.com/user-guide/forge/Installation.html'
def url_for_version(self, version): def url_for_version(self, version):
# TODO: add support for other architectures/distributions # TODO: add support for other architectures/distributions
url = "http://content.allinea.com/downloads/" url = "http://content.allinea.com/downloads/"
return url + "allinea-forge-%s-Redhat-6.0-x86_64.tar" % version return url + "allinea-forge-%s-Redhat-6.0-x86_64.tar" % version
def install(self, spec, prefix): def install(self, spec, prefix):
textinstall = which('textinstall.sh') textinstall = which('textinstall.sh')
textinstall('--accept-licence', prefix) textinstall('--accept-licence', prefix)
from spack import * from spack import *
class AllineaReports(Package): class AllineaReports(Package):
"""Allinea Performance Reports are the most effective way to characterize """Allinea Performance Reports are the most effective way to characterize
and understand the performance of HPC application runs. One single-page HTML and understand the performance of HPC application runs. One single-page
report elegantly answers a range of vital questions for any HPC site""" HTML report elegantly answers a range of vital questions for any HPC site
"""
homepage = "http://www.allinea.com/products/allinea-performance-reports" homepage = "http://www.allinea.com/products/allinea-performance-reports"
...@@ -16,13 +18,11 @@ class AllineaReports(Package): ...@@ -16,13 +18,11 @@ class AllineaReports(Package):
license_vars = ['ALLINEA_LICENCE_FILE', 'ALLINEA_LICENSE_FILE'] license_vars = ['ALLINEA_LICENCE_FILE', 'ALLINEA_LICENSE_FILE']
license_url = 'http://www.allinea.com/user-guide/reports/Installation.html' license_url = 'http://www.allinea.com/user-guide/reports/Installation.html'
def url_for_version(self, version): def url_for_version(self, version):
# TODO: add support for other architectures/distributions # TODO: add support for other architectures/distributions
url = "http://content.allinea.com/downloads/" url = "http://content.allinea.com/downloads/"
return url + "allinea-reports-%s-Redhat-6.0-x86_64.tar" % version return url + "allinea-reports-%s-Redhat-6.0-x86_64.tar" % version
def install(self, spec, prefix): def install(self, spec, prefix):
textinstall = which('textinstall.sh') textinstall = which('textinstall.sh')
textinstall('--accept-licence', prefix) textinstall('--accept-licence', prefix)
from spack import * from spack import *
import os import os
class Nag(Package): class Nag(Package):
"""The NAG Fortran Compiler.""" """The NAG Fortran Compiler."""
homepage = "http://www.nag.com/nagware/np.asp" homepage = "http://www.nag.com/nagware/np.asp"
...@@ -15,13 +16,11 @@ class Nag(Package): ...@@ -15,13 +16,11 @@ class Nag(Package):
license_vars = ['NAG_KUSARI_FILE'] license_vars = ['NAG_KUSARI_FILE']
license_url = 'http://www.nag.com/doc/inun/np61/lin-mac/klicence.txt' license_url = 'http://www.nag.com/doc/inun/np61/lin-mac/klicence.txt'
def url_for_version(self, version): def url_for_version(self, version):
# TODO: url and checksum are architecture dependent # TODO: url and checksum are architecture dependent
# TODO: We currently only support x86_64 # TODO: We currently only support x86_64
return 'http://www.nag.com/downloads/impl/npl6a%sna_amd64.tgz' % \ return 'http://www.nag.com/downloads/impl/npl6a%sna_amd64.tgz' % \
str(version).replace('.', '') str(version).replace('.', '')
def install(self, spec, prefix): def install(self, spec, prefix):
# Set installation directories # Set installation directories
......
from spack import * from spack import *
import os import os
class Pgi(Package): class Pgi(Package):
"""PGI optimizing multi-core x64 compilers for Linux, MacOS & Windows """PGI optimizing multi-core x64 compilers for Linux, MacOS & Windows
with support for debugging and profiling of local MPI processes. with support for debugging and profiling of local MPI processes.
...@@ -18,12 +19,18 @@ class Pgi(Package): ...@@ -18,12 +19,18 @@ class Pgi(Package):
version('16.3', '618cb7ddbc57d4e4ed1f21a0ab25f427') version('16.3', '618cb7ddbc57d4e4ed1f21a0ab25f427')
variant('network', default=True, description="Perform a network install") variant('network', default=True,
variant('single', default=False, description="Perform a single system install") description="Perform a network install")
variant('nvidia', default=False, description="Enable installation of optional NVIDIA components, such as CUDA") variant('single', default=False,
variant('amd', default=False, description="Enable installation of optional AMD components") description="Perform a single system install")
variant('java', default=False, description="Enable installation of Java Runtime Environment") variant('nvidia', default=False,
variant('mpi', default=False, description="Enable installation of Open MPI") description="Enable installation of optional NVIDIA components")
variant('amd', default=False,
description="Enable installation of optional AMD components")
variant('java', default=False,
description="Enable installation of Java Runtime Environment")
variant('mpi', default=False,
description="Enable installation of Open MPI")
# Licensing # Licensing
license_required = True license_required = True
...@@ -32,7 +39,6 @@ class Pgi(Package): ...@@ -32,7 +39,6 @@ class Pgi(Package):
license_vars = ['PGROUPD_LICENSE_FILE', 'LM_LICENSE_FILE'] license_vars = ['PGROUPD_LICENSE_FILE', 'LM_LICENSE_FILE']
license_url = 'http://www.pgroup.com/doc/pgiinstall.pdf' license_url = 'http://www.pgroup.com/doc/pgiinstall.pdf'
def install(self, spec, prefix): def install(self, spec, prefix):
# Enable the silent installation feature # Enable the silent installation feature
os.environ['PGI_SILENT'] = "true" os.environ['PGI_SILENT'] = "true"
...@@ -41,12 +47,13 @@ def install(self, spec, prefix): ...@@ -41,12 +47,13 @@ def install(self, spec, prefix):
if '+network' in spec and '~single' in spec: if '+network' in spec and '~single' in spec:
os.environ['PGI_INSTALL_TYPE'] = "network" os.environ['PGI_INSTALL_TYPE'] = "network"
os.environ['PGI_INSTALL_LOCAL_DIR'] = "%s/%s/share_objects" % (prefix, self.version) os.environ['PGI_INSTALL_LOCAL_DIR'] = "%s/%s/share_objects" % \
(prefix, self.version)
elif '+single' in spec and '~network' in spec: elif '+single' in spec and '~network' in spec:
os.environ['PGI_INSTALL_TYPE'] = "single" os.environ['PGI_INSTALL_TYPE'] = "single"
else: else:
msg = 'You must choose either a network install or a single system install.\n' msg = 'You must choose either a network install or a single '
msg += 'You cannot choose both.' msg += 'system install.\nYou cannot choose both.'
raise RuntimeError(msg) raise RuntimeError(msg)
if '+nvidia' in spec: if '+nvidia' in spec:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment