Skip to content

samrai: update package for 3.12.0 and fix compilation bugs for earlier versions#8501

Merged
adamjstewart merged 2 commits intospack:developfrom
twang15:bug_fix_samrai
Jun 18, 2018
Merged

samrai: update package for 3.12.0 and fix compilation bugs for earlier versions#8501
adamjstewart merged 2 commits intospack:developfrom
twang15:bug_fix_samrai

Conversation

@twang15
Copy link
Copy Markdown
Contributor

@twang15 twang15 commented Jun 18, 2018

SAMRAI: remove dependency on boost for samrai 3.12.0 or later versions, but keep the older versions continuing working with boost 1.64.0 or earlier. Also, the older versions cannot compile with boost 1.65.0 or above. (#8491)

…s, but keep the older versions ccontinuing working with boost 1.64.0 or earlier. Also, the older versions cannot compile with boost 1.65.0 or above. (spack#8491)
# < 3.12.0 versions. I don't know what version of boost that
# happened at though without trying each version of boost.
depends_on('boost@:1.60.0', when='@0:3.11.99')
# From 3.12.0, samrai no long depends on boost.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Typo: "long" -> "longer"

I would also switch "From" to "Starting with"

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Sure.
Should I resubmit a new PR?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nah, just add a second commit to this PR.

# From 3.12.0, samrai no long depends on boost.
# version 3.11.5 or earlier can only work with boost version
# 1.64.0 or earlier.
depends_on('boost@:1.64.0', when='@0:3.11.99', type='build')
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It doesn't link to any of the Boost libraries?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes.

env['CXXFLAGS'] = self.compiler.cxx11_flag
else:
# boost 1.64.0 or earlier works with samrai 2.4.4~3.11.5
options.extend(['--with-boost=%s' % self.spec['boost'].prefix])
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I would use options.append() instead of options.extend([]). No need to create an extra list.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Also, this is already being added above.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The above one was intended to be removed.

    if self.spec.satisfies('@0:3.11.99'):
        options.extend([
            '--with-boost=%s' % self.spec['boost'].prefix
        ])

@adamjstewart adamjstewart merged commit ec1b2d0 into spack:develop Jun 18, 2018
@twang15 twang15 deleted the bug_fix_samrai branch June 18, 2018 21:11
@twang15 twang15 restored the bug_fix_samrai branch June 18, 2018 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants