Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 73a65e2f authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Silent the new warning on gemm3m

parent e1c68e1a
No related branches found
No related tags found
1 merge request!55Fix #42 - HQR header installation
...@@ -296,7 +296,9 @@ elseif(CHAMELEON_SCHED_QUARK) ...@@ -296,7 +296,9 @@ elseif(CHAMELEON_SCHED_QUARK)
list(INSERT CHAMELEON_DEP 0 -lchameleon_quark) list(INSERT CHAMELEON_DEP 0 -lchameleon_quark)
endif() endif()
if (NOT CHAMELEON_SIMULATION) if (NOT CHAMELEON_SIMULATION)
target_link_libraries(chameleon coreblas) add_dependencies(chameleon
coreblas_include)
target_link_libraries(chameleon coreblas)
endif() endif()
target_link_libraries(chameleon hqr) target_link_libraries(chameleon hqr)
list(INSERT CHAMELEON_DEP 0 -lchameleon) list(INSERT CHAMELEON_DEP 0 -lchameleon)
......
...@@ -43,6 +43,10 @@ ...@@ -43,6 +43,10 @@
#include "control/context.h" #include "control/context.h"
#include "chameleon/morse_runtime.h" #include "chameleon/morse_runtime.h"
#if !defined(CHAMELEON_SIMULATION)
#include "coreblas.h"
#endif
/******************************************************************************* /*******************************************************************************
* Global data * Global data
**/ **/
...@@ -163,7 +167,7 @@ int MORSE_Enable(MORSE_enum option) ...@@ -163,7 +167,7 @@ int MORSE_Enable(MORSE_enum option)
morse->progress_enabled = MORSE_TRUE; morse->progress_enabled = MORSE_TRUE;
break; break;
case MORSE_GEMM3M: case MORSE_GEMM3M:
#ifdef CBLAS_HAS_ZGEMM3M #if defined(CBLAS_HAS_ZGEMM3M) && !defined(CHAMELEON_SIMULATION)
set_coreblas_gemm3m_enabled(1); set_coreblas_gemm3m_enabled(1);
#else #else
morse_error("MORSE_Enable", "cannot enable GEMM3M (not available in cblas)"); morse_error("MORSE_Enable", "cannot enable GEMM3M (not available in cblas)");
...@@ -231,7 +235,7 @@ int MORSE_Disable(MORSE_enum option) ...@@ -231,7 +235,7 @@ int MORSE_Disable(MORSE_enum option)
morse->progress_enabled = MORSE_FALSE; morse->progress_enabled = MORSE_FALSE;
break; break;
case MORSE_GEMM3M: case MORSE_GEMM3M:
#if !defined(CHAMELEON_SIMULATION) #if defined(CBLAS_HAS_ZGEMM3M) && !defined(CHAMELEON_SIMULATION)
set_coreblas_gemm3m_enabled(0); set_coreblas_gemm3m_enabled(0);
#endif #endif
break; break;
......
...@@ -23,13 +23,16 @@ ...@@ -23,13 +23,16 @@
* *
**/ **/
static int coreblas_gemm3m_enabled=0; static int coreblas_gemm3m_enabled = 0;
void set_coreblas_gemm3m_enabled(int v) { void
coreblas_gemm3m_enabled=v; set_coreblas_gemm3m_enabled( int v ) {
coreblas_gemm3m_enabled = v;
} }
int get_coreblas_gemm3m_enabled(void) {
return coreblas_gemm3m_enabled; int
get_coreblas_gemm3m_enabled(void) {
return coreblas_gemm3m_enabled;
} }
/******************************************************************************* /*******************************************************************************
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment