From c8c985464030496fc9b2c389870d70e7b227e177 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Fri, 1 Mar 2019 02:55:19 +0100
Subject: [PATCH] Issue65
---
.gitlab-ci.yml | 2 +-
cmake_modules/morse_cmake | 2 +-
timing/CTestLists.cmake | 52 +++++++++++++++++++--------------------
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 025e11002..f2badb5fd 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/cmake_modules/morse_cmake b/cmake_modules/morse_cmake
index f99bada1a..376ef8436 160000
--- a/cmake_modules/morse_cmake
+++ b/cmake_modules/morse_cmake
@@ -1 +1 @@
-Subproject commit f99bada1af8f986d91f651eb9748d0ac6367ef5e
+Subproject commit 376ef84365284898e734d4d8e17359981cae8b7f
diff --git a/timing/CTestLists.cmake b/timing/CTestLists.cmake
index 9785a19b3..5b248f075 100644
--- a/timing/CTestLists.cmake
+++ b/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 )
--
GitLab