From 463a4482d8d69cdf6605624feabf094d142724f9 Mon Sep 17 00:00:00 2001 From: Alex Allmont Date: Mon, 19 Jan 2026 15:55:01 +0000 Subject: [PATCH 1/5] docs: remove out of date asv instructions (#279) - asv is now run in the root dir, not the benchmarks folder. --- benchmarks/README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/benchmarks/README.md b/benchmarks/README.md index 7dfba05db..195e45e9a 100644 --- a/benchmarks/README.md +++ b/benchmarks/README.md @@ -20,9 +20,6 @@ This installs: #### Initial Setup ```bash -# Navigate to benchmarks directory -cd benchmarks - # Initialize ASV (first time only) asv machine --yes From a4c0bdb91b6fe3bc2fd9ef9eb0b2735384c7c966 Mon Sep 17 00:00:00 2001 From: Alex Allmont Date: Mon, 19 Jan 2026 15:58:43 +0000 Subject: [PATCH 2/5] fix: remove asv branch specifier (#279) - In-development branch name specified here prevents asv running locally --- asv.conf.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/asv.conf.json b/asv.conf.json index 43ab53bf5..4e8240dee 100644 --- a/asv.conf.json +++ b/asv.conf.json @@ -3,9 +3,6 @@ "project": "roughpy", "project_url": "https://github.com/datasig-ac-uk/RoughPy", "repo": ".", - "branches": [ - "jl/benchmarks" - ], "dvcs": "git", "environment_type": "virtualenv", "show_commit_url": "https://github.com/datasig-ac-uk/RoughPy/commit/", From 323ab6fb5cdb26d977cbb17a32eae6372a6cefab Mon Sep 17 00:00:00 2001 From: Alex Allmont Date: Mon, 19 Jan 2026 15:59:05 +0000 Subject: [PATCH 3/5] tidy: gitignore asv-generated files (#279) --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 491072c4c..33052203e 100644 --- a/.gitignore +++ b/.gitignore @@ -375,4 +375,6 @@ examples/*.png examples/documentation-testing.py todo.md -tools/vcpkg/ \ No newline at end of file +tools/vcpkg/ + +.asv/ From c5967447ff17a27244a5842fa4110d71ba011bcb Mon Sep 17 00:00:00 2001 From: Alex Allmont Date: Tue, 20 Jan 2026 12:06:38 +0000 Subject: [PATCH 4/5] docs: correct branch in ASV docs (#279) - This needs to be set for asv run's pip to pick up roughpy_jax folder as a python package. - These instructions may need to change when we have added a roughpy_jax pyproject.toml, but for now this helps new users get their bearings. --- asv.conf.json | 3 +++ benchmarks/README.md | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/asv.conf.json b/asv.conf.json index 4e8240dee..7c028ad35 100644 --- a/asv.conf.json +++ b/asv.conf.json @@ -3,6 +3,9 @@ "project": "roughpy", "project_url": "https://github.com/datasig-ac-uk/RoughPy", "repo": ".", + "branches": [ + "" + ], "dvcs": "git", "environment_type": "virtualenv", "show_commit_url": "https://github.com/datasig-ac-uk/RoughPy/commit/", diff --git a/benchmarks/README.md b/benchmarks/README.md index 195e45e9a..e0d9a0f26 100644 --- a/benchmarks/README.md +++ b/benchmarks/README.md @@ -19,6 +19,17 @@ This installs: ### Running Benchmarks #### Initial Setup + +Open `asv.conf.json` and set your branch name, i.e. replace with result of `git branch --show-current`: + +```json + "branches": [ + "" + ], +``` + +Then in the shell: + ```bash # Initialize ASV (first time only) asv machine --yes @@ -29,8 +40,6 @@ asv run --launch-method spawn #### Continuous Use ```bash -# From benchmarks directory: - # Run benchmarks for specific commits asv run main^..HEAD @@ -44,8 +53,6 @@ asv preview #### Development Testing ```bash -# From benchmarks directory: - # Quick test of benchmark validity asv dev From d8cc8f31a3dde24d2fca2a9149a424c779577838 Mon Sep 17 00:00:00 2001 From: Alex Allmont Date: Tue, 20 Jan 2026 12:32:40 +0000 Subject: [PATCH 5/5] tidy: json format asv.conf (#279) --- asv.conf.json | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/asv.conf.json b/asv.conf.json index 7c028ad35..125a44318 100644 --- a/asv.conf.json +++ b/asv.conf.json @@ -9,43 +9,50 @@ "dvcs": "git", "environment_type": "virtualenv", "show_commit_url": "https://github.com/datasig-ac-uk/RoughPy/commit/", - "pythons": ["3.12"], - + "pythons": [ + "3.12" + ], "matrix": { - "jax": ["0.8.0"], - "jaxlib": ["0.8.0"], - "numpy": ["2.3.4"] + "jax": [ + "0.8.0" + ], + "jaxlib": [ + "0.8.0" + ], + "numpy": [ + "2.3.4" + ] }, - "exclude": [ - {"python": "3.12", "jax": null} + { + "python": "3.12", + "jax": null + } ], - "benchmark_dir": "benchmarks/", "env_dir": ".asv/env", "results_dir": ".asv/results", "html_dir": ".asv/html", - "install_command": [ "python -m pip install {wheel_file}" ], - "uninstall_command": [ "return-code=any python -m pip uninstall -y {project}" ], - "build_command": [ "python -m pip install scikit-build-core[pyproject] 'pybind11<3.0.0' numpy hatch-fancy-pypi-readme jax", "CMAKE_ARGS='-DROUGHPY_JAX=ON' python -m pip wheel --no-build-isolation --no-deps -vvv {build_dir} -w {build_cache_dir}" ], - "benchmark_pattern": "^(Bench|Track|Suite)", "regressions_first_commits": {}, "regressions_thresholds": { - "factors": {"factor": 2.0}, - "percentages": {"percentage": 20.0} + "factors": { + "factor": 2.0 + }, + "percentages": { + "percentage": 20.0 + } }, - "hash_length": 8, "cpu_count": null, "build_cache_size": 1