Skip to content

Commit 6153383

Browse files
committed
re-bury the julia imports that got shuffled around
1 parent b35e764 commit 6153383

2 files changed

Lines changed: 15 additions & 12 deletions

File tree

rmgpy/pdep/sls.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@
3232
and implementing the SLS master equation reduction method
3333
"""
3434

35-
from juliacall import Main
36-
37-
Main.seval("using ReactionMechanismSimulator.SciMLBase")
38-
Main.seval("using ReactionMechanismSimulator.Sundials")
39-
import sys
4035
import logging
36+
import sys
4137

4238
import numpy as np
4339
import scipy.linalg
@@ -50,8 +46,10 @@
5046

5147
NO_JULIA = False
5248
try:
53-
from diffeqpy import de
54-
from julia import Main
49+
from juliacall import Main
50+
51+
Main.seval("using ReactionMechanismSimulator.SciMLBase")
52+
Main.seval("using ReactionMechanismSimulator.Sundials")
5553
except Exception as e:
5654
logging.info(
5755
f"Unable to import Julia dependencies, original error: {str(e)}"

rmgpy/rmg/reactionmechanismsimulator_reactors.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,20 @@
3434
import logging
3535
import sys
3636

37-
import juliacall
3837
import numpy as np
39-
from juliacall import Main
4038

4139
import rmgpy.constants as constants
4240

43-
Main.seval("using PythonCall")
44-
Main.seval("using ReactionMechanismSimulator")
45-
Main.seval("using ReactionMechanismSimulator.Sundials")
41+
NO_JULIA = True
42+
try:
43+
import juliacall
44+
from juliacall import Main
45+
Main.seval("using PythonCall")
46+
Main.seval("using ReactionMechanismSimulator")
47+
Main.seval("using ReactionMechanismSimulator.Sundials")
48+
NO_JULIA = False
49+
except:
50+
logging.warning("Julia import failed, RMS reactors not available.")
4651

4752
from rmgpy import constants
4853
from rmgpy.data.kinetics.depository import DepositoryReaction

0 commit comments

Comments
 (0)