Skip to content

Commit

Permalink
Merge branch 'master' into issue-632-coarrays-teams
Browse files Browse the repository at this point in the history
  • Loading branch information
zbeekman committed Apr 21, 2019
2 parents 31af933 + b6628f6 commit 93edc85
Show file tree
Hide file tree
Showing 20 changed files with 190 additions and 118 deletions.
16 changes: 8 additions & 8 deletions .Dockerfiles/master-jupyter-inherit/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM jupyter/minimal-notebook:f3652d3f58f2
FROM jupyter/minimal-notebook:4cdbc9cdb7d1

USER root
ENV GCC_VERSION 7.3.0
ENV GCC_VERSION 8.2.0

RUN DEBIAN_FRONTEND=noninteractive transientBuildDeps="file" \
&& echo "NB_USER=${NB_USER}" \
Expand All @@ -16,14 +16,14 @@ RUN DEBIAN_FRONTEND=noninteractive transientBuildDeps="file" \
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
build-essential \
gcc-7>=7.3.0 \
gfortran-7>=7.3.0 \
g++-7>=7.3.0 \
gcc-8>=8.2.0 \
gfortran-8>=8.2.0 \
g++-8>=8.2.0 \
mpich>=3.2 \
libmpich-dev>=3.2 \
${transientBuildDeps} \
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-7 \
&& update-alternatives --set gcc "/usr/bin/gcc-7" \
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-8 \
&& update-alternatives --set gcc "/usr/bin/gcc-8" \
&& gcc --version \
&& gfortran --version \
&& mpiexec --version \
Expand Down Expand Up @@ -74,4 +74,4 @@ RUN DEBIAN_FRONTEND=noninteractive transientBuildDeps="cmake cmake-data git" \
&& apt-get purge -y --auto-remove ${transientBuildDeps} \
&& rm -rf /var/lib/apt/lists/* /var/log/* /tmp/*

USER "${NB_USER}"
USER "${NB_USER}"
2 changes: 1 addition & 1 deletion .Dockerfiles/master-jupyter-inherit/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ build: $(subst /,_,$(NAME))-build.stamp ## Build docker file. Depending on which

$(subst /,_,$(NAME))-build.stamp: Dockerfile .dockerignore hooks/build ## Target for doing & timestamping the build
touch $@
hooks/build 2>&1 | tee $(subst stamp,log,$@) || rm -rf $@
IMAGE_NAME=$(IMAGE_NAME) hooks/build 2>&1 | tee $(subst stamp,log,$@) || rm -rf $@
docker tag $(NAME) $(NAME):$(GIT_MASTER_HEAD_SHA)
docker tag $(NAME) $(NAME):latest

Expand Down
8 changes: 5 additions & 3 deletions .Dockerfiles/master-jupyter-inherit/hooks/build
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ git fetch -v --all --depth=9999999 --update-shallow
git tag --list
git branch

echo "Info: value of IMAGE_NAME = ${IMAGE_NAME:-<unset>}"

d_repo='sourceryinstitute/OpenCoarrays'
d_git_remotes=("$(git remote show)")
echo "${#d_git_remotes[@]} git remotes found."
n_remotes=${#d_git_remotes[@]}
if (( n_remotes > 0 )) ; then
echo "Using remote: ${d_git_remotes[0]}"
d_vcs_url="$(git remote -v | awk 'FNR == 1 {print $2}')"
d_vcs_url="$(git remote -v | awk '/origin/ {print $2; exit}')"
fi

if [[ -z "${d_vcs_url:-}" ]]; then
Expand Down Expand Up @@ -56,5 +58,5 @@ docker build --build-arg OPENCOARRAYS_VERSION="${opencoarrays_version}" \
--build-arg VCS_VERSION="${d_vcs_describe:-${d_tag}}" \
--rm \
--pull \
-t "${IMAGE_NAME:-$(tr '[:upper:]' '[:lower:]' <<< "${d_repo}")}:latest" .
docker tag "${IMAGE_NAME:-$(tr '[:upper:]' '[:lower:]' <<< "${d_repo}")}:latest" "${IMAGE_NAME:-$(tr '[:upper:]' '[:lower:]' <<< "${d_repo}")}:${d_vcs_tag}"
-t "${IMAGE_NAME:-$(tr '[:upper:]' '[:lower:]' <<< "${d_repo}_jupyter"):latest}" .
docker tag "${IMAGE_NAME:-$(tr '[:upper:]' '[:lower:]' <<< "${d_repo}_jupyter"):latest}" "${IMAGE_NAME:-$(tr '[:upper:]' '[:lower:]' <<< "${d_repo}_jupyter"):${d_vcs_tag}}"
2 changes: 1 addition & 1 deletion .VERSION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$Format:%d%n%n$
# Fall back version, probably last release:
2.6.1
2.6.3

# OpenCoarrays version file. This project uses semantic
# versioning. For details see http://semver.org
Expand Down
78 changes: 3 additions & 75 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,77 +1,5 @@
<!-- Please fill out the issue template included below, failure to do -->
<!-- so may result in immediate closure of your issue. -->
Please fill out one of the templates at: https://github.com/sourceryinstitute/OpenCoarrays/issues/new/choose

<!-- Fill out all portions of this template that apply. Please delete -->
<!-- any unnecessary sections. -->
Failure to fill out a template will result in the issue being closed without comment.

<!-- PRO TIP! Submit the pull request *before* you check any -->
<!-- checkboxes. Then, use the gui/web interface to check the -->
<!-- checkboxes! -->

[issue stat img]: https://img.shields.io/issuestats/i/github/sourceryinstitute/OpenCoarrays.svg?style=flat-square

| Avg response time |
|:------------------------------:|
| ![Issue Stats][issue stat img] |

Please make sure to put any logs, terminal output, or code in
[fenced code blocks]. Please also read the [contributing guidelines]
before submitting a new issue.

# Defect/Bug Report #

<!-- delete this section if it does not apply -->
The title of the issue should start with `Defect:` followed by a
succinct title.

<!-- THE FOLLOWING INFORMATION IS MANDATORY if you would like our help -->

- OpenCoarrays Version: <!-- `caf --version` or `./install.sh --version` -->
- Fortran Compiler: <!-- vendor & version number-->
- C compiler used for building lib: <!-- vendor & version -->
- Installation method: <!-- `install.sh`, or package manager etc. -->
- Output of `uname -a`:
- MPI library being used: <!-- e.g., MPICH 3.2 -->
- Machine architecture and number of physical cores:
- Version of CMake: <!-- if preinstalled & installing yourself -->

## Observed Behavior ##

## Expected Behavior ##

## Steps to Reproduce ##

# Question #

<!-- delete this section if it does not apply -->
The title of the issue should start with `Question:` followed by a
succinct title. Add the text of your question here. Be specific. Search for
answers on [Google] and [Stack Overflow]
before asking a new question

# Request for Enhancement (RFE) #

<!-- delete this section if it does not apply -->
The title of the issue should start with `RFE:` followed by a succinct
title. Add a description of your requested enhancement here. If you are
willing to help out please also read the [Helping Out] section of
[CONTRIBUTING.md]

[links]:#
[Google]: https://www.google.com
[Stack Overflow]: https://stackoverflow.com
[fenced codeblocks]: https://help.github.com/articles/creating-and-highlighting-code-blocks/
[GFortran bug tracker]: https://gcc.gnu.org/bugzilla/
[Intel MPI]: https://software.intel.com/en-us/intel-mpi-library
[MPT]: http://www.sgi.com/products/software/sps.html
[MVAPICH]: http://mvapich.cse.ohio-state.edu
[MPICH]: https://www.mpich.org
[Open-MPI]: https://www.open-mpi.org
[CONTRIBUTING.md]: https://github.com/sourceryinstitute/OpenCoarrays/blob/master/CONTRIBUTING.md
[Helping Out]: https://github.com/sourceryinstitute/OpenCoarrays/blob/master/CONTRIBUTING.md#helping-out
[official release]: https://github.com/sourceryinstitute/OpenCoarrays/releases
[CMake install]: https://github.com/sourceryinstitute/OpenCoarrays/blob/master/INSTALL.md#cmake-scripts
[homebrew]: https://brew.sh
[issues page]: https://github.com/sourceryinstitute/OpenCoarrays/issues
[mailing list]: https://groups.google.com/forum/#!forum/opencoarrays
[install.sh]: https://github.com/sourceryinstitute/OpenCoarrays/blob/master/install.sh
Thanks!
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/questions-and-support-requests.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: Questions and Support Requests
about: Issue template to use for general questions and support request that are not
bugs or feature requests.

---

**Please note we will close your issue without comment if you delete, do not read or do not fill out the issue checklist below and provide ALL the requested information.**

The title of the issue should start with `Question:` followed by a
succinct title.

<!-- PRO TIP! You can submit the issue first, then use the gui/web interface to check the -->
<!-- checkboxes! -->

- [ ] I am not reporting a bug or asking for a new feature
- [ ] I am asking a general question about, e.g., the internal workings of this software, the direct use of this software, or use cases for this software, etc.
- [ ] I have already searched for the answer to my question on [Google] and [Stack Overflow]

Please be descriptive, precise and concise. Thanks!

[Google]: https://www.google.com
[Stack Overflow]: https://stackoverflow.com
46 changes: 46 additions & 0 deletions .github/ISSUE_TEMPLATE/reproducible-bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
---
name: Reproducible Bug Report
about: File a bug report so we can fix it

---

The title of the issue should start with `Defect:` followed by a
succinct title.

Please make sure to put any logs, terminal output, or code in
[fenced code blocks]. Please also read the [contributing guidelines][CONTRIBUTING.md]
before submitting a new issue.

**Please note we will close your issue without comment if you delete, do not read or do not fill out the issue checklist below and provide ALL the requested information.**

- [ ] I am reporting a bug others will be able to reproduce and not asking a question or requesting a new feature.

## System information including:
- OpenCoarrays Version: <!-- `caf --version` or `./install.sh --version` -->
- Fortran Compiler: <!-- vendor & version number-->
- C compiler used for building lib: <!-- vendor & version -->
- Installation method: <!-- `install.sh`, or package manager etc. -->
- All flags & options passed to the installer
- Output of `uname -a`:
- MPI library being used: <!-- e.g., MPICH 3.2 -->
- Machine architecture and number of physical cores:
- Version of CMake: <!-- if preinstalled & installing yourself -->

## To help us debug your issue please explain:

### What you were trying to do (and why)


### What happened (include command output, screenshots, logs, etc.)


### What you expected to happen


### Step-by-step reproduction instructions to reproduce the error/bug



[links]:#
[fenced code blocks]: https://help.github.com/articles/creating-and-highlighting-code-blocks/
[CONTRIBUTING.md]: https://github.com/sourceryinstitute/OpenCoarrays/blob/master/CONTRIBUTING.md
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/request-for-enhancement.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Request for Enhancement
about: Request a new feature or new functionality in this project

---

The title of the issue should start with `RFE:` followed by a succinct
title. If you are
willing to help out please also read the [Helping Out] section of
[CONTRIBUTING.md]

Please replace this section with:

- a detailed description of your proposed feature
- the motivation for the feature, i.e., why would this software be better if your feature were added?
- how the feature would be relevant to users (if it's not: do not open a feature request)
- what alternatives to the feature you have considered

[CONTRIBUTING.md]: https://github.com/sourceryinstitute/OpenCoarrays/blob/master/CONTRIBUTING.md
[Helping Out]: https://github.com/sourceryinstitute/OpenCoarrays/blob/master/CONTRIBUTING.md#helping-out
51 changes: 30 additions & 21 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Please fill out the pull request template included below, failure -->
<!-- to do so may result in immediate closure of your pull request. -->
<!-- Please fill out the pull request template included below. Failure -->
<!-- to do so may result in immediate closure of your pull request! -->

<!-- Fill out all portions of this template that apply. Please delete -->
<!-- any unnecessary sections. -->
Expand All @@ -11,12 +11,11 @@
[links]:#
[contributing guidelines]: https://github.com/sourceryinstitute/OpenCoarrays/blob/master/CONTRIBUTING.md
[issue]: https://github.com/sourceryinstitute/OpenCoarrays/issues
[PR response img]: https://img.shields.io/issuestats/p/github/sourceryinstitute/OpenCoarrays.svg?style=flat-square
[coverage]: https://img.shields.io/codecov/c/github/sourceryinstitute/OpenCoarrays/master.svg?style=flat-square

| Avg response time | coverage on master |
|:---------------------------------:|:---------------------------:|
| ![Issue Stats][PR response img] | ![Codecov branch][coverage] |
| coverage on master |
|:---------------------------:|
| ![Codecov branch][coverage] |

## Summary of changes ##

Expand All @@ -36,18 +35,28 @@ This pull request (PR) is a:

### I certify that ###

- [ ] I reviewed and followed the [contributing guidelines], including
- Increasing test coverage for all feature-addition PRs
- Increasing test coverage for all bug-fix PRs for which there
does not already exist a related test that failed before the PR
- At least maintaining test coverage for all other PRs
- Ensuring that all tests pass when run locally
- Naming PR to indicate work in progress (WIP) and to attach the PR
to the appropriate bug report or feature request [issue]
- White space (no trailing white space or white space errors may
be introduced)
- Commenting code where it is non-obvious and non-trivial
- Logically atomic, self consistent and coherent commits
- Commit message content
- Waiting 24 hours before self-approving the PR to give another
OpenCoarrays developer a chance to review my proposed code
- [ ] I certify that:
- I have reviewed and followed the [contributing guidelines]
- I will wait at least 24 hours before self-approving the PR to give another
OpenCoarrays developer a chance to review my proposed code
- I have not introduced errant white space (no trailing white space or white space errors may
be introduced)
- I have added an explanation of what these changes do and why they should be included
- I have checked to ensure there aren't other open [Pull Requests] for the same change
- I have you written new tests for these changes
- I have successfully tested these changes locally
- I have commented any non-trivial, non-obvious code changes
- The commits are logically atomic, self consistent and coherent
- The [commit messages] follow [best practices]
- Test coverage is maintained or increased after this is merged


## Code coverage data

![coverage on master](https://codecov.io/gh/sourceryinstitute/OpenCoarrays/branch/master/graphs/commits.svg)


[links]: #
[best practices]: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
[commit messages]: https://thoughtbot.com/blog/5-useful-tips-for-a-better-commit-message
[Pull Requests]: https://github.com/sourceryinstitue/OpenCoarrays/pulls
13 changes: 13 additions & 0 deletions .github/no-response.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Configuration for probot-no-response - https://github.com/probot/no-response

# Number of days of inactivity before an Issue is closed for lack of response
daysUntilClose: 21
# Label requiring a response
responseRequiredLabel: needs response
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
closeComment: >
This issue has been automatically closed because there has been no response
to our request for more information from the original author. With only the
information that is currently in the issue, we don't have enough information
to take action. Please reach out if you have or find the answers we need so
that we can investigate further.
18 changes: 18 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Configuration for probot-stale - https://github.com/probot/stale

# Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 28
# Number of days of inactivity before a stale Issue or Pull Request is closed
daysUntilClose: 21
# Issues or Pull Requests with these labels will never be considered stale
exemptLabels:
- help wanted
- in progress
- in-progress
- help-wanted
# Label to use when marking as stale
staleLabel: stale
# Comment to post when marking as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "wiki"]
path = wiki
url = ../OpenCoarrays.wiki.git
4 changes: 2 additions & 2 deletions Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

brew 'cmake'
brew 'gcc'
brew 'mpich', args: ['cc=gcc-7', 'build-from-source']
brew 'opencoarrays', args: ['cc=gcc-7', 'build-from-source']
brew 'mpich', args: ['cc=gcc-8', 'build-from-source']
brew 'opencoarrays', args: ['cc=gcc-8', 'build-from-source']

# [Homebrew]: http://brew.sh
# [Linuxbrew]: http://linuxbrew.sh
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ OpenCoarrays
[![Download as PDF][pdf img]](https://md2pdf.herokuapp.com/sourceryinstitute/OpenCoarrays/blob/master/README.pdf)
[![Twitter URL][twitter img]][default tweet]

[News](#news) | [Overview](#overview) | [Downloads](#downloads) |
[Overview](#overview) | [Downloads](#downloads) |
[Compatibility](#compatibility) | [Prerequisites](#prerequisites) |
[Installation](#installation) | [Getting Started](#getting-started) |
[Contributing](#contributing) | [Status](#status)
Expand Down Expand Up @@ -150,7 +150,6 @@ to aid in development efforts.

[Hyperlinks]:#

[News]: #news
[Overview]: #overview
[Downloads]: #downloads
[Compatibility]: #compatibility
Expand Down Expand Up @@ -190,7 +189,7 @@ to aid in development efforts.
[Jupyter]: https://jupyter.org
[index.ipynb]: https://nbviewer.jupyter.org/github/sourceryinstitute/jupyter-CAF-kernel/blob/master/index.ipynb

[build img]: https://img.shields.io/travis-ci/sourceryinstitute/OpenCoarrays/master.svg?style=flat-square "Travis-CI build badge"
[build img]: https://img.shields.io/travis/sourceryinstitute/OpenCoarrays.svg?style=flat-square "Build badge"
[CI Master Branch]: https://travis-ci.org/sourceryinstitute/OpenCoarrays?branch=master "View Travis-CI builds"
[download img]: https://img.shields.io/github/downloads/sourceryinstitute/OpenCoarrays/total.svg?style=flat-square "Download count badge"
[license img]: https://img.shields.io/badge/license-BSD--3-blue.svg?style=flat-square "BSD-3 License badge"
Expand Down
Loading

0 comments on commit 93edc85

Please sign in to comment.