bench 8812336

rn5f107s2 · Oct 6, 2024 · f8843d4 · f8843d4
1 parent 59d7cc5
commit f8843d4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ OBJ_DIR=build
 MOLY_DIR=src
 CXX=clang++
 
-DEFAULT_NET_NAME=params.bin
+DEFAULT_NET_NAME=raw.bin
 DEFAULT_WDL_HEAD_NAME=net.nnue
 
 DEFAULT_EXE = $(OBJ_DIR)/Molybdenum

diff --git a/src/Nets/raw.bin b/src/Nets/raw.bin
diff --git a/src/nnue.cpp b/src/nnue.cpp
@@ -52,6 +52,8 @@ void Net::loadDefaultNet() {
 
     bias1    = defaultWeights.bias1;
     weights2 = defaultWeights.weights2;
+    biasS    = defaultWeights.biasS; 
+    weightsS = defaultWeights.weightsS;
     bias2    = defaultWeights.bias2;
     weights3 = defaultWeights.weights3;
     bias3    = defaultWeights.bias3;
@@ -80,7 +82,7 @@ void Net::initAccumulator(std::array<u64, 13> &bitboards) {
 }
 
 int Net::calculate(Color c) {
-    float out = bias3[0];
+    float out = bias3[0] + biasS[0];
     std::array<float, L2_SIZE> l1Out = bias1;
     std::array<float, L3_SIZE> l2Out = bias2;
 
@@ -125,6 +127,9 @@ int Net::calculate(Color c) {
         l1Out[7] += screlu(float(accumulator[!c][n]) / 255.0f) * weights1[n + L1_SIZE];
     }
 
+    for (int n = 0; n < L2_SIZE; n++)
+        out += l1Out[n] * weightsS[n];
+
     for (int n = 0; n < L2_SIZE; n++)
         for (int m = 0; m < L3_SIZE; m++)
             l2Out[m] += screlu(l1Out[n]) * weights2[n * L3_SIZE + m];

diff --git a/src/nnue.h b/src/nnue.h
@@ -24,6 +24,8 @@ struct Weights {
     std::array<float, L1_SIZE> bias0{};
     std::array<float, L1_SIZE * L2_SIZE * 2> weights1{};
     std::array<float, L2_SIZE> bias1{};
+    std::array<float, L2_SIZE * OUT_SIZE> weightsS{};
+    std::array<float, OUT_SIZE> biasS{};
     std::array<float, L2_SIZE * L3_SIZE> weights2{};
     std::array<float, L3_SIZE> bias2{};
     std::array<float, L3_SIZE * OUT_SIZE> weights3{};
@@ -39,8 +41,10 @@ class Net {
 public:
     std::array<int16_t , L1_SIZE * INPUT_SIZE> weights0{};
     std::array<int16_t, L1_SIZE> bias0{};
-    std::array<float, 64 * 4 * 2> weights1{};
+    std::array<float, 32 * 8 * 2> weights1{};
     std::array<float, L2_SIZE> bias1{};
+    std::array<float, L2_SIZE * OUT_SIZE> weightsS{};
+    std::array<float, OUT_SIZE> biasS{};
     std::array<float, L2_SIZE * L3_SIZE> weights2{};
     std::array<float, L3_SIZE> bias2{};
     std::array<float, L3_SIZE * OUT_SIZE> weights3{};