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.

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

Devops/docker envs #271

Merged
merged 13 commits into from
Mar 29, 2024
Merged

Devops/docker envs #271

merged 13 commits into from
Mar 29, 2024

Conversation

mdavis36
Copy link
Collaborator

@mdavis36 mdavis36 commented Mar 28, 2024

Summary

  • This PR is a refactor

  • It does the following:

    • Renames our x86_64/packages.yaml path to Ubuntu20.04/packages.yaml since that is the operating system the file is configured for.
    • Adds a generic/ directory for external users to modify for their systems.
    • Documentation has been add outlining how to edit the generic config files for a system.
    • Uses spack arch -o to determine operating system and version string when$SYS_TYPE is not available
  • Additional Changes:

    • Moves the installation location of python files and libraries to <install_prefix>/lib/pythonX.Y/site-packages/Spheral. This is standard practice for python library install structures. I Also ran into a bug where my filesystem on MacOS would confuse the Spheral/ dir and the spheral executable file in our installation dir.
    • Added documentation for using docker dev environments with spheral for local development.
    • Adding --fail-fast to spack install command to fail on first error.
    • Pull in changes from v2024.01.1 release that were never brought back to develop.

Docs: https://spheral.readthedocs.io/en/devops-docker-envs/index.html


ToDo :

  • Annotate RELEASE_NOTES.md with notable changes.
  • Create LLNLSpheral PR pointing at this branch. (PR#81)
  • LLNLSpheral PR has passed all tests.

@mdavis36 mdavis36 linked an issue Mar 28, 2024 that may be closed by this pull request
Copy link
Collaborator

@jmikeowen jmikeowen left a comment

Choose a reason for hiding this comment

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

Looking good

if sexe("{0} dev-build --fresh --quiet --deprecated -u initconfig {2}@develop%{3} 2>&1 | tee -a \"dev-build-{3}-out.txt\"".format(spack_cmd, os.getcwd(), package_name, s), echo=True) : sys.exit(1)

# Install only the dependencies for Spheral
if sexe("{0} install --fail-fast --fresh --deprecated --only dependencies {2}@develop%{3} 2>&1 | tee -a \"dev-build-{3}-out.txt\"".format(spack_cmd, os.getcwd(), package_name, s), echo=True) : sys.exit(1)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why wasn't this install call needed before?

Copy link
Collaborator Author

@mdavis36 mdavis36 Mar 28, 2024

Choose a reason for hiding this comment

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

dev-build acts the same as install in regards to concretizing and installing dependencies, but dev-build doesn't have the --fail-fast option. So here we have spack install only the dependencies with install, then let it create the host-config file from dev-build with our local repo. Using install tries to pull spheral develop and that isn't what we want for tpl-manager

@mdavis36 mdavis36 merged commit f5b0488 into develop Mar 29, 2024
2 checks passed
@mdavis36 mdavis36 deleted the devops/docker-envs branch March 29, 2024 01:45
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.

x86_64 external spack packages files
3 participants