Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Conversation

@hppritcha
Copy link
Member

Cherry picks of

Fixes open-mpi/ompi#869
smoke tested on a mac and a mlx_4/opteron cluster
@jsquyres

Ralph Castain and others added 3 commits November 12, 2015 16:58
…given

(cherry picked from commit open-mpi/ompi@d97bc29)

Conflicts:
	ompi/mca/topo/treematch/configure.m4
	ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c
	opal/mca/btl/openib/btl_openib_component.c
	orte/mca/ess/base/ess_base_std_orted.c
	orte/mca/ess/hnp/ess_hnp_module.c
	orte/mca/ess/pmi/ess_pmi_module.c
	orte/mca/ras/simulator/ras_sim_module.c
Put the hwloc.c file alphabetically in the list.

(cherry picked from commit open-mpi/ompi@f782a76)
This test was accidentally left over from
open-mpi/ompi@d97bc29 that prevented
the treematch component from building.

(cherry picked from commit open-mpi/ompi@794ee4a)

Conflicts:
	ompi/mca/topo/treematch/configure.m4
@hppritcha hppritcha added this to the v2.0.0 milestone Nov 14, 2015
@mellanox-github
Copy link

Test FAILed.
See http://bgate.mellanox.com/jenkins/job/gh-ompi-release-pr/1021/ for details.

@jsquyres jsquyres changed the title Topic/fix 869 Topic/fix 869: force the use of hwloc Nov 30, 2015
@jsquyres
Copy link
Member

Visual inspection looks ok, and it build ok for me. 👍

jsquyres added a commit that referenced this pull request Nov 30, 2015
Topic/fix 869: force the use of hwloc
@jsquyres jsquyres merged commit e330595 into open-mpi:v2.x Nov 30, 2015
alinask pushed a commit to alinask/ompi-release that referenced this pull request Dec 10, 2015
Update x86_32 cpuid assembly code.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants