Merge branch 'issue65' into 'master'

Issue65

Closes #65

See merge request !143

.gitlab-ci.yml

@@ -108,7 +108,7 @@ build_openmp:
 test_starpu_branches:
   <<: *test_script
   variables:
-    TESTS_RESTRICTION: "-R \"test_shm_s|test_mpi_s\""
+    TESTS_RESTRICTION: "-R \"test_shm_s|test_mpi_s|time_ooc_shm_s|time_ooc_mpi_s\""
     VERSION: starpu
   dependencies:
     - build_starpu

morse_cmake @ 376ef843

-Subproject commit f99bada1af8f986d91f651eb9748d0ac6367ef5e
+Subproject commit 376ef84365284898e734d4d8e17359981cae8b7f

timing/CTestLists.cmake

@@ -62,32 +62,32 @@ if (NOT CHAMELEON_SIMULATION)
     endforeach()
   endforeach()
 
-  # if ( CHAMELEON_SCHED_STARPU )
-  #   foreach(cat ${TEST_CATEGORIES})
-  #     foreach(prec ${RP_CHAMELEON_PRECISIONS})
-  #       string(TOUPPER ${prec} PREC)
-  #       if (CHAMELEON_PREC_${PREC})
-  #         foreach(test ${TESTLIST})
-  #           add_test(time_ooc_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --ooc --check)
-  #           set_tests_properties(time_ooc_${cat}_${prec}${test} PROPERTIES
-  #             ENVIRONMENT "STARPU_DISK_SWAP=/tmp;STARPU_LIMIT_CPU_MEM=1"
-  #             )
-  #         endforeach()
-  #       endif()
-  #     endforeach()
-  #     foreach(prec ${CHAMELEON_PRECISIONS_ZC})
-  #       string(TOUPPER ${prec} PREC)
-  #       if (CHAMELEON_PREC_${PREC})
-  #         foreach(test ${TESTLIST_ZC})
-  #           add_test(time_ooc_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --ooc --check)
-  #           set_tests_properties(time_ooc_${cat}_${prec}${test} PROPERTIES
-  #             ENVIRONMENT "STARPU_DISK_SWAP=/tmp;STARPU_LIMIT_CPU_MEM=1"
-  #             )
-  #         endforeach()
-  #       endif()
-  #     endforeach()
-  #   endforeach()
-  # endif()
+  if ( CHAMELEON_SCHED_STARPU )
+    foreach(cat ${TEST_CATEGORIES})
+      foreach(prec ${RP_CHAMELEON_PRECISIONS})
+        string(TOUPPER ${prec} PREC)
+        if (CHAMELEON_PREC_${PREC})
+          foreach(test ${TESTLIST})
+            add_test(time_ooc_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --ooc --check)
+            set_tests_properties(time_ooc_${cat}_${prec}${test} PROPERTIES
+              ENVIRONMENT "STARPU_DISK_SWAP=/tmp;STARPU_LIMIT_CPU_MEM=1"
+              )
+          endforeach()
+        endif()
+      endforeach()
+      foreach(prec ${CHAMELEON_PRECISIONS_ZC})
+        string(TOUPPER ${prec} PREC)
+        if (CHAMELEON_PREC_${PREC})
+          foreach(test ${TESTLIST_ZC})
+            add_test(time_ooc_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --ooc --check)
+            set_tests_properties(time_ooc_${cat}_${prec}${test} PROPERTIES
+              ENVIRONMENT "STARPU_DISK_SWAP=/tmp;STARPU_LIMIT_CPU_MEM=1"
+              )
+          endforeach()
+        endif()
+      endforeach()
+    endforeach()
+  endif()
 
   if (CHAMELEON_USE_MPI AND MPI_C_FOUND)
     set( TEST_CATEGORIES mpi )