Spaces:
Sleeping
Sleeping
MilesCranmer
commited on
Merge branch 'master' into cleanup
Browse files- .github/workflows/CI.yml +2 -2
- .github/workflows/CI_Windows.yml +1 -1
- .github/workflows/CI_mac.yml +1 -1
- .github/workflows/docker_deploy.yml +2 -2
- .pre-commit-config.yaml +1 -1
- README.md +1 -1
- examples/pysr_demo.ipynb +1 -1
.github/workflows/CI.yml
CHANGED
@@ -52,7 +52,7 @@ jobs:
|
|
52 |
with:
|
53 |
version: ${{ matrix.julia-version }}
|
54 |
- name: "Cache Julia"
|
55 |
-
uses: julia-actions/cache@
|
56 |
with:
|
57 |
cache-name: ${{ matrix.os }}-test-${{ matrix.julia-version }}-${{ matrix.python-version }}
|
58 |
cache-packages: false
|
@@ -144,7 +144,7 @@ jobs:
|
|
144 |
activate-environment: pysr-test
|
145 |
environment-file: environment.yml
|
146 |
- name: "Cache Julia"
|
147 |
-
uses: julia-actions/cache@
|
148 |
with:
|
149 |
cache-name: ${{ matrix.os }}-conda-${{ matrix.python-version }}
|
150 |
cache-packages: false
|
|
|
52 |
with:
|
53 |
version: ${{ matrix.julia-version }}
|
54 |
- name: "Cache Julia"
|
55 |
+
uses: julia-actions/cache@v2
|
56 |
with:
|
57 |
cache-name: ${{ matrix.os }}-test-${{ matrix.julia-version }}-${{ matrix.python-version }}
|
58 |
cache-packages: false
|
|
|
144 |
activate-environment: pysr-test
|
145 |
environment-file: environment.yml
|
146 |
- name: "Cache Julia"
|
147 |
+
uses: julia-actions/cache@v2
|
148 |
with:
|
149 |
cache-name: ${{ matrix.os }}-conda-${{ matrix.python-version }}
|
150 |
cache-packages: false
|
.github/workflows/CI_Windows.yml
CHANGED
@@ -40,7 +40,7 @@ jobs:
|
|
40 |
with:
|
41 |
version: ${{ matrix.julia-version }}
|
42 |
- name: "Cache Julia"
|
43 |
-
uses: julia-actions/cache@
|
44 |
with:
|
45 |
cache-name: ${{ matrix.os }}-test-${{ matrix.julia-version }}-${{ matrix.python-version }}
|
46 |
cache-packages: false
|
|
|
40 |
with:
|
41 |
version: ${{ matrix.julia-version }}
|
42 |
- name: "Cache Julia"
|
43 |
+
uses: julia-actions/cache@v2
|
44 |
with:
|
45 |
cache-name: ${{ matrix.os }}-test-${{ matrix.julia-version }}-${{ matrix.python-version }}
|
46 |
cache-packages: false
|
.github/workflows/CI_mac.yml
CHANGED
@@ -40,7 +40,7 @@ jobs:
|
|
40 |
with:
|
41 |
version: ${{ matrix.julia-version }}
|
42 |
- name: "Cache Julia"
|
43 |
-
uses: julia-actions/cache@
|
44 |
with:
|
45 |
cache-name: ${{ matrix.os }}-test-${{ matrix.julia-version }}-${{ matrix.python-version }}
|
46 |
cache-packages: false
|
|
|
40 |
with:
|
41 |
version: ${{ matrix.julia-version }}
|
42 |
- name: "Cache Julia"
|
43 |
+
uses: julia-actions/cache@v2
|
44 |
with:
|
45 |
cache-name: ${{ matrix.os }}-test-${{ matrix.julia-version }}-${{ matrix.python-version }}
|
46 |
cache-packages: false
|
.github/workflows/docker_deploy.yml
CHANGED
@@ -24,13 +24,13 @@ jobs:
|
|
24 |
- name: Checkout
|
25 |
uses: actions/checkout@v4
|
26 |
- name: Login to Docker Hub
|
27 |
-
uses: docker/login-action@
|
28 |
if: github.event_name != 'pull_request'
|
29 |
with:
|
30 |
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
31 |
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
32 |
- name: Login to GitHub registry
|
33 |
-
uses: docker/login-action@
|
34 |
if: github.event_name != 'pull_request'
|
35 |
with:
|
36 |
registry: ghcr.io
|
|
|
24 |
- name: Checkout
|
25 |
uses: actions/checkout@v4
|
26 |
- name: Login to Docker Hub
|
27 |
+
uses: docker/login-action@v3
|
28 |
if: github.event_name != 'pull_request'
|
29 |
with:
|
30 |
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
31 |
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
32 |
- name: Login to GitHub registry
|
33 |
+
uses: docker/login-action@v3
|
34 |
if: github.event_name != 'pull_request'
|
35 |
with:
|
36 |
registry: ghcr.io
|
.pre-commit-config.yaml
CHANGED
@@ -9,7 +9,7 @@ repos:
|
|
9 |
- id: check-added-large-files
|
10 |
# General formatting
|
11 |
- repo: https://github.com/psf/black
|
12 |
-
rev: 24.4.
|
13 |
hooks:
|
14 |
- id: black
|
15 |
- id: black-jupyter
|
|
|
9 |
- id: check-added-large-files
|
10 |
# General formatting
|
11 |
- repo: https://github.com/psf/black
|
12 |
+
rev: 24.4.2
|
13 |
hooks:
|
14 |
- id: black
|
15 |
- id: black-jupyter
|
README.md
CHANGED
@@ -287,7 +287,7 @@ model = PySRRegressor(
|
|
287 |
# ^ Higher precision calculations.
|
288 |
warm_start=True,
|
289 |
# ^ Start from where left off.
|
290 |
-
|
291 |
# ^ Faster evaluation (experimental)
|
292 |
extra_sympy_mappings={"cos2": lambda x: sympy.cos(x)**2},
|
293 |
# extra_torch_mappings={sympy.cos: torch.cos},
|
|
|
287 |
# ^ Higher precision calculations.
|
288 |
warm_start=True,
|
289 |
# ^ Start from where left off.
|
290 |
+
turbo=True,
|
291 |
# ^ Faster evaluation (experimental)
|
292 |
extra_sympy_mappings={"cos2": lambda x: sympy.cos(x)**2},
|
293 |
# extra_torch_mappings={sympy.cos: torch.cos},
|
examples/pysr_demo.ipynb
CHANGED
@@ -396,7 +396,7 @@
|
|
396 |
"id": "wbWHyOjl2_kX"
|
397 |
},
|
398 |
"source": [
|
399 |
-
"Since `quart` is arguably more complex than the other operators, you can also give it a different complexity, using, e.g., `complexity_of_operators={\"quart\": 2}` to give it a complexity of 2 (instead of the default
|
400 |
"\n",
|
401 |
"\n",
|
402 |
"One can also add a binary operator, with, e.g., `\"myoperator(x, y) = x^2 * y\"`. All Julia operators that work on scalar 32-bit floating point values are available.\n",
|
|
|
396 |
"id": "wbWHyOjl2_kX"
|
397 |
},
|
398 |
"source": [
|
399 |
+
"Since `quart` is arguably more complex than the other operators, you can also give it a different complexity, using, e.g., `complexity_of_operators={\"quart\": 2}` to give it a complexity of 2 (instead of the default 1). You can also define custom complexities for variables and constants (`complexity_of_variables` and `complexity_of_constants`, respectively - both take a single number).\n",
|
400 |
"\n",
|
401 |
"\n",
|
402 |
"One can also add a binary operator, with, e.g., `\"myoperator(x, y) = x^2 * y\"`. All Julia operators that work on scalar 32-bit floating point values are available.\n",
|