File tree Expand file tree Collapse file tree 7 files changed +33
-36
lines changed Expand file tree Collapse file tree 7 files changed +33
-36
lines changed Original file line number Diff line number Diff line change @@ -21,11 +21,6 @@ on: # yamllint disable-line rule:truthy
21
21
default : ' '
22
22
required : false
23
23
type : string
24
- variant :
25
- description : ' Build variant'
26
- default : ' '
27
- required : false
28
- type : string
29
24
os-arch :
30
25
description : ' Target OS-Architecture'
31
26
default : ' '
@@ -50,14 +45,6 @@ on: # yamllint disable-line rule:truthy
50
45
default : ' '
51
46
required : false
52
47
type : string
53
- variant :
54
- description : ' Build variant'
55
- default : ' '
56
- type : choice
57
- options :
58
- - ' '
59
- - ofi
60
- - ucx
61
48
os-arch :
62
49
description : " Target OS-Architecture"
63
50
default : Linux-x86_64
77
64
MPINAME : ' ${{ inputs.mpiname }}'
78
65
VERSION : ' ${{ inputs.version }}'
79
66
RELEASE : ' ${{ inputs.release }}'
80
- VARIANT : ' ${{ inputs.variant }}'
81
67
82
68
jobs :
83
69
@@ -174,7 +160,7 @@ jobs:
174
160
CIBW_TEST_COMMAND : >-
175
161
bash {project}/cibw-check-mpi.sh
176
162
CIBW_ENVIRONMENT_PASS : >-
177
- MPINAME VARIANT RELEASE
163
+ MPINAME RELEASE
178
164
CIBW_ENVIRONMENT_LINUX : >-
179
165
SOURCE="/project/package/source"
180
166
WORKDIR="/project/package/workdir"
Original file line number Diff line number Diff line change @@ -23,14 +23,6 @@ on: # yamllint disable-line rule:truthy
23
23
default : ' '
24
24
required : false
25
25
type : string
26
- variant :
27
- description : ' Build variant'
28
- default : ' '
29
- type : choice
30
- options :
31
- - ' '
32
- - ofi
33
- - ucx
34
26
os-arch :
35
27
description : " Target OS-Architecture"
36
28
default : all
58
50
mpiname : ${{ inputs.mpiname }}
59
51
version : ${{ inputs.version }}
60
52
release : ${{ inputs.release }}
61
- variant : ${{ inputs.variant }}
62
53
os-arch : ${{ inputs.os-arch }}
63
54
64
55
publish-anaconda :
Original file line number Diff line number Diff line change @@ -7,15 +7,18 @@ DESTDIR=package/install
7
7
ARCHLIST=${ARCHLIST:- $(uname -m)}
8
8
9
9
export CIBW_BUILD_FRONTEND=' build'
10
- export CIBW_BUILD=' cp312 -*'
10
+ export CIBW_BUILD=' cp313 -*'
11
11
export CIBW_SKIP=' *musllinux*'
12
12
export CIBW_ARCHS=$ARCHLIST
13
13
export CIBW_BEFORE_ALL=' bash {project}/cibw-build-mpi.sh'
14
14
export CIBW_TEST_COMMAND=' bash {project}/cibw-check-mpi.sh'
15
- export CIBW_ENVIRONMENT_PASS=' MPINAME VARIANT RELEASE SOURCE WORKDIR DESTDIR'
15
+ export CIBW_ENVIRONMENT_PASS=' MPINAME RELEASE SOURCE WORKDIR DESTDIR'
16
16
export CIBW_REPAIR_WHEEL_COMMAND_MACOS=' delocate-wheel --ignore-missing-dependencies --exclude libmpi --exclude libpmpi --require-archs {delocate_archs -w {dest_dir} -v {wheel}'
17
17
18
18
if test " $( uname) " = Linux; then
19
+ if command -v podman > /dev/null; then
20
+ export CIBW_CONTAINER_ENGINE=podman
21
+ fi
19
22
export SOURCE=" /project/$SOURCE "
20
23
export WORKDIR=" /host/$PWD /$WORKDIR "
21
24
export DESTDIR=" /host/$PWD /$DESTDIR "
Original file line number Diff line number Diff line change @@ -18,8 +18,6 @@ cd "$workdir"
18
18
whlname=$( basename " $wheelfile " )
19
19
pkgname=${whlname%% -* }
20
20
mpiname=${pkgname% _* }
21
- variant=${pkgname# " ${mpiname} " }
22
- variant=${variant# _}
23
21
24
22
data=$( ls -d " $pkgname " -* .data/data)
25
23
if test " $( uname) " = Linux; then
@@ -69,7 +67,7 @@ if test "$mpiname" = "mpich"; then
69
67
libraries=(
70
68
" $data " /lib/libmpi.*
71
69
)
72
- if test " $variant " = " ucx" ; then
70
+ if test -d " $data " /lib/ ucx; then
73
71
libraries+=(
74
72
" $data " /lib/libuc[mpst]* .*
75
73
" $data " /lib/ucx/libuc* .*
Original file line number Diff line number Diff line change 2
2
set -euo pipefail
3
3
4
4
mpiname=" ${MPINAME:- mpich} "
5
- variant=" ${VARIANT:- } "
6
5
7
6
PROJECT=$( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd)
8
7
PACKAGE=$PROJECT /package
@@ -14,11 +13,16 @@ PREFIX=${PREFIX:-"/opt/$mpiname"}
14
13
15
14
if test " $mpiname " = " mpich" ; then
16
15
version=$( sed -n ' s/MPICH_VERSION=\(.*\)/\1/p' " $SOURCE " /maint/Version)
16
+ case $( uname) -$( uname -m) in
17
+ Linux-x86_64) device=ch4:ofi,ucx ;;
18
+ Linux-aarch64) device=ch4:ofi,ucx ;;
19
+ * ) device=ch4:ofi ;;
20
+ esac
17
21
options=(
18
22
CC=cc
19
23
CXX=c++
20
24
--prefix=" $PREFIX "
21
- --with-device=ch4: " ${variant :- ofi} "
25
+ --with-device=" $device "
22
26
--with-pm=hydra:gforker
23
27
--with-libfabric=embedded
24
28
--with-ucx=embedded
@@ -76,9 +80,6 @@ if test "$(uname)" = Darwin; then
76
80
export MACOSX_DEPLOYMENT_TARGET=" 10.9"
77
81
export ac_cv_func_aligned_alloc=" no" # macOS>=10.15
78
82
fi
79
- if test " $variant " = ucx; then
80
- echo " ERROR: UCX is not supported on macOS" ; exit 1;
81
- fi
82
83
fi
83
84
84
85
case $( uname) in
Original file line number Diff line number Diff line change @@ -69,3 +69,22 @@ RUN mpicxx helloworld.cxx -o helloworld-cxx
69
69
RUN command -v mpiexec
70
70
RUN mpiexec -n 3 ./helloworld-c
71
71
RUN mpiexec -n 3 ./helloworld-cxx
72
+
73
+ if test " $mpiname " = " mpich" ; then
74
+ case $( uname) -$( uname -m) in
75
+ Linux-x86_64) ch4netmods=(ofi ucx) ;;
76
+ Linux-aarch64) ch4netmods=(ofi ucx) ;;
77
+ * ) ch4netmods=(ofi) ;;
78
+ esac
79
+ export MPICH_CH4_OFI_CAPABILITY_DEBUG=1
80
+ export MPICH_CH4_UCX_CAPABILITY_DEBUG=1
81
+ for netmod in " ${ch4netmods[@]} " ; do
82
+ printf " testing ch4:%s ... " " $netmod "
83
+ export MPICH_CH4_NETMOD=" $netmod "
84
+ ./helloworld-c | grep -i " $netmod " > /dev/null
85
+ printf " OK\n"
86
+ done
87
+ unset MPICH_CH4_OFI_CAPABILITY_DEBUG
88
+ unset MPICH_CH4_UCX_CAPABILITY_DEBUG
89
+ unset MPICH_CH4_NETMOD
90
+ fi
Original file line number Diff line number Diff line change @@ -17,9 +17,8 @@ def get_tag(self):
17
17
18
18
19
19
mpiname = os .environ .get ("MPINAME" , "mpich" )
20
- variant = os .environ .get ("VARIANT" , "" )
21
20
release = os .environ .get ("RELEASE" , "" )
22
- pkgname = f" { mpiname } - { variant } " if variant else mpiname
21
+ pkgname = mpiname
23
22
24
23
if mpiname == "mpich" :
25
24
project = "MPICH"
You can’t perform that action at this time.
0 commit comments