Commit e99a80cf authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge branch 'bf/cuda' into 'master'

Bf/cuda

See merge request fsl/conda/installer!38
parents bdfc1a1c c1e081a6
# FSL installer script release history
# 1.10.2
- Fix to handling of the `--cuda` / `--no_cuda` options on macOS.
# 1.10.1
- Small adjustment to how the `devreleases.txt` file is parsed.
......
......@@ -54,7 +54,7 @@ log = logging.getLogger(__name__)
__absfile__ = op.abspath(__file__).rstrip('c')
__version__ = '1.10.1'
__version__ = '1.10.2'
"""Installer script version number. This must be updated
whenever a new version of the installer script is released.
"""
......@@ -2024,9 +2024,13 @@ def parse_args(argv=None):
# "-cuda-X.Y".
args.include_package = []
if args.cuda is not None:
# args.[cuda|no_cuda] won't be added on macOS
cuda = getattr(args, 'cuda', None)
no_cuda = getattr(args, 'no_cuda', False)
if cuda is not None:
args.include_package.append('fsl-*-cuda-{:0.1f}'.format(args.cuda))
if args.no_cuda or (args.cuda is not None):
if no_cuda or (cuda is not None):
args.exclude_package.append('fsl-*-cuda-*')
# accept local path for manifest and environment
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment