From faffa860cf9789c1543b24389167c60cf54865e6 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Wed, 5 Dec 2018 13:38:37 +0100
Subject: [PATCH] Simplify the choice of the runtime system before integrating
the new ones
---
.gitlab-ci.yml | 4 +-
CMakeLists.txt | 61 ++++++++++-------------------
doc/orgmode/chapters/installing.org | 8 +---
3 files changed, 25 insertions(+), 48 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ad9cdd29..06ae4b92d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,7 @@ build_quark:
- build
- chameleon_quark.log
variables:
- BUILD_OPTIONS: "-DCHAMELEON_SCHED_QUARK=ON"
+ BUILD_OPTIONS: "-DCHAMELEON_SCHED=QUARK"
VERSION: quark
build_parsec:
@@ -90,7 +90,7 @@ build_parsec:
- build
- chameleon_parsec.log
variables:
- BUILD_OPTIONS: "-DCHAMELEON_SCHED_PARSEC=ON"
+ BUILD_OPTIONS: "-DCHAMELEON_SCHED=PARSEC"
VERSION: parsec
test_starpu_branches:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52945bc4f..ff59bbf70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@
# @date 2012-07-13
#
###
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.3)
project(CHAMELEON Fortran C CXX)
# directly make an error if in-source build
@@ -108,50 +108,31 @@ option(CHAMELEON_USE_MIGRATE
# -----------------------------
# Create a list of possible runtime
-set(CHAMELEON_SCHED_list "PARSEC" "STARPU" "QUARK")
+set(CHAMELEON_SCHED_list PARSEC STARPU QUARK
+ CACHE INTERNAL "List of available runtimes" )
-# Initially PaRSEC runtime is enabled
-option(CHAMELEON_SCHED_PARSEC
- "Enable PaRSEC scheduler as the default runtime
- (Conflict with other CHAMELEON_SCHED_* options)" OFF)
-option(CHAMELEON_SCHED_STARPU
+set( CHAMELEON_SCHED_PARSEC OFF CACHE INTERNAL
+ "Enable PaRSEC scheduler as the default runtime
+ (Conflict with other CHAMELEON_SCHED_* options)")
+set(CHAMELEON_SCHED_STARPU OFF CACHE INTERNAL
"Enable StarPU scheduler as the default runtime
- (Conflict with other CHAMELEON_SCHED_* options)" OFF)
-option(CHAMELEON_SCHED_QUARK
- "Enable Quark scheduler as the default runtime
- (Conflict with other CHAMELEON_SCHED_* options)" OFF)
+ (Conflict with other CHAMELEON_SCHED_* options)")
+set(CHAMELEON_SCHED_QUARK OFF CACHE INTERNAL
+ "Enable Quark scheduler as the default runtime
+ (Conflict with other CHAMELEON_SCHED_* options)")
-# For now, we are able to compile only one runtime at a time, so we disable combinations of runtimes
-if (CHAMELEON_SCHED_QUARK)
- set(CHAMELEON_SCHED_STARPU OFF)
- set(CHAMELEON_SCHED_PARSEC OFF)
-elseif (CHAMELEON_SCHED_STARPU)
- set(CHAMELEON_SCHED_QUARK OFF)
- set(CHAMELEON_SCHED_PARSEC OFF)
-elseif (CHAMELEON_SCHED_PARSEC)
- set(CHAMELEON_SCHED_QUARK OFF)
- set(CHAMELEON_SCHED_STARPU OFF)
+set( CHAMELEON_SCHED STARPU
+ CACHE STRING "Choose the chameleon internal runtime from ${CHAMELEON_SCHED_list}")
+set_property(CACHE CHAMELEON_SCHED PROPERTY STRINGS ${CHAMELEON_SCHED_list})
+
+if ( NOT ${CHAMELEON_SCHED} IN_LIST CHAMELEON_SCHED_list )
+ message(FATAL_ERROR "CHAMELEON_SCHED must be one of ${CHAMELEON_SCHED_list} (${CHAMELEON_SCHED} is incorrect)" )
endif()
+
+set( CHAMELEON_SCHED_${CHAMELEON_SCHED} ON )
+
# Set default to StarPU if nothing specific is required by the user
-if ( NOT CHAMELEON_SCHED_STARPU AND NOT CHAMELEON_SCHED_PARSEC AND NOT CHAMELEON_SCHED_QUARK )
- set(CHAMELEON_SCHED_STARPU ON)
-endif()
-if (CHAMELEON_SCHED_STARPU)
- message("-- ${BoldGreen}CHAMELEON_SCHED_STARPU is set to ON: CHAMELEON uses StarPU runtime\n"
- " To use CHAMELEON with Quark runtime: set CHAMELEON_SCHED_QUARK to ON\n"
- " To use CHAMELEON with PaRSEC runtime: set CHAMELEON_SCHED_PARSEC to ON\n"
- " (CHAMELEON_SCHED_STARPU will be disabled)${ColourReset}")
-elseif(CHAMELEON_SCHED_QUARK)
- message("-- ${BoldGreen}CHAMELEON_SCHED_QUARK is set to ON: CHAMELEON uses Quark runtime\n"
- " To use CHAMELEON with StarPU runtime: set CHAMELEON_SCHED_STARPU to ON\n"
- " To use CHAMELEON with PaRSEC runtime: set CHAMELEON_SCHED_PARSEC to ON\n"
- " (CHAMELEON_SCHED_QUARK will be disabled)${ColourReset}")
-elseif(CHAMELEON_SCHED_PARSEC)
- message("-- ${BoldGreen}CHAMELEON_SCHED_PARSEC is set to ON: CHAMELEON uses PaRSEC runtime\n"
- " To use CHAMELEON with StarPU runtime: set CHAMELEON_SCHED_STARPU to ON\n"
- " To use CHAMELEON with Quark runtime: set CHAMELEON_SCHED_QUARK to ON\n"
- " (CHAMELEON_SCHED_PARSEC will be disabled)${ColourReset}")
-endif()
+message("-- ${BoldGreen}CHAMELEON_SCHED is set to use ${CHAMELEON_SCHED} runtime" )
# Check that one, and only one, SCHED option is set to ON
# count number of runtime sets to ON
diff --git a/doc/orgmode/chapters/installing.org b/doc/orgmode/chapters/installing.org
index 8df8a55cc..18573d68e 100644
--- a/doc/orgmode/chapters/installing.org
+++ b/doc/orgmode/chapters/installing.org
@@ -359,12 +359,8 @@ we encourage users to use [[sec:spack][Spack]].
LAPACKE - QUARK - SIMGRID - STARPU - TMG.
**** Chameleon specific options
- * *CHAMELEON_SCHED_STARPU=ON|OFF* (default ON): to link with
- StarPU library (runtime system)
- * *CHAMELEON_SCHED_PARSEC=ON|OFF* (default OFF): to link with
- PARSEC library (runtime system)
- * *CHAMELEON_SCHED_QUARK=ON|OFF* (default OFF): to link with QUARK
- library (runtime system)
+ * *CHAMELEON_SCHED=STARPU|PARSEC|QUARK* (default STARPU): to link
+ respectively with StarPU, PaRSEC, or Quark library (runtime system)
* *CHAMELEON_USE_MPI=ON|OFF* (default OFF): to link with MPI
library (message passing implementation for use of multiple
nodes with distributed memory), can only be used with StarPU
--
GitLab