Commit 69e80e93 authored by Mathieu Faverge's avatar Mathieu Faverge

Merge branch 'timing/options' into 'master'

Timing/options

See merge request !53
parents 253e9ad4 27e4d8c3
......@@ -749,6 +749,9 @@ if( CHAMELEON_SCHED_STARPU )
list(INSERT CHAMELEON_DEP 0 ${STARPU_LIBRARIES})
endif()
endif()
unset(CMAKE_REQUIRED_FLAGS)
unset(CMAKE_REQUIRED_INCLUDES)
unset(CMAKE_REQUIRED_LIBRARIES)
else ( STARPU_FOUND )
if(MORSE_VERBOSE_FIND_PACKAGE)
if(NOT HWLOC_FOUND OR NOT HWLOC_LIBRARIES)
......@@ -864,6 +867,9 @@ if( CHAMELEON_SCHED_PARSEC )
list(INSERT CHAMELEON_DEP 0 ${PARSEC_LIBRARIES})
endif()
endif()
unset(CMAKE_REQUIRED_FLAGS)
unset(CMAKE_REQUIRED_INCLUDES)
unset(CMAKE_REQUIRED_LIBRARIES)
else ( PARSEC_FOUND )
if(MORSE_VERBOSE_FIND_PACKAGE)
if(NOT HWLOC_FOUND OR NOT HWLOC_LIBRARIES)
......@@ -952,6 +958,12 @@ if( CHAMELEON_SCHED_QUARK )
endif()
# getopt
check_include_files(getopt.h CHAMELEON_HAVE_GETOPT_H)
if (CHAMELEON_HAVE_GETOPT_H)
check_function_exists(getopt_long CHAMELEON_HAVE_GETOPT_LONG)
endif()
# Add option to exploit cublas API v2
# -----------------------------------
cmake_dependent_option(CHAMELEON_USE_CUBLAS_V2
......@@ -1084,7 +1096,7 @@ endif()
# Config files (pkg_config) #
#############################
# Create .pc file
# Create .pc file
# ---------------
generate_pkgconfig_file()
#------------------------------------------------------------------------------
......
......@@ -48,4 +48,8 @@
/* Tracing support */
#cmakedefine CHAMELEON_ENABLE_TRACING
/* getopt */
#cmakedefine CHAMELEON_HAVE_GETOPT_H
#cmakedefine CHAMELEON_HAVE_GETOPT_LONG
#endif /* CHAMELEON_CONFIG_H_HAS_BEEN_INCLUDED */
......@@ -4,8 +4,8 @@
set(TEST_CMD_shm --n_range=500:2000:500 --nb=320 )
set(TEST_CMD_shmgpu --n_range=500:2000:500 --nb=320 --gpus=1)
set(TEST_CMD_mpi --n_range=500:2000:500 --nb=320 --p=2)
set(TEST_CMD_mpigpu --n_range=500:2000:500 --nb=320 --p=2 --gpus=1)
set(TEST_CMD_mpi --n_range=500:2000:500 --nb=320 --P=2)
set(TEST_CMD_mpigpu --n_range=500:2000:500 --nb=320 --P=2 --gpus=1)
set(MPI_CMD_shm )
set(MPI_CMD_shmgpu )
......@@ -48,7 +48,7 @@ if (NOT CHAMELEON_SIMULATION)
string(TOUPPER ${prec} PREC)
if (CHAMELEON_PREC_${PREC})
foreach(test ${TESTLIST})
add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --warmup)
add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check)
endforeach()
endif()
endforeach()
......@@ -56,7 +56,7 @@ if (NOT CHAMELEON_SIMULATION)
string(TOUPPER ${prec} PREC)
if (CHAMELEON_PREC_${PREC})
foreach(test ${TESTLIST_ZC})
add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --warmup)
add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check)
endforeach()
endif()
endforeach()
......@@ -64,8 +64,8 @@ if (NOT CHAMELEON_SIMULATION)
if (CHAMELEON_USE_MPI AND MPI_C_FOUND)
set( TEST_CATEGORIES mpi )
set( TEST_CMD_mpi --p=2 --n_range=2000:2000:1 --nb==32)
set( TEST_CMD_mpigpu --p=2 --n_range=2000:2000:1 --nb==32 --gpus=1)
set( TEST_CMD_mpi --P=2 --n_range=2000:2000:1 --nb=32)
set( TEST_CMD_mpigpu --P=2 --n_range=2000:2000:1 --nb=32 --gpus=1)
#set( TEST_CATEGORIES ${TEST_CATEGORIES} mpi )
#if (CHAMELEON_USE_CUDA AND CUDA_FOUND)
# set( TEST_CATEGORIES ${TEST_CATEGORIES} mpigpu )
......@@ -79,7 +79,7 @@ if (NOT CHAMELEON_SIMULATION)
if (CHAMELEON_PREC_${PREC})
foreach(test ${TESTLIST_MPI})
add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check --warmup)
add_test(time_${cat}_${prec}${test} ${MPI_CMD_${cat}} ./time_${prec}${test}_tile ${TEST_CMD_${cat}} --check)
endforeach()
endif()
endforeach()
......
This diff is collapsed.
......@@ -12,7 +12,6 @@
#define TIMING_H
typedef double morse_time_t;
static void* morse_getaddr_null(const MORSE_desc_t *A, int m, int n);
enum iparam_timing {
IPARAM_THRDNBR, /* Number of cores */
......@@ -112,7 +111,8 @@ enum dparam_timing {
(void)M;(void)N;(void)K;(void)NRHS; \
(void)LDA;(void)LDB;(void)LDC; \
(void)IB;(void)MB;(void)NB;(void)P;(void)Q; \
(void)MT;(void)NT;(void)check;(void)loud;(void)bigmat;
(void)MT;(void)NT;(void)check; \
(void)loud;(void)bigmat;(void)ooc;
/* Paste code to allocate a matrix in desc if cond_init is true */
#define PASTE_CODE_ALLOCATE_MATRIX_TILE(_desc_, _cond_, _type_, _type2_, _lda_, _m_, _n_) \
......
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