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

Tpetra: Distributor createFromRecvs remove duplicate dynamic communication #13933

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from

Conversation

bienz2
Copy link

@bienz2 bienz2 commented Apr 1, 2025

@trilinos/Tpetra

Motivation

The createFromRecvs methods within the Distributor created a tempPlan through a reduce+scatter followed by dynamic communication, used the tempPlan to determine the send indices, threw away the tempPlan, and then recreated the plan_ with the same reduce+scatter and dynamic communication. This change sets plan_ = tempPlan.plan_ rather than throwing it away and recreating it.

Related Issues

N/A

Stakeholder Feedback

N/A

Testing

No new method was created, Tpetra already tests that createFromRecvs works correctly.

trilinos-autotester and others added 10 commits January 17, 2025 20:41
…_20250117_175821

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20250117_175821 branch to master'
PR Author: trilinos-autotester
…_20250124_175818

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20250124_175818 branch to master'
PR Author: trilinos-autotester
…_20250131_175819

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20250131_175819 branch to master'
PR Author: trilinos-autotester
…_20250207_175815

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20250207_175815 branch to master'
PR Author: trilinos-autotester
…_20250214_175813

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20250214_175813 branch to master'
PR Author: trilinos-autotester
…_20250228_175817

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20250228_175817 branch to master'
PR Author: trilinos-autotester
…_20250307_175820

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20250307_175820 branch to master'
PR Author: trilinos-autotester
…_175817

Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20250314_175817 branch to master
…_20250321_175818

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20250321_175818 branch to master'
PR Author: trilinos-autotester
…_20250328_175821

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20250328_175821 branch to master'
PR Author: trilinos-autotester
@bienz2 bienz2 requested a review from a team as a code owner April 1, 2025 19:58
@cgcgcg cgcgcg added pkg: Tpetra AT: PRE-TEST INSPECTED Required to test outside contributions. This label alone will not allow a PR to merge. labels Apr 1, 2025
@cgcgcg cgcgcg changed the title Tetra: Distributor createFromRecvs remove duplicate dynamic communication Tpetra: Distributor createFromRecvs remove duplicate dynamic communication Apr 1, 2025
Comment on lines 394 to 395
//createFromSends(remoteProcIDs);
//using tempPlan rather than recreating plan here
Copy link
Member

Choose a reason for hiding this comment

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

Just delete these.

Signed-off-by: Amanda Bienz <bienz@unm.edu>
@bienz2 bienz2 force-pushed the fix-distributorplan branch from 0452a25 to 7b6e0fe Compare April 1, 2025 20:17
Signed-off-by: Amanda Bienz <bienz@unm.edu>
@bienz2 bienz2 force-pushed the fix-distributorplan branch from a6adb3d to 37a5710 Compare April 1, 2025 20:20
Copy link
Member

@jhux2 jhux2 left a comment

Choose a reason for hiding this comment

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

lgtm

@trilinos-autotester trilinos-autotester removed the AT: PRE-TEST INSPECTED Required to test outside contributions. This label alone will not allow a PR to merge. label Apr 1, 2025
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Test Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging
ERROR: USER HAS COMMITTED TO PR AFTER INSPECTION, INSPECTION IS INVALID! - This PR must be re-inspected by setting label 'AT: PRE-TEST INSPECTED'.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Test Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging
NO INSPECTION HAS BEEN PERFORMED ON THIS PULL REQUEST! - This PR must be inspected by setting label 'AT: PRE-TEST INSPECTED'.

@jhux2 jhux2 added the AT: PRE-TEST INSPECTED Required to test outside contributions. This label alone will not allow a PR to merge. label Apr 1, 2025
@trilinos-autotester trilinos-autotester removed the AT: PRE-TEST INSPECTED Required to test outside contributions. This label alone will not allow a PR to merge. label Apr 1, 2025
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Test Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED by label AT: PRE-TEST INSPECTED! Autotester is Removing Label; this inspection will remain valid until a new commit to source branch is performed.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects:

Pull Request Auto Testing STARTING (click to expand)

Build Information

Test Name: PR_gcc-openmpi-openmp

  • Build Num: 1329
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-gnu-8.5.0-openmpi-4.1.6-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS pkg: Tpetra
PULLREQUESTNUM 13933
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8
TRILINOS_SOURCE_REPO https://github.com/bienz2/Trilinos
TRILINOS_SOURCE_SHA 37a5710
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 164b913

Build Information

Test Name: PR_clang

  • Build Num: 1376
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-clang-11.0.1-openmpi-4.0.5-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS pkg: Tpetra
PULLREQUESTNUM 13933
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8
TRILINOS_SOURCE_REPO https://github.com/bienz2/Trilinos
TRILINOS_SOURCE_SHA 37a5710
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 164b913

Build Information

Test Name: PR_cuda

  • Build Num: 1375
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
BLOCKING_BUILD false
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS pkg: Tpetra
PULLREQUESTNUM 13933
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8-gpu
TRILINOS_SOURCE_REPO https://github.com/bienz2/Trilinos
TRILINOS_SOURCE_SHA 37a5710
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 164b913

Build Information

Test Name: PR_cuda-uvm

  • Build Num: 1375
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables
PR_LABELS pkg: Tpetra
PULLREQUESTNUM 13933
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8
TRILINOS_SOURCE_REPO https://github.com/bienz2/Trilinos
TRILINOS_SOURCE_SHA 37a5710
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 164b913

Using Repos:

Repo: TRILINOS (bienz2/Trilinos)
  • Branch: fix-distributorplan
  • SHA: 37a5710
  • Mode: TEST_REPO

Pull Request Author: bienz2

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED

Pull Request Auto Testing has PASSED (click to expand)

Build Information

Test Name: PR_gcc-openmpi-openmp

  • Build Num: 1329
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-gnu-8.5.0-openmpi-4.1.6-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS pkg: Tpetra
PULLREQUESTNUM 13933
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8
TRILINOS_SOURCE_REPO https://github.com/bienz2/Trilinos
TRILINOS_SOURCE_SHA 37a5710
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 164b913

Build Information

Test Name: PR_clang

  • Build Num: 1376
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-clang-11.0.1-openmpi-4.0.5-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS pkg: Tpetra
PULLREQUESTNUM 13933
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8
TRILINOS_SOURCE_REPO https://github.com/bienz2/Trilinos
TRILINOS_SOURCE_SHA 37a5710
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 164b913

Build Information

Test Name: PR_cuda

  • Build Num: 1375
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
BLOCKING_BUILD false
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS pkg: Tpetra
PULLREQUESTNUM 13933
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8-gpu
TRILINOS_SOURCE_REPO https://github.com/bienz2/Trilinos
TRILINOS_SOURCE_SHA 37a5710
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 164b913

Build Information

Test Name: PR_cuda-uvm

  • Build Num: 1375
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables
PR_LABELS pkg: Tpetra
PULLREQUESTNUM 13933
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8
TRILINOS_SOURCE_REPO https://github.com/bienz2/Trilinos
TRILINOS_SOURCE_SHA 37a5710
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 164b913


CDash Test Results for PR# 13933.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ jhux2 ]!

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - AutoMerge IS ENABLED, but the Label AT: AUTOMERGE is not set. Either set Label AT: AUTOMERGE or manually merge the PR...

@jhux2
Copy link
Member

jhux2 commented Apr 1, 2025

@bienz2 Do you know why there are 12 merge commits from master? Can those be squashed away?

@bienz2
Copy link
Author

bienz2 commented Apr 2, 2025

I have no idea where the 11 other commits came from. I pulled from master and changed two lines. They should be able to be squashed away, the change is definitely not dependent on any of them.

@bienz2
Copy link
Author

bienz2 commented Apr 2, 2025

@jhux2 I figured out the 11 commits before mine are differences between master and develop. I initially pulled from master rather than develop, and it seems master is 11 commits ahead of develop. I'm unsure the easiest way to fix this but can look into changing this to initially pull from develop rather than master.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - AutoMerge IS ENABLED, but the Label AT: AUTOMERGE is not set. Either set Label AT: AUTOMERGE or manually merge the PR...

4 similar comments
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - AutoMerge IS ENABLED, but the Label AT: AUTOMERGE is not set. Either set Label AT: AUTOMERGE or manually merge the PR...

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - AutoMerge IS ENABLED, but the Label AT: AUTOMERGE is not set. Either set Label AT: AUTOMERGE or manually merge the PR...

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - AutoMerge IS ENABLED, but the Label AT: AUTOMERGE is not set. Either set Label AT: AUTOMERGE or manually merge the PR...

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - AutoMerge IS ENABLED, but the Label AT: AUTOMERGE is not set. Either set Label AT: AUTOMERGE or manually merge the PR...

@trilinos-autotester trilinos-autotester added the AT: STALE Added by the PR autotester if too much time has elapsed since the last successful PR test iteration label Apr 7, 2025
@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

@jhux2
Copy link
Member

jhux2 commented Apr 7, 2025

@cgcgcg @bienz2 Maybe this could be folded into #13934?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AT: STALE Added by the PR autotester if too much time has elapsed since the last successful PR test iteration pkg: Tpetra
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants