Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
AGULLO Emmanuel
Chameleon
Commits
b7a71b38
Commit
b7a71b38
authored
Aug 22, 2017
by
Mathieu Faverge
Browse files
Remove the coreblas_include dependency in compute directory
parent
da0c7350
Changes
70
Hide whitespace changes
Inline
Side-by-side
compute/CMakeLists.txt
View file @
b7a71b38
...
...
@@ -303,12 +303,8 @@ list(INSERT CHAMELEON_DEP 0 -lchameleon)
add_dependencies
(
chameleon
chameleon_include
coreblas_include
control_include
)
if
(
NOT CHAMELEON_SIMULATION
)
add_dependencies
(
chameleon coreblas_include
)
endif
()
set_property
(
TARGET chameleon PROPERTY LINKER_LANGUAGE Fortran
)
set_property
(
TARGET chameleon PROPERTY Fortran_MODULE_DIRECTORY
"
${
CMAKE_BINARY_DIR
}
/include"
)
...
...
compute/zgesvd.c
View file @
b7a71b38
...
...
@@ -23,6 +23,8 @@
* @precisions normal z -> s d c
*
**/
#include <stdio.h>
#include <string.h>
#include <coreblas/lapacke.h>
#include "control/common.h"
...
...
compute/zheevd.c
View file @
b7a71b38
...
...
@@ -23,6 +23,7 @@
* @precisions normal z -> s d c
*
**/
#include <string.h>
#include <coreblas/lapacke.h>
#include "control/common.h"
...
...
control/common.h
View file @
b7a71b38
...
...
@@ -74,11 +74,6 @@
**/
#include "morse.h"
#include "coreblas.h"
#if defined(CHAMELEON_USE_CUDA) && !defined(CHAMELEON_SIMULATION)
#include "cudablas.h"
#endif
#include "control/global.h"
#include "control/auxiliary.h"
#include "control/context.h"
...
...
control/descriptor.c
View file @
b7a71b38
...
...
@@ -29,9 +29,9 @@
* @brief Group descriptor routines exposed to users
*
*/
#include <stdlib.h>
#include <assert.h>
#include <string.h>
#include "control/common.h"
#include "control/descriptor.h"
#include "chameleon/morse_runtime.h"
...
...
runtime/parsec/CMakeLists.txt
View file @
b7a71b38
...
...
@@ -44,8 +44,8 @@ set(RUNTIME_HDRS_GENERATED "")
# Define the list of headers
# --------------------------
set
(
RUNTIME_HDRS
include/chameleon_parsec.h
)
include/chameleon_parsec.h
)
# Add generated headers
# ---------------------
...
...
@@ -111,10 +111,16 @@ add_library(chameleon_parsec ${RUNTIME_SRCS})
set_property
(
TARGET chameleon_parsec PROPERTY LINKER_LANGUAGE Fortran
)
set_property
(
TARGET chameleon_parsec PROPERTY INSTALL_NAME_DIR
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
target_link_libraries
(
chameleon_parsec coreblas
${
PARSEC_LIBRARIES_DEP
}
)
if
(
CHAMELEON_USE_CUDA
)
target_link_libraries
(
chameleon_parsec cudablas
)
endif
(
CHAMELEON_USE_CUDA
)
target_link_libraries
(
chameleon_parsec
${
PARSEC_LIBRARIES_DEP
}
)
if
(
NOT CHAMELEON_SIMULATION
)
target_link_libraries
(
chameleon_parsec
coreblas
)
if
(
CHAMELEON_USE_CUDA
)
target_link_libraries
(
chameleon_parsec
cudablas
)
endif
(
CHAMELEON_USE_CUDA
)
endif
(
NOT CHAMELEON_SIMULATION
)
add_dependencies
(
chameleon_parsec
chameleon_include
...
...
@@ -123,14 +129,18 @@ add_dependencies(chameleon_parsec
runtime_parsec_include
)
if
(
CHAMELEON_USE_CUDA AND NOT CHAMELEON_SIMULATION
)
if
(
NOT CHAMELEON_SIMULATION
)
add_dependencies
(
chameleon_parsec coreblas_include
)
if
(
CHAMELEON_USE_CUDA
)
add_dependencies
(
chameleon_parsec cudablas_include
)
endif
()
endif
()
# installation
# ------------
install
(
TARGETS chameleon_parsec
DESTINATION lib
)
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
)
###
### END CMakeLists.txt
...
...
runtime/starpu/CMakeLists.txt
View file @
b7a71b38
...
...
@@ -75,7 +75,7 @@ install(
DESTINATION include/runtime/starpu
)
# Generate the Chameleon common for all possible precisions
# -----------------------------------------------------
# -----------------------------------------------------
----
set
(
RUNTIME_COMMON_GENERATED
""
)
set
(
ZSRC
control/runtime_zprofiling.c
...
...
@@ -106,7 +106,7 @@ endforeach()
set_source_files_properties
(
control/runtime_profiling.c PROPERTIES COMPILE_FLAGS
"
${
flags_to_add
}
"
)
# Generate the Chameleon sources for all possible precisions
# ------------------------------------------------------
# ------------------------------------------------------
----
set
(
RUNTIME_SRCS_GENERATED
""
)
set
(
ZSRC
codelets/codelet_zcallback.c
...
...
runtime/starpu/codelets/codelet_zasum.c
View file @
b7a71b38
...
...
@@ -26,7 +26,6 @@
**/
#include "chameleon_starpu.h"
#include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void
MORSE_TASK_dzasum
(
const
MORSE_option_t
*
options
,
MORSE_enum
storev
,
MORSE_enum
uplo
,
int
M
,
int
N
,
...
...
runtime/starpu/codelets/codelet_zaxpy.c
View file @
b7a71b38
...
...
@@ -24,7 +24,6 @@
**/
#include "chameleon_starpu.h"
#include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void
MORSE_TASK_zaxpy
(
const
MORSE_option_t
*
options
,
int
M
,
MORSE_Complex64_t
alpha
,
...
...
runtime/starpu/codelets/codelet_zbuild.c
View file @
b7a71b38
...
...
@@ -31,7 +31,6 @@
**/
#include "chameleon_starpu.h"
#include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void
MORSE_TASK_zbuild
(
const
MORSE_option_t
*
options
,
const
MORSE_desc_t
*
A
,
int
Am
,
int
An
,
int
lda
,
...
...
runtime/starpu/codelets/codelet_zgeadd.c
View file @
b7a71b38
...
...
@@ -28,7 +28,6 @@
**/
#include "chameleon_starpu.h"
#include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
******************************************************************************
...
...
runtime/starpu/codelets/codelet_zgelqt.c
View file @
b7a71b38
...
...
@@ -30,7 +30,6 @@
**/
#include "chameleon_starpu.h"
#include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
...
...
runtime/starpu/codelets/codelet_zgemm.c
View file @
b7a71b38
...
...
@@ -30,7 +30,6 @@
**/
#include "chameleon_starpu.h"
#include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
...
...
runtime/starpu/codelets/codelet_zgeqrt.c
View file @
b7a71b38
...
...
@@ -30,7 +30,6 @@
**/
#include "chameleon_starpu.h"
#include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
...
...
runtime/starpu/codelets/codelet_zgessm.c
View file @
b7a71b38
...
...
@@ -30,7 +30,6 @@
**/
#include "chameleon_starpu.h"
#include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
...
...
runtime/starpu/codelets/codelet_zgessq.c
View file @
b7a71b38
...
...
@@ -26,7 +26,6 @@
**/
#include "chameleon_starpu.h"
#include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void
MORSE_TASK_zgessq
(
const
MORSE_option_t
*
options
,
int
m
,
int
n
,
...
...
runtime/starpu/codelets/codelet_zgetrf.c
View file @
b7a71b38
...
...
@@ -28,7 +28,6 @@
**/
#include "chameleon_starpu.h"
#include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void
MORSE_TASK_zgetrf
(
const
MORSE_option_t
*
options
,
int
m
,
int
n
,
int
nb
,
...
...
runtime/starpu/codelets/codelet_zgetrf_incpiv.c
View file @
b7a71b38
...
...
@@ -30,7 +30,6 @@
**/
#include "chameleon_starpu.h"
#include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
...
...
runtime/starpu/codelets/codelet_zgetrf_nopiv.c
View file @
b7a71b38
...
...
@@ -27,7 +27,6 @@
**/
#include "chameleon_starpu.h"
#include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
...
...
runtime/starpu/codelets/codelet_zhe2ge.c
View file @
b7a71b38
...
...
@@ -22,7 +22,6 @@
#include "chameleon_starpu.h"
#include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/**
*
...
...
Prev
1
2
3
4
Next
Write
Preview
Markdown
is supported
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