Commit c35bbf2c authored by PRUVOST Florent's avatar PRUVOST Florent

fix compatibility to starpu 1.1

parent 17a9823a
......@@ -657,7 +657,7 @@ endif(NOT CHAMELEON_SIMULATION)
if( CHAMELEON_SCHED_STARPU )
set(CHAMELEON_STARPU_VERSION "1.2" CACHE STRING "oldest STARPU version desired")
set(CHAMELEON_STARPU_VERSION "1.1" CACHE STRING "oldest STARPU version desired")
# create list of components in order to make a single call to find_package(starpu...)
if(NOT CHAMELEON_SIMULATION)
......@@ -691,6 +691,8 @@ if( CHAMELEON_SCHED_STARPU )
foreach(libdir ${STARPU_LIBRARY_DIRS_DEP})
list(APPEND CMAKE_REQUIRED_FLAGS "-L${libdir}")
endforeach()
add_definitions("-DSTARPU_${STARPU_VERSION_MAJOR}${STARPU_VERSION_MINOR}")
message("-- ${Blue}Add definition STARPU_${STARPU_VERSION_MAJOR}${STARPU_VERSION_MINOR}${ColourReset}")
set(CMAKE_REQUIRED_LIBRARIES "${STARPU_LIBRARIES_DEP}")
if (CHAMELEON_USE_MPI)
list(APPEND CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_PATH}")
......
......@@ -29,7 +29,9 @@ add_subdirectory(basic_zposv)
if (CHAMELEON_PREC_D)
add_subdirectory(lapack_to_morse)
if (CHAMELEON_SCHED_STARPU)
add_subdirectory(out_of_core)
if (${STARPU_VERSION_MAJOR} GREATER 0 AND ${STARPU_VERSION_MINOR} GREATER 1)
add_subdirectory(out_of_core)
endif()
endif()
else()
message(WARNING "CHAMELEON_PREC_D is set to OFF so that lapack_to_morse "
......
......@@ -123,7 +123,9 @@ void MORSE_TASK_zgeqrt(const MORSE_option_t *options,
STARPU_VALUE, &h_work, sizeof(MORSE_starpu_ws_t *),
STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback,
STARPU_NAME, "zgeqrt",
#ifdef STARPU_12
STARPU_NAME, "zgeqrt",
#endif
0);
}
}
......
......@@ -53,7 +53,9 @@ void MORSE_TASK_zhe2ge(const MORSE_option_t *options,
STARPU_VALUE, &ldb, sizeof(int),
STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback,
STARPU_NAME, "zhe2ge",
#ifdef STARPU_12
STARPU_NAME, "zhe2ge",
#endif
0);
}
}
......
......@@ -61,7 +61,9 @@ void MORSE_TASK_zherfb(const MORSE_option_t *options,
STARPU_VALUE, &nb, sizeof(int),
STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback,
STARPU_NAME, "zherfb",
#ifdef STARPU_12
STARPU_NAME, "zherfb",
#endif
0);
}
}
......
......@@ -62,7 +62,9 @@ void MORSE_TASK_zlatro(const MORSE_option_t *options,
STARPU_VALUE, &ldb, sizeof(int),
STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback,
STARPU_NAME, "zlatro",
#ifdef STARPU_12
STARPU_NAME, "zlatro",
#endif
0);
}
(void)mb;
......
......@@ -199,7 +199,9 @@ void MORSE_TASK_ztsmqr(const MORSE_option_t *options,
STARPU_VALUE, &ldwork, sizeof(int),
STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback,
STARPU_NAME, "ztsmqr",
#ifdef STARPU_12
STARPU_NAME, "ztsmqr",
#endif
#if defined(CHAMELEON_USE_MPI)
STARPU_EXECUTE_ON_NODE, execution_rank,
#endif
......
......@@ -73,7 +73,9 @@ void MORSE_TASK_ztsmqr_hetra1(const MORSE_option_t *options,
STARPU_VALUE, &ldwork, sizeof(int),
STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback,
STARPU_NAME, "ztsmqr_hetra1",
#ifdef STARPU_12
STARPU_NAME, "ztsmqr_hetra1",
#endif
0);
}
}
......
......@@ -129,7 +129,9 @@ void MORSE_TASK_ztsqrt(const MORSE_option_t *options,
STARPU_VALUE, &h_work, sizeof(MORSE_starpu_ws_t *),
STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback,
STARPU_NAME, "ztsqrt",
#ifdef STARPU_12
STARPU_NAME, "ztsqrt",
#endif
STARPU_EXECUTE_ON_NODE, A2->get_rankof(A2, A2m, A2n),
0);
}
......
......@@ -150,7 +150,9 @@ void MORSE_TASK_zunmlq(const MORSE_option_t *options,
STARPU_VALUE, &nb, sizeof(int),
STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback,
STARPU_NAME, "zunmlq",
#ifdef STARPU_12
STARPU_NAME, "zunmlq",
#endif
0);
}
}
......
......@@ -172,7 +172,9 @@ void MORSE_TASK_zunmqr(const MORSE_option_t *options,
STARPU_VALUE, &nb, sizeof(int),
STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback,
STARPU_NAME, "zunmqr",
#ifdef STARPU_12
STARPU_NAME, "zunmqr",
#endif
#if defined(CHAMELEON_USE_MPI)
STARPU_EXECUTE_ON_NODE, execution_rank,
#endif
......
......@@ -315,9 +315,15 @@ void *RUNTIME_desc_getaddr( const MORSE_desc_t *desc, int m, int n )
BLKLDD(desc, im), tempmm, tempnn, eltsze);
}
else {
#ifdef STARPU_12
starpu_matrix_data_register(ptrtile, STARPU_MAIN_RAM,
(uintptr_t)desc->get_blkaddr(desc, m, n),
BLKLDD(desc, im), tempmm, tempnn, eltsze);
#else
starpu_matrix_data_register(ptrtile, 0,
(uintptr_t)desc->get_blkaddr(desc, m, n),
BLKLDD(desc, im), tempmm, tempnn, eltsze);
#endif
}
}
else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment