Skip to content

Environment updates#20

Merged
jo-basevi merged 4 commits intomainfrom
17-only-set-launch-script-env
Jul 25, 2025
Merged

Environment updates#20
jo-basevi merged 4 commits intomainfrom
17-only-set-launch-script-env

Conversation

@jo-basevi
Copy link
Copy Markdown
Collaborator

@jo-basevi jo-basevi commented Jul 21, 2025

This PR grabbed a couple changes from #19, namely:

  • Add ENV_LAUNCHER_SCRIPT_PATH to launcher_conf.sh: This means for scripts that are run as part of launcher.sh and within the singularity container, it is possible to find out how to launch the container again. This is useful for payu, so it can pass the launcher script along to the PBS jobs. So the payu pbs jobs would look like: qsub <qsub-flags> -- /path/to/launcher.sh /path/to/squashfs-payu-env/bin/python /path/to/squashfs-payu-env/bin/payu-run. This removes the hack of modifying the payu python headers to point to the python launcher script.
  • Update payu/dev to remove modifying payu python header to point to the python launcher script
  • Remove CONDA_EXE and MAMBA_ROOT_PREFIX from modulefile as it's not needed as it can cause issues with running payu alongside other conda environments.

Other change:

  • Keep 5 latest versions of payu/dev - this is ensure that by the payu/dev environment is deleted, it would be unlikely it was being used in any currently running payu jobs Added in Keep 5 latest versions of payu/dev #21

aidanheerdegen
aidanheerdegen previously approved these changes Jul 23, 2025
Copy link
Copy Markdown
Member

@aidanheerdegen aidanheerdegen left a comment

Choose a reason for hiding this comment

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

LGTM AFAICT

Comment thread environments/payu-dev/build_inner.sh
Comment thread scripts/build.sh
@jo-basevi jo-basevi temporarily deployed to Gadi Prerelease July 25, 2025 04:47 — with GitHub Actions Inactive
@jo-basevi
Copy link
Copy Markdown
Collaborator Author

I've added changes to install netcdf4 with no mpi and removed setting OMPI_MCA_orte_launch_agent to this PR as it's modifying the same files (see #25 for more information). This means mpi and mpich packages will not be installed in the environment.

@jo-basevi jo-basevi requested a review from aidanheerdegen July 25, 2025 04:56
Copy link
Copy Markdown
Member

@aidanheerdegen aidanheerdegen left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks.

@jo-basevi jo-basevi merged commit d79374c into main Jul 25, 2025
4 checks passed
@jo-basevi jo-basevi deleted the 17-only-set-launch-script-env branch July 25, 2025 05:09
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.

2 participants