mirror of
https://github.com/Akkudoktor-EOS/EOS.git
synced 2026-10-13 09:31:56 +00:00
* feat(devices): add load-dependent DC-to-AC efficiency curve for GENETIC inverters Real inverters are much less efficient at low load than at rated power (e.g. 0.80 at 2 % vs. 0.93 at 7 % load). A constant dc_to_ac_efficiency overrates night-time battery discharge into a small base load and, with it, arbitrage and grid charging. Add two optional inverter settings for the GENETIC optimizer: - dc_to_ac_efficiency_curve: list of (load_fraction, efficiency) points, load fraction = AC power / max_power_w. Points must be strictly increasing in [0, 1] with efficiencies in (0, 1]; at least two points. Linear interpolation, clamped at both ends. When set, the curve replaces dc_to_ac_efficiency. - dc_to_ac_efficiency_reference_load_fraction (default 0.06): load at which the curve values stored energy without a specific conversion. Battery discharges in Inverter.process_energy() use the efficiency at the AC energy of each conversion. The end-of-horizon value, the terminal and tail value curves and the AC charge break-even penalty use Inverter.reference_dc_to_ac_efficiency. Without a curve, dc_to_ac_efficiency_at() and the reference efficiency return dc_to_ac_efficiency itself, so results are bit-identical to the previous model. GENETIC0 is unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(genetic): make the fitness cache size configurable The per-run fitness cache of the GENETIC optimizer is unbounded. It grows with individuals x generations (~110k keys at 300 x 400, about 1.1 kB each, 1.6 kB with an EV) and adds 120-170 MB to the peak memory of a run, while only 6-15 % of the lookups hit. On 512 MB boards this is the largest part of the optimizer's memory. Add optimization.genetic.fitness_cache_max_entries: - None (default): unbounded, the previous behaviour. - 0: no cache; every genome is evaluated. - N > 0: at most N keys. The cache is then an OrderedDict and evicts the oldest key first (FIFO, O(1)); LRU would cost bookkeeping on every hit for a cache that rarely hits. A cache hit returns exactly what the deterministic evaluation would return, so the plan for a fixed seed is identical with any setting. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * perf: import heavy optional dependencies on first use A GENETIC server with external (import) providers and EOSdash disabled loads several large packages at start that it never uses, which costs a noticeable part of the memory on 512 MB boards: - matplotlib via the GENETIC/GENETIC0 PDF report modules (server/eos.py) - statsmodels via the Holt-Winters fallback in prediction/priceabc.py - pvlib via the weather base class and the pvlib-based providers - bs4/lxml via the ClearOutside provider - scipy via the self-consumption interpolator singletons, which were loaded at import time - the GENETIC0 optimizer, imported by core/ems.py - tzfpy, whose polygon data the computed general.timezone loads Import these where they are used. The interpolator tables are loaded on first use (thread-safe). Nothing changes in what is computed. general.timezone is computed from latitude/longitude and cannot be set. Add general.timezone_override (IANA name, validated with pendulum): when set, general.timezone returns it and the lookup is skipped. When unset (default) the lookup is unchanged. Tests that patched the moved names now patch them at their source. A new test starts the server module in a subprocess and checks that none of these modules is loaded. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * perf(prediction): evaluate self-consumption tables without SciPy The GENETIC inverter (and the GENETIC0 one) evaluates a pickled scipy.interpolate.RegularGridInterpolator for the self-consumption probabilities. SciPy is used nowhere else in EOS, yet loading it costs about 35 MB RSS (21 MB anonymous) on Linux arm64, which every optimization run pays. Add utils/gridinterpolator.py: - LinearGridInterpolator: 2-D linear interpolation with the same steps as SciPy's linear 2-D path (interval search, normalised distances, corner weights summed in the same order, fill value outside the grid, NaN for NaN input). - load_grid_interpolator(): reads the shipped pickles with a restricted unpickler that maps the SciPy class to a stand-in and accepts only the NumPy globals needed for the arrays. SciPy is not imported, and the data files no longer depend on SciPy's private module paths. Results are bit-identical to SciPy on Linux (aarch64, checked on 3.6M points per table including the query pattern of the inverter). The macOS arm64 SciPy wheel fuses multiply-add, so there SciPy itself differs by <= 1.1e-16; GENETIC plans for fixed seeds are unchanged on both platforms. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(prediction): make the SciPy-free table evaluation opt-in Add optimization.self_consumption_interpolator (scipy | numpy, default scipy). The default keeps evaluating the self-consumption tables with SciPy's RegularGridInterpolator, built from the same grid, values and fill value the pickle holds, so results are unchanged. With numpy the tables are evaluated by LinearGridInterpolator and SciPy is never imported. The backend is read on every evaluation, so a config change applies to the next run. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(genetic): evaluate candidates in parallel worker processes A GENETIC run evaluated every candidate in the server process, so a run used one CPU core however many the machine had. On small ARM boards (4x Cortex-A55, thermally limited) a 300x200 run took 12-15 minutes. Candidates are now evaluated in up to two worker processes, forked once per run after the run is fully prepared. Each worker owns a copy of the prepared optimizer; only genomes and results cross the process boundary. The fitness cache stays in the server process: hits are answered there, and identical genomes in a batch are evaluated once, as a serial run would hit the cache for the repeats. Results are applied only after the whole batch returned. If a batch fails or times out, the run continues serially. For a fixed seed the result is identical to a serial run. optimization.genetic.workers sets the number of processes. Unset (default) is automatic: one CPU core always stays free and at most two are used (1-2 cores -> 1, 3 or more -> 2), capped by a cgroup v2 CPU limit of the process or any parent (container limit, systemd CPUQuota). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EYWR1HVM8a8src23xuyL3T * fix(genetic): freeze the optimization configuration for the duration of a run The genetic optimization reads horizon_hours, tail_horizon_hours, interval_sec and prediction.hours from the live configuration on every access (control_slots, tail_slots, ... are properties). A client that updates the configuration while a run is in progress - DVhub shrinks or grows the control horizon as the known price horizon moves during the night - changed these values mid-run. Genomes and device arrays sized at the start then no longer matched the simulation loop and the final evaluation failed: IndexError: index 84 is out of bounds for axis 0 with size 84 Long runs on slow hardware hit this almost every night. optimize_ems() now takes a deep copy of the genetic configuration and the prediction hours at the start of a run, all reads in genetic.py go through it, and it is released when the run ends (also on errors). New values apply to the next run. Tests: tests/test_genetic_config_frozen_per_run.py reproduces the error without the fix (horizon 20 -> 24 mid-run: index 20 out of bounds) and passes with it; genetic/optimization tests 439 passed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(genetic): pin evaluation workers, keep the server responsive Workers are pinned to the last `workers` CPU cores (new setting optimization.genetic.pin_workers, default on); the server process stays unpinned. The run never spreads beyond `workers` cores without a CPU quota, and the server and the rest of the system keep the other cores. No pinning without a spare core. With a CPU limit (container cpu.max, systemd CPUQuota) the automatic worker count now keeps a quarter core of it for the server process (limit 2 -> 1 worker, 2.5 -> 2): two workers used a 2-core limit fully. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EYWR1HVM8a8src23xuyL3T * fix(devices): evaluate the efficiency curve at the delivered AC load When the battery limits a discharge (low state of charge or its power limit), the conversion ran with the efficiency of the requested AC energy. With a 1000 Wh battery at 10 % SoC, a 1000 W inverter and the curve [(0, .8), (.5, .95), (1, .95)], a request of 500 Wh AC returned 95 Wh AC from the available 100 Wh DC, although the curve gives 82.5 % at that load. The delivered AC energy now solves a = dc * efficiency(a / rated) exactly on the piecewise-linear curve (solve_ac_for_dc_energy), bounded by the request. Unlimited discharges and inverters without a curve are unchanged. Regression tests use a real Battery: low SoC and a power-limited discharge, each with 60- and 15-minute slots, battery discharge losses, the load path through process_energy, and constant efficiency. * docs: regenerate OpenAPI for the efficiency-curve fix * docs: regenerate OpenAPI after merging the efficiency-curve fix * docs: regenerate OpenAPI after merging the efficiency-curve fix * test(genetic): cover serial fallback on platforms without fork --------- Co-authored-by: Christin <christin@BigBrother.bikini.bottom.zone> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Andreas <drbacke@gmx.de>
206 lines
7.3 KiB
Python
206 lines
7.3 KiB
Python
"""Parallel fitness evaluation gives the same result as evaluating in one process."""
|
|
|
|
import multiprocessing
|
|
|
|
import pytest
|
|
|
|
from akkudoktoreos.config.config import ConfigEOS
|
|
from akkudoktoreos.core.cache import CacheEnergyManagementStore
|
|
from akkudoktoreos.core.coreabc import get_ems
|
|
from akkudoktoreos.optimization.genetic import genetic as genetic_module
|
|
from akkudoktoreos.optimization.genetic.genetic import (
|
|
GeneticOptimization,
|
|
auto_evaluation_workers,
|
|
)
|
|
from akkudoktoreos.optimization.genetic.geneticparams import (
|
|
GeneticOptimizationParameters,
|
|
)
|
|
from akkudoktoreos.utils.datetimeutil import to_datetime
|
|
|
|
ems_eos = get_ems(init=True) # init once
|
|
|
|
HOURS = 24
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"cores,cpu_limit,expected",
|
|
[
|
|
(1, None, 1),
|
|
(2, None, 1), # one core stays free
|
|
(3, None, 2),
|
|
(4, None, 2),
|
|
(16, None, 2), # at most two
|
|
(4, 1, 1), # container CPU limit
|
|
(4, 2, 1), # a quarter core stays free for the server process
|
|
(4, 2.5, 2),
|
|
(4, 3, 2),
|
|
(2, 4, 1),
|
|
],
|
|
)
|
|
def test_auto_workers_keep_one_core_free(cores, cpu_limit, expected):
|
|
assert auto_evaluation_workers(cores=cores, cpu_limit=cpu_limit) == expected
|
|
|
|
|
|
def _parameters(
|
|
config_eos: ConfigEOS, workers: int, cache_entries
|
|
) -> GeneticOptimizationParameters:
|
|
config_eos.merge_settings_from_dict(
|
|
{
|
|
"prediction": {"hours": HOURS},
|
|
"optimization": {
|
|
"genetic": {
|
|
"individuals": 30,
|
|
"generations": 10,
|
|
"tail_horizon_hours": 0,
|
|
"horizon_hours": HOURS,
|
|
"interval_sec": 3600,
|
|
"workers": workers,
|
|
"fitness_cache_max_entries": cache_entries,
|
|
}
|
|
},
|
|
"feedintariff": {"direct_marketing_enabled": True},
|
|
"devices": {
|
|
"max_batteries": 1,
|
|
"batteries": {
|
|
"battery1": {"device_id": "battery1", "grid_export_rates": [0.5, 1.0]}
|
|
},
|
|
},
|
|
}
|
|
)
|
|
ems_eos.set_start_datetime(to_datetime().set(hour=0, minute=0))
|
|
CacheEnergyManagementStore().clear()
|
|
return GeneticOptimizationParameters.model_validate(
|
|
dict(
|
|
ems={
|
|
"pv_prognose_wh": [0.0] * 8 + [3000.0] * 8 + [0.0] * 8,
|
|
"strompreis_euro_pro_wh": [0.0003] * 6 + [0.0001] * 6 + [0.0004] * 12,
|
|
"einspeiseverguetung_euro_pro_wh": [0.0001] * 12 + [0.0009] * 12,
|
|
"preis_euro_pro_wh_akku": 0.0,
|
|
"gesamtlast": [400.0] * HOURS,
|
|
},
|
|
pv_battery={
|
|
"device_id": "battery1",
|
|
"capacity_wh": 10000,
|
|
"initial_soc_percentage": 40,
|
|
"min_soc_percentage": 5,
|
|
"max_charge_power_w": 5000,
|
|
},
|
|
inverter={
|
|
"device_id": "inverter1",
|
|
"max_power_wh": 10000,
|
|
"battery_id": "battery1",
|
|
},
|
|
ev=None,
|
|
)
|
|
)
|
|
|
|
|
|
def _run(config_eos: ConfigEOS, workers: int, cache_entries):
|
|
parameters = _parameters(config_eos, workers, cache_entries)
|
|
optimization = GeneticOptimization(fixed_seed=7)
|
|
used: list[int] = []
|
|
original_start = optimization._start_evaluation_pool
|
|
|
|
def start_and_record():
|
|
original_start()
|
|
used.append(
|
|
0 if optimization._evaluation_pool is None else optimization._evaluation_workers
|
|
)
|
|
|
|
optimization._start_evaluation_pool = start_and_record # type: ignore[method-assign]
|
|
solution = optimization.optimize_ems(parameters=parameters, start_hour=0, ngen=6)
|
|
assert optimization._evaluation_pool is None # stopped after the run
|
|
return solution, used
|
|
|
|
|
|
@pytest.mark.parametrize("cache_entries", [None, 0])
|
|
@pytest.mark.skipif("fork" not in multiprocessing.get_all_start_methods(), reason="requires fork")
|
|
def test_parallel_evaluation_matches_serial(config_eos: ConfigEOS, cache_entries):
|
|
serial, serial_used = _run(config_eos, 1, cache_entries)
|
|
parallel, parallel_used = _run(config_eos, 2, cache_entries)
|
|
|
|
assert serial_used == [0]
|
|
assert parallel_used == [2]
|
|
assert parallel.start_solution == serial.start_solution
|
|
assert parallel.result.total_balance == serial.result.total_balance
|
|
assert parallel.fitness_history == serial.fitness_history
|
|
assert parallel.ac_charge == serial.ac_charge
|
|
assert parallel.dc_charge == serial.dc_charge
|
|
assert parallel.discharge_allowed == serial.discharge_allowed
|
|
assert parallel.battery_grid_export_factor == serial.battery_grid_export_factor
|
|
|
|
|
|
@pytest.mark.skipif("fork" not in multiprocessing.get_all_start_methods(), reason="requires fork")
|
|
def test_failed_batch_falls_back_to_serial(config_eos: ConfigEOS, monkeypatch):
|
|
serial, _ = _run(config_eos, 1, None)
|
|
|
|
def broken_worker(genome):
|
|
raise RuntimeError("worker lost")
|
|
|
|
monkeypatch.setattr(genetic_module, "_evaluation_worker", broken_worker)
|
|
fallback, used = _run(config_eos, 2, None)
|
|
|
|
assert used == [2]
|
|
assert fallback.start_solution == serial.start_solution
|
|
assert fallback.ac_charge == serial.ac_charge
|
|
|
|
|
|
def test_unsupported_fork_falls_back_to_serial(config_eos: ConfigEOS, monkeypatch):
|
|
serial, _ = _run(config_eos, 1, None)
|
|
|
|
def unsupported_context(method):
|
|
assert method == "fork"
|
|
raise ValueError("fork is unavailable")
|
|
|
|
monkeypatch.setattr(genetic_module.multiprocessing, "get_context", unsupported_context)
|
|
fallback, used = _run(config_eos, 2, None)
|
|
|
|
assert used == [0]
|
|
assert fallback.start_solution == serial.start_solution
|
|
assert fallback.result.total_balance == serial.result.total_balance
|
|
assert fallback.ac_charge == serial.ac_charge
|
|
assert fallback.dc_charge == serial.dc_charge
|
|
|
|
|
|
def test_cgroup_cpu_limit_reads_own_and_parent_cgroups(tmp_path, monkeypatch):
|
|
from akkudoktoreos.optimization.genetic.genetic import _cgroup_cpu_limit
|
|
|
|
service = tmp_path / "system.slice" / "eos.service"
|
|
service.mkdir(parents=True)
|
|
(tmp_path / "cpu.max").write_text("max 100000\n")
|
|
(tmp_path / "system.slice" / "cpu.max").write_text("max 100000\n")
|
|
(service / "cpu.max").write_text("150000 100000\n")
|
|
|
|
real_open = open
|
|
|
|
def fake_open(path, *args, **kwargs):
|
|
if path == "/proc/self/cgroup":
|
|
import io
|
|
|
|
return io.StringIO("0::/system.slice/eos.service\n")
|
|
return real_open(path, *args, **kwargs)
|
|
|
|
monkeypatch.setattr("builtins.open", fake_open)
|
|
assert _cgroup_cpu_limit(str(tmp_path)) == 1.5
|
|
(service / "cpu.max").write_text("max 100000\n")
|
|
assert _cgroup_cpu_limit(str(tmp_path)) is None
|
|
(tmp_path / "cpu.max").write_text("100000 100000\n")
|
|
assert _cgroup_cpu_limit(str(tmp_path)) == 1 # a parent limit counts too
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"workers,allowed,expected",
|
|
[
|
|
(2, {0, 1, 2, 3}, {2, 3}), # core 0/1 stay free for the server and the system
|
|
(3, {0, 1, 2, 3}, {1, 2, 3}),
|
|
(1, {0, 1}, {1}),
|
|
(2, {0, 1}, None), # no spare core -> no pinning
|
|
(2, {4, 5, 6, 7}, {6, 7}), # restricted container cpuset
|
|
(0, {0, 1, 2, 3}, None),
|
|
],
|
|
)
|
|
def test_worker_cpu_set(workers, allowed, expected):
|
|
from akkudoktoreos.optimization.genetic.genetic import worker_cpu_set
|
|
|
|
assert worker_cpu_set(workers, allowed) == expected
|