- k_p_256x2-32-32.hのファイル名 kp_256x2-32-32.h にrename。(入力特徴量名を'_'の左側に持って…

…きたいため。) - halfkp_vm_256x2-32-32.hもhalfkpvm_256x2-32-32.h とrename。 - NNUEのarchitectureのheaderでifdefで囲ってないものがあったのを修正。
yaneurao · Jun 24, 2024 · ca1ae6f · ca1ae6f
1 parent 40abaf3
commit ca1ae6f
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 24 deletions.
diff --git a/source/YaneuraOu.vcxproj b/source/YaneuraOu.vcxproj
@@ -620,8 +620,8 @@
  <ClInclude Include="eval\nnue\architectures\halfkp_1024x2-8-64.h" />
  <ClInclude Include="eval\nnue\architectures\halfkp_256x2-32-32.h" />
  <ClInclude Include="eval\nnue\architectures\halfkp_512x2-16-32.h" />
- <ClInclude Include="eval\nnue\architectures\halfkp_vm_256x2-32-32.h" />
- <ClInclude Include="eval\nnue\architectures\k-p_256x2-32-32.h" />
+ <ClInclude Include="eval\nnue\architectures\halfkpvm_256x2-32-32.h" />
+ <ClInclude Include="eval\nnue\architectures\kp_256x2-32-32.h" />
  <ClInclude Include="eval\nnue\evaluate_nnue.h" />
  <ClInclude Include="eval\nnue\evaluate_nnue_learner.h" />
  <ClInclude Include="eval\nnue\features\features_common.h" />

diff --git a/source/YaneuraOu.vcxproj.filters b/source/YaneuraOu.vcxproj.filters
@@ -220,7 +220,7 @@
  <ClInclude Include="eval\nnue\architectures\halfkp_256x2-32-32.h">
  <Filter>リソース ファイル\eval\nnue\architectures</Filter>
  </ClInclude>
- <ClInclude Include="eval\nnue\architectures\k-p_256x2-32-32.h">
+ <ClInclude Include="eval\nnue\architectures\kp_256x2-32-32.h">
  <Filter>リソース ファイル\eval\nnue\architectures</Filter>
  </ClInclude>
  <ClInclude Include="eval\nnue\trainer\features\factorizer.h">
@@ -319,7 +319,7 @@
  <ClInclude Include="eval\nnue\features\half_kp_vm.h">
  <Filter>リソース ファイル\eval\nnue\features</Filter>
  </ClInclude>
- <ClInclude Include="eval\nnue\architectures\halfkp_vm_256x2-32-32.h">
+ <ClInclude Include="eval\nnue\architectures\halfkpvm_256x2-32-32.h">
  <Filter>リソース ファイル\eval\nnue\architectures</Filter>
  </ClInclude>
  <ClInclude Include="engine\dlshogi-engine\dlshogi_min.h">
@@ -599,8 +599,6 @@
  <None Include="..\script\bench.py">
  <Filter>script</Filter>
  </None>
- <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\onnxruntime.dll" />
- <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\onnxruntime_providers_shared.dll" />
  </ItemGroup>
  <ItemGroup>
  <CustomBuild Include="eval\deep\unpack.cu">

diff --git a/source/eval/nnue/architectures/halfkpe9_256x2-32-32.h b/source/eval/nnue/architectures/halfkpe9_256x2-32-32.h
@@ -1,5 +1,8 @@
 // NNUE評価関数で用いる入力特徴量とネットワーク構造の定義
 
+#ifndef NNUE_HALFKPE9_256X2_32_32_H_INCLUDED
+#define NNUE_HALFKPE9_256X2_32_32_H_INCLUDED
+
 #include "../features/feature_set.h"
 #include "../features/half_kpe9.h"
 
@@ -11,20 +14,20 @@ namespace Eval {
 
 namespace NNUE {
 
-// 評価関数で用いる入力特徴量
-using RawFeatures = Features::FeatureSet<
- Features::HalfKPE9<Features::Side::kFriend>>;
-
-// 変換後の入力特徴量の次元数
-constexpr IndexType kTransformedFeatureDimensions = 256;
-
-namespace Layers {
-
-// ネットワーク構造の定義
-using InputLayer = InputSlice<kTransformedFeatureDimensions * 2>;
-using HiddenLayer1 = ClippedReLU<AffineTransform<InputLayer, 32>>;
-using HiddenLayer2 = ClippedReLU<AffineTransform<HiddenLayer1, 32>>;
-using OutputLayer = AffineTransform<HiddenLayer2, 1>;
+ // 評価関数で用いる入力特徴量
+ using RawFeatures = Features::FeatureSet<
+  Features::HalfKPE9<Features::Side::kFriend>>;
+ 
+ // 変換後の入力特徴量の次元数
+ constexpr IndexType kTransformedFeatureDimensions = 256;
+ 
+ namespace Layers {
+ 
+ // ネットワーク構造の定義
+ using InputLayer = InputSlice<kTransformedFeatureDimensions * 2>;
+ using HiddenLayer1 = ClippedReLU<AffineTransform<InputLayer, 32>>;
+ using HiddenLayer2 = ClippedReLU<AffineTransform<HiddenLayer1, 32>>;
+ using OutputLayer = AffineTransform<HiddenLayer2, 1>;
 
 } // namespace Layers
 
@@ -33,3 +36,5 @@ using Network = Layers::OutputLayer;
 } // namespace NNUE
 
 } // namespace Eval
+
+#endif // #ifndef NNUE_HALFKPE9_256X2_32_32_H_INCLUDED
diff --git a/...nue/architectures/halfkp_vm_256x2-32-32.h → ...nnue/architectures/halfkpvm_256x2-32-32.h b/...nue/architectures/halfkp_vm_256x2-32-32.h → ...nnue/architectures/halfkpvm_256x2-32-32.h
@@ -1,4 +1,7 @@
-// NNUE評価関数で用いる入力特徴量とネットワーク構造の定義
+// NNUE評価関数で用いる入力特徴量とネットワーク構造の定義
+
+#ifndef NNUE_HALFKPVM_256X2_32_32_H_INCLUDED
+#define NNUE_HALFKPVM_256X2_32_32_H_INCLUDED
 
 #include "../features/feature_set.h"
 #include "../features/half_kp_vm.h"
@@ -11,16 +14,16 @@ namespace Eval {
 
  namespace NNUE {
 
- // 評価関数で用いる入力特徴量
+ // 評価関数で用いる入力特徴量
  using RawFeatures = Features::FeatureSet<
  Features::HalfKP_vm<Features::Side::kFriend>>;
 
- // 変換後の入力特徴量の次元数
+ // 変換後の入力特徴量の次元数
  constexpr IndexType kTransformedFeatureDimensions = 256;
 
  namespace Layers {
 
- // ネットワーク構造の定義
+ // ネットワーク構造の定義
  using InputLayer = InputSlice<kTransformedFeatureDimensions * 2>;
  using HiddenLayer1 = ClippedReLU<AffineTransform<InputLayer, 32>>;
  using HiddenLayer2 = ClippedReLU<AffineTransform<HiddenLayer1, 32>>;
@@ -33,3 +36,5 @@ namespace Eval {
  } // namespace NNUE
 
 } // namespace Eval
+
+#endif // #ifndef NNUE_HALFKPVM_256X2_32_32_H_INCLUDED
diff --git a/...eval/nnue/architectures/k-p_256x2-32-32.h → .../eval/nnue/architectures/kp_256x2-32-32.h b/...eval/nnue/architectures/k-p_256x2-32-32.h → .../eval/nnue/architectures/kp_256x2-32-32.h
@@ -1,4 +1,6 @@
 // NNUE評価関数で用いる入力特徴量とネットワーク構造の定義
+#ifndef NNUE_KP_256X2-32-32_H_INCLUDED
+#define NNUE_KP_256X2-32-32_H_INCLUDED
 
 #include "../features/feature_set.h"
 #include "../features/k.h"
@@ -33,3 +35,5 @@ using Network = Layers::OutputLayer;
 } // namespace NNUE
 
 } // namespace Eval
+
+#endif // #ifndef NNUE_KP_256X2-32-32_H_INCLUDED