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

Sort input file list #5559

Merged
merged 1 commit into from Sep 30, 2019
Merged

Sort input file list #5559

merged 1 commit into from Sep 30, 2019

Conversation

bmwiedemann
Copy link
Contributor

@bmwiedemann bmwiedemann commented Jul 22, 2019

@trilinos/

  • My commit messages mention the appropriate GitHub issue numbers.
  • My code follows the code style of the affected package(s).
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the code contribution guidelines for this project.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • No new compiler warnings were introduced.
  • These changes break backwards compatibility.

Sort input file list
so that variables_f.js builds in a reproducible way
in spite of indeterministic filesystem readdir order.

See https://reproducible-builds.org/ for why this is good.

This PR was done while working on reproducible builds for openSUSE.

@bmwiedemann bmwiedemann changed the base branch from master to develop July 22, 2019 14:55
@bmwiedemann
Copy link
Contributor Author

WIP: I need to run another round of testing on this.

@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
WARNING: NO REVIEWERS HAVE BEEN REQUESTED FOR THIS PULL REQUEST!

@mhoemmen
Copy link
Contributor

@trilinos/framework

I don't think the pull request tests have a way to test these changes. They look fine to me, but we would need reproduction instructions in order to evaluate them.

@bmwiedemann
Copy link
Contributor Author

My test looked good.

One way to reproduce the original issue is to build on 2 different ext4 filesystems with dir_index enabled (is default on). This caused variations in search/variables_f.js files.
Another way to trigger it, would be to use the 'disorderfs' FUSE filesystem to randomize readdir order in the build dir.

@bmwiedemann
Copy link
Contributor Author

Here is a snippet from a diff, but due to the random input, you will get different diffs.

+++ new//usr/share/doc/packages/trilinos-doc/packages/xpetra/doc/html/search/variables_f.js     2019-07-05 12:00:00.000000000 +0000
@@ -1,6 +1,4 @@
 var searchData=
 [
-  ['rangemaps_5f',['rangemaps_',['../classXpetra_1_1BlockedCrsMatrix.html#a20e4a341fac502c3d2c02c7a50d9c66b',1,'Xpetra::BlockedCrsMatrix']]],
-  ['right_5fside',['RIGHT_SIDE',['/home/abuild/rpmbuild/BUILD/Trilinos-trilinos-release-12-10-1/packages/xpetra/doc/../../../packages/teuchos/doc/html/namespaceTeuchos.html#a4d69c405faef2b64ef0583adadcdbf91af01e44b3bfce7cb55b7537f0b1e23bde',1,'Teuchos']]],
-  ['rowmap_5f',['rowMap_',['../classXpetra_1_1MatrixView.html#ab578ce61f1c75bb636b3431fd8390db1',1,'Xpetra::MatrixView']]]
+  ['thyramaps_5f',['thyraMaps_',['../classXpetra_1_1MapExtractor.html#a6c2728225e6db2f419856c5138be7ce7',1,'Xpetra::MapExtractor']]]

bmwiedemann added a commit to bmwiedemann/theunreproduciblepackage that referenced this pull request Jul 23, 2019
bmwiedemann added a commit to bmwiedemann/Trilinos that referenced this pull request Sep 10, 2019
so that variables_f.js builds in a reproducible way
in spite of indeterministic filesystem readdir order.

See https://reproducible-builds.org/ for why this is good.

Fixes trilinos#5559
@bmwiedemann bmwiedemann requested review from a team as code owners September 10, 2019 08:05
bmwiedemann added a commit to bmwiedemann/Trilinos that referenced this pull request Sep 10, 2019
so that variables_f.js builds in a reproducible way
in spite of indeterministic filesystem readdir order.

See https://reproducible-builds.org/ for why this is good.

Fixes trilinos#5559
so that variables_f.js builds in a reproducible way
in spite of indeterministic filesystem readdir order.

See https://reproducible-builds.org/ for why this is good.

Fixes trilinos#5559
@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
WARNING: NO REVIEWERS HAVE BEEN REQUESTED FOR THIS PULL REQUEST!

@jmgate jmgate removed request for a team September 10, 2019 13:16
@bmwiedemann
Copy link
Contributor Author

I would still like to see this merged. Can I help anything more?

Copy link
Contributor

@jmgate jmgate left a comment

Choose a reason for hiding this comment

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

This looks harmless to me. Approving so testing can commence, though I realize this change won't actually be tested.

@jmgate
Copy link
Contributor

jmgate commented Sep 25, 2019

@mhoemmen, were you wanting documentation in the diff of this PR, or were @bmwiedemann's comments above sufficient?

@prwolfe
Copy link
Contributor

prwolfe commented Sep 25, 2019

This looks ok, but I have to ask

  1. we have perl in our code base?
  2. why is there not a test for this file directly as there would be for a python script of this type?

@trilinos-autotester
Copy link
Contributor

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

@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: 4611
  • 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 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 4438
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 2869
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 2694
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 2270
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
JENKINS_JOB_TYPE Experimental
PULLREQUESTNUM 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133

Build Information

Test Name: Trilinos_pullrequest_python_2

  • Build Num: 681
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 681
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133

Using Repos:

Repo: TRILINOS (bmwiedemann/Trilinos)
  • Branch: sort
  • SHA: 84f175c
  • Mode: TEST_REPO

Pull Request Author: bmwiedemann

@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: 4611
  • 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 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 4438
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 2869
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 2694
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 2270
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
JENKINS_JOB_TYPE Experimental
PULLREQUESTNUM 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133

Build Information

Test Name: Trilinos_pullrequest_python_2

  • Build Num: 681
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 681
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5559
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH sort
TRILINOS_SOURCE_REPO https://github.com/bmwiedemann/Trilinos
TRILINOS_SOURCE_SHA 84f175c
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 4c45133


CDash Test Results for PR# 5559.

@trilinos-autotester
Copy link
Contributor

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

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

@jmgate
Copy link
Contributor

jmgate commented Sep 25, 2019

@trilinos/framework, who owns the doc directory. Should we merge this 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...

1 similar comment
@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...

@mhoemmen
Copy link
Contributor

@jmgate It's all good, as long as y'all think this is harmless. Thanks!

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

1 similar comment
@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...

@jmgate jmgate merged commit 1b88014 into trilinos:develop Sep 30, 2019
@bmwiedemann bmwiedemann deleted the sort branch August 9, 2020 13:54
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.

None yet

5 participants