Skip to content

Commit 463b4e8

Browse files
authored
Merge pull request #2766 from sevyharris/require_recent_mkl
require a more recent version of mkl for Cantera
2 parents b041507 + fc5f4ab commit 463b4e8

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

environment.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,18 @@ dependencies:
105105
# configure packages to use OpenBLAS instead of Intel MKL
106106
- blas=*=openblas
107107

108+
# Cantera 2.6 on the Cantera channel is configured to use Intel MKL. It doesn't specify a version minimum
109+
# but crashes if MKL is too old, so we have to enforce a minimum version here. But, if we can switch over
110+
# to the conda-forge version, we should be able to remove this line (and maybe the two after it)
111+
# because it use OpenBLAS instead.
112+
- conda-forge::mkl >=2023.1.0
113+
# 2023.1.0 is just a guess at the minimum version. Older versions might work too.
114+
- conda-forge::libcurl <= 8.9
115+
# There's a Julia/PyCall installation bug associated with libcurl 8.10+:
116+
# https://discourse.julialang.org/t/curl-multi-assign-and-segmentation-fault-when-installing-package/120901/3
117+
- conda-forge::pyopenssl >20
118+
# ThermoCentralDatabaseInterface fails if pyopenssl is too old. 20 is just a guess at the version number.
119+
108120
# additional packages that are required, but not specified here (and why)
109121
# pydqed, pydas, mopac, and likely others require a fortran compiler (specifically gfortran)
110122
# in the environment. Normally we would add this to the environment file with

test/rmgpy/rmg/inputTest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def test_ml_estimator(self):
117117
assert isinstance(rmg.ml_settings, dict)
118118

119119

120-
class TestInputThemoCentralDatabase:
120+
class TestInputThermoCentralDatabase:
121121
"""
122122
Contains unit tests rmgpy.rmg.input.thermo_central_database
123123
"""
@@ -127,7 +127,7 @@ def teardown_class(self):
127127
global rmg
128128
rmg.thermo_central_database = None
129129

130-
def test_themo_central_database(self):
130+
def test_thermo_central_database(self):
131131
"""
132132
Test that we can input.
133133
"""

0 commit comments

Comments
 (0)