Skip to content

Commit f9cd7f7

Browse files
committed
refactor: root w/ new neural net
1 parent d28246d commit f9cd7f7

File tree

15 files changed

+299
-1540
lines changed

15 files changed

+299
-1540
lines changed

Makefile

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -272,30 +272,6 @@ src/uci.cpp.s:
272272
$(MAKE) $(MAKESILENT) -f CMakeFiles\engine.dir\build.make CMakeFiles/engine.dir/src/uci.cpp.s
273273
.PHONY : src/uci.cpp.s
274274

275-
src/worker.obj: src/worker.cpp.obj
276-
.PHONY : src/worker.obj
277-
278-
# target to build an object file
279-
src/worker.cpp.obj:
280-
$(MAKE) $(MAKESILENT) -f CMakeFiles\engine.dir\build.make CMakeFiles/engine.dir/src/worker.cpp.obj
281-
.PHONY : src/worker.cpp.obj
282-
283-
src/worker.i: src/worker.cpp.i
284-
.PHONY : src/worker.i
285-
286-
# target to preprocess a source file
287-
src/worker.cpp.i:
288-
$(MAKE) $(MAKESILENT) -f CMakeFiles\engine.dir\build.make CMakeFiles/engine.dir/src/worker.cpp.i
289-
.PHONY : src/worker.cpp.i
290-
291-
src/worker.s: src/worker.cpp.s
292-
.PHONY : src/worker.s
293-
294-
# target to generate assembly for a file
295-
src/worker.cpp.s:
296-
$(MAKE) $(MAKESILENT) -f CMakeFiles\engine.dir\build.make CMakeFiles/engine.dir/src/worker.cpp.s
297-
.PHONY : src/worker.cpp.s
298-
299275
# Help Target
300276
help:
301277
@echo The following are some of the valid targets for this Makefile:
@@ -323,9 +299,6 @@ help:
323299
@echo ... src/uci.obj
324300
@echo ... src/uci.i
325301
@echo ... src/uci.s
326-
@echo ... src/worker.obj
327-
@echo ... src/worker.i
328-
@echo ... src/worker.s
329302
.PHONY : help
330303

331304

config.json

Lines changed: 27 additions & 175 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@
66
"enabled": false
77
},
88
"draw": {
9-
"move_number": 40,
10-
"move_count": 3,
11-
"score": 20,
12-
"enabled": true
9+
"move_number": 0,
10+
"move_count": 1,
11+
"score": 0,
12+
"enabled": false
1313
},
1414
"maxmoves": {
15-
"move_count": 150,
16-
"enabled": true
15+
"move_count": 1,
16+
"enabled": false
1717
},
1818
"opening": {
19-
"file": "./openingbook/8moves_v3.pgn",
19+
"file": ".\\openingbook\\8moves_v3.pgn",
2020
"format": 1,
2121
"order": 0,
2222
"plies": -1,
2323
"start": 1
2424
},
2525
"pgn": {
26-
"event_name": "test",
26+
"event_name": "Fastchess Tournament",
2727
"site": "?",
28-
"file": "enginetest_12_32_31.pgn",
28+
"file": "elo_20250809-111634.pgn",
2929
"notation": 0,
3030
"track_nodes": false,
3131
"track_seldepth": false,
@@ -48,51 +48,32 @@
4848
},
4949
"config_name": "",
5050
"output": 0,
51-
"seed": 13538336756609105525,
51+
"seed": 15386497898281713509,
5252
"variant": 0,
5353
"ratinginterval": 10,
5454
"scoreinterval": 1,
5555
"wait": 0,
56-
"autosaveinterval": 1,
56+
"autosaveinterval": 20,
5757
"games": 2,
58-
"rounds": 15,
59-
"concurrency": 4,
58+
"rounds": 10,
59+
"concurrency": 2,
6060
"force_concurrency": false,
61-
"recover": true,
61+
"recover": false,
6262
"noswap": false,
6363
"reverse": false,
6464
"report_penta": true,
6565
"affinity": false,
6666
"log": {
67-
"file": "debug.log",
68-
"level": 3,
67+
"file": "",
68+
"level": 2,
6969
"compress": false,
7070
"realtime": true
7171
},
7272
"engines": [
7373
{
7474
"name": "engine",
7575
"dir": "",
76-
"cmd": "./build/engine.exe",
77-
"args": "",
78-
"options": [],
79-
"limit": {
80-
"tc": {
81-
"increment": 100,
82-
"fixed_time": 0,
83-
"time": 10000,
84-
"moves": 0,
85-
"timemargin": 0
86-
},
87-
"nodes": 0,
88-
"plies": 0
89-
},
90-
"variant": 0
91-
},
92-
{
93-
"name": "engine.0.3.0.core-avx2",
94-
"dir": "",
95-
"cmd": "./build/engine.0.3.0.core-avx2.exe",
76+
"cmd": "build/engine.exe",
9677
"args": "",
9778
"options": [],
9879
"limit": {
@@ -111,26 +92,7 @@
11192
{
11293
"name": "neuromancer",
11394
"dir": "",
114-
"cmd": "./build/neuromancer.exe",
115-
"args": "",
116-
"options": [],
117-
"limit": {
118-
"tc": {
119-
"increment": 100,
120-
"fixed_time": 0,
121-
"time": 10000,
122-
"moves": 0,
123-
"timemargin": 0
124-
},
125-
"nodes": 0,
126-
"plies": 0
127-
},
128-
"variant": 0
129-
},
130-
{
131-
"name": "kelp",
132-
"dir": "",
133-
"cmd": "./build/kelp.exe",
95+
"cmd": "build/neuromancer.exe",
13496
"args": "",
13597
"options": [],
13698
"limit": {
@@ -148,137 +110,27 @@
148110
}
149111
],
150112
"stats": {
151-
"kelp vs neuromancer": {
152-
"wins": 6,
153-
"losses": 13,
154-
"draws": 3,
155-
"penta_WW": 1,
156-
"penta_WD": 2,
157-
"penta_WL": 2,
158-
"penta_DD": 0,
159-
"penta_LD": 1,
160-
"penta_LL": 5
161-
},
162-
"kelp vs engine.0.3.0.core-avx2": {
163-
"wins": 9,
164-
"losses": 5,
165-
"draws": 2,
166-
"penta_WW": 3,
167-
"penta_WD": 0,
168-
"penta_WL": 3,
169-
"penta_DD": 0,
170-
"penta_LD": 2,
171-
"penta_LL": 0
172-
},
173-
"neuromancer vs engine.0.3.0.core-avx2": {
174-
"wins": 16,
175-
"losses": 5,
176-
"draws": 1,
177-
"penta_WW": 6,
178-
"penta_WD": 1,
179-
"penta_WL": 3,
180-
"penta_DD": 0,
181-
"penta_LD": 0,
182-
"penta_LL": 1
183-
},
184-
"neuromancer vs kelp": {
185-
"wins": 5,
186-
"losses": 3,
113+
"neuromancer vs engine": {
114+
"wins": 0,
115+
"losses": 0,
187116
"draws": 0,
188-
"penta_WW": 1,
117+
"penta_WW": 0,
189118
"penta_WD": 0,
190-
"penta_WL": 3,
191-
"penta_DD": 0,
192-
"penta_LD": 0,
193-
"penta_LL": 0
194-
},
195-
"engine.0.3.0.core-avx2 vs kelp": {
196-
"wins": 9,
197-
"losses": 3,
198-
"draws": 2,
199-
"penta_WW": 2,
200-
"penta_WD": 2,
201-
"penta_WL": 3,
119+
"penta_WL": 0,
202120
"penta_DD": 0,
203121
"penta_LD": 0,
204122
"penta_LL": 0
205123
},
206-
"engine.0.3.0.core-avx2 vs neuromancer": {
207-
"wins": 3,
208-
"losses": 5,
124+
"engine vs neuromancer": {
125+
"wins": 0,
126+
"losses": 2,
209127
"draws": 0,
210128
"penta_WW": 0,
211129
"penta_WD": 0,
212-
"penta_WL": 3,
130+
"penta_WL": 0,
213131
"penta_DD": 0,
214132
"penta_LD": 0,
215133
"penta_LL": 1
216-
},
217-
"kelp vs engine": {
218-
"wins": 5,
219-
"losses": 17,
220-
"draws": 0,
221-
"penta_WW": 1,
222-
"penta_WD": 0,
223-
"penta_WL": 3,
224-
"penta_DD": 0,
225-
"penta_LD": 0,
226-
"penta_LL": 7
227-
},
228-
"engine.0.3.0.core-avx2 vs engine": {
229-
"wins": 5,
230-
"losses": 16,
231-
"draws": 7,
232-
"penta_WW": 0,
233-
"penta_WD": 2,
234-
"penta_WL": 3,
235-
"penta_DD": 1,
236-
"penta_LD": 3,
237-
"penta_LL": 5
238-
},
239-
"engine vs engine.0.3.0.core-avx2": {
240-
"wins": 1,
241-
"losses": 1,
242-
"draws": 0,
243-
"penta_WW": 0,
244-
"penta_WD": 0,
245-
"penta_WL": 1,
246-
"penta_DD": 0,
247-
"penta_LD": 0,
248-
"penta_LL": 0
249-
},
250-
"neuromancer vs engine": {
251-
"wins": 8,
252-
"losses": 4,
253-
"draws": 0,
254-
"penta_WW": 2,
255-
"penta_WD": 0,
256-
"penta_WL": 4,
257-
"penta_DD": 0,
258-
"penta_LD": 0,
259-
"penta_LL": 0
260-
},
261-
"engine vs kelp": {
262-
"wins": 7,
263-
"losses": 1,
264-
"draws": 0,
265-
"penta_WW": 3,
266-
"penta_WD": 0,
267-
"penta_WL": 1,
268-
"penta_DD": 0,
269-
"penta_LD": 0,
270-
"penta_LL": 0
271-
},
272-
"engine vs neuromancer": {
273-
"wins": 8,
274-
"losses": 8,
275-
"draws": 2,
276-
"penta_WW": 3,
277-
"penta_WD": 1,
278-
"penta_WL": 1,
279-
"penta_DD": 0,
280-
"penta_LD": 1,
281-
"penta_LL": 3
282134
}
283135
}
284136
}

crystal.bin

48.3 KB
Binary file not shown.

src/eval.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ class NNUEState {
130130
}
131131
// Accumulate
132132
int y = w.fc2_bias + temp[0] / 127 + temp[1] / 127 + temp[2] / 127 + temp[3] / 127;
133-
y = y / 152;
133+
y = y / 140;
134134
return y;
135135
}
136136
};

0 commit comments

Comments
 (0)