Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
AGULLO Emmanuel
Chameleon
Commits
7da7fbcf
Commit
7da7fbcf
authored
Jan 11, 2017
by
PRUVOST Florent
Browse files
change USE_STARPU_... definitions into HAVE_STARPU_... for coherency
parent
04da77e9
Changes
4
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
7da7fbcf
...
...
@@ -703,18 +703,18 @@ if( CHAMELEON_SCHED_STARPU )
string
(
REPLACE
";"
" "
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
"
)
check_function_exists
(
starpu_data_idle_prefetch_on_node STARPU_IDLE_PREFETCH_FOUND
)
if
(
STARPU_IDLE_PREFETCH_FOUND
)
set
(
US
E_STARPU_IDLE_PREFETCH 1
)
message
(
"--
${
Blue
}
Add definition
US
E_STARPU_IDLE_PREFETCH
${
ColourReset
}
"
)
set
(
HAV
E_STARPU_IDLE_PREFETCH 1
)
message
(
"--
${
Blue
}
Add definition
HAV
E_STARPU_IDLE_PREFETCH
${
ColourReset
}
"
)
endif
()
check_function_exists
(
starpu_data_wont_use STARPU_DATA_WONT_USE_FOUND
)
if
(
STARPU_DATA_WONT_USE_FOUND
)
set
(
US
E_STARPU_DATA_WONT_USE 1
)
message
(
"--
${
Blue
}
Add definition
US
E_STARPU_DATA_WONT_USE
${
ColourReset
}
"
)
set
(
HAV
E_STARPU_DATA_WONT_USE 1
)
message
(
"--
${
Blue
}
Add definition
HAV
E_STARPU_DATA_WONT_USE
${
ColourReset
}
"
)
endif
()
check_function_exists
(
starpu_malloc_on_node_set_default_flags STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS
)
if
(
STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS
)
set
(
US
E_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS 1
)
message
(
"--
${
Blue
}
Add definition
US
E_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS
${
ColourReset
}
"
)
set
(
HAV
E_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS 1
)
message
(
"--
${
Blue
}
Add definition
HAV
E_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS
${
ColourReset
}
"
)
endif
()
if
(
CHAMELEON_ENABLE_TRACING
)
# check if fxt profiling is accessible in starpu and activate it in chameleon
...
...
control/config.h.in
View file @
7da7fbcf
...
...
@@ -12,7 +12,7 @@
*
* @file config.h
*
*
MORSE main header
*
Chameleon's internal definitions
* MORSE is a software package provided by Univ. of Tennessee,
* Univ. of California Berkeley and Univ. of Colorado Denver,
* and INRIA Bordeaux Sud-Ouest
...
...
@@ -31,15 +31,15 @@
/* For BLAS Fortran mangling */
#cmakedefine ADD_
/*
Profiling
*/
/*
StarPU functions
*/
#cmakedefine HAVE_STARPU_FXT_PROFILING
/* Optional functions */
#cmakedefine HAVE_MAGMA_GETRF_INCPIV_GPU
#cmakedefine USE_STARPU_IDLE_PREFETCH
#cmakedefine USE_STARPU_DATA_WONT_USE
#cmakedefine USE_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS
#cmakedefine HAVE_STARPU_IDLE_PREFETCH
#cmakedefine HAVE_STARPU_DATA_WONT_USE
#cmakedefine HAVE_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS
#cmakedefine HAVE_STARPU_MPI_DATA_REGISTER
#cmakedefine HAVE_STARPU_MPI_COMM_RANK
/* MAGMA functions */
#cmakedefine HAVE_MAGMA_GETRF_INCPIV_GPU
#endif /* CONFIG_H_HAS_BEEN_INCLUDED */
runtime/starpu/codelets/codelet_dataflush.c
View file @
7da7fbcf
...
...
@@ -26,8 +26,8 @@
**/
#include
"runtime/starpu/include/morse_starpu.h"
#ifdef
US
E_STARPU_DATA_WONT_USE
#elif defined
US
E_STARPU_IDLE_PREFETCH
#ifdef
HAV
E_STARPU_DATA_WONT_USE
#elif defined
HAV
E_STARPU_IDLE_PREFETCH
static
void
data_flush
(
void
*
handle
)
{
starpu_data_idle_prefetch_on_node
(
handle
,
STARPU_MAIN_RAM
,
1
);
...
...
@@ -63,9 +63,9 @@ void MORSE_TASK_dataflush(const MORSE_option_t *options,
if
(
A
->
myrank
==
A
->
get_rankof
(
A
,
Am
,
An
)
)
{
/* Push data to main memory when we have time to */
#ifdef
US
E_STARPU_DATA_WONT_USE
#ifdef
HAV
E_STARPU_DATA_WONT_USE
starpu_data_wont_use
(
*
ptrtile
);
#elif defined
US
E_STARPU_IDLE_PREFETCH
#elif defined
HAV
E_STARPU_IDLE_PREFETCH
starpu_data_acquire_on_node_cb
(
*
ptrtile
,
-
1
,
STARPU_R
,
data_flush
,
*
ptrtile
);
#else
starpu_data_acquire_cb
(
*
ptrtile
,
STARPU_R
,
data_release
,
*
ptrtile
);
...
...
runtime/starpu/control/runtime_control.c
View file @
7da7fbcf
...
...
@@ -113,7 +113,7 @@ int RUNTIME_init_scheduler( MORSE_context_t *morse, int ncpus, int ncudas, int n
morse
->
nthreads_per_worker
=
nthreads_per_worker
;
}
#ifdef
US
E_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS
#ifdef
HAV
E_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS
starpu_malloc_on_node_set_default_flags
(
STARPU_MAIN_RAM
,
STARPU_MALLOC_PINNED
|
STARPU_MALLOC_COUNT
#ifdef STARPU_MALLOC_SIMULATION_FOLDED
|
STARPU_MALLOC_SIMULATION_FOLDED
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment