Revert "parallelize kORE outer (k, n) trials via ProcessPoolExecutor"

This reverts commit 0b5b0e623b.
This commit is contained in:
tobjend 2026-07-11 20:36:48 +02:00
parent 0b5b0e623b
commit ce6521ad5e
2 changed files with 18 additions and 52 deletions

View file

@ -386,18 +386,18 @@ _ALGORITHMS = {
} }
def _run_kore(sequences, kmax, N, n_workers=1): def _run_kore(sequences, kmax, N):
"""Run kOREInference, return (grammar, score) or (None, inf).""" """Run kOREInference, return (grammar, score) or (None, inf)."""
from .kore import kOREInference from .kore import kOREInference
kore = kOREInference(k_max=kmax, N=N) kore = kOREInference(k_max=kmax, N=N)
result = kore.infer(sequences, n_workers=n_workers) result = kore.infer(sequences)
if result: if result:
_, expr, _ = result _, expr, _ = result
return expr, mdl_score_simple(expr, sequences) return expr, mdl_score_simple(expr, sequences)
return None, float('inf') return None, float('inf')
def infer_ensemble(sequences, kmax=2, N=3, prefer=None, min_coverage=1.0, include_kore=False, n_workers=1): def infer_ensemble(sequences, kmax=2, N=3, prefer=None, min_coverage=1.0, include_kore=False):
"""Run all applicable algorithms and return the best by MDL score. """Run all applicable algorithms and return the best by MDL score.
Args: Args:
@ -450,7 +450,7 @@ def infer_ensemble(sequences, kmax=2, N=3, prefer=None, min_coverage=1.0, includ
# 3. kOREInference (opt-in via include_kore=True) # 3. kOREInference (opt-in via include_kore=True)
if include_kore: if include_kore:
kore_g, kore_score = _run_kore(sequences, kmax, N, n_workers=n_workers) kore_g, kore_score = _run_kore(sequences, kmax, N)
if kore_g: if kore_g:
results.append(('kOREInference', kore_g, kore_score)) results.append(('kOREInference', kore_g, kore_score))

View file

@ -13,9 +13,6 @@ Unlike the PTA→Shrink→Repair approach from Bex 2008, this follows
the journal paper (arXiv 1004.2372) exactly. the journal paper (arXiv 1004.2372) exactly.
""" """
import os
from concurrent.futures import ProcessPoolExecutor, as_completed
from .ikoa import ikoa from .ikoa import ikoa
from .rwrsq import rwr_sq from .rwrsq import rwr_sq
from .idregex import is_deterministic from .idregex import is_deterministic
@ -56,28 +53,6 @@ def validate_k_ore(expr, k, alphabet_set=None):
return True, "OK" return True, "OK"
def _kore_trial(args):
"""Run one (k, n) trial. Module-level for ProcessPoolExecutor.
Args:
args: (sequences, k, trial_index) trial_index unused, for diagnostics
Returns:
(koa_automaton, expression_string, k) or None
"""
sequences, k, _ = args
G = ikoa(sequences, k, num_trials=1)
if G is None:
return None
expr = rwr_sq(G)
if expr and expr not in ('', 'ε'):
if is_deterministic(expr):
valid, _ = validate_k_ore(expr, k)
if valid:
return (G, expr, k)
return None
class kOREInference: class kOREInference:
""" """
| Algorithm 4: iDRegEx | | Algorithm 4: iDRegEx |
@ -97,12 +72,9 @@ class kOREInference:
self.k_max = k_max self.k_max = k_max
self.N = N self.N = N
def infer(self, sequences, n_workers=1): def infer(self, sequences):
"""Infer the best k-ORE for the given sequences. """
Infer the best k-ORE for the given sequences.
Args:
sequences: list of token sequences
n_workers: parallel workers. >1 runs (k, n) trials concurrently.
Returns: Returns:
(koa_automaton, expression_string, best_k) or None if no valid (koa_automaton, expression_string, best_k) or None if no valid
@ -112,25 +84,19 @@ class kOREInference:
if not sequences: if not sequences:
return None return None
trials = [(sequences, k, i)
for k in range(1, self.k_max + 1)
for i in range(self.N)]
candidates = [] candidates = []
if n_workers <= 1 or len(trials) < 2: for k in range(1, self.k_max + 1):
for t in trials: for _ in range(self.N):
result = _kore_trial(t) G = ikoa(sequences, k, num_trials=1)
if result is not None: if G is None:
candidates.append(result) continue
else: expr = rwr_sq(G)
nw = min(n_workers, len(trials)) if expr and expr not in ('', 'ε'):
with ProcessPoolExecutor(max_workers=nw) as ex: if is_deterministic(expr):
futures = [ex.submit(_kore_trial, t) for t in trials] valid, _ = validate_k_ore(expr, k)
for f in as_completed(futures): if valid:
result = f.result() candidates.append((G, expr, k))
if result is not None:
candidates.append(result)
if not candidates: if not candidates:
return None return None