Skip to content

Commit 4a853cd

Browse files
dalcinldalcinl
committed
GHA: Update workflows
1 parent d30b458 commit 4a853cd

File tree

5 files changed

+127
-117
lines changed

5 files changed

+127
-117
lines changed

‎.github/workflows/@ALL.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ on:
55
inputs:
66
mpi4py-git:
77
description: 'mpi4py git'
8-
default: mpi4py/mpi4py
8+
default: mpi4py/mpi4py
99
required: true
1010
type: string
1111
mpi4py-ref:
1212
description: 'mpi4py ref'
13-
default: master
14-
required: true
13+
default: ''
14+
required: false
1515
type: string
1616
push:
1717
branches:
@@ -22,23 +22,23 @@ jobs:
2222
mpich:
2323
uses: ./.github/workflows/mpich.yml
2424
with:
25-
mpi4py-git: ${{ github.event.inputs.mpi4py-git }}
26-
mpi4py-ref: ${{ github.event.inputs.mpi4py-ref }}
25+
mpi4py-git: ${{ inputs.mpi4py-git }}
26+
mpi4py-ref: ${{ inputs.mpi4py-ref }}
2727

2828
openmpi:
2929
uses: ./.github/workflows/openmpi.yml
3030
with:
31-
mpi4py-git: ${{ github.event.inputs.mpi4py-git }}
32-
mpi4py-ref: ${{ github.event.inputs.mpi4py-ref }}
31+
mpi4py-git: ${{ inputs.mpi4py-git }}
32+
mpi4py-ref: ${{ inputs.mpi4py-ref }}
3333

3434
intelmpi:
3535
uses: ./.github/workflows/intelmpi.yml
3636
with:
37-
mpi4py-git: ${{ github.event.inputs.mpi4py-git }}
38-
mpi4py-ref: ${{ github.event.inputs.mpi4py-ref }}
37+
mpi4py-git: ${{ inputs.mpi4py-git }}
38+
mpi4py-ref: ${{ inputs.mpi4py-ref }}
3939

4040
mvapich:
4141
uses: ./.github/workflows/mvapich.yml
4242
with:
43-
mpi4py-git: ${{ github.event.inputs.mpi4py-git }}
44-
mpi4py-ref: ${{ github.event.inputs.mpi4py-ref }}
43+
mpi4py-git: ${{ inputs.mpi4py-git }}
44+
mpi4py-ref: ${{ inputs.mpi4py-ref }}

‎.github/workflows/intelmpi.yml

+26-27
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ on:
55
inputs:
66
mpi4py-git:
77
description: 'mpi4py git'
8-
default: mpi4py/mpi4py
9-
required: true
8+
default: mpi4py/mpi4py
9+
required: false
1010
type: string
1111
mpi4py-ref:
1212
description: 'mpi4py ref'
13-
default: master
14-
required: true
13+
default: ''
14+
required: false
1515
type: string
1616
workflow_dispatch:
1717
inputs:
1818
mpi4py-git:
1919
description: 'mpi4py git'
2020
default: mpi4py/mpi4py
21-
required: true
21+
required: false
2222
type: string
2323
mpi4py-ref:
2424
description: 'mpi4py ref'
25-
default: master
26-
required: true
25+
default: ''
26+
required: false
2727
type: string
2828
push:
2929
branches:
@@ -84,30 +84,29 @@ jobs:
8484
numpy cffi pyyaml
8585

8686
- name: Checkout mpi4py
87-
uses: actions/checkout@v3
87+
uses: actions/checkout@v4
8888
with:
89-
repository: ${{ github.event.inputs.mpi4py-git || 'mpi4py/mpi4py' }}
90-
ref: ${{ github.event.inputs.mpi4py-ref || 'master' }}
91-
path: mpi4py
89+
repository: ${{ inputs.mpi4py-git || 'mpi4py/mpi4py' }}
90+
ref: ${{ inputs.mpi4py-ref }}
9291

9392
- name: Install mpi4py
94-
run: python -m pip install ./mpi4py
93+
run: python -m pip install .
9594
env:
9695
CFLAGS: "-O0"
9796

9897
- name: Test mpi4py (singleton)
99-
run: python mpi4py/test/main.py -v
98+
run: python test/main.py -v
10099
if: ${{ true }}
101100
- name: Test mpi4py (np=1)
102-
run: mpiexec -n 1 python mpi4py/test/main.py -v
101+
run: mpiexec -n 1 python test/main.py -v
103102
- name: Test mpi4py (np=2)
104-
run: mpiexec -n 2 python mpi4py/test/main.py -v -f
103+
run: mpiexec -n 2 python test/main.py -v -f
105104
- name: Test mpi4py (np=3)
106-
run: mpiexec -n 3 python mpi4py/test/main.py -v -f
105+
run: mpiexec -n 3 python test/main.py -v -f
107106
if: ${{ false }}
108107
timeout-minutes: 10
109108
- name: Test mpi4py (np=5)
110-
run: mpiexec -n 5 python mpi4py/test/main.py -v -f
109+
run: mpiexec -n 5 python test/main.py -v -f
111110
if: ${{ false }}
112111
timeout-minutes: 20
113112

@@ -116,24 +115,24 @@ jobs:
116115
shell: bash
117116

118117
- name: Test mpi4py.futures (singleton)
119-
run: python mpi4py/demo/futures/test_futures.py -v
118+
run: python demo/futures/test_futures.py -v
120119
- name: Test mpi4py.futures (np=1)
121-
run: mpiexec -n 1 python mpi4py/demo/futures/test_futures.py -v
120+
run: mpiexec -n 1 python demo/futures/test_futures.py -v
122121
- name: Test mpi4py.futures (np=2)
123-
run: mpiexec -n 2 python mpi4py/demo/futures/test_futures.py -v
122+
run: mpiexec -n 2 python demo/futures/test_futures.py -v
124123
- name: Test mpi4py.futures (np=3)
125-
run: mpiexec -n 3 python mpi4py/demo/futures/test_futures.py -v
124+
run: mpiexec -n 3 python demo/futures/test_futures.py -v
126125

127126
- name: Test mpi4py.futures (np=1)
128-
run: mpiexec -n 1 python -m mpi4py.futures mpi4py/demo/futures/test_futures.py -v
127+
run: mpiexec -n 1 python -m mpi4py.futures demo/futures/test_futures.py -v
129128
- name: Test mpi4py.futures (np=2)
130-
run: mpiexec -n 2 python -m mpi4py.futures mpi4py/demo/futures/test_futures.py -v
129+
run: mpiexec -n 2 python -m mpi4py.futures demo/futures/test_futures.py -v
131130
- name: Test mpi4py.futures (np=3)
132-
run: mpiexec -n 3 python -m mpi4py.futures mpi4py/demo/futures/test_futures.py -v
131+
run: mpiexec -n 3 python -m mpi4py.futures demo/futures/test_futures.py -v
133132

134133
- name: Test mpi4py.run
135-
run: python mpi4py/demo/test-run/test_run.py -v
134+
run: python demo/test-run/test_run.py -v
136135
- name: Test init-fini
137-
run: bash mpi4py/demo/init-fini/run.sh
136+
run: bash demo/init-fini/run.sh
138137
- name: Test check-mpiexec
139-
run: bash mpi4py/demo/check-mpiexec/run.sh
138+
run: bash demo/check-mpiexec/run.sh

‎.github/workflows/mpich.yml

+34-30
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ on:
55
inputs:
66
mpi4py-git:
77
description: 'mpi4py git'
8-
default: mpi4py/mpi4py
9-
required: true
8+
default: mpi4py/mpi4py
9+
required: false
1010
type: string
1111
mpi4py-ref:
1212
description: 'mpi4py ref'
13-
default: master
14-
required: true
13+
default: ''
14+
required: false
1515
type: string
1616
workflow_dispatch:
1717
inputs:
@@ -28,12 +28,12 @@ on:
2828
mpi4py-git:
2929
description: 'mpi4py git'
3030
default: mpi4py/mpi4py
31-
required: true
31+
required: false
3232
type: string
3333
mpi4py-ref:
3434
description: 'mpi4py ref'
35-
default: master
36-
required: true
35+
default: ''
36+
required: false
3737
type: string
3838
push:
3939
branches:
@@ -70,14 +70,16 @@ jobs:
7070
libnuma-dev
7171

7272
- name: Checkout MPI
73-
uses: actions/checkout@v3
73+
uses: actions/checkout@v4
7474
with:
75-
repository: ${{ github.event.inputs.mpi-git || 'pmodels/mpich' }}
76-
ref: ${{ github.event.inputs.mpi-ref || 'main' }}
75+
repository: ${{ inputs.mpi-git || 'pmodels/mpich' }}
76+
ref: ${{ inputs.mpi-ref }}
77+
path: mpi-build
7778
submodules: recursive
7879

7980
- name: Bootstrap MPI
8081
run: ./autogen.sh
82+
working-directory: mpi-build
8183

8284
- name: Configure MPI
8385
run: ./configure
@@ -91,12 +93,15 @@ jobs:
9193
LDFLAGS=-Wl,-rpath,/usr/local/lib
9294
$(test ${{ matrix.pm }} == gforker &&
9395
echo --with-namepublisher=file)
96+
working-directory: mpi-build
9497

9598
- name: Build MPI
9699
run: make -j 2
100+
working-directory: mpi-build
97101

98102
- name: Install MPI
99103
run: sudo make install
104+
working-directory: mpi-build
100105

101106
- name: Tweak MPI
102107
run: |
@@ -124,52 +129,51 @@ jobs:
124129
numpy cffi pyyaml
125130

126131
- name: Checkout mpi4py
127-
uses: actions/checkout@v3
132+
uses: actions/checkout@v4
128133
with:
129-
repository: ${{ github.event.inputs.mpi4py-git || 'mpi4py/mpi4py' }}
130-
ref: ${{ github.event.inputs.mpi4py-ref || 'master' }}
131-
path: mpi4py
134+
repository: ${{ inputs.mpi4py-git || 'mpi4py/mpi4py' }}
135+
ref: ${{ inputs.mpi4py-ref }}
132136

133137
- name: Install mpi4py
134-
run: python -m pip install ./mpi4py
138+
run: python -m pip install .
135139
env:
136140
CFLAGS: "-O0"
137141

138142
- name: Test mpi4py (singleton)
139-
run: python mpi4py/test/main.py -v
143+
run: python test/main.py -v
140144
if: ${{ true }}
141145
- name: Test mpi4py (np=1)
142-
run: mpiexec -n 1 python mpi4py/test/main.py -v
146+
run: mpiexec -n 1 python test/main.py -v
143147
- name: Test mpi4py (np=2)
144-
run: mpiexec -n 2 python mpi4py/test/main.py -v -f
148+
run: mpiexec -n 2 python test/main.py -v -f
145149
- name: Test mpi4py (np=3)
146-
run: mpiexec -n 3 python mpi4py/test/main.py -v -f
150+
run: mpiexec -n 3 python test/main.py -v -f
147151
if: ${{ matrix.device == 'ch3:sock' }}
148152
timeout-minutes: 10
149153
- name: Test mpi4py (np=5)
150-
run: mpiexec -n 5 python mpi4py/test/main.py -v -f
154+
run: mpiexec -n 5 python test/main.py -v -f
151155
if: ${{ matrix.device == 'ch3:sock' }}
152156
timeout-minutes: 20
153157

154158
- name: Test mpi4py.futures (singleton)
155-
run: python mpi4py/demo/futures/test_futures.py -v
159+
run: python demo/futures/test_futures.py -v
156160
- name: Test mpi4py.futures (np=1)
157-
run: mpiexec -n 1 python mpi4py/demo/futures/test_futures.py -v
161+
run: mpiexec -n 1 python demo/futures/test_futures.py -v
158162
- name: Test mpi4py.futures (np=2)
159-
run: mpiexec -n 2 python mpi4py/demo/futures/test_futures.py -v
163+
run: mpiexec -n 2 python demo/futures/test_futures.py -v
160164
- name: Test mpi4py.futures (np=3)
161-
run: mpiexec -n 3 python mpi4py/demo/futures/test_futures.py -v
165+
run: mpiexec -n 3 python demo/futures/test_futures.py -v
162166

163167
- name: Test mpi4py.futures (np=1)
164-
run: mpiexec -n 1 python -m mpi4py.futures mpi4py/demo/futures/test_futures.py -v
168+
run: mpiexec -n 1 python -m mpi4py.futures demo/futures/test_futures.py -v
165169
- name: Test mpi4py.futures (np=2)
166-
run: mpiexec -n 2 python -m mpi4py.futures mpi4py/demo/futures/test_futures.py -v
170+
run: mpiexec -n 2 python -m mpi4py.futures demo/futures/test_futures.py -v
167171
- name: Test mpi4py.futures (np=3)
168-
run: mpiexec -n 3 python -m mpi4py.futures mpi4py/demo/futures/test_futures.py -v
172+
run: mpiexec -n 3 python -m mpi4py.futures demo/futures/test_futures.py -v
169173

170174
- name: Test mpi4py.run
171-
run: python mpi4py/demo/test-run/test_run.py -v
175+
run: python demo/test-run/test_run.py -v
172176
- name: Test init-fini
173-
run: bash mpi4py/demo/init-fini/run.sh
177+
run: bash demo/init-fini/run.sh
174178
- name: Test check-mpiexec
175-
run: bash mpi4py/demo/check-mpiexec/run.sh
179+
run: bash demo/check-mpiexec/run.sh

0 commit comments

Comments
 (0)