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: restore original ETI types for normImpl #4967

Closed
wants to merge 1 commit into from

Conversation

kddevin
Copy link
Contributor

@kddevin kddevin commented Apr 19, 2019

This reverts commit 665ede0.

This PR reverts the changes suggested in #4951 and pushed in #4956
Although these changes worked fine with PR testing both with and without deprecated code, they caused build failures in Albany #4962

@trilinos/tpetra These changes may cause builds with Tpetra_ENABLE_DEPRECATED_CODE=OFF to have link errors; the short term workaround is to use global ordinal = INT instead of LONG LONG.

@trilinos/tpetra @ikalash

@kddevin kddevin added pkg: Tpetra AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed labels Apr 19, 2019
@kddevin kddevin requested review from mhoemmen and ikalash April 19, 2019 20:57
@kddevin kddevin self-assigned this Apr 19, 2019
Copy link
Contributor

@mhoemmen mhoemmen left a comment

Choose a reason for hiding this comment

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

This will break for the case where deprecated code is off. Let's try using the technique here:

TPETRA_INSTANTIATE_SN_NO_ORDINAL_SCALAR( TPETRA_DETAILS_NORMIMPL_INSTANT )
// TPETRA_INSTANTIATE_GN doesn't exist yet; would need to add
// this to tpetra/core/cmake/ExplicitInstantiationSupport.cmake
TPETRA_INSTANTIATE_GN( TPETRA_DETAILS_NORMIMPL_INSTANT )
#ifndef HAVE_TPETRA_INST_INT_INT
TPETRA_INSTANTIATE_N( TPETRA_DETAILS_NORMIMPL_INSTANT_INT )
#endif // HAVE_TPETRA_INST_INT_INT

@mhoemmen
Copy link
Contributor

@kddevin Hold on, let me make a PR for this.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request.

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

  • Build Num: 3324
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 4967
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tpetra_fixNormImplETI
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA bc83d2f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 8c5bac7

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 3151
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 4967
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tpetra_fixNormImplETI
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA bc83d2f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 8c5bac7

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 1596
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 4967
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tpetra_fixNormImplETI
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA bc83d2f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 8c5bac7

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 1331
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 4967
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tpetra_fixNormImplETI
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA bc83d2f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 8c5bac7

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 1007
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
JENKINS_JOB_TYPE Experimental
PULLREQUESTNUM 4967
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tpetra_fixNormImplETI
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA bc83d2f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 8c5bac7

Using Repos:

Repo: TRILINOS (trilinos/Trilinos)
  • Branch: tpetra_fixNormImplETI
  • SHA: bc83d2f
  • Mode: TEST_REPO

Pull Request Author: kddevin

@kddevin kddevin added AT: WIP Causes the PR autotester to not test the PR. (Remove to allow testing to occur.) and removed AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed labels Apr 19, 2019
@kddevin
Copy link
Contributor Author

kddevin commented Apr 19, 2019

@mhoemmen says he would prefer a different solution, rather than this reversal of the his first solution. I'll mark this PR WIP to prevent testing / retesting, or merging that creates conflicts for @mhoemmen

@mhoemmen
Copy link
Contributor

@kddevin Thanks! I'm testing the solution now.

@mhoemmen
Copy link
Contributor

@kddevin Check this out: #4969

btw the "macro that generates a macro" didn't work, because # has a special meaning ("stringify") in macros. Oops ;-P

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

  • Build Num: 3324
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 4967
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tpetra_fixNormImplETI
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA bc83d2f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 8c5bac7

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 3151
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 4967
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tpetra_fixNormImplETI
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA bc83d2f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 8c5bac7

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 1596
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 4967
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tpetra_fixNormImplETI
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA bc83d2f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 8c5bac7

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 1331
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 4967
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tpetra_fixNormImplETI
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA bc83d2f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 8c5bac7

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 1007
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
JENKINS_JOB_TYPE Experimental
PULLREQUESTNUM 4967
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tpetra_fixNormImplETI
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA bc83d2f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 8c5bac7


CDash Test Results for PR# 4967.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Merge Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging
THE LAST COMMIT TO THIS PULL REQUEST HAS BEEN REVIEWED, BUT NOT ACCEPTED OR REQUIRES CHANGES

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur...

@mhoemmen
Copy link
Contributor

Superseded by #4969. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AT: WIP Causes the PR autotester to not test the PR. (Remove to allow testing to occur.) pkg: Tpetra
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants