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

Add -d and -j options to diy

Browse Source 
Also add -j to the common arguments
This commit is contained in:
Matthew Krafczyk
2017-01-06 22:20:56 -05:00
parent aa3cc0ea81
commit dcab47cdc0
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/cmd/common/arguments.py
View File

@@ -105,3 +105,7 @@ def _specs(self, **kwargs):
_arguments['very_long'] = Args( _arguments['very_long'] = Args(
'-L', '--very-long', action='store_true', '-L', '--very-long', action='store_true',
help='Show full dependency hashes as well as versions.') help='Show full dependency hashes as well as versions.')
_arguments['jobs'] = Args(
'-j', '--jobs', action='store', type=int, dest="jobs",
help="Explicitly set number of make jobs. Default is #cpus.")

16
lib/spack/spack/cmd/diy.py
View File

@@ -38,6 +38,10 @@
def setup_parser(subparser): def setup_parser(subparser):
arguments.add_common_arguments(subparser, ['jobs'])
subparser.add_argument(
'-d', '--source-path', dest='source_path', default=None,
help="Path to the source directory. Defaults to the current directory")
subparser.add_argument( subparser.add_argument(
'-i', '--ignore-dependencies', action='store_true', dest='ignore_deps', '-i', '--ignore-dependencies', action='store_true', dest='ignore_deps',
help="Do not try to install dependencies of requested packages.") help="Do not try to install dependencies of requested packages.")
@@ -62,6 +66,10 @@ def diy(self, args):
if not args.spec: if not args.spec:
tty.die("spack diy requires a package spec argument.") tty.die("spack diy requires a package spec argument.")
if args.jobs is not None:
if args.jobs <= 0:
tty.die("The -j option must be a positive integer!")
specs = spack.cmd.parse_specs(args.spec) specs = spack.cmd.parse_specs(args.spec)
if len(specs) > 1: if len(specs) > 1:
tty.die("spack diy only takes one spec.") tty.die("spack diy only takes one spec.")
@@ -91,13 +99,19 @@ def diy(self, args):
tty.msg("Uninstall or try adding a version suffix for this DIY build.") tty.msg("Uninstall or try adding a version suffix for this DIY build.")
sys.exit(1) sys.exit(1)
source_path = args.source_path
if source_path is None:
source_path = os.getcwd()
source_path = os.path.abspath(source_path)
# Forces the build to run out of the current directory. # Forces the build to run out of the current directory.
package.stage = DIYStage(os.getcwd()) package.stage = DIYStage(source_path)
# TODO: make this an argument, not a global. # TODO: make this an argument, not a global.
spack.do_checksum = False spack.do_checksum = False
package.do_install( package.do_install(
make_jobs=args.jobs,
keep_prefix=args.keep_prefix, keep_prefix=args.keep_prefix,
install_deps=not args.ignore_deps, install_deps=not args.ignore_deps,
verbose=not args.quiet, verbose=not args.quiet,

4
lib/spack/spack/cmd/install.py
View File

@@ -54,9 +54,7 @@ def setup_parser(subparser):
Alternatively one can decide to install only the package or only Alternatively one can decide to install only the package or only
the dependencies.""" the dependencies."""
) )
subparser.add_argument( arguments.add_common_arguments(subparser, ['jobs'])
'-j', '--jobs', action='store', type=int,
help="Explicitly set number of make jobs. Default is #cpus.")
subparser.add_argument( subparser.add_argument(
'--keep-prefix', action='store_true', dest='keep_prefix', '--keep-prefix', action='store_true', dest='keep_prefix',
help="Don't remove the install prefix if installation fails.") help="Don't remove the install prefix if installation fails.")