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

Make MesonNinja respect the toolchainopts with buildtype as well as --debug and --optimization flags #3454

Merged
merged 7 commits into from
Oct 11, 2024
Merged

Make MesonNinja respect the toolchainopts with buildtype as well as --debug and --optimization flags #3454

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f54380c
Make mesonninja easyblock respect toolchainopts
Micket Sep 20, 2024
a75f53d
Update easybuild/easyblocks/generic/mesonninja.py
Micket Sep 27, 2024
23d8254
Fix use of property correctly, removing extra paranthesis
Micket Sep 27, 2024
17909f2
Fix --debug flag.
Micket Sep 27, 2024
100cbb6
Add NDEBUG flag to meson builds
Micket Oct 1, 2024
ec8642e
Make mesons optimization/debug flags mutually exclusive with buildtype
Micket Oct 10, 2024
9742934
Add opt variant to optimization levels
Micket Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion easybuild/easyblocks/generic/mesonninja.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,40 @@ def extra_options(extra_vars=None):
extra_vars.update({
'build_dir': [None, "build_dir to pass to meson", CUSTOM],
'build_cmd': [DEFAULT_BUILD_CMD, "Build command to use", CUSTOM],
'build_type': [None, "Build type for meson, e.g. release."
"Defaults to 'release', 'debugoptimized' or 'debug' depending on "
"toolchainopts[debug,noopt]", CUSTOM],
'configure_cmd': [DEFAULT_CONFIGURE_CMD, "Configure command to use", CUSTOM],
'install_cmd': [DEFAULT_INSTALL_CMD, "Install command to use", CUSTOM],
'separate_build_dir': [True, "Perform build in a separate directory", CUSTOM],
})
return extra_vars

@property
def build_type(self):
"""Build type set in the EasyConfig with default determined by toolchainopts"""
build_type = self.cfg.get('build_type')
# While we do set optimization and debug flag separately, build scripts may be adding additional
# defines and flags based on the build_type as well so we pick the closest match.
if build_type is None:
if self.toolchain.options.get('noopt', None): # also implies debug but is the closest match
build_type = 'debug'
elif self.toolchain.options.get('debug', None):
build_type = 'debugoptimized'
else:
build_type = 'release'
return build_type

@property
def optimization(self):
"""Optimization level"""
if self.toolchain.options.get('noopt', False):
return 0
elif self.toolchain.options.get('lowopt', False):
return 1
else:
return 2

Copy link
Member

Choose a reason for hiding this comment

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

wait, what if we have 'opt': True (as in, use -O3)?
surely this needs another elif?

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
@property
def optimization(self):
"""Optimization level"""
if self.toolchain.options.get('noopt', False):
return 0
elif self.toolchain.options.get('lowopt', False):
return 1
else:
return 2
@property
def optimization(self):
"""Optimization level"""
if self.toolchain.options.get('noopt', False):
return 0
elif self.toolchain.options.get('lowopt', False):
return 1
elif self.toolchain.options.get('opt', False):
return 3
else:
return 2

def configure_step(self, cmd_prefix=''):
"""
Configure with Meson.
Expand Down Expand Up @@ -92,12 +120,16 @@ def configure_step(self, cmd_prefix=''):

build_dir = self.cfg.get('build_dir') or self.start_dir

cmd = "%(preconfigopts)s %(configure_cmd)s --prefix %(installdir)s %(configopts)s %(source_dir)s" % {
cmd = ("%(preconfigopts)s %(configure_cmd)s --prefix %(installdir)s --buildtype %(buildtype)s %(configopts)s "
"--optimization %(optimization)s --debug %(debug)s %(source_dir)s") % {
'configopts': self.cfg['configopts'],
'configure_cmd': configure_cmd,
'installdir': self.installdir,
'preconfigopts': self.cfg['preconfigopts'],
'source_dir': build_dir,
'buildtype': self.build_type(),
'optimization': self.optimizatoin(),
Micket marked this conversation as resolved.
Show resolved Hide resolved
'debug': self.toolchain.options.get('debug', False),
}
res = run_shell_cmd(cmd)
return res.output
Expand Down
Loading