Merge branch 'master' into an/ninja_win

Author: allnes

.github/labeler.yml

@@ -1,3 +1,5 @@
+'task:all':
+  - "tasks/all/**"
 'task:mpi':
   - "tasks/mpi/**"
 'task:omp':

.github/workflows/main.yml

@@ -44,7 +44,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install gcc-13 g++-13
         sudo apt-get install ninja-build
-        sudo apt-get install mpich libmpich* mpi* openmpi-bin
+        sudo apt-get install mpich
         sudo apt-get install libomp-dev
         sudo apt-get install valgrind
         python3 -m pip install xlsxwriter
@@ -114,7 +114,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install gcc-13 g++-13
         sudo apt-get install ninja-build
-        sudo apt-get install mpich libmpich* mpi* openmpi-bin
+        sudo apt-get install mpich
         sudo apt-get install libomp-dev
         sudo apt-get install valgrind
         python3 -m pip install xlsxwriter
@@ -185,7 +185,7 @@ jobs:
         sudo add-apt-repository ppa:ubuntu-toolchain-r/test
         sudo apt-get update
         sudo apt-get install ninja-build
-        sudo apt-get install mpich libmpich* mpi* openmpi-bin
+        sudo apt-get install mpich
         sudo apt-get install python3-pip
         sudo apt-get install valgrind
         wget https://apt.llvm.org/llvm.sh
@@ -255,7 +255,7 @@ jobs:
         sudo add-apt-repository ppa:ubuntu-toolchain-r/test
         sudo apt-get update
         sudo apt-get install ninja-build
-        sudo apt-get install mpich libmpich* mpi* openmpi-bin
+        sudo apt-get install mpich
         sudo apt-get install python3-pip
         sudo apt-get install valgrind
         wget https://apt.llvm.org/llvm.sh
@@ -355,7 +355,7 @@ jobs:
     - name: Run tests (MPI)
       run: |
         export ASAN_RUN=1
-        source scripts/run_mpi.sh
+        source scripts/run_mpi.sh "--oversubscribe"
       env:
         PROC_COUNT: 2
     - name: Run tests (threads, num_threads=1)
@@ -857,7 +857,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install gcc g++
         sudo apt-get install ninja-build
-        sudo apt-get install mpich libmpich* mpi* openmpi-bin
+        sudo apt-get install mpich
         sudo apt-get install libomp-dev
         sudo apt-get install valgrind
         sudo apt-get install gcovr lcov
@@ -906,7 +906,7 @@ jobs:
       run: |
         cd build
         lcov --capture --directory . --output-file ../coverage.info
-        lcov --remove ../coverage.info '*/3rdparty/*' '/usr/*' '*/perf_tests/*' '*/func_tests/*' --output-file ../coverage.info
+        lcov --remove ../coverage.info '*/3rdparty/*' '/usr/*' '*/perf_tests/*' '*/func_tests/*' '*/all/runner.cpp' '*/mpi/runner.cpp' '*/omp/runner.cpp' '*/seq/runner.cpp' '*/stl/runner.cpp' '*/tbb/runner.cpp' --output-file ../coverage.info
         cd ..
         genhtml coverage.info --output-directory cov-report
     - name: Upload coverage report artifact
@@ -934,7 +934,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install gcc-12 g++-12
         sudo apt-get install ninja-build
-        sudo apt-get install mpich libmpich* mpi* openmpi-bin
+        sudo apt-get install mpich
         sudo apt-get install libomp-dev
         sudo apt-get install valgrind
         python3 -m pip install xlsxwriter

codecov.yml

@@ -1,6 +1,12 @@
 ignore:
   - "**/perf_tests/**"
   - "**/func_tests/**"
+  - "**/all/runner.cpp"
+  - "**/mpi/runner.cpp"
+  - "**/omp/runner.cpp"
+  - "**/seq/runner.cpp"
+  - "**/stl/runner.cpp"
+  - "**/tbb/runner.cpp"
 coverage:
   status:
     project:

docs/user_guide/submit_work.rst

@@ -1,20 +1,21 @@
 How to submit your work
 ========================
 
-- There are ``mpi``, ``omp``, ``seq``, ``stl``, ``tbb`` folders in the ``tasks`` directory. Move to a folder of your task. Create a directory named ``<last name>_<first letter of name>_<short task name>``. 
+- There are ``all``, ``mpi``, ``omp``, ``seq``, ``stl``, ``tbb`` folders in the ``tasks`` directory. Move to a folder of your task. Create a directory named ``<last name>_<first letter of name>_<short task name>``.
 
   Example: ``seq/nesterov_a_vector_sum``. Please name all tasks **with the same** name directory. If the ``seq`` task is named ``seq/nesterov_a_vector_sum``, then the ``omp`` task must be named ``omp/nesterov_a_vector_sum``.
 
 - Navigate into the newly created folder and begin your work on the task. The folder must contain only 4 directories with files:
 
+  - ``data``       - Directory with own data files for functional testing of the task.
   - ``func_tests`` - Directory with Google tests for functional testing of the task.
   - ``include``    - Directory for header files with function prototypes.
   - ``perf_tests`` - Directory with Google tests for performance testing. The number of tests must be 2: ``run_task`` and ``run_pipeline``.
   - ``src``        - Directory with source files containing the function implementations.
 
 - There must be 10 executable files for running:
 
-  - ``<mpi, omp, seq, stl, tbb>_<func, perf>_tests``. For example, ``omp_perf_tests`` - an executable file for performance tests of OpenMP practice tasks.
+  - ``<all, mpi, omp, seq, stl, tbb>_<func, perf>_tests``. For example, ``omp_perf_tests`` - an executable file for performance tests of OpenMP practice tasks.
 
 - All prototypes and classes in the ``include`` directory must be namespace-escaped. Name your namespace as follows:
 

scripts/create_perf_table.py

@@ -11,7 +11,7 @@
 logs_path = os.path.abspath(args.input)
 xlsx_path = os.path.abspath(args.output)
 
-list_of_type_of_tasks = ["mpi", "omp", "seq", "stl", "tbb"]
+list_of_type_of_tasks = ["all", "mpi", "omp", "seq", "stl", "tbb"]
 
 result_tables = {"pipeline": {}, "task_run": {}}
 set_of_task_name = []
@@ -83,7 +83,10 @@
                 continue
             par_time = result_tables[table_name][task_name][type_of_task]
             seq_time = result_tables[table_name][task_name]["seq"]
-            speed_up = seq_time / par_time
+            if par_time == 0:
+                speed_up = -1
+            else:
+                speed_up = seq_time / par_time
             efficiency = speed_up / cpu_num
             worksheet.write(it_j, it_i, par_time)
             it_i += 1

scripts/run.bat

@@ -9,7 +9,9 @@ if "%CLANG_BUILD%" NEQ "1" build\bin\sample_omp.exe
 build\bin\sample_stl.exe
 build\bin\sample_tbb.exe
 
+if "%CLANG_BUILD%" NEQ "1" mpiexec.exe -np 4 build\bin\all_func_tests.exe --gtest_repeat=10 || exit 1
 if "%CLANG_BUILD%" NEQ "1" mpiexec.exe -np 4 build\bin\mpi_func_tests.exe --gtest_repeat=10 || exit 1
+if "%CLANG_BUILD%" NEQ "1" build\bin\all_func_tests.exe || exit 1
 if "%CLANG_BUILD%" NEQ "1" build\bin\mpi_func_tests.exe || exit 1
 if "%CLANG_BUILD%" NEQ "1" build\bin\omp_func_tests.exe  --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating || exit 1
 build\bin\seq_func_tests.exe  --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating || exit 1

scripts/run_mpi.sh

@@ -4,20 +4,16 @@ if [[ $OSTYPE == "linux-gnu" && -z "$ASAN_RUN" ]]; then
   valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/core_func_tests
   valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/ref_func_tests
 
+#  valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/all_func_tests
 #  valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all ./build/bin/mpi_func_tests
 fi
 
 ./build/bin/core_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
 ./build/bin/ref_func_tests  --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
 
 if [[ -z "$ASAN_RUN" ]]; then
-  if [[ $OSTYPE == "linux-gnu" ]]; then
-    mpirun --oversubscribe -np $PROC_COUNT ./build/bin/sample_mpi
-    mpirun --oversubscribe -np $PROC_COUNT ./build/bin/sample_mpi_boost
-    mpirun --oversubscribe -np $PROC_COUNT ./build/bin/mpi_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
-  elif [[ $OSTYPE == "darwin"* ]]; then
-    mpirun -np $PROC_COUNT ./build/bin/sample_mpi
-    mpirun -np $PROC_COUNT ./build/bin/sample_mpi_boost
-    mpirun -np $PROC_COUNT ./build/bin/mpi_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
-  fi
+    mpirun $1 -np $PROC_COUNT ./build/bin/sample_mpi
+    mpirun $1 -np $PROC_COUNT ./build/bin/sample_mpi_boost
+    mpirun $1 -np $PROC_COUNT ./build/bin/all_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
+    mpirun $1 -np $PROC_COUNT ./build/bin/mpi_func_tests --gtest_also_run_disabled_tests --gtest_repeat=10 --gtest_recreate_environments_when_repeating
 fi

scripts/run_perf_collector.bat

@@ -1,3 +1,4 @@
+REM mpiexec -np 4 build\bin\all_perf_tests.exe
 REM mpiexec -np 4 build\bin\mpi_perf_tests.exe
 build\bin\omp_perf_tests.exe
 build\bin\seq_perf_tests.exe

scripts/run_perf_collector.sh

@@ -2,9 +2,11 @@
 
 if [[ -z "$ASAN_RUN" ]]; then
   if [[ $OSTYPE == "linux-gnu" ]]; then
-    mpirun --oversubscribe -np 4 ./build/bin/mpi_perf_tests
+    mpirun -np 4 ./build/bin/all_perf_tests --gtest_color=no
+    mpirun -np 4 ./build/bin/mpi_perf_tests --gtest_color=no
   elif [[ $OSTYPE == "darwin"* ]]; then
-    mpirun -np 2 ./build/bin/mpi_perf_tests
+    mpirun -np 2 ./build/bin/all_perf_tests --gtest_color=no
+    mpirun -np 2 ./build/bin/mpi_perf_tests --gtest_color=no
   fi
 fi
 ./build/bin/omp_perf_tests

scripts/run_perf_count_checker.sh

@@ -40,6 +40,7 @@ run_check() {
   fi
 }
 
+run_check "all"
 run_check "mpi"
 run_check "omp"
 run_check "seq"