Commit 5f6f225a authored by Mathieu Faverge's avatar Mathieu Faverge

Remove MAGMA references from runtime directory

parent b878db63
...@@ -29,17 +29,6 @@ ...@@ -29,17 +29,6 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
# check if magma_dgetrf_incpiv_gpu is accessible in libmagma and activate it in chameleon
if ( CBLAS_FOUND AND LAPACKE_FOUND AND LAPACK_FOUND AND CUDA_FOUND AND CUDA_CUBLAS_LIBRARIES AND MAGMA_FOUND )
set(CMAKE_REQUIRED_LIBRARIES "${CBLAS_LIBRARIES};${LAPACKE_LIBRARIES};${LAPACK_SEQ_LIBRARIES};${CUDA_LIBRARIES};${CUDA_CUBLAS_LIBRARIES};${MAGMA_LIBRARIES};${COREBLAS_LIBRARIES}")
unset(MAGMA_DGETRF_INCPIV_GPU_FOUND CACHE)
check_function_exists(magma_dgetrf_incpiv_gpu MAGMA_DGETRF_INCPIV_GPU_FOUND)
if ( MAGMA_DGETRF_INCPIV_GPU_FOUND )
message(STATUS "Set HAVE_MAGMA_GETRF_INCPIV_GPU")
set(HAVE_MAGMA_GETRF_INCPIV_GPU 1)
endif()
endif()
# Generate headers for all possible precisions # Generate headers for all possible precisions
# -------------------------------------------- # --------------------------------------------
set(RUNTIME_HDRS_GENERATED "") set(RUNTIME_HDRS_GENERATED "")
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
# Generate the magma headers for all possible precisions # Generate the quark headers for all possible precisions
# ------------------------------------------------------ # ------------------------------------------------------
set(RUNTIME_HDRS_GENERATED "") set(RUNTIME_HDRS_GENERATED "")
set(ZHDR set(ZHDR
...@@ -105,9 +105,9 @@ set_property(TARGET chameleon_quark PROPERTY LINKER_LANGUAGE Fortran) ...@@ -105,9 +105,9 @@ set_property(TARGET chameleon_quark PROPERTY LINKER_LANGUAGE Fortran)
set_property(TARGET chameleon_quark PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") set_property(TARGET chameleon_quark PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
target_link_libraries(chameleon_quark coreblas ${QUARK_LIBRARIES_DEP}) target_link_libraries(chameleon_quark coreblas ${QUARK_LIBRARIES_DEP})
if(CHAMELEON_USE_CUDA OR CHAMELEON_USE_MAGMA) if(CHAMELEON_USE_CUDA)
target_link_libraries(chameleon_quark cudablas) target_link_libraries(chameleon_quark cudablas)
endif(CHAMELEON_USE_CUDA OR CHAMELEON_USE_MAGMA) endif(CHAMELEON_USE_CUDA)
add_dependencies(chameleon_quark add_dependencies(chameleon_quark
chameleon_include chameleon_include
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
* *
* @file morse_quark.h * @file morse_quark.h
* *
* MAGMA codelets kernel * MORSE codelets kernel
* MAGMA is a software package provided by Univ. of Tennessee, * MORSE is a software package provided by Univ. of Tennessee,
* Univ. of California Berkeley and Univ. of Colorado Denver, * Univ. of California Berkeley and Univ. of Colorado Denver,
* and INRIA Bordeaux Sud-Ouest * and INRIA Bordeaux Sud-Ouest
* *
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
* @date 2011-06-01 * @date 2011-06-01
* *
**/ **/
/*******************************************************************************
* MAGMA facilities of interest to both src and magmablas directories
**/
#ifndef _MORSE_QUARK_H_ #ifndef _MORSE_QUARK_H_
#define _MORSE_QUARK_H_ #define _MORSE_QUARK_H_
......
...@@ -23,12 +23,6 @@ ...@@ -23,12 +23,6 @@
* @date 2011-06-01 * @date 2011-06-01
* *
**/ **/
/******************************************************************************/
/*
* MORSE facilities of interest to both src and magmablas directories
**/
#ifndef _MORSE_STARPU_H_ #ifndef _MORSE_STARPU_H_
#define _MORSE_STARPU_H_ #define _MORSE_STARPU_H_
......
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