Skip to content

Commit 0929736

Browse files
committed
Update branch map for the 2026-09-04 main merges and the 1885 carve
Record the merged apache#1190, apache#1191, apache#1265, and apache#1211 (now supplied by main), the slimmed subword-API-only apache#1165 with its add-ons PR apache#178, the open apache#1266 hunspell follow-up, refreshed PR heads, and the regenerated uber and helper tips.
1 parent f57393e commit 0929736

1 file changed

Lines changed: 44 additions & 45 deletions

File tree

RESEARCH_BRANCHES.md

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
# Research branch map
22

3-
State verified on 2026-09-03 against Apache GitHub, every live worktree in
3+
State verified on 2026-09-04 against Apache GitHub, every live worktree in
44
`repos.all.txt`, the org remote, `regen-uber.sh`, and the current provenance
55
manifest.
66

7-
Apache main is `73f9a25f7`. It includes the typed Document container from
8-
merged PR #1182, the paragraph normalizer from merged PR #1249, and term
9-
vectors from merged PR #1212. The public `OPENNLP-1833-grpc-helper` is
10-
`2b5ebbc9d` locally and on Apache. It contains Apache main plus all 15 open
11-
pull requests in the 3.x review graph, drafts included. No open 2.x pull
12-
request belongs in this helper.
13-
14-
`regen-uber.sh` now starts from current main, drops merged #1182, #1249, and
15-
#1212 branches,
7+
Apache main is `144be05ae`. It includes the typed Document container from
8+
merged PR #1182, the paragraph normalizer from merged PR #1249, term vectors
9+
from merged PR #1212, Hunspell stemming from merged PRs #1190, CJK lattice
10+
tokenization from merged PRs #1191 and #1265, and the verified resource
11+
installer from merged PR #1211. The public `OPENNLP-1833-grpc-helper` was
12+
regenerated locally on 2026-09-04 as `16e3568c2`: current Apache main plus all
13+
13 open pull requests in the 3.x review graph, drafts included. The helper
14+
push to Apache is pending and needs the user's one-time authorization. No open
15+
2.x pull request belongs in this helper.
16+
17+
`regen-uber.sh` now starts from current main, drops merged #1182, #1249,
18+
#1212, #1190, #1191/#1265, and #1211 branches,
1619
and selects the cascaded heads shown below. The exact refs in the last
1720
completed preview remain recorded in `PIPESTREAM-PROVENANCE.txt`; during a
1821
cascade that generated manifest can temporarily trail this membership plan.
@@ -39,7 +42,7 @@ research branch is selected for uber.
3942

4043
```mermaid
4144
flowchart LR
42-
main["apache main<br/>OPENNLP-1888, OPENNLP-1921, and OPENNLP-1897 included"]
45+
main["apache main<br/>OPENNLP-1888, -1921, -1897, -1893, -1894, and -1909 included"]
4346
uber["kristian-3.x-features<br/>generated uber"]
4447
apacheTips{{"APACHE_TIPS"}}
4548
researchTips{{"RESEARCH_TIPS"}}
@@ -49,19 +52,21 @@ flowchart LR
4952
wordnet["#1155 WordNet API"]
5053
expansion["#1167 WordNet expansion"]
5154
light["#1166 Light stemmers"]
52-
sentencepiece["#1165 SentencePiece"]
55+
sentencepiece["#1165 Subword API and WordPiece"]
5356
static["#1152 Static embeddings<br/>add-ons reconciliation"]
5457
turbo["#1213 TurboQuant"]
5558
vector["#1214 Vector index"]
5659
evaluation["#1215 Vector evaluation"]
57-
hunspell["#1190 Hunspell"]
58-
lattice["#1191 CJK lattice"]
59-
installer["#1211 Resource installer"]
60+
hunspellFix["#1266 Hunspell corrections"]
6061
parser["#1236 Dependency parser"]
6162
dependency["#1237 Dependency annotations"]
6263
relation["#1238 Relation extraction"]
6364
end
6465
66+
subgraph addons["apache/opennlp-addons"]
67+
subwordAddon["addons PR #178 SentencePiece impl<br/>(subword-addon, draft)"]
68+
end
69+
6570
subgraph research["Research branches"]
6671
artifacts["Text artifacts"]
6772
assets["Embedded assets"]
@@ -92,10 +97,8 @@ flowchart LR
9297
main --> wordnet --> expansion
9398
main --> light
9499
main --> sentencepiece --> static --> turbo --> vector --> evaluation
95-
main --> hunspell
96-
main --> lattice
97-
hunspell --> installer
98-
lattice --> installer
100+
main --> hunspellFix
101+
sentencepiece -. impl moved .-> subwordAddon
99102
main --> parser --> dependency --> relation
100103
101104
main --> artifacts
@@ -120,9 +123,6 @@ flowchart LR
120123
wordnet --> apacheTips
121124
expansion --> apacheTips
122125
light --> apacheTips
123-
hunspell --> apacheTips
124-
lattice --> apacheTips
125-
installer --> apacheTips
126126
evaluation --> apacheTips
127127
relation --> apacheTips
128128
@@ -159,26 +159,26 @@ flowchart LR
159159
| [#1152](https://github.com/apache/opennlp/pull/1152) | Static embeddings | `OPENNLP-1885-sentencepiece` | `f6f1bef48e` | `18b3426767` | Draft, no decision | Via #1215 |
160160
| [#1154](https://github.com/apache/opennlp/pull/1154) | Gazetteer and geocoder API | `main` | `b81d0eb978` | `2b72aa1a66` | Draft, review required | Direct |
161161
| [#1155](https://github.com/apache/opennlp/pull/1155) | WordNet API and readers | `main` | `9c0e9a0533` | `19117b0315` | Draft, review required, conflicting | Direct |
162-
| [#1165](https://github.com/apache/opennlp/pull/1165) | Subword API and WordPiece | `main` | `96d2781cb2` | `d2c216e749` | Ready, review required | Via #1215 |
163-
| [#1166](https://github.com/apache/opennlp/pull/1166) | UniNE light and minimal stemmers | `main` | `ff681b3934` | `e0a46ee89d` | Draft, review required | Direct |
164-
| [#1167](https://github.com/apache/opennlp/pull/1167) | WordNet expansion | `main` | `a68762fe35` | `e6fad91bf2` | Draft, review required, conflicting | Direct |
165-
| [#1190](https://github.com/apache/opennlp/pull/1190) | Hunspell stemming | `main` | `c833264c1c` | `b2b5bd9da1` | Ready, changes requested | Direct |
166-
| [#1191](https://github.com/apache/opennlp/pull/1191) | CJK lattice tokenization | `main` | `dba1353580` | `01c1875d23` | Ready, changes requested | Direct |
167-
| [#1211](https://github.com/apache/opennlp/pull/1211) | Verified resource installer | `main` | `b1b38039f7` | `79dd6ec5f4` | Ready, review required | Direct |
162+
| [#1165](https://github.com/apache/opennlp/pull/1165) | Subword API and WordPiece | `main` | `141160e439` | `141160e439` | Ready, rzo1 review answered 2026-09-04, eval build pending | Via #1215 |
163+
| [#1166](https://github.com/apache/opennlp/pull/1166) | UniNE light and minimal stemmers | `main` | `233514d523` | `403302109e` | Draft, review required | Direct |
164+
| [#1167](https://github.com/apache/opennlp/pull/1167) | WordNet expansion | `main` | `1d13232d89` | `db8c221440` | Draft, review required, conflicting | Direct |
168165
| [#1213](https://github.com/apache/opennlp/pull/1213) | TurboQuant embedding tables | `main` | `05398bb677` | `16e4ab4d17` | Draft, review required | Via #1215 |
169-
| [#1214](https://github.com/apache/opennlp/pull/1214) | Bounded in-memory vector indexes | `main` | `ac501e2259` | `bc844412e4` | Draft, review required | Via #1215 |
166+
| [#1214](https://github.com/apache/opennlp/pull/1214) | Bounded in-memory vector indexes | `main` | `ac501e2259` | `bc844412e4` | Draft, review required | Via #1214 stack |
170167
| [#1215](https://github.com/apache/opennlp/pull/1215) | Vector-search evaluation | `main` | `5b79627bb8` | `89d8fba4c5` | Draft, review required | Direct stack tip |
171-
| [#1236](https://github.com/apache/opennlp/pull/1236) | Dependency parser | `main` | `83bc298189` | `437d01ff56` | Ready, review required | Via #1238 |
172-
| [#1237](https://github.com/apache/opennlp/pull/1237) | Dependency Document layer | `OPENNLP-547-dependency-parser` | `75bf330a26` | `a974a8d8c1` | Draft, no decision, conflicting | Via #1238 |
173-
| [#1238](https://github.com/apache/opennlp/pull/1238) | Dependency-path relation extraction | `OPENNLP-1919-dependency-annotations` | `9c860c3afc` | `20e99af717` | Draft, no decision | Direct stack tip |
174-
175-
PRs #1182, #1212, #1247, #1249, and #1250 merged and are now supplied by
176-
main. The earlier local competing OPENNLP-1921 branch is review-only and is not
177-
an uber feature source. The local static-embedding line contains the API-only
178-
#1165 head but still carries its earlier in-repository SentencePiece
179-
implementation so the preview remains buildable. Replace that copy with the
180-
add-ons module during embeddings reconciliation. The local cascaded heads have
181-
not been pushed to their Apache branches.
168+
| [#1236](https://github.com/apache/opennlp/pull/1236) | Dependency parser | `main` | `5cc405820d` | `aa90290996` | Ready, rebased per mawiesne 2026-09-04 | Via #1238 |
169+
| [#1237](https://github.com/apache/opennlp/pull/1237) | Dependency Document layer | `OPENNLP-547-dependency-parser` | `75bf330a26` | `f8498b1e66` | Draft, no decision, conflicting | Via #1238 |
170+
| [#1238](https://github.com/apache/opennlp/pull/1238) | Dependency-path relation extraction | `OPENNLP-1919-dependency-annotations` | `9c860c3afc` | `92df0620ce` | Draft, no decision | Direct stack tip |
171+
| [#1266](https://github.com/apache/opennlp/pull/1266) | Hunspell parsing and analysis corrections | `main` | `6e18532129` | `6e18532129` | Ready, changes requested (javadoc churn; process items pending) | Not a feature source; fixes land on main |
172+
173+
PRs #1182, #1190, #1191, #1211, #1212, #1247, #1249, #1250, and #1265 merged
174+
and are now supplied by main. The earlier local competing OPENNLP-1921 branch
175+
is review-only and is not an uber feature source. The local static-embedding
176+
line contains the API-only #1165 head but still carries its earlier
177+
in-repository SentencePiece implementation so the preview remains buildable.
178+
Replace that copy with the add-ons module during embeddings reconciliation.
179+
The stale local branches `OPENNLP-1893-hunspell`, `OPENNLP-1894-lattice-cjk`,
180+
and `OPENNLP-1909-resource-installer` are superseded by merged main and can be
181+
retired.
182182

183183
## Research worktrees
184184

@@ -217,11 +217,10 @@ directory, not in this branch-status map.
217217

218218
## Add-ons candidates
219219

220-
This is a routing list, not an Apache consensus decision. Document Shape and
221-
term vectors are already in core. The remaining narrow core candidates are the
222-
subword API and WordPiece (#1165), Hunspell stemming (#1190), CJK lattice
223-
tokenization (#1191), the resource installer (#1211), and the dependency parser
224-
(#1236).
220+
This is a routing list, not an Apache consensus decision. Document Shape, term
221+
vectors, Hunspell stemming, CJK lattice tokenization, and the resource
222+
installer are already in core. The remaining narrow core candidates are the
223+
subword API and WordPiece (#1165) and the dependency parser (#1236).
225224

226225
| Family | Candidate add-ons |
227226
| --- | --- |

0 commit comments

Comments
 (0)