[Windows] Build applications tests and benchmarks on windows

This PR add possibility to run soma applications, tests and benchmarks on windows It aslo fix support for blas and avx on windows **Self-evaluation:** 1. Build test: [X]Passed [ ]Failed [ ]Skipped 2. Run test: [X]Passed [ ]Failed [ ]Skipped Signed-off-by: Grzegorz Kisala <[email protected]>
nnstreamer · Feb 14, 2025 · d0bd6bf · d0bd6bf
1 parent 223973b
commit d0bd6bf
Show file tree

Hide file tree

Showing 38 changed files with 277 additions and 96 deletions.
diff --git a/Applications/AlexNet/jni/meson.build b/Applications/AlexNet/jni/meson.build
@@ -1,8 +1,15 @@
-build_root = meson.build_root()
-res_path = meson.current_source_dir() / '..' / 'res'
+fs = import('fs')
+app_res_dir = fs.parent(meson.current_source_dir()) / 'res'
+build_app_res_dir = nntr_app_resdir / 'AlexNet'
 
-nntr_alex_resdir = nntr_app_resdir / 'AlexNet'
-run_command('cp', '-lr', res_path, nntr_alex_resdir)
+if host_machine.system() == 'windows'
+  app_res_dir_win = app_res_dir.replace('/', '\\')
+  build_app_res_dir_win = build_app_res_dir.replace('/', '\\')
+  run_command('cmd.exe', '/C', 'mkdir', build_app_res_dir_win)
+  run_command('cmd.exe', '/C', 'xcopy',app_res_dir_win, build_app_res_dir_win)
+else
+  run_command('cp', '-lr', app_res_dir, build_app_res_dir)
+endif
 
 alex_sources = [
   'main.cpp',

diff --git a/Applications/Custom/LayerClient/jni/meson.build b/Applications/Custom/LayerClient/jni/meson.build
@@ -1,13 +1,22 @@
-res_path = meson.current_source_dir() / '..' / 'res'
+fs = import('fs')
+app_res_dir = fs.parent(meson.current_source_dir()) / 'res'
+build_app_res_dir = nntr_app_resdir / 'LayerClient'
+
+if host_machine.system() == 'windows'
+  app_res_dir_win = app_res_dir.replace('/', '\\')
+  build_app_res_dir_win = build_app_res_dir.replace('/', '\\')
+  run_command('cmd.exe', '/C', 'mkdir', build_app_res_dir_win)
+  run_command('cmd.exe', '/C', 'xcopy',app_res_dir_win, build_app_res_dir_win)
+else
+  run_command('cp', '-lr', app_res_dir, build_app_res_dir)
+endif
 
 layer_client_sources = [
   'main.cpp',
   layer_example_pow_src,
   layer_example_mae_src
 ]
 
-run_command('cp', '-lr', res_path, nntr_app_resdir / 'LayerClient')
-
 exe = executable('layer_client',
   layer_client_sources,
   include_directories: layer_example_inc,
@@ -17,4 +26,4 @@ exe = executable('layer_client',
 )
 
 test('app_layer_client_api', exe, args: 'model')
-test('app_layer_client_ini', exe, args: res_path / 'custom_layer_client.ini')
+test('app_layer_client_ini', exe, args: build_app_res_dir / 'custom_layer_client.ini')
diff --git a/Applications/Layers/jni/meson.build b/Applications/Layers/jni/meson.build
@@ -1,8 +1,15 @@
-build_root = meson.build_root()
-res_path = meson.current_source_dir() / '..' / 'res'
+fs = import('fs')
+app_res_dir = fs.parent(meson.current_source_dir()) / 'res'
+build_app_res_dir = nntr_app_resdir / 'Layers'
 
-nntr_Layers_resdir = nntr_app_resdir / 'Layers'
-run_command('cp', '-lr', res_path, nntr_Layers_resdir)
+if host_machine.system() == 'windows'
+  app_res_dir_win = app_res_dir.replace('/', '\\')
+  build_app_res_dir_win = build_app_res_dir.replace('/', '\\')
+  run_command('cmd.exe', '/C', 'mkdir', build_app_res_dir_win)
+  run_command('cmd.exe', '/C', 'xcopy',app_res_dir_win, build_app_res_dir_win)
+else
+  run_command('cp', '-lr', app_res_dir, build_app_res_dir)
+endif
 
 Layers_sources = [
   'main.cpp',

diff --git a/Applications/LogisticRegression/jni/main.cpp b/Applications/LogisticRegression/jni/main.cpp
@@ -30,6 +30,7 @@
 #include <iostream>
 #include <layer.h>
 #include <model.h>
+#include <numeric>
 #include <optimizer.h>
 #include <random>
 #include <sstream>

diff --git a/Applications/LogisticRegression/jni/meson.build b/Applications/LogisticRegression/jni/meson.build
@@ -1,5 +1,15 @@
-res_path = meson.current_source_dir() / '..' / 'res'
-run_command('cp', '-lr', res_path, nntr_app_resdir / 'LogisticRegression')
+fs = import('fs')
+app_res_dir = fs.parent(meson.current_source_dir()) / 'res'
+build_app_res_dir = nntr_app_resdir / 'LogisticRegression'
+
+if host_machine.system() == 'windows'
+  app_res_dir_win = app_res_dir.replace('/', '\\')
+  build_app_res_dir_win = build_app_res_dir.replace('/', '\\')
+  run_command('cmd.exe', '/C', 'mkdir', build_app_res_dir_win)
+  run_command('cmd.exe', '/C', 'xcopy',app_res_dir_win, build_app_res_dir_win)
+else
+  run_command('cp', '-lr', app_res_dir, build_app_res_dir)
+endif
 
 e = executable('nntrainer_logistic',
   'main.cpp',
@@ -9,6 +19,6 @@ e = executable('nntrainer_logistic',
 )
 
 test('app_logistic', e, args: ['train',
-  nntr_app_resdir / 'LogisticRegression' / 'LogisticRegression.ini',
-  nntr_app_resdir / 'LogisticRegression' / 'dataset1.txt']
+  build_app_res_dir / 'LogisticRegression.ini',
+  build_app_res_dir / 'dataset1.txt']
 )
diff --git a/Applications/MNIST/jni/main.cpp b/Applications/MNIST/jni/main.cpp
@@ -30,6 +30,7 @@
 #include <iomanip>
 #include <iostream>
 #include <memory>
+#include <numeric>
 #include <random>
 #include <sstream>
 #include <vector>

diff --git a/Applications/MNIST/jni/meson.build b/Applications/MNIST/jni/meson.build
@@ -1,7 +1,15 @@
-res_path = meson.current_source_dir() / '..' / 'res'
-nntr_mnist_resdir = nntr_app_resdir / 'MNIST'
+fs = import('fs')
+app_res_dir = fs.parent(meson.current_source_dir()) / 'res'
+build_app_res_dir = nntr_app_resdir / 'MNIST'
 
-run_command('cp', '-lr', res_path, nntr_mnist_resdir)
+if host_machine.system() == 'windows'
+  app_res_dir_win = app_res_dir.replace('/', '\\')
+  build_app_res_dir_win = build_app_res_dir.replace('/', '\\')
+  run_command('cmd.exe', '/C', 'mkdir', build_app_res_dir_win)
+  run_command('cmd.exe', '/C', 'xcopy',app_res_dir_win, build_app_res_dir_win)
+else
+  run_command('cp', '-lr', app_res_dir, build_app_res_dir)
+endif
 
 mnist_sources = [
   'main.cpp'
@@ -23,8 +31,8 @@ test(
   'app_mnist',
   e,
   args: [
-    nntr_mnist_resdir / 'mnist.ini',
-    nntr_mnist_resdir / 'mnist_trainingSet.dat'
+    build_app_res_dir / 'mnist.ini',
+    build_app_res_dir / 'mnist_trainingSet.dat'
   ],
   timeout: 60
 )

diff --git a/Applications/Multi_input/jni/multi_loader.cpp b/Applications/Multi_input/jni/multi_loader.cpp
@@ -16,6 +16,7 @@
 #include <cstring>
 #include <iostream>
 #include <nntrainer_error.h>
+#include <numeric>
 #include <random>
 
 namespace nntrainer::util {

diff --git a/Applications/ProductRatings/jni/main.cpp b/Applications/ProductRatings/jni/main.cpp
@@ -17,6 +17,7 @@
 #include <cmath>
 #include <fstream>
 #include <iostream>
+#include <numeric>
 #include <random>
 #include <sstream>
 

diff --git a/Applications/ProductRatings/jni/meson.build b/Applications/ProductRatings/jni/meson.build
@@ -1,5 +1,15 @@
-res_path = meson.current_source_dir() / '..' / 'res'
-run_command('cp', '-lr', res_path, nntr_app_resdir / 'ProductRatings')
+fs = import('fs')
+app_res_dir = fs.parent(meson.current_source_dir()) / 'res'
+build_app_res_dir = nntr_app_resdir / 'ProductRatings'
+
+if host_machine.system() == 'windows'
+  app_res_dir_win = app_res_dir.replace('/', '\\')
+  build_app_res_dir_win = build_app_res_dir.replace('/', '\\')
+  run_command('cmd.exe', '/C', 'mkdir', build_app_res_dir_win)
+  run_command('cmd.exe', '/C', 'xcopy',app_res_dir_win, build_app_res_dir_win)
+else
+  run_command('cp', '-lr', app_res_dir, build_app_res_dir)
+endif
 
 e = executable('nntrainer_product_ratings',
   'main.cpp',
@@ -10,6 +20,6 @@ e = executable('nntrainer_product_ratings',
 
 # test split example
 test('app_product_ratings', e, args: ['train',
-  nntr_app_resdir / 'ProductRatings' / 'product_ratings_model.ini',
-  nntr_app_resdir / 'ProductRatings' / 'sample_product_ratings.txt']
+  build_app_res_dir / 'product_ratings_model.ini',
+  build_app_res_dir / 'sample_product_ratings.txt']
 )
diff --git a/Applications/ReinforcementLearning/DeepQ/jni/meson.build b/Applications/ReinforcementLearning/DeepQ/jni/meson.build
@@ -6,6 +6,9 @@ run_command('cp', '-lr', res_path, nntr_deepq_resdir)
 
 env_dir='../../Environment'
 
+jsoncpp_dep = dependency('jsoncpp')
+libcurl_dep = dependency('libcurl')
+
 deepq_sources = [
   'main.cpp',
   env_dir / 'CartPole/cartpole.cpp'

diff --git a/Applications/YOLOv2/jni/det_dataloader.cpp b/Applications/YOLOv2/jni/det_dataloader.cpp
@@ -18,6 +18,7 @@
 #include <filesystem>
 #include <fstream>
 #include <nntrainer_error.h>
+#include <numeric>
 #include <random>
 
 namespace nntrainer::util {

diff --git a/Applications/YOLOv3/jni/det_dataloader.cpp b/Applications/YOLOv3/jni/det_dataloader.cpp
@@ -18,6 +18,7 @@
 #include <filesystem>
 #include <fstream>
 #include <nntrainer_error.h>
+#include <numeric>
 #include <random>
 
 namespace nntrainer::util {

diff --git a/Applications/meson.build b/Applications/meson.build
@@ -1,8 +1,13 @@
 nntr_app_resdir = nntrainer_resdir / 'app'
-run_command('mkdir', '-p', nntr_app_resdir)
+
+if host_machine.system() == 'windows'
+  nntr_app_resdir_win = nntr_app_resdir.replace('/', '\\')
+  run_command('cmd.exe', '/C', 'mkdir', nntr_app_resdir_win)
+else
+  run_command('mkdir', '-p', nntr_app_resdir)
+endif
 
 subdir('utils')
-subdir('KNN/jni')
 subdir('LogisticRegression/jni')
 if enable_ccapi
   subdir('MNIST/jni')
@@ -12,22 +17,28 @@ if enable_ccapi
 endif
 subdir('VGG/jni')
 subdir('Resnet/jni')
-subdir('YOLOv2/jni')
-subdir('YOLOv3/jni')
-subdir('LLaMA/jni')
 subdir('Multi_input/jni')
-subdir('ReinforcementLearning/DeepQ/jni')
-subdir('TransferLearning/CIFAR_Classification/jni')
+
 # if enable_capi
 #   subdir('TransferLearning/Draw_Classification/jni')
 # endif
-subdir('Custom')
+
 subdir('ProductRatings/jni')
 subdir('AlexNet/jni')
 subdir('Layers/jni')
 if get_option('enable-tflite-backbone')
   subdir('SimpleShot')
 endif
-subdir('PicoGPT/jni')
 
 subdir('SimpleFC/jni')
+
+if host_machine.system() != 'windows'
+  subdir('KNN/jni')
+  subdir('YOLOv2/jni')
+  subdir('YOLOv3/jni')
+  subdir('LLaMA/jni')
+  subdir('ReinforcementLearning/DeepQ/jni')
+  subdir('TransferLearning/CIFAR_Classification/jni')
+  subdir('Custom')
+  subdir('PicoGPT/jni')
+endif
diff --git a/Applications/utils/datagen/cifar/cifar_dataloader.cpp b/Applications/utils/datagen/cifar/cifar_dataloader.cpp
@@ -16,6 +16,7 @@
 #include <cstring>
 #include <iostream>
 #include <nntrainer_error.h>
+#include <numeric>
 #include <random>
 
 namespace nntrainer::util {

diff --git a/Applications/utils/jni/bitmap_helpers.cpp b/Applications/utils/jni/bitmap_helpers.cpp
@@ -23,8 +23,6 @@ limitations under the License.
 #include <fstream>
 #include <iostream>
 
-#include <unistd.h> // NOLINT(build/include_order)
-
 #include "bitmap_helpers.h"
 
 #define LOG(x) std::cerr

diff --git a/benchmarks/benchmark_application/benchmark_resnet.cpp b/benchmarks/benchmark_application/benchmark_resnet.cpp
@@ -27,6 +27,7 @@ using ModelHandle = std::unique_ptr<ml::train::Model>;
 using UserDataType = std::unique_ptr<nntrainer::util::DataLoader>;
 
 uint64_t get_cpu_freq() {
+#if not defined(_WIN32)
   unsigned int freq = 0;
   char cur_cpu_name[512];
   int cpu = sched_getcpu();
@@ -41,6 +42,7 @@ uint64_t get_cpu_freq() {
     }
     fclose(f);
   }
+#endif
   return 0;
 }
 

diff --git a/benchmarks/benchmark_application/meson.build b/benchmarks/benchmark_application/meson.build
@@ -7,7 +7,14 @@ resnet_dependencies = [nntrainer_dep,
                        nntrainer_ccapi_dep,
                        benchmark_dep, ]
 
+benchmark_ling_args = ''
+
+if host_machine.system() == 'windows'
+    benchmark_ling_args = '-lshlwapi'
+endif
+
 executable('Benchmark_ResNet',
            sources,
            include_directories : [include_directories('.'), fake_datagen_include_dir],
-           dependencies : resnet_dependencies)
+           dependencies : resnet_dependencies,
+           link_args: benchmark_ling_args)
diff --git a/benchmarks/fake_data_gen/fake_data_gen.cpp b/benchmarks/fake_data_gen/fake_data_gen.cpp
@@ -16,6 +16,7 @@
 #include <cstring>
 #include <iostream>
 #include <nntrainer_error.h>
+#include <numeric>
 #include <random>
 
 namespace nntrainer::util {