Skip to content

Commit 17411bf

Browse files
authored
Update OpenMPI and libfabric preferences (#68)
This PR: - Makes libfabric version >= 2.2 the preferred choice, from upstream source. I've set no upper bound since we really do want to be testing the latest versions as they drop in. If anything we could set a constraint not to use libfabric 3 if/when that release happens as that is likely to need more testing. - Removes the custom openmpi package, all changes are upstream and e.g. in eth-cscs/alps-uenv#263 I anyway want to use a very recent spack-packages commit
1 parent 0eb016f commit 17411bf

20 files changed

+19
-2950
lines changed

site/network/amdgpu/network.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
mpi:
22
cray-mpich:
3-
specs: ["libfabric@1.22"]
3+
specs: ["libfabric@2.2:"]
44
openmpi:
5-
specs: ["[email protected].0 fabrics=lnx"]
5+
specs: ["[email protected]: fabrics=lnx,shm,xpmem"]
66
packages:
77
# adding a variant to the variants field of a package
88
# e.g. packages:openmpi:variants
@@ -15,6 +15,7 @@ packages:
1515
- '+internal-pmix'
1616
- '+cray-xpmem'
1717
prefer:
18+
- '@5.0.9:'
1819
- '+rocm'
1920
variants: []
2021
cray-mpich:
@@ -27,7 +28,9 @@ packages:
2728
externals:
2829
- spec: [email protected] fabrics=cxi,rxm,tcp,rxd,udp +rocm amdgpu_target=gfx90a,gfx942
2930
prefix: /opt/cray/libfabric/1.22.0/
30-
version: ["2.2.0"]
31+
prefer:
32+
- '@2.2:'
33+
- '+rocm'
3134
require: fabrics=cxi,rxm,tcp
3235
libcxi:
3336
version: ["git.be1f7149482581ad589a124e5f6764b9d20d2d45=main"]

site/network/gh200/network.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
mpi:
22
cray-mpich:
3-
specs: ["libfabric@1.22"]
3+
specs: ["libfabric@2.2:"]
44
openmpi:
5-
specs: ["[email protected].0 fabrics=lnx"]
5+
specs: ["[email protected]: fabrics=lnx,shm,xpmem"]
66
packages:
77
# adding a variant to the variants field of a package
88
# e.g. packages:openmpi:variants
@@ -15,6 +15,7 @@ packages:
1515
- '+internal-pmix'
1616
- '+cray-xpmem'
1717
prefer:
18+
- '@5.0.9:'
1819
- '+cuda'
1920
variants: []
2021
cray-mpich:
@@ -29,7 +30,10 @@ packages:
2930
prefix: /opt/cray/libfabric/1.22.0
3031
- spec: [email protected] fabrics=cxi,rxm,tcp,rxd,udp +cuda cuda_arch=90,90a
3132
prefix: /opt/cray/libfabric/1.15.2.0
32-
version: ["2.2.0"]
33+
prefer:
34+
- '@2.2:'
35+
- '+cuda'
36+
- '+gdrcopy'
3337
require: fabrics=cxi,rxm,tcp
3438
libcxi:
3539
version: ["git.be1f7149482581ad589a124e5f6764b9d20d2d45=main"]

site/network/zen/network.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
mpi:
22
cray-mpich:
3-
specs: ["libfabric@1.22"]
3+
specs: ["libfabric@2.2:"]
44
openmpi:
5-
specs: ["[email protected].0 fabrics=lnx"]
5+
specs: ["[email protected]: fabrics=lnx,shm,xpmem"]
66
packages:
77
# adding a variant to the variants field of a package
88
# e.g. packages:openmpi:variants
@@ -14,8 +14,8 @@ packages:
1414
- 'fabrics=cma,ofi,xpmem'
1515
- '+internal-pmix'
1616
- '+cray-xpmem'
17-
prefer: []
18-
#- '+cuda'
17+
prefer:
18+
- '@5:'
1919
variants: []
2020
cray-mpich:
2121
buildable: true
@@ -28,7 +28,8 @@ packages:
2828
prefix: /opt/cray/libfabric/1.22.0/
2929
- spec: [email protected] fabrics=cxi,rxm,tcp,rxd,udp
3030
prefix: /opt/cray/libfabric/1.15.2.0/
31-
version: ["2.2.0"]
31+
prefer:
32+
- '@2.2:'
3233
require: fabrics=cxi,rxm,tcp
3334
libcxi:
3435
version: ["git.be1f7149482581ad589a124e5f6764b9d20d2d45=main"]

site/spack_repo/alps/packages/openmpi/accelerator-build-components-as-dso-s-by-default.patch

Lines changed: 0 additions & 81 deletions
This file was deleted.

site/spack_repo/alps/packages/openmpi/accelerator-cuda-fix-bug-in-makefile.patch

Lines changed: 0 additions & 33 deletions
This file was deleted.

site/spack_repo/alps/packages/openmpi/ad_lustre_rwcontig_open_source.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

site/spack_repo/alps/packages/openmpi/btl_vader.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

site/spack_repo/alps/packages/openmpi/btlsmcuda-fix-problem-with-makefile.patch

Lines changed: 0 additions & 73 deletions
This file was deleted.

site/spack_repo/alps/packages/openmpi/configure.patch

Lines changed: 0 additions & 31 deletions
This file was deleted.

site/spack_repo/alps/packages/openmpi/fix-for-dlopen-missing-symbol-problem.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)