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

Scream downstream merge 2024_10_09 #6675

Merged
merged 587 commits into from
Oct 15, 2024
Merged

Conversation

jgfouca
Copy link
Member

@jgfouca jgfouca commented Oct 9, 2024

[BFB]

singhbalwinder and others added 30 commits August 13, 2024 15:49
E3SM-Bot and others added 4 commits October 7, 2024 15:31
…ug_forced_fail_opt

Automatically Merged using E3SM Pull Request AutoTester
PR Title: AD Debug Option to set a FAIL point
PR Author: AaronDonahue
PR LABELS: enhancement, AT: AUTOMERGE, Atmosphere Driver
…ync_bugfix

Automatically Merged using E3SM Pull Request AutoTester
PR Title: Fix field sync for subfields
PR Author: tcclevenger
PR LABELS: infrastructure, AT: AUTOMERGE, bugfix, performance
…oncontig-cpuset

Automatically Merged using E3SM Pull Request AutoTester
PR Title: Allow non-contiguous set of cpus in test-all-scream
PR Author: bartgol
PR LABELS: enhancement, AT: AUTOMERGE, scripts, code usability
…stream_2024_10_09

* scream/master: (471 commits)
  Simply call to new abort feature in the AD code
  better comment
  Use asynchronous deep_copy in non-contig sync_views_impl
  Change the name of fail option to be self-descriptive
  EAMxx: allow non-contiguous set of cpus in test-all-scream
  Change sync_views_impl to use scratch contiguous field
  Pass data_type to other subfield impl
  Make deep_copy const
  Create contiguous helper field
  Add function to return if host == device mem space
  A quick change to recreate an aborted run mid simulation
  Update rrtmgp to latest kokkos-coversion-branch
  Remove most allocations from rrtmgp interface
  Try async deep copy for sync to host
  EAMxx: fix usage of regex when parsing rpointer file
  EAMxx: fix nc file names in some standalone tests
  EAMxx: fix usage of layout extents in field methods
  Consolidate sync_to_host_impl and sync_to_device_impl into sync_views_impl
  Add comment on need for mutable m_is_read_only
  Allow sync_to_host for read-only fields
  ...
@jgfouca jgfouca added BFB PR leaves answers BFB EAMxx PRs focused on capabilities for EAMxx labels Oct 9, 2024
@jgfouca jgfouca requested review from rljacob and brhillman October 9, 2024 20:01
@jgfouca jgfouca self-assigned this Oct 9, 2024
Copy link

github-actions bot commented Oct 9, 2024

PR Preview Action v1.4.8
🚀 Deployed preview to https://E3SM-Project.github.io/E3SM/pr-preview/pr-6675/
on branch gh-pages at 2024-10-11 15:12 UTC

Copy link
Contributor

@mahf708 mahf708 left a comment

Choose a reason for hiding this comment

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

We should leave these as-are or with the suggested edits. Sorry about the confusion, I should have followed up on the scream side with a PR. I can push to your branch if you'd like.

.github/workflows/e3sm-gh-ci-cime-tests.yml Outdated Show resolved Hide resolved
.github/workflows/eamxx_default_files.yml Outdated Show resolved Hide resolved
@jgfouca
Copy link
Member Author

jgfouca commented Oct 9, 2024

@mahf708 , feel free to push to my branch.

jgfouca added a commit that referenced this pull request Oct 9, 2024
Scream downstream merge 2024_10_09

[BFB]

* jgfouca/scream_downstream_2024_10_09: (471 commits)
  Simply call to new abort feature in the AD code
  better comment
  Use asynchronous deep_copy in non-contig sync_views_impl
  Change the name of fail option to be self-descriptive
  EAMxx: allow non-contiguous set of cpus in test-all-scream
  Change sync_views_impl to use scratch contiguous field
  Pass data_type to other subfield impl
  Make deep_copy const
  Create contiguous helper field
  Add function to return if host == device mem space
  A quick change to recreate an aborted run mid simulation
  Update rrtmgp to latest kokkos-coversion-branch
  Remove most allocations from rrtmgp interface
  Try async deep copy for sync to host
  EAMxx: fix usage of regex when parsing rpointer file
  EAMxx: fix nc file names in some standalone tests
  EAMxx: fix usage of layout extents in field methods
  Consolidate sync_to_host_impl and sync_to_device_impl into sync_views_impl
  Add comment on need for mutable m_is_read_only
  Allow sync_to_host for read-only fields
  ...
@jgfouca
Copy link
Member Author

jgfouca commented Oct 9, 2024

Merged to next.

integer(kind=c_int), intent(in) :: num_cpl_imports, num_scream_imports, &
num_cpl_exports, num_scream_exports
integer(kind=c_int), intent(in) :: import_field_size, export_field_size
end subroutine scream_setup_surface_coupling

#if defined(SCREAM_SYSTEM_WORKAROUND) && (SCREAM_SYSTEM_WORKAROUND == 1)
subroutine scream_init_hip_atm () bind(c)
Copy link
Member

Choose a reason for hiding this comment

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

What is this for?

Copy link
Contributor

Choose a reason for hiding this comment

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

This was one of the problems that appeared when frontier software was update. Specific commit 4411d44

Related PR in scream repo: E3SM-Project/scream#2923

@rljacob rljacob added this to the maint-3.0 milestone Oct 9, 2024
We don't want testing stuff or small kernel stuff
We don't want testing stuff or small kernel stuff
@jgfouca jgfouca force-pushed the jgfouca/scream_downstream_2024_10_09 branch from 64f041b to 10099ac Compare October 10, 2024 18:28
jgfouca added a commit that referenced this pull request Oct 14, 2024
Fixes for PAM

[BFB]

* jgfouca/scream_downstream_2024_10_09:
  enable shared builds for gh-standalone
  update PAM submodule
  bug fix for pam_statistics.h
  Make sure SCREAM_LIBS_ONLY is on
  Make sure SCREAM_LIBS_ONLY is on
  keep github actions working for e3sm repo
@jgfouca
Copy link
Member Author

jgfouca commented Oct 14, 2024

Merged fixes to next.

@jgfouca jgfouca merged commit 22a8515 into master Oct 15, 2024
14 checks passed
@jgfouca jgfouca deleted the jgfouca/scream_downstream_2024_10_09 branch October 15, 2024 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BFB PR leaves answers BFB EAMxx PRs focused on capabilities for EAMxx
Projects
None yet
Development

Successfully merging this pull request may close these issues.