Skip to content

Commit f105704

Browse files
jeanbezjeanbez
committed
fix versions and make CI robust
1 parent 4493988 commit f105704

File tree

9 files changed

+361
-244
lines changed

9 files changed

+361
-244
lines changed

‎.github/workflows/drishti-darshan-3.4.2.yml‎ renamed to ‎.github/workflows/darshan-3.4.2.yml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,99 +2,99 @@ name: Drishti (Darshan 3.4.2)
22

33
on:
44
pull_request:
5-
push:
65
workflow_dispatch:
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
8+
cancel-in-progress: true
79

810
jobs:
911
drishti:
10-
runs-on: ubuntu-latest
11-
container: jlbez/dxt-explorer-ubuntu-20.04
12-
timeout-minutes: 60
12+
runs-on: ${{ matrix.os }}
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
os: ["ubuntu-latest", "macos-latest"]
17+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
18+
19+
timeout-minutes: 20
1320

1421
steps:
1522
- uses: actions/checkout@v4
1623
with:
1724
submodules: true
1825

26+
- name: Set up Python ${{ matrix.python-version }}
27+
uses: actions/setup-python@v5
28+
with:
29+
python-version: ${{ matrix.python-version }}
1930
- name: Dependencies
2031
run: |
21-
sudo apt-get update
22-
sudo apt-get install cmake gcc git libtool python3 python3-pip libcurl4-openssl-dev software-properties-common -y
23-
24-
# Darshan
25-
git clone https://github.com/darshan-hpc/darshan.git darshan-3.4.2
26-
cd darshan-3.4.2
27-
git checkout darshan-3.4.2
32+
git clone https://github.com/darshan-hpc/darshan.git
2833
29-
pip install --upgrade pip
34+
- name: Install macOS Dependencies
35+
if: runner.os == 'macOS'
36+
run: |
37+
brew install libtool autoconf automake
3038
3139
- name: Build Darshan
3240
run: |
33-
export DARSHAN_DIR=/opt/darshan
34-
35-
mkdir $DARSHAN_DIR
36-
cd darshan-3.4.2
41+
cd darshan
42+
git checkout darshan-3.4.2
3743
bash prepare.sh
3844
cd darshan-util
39-
./configure --prefix=$DARSHAN_DIR
45+
./configure
4046
make
41-
make install
47+
sudo make install
4248
43-
- name: Install py-darshan
49+
- name: Configure Linux
50+
if: runner.os == 'Linux'
4451
run: |
45-
pip install darshan==3.4.2
52+
sudo ldconfig
4653
4754
- name: Install Drishti
4855
run: |
56+
python -m ensurepip --upgrade
57+
pip install --upgrade setuptools
58+
pip install darshan==3.4.2
4959
pip install -r requirements.txt
5060
pip install .
5161
5262
- name: Run Drishti (--help)
5363
run: |
54-
export PATH=/opt/darshan/bin:$PATH
55-
5664
drishti -h
5765
5866
- name: Run Drishti (--issues)
5967
run: |
60-
export PATH=/opt/darshan/bin:$PATH
61-
6268
drishti --issues sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
6369
6470
- name: Run Drishti (--code)
6571
run: |
66-
export PATH=/opt/darshan/bin:$PATH
67-
68-
drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
72+
drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
6973
7074
- name: Run DXT Explorer (--verbose)
7175
run: |
72-
export PATH=/opt/darshan/bin:$PATH
73-
7476
drishti --verbose sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
7577
7678
- name: Run DXT Explorer (--path)
7779
run: |
78-
export PATH=/opt/darshan/bin:$PATH
79-
80-
drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
80+
drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
8181
8282
- name: Run DXT Explorer (--html)
8383
run: |
84-
export PATH=/opt/darshan/bin:$PATH
85-
8684
drishti --html sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
8785
8886
- name: Run DXT Explorer (--svg)
8987
run: |
90-
export PATH=/opt/darshan/bin:$PATH
88+
drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
9189
92-
drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
90+
- name: Setup upterm session
91+
if: ${{ failure() }}
92+
uses: owenthereal/action-upterm@v1
9393

9494
- name: Upload Artifact
9595
if: always()
9696
uses: actions/upload-artifact@v4
9797
with:
98-
name: tests
98+
name: tests-${{ matrix.os }}-${{ matrix.python-version }}
9999
path: sample/**
100100
retention-days: 1

‎.github/workflows/darshan-3.4.4.yml‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
name: Drishti (Darshan 3.4.4)
2+
3+
on:
4+
pull_request:
5+
workflow_dispatch:
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
8+
cancel-in-progress: true
9+
10+
jobs:
11+
drishti:
12+
runs-on: ${{ matrix.os }}
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
os: ["ubuntu-latest", "macos-latest"]
17+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
18+
19+
timeout-minutes: 20
20+
21+
steps:
22+
- uses: actions/checkout@v4
23+
with:
24+
submodules: true
25+
26+
- name: Set up Python ${{ matrix.python-version }}
27+
uses: actions/setup-python@v5
28+
with:
29+
python-version: ${{ matrix.python-version }}
30+
- name: Dependencies
31+
run: |
32+
git clone https://github.com/darshan-hpc/darshan.git
33+
34+
- name: Install macOS Dependencies
35+
if: runner.os == 'macOS'
36+
run: |
37+
brew install libtool autoconf automake
38+
39+
- name: Build Darshan
40+
run: |
41+
cd darshan
42+
git checkout darshan-3.4.4
43+
bash prepare.sh
44+
cd darshan-util
45+
./configure
46+
make
47+
sudo make install
48+
49+
- name: Configure Linux
50+
if: runner.os == 'Linux'
51+
run: |
52+
sudo ldconfig
53+
54+
- name: Install Drishti
55+
run: |
56+
python -m ensurepip --upgrade
57+
pip install --upgrade setuptools
58+
pip install darshan==3.4.4
59+
pip install -r requirements.txt
60+
pip install .
61+
62+
- name: Run Drishti (--help)
63+
run: |
64+
drishti -h
65+
66+
- name: Run Drishti (--issues)
67+
run: |
68+
drishti --issues sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
69+
70+
- name: Run Drishti (--code)
71+
run: |
72+
drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
73+
74+
- name: Run DXT Explorer (--verbose)
75+
run: |
76+
drishti --verbose sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
77+
78+
- name: Run DXT Explorer (--path)
79+
run: |
80+
drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
81+
82+
- name: Run DXT Explorer (--html)
83+
run: |
84+
drishti --html sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
85+
86+
- name: Run DXT Explorer (--svg)
87+
run: |
88+
drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
89+
90+
- name: Setup upterm session
91+
if: ${{ failure() }}
92+
uses: owenthereal/action-upterm@v1
93+
94+
- name: Upload Artifact
95+
if: always()
96+
uses: actions/upload-artifact@v4
97+
with:
98+
name: tests-${{ matrix.os }}-${{ matrix.python-version }}
99+
path: sample/**
100+
retention-days: 1

‎.github/workflows/darshan-3.4.6.yml‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
name: Drishti (Darshan 3.4.6)
2+
3+
on:
4+
pull_request:
5+
workflow_dispatch:
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
8+
cancel-in-progress: true
9+
10+
jobs:
11+
drishti:
12+
runs-on: ${{ matrix.os }}
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
os: ["ubuntu-latest", "macos-latest"]
17+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
18+
19+
timeout-minutes: 20
20+
21+
steps:
22+
- uses: actions/checkout@v4
23+
with:
24+
submodules: true
25+
26+
- name: Set up Python ${{ matrix.python-version }}
27+
uses: actions/setup-python@v5
28+
with:
29+
python-version: ${{ matrix.python-version }}
30+
- name: Dependencies
31+
run: |
32+
git clone https://github.com/darshan-hpc/darshan.git
33+
34+
- name: Install macOS Dependencies
35+
if: runner.os == 'macOS'
36+
run: |
37+
brew install libtool autoconf automake
38+
39+
- name: Build Darshan
40+
run: |
41+
cd darshan
42+
git checkout darshan-3.4.6
43+
bash prepare.sh
44+
cd darshan-util
45+
./configure
46+
make
47+
sudo make install
48+
49+
- name: Configure Linux
50+
if: runner.os == 'Linux'
51+
run: |
52+
sudo ldconfig
53+
54+
- name: Install Drishti
55+
run: |
56+
python -m ensurepip --upgrade
57+
pip install --upgrade setuptools
58+
pip install darshan==3.4.6
59+
pip install -r requirements.txt
60+
pip install .
61+
62+
- name: Run Drishti (--help)
63+
run: |
64+
drishti -h
65+
66+
- name: Run Drishti (--issues)
67+
run: |
68+
drishti --issues sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
69+
70+
- name: Run Drishti (--code)
71+
run: |
72+
drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
73+
74+
- name: Run DXT Explorer (--verbose)
75+
run: |
76+
drishti --verbose sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
77+
78+
- name: Run DXT Explorer (--path)
79+
run: |
80+
drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
81+
82+
- name: Run DXT Explorer (--html)
83+
run: |
84+
drishti --html sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
85+
86+
- name: Run DXT Explorer (--svg)
87+
run: |
88+
drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
89+
90+
- name: Setup upterm session
91+
if: ${{ failure() }}
92+
uses: owenthereal/action-upterm@v1
93+
94+
- name: Upload Artifact
95+
if: always()
96+
uses: actions/upload-artifact@v4
97+
with:
98+
name: tests-${{ matrix.os }}-${{ matrix.python-version }}
99+
path: sample/**
100+
retention-days: 1

0 commit comments

Comments
 (0)