Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add two options diy #2771

Closed
wants to merge 1 commit into from
Closed

Add two options diy #2771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/spack/spack/cmd/common/arguments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,8 @@ def _specs(self, **kwargs):

_arguments['very_long'] = Args(
'-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 changes: 15 additions & 1 deletion lib/spack/spack/cmd/diy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@


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(
'-i', '--ignore-dependencies', action='store_true', dest='ignore_deps',
help="don't try to install dependencies of requested packages")
Expand All @@ -61,6 +65,10 @@ def diy(self, args):
if not args.spec:
tty.die("spack diy requires a package spec argument.")

if args.jobs is not None:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is a common argument with install, can you factor this and arg from install into spack.cmd.common.arguments? Look at the find, install, module, setup and spec commands do it for examples.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Such factoring has already been done (extensively) in #2664. Please base your changes off of that PR.

if args.jobs <= 0:
tty.die("The -j option must be a positive integer!")

specs = spack.cmd.parse_specs(args.spec)
if len(specs) > 1:
tty.die("spack diy only takes one spec.")
Expand All @@ -83,13 +91,19 @@ def diy(self, args):
tty.msg("Uninstall or try adding a version suffix for this DIY build.")
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.
package.stage = DIYStage(os.getcwd())
package.stage = DIYStage(source_path)

# TODO: make this an argument, not a global.
spack.do_checksum = False

package.do_install(
make_jobs=args.jobs,
keep_prefix=args.keep_prefix,
install_deps=not args.ignore_deps,
verbose=not args.quiet,
Expand Down
4 changes: 1 addition & 3 deletions lib/spack/spack/cmd/install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ def setup_parser(subparser):
alternatively one can decide to install only the package or only
the dependencies"""
)
subparser.add_argument(
'-j', '--jobs', action='store', type=int,
help="explicitly set number of make jobs. default is #cpus")
arguments.add_common_arguments(subparser, ['jobs'])
subparser.add_argument(
'--keep-prefix', action='store_true', dest='keep_prefix',
help="don't remove the install prefix if installation fails")
Expand Down