Skip to content

Merge post-1.6.0-release master into caffeinated-opencoarrays #187

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 22 commits into from
Jun 4, 2016
Merged

Merge post-1.6.0-release master into caffeinated-opencoarrays #187

merged 22 commits into from
Jun 4, 2016

Conversation

@rouson
Copy link
Member

@rouson rouson commented May 19, 2016

No description provided.

@zbeekman
Copy link
Collaborator

@rouson I can work to resolve these conflicts, if this is ready to merge

@rouson
Copy link
Member Author

rouson commented May 31, 2016

@zbeekman yes, please do.

Damian Rouson added 2 commits June 3, 2016 23:15
Use any of ftp wget curl (#196)
706ea5a 
Removed download-mechanism platform-dependence.
Use svn for all branch builds or branch list queries
Use curl, wget, or ftp in decreasing order of preference as measured by robustness.

* Restrict ftp to sites that offer anonymous ftp

* Improve error output when non-OSX OFP build required
caf invokes compiler specified by OC-build-time FC (#197)
f3f6a78
@zbeekman
Copy link
Collaborator

zbeekman commented Jun 4, 2016

I'm going to wait until I've merged a few outstanding PRs, namely #195 and #194

zbeekman and others added 5 commits June 4, 2016 14:11
@zbeekman
Fixes #48 Navier-Stokes test failures.
5e816e4
@zbeekman
Fix CI silent failures
6b47189
@zbeekman
Full barrier for any allocation
ad94d57
@zbeekman
Add more stressful test to catch #42 more often
a433b88 
 Also, limit building dist_transpose more accurately: It should not be
 built during a CodeCoverage build (`cmake
 -DCMAKE_BUILD_TYPE=CodeCoverage`) but *can* be built during other
 Travis-CI tests.
@zbeekman
Merge pull request #195 from sourceryinstitute/bugfix-allocate_as_bar…
e7d7bcc 
…rier_proc

Fixes #161 and tweaks test to find it more consistently if a regression is introduced
Fixes #42
@zbeekman zbeekman removed the waiting label Jun 4, 2016
@zbeekman zbeekman merged commit e7d7bcc into caffeinate-opencoarrays Jun 4, 2016
@zbeekman
Copy link
Collaborator

zbeekman commented Jun 4, 2016

@rouson Can you please test this to make sure I didn't mess anything up here? Specifically that the caf script gets written correctly and incorporates your fixes to #193 correctly?

@zbeekman
Copy link
Collaborator

zbeekman commented Jun 4, 2016 •
edited
Loading

In particular the files to scrutinize are:

  • caf-foot
  • src/mpi/CMakeLists.txt
  • prerequisites/install-functions/find_or_install.sh

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@rouson @zbeekman