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

Intrepid2: fix shadowed DeviceType declarations in function scope #9651

Merged
merged 1 commit into from
Sep 8, 2021

Conversation

japlews
Copy link
Contributor

@japlews japlews commented Sep 2, 2021

@trilinos/Intrepid2
@mperego @kyungjoo-kim

Motivation

Shadowed declaration of DeviceType in class scope; there are several other declarations in function scope which seem to be no longer needed.

Stakeholder Feedback

N/A

Testing

N/A

@mperego mperego requested a review from CamelliaDPG September 2, 2021 14:31
@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 REVIEWS HAVE BEEN PERFORMED ON THIS PULL REQUEST!

Copy link
Contributor

@CamelliaDPG CamelliaDPG left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks!

@trilinos-autotester
Copy link
Contributor

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

@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: Trilinos_pullrequest_gcc_8.3.0

  • Build Num: 5470
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 3025
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 3505
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 10748
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105

  • Build Num: 2159
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off

  • Build Num: 1156
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 3536
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: python-3

  • Build Num: 191
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Using Repos:

Repo: TRILINOS (japlews/Trilinos)
  • Branch: intrepid2-DeviceType-shadow
  • SHA: 310a185
  • Mode: TEST_REPO

Pull Request Author: japlews

@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: Trilinos_pullrequest_gcc_8.3.0

  • Build Num: 5470
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 3025
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 3505
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 10748
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105

  • Build Num: 2159
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off

  • Build Num: 1156
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 3536
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e

Build Information

Test Name: python-3

  • Build Num: 191
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS
PULLREQUESTNUM 9651
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH intrepid2-DeviceType-shadow
TRILINOS_SOURCE_REPO https://github.com/japlews/Trilinos
TRILINOS_SOURCE_SHA 310a185
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 65fc34e


CDash Test Results for PR# 9651.

@trilinos-autotester
Copy link
Contributor

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

@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...

5 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
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...

@CamelliaDPG CamelliaDPG merged commit c131183 into trilinos:develop Sep 8, 2021
jmgate pushed a commit to tcad-charon/Trilinos that referenced this pull request Sep 9, 2021
…s:develop' (28932b4).

* trilinos-develop:
  Fixed up model evaluator test, tanget scatters
  Intrepid2: fix shadowed DeviceType declarations in function scope (trilinos#9651)
  MueLu: Clean up SemiCoarsenP factories
  Panzer: fix response evaluation for uvm removal
  Add SemiCoarsenPFactory unit test  - this test uses the SemiCoarsenP matrix to prolongate the coarse grid coordinates    into fine grid coordinates. It only works on the third layer of a 5 layer    grid because of boundary conditions.  - also SemiCoarsenPFactory_kokkos fixes for complex types
  MueLu: Add SemiCoarsenPFactory_kokkos  - kokkos version of SemiCoarsenPFactory
jmgate pushed a commit to tcad-charon/Trilinos that referenced this pull request Sep 9, 2021
…s:develop' (28932b4).

* trilinos-develop:
  Fixed up model evaluator test, tanget scatters
  Intrepid2: fix shadowed DeviceType declarations in function scope (trilinos#9651)
  MueLu: Clean up SemiCoarsenP factories
  Panzer: fix response evaluation for uvm removal
  Add SemiCoarsenPFactory unit test  - this test uses the SemiCoarsenP matrix to prolongate the coarse grid coordinates    into fine grid coordinates. It only works on the third layer of a 5 layer    grid because of boundary conditions.  - also SemiCoarsenPFactory_kokkos fixes for complex types
  MueLu: Add SemiCoarsenPFactory_kokkos  - kokkos version of SemiCoarsenPFactory
PhilMiller pushed a commit to PhilMiller/Trilinos that referenced this pull request Dec 22, 2021
…develop' (d5609d7).

* trilinos/develop: (23 commits)
  Fixed up model evaluator test, tanget scatters
  Intrepid2: fix shadowed DeviceType declarations in function scope (trilinos#9651)
  MueLu: Clean up SemiCoarsenP factories
  Panzer: fix response evaluation for uvm removal
  Tpetra:  added methods to replace Domain and Range maps in CrsMatrix and CrsGraph (trilinos#9626)
  Fixed uvm error with building the sideset coords
  Fixed Dirichlet resid for edge basis and UVM
  Resolved UVM issues
  Minor fixes in some of the source terms for examples
  reset view ref to equalize count
  another device access
  Have simple tpetra example working
  have some memory access errors resolved
  tpetra:  reduced amount of output to reduce test failures due to intermixed output
  more progress
  more progress
  fixed centroid code
  Fixed inv perm func
  have epetra stack going partially through
  Fixed up some view of view errors
  ...
@japlews japlews deleted the intrepid2-DeviceType-shadow branch December 22, 2022 20:51
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.

3 participants