From 2a14c4eeeafa3dc985763f4df3e22cf3fc1d63a3 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Mon, 25 Nov 2019 13:59:35 +0100
Subject: [PATCH] Add an option CHAMELEON_RUNTIME_SYNC to debug quark and
StarPU in synchronous mode
---
CMakeLists.txt | 6 +++++-
hqr | 2 +-
include/chameleon/config.h.in | 3 +++
runtime/quark/include/chameleon_quark.h | 7 +++++--
runtime/starpu/include/chameleon_starpu.h.in | 2 +-
timing/CMakeLists.txt | 2 +-
6 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28887656a..33bce25ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,6 +191,11 @@ if (NOT CHAMELEON_ENABLE_TRACING)
endif()
#option(CHAMELEON_USE_EZTRACE "Enable EZTRACE to build modules" OFF)
+option(CHAMELEON_RUNTIME_SYNC "Enable synchronous task submission when available to debug the code without parallelism" OFF)
+if (CHAMELEON_RUNTIME_SYNC)
+ message("-- ${BoldGreen}CHAMELEON_RUNTIME_SYNC is set to ON, turn it OFF to avoid synchronisation in the tasks submission${ColourReset}")
+endif()
+
# Options to enable/disable testings and timings
# ----------------------------------------------
option(CHAMELEON_ENABLE_DOC "Enable documentation build" OFF)
@@ -912,7 +917,6 @@ if( CHAMELEON_SCHED_OPENMP )
else ( OPENMP_FOUND )
message(FATAL_ERROR "Something went wrong when finding OpenMP")
endif ( OPENMP_FOUND )
-
endif( CHAMELEON_SCHED_OPENMP )
# getopt
diff --git a/hqr b/hqr
index c05aef897..a0ec4d899 160000
--- a/hqr
+++ b/hqr
@@ -1 +1 @@
-Subproject commit c05aef8974161f46281170232fbe604f3fe2a68d
+Subproject commit a0ec4d899c07cadc860a92808294ec3599c3cf17
diff --git a/include/chameleon/config.h.in b/include/chameleon/config.h.in
index b3fbb7366..1596315d8 100644
--- a/include/chameleon/config.h.in
+++ b/include/chameleon/config.h.in
@@ -29,6 +29,9 @@
#cmakedefine CHAMELEON_SCHED_STARPU
#cmakedefine CHAMELEON_SCHED_OPENMP
+/* Debug scheduling engine */
+#cmakedefine CHAMELEON_RUNTIME_SYNC
+
/* Communication engine */
#cmakedefine CHAMELEON_USE_MPI
#cmakedefine CHAMELEON_USE_MIGRATE
diff --git a/runtime/quark/include/chameleon_quark.h b/runtime/quark/include/chameleon_quark.h
index 4cc04939c..03e0f50f5 100644
--- a/runtime/quark/include/chameleon_quark.h
+++ b/runtime/quark/include/chameleon_quark.h
@@ -20,12 +20,15 @@
#ifndef _chameleon_quark_h_
#define _chameleon_quark_h_
+#include "control/common.h"
+
#include <quark.h>
+#if defined(CHAMELEON_RUNTIME_SYNC)
+#define QUARk_Insert_Task QUARK_Execute_Task
+#endif
#include "coreblas.h"
#include "core_blas_dag.h"
-#include "control/common.h"
-
typedef struct quark_option_s {
Quark_Task_Flags flags;
Quark *quark;
diff --git a/runtime/starpu/include/chameleon_starpu.h.in b/runtime/starpu/include/chameleon_starpu.h.in
index a36fdc613..6cf49261c 100644
--- a/runtime/starpu/include/chameleon_starpu.h.in
+++ b/runtime/starpu/include/chameleon_starpu.h.in
@@ -81,7 +81,7 @@ typedef struct starpu_conf starpu_conf_t;
/*
* MPI Redefinitions
*/
-#if defined(CHAMELEON_STARPU_SYNC)
+#if defined(CHAMELEON_RUNTIME_SYNC)
#define TASK_SYNCHRONOUS , STARPU_TASK_SYNCHRONOUS, 1
#else
#define TASK_SYNCHRONOUS
diff --git a/timing/CMakeLists.txt b/timing/CMakeLists.txt
index eb70fd776..e27c58a92 100644
--- a/timing/CMakeLists.txt
+++ b/timing/CMakeLists.txt
@@ -67,7 +67,7 @@ if (NOT CHAMELEON_SIMULATION)
# -----------------------------
add_library(chameleon_timing STATIC ${TIMING_SRCS})
set_property(TARGET chameleon_timing PROPERTY LINKER_LANGUAGE Fortran)
- add_dependencies(chameleon_timing timing_include timing_aux_sources)
+ add_dependencies(chameleon_timing timing_include timing_aux_sources chameleon_include)
endif()
# Generate the chameleon testing sources for all possible precisions
--
GitLab