Updates needed to support psyclone 3.3#545
Conversation
Co-authored-by: Andrew Porter <andrew.porter@stfc.ac.uk> Co-authored-by: Aidan Chalk <3043914+LonelyCat124@users.noreply.github.com>
Co-authored-by: Andrew Porter <andrew.porter@stfc.ac.uk> Co-authored-by: Aidan Chalk <3043914+LonelyCat124@users.noreply.github.com> Signed-off-by: Sergi Siso <sergiesg@gmail.com>
Sergi Siso (sergisiso)
requested review from
Hacka Fett (christophermaynard),
iboutle,
thomasmelvin and
Thomas Bendall (tommbendall)
as code owners
github-actions
Bot
added
the
cla-signed
Testing with PSyclone master on Azure SpiceChanges made to test PSyclone masterdiff --git a/dependencies.yaml b/dependencies.yaml
index e314999e..6dfadfbb 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -30,8 +30,10 @@ lfric_apps:
ref:
lfric_core:
- source: git@github.com:MetOffice/lfric_core.git
- ref: 70405b50bda5a86c8711a2cceae0ea69dd04c2bc
+# source: git@github.com:MetOffice/lfric_core.git
+# ref: 70405b50bda5a86c8711a2cceae0ea69dd04c2bc
+ source: git@github.com:stfc/lfric_core.git
+ ref: psyclone_next
moci:
source: git@github.com:MetOffice/moci.git
diff --git a/rose-stem/site/meto/common/suite_config_azspice.cylc b/rose-stem/site/meto/common/suite_config_azspice.cylc
index 07e72b22..fa304364 100644
--- a/rose-stem/site/meto/common/suite_config_azspice.cylc
+++ b/rose-stem/site/meto/common/suite_config_azspice.cylc
@@ -7,18 +7,23 @@
{% set azspice_base = 'umask 0022 ; '~
'module purge ; '~
- 'module use /home/users/lfricadmin/lmod ; ' %}
+ 'module use /home/users/lfricadmin/lmod ; '~
+ 'module use /home/users/lfricadmin/test_modules ; ' %}
-{% set azspice_compiler_gnu = 'module load lfric/vn3.1' %}
+{#% set azspice_compiler_gnu = 'module load lfric/vn3.1' %#}
+{% set azspice_compiler_gnu = 'module load lfric/vn3.2-rc1 ; '~
+ 'module load py-psyclone/master' %}
-{% set azspice_coupled_gnu = 'module load xios/2701-oasis ; '~
+{% set azspice_coupled_gnu = 'module load xios/2.2701-oasis ; '~
'module load oasis' %}
{% set azspice_run = 'ulimit -s unlimited' %}
{% set azspice_scitools = 'module load scitools/production-os47-1' %}
-{% set azspice_tech = 'module load lfric/vn3.1' %}
+{#% set azspice_tech = 'module load lfric/vn3.1' %#}
+{% set azspice_tech = 'module load lfric/vn3.2-rc1 ; '~
+ 'module load py-psyclone/master' %}
[[AZSPICE_BASE]]
platform = spiceI would recommend making these changes to facilitate testing until the full -{% set azspice_compiler_gnu = 'module load lfric/vn3.1' %}
+{% set azspice_compiler_gnu = 'module load lfric/vn3.2' %}
-{% set azspice_tech = 'module load lfric/vn3.1' %}
+{% set azspice_tech = 'module load lfric/vn3.2' %}
-{% set azspice_coupled_gnu = 'ml xios/2701-oasis ; '~
+{% set azspice_coupled_gnu = 'ml xios/2.2701-oasis ; '~
'ml oasis/3-mct5.0' %}Note that Testing outcomeChecked out the 10 of them fail due to current lack of Shumlib in the 3.2 release candidate modules, so I am not particularly worried about them. The other 5 are in adjoint and JEDI-LFRic tests: From the error reports, they seem to be related to changes in adjoint kernels and patches that are applied to kernels that PSyAD generates. See e.g. error for A DA person familiar with these kernels would be helpful here. For command-line testing of what PSyAD on PSyclone master generates, use P.S. I checked the "PSyclone Approval" tick box as a TCD Team representative. |
|
We will need to apply an update in the DA/JEDI build to include the new version of |
Steven Sandbach (ss421)
added
the
Linked Jedi
|
I believe I have now successfully generated the adjoint patches needed, just awaiting further testing. |
Thanks for sending over the patch upgrades, DrTVockerodtMO! They are attached PSy3.3PatchUpgrades.zip. Sergi Siso (@sergisiso), the locations of modified patches are below. |
7 participants
PR Summary
Sci/Tech Reviewer:
Code Reviewer:
These are the changes necessary to use the next release of psyclone.
To work this needs:
Andrew Coughtrie (@andrewcoughtrie) This is not ready to be merged until the above points are ready, but would it be possible to test this with rose-stem and your new environment to find if we need to fix something in psyclone before we do the release? (Note that it will only work with psyclone master, not the last psyclone release candidate)
Code Quality Checklist
Testing
trac.log
Security Considerations
Performance Impact
AI Assistance and Attribution
Documentation
PSyclone Approval
Sci/Tech Review
(Please alert the code reviewer via a tag when you have approved the SR)
Code Review