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

Bgq mxm #4

Merged
merged 4 commits into from
Jun 3, 2016
Merged

Bgq mxm #4

merged 4 commits into from
Jun 3, 2016

Conversation

maxhutch
Copy link
Contributor

@maxhutch maxhutch commented Jun 3, 2016

Adding bgq assembly version of mxm for common sizes. Also includes dummy cmt.

PPLIST now expects BGL instead of BG to build for BG/L and BG/P.
This was to avoid grep matching BG to BGQ.

mxm_wrapper intercepts mxm if mod(n1,4) == 0 and n2 = {6,8,10,12,16}.
@RonRahaman
Copy link
Contributor

Looks good. I think we should merge this before merging #5, then manually fix conflicts in #5. Should be easy.

@RonRahaman RonRahaman merged commit 5a0f245 into Nek5000:master Jun 3, 2016
@RonRahaman
Copy link
Contributor

I didn't realize this was merging into Nek5000:master. I realized this after merging #5 into develop. I rebased develop, and now the history looks reasonable now. I certainly don't plan to rebase routinely. I'll be more vigilant next time.

@maxhutch maxhutch deleted the bgq_mxm branch June 6, 2016 16:26
RonRahaman referenced this pull request in RonRahaman/Nek5000 Aug 18, 2016
Added tools from nek5000 into a tools folder since they are used in the examples (prevent having to fetch code from nek5000 repo)
RonRahaman referenced this pull request in RonRahaman/Nek5000 Sep 6, 2016
Fixes to makenek, makefiles for MOAB, SHARP
RonRahaman referenced this pull request in RonRahaman/Nek5000 Sep 20, 2016
kent0 pushed a commit to kent0/Nek5000 that referenced this pull request Jul 25, 2017
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.

2 participants