chore: some adjustments. ➕

CMakeLists.txt

@@ -36,17 +36,18 @@ target_link_libraries(pbrain-Z2I onnxruntime)
 
 add_subdirectory(test)
 
-if (MSVC)
- file(GLOB ONNX_DLLS "${ONNXRUNTIME_ROOTDIR}/lib/*.dll")
- add_custom_command(TARGET pbrain-Z2I POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                    ${ONNX_DLLS} $<TARGET_FILE_DIR:pbrain-Z2I>)
-endif (MSVC)
+if(MSVC)
+    file(GLOB ONNX_DLLS "${ONNXRUNTIME_ROOTDIR}/lib/*.dll")
+elseif(UNIX)
+    file(GLOB ONNX_DLLS "${ONNXRUNTIME_ROOTDIR}/lib/lib*.so*")
+endif()
 
-if (UNIX)
- file(GLOB ONNX_DLLS "${ONNXRUNTIME_ROOTDIR}/lib/lib*.so*")
- add_custom_command(TARGET pbrain-Z2I POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
+if(DEFINED ONNX_DLLS)
+    add_custom_command(TARGET pbrain-Z2I POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
                     ${ONNX_DLLS} $<TARGET_FILE_DIR:pbrain-Z2I>)
-endif (UNIX)
+else()
+    message("ONNX_DLLS does not exist or is empty.")
+endif()
 
 # ADD_EXECUTABLE(AlphaZeroInference  main.cpp)
 

README.md

@@ -45,7 +45,7 @@ CMakefiles.txt:  convert the onnxruntime path to your own path
 
 ```shell
 mkdir build
-cp *.sh ./build/
+cp ./scripts/*.sh ./build/
 cd ./build
 cmake ..    # (or "cmake -A x64 ..")
 cmake --build . --config Release   # (or open .sln file through visual Studio 19 and generate for win10)

scripts/train.bat

@@ -0,0 +1,31 @@
+@echo off
+set n=1
+set batch_num=1
+set do_prepare=0
+
+if %do_prepare%==1 (
+    echo preparing........
+    train_net.bat prepare
+    python ..\\python\\learner.py
+) else (
+    echo skip prepare!
+)
+echo start train......
+
+:LOOP
+if %%n LEQ 2000 (
+    echo --------------%%n-th train------------------
+    set i=0
+    :INNER_LOOP
+    if %%i LSS %batch_num% (
+		echo generate data......
+        start /B cmd /C "train_net.bat generate %%i"
+        set /A i+=1
+        goto INNER_LOOP
+    )
+    python ..\\python\\learner.py train
+    :: train_net.bat eval_with_winner 10
+    train_net.bat eval_with_random 10
+    set /A n+=1
+    goto LOOP
+)

train.sh → scripts/train.sh

@@ -23,4 +23,4 @@ do
 #	bash ./train_net.sh eval_with_winner 10
 	bash ./train_net.sh eval_with_random 10
 	let n++
-done
+done

train_miniconda3.sh → scripts/train_miniconda3.sh

@@ -23,4 +23,4 @@ do
 #	bash ./train_net.sh eval_with_winner 10
 	bash ./train_net.sh eval_with_random 10
 	let n++
-done
+done

scripts/train_net.bat

@@ -0,0 +1 @@
+.\\train_eval_net.exe %1 %2

scripts/train_net.sh

@@ -0,0 +1 @@
+exec ./train_eval_net $1 $2

src/pbrain-Z2I/pbrain-Z2I.cpp

@@ -42,7 +42,7 @@ using namespace std;
 
 bool isNumericString(const char *str, unsigned int i_len)
 {
-    for (int i = 0; i < i_len; i++)
+    for (unsigned int i = 0; i < i_len; i++)
     {
         if (!isdigit(str[i]))
         {

src/train_and_eval/train_eval_net.cpp

@@ -42,15 +42,15 @@ void generate_data_for_train(int current_weight, int start_batch_id)
     SelfPlay *sp = new SelfPlay(model);
     sp->self_play_for_train(NUM_TRAIN_THREADS, start_batch_id);
 
-    if (nullptr != model)
-    {
-        delete model;
-        model = nullptr;
+    if (nullptr != model)
+    {
+        delete model;
+        model = nullptr;
     }
-    if (nullptr != sp)
-    {
-        delete sp;
-        sp = nullptr;
+    if (nullptr != sp)
+    {
+        delete sp;
+        sp = nullptr;
     }
 }
 
@@ -140,20 +140,20 @@ vector<int> eval(int weight_a, int weight_b, unsigned int game_num, int a_sims,
     }
     // cout << "win_table = " << win_table[0] << win_table[1] << win_table [2] << endl;
 
-    if (nullptr != nn_a)
-    {
-        delete nn_a;
-        nn_a = nullptr;
+    if (nullptr != nn_a)
+    {
+        delete nn_a;
+        nn_a = nullptr;
     }
-    if (nullptr != nn_b)
-    {
-        delete nn_b;
-        nn_b = nullptr;
+    if (nullptr != nn_b)
+    {
+        delete nn_b;
+        nn_b = nullptr;
     }
-    if (nullptr != thread_pool)
-    {
-        delete thread_pool;
-        thread_pool = nullptr;
+    if (nullptr != thread_pool)
+    {
+        delete thread_pool;
+        thread_pool = nullptr;
     }
 
     return {win_table[0], win_table[1], win_table[2]};
@@ -199,7 +199,7 @@ int main(int argc, char *argv[])
         }
         // logger_reader >> temp[1];
         logger_reader.close();
-        cout << "Generating... current_weight = " << current_weight << endl;
+        cout << "Generating... current_weight = " << current_weight << " start batch id: " << argv[2] << endl;
         generate_data_for_train(current_weight, atoi(argv[2]) * NUM_TRAIN_THREADS);
     }
     else if (strcmp(argv[1], "eval_with_winner") == 0)

test/CMakeLists.txt

@@ -6,16 +6,17 @@ target_link_libraries(mcts_test onnxruntime)
 target_link_libraries(get_best_action_from_prob_test Z2I_lib)
 target_link_libraries(get_best_action_from_prob_test onnxruntime)
 
-if (MSVC)
- file(GLOB ONNX_DLLS "${ONNXRUNTIME_ROOTDIR}/lib/*.dll")
- add_custom_command(TARGET mcts_test POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                    ${ONNX_DLLS} $<TARGET_FILE_DIR:mcts_test>)
-endif (MSVC)
+if(MSVC)
+    file(GLOB ONNX_DLLS "${ONNXRUNTIME_ROOTDIR}/lib/*.dll")
+elseif(UNIX)
+    file(GLOB ONNX_DLLS "${ONNXRUNTIME_ROOTDIR}/lib/lib*.so*")
+endif()
 
-if (UNIX)
- file(GLOB ONNX_DLLS "${ONNXRUNTIME_ROOTDIR}/lib/lib*.so*")
- add_custom_command(TARGET mcts_test POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
+if(DEFINED ONNX_DLLS)
+    add_custom_command(TARGET mcts_test POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
                     ${ONNX_DLLS} $<TARGET_FILE_DIR:mcts_test>)
-endif (UNIX)
+else()
+    message("ONNX_DLLS does not exist or is empty.")
+endif()
 
 # add_test(NAME mcts_test COMMAND "mcts_test")