Skip to content

Reconcile axom spack package.#1891

Merged
BradWhitlock merged 5 commits into
developfrom
bugfix/whitlock/reconcile_axom_spack_package
Jun 26, 2026
Merged

Reconcile axom spack package.#1891
BradWhitlock merged 5 commits into
developfrom
bugfix/whitlock/reconcile_axom_spack_package

Conversation

@BradWhitlock

@BradWhitlock BradWhitlock commented Jun 23, 2026

Copy link
Copy Markdown
Member

This PR resolves #1890 by incorporating some formatting changes and small bug-fixes from the spack-packages axom package.py into the axom repo package.py.

  • This included a fix that let Axom build with +raja~umpire.
  • Minor reformatting to match the spack package.py (to ease future updates from here into it)
  • Updates some RAJA, umpire versions

@kennyweiss kennyweiss left a comment

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.

Thanks @BradWhitlock

Comment on lines +421 to +422
# Remove unusable -Mfreeform flag injected by spack
entries = [entry.replace("-Mfreeform", "") for entry in entries]

@kennyweiss kennyweiss Jun 24, 2026

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.

👍 Nice! The -Mfreeform flag generates lots of warning

Comment thread scripts/spack/packages/axom/package.py Outdated
with when("+profiling"):
depends_on("adiak")
depends_on("caliper")
depends_on("caliper+adiak~papi")

@kennyweiss kennyweiss Jun 24, 2026

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 don't think it matters too much since we're deprecating the profiling variant, but it seems weird to unconditionally require that papi is disabled for caliper.

I moved this constraint to defaults.yaml in ebafb95 and it looks like it should be upstreamed to spack-packages (very low priority though)

Comment thread scripts/spack/packages/axom/package.py Outdated
variant("umpire", default=True, description="Build with umpire")

variant("int64", default=True, description="Use 64bit integers for IndexType")
variant("raja", default=True, description="Build with raja")

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.

Minor: Since this list is alphabetized, raja should probably be between opencascade and scr

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I can put it back. I was just trying to minimize code differences with the spack-packages version.

@bmhan12 bmhan12 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks @BradWhitlock !

@BradWhitlock BradWhitlock merged commit 81611d9 into develop Jun 26, 2026
15 checks passed
@BradWhitlock BradWhitlock deleted the bugfix/whitlock/reconcile_axom_spack_package branch June 26, 2026 18:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Axom spack recipe can make bad host-config.

4 participants