forked from trilinos/Trilinos
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature-superlu5all
* develop: (812 commits) MueLu: comment out mmayr research subdirectory Enable Tacho in Kokkos promotion configuration Shylu/Tacho - fix the unit test failure described in trilinos#1935 Tpetra: Fix spelling errors (see trilinos#1956) Intrepid2: implementing new design suggested by Kyungjoo to have work view of rank 1, instead of having a work view of rank 2 or 3. In this case we have to expose Fad dimension. Intrepid2: introduce new function get_dimension_scalar(view) that returns the dimension_scalar(view), for non pod view types (defined e.g. in Sacado) and returns 1 for pod types. HHG: 1D test code to figure out issues with parallelism MueLu tutorial: correct instructions in README file MueLu/HHG: setup row maps for each region MueLu/HHG: setup data structure to store all nodes in each region MueLu/HHG: read proc info from file MueLu/HHG: write region matrix information to file (using Matlab) MueLu/HHG: attempt to fix indices MueLu/HHG: First draft of regional splitting of matrices MueLu/HHG by Max: move creation of Xpetra::MatrixSplitting to driver MueLu/HHG by Max: move creation of RegionHandler to Test_xpetra.cpp Single versus double colon. Fixed FS example. ShyLU: Add missing TRIBITS_PACKAGE_DEF() calls (TriBITSPub/TriBITS#200) Enable ST code in ST extrab builds ...
- Loading branch information
Showing
4,570 changed files
with
294,379 additions
and
483,851 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -145,3 +145,6 @@ rsync.* | |
# Ignore files generated from INSTALL.rst | ||
/INSTALL.html | ||
/INSTALL.pdf | ||
|
||
# VIM YCM | ||
.ycm_extra_conf.py |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,76 @@ | ||
# Trilinos Contributors Policy | ||
# Contributing to Trilinos | ||
|
||
Placeholder for now. | ||
Thank you for your willingness to contribute to the Trilinos project. The procedure to do so is the following: | ||
|
||
## Create a GitHub Issue | ||
|
||
Navigate to Trilinos' [GitHub Issues page](https://github.com/trilinos/Trilinos/issues) and create a new issue. The issue can be used for any number of things—reporting a bug, suggesting an enhancement, posing a question, etc. On the new issue creation page, you'll notice the *Description* field will be pre-populated with some text. Follow the instructions in that template to give us as much information as you can such that we can tackle the issue as soon as is practicable. | ||
|
||
## Work an Issue | ||
|
||
When work is ready to commence on an issue, the workflow to use is the following: | ||
|
||
### Fork Trilinos | ||
|
||
* If you have not already done so, create a fork of Trilinos on GitHub under your username. | ||
* Clone your fork of Trilinos with `git clone [email protected]:<username>/Trilinos`. | ||
* Each time you clone your fork, `git remote add upstream [email protected]:trilinos/Trilinos` to add the original Trilinos repository as the `upstream` remote. | ||
|
||
### Update the Main Development Branches | ||
|
||
To keep your `master` and `develop` branches up-to-date with those from `upstream`: | ||
|
||
* `git fetch --all` | ||
* `git checkout master` | ||
* `git merge upstream/master` | ||
* `git push origin master` | ||
* `git checkout develop` | ||
* `git merge upstream/develop` | ||
* `git push origin develop` | ||
|
||
You want to do this before starting work on a new feature branch. | ||
|
||
> **Note:** Updating `master` is not strictly necessary, as all development work is done off of `develop`. | ||
### Create a Feature Branch | ||
|
||
Create a local branch off of `develop` on which to make your changes: | ||
|
||
* `git checkout develop` | ||
* `git checkout -b <branchName>` | ||
|
||
`<branchName>` can be whatever you like, though we have some recommendations: | ||
* Include the issue number in it in some way, for instance, `123-<restOfBranchName>`, or `<restOfBranchName>-123`. | ||
* Make the branch name descriptive; that is, avoid `fixSomeStuff`, `performanceTweaks`, and generic names along those lines. | ||
* To indicate your branch is intended solely for your own use, preface the branch name with your username, as in `<username>/<restOfBranchName>`. | ||
|
||
### Make Your Changes | ||
|
||
Do whatever work is necessary to address the issue you're tackling, breaking your work into logical, compilable commits. Feel free to commit small chunks early and often in your local repository and then use `git rebase -i` to reorganize your commits before sharing. | ||
|
||
### Update Your Branch | ||
|
||
While working on your feature in your local `<branchName>` branch, other commits will likely make it into the real Trilinos `develop` branch. There are a variety of ways to merge these changes into your local feature branch. One possibility is | ||
|
||
* `git checkout <branchName>` | ||
* `git fetch --all` | ||
* `git merge upstream/develop` | ||
|
||
though there are others that are equally valid. | ||
|
||
### Create a Pull Request | ||
|
||
When your changes are ready to be integrated into Trilinos' `develop` branch: | ||
|
||
* Push your local feature branch up to your fork with `git push -u origin <branchName>`. | ||
* Navigate to your fork of Trilinos on GitHub and create a new pull request: | ||
* Be sure you choose: | ||
* base fork: `trilinos/Trilinos` | ||
* base: `develop` | ||
* head fork: `<username>/Trilinos` | ||
* compare: `<branchName>` | ||
* On the new pull request creation page, you'll notice the *Description* field will be pre-populated with some text. Follow the instructions in that template to give us as much information as you can such that we can review and approve the issue as soon as is practicable. | ||
|
||
### Feedback | ||
|
||
At this point you'll enter into a stage where you and various Trilinos developers will iterate back and forth until your changes are in an acceptable state and can be merged in. If you need to make changes to your pull request, make additional commits on your `<branchName>` branch and push them up to your fork. Make sure you don't delete your remote feature branch or your fork of Trilinos before your pull request has been merged. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
<!--- Provide a general summary of the issue in the Title above. --> | ||
|
||
<!--- | ||
Note that anything between these delimiters is a comment that will not appear | ||
in the issue description once created. Click on the Preview tab to see what | ||
everything will look like when you submit. | ||
--> | ||
|
||
<!--- | ||
Feel free to delete anything from this template that is not applicable to the | ||
issue you are submitting. | ||
--> | ||
|
||
<!--- | ||
Replace <teamName> below with the appropriate Trilinos package/team name. | ||
--> | ||
@trilinos/<teamName> | ||
|
||
<!--- | ||
Assignees: If you know anyone who should likely tackle this issue, select them | ||
from the Assignees drop-down on the right. | ||
--> | ||
|
||
<!--- | ||
Lables: Choose any applicable package names from the Labels drop-down on the | ||
right. Additionally, choose a label to indicate the type of issue, for | ||
instance, bug, build, documentation, enhancement, etc. | ||
--> | ||
|
||
## Expectations | ||
<!--- | ||
Tell us what you think should happen, how you think things should work, what | ||
you would like to see in the documentation, etc. | ||
--> | ||
|
||
## Current Behavior | ||
<!--- | ||
Tell us how the current behavior fails to meet your expectations in some way. | ||
--> | ||
|
||
## Motivation and Context | ||
<!--- | ||
How has this expectation failure affected you? What are you trying to | ||
accomplish? Why do we need to address this? What does it have to do with | ||
anything? Providing context helps us come up with a solution that is most | ||
useful in the real world. | ||
--> | ||
|
||
## Definition of Done | ||
<!--- | ||
Tell us what needs to happen. If necessary, give us a task lisk along the | ||
lines of: | ||
- [ ] First do this. | ||
- [ ] Then do that. | ||
- [ ] Also this other thing. | ||
--> | ||
|
||
## Possible Solution | ||
<!--- | ||
Not obligatory, but suggest a fix for the bug or documentation, or suggest | ||
ideas on how to implement the addition or change. | ||
--> | ||
|
||
## Steps to Reproduce | ||
<!--- | ||
Provide a link to a live example, or an unambiguous set of steps to reproduce | ||
this issue. Include code to reproduce, if relevant. | ||
1. Do this. | ||
1. Do that. | ||
1. Shake fist angrily at computer. | ||
--> | ||
|
||
## Your Environment | ||
<!--- | ||
Include relevant details about your environment such that we can replicate this | ||
issue. | ||
--> | ||
- **Relevant repo SHA1s:** | ||
- **Relevant configure flags or configure script:** | ||
- **Operating system and version:** | ||
- **Compiler and TPL versions:** | ||
|
||
## Related Issues | ||
<!--- | ||
If applicable, let us know how this bug is related to any other open issues: | ||
--> | ||
* Blocks | ||
* Is blocked by | ||
* Follows | ||
* Precedes | ||
* Related to | ||
* Part of | ||
* Composed of | ||
|
||
## Additional Information | ||
<!--- | ||
Anything else that might be helpful for us to know in addressing this issue: | ||
* Configure log file: | ||
* Build log file: | ||
* Test log file: | ||
* When was the last time everything worked (date/time; SHA1s; etc.)? | ||
* What did you do that made the bug rear its ugly head? | ||
* Have you tried turning it off and on again? | ||
--> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
<!--- Provide a general summary of your changes in the Title above. --> | ||
|
||
<!--- | ||
Note that anything between these delimiters is a comment that will not appear | ||
in the pull request description once created. | ||
--> | ||
|
||
<!--- | ||
Replace <teamName> below with the appropriate Trilinos package/team name. | ||
--> | ||
@trilinos/<teamName> | ||
|
||
<!--- | ||
Reviewers: If you know someone who is knowledgeable about what you are | ||
changing, or perhaps someone who should be, and you would like them to review | ||
your changes before they are accepted, select them from the Reviewers drop-down | ||
on the right. | ||
--> | ||
|
||
<!--- | ||
Assignees: If you know anyone who should likely handle bringing this pull | ||
request to completion, select them from the Assignees drop-down on the right. | ||
If you have write-access to Trilinos, this should likely be you. | ||
--> | ||
|
||
<!--- | ||
Lables: Choose any applicable package names from the Labels drop-down on the | ||
right. Additionally, choose a label to indicate the type of issue, for | ||
instance, bug, build, documentation, enhancement, etc. | ||
--> | ||
|
||
## Description | ||
<!--- Describe your changes in detail. --> | ||
|
||
## Motivation and Context | ||
<!--- Why is this change required? What problem does it solve? --> | ||
|
||
## Related Issues | ||
<!--- | ||
If applicable, let us know how this merge request is related to any other open | ||
issues or pull requests: | ||
--> | ||
* Closes | ||
* Blocks | ||
* Is blocked by | ||
* Follows | ||
* Precedes | ||
* Related to | ||
* Part of | ||
* Composed of | ||
|
||
## How Has This Been Tested? | ||
<!--- | ||
Please describe in detail how you tested your changes. Include details of your | ||
testing environment and the tests you ran to see how your change affects other | ||
areas of the code. Consider including configure, build, and test log files. | ||
--> | ||
|
||
## Screenshots | ||
<!--- Not obligatory, but is there anything pertinent that we should see? --> | ||
|
||
## Checklist | ||
<!--- | ||
Go over all the following points, and put an `x` in all the boxes that apply. | ||
If you are unsure about any of these, please ask—we are here to help. | ||
--> | ||
- [ ] 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](../blob/master/CONTRIBUTING.md) 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. | ||
|
||
## Additional Information | ||
<!--- Anything else we need to know in evaluating this merge request? --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.