Skip to content

Commit e25dbc4

Browse files
authored
Update cantera and pyrometheus dependencies (#1053)
1 parent 76250b7 commit e25dbc4

File tree

4 files changed

+12
-24
lines changed

4 files changed

+12
-24
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ jobs:
4848
- name: Clone
4949
uses: actions/checkout@v4
5050

51-
- name: Set up Python 3.13
52-
uses: actions/setup-python@v5
53-
with:
54-
python-version: '3.13'
55-
5651
- name: Setup MacOS
5752
if: matrix.os == 'macos'
5853
run: |
@@ -81,6 +76,10 @@ jobs:
8176
source /opt/intel/oneapi/setvars.sh
8277
printenv >> $GITHUB_ENV
8378
79+
- name: Set up Python 3.14
80+
uses: actions/setup-python@v5
81+
with:
82+
python-version: '3.14'
8483

8584
- name: Build
8685
run: |

toolchain/bootstrap/python.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
MFC_PYTHON_MIN_MAJOR=3
4-
MFC_PYTHON_MIN_MINOR=9
4+
MFC_PYTHON_MIN_MINOR=11
55
MFC_PYTHON_MIN_STR="$MFC_PYTHON_MIN_MAJOR.$MFC_PYTHON_MIN_MINOR"
66

77
is_python_compatible() {

toolchain/modules

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
# [slug]-cpu [cpu-only modules] (any number of lines)
77
# [slug]-gpu [gpu-only modules] (any number of lines)
88

9-
s OLCF Summit
10-
s-all python/3.8.10 darshan-runtime/3.3.1-lite hsi/5.0.2.p5 xalt/1.2.1
11-
s-cpu lsf-tools/2.0 cmake/3.23.2 ninja/1.10.2 spectrum-mpi/10.4.0.3-20210112
12-
s-cpu gcc/12.1.0
13-
s-gpu nvhpc/22.11 cuda/nvhpc
14-
s-gpu CC=nvc CXX=nvc++ FC=nvfortran
15-
169
b PSC Bridges2
1710
b-all python/3.8.6 hdf5 anaconda3
1811
b-cpu allocations/1.0 gcc/10.2.0 openmpi/4.0.5-gcc10.2.0
@@ -42,15 +35,15 @@ e-gpu gpu/0.15.4 cuda/11.0.2 nvhpc/22.2 openmpi/4.0.5 cmake/3.19.8
4235
e-gpu CC=nvc CXX=nvc++ FC=nvfortran
4336

4437
p GT Phoenix
45-
p-all python/3.10.10
38+
p-all python/3.12.5
4639
p-cpu gcc/12.3.0 openmpi/4.1.5
47-
p-gpu nvhpc/24.5 hpcx/2.19-cuda cuda/12.1.1
40+
p-gpu python/3.12.5 nvhpc/24.5 hpcx/2.19-cuda cuda/12.1.1
4841
p-gpu MFC_CUDA_CC=70,75,80,89,90 NVHPC_CUDA_HOME=$CUDA_HOME CC=nvc CXX=nvc++ FC=nvfortran
4942

5043
f OLCF Frontier
5144
f-all cpe/25.03 rocm/6.3.1
52-
f-all cray-fftw cray-hdf5 cray-python cmake
53-
f-gpu craype-accel-amd-gfx90a rocprofiler-compute/3.0.0
45+
f-all cray-fftw cray-hdf5 python cmake
46+
f-gpu python craype-accel-amd-gfx90a rocprofiler-compute/3.0.0
5447

5548
d NCSA Delta
5649
d-all python/3.11.6
@@ -89,10 +82,6 @@ san CSCS Santis
8982
san-all cmake python
9083
san-gpu nvhpc cuda cray-mpich
9184

92-
san CSCS Santis
93-
san-all cmake python
94-
san-gpu nvhpc cuda cray-mpich
95-
9685
h hipergator
9786
h-gpu nvhpc/25.9
9887
h-gpu CUDA_HOME="/apps/compilers/cuda/12.8.1"
@@ -101,4 +90,4 @@ h-all HPC_OMPI_BIN="/apps/mpi/cuda/12.8.1/nvhpc/25.3/openmpi/5.0.7/bin"
10190
h-all OMPI_MCA_pml=ob1 OMPI_MCA_coll_hcoll_enable=0
10291
h-gpu PATH="/apps/mpi/cuda/12.8.1/nvhpc/25.3/openmpi/5.0.7/bin:${PATH}"
10392
h-all LD_LIBRARY_PATH=/apps/compilers/cuda/12.8.1/lib64:$LD_LIBRARY_PATH
104-
h-gpu MFC_CUDA_CC=100 NVHPC_CUDA_HOME="/apps/compilers/cuda/12.8.1"
93+
h-gpu MFC_CUDA_CC=100 NVHPC_CUDA_HOME="/apps/compilers/cuda/12.8.1"

toolchain/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ dependencies = [
3737
"matplotlib",
3838

3939
# Chemistry
40-
"cantera==3.1.0",
40+
"cantera>=3.1.0",
4141
#"pyrometheus == 1.0.5",
42-
"pyrometheus @ git+https://github.com/wilfonba/pyrometheus-wilfong.git@OpenMPTest",
42+
"pyrometheus @ git+https://github.com/pyrometheus/pyrometheus.git",
4343

4444
# Frontier Profiling
4545
"astunparse==1.6.2",

0 commit comments

Comments
 (0)