Merge 197cf0a into a5e5da1

pysr/julia_helpers.py

@@ -4,6 +4,7 @@
 import warnings
 from pathlib import Path
 import os
+from julia.api import JuliaError
 
 from .version import __version__, __symbolic_regression_jl_version__
 
@@ -70,7 +71,7 @@ def install(julia_project=None, quiet=False):  # pragma: no cover
     """
     import julia
 
-    _version_assertion()
+    _julia_version_assertion()
     # Set JULIA_PROJECT so that we install in the pysr environment
     processed_julia_project, is_shared = _process_julia_project(julia_project)
     _set_julia_project_env(processed_julia_project, is_shared)
@@ -93,19 +94,15 @@ def install(julia_project=None, quiet=False):  # pragma: no cover
         )
 
 
-def _import_error_string(julia_project=None):
-    s = """
+def _import_error():
+    raise ImportError(
+        """
     Required dependencies are not installed or built.  Run the following code in the Python REPL:
 
         >>> import pysr
         >>> pysr.install()
     """
-
-    if julia_project is not None:
-        s += f"""
-        Tried to activate project {julia_project} but failed."""
-
-    return s
+    )
 
 
 def _process_julia_project(julia_project):
@@ -157,7 +154,7 @@ def init_julia(julia_project=None, quiet=False):
 
     from julia.core import JuliaInfo, UnsupportedPythonError
 
-    _version_assertion()
+    _julia_version_assertion()
     processed_julia_project, is_shared = _process_julia_project(julia_project)
     _set_julia_project_env(processed_julia_project, is_shared)
 
@@ -170,7 +167,7 @@ def init_julia(julia_project=None, quiet=False):
         )
 
     if not info.is_pycall_built():
-        raise ImportError(_import_error_string())
+        _import_error()
 
     Main = None
     try:
@@ -224,9 +221,59 @@ def _escape_filename(filename):
     return str_repr
 
 
-def _version_assertion():
+def _julia_version_assertion():
     if not is_julia_version_greater_eq(version=(1, 6, 0)):
         raise NotImplementedError(
             "PySR requires Julia 1.6.0 or greater. "
             "Please update your Julia installation."
         )
+
+
+def _backend_version_assertion(Main):
+    try:
+        backend_version = Main.eval("string(SymbolicRegression.PACKAGE_VERSION)")
+        expected_backend_version = __symbolic_regression_jl_version__
+        if backend_version != expected_backend_version:  # pragma: no cover
+            warnings.warn(
+                f"PySR backend (SymbolicRegression.jl) version {backend_version} "
+                "does not match expected version {expected_backend_version}. "
+                "Things may break. "
+                "Please update your PySR installation with "
+                "`python -c 'import pysr; pysr.install()'`."
+            )
+    except JuliaError:  # pragma: no cover
+        warnings.warn(
+            "You seem to have an outdated version of SymbolicRegression.jl. "
+            "Things may break. "
+            "Please update your PySR installation with "
+            "`python -c 'import pysr; pysr.install()'`."
+        )
+
+
+def _load_cluster_manager(Main, cluster_manager):
+    Main.eval(f"import ClusterManagers: addprocs_{cluster_manager}")
+    return Main.eval(f"addprocs_{cluster_manager}")
+
+
+def _update_julia_project(Main, is_shared, io_arg):
+    try:
+        if is_shared:
+            _add_sr_to_julia_project(Main, io_arg)
+        Main.eval(f"Pkg.resolve({io_arg})")
+    except (JuliaError, RuntimeError) as e:
+        raise ImportError(_import_error()) from e
+
+
+def _load_backend(Main):
+    try:
+        # Load namespace, so that various internal operators work:
+        Main.eval("using SymbolicRegression")
+    except (JuliaError, RuntimeError) as e:
+        raise ImportError(_import_error()) from e
+
+    _backend_version_assertion(Main)
+
+    # Load Julia package SymbolicRegression.jl
+    from julia import SymbolicRegression
+
+    return SymbolicRegression

pysr/sr.py

@@ -26,8 +26,9 @@
     _process_julia_project,
     is_julia_version_greater_eq,
     _escape_filename,
-    _add_sr_to_julia_project,
-    _import_error_string,
+    _load_cluster_manager,
+    _update_julia_project,
+    _load_backend,
 )
 from .export_numpy import CallableEquation
 from .export_latex import generate_single_table, generate_multiple_tables, to_latex
@@ -1453,8 +1454,7 @@ def _run(self, X, y, mutated_params, weights, seed):
             Main = init_julia(self.julia_project)
 
         if cluster_manager is not None:
-            Main.eval(f"import ClusterManagers: addprocs_{cluster_manager}")
-            cluster_manager = Main.eval(f"addprocs_{cluster_manager}")
+            cluster_manager = _load_cluster_manager(cluster_manager)
 
         if not already_ran:
             julia_project, is_shared = _process_julia_project(self.julia_project)
@@ -1467,25 +1467,17 @@ def _run(self, X, y, mutated_params, weights, seed):
             Main.eval(
                 f'Pkg.activate("{_escape_filename(julia_project)}", shared = Bool({int(is_shared)}), {io_arg})'
             )
-            from julia.api import JuliaError
 
             if self.update:
-                try:
-                    if is_shared:
-                        _add_sr_to_julia_project(Main, io_arg)
-                    Main.eval(f"Pkg.resolve({io_arg})")
-                except (JuliaError, RuntimeError) as e:
-                    raise ImportError(_import_error_string(julia_project)) from e
-            try:
-                Main.eval("using SymbolicRegression")
-            except (JuliaError, RuntimeError) as e:
-                raise ImportError(_import_error_string(julia_project)) from e
-
-            Main.plus = Main.eval("(+)")
-            Main.sub = Main.eval("(-)")
-            Main.mult = Main.eval("(*)")
-            Main.pow = Main.eval("(^)")
-            Main.div = Main.eval("(/)")
+                _update_julia_project(Main, is_shared, io_arg)
+
+        SymbolicRegression = _load_backend(Main)
+
+        Main.plus = Main.eval("(+)")
+        Main.sub = Main.eval("(-)")
+        Main.mult = Main.eval("(*)")
+        Main.pow = Main.eval("(^)")
+        Main.div = Main.eval("(/)")
 
         # TODO(mcranmer): These functions should be part of this class.
         binary_operators, unary_operators = _maybe_create_inline_operators(
@@ -1542,7 +1534,7 @@ def _run(self, X, y, mutated_params, weights, seed):
 
         # Call to Julia backend.
         # See https://github.com/MilesCranmer/SymbolicRegression.jl/blob/master/src/OptionsStruct.jl
-        options = Main.Options(
+        options = SymbolicRegression.Options(
             binary_operators=Main.eval(str(tuple(binary_operators)).replace("'", "")),
             unary_operators=Main.eval(str(tuple(unary_operators)).replace("'", "")),
             bin_constraints=bin_constraints,
@@ -1615,7 +1607,7 @@ def _run(self, X, y, mutated_params, weights, seed):
 
         # Call to Julia backend.
         # See https://github.com/MilesCranmer/SymbolicRegression.jl/blob/master/src/SymbolicRegression.jl
-        self.raw_julia_state_ = Main.EquationSearch(
+        self.raw_julia_state_ = SymbolicRegression.EquationSearch(
             Main.X,
             Main.y,
             weights=Main.weights,

pysr/version.py

@@ -1,2 +1,2 @@
-__version__ = "0.11.4"
-__symbolic_regression_jl_version__ = "0.12.2"
+__version__ = "0.11.5"
+__symbolic_regression_jl_version__ = "0.12.6"