Merge pull request #650 from MilesCranmer/deps-update

Build: update numpy version

.github/workflows/CI.yml

@@ -5,20 +5,14 @@ on:
     branches:
       - '**'
     paths:
-      - 'test/**'
-      - 'pysr/**'
-      - '.github/workflows/CI.yml'
-      - 'setup.py'
+      - '**'
     tags:
       - 'v*.*.*'
   pull_request:
     branches:
-      - '*'
+      - 'master'
     paths:
-      - 'test/**'
-      - 'pysr/**'
-      - '.github/workflows/CI.yml'
-      - 'setup.py'
+      - '**'
 
 jobs:
   test:

.github/workflows/CI_Windows.yml

@@ -3,22 +3,16 @@ name: Windows
 on:
   push:
     branches:
-      - '**'
+      - 'master'
     paths:
-      - 'test/**'
-      - 'pysr/**'
-      - '.github/workflows/CI_Windows.yml'
-      - 'setup.py'
+      - '**'
     tags:
       - 'v*.*.*'
   pull_request:
     branches:
-      - '*'
+      - 'master'
     paths:
-      - 'test/**'
-      - 'pysr/**'
-      - '.github/workflows/CI_Windows.yml'
-      - 'setup.py'
+      - '**'
 
 jobs:
   test:
@@ -52,7 +46,7 @@ jobs:
       - name: "Install PySR"
         run: |
             python -m pip install --upgrade pip
-            pip install pytest nbval
+            pip install pytest nbval "numpy<2.0.0"
             pip install .
             python -c 'import pysr'
       - name: "Run tests"

.github/workflows/CI_docker.yml

@@ -3,22 +3,16 @@ name: Docker
 on:
   push:
     branches:
-      - '**'
+      - 'master'
     paths:
-      - 'test/**'
-      - 'pysr/**'
-      - '.github/workflows/CI_docker.yml'
-      - 'setup.py'
-      - 'Dockerfile'
+      - '**'
+    tags:
+      - 'v*.*.*'
   pull_request:
     branches:
-      - '*'
+      - 'master'
     paths:
-      - 'test/**'
-      - 'pysr/**'
-      - '.github/workflows/CI_docker.yml'
-      - 'setup.py'
-      - 'Dockerfile'
+      - '**'
 
 jobs:
   test:

.github/workflows/CI_mac.yml

@@ -3,22 +3,16 @@ name: macOS
 on:
   push:
     branches:
-      - '**'
+      - 'master'
     paths:
-      - 'test/**'
-      - 'pysr/**'
-      - '.github/workflows/CI_mac.yml'
-      - 'setup.py'
+      - '**'
     tags:
       - 'v*.*.*'
   pull_request:
     branches:
-      - '*'
+      - 'master'
     paths:
-      - 'test/**'
-      - 'pysr/**'
-      - '.github/workflows/CI_mac.yml'
-      - 'setup.py'
+      - '**'
 
 jobs:
   test:

pysr/export_jax.py

@@ -1,3 +1,4 @@
+import numpy as np  # noqa: F401
 import sympy
 
 # Special since need to reduce arguments.

pysr/export_torch.py

@@ -1,11 +1,9 @@
-#####
-# From https://github.com/patrick-kidger/sympytorch
-# Copied here to allow PySR-specific tweaks
-#####
+# Fork of https://github.com/patrick-kidger/sympytorch
 
 import collections as co
 import functools as ft
 
+import numpy as np  # noqa: F401
 import sympy
 
 
@@ -84,7 +82,7 @@ def _initialize_torch():
         }
 
         class _Node(torch.nn.Module):
-            """SympyTorch code from https://github.com/patrick-kidger/sympytorch"""
+            """Forked from https://github.com/patrick-kidger/sympytorch"""
 
             def __init__(self, *, expr, _memodict, _func_lookup, **kwargs):
                 super().__init__(**kwargs)
@@ -161,7 +159,7 @@ def forward(self, memodict):
                 return self._torch_func(*args)
 
         class _SingleSymPyModule(torch.nn.Module):
-            """SympyTorch code from https://github.com/patrick-kidger/sympytorch"""
+            """Forked from https://github.com/patrick-kidger/sympytorch"""
 
             def __init__(
                 self, expression, symbols_in, selection=None, extra_funcs=None, **kwargs

pysr/sr.py

@@ -2060,13 +2060,7 @@ def fit(
                 "Note: you are running with 10 features or more. "
                 "Genetic algorithms like used in PySR scale poorly with large numbers of features. "
                 "You should run PySR for more `niterations` to ensure it can find "
-                "the correct variables, "
-                "or, alternatively, do a dimensionality reduction beforehand. "
-                "For example, `X = PCA(n_components=6).fit_transform(X)`, "
-                "using scikit-learn's `PCA` class, "
-                "will reduce the number of features to 6 in an interpretable way, "
-                "as each resultant feature "
-                "will be a linear combination of the original features. "
+                "the correct variables, and consider using a larger `maxsize`."
             )
 
         # Assertion checks

requirements.txt

@@ -1,6 +1,6 @@
 sympy>=1.0.0,<2.0.0
 pandas>=0.21.0,<3.0.0
-numpy>=1.13.0,<2.0.0
+numpy>=1.13.0,<3.0.0
 scikit_learn>=1.0.0,<2.0.0
 juliacall==0.9.20
 click>=7.0.0,<9.0.0