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

Atdm tweak install stuff #4686

Merged

Conversation

bartlettroscoe
Copy link
Member

This fixes configure in case CMAKE_INSTALL_PREFIX is empty (which is perfectly valid in some use cases) and it moves the load_matching_env.sh file out if the way in the source and build dirs so it does not cause confusion.

I tested this manually locally and it seems to do the right thing for the various use cases.

It is prefectly fine to set CMAKE_INSTALL_PREFIX="". That just tells the build
system that you don't want to install.

This was reported by EMPIRE developers.
This avoids having it sit in the source dir along side the load-env.sh script
so tab completion works better and it moves it out of the base build directory
to avoid confusion (because it is only for the install dir).

I tested this manually and it seems to do exactly what it is supposed to do.
@bartlettroscoe bartlettroscoe added type: enhancement Issue is an enhancement, not a bug client: ATDM Any issue primarily impacting the ATDM project client: EMPIRE All issues that most directly target the ATDM EMPIRE code AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed ATDM DevOps Issues that will be worked by the Coordinated ATDM DevOps teams labels Mar 21, 2019
@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: 2915
  • 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 4686
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH atdm-tweak-install-stuff
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27bd653
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA b3351b0

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 2744
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 4686
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH atdm-tweak-install-stuff
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27bd653
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA b3351b0

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 1195
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 4686
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH atdm-tweak-install-stuff
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27bd653
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA b3351b0

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 881
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 4686
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH atdm-tweak-install-stuff
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27bd653
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA b3351b0

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 616
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
JENKINS_JOB_TYPE Experimental
PULLREQUESTNUM 4686
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH atdm-tweak-install-stuff
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27bd653
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA b3351b0

Using Repos:

Repo: TRILINOS (bartlettroscoe/Trilinos)
  • Branch: atdm-tweak-install-stuff
  • SHA: 27bd653
  • Mode: TEST_REPO

Pull Request Author: bartlettroscoe

@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: 2915
  • 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 4686
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH atdm-tweak-install-stuff
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27bd653
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA b3351b0

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 2744
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 4686
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH atdm-tweak-install-stuff
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27bd653
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA b3351b0

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 1195
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 4686
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH atdm-tweak-install-stuff
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27bd653
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA b3351b0

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 881
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 4686
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH atdm-tweak-install-stuff
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27bd653
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA b3351b0

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 616
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
JENKINS_JOB_TYPE Experimental
PULLREQUESTNUM 4686
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH atdm-tweak-install-stuff
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27bd653
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA b3351b0


CDash Test Results for PR# 4686.

@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
NO REVIEWS HAVE BEEN PERFORMED ON THIS PULL REQUEST!

@trilinos-autotester
Copy link
Contributor

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

@trilinos-autotester
Copy link
Contributor

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

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Pull Request will be Automerged

@trilinos-autotester trilinos-autotester merged commit fb8dd65 into trilinos:develop Mar 21, 2019
@trilinos-autotester
Copy link
Contributor

Merge on Pull Request# 4686: IS A SUCCESS - Pull Request successfully merged

@trilinos-autotester trilinos-autotester removed the AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed label Mar 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ATDM DevOps Issues that will be worked by the Coordinated ATDM DevOps teams client: ATDM Any issue primarily impacting the ATDM project client: EMPIRE All issues that most directly target the ATDM EMPIRE code type: enhancement Issue is an enhancement, not a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants