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

Submodule revert #2851

Merged
merged 8 commits into from Nov 8, 2017
Merged

Submodule revert #2851

merged 8 commits into from Nov 8, 2017

Conversation

raffenet
Copy link
Contributor

@raffenet raffenet commented Nov 8, 2017

Revert confdb, mpl and hydra as submodules back to in-repo source.

@raffenet
Copy link
Contributor Author

raffenet commented Nov 8, 2017

test:jenkins/ch3/tcp

echo "########################################################"
echo

if test ! -e "src/mpl/confdb/aclocal.m4" ; then
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this need to be changed to check for hwloc rather than being removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I guess that should go in Hydra's autogen.sh. There is no hwloc in MPICH yet.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm, on second thought, it could probably go here.

@yfguo
Copy link
Contributor

yfguo commented Nov 8, 2017

Since hwloc need to be a submodule, I think we should do it in this PR.
We also need to pick pmodels/confdb#1 back here.

@raffenet
Copy link
Contributor Author

raffenet commented Nov 8, 2017

Can you add those commits onto this branch?

@yfguo
Copy link
Contributor

yfguo commented Nov 8, 2017

Sure. I can add them right now.

@yfguo
Copy link
Contributor

yfguo commented Nov 8, 2017

@raffenet Added two commit: Fix F08 and add hwloc as a submodule. You might run into some conflict when rebasing, do a git add . and git commit, then git submodule deinit -f ./ should fix it and clean up.

@raffenet
Copy link
Contributor Author

raffenet commented Nov 8, 2017

test:jenkins/ch3/tcp

@raffenet
Copy link
Contributor Author

raffenet commented Nov 8, 2017

hwloc submodule is not working.

@yfguo
Copy link
Contributor

yfguo commented Nov 8, 2017

test:jenkins/ch3/tcp

@yfguo
Copy link
Contributor

yfguo commented Nov 8, 2017

I picked wrong version. Now it should work.

@raffenet
Copy link
Contributor Author

raffenet commented Nov 8, 2017

@wesbland no, those aren't in this PR. I will add them now.

@raffenet
Copy link
Contributor Author

raffenet commented Nov 8, 2017

test:jenkins/ch3/tcp

@wesbland the .gitignore update shouldn't be necessary, as everything should be covered by the main MPICH file.

@raffenet
Copy link
Contributor Author

raffenet commented Nov 8, 2017

test:jenkins/ch3/tcp

@wesbland
Copy link
Contributor

wesbland commented Nov 8, 2017

Yep. That's true.

@raffenet
Copy link
Contributor Author

raffenet commented Nov 8, 2017

@yfguo test builds look good so far. I'd like to get this merged sooner rather than later so we can move on to other PRs. What do you think?

@yfguo
Copy link
Contributor

yfguo commented Nov 8, 2017

I agree. I can signoff and merge.

raffenet and others added 8 commits November 8, 2017 10:27
This reverts commit a7ac6e8.

Signed-off-by: Yanfei Guo <yguo@anl.gov>
This reverts commit e61b7f9.

Signed-off-by: Yanfei Guo <yguo@anl.gov>
This reverts commit 90df096.

Signed-off-by: Yanfei Guo <yguo@anl.gov>
This reverts commit 0e8d809.

Signed-off-by: Yanfei Guo <yguo@anl.gov>
This reverts commit 93f6f8e.

Signed-off-by: Yanfei Guo <yguo@anl.gov>
The new check is for the case where a async subarray is passed to a
assumed-type assumed-rank async dummy argument of a interface in a
module. ifort 18 is known to give compile error on it.

This is a patch to confdb after the switching to submodule. Here is to
bring it back.

Signed-off-by: Yanfei Guo <yguo@anl.gov>
Signed-off-by: Yanfei Guo <yguo@anl.gov>
Adds supports for Argobots thread interface, including: creation,
lock/unlock, yielding and condition.

Argobots can be enabled by using --with-thread-package=argobots

This commit takes the final codes from mpich-dev/mpi-argobots branch
without preserving its detail history. The original contributors are
Halim Amer, Pavan Balaji, Huiwei Lu and Sangmin Seo.

Signed-off-by: Ken Raffenetti <raffenet@mcs.anl.gov>
Signed-off-by: Yanfei Guo <yguo@anl.gov>
@yfguo yfguo merged commit 677dc09 into pmodels:master Nov 8, 2017
@raffenet raffenet deleted the submodule-revert branch November 8, 2017 16:29
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

3 participants