Attention une mise à jour du service Gitlab va être effectuée le mardi 14 décembre entre 13h30 et 14h00. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes.

Commit 4a754cec authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

HwLoc is not a direct dependence of chameleon

parent 414ff41e
......@@ -148,8 +148,6 @@ MACRO(GENERATE_PKGCONFIG_FILE)
endif(NOT CHAMELEON_SIMULATION)
list(APPEND CHAMELEON_PKGCONFIG_REQUIRED_PRIVATE hwloc)
# Define required package
# -----------------------
CLEAN_LIB_LIST(CHAMELEON)
......
......@@ -82,7 +82,6 @@ if(NOT CHAMELEON_SIMULATION)
${CBLAS_LIBRARIES}
${LAPACK_SEQ_LIBRARIES}
${BLAS_SEQ_LIBRARIES}
${HWLOC_LIBRARIES}
${EXTRA_LIBRARIES}
)
......@@ -94,14 +93,11 @@ if(NOT CHAMELEON_SIMULATION)
else()
list(APPEND libs_for_examples
${HWLOC_LIBRARIES}
${EXTRA_LIBRARIES}
)
endif()
link_directories(${HWLOC_LIBRARY_DIRS})
# message(STATUS "libs timings: ${libs_for_examples}")
foreach(_example ${EXAMPLES})
get_filename_component(_name_exe ${_example} NAME_WE)
......
......@@ -85,7 +85,6 @@ if(NOT CHAMELEON_SIMULATION)
${CBLAS_LIBRARIES}
${LAPACK_SEQ_LIBRARIES}
${BLAS_SEQ_LIBRARIES}
${HWLOC_LIBRARIES}
${EXTRA_LIBRARIES}
)
......@@ -104,7 +103,6 @@ if(NOT CHAMELEON_SIMULATION)
${CBLAS_LIBRARIES}
${LAPACK_PAR_LIBRARIES}
${BLAS_PAR_LIBRARIES}
${HWLOC_LIBRARIES}
${EXTRA_LIBRARIES}
)
......@@ -115,7 +113,6 @@ if(NOT CHAMELEON_SIMULATION)
${CBLAS_LIBRARIES}
${LAPACK_SEQ_LIBRARIES}
${BLAS_SEQ_LIBRARIES}
${HWLOC_LIBRARIES}
${EXTRA_LIBRARIES}
)
endif ()
......
......@@ -56,7 +56,6 @@ if(NOT CHAMELEON_SIMULATION)
${CBLAS_LIBRARIES}
${LAPACK_SEQ_LIBRARIES}
${BLAS_SEQ_LIBRARIES}
${HWLOC_LIBRARIES}
${EXTRA_LIBRARIES}
)
......
......@@ -141,7 +141,6 @@ if(NOT CHAMELEON_SIMULATION)
${LAPACK_LIBRARIES}
${CBLAS_LIBRARIES}
${BLAS_LIBRARIES}
${HWLOC_LIBRARIES}
${EXTRA_LIBRARIES}
)
......@@ -161,7 +160,6 @@ endif()
# message("LAPACK_LIBRARY_DIRS: ${LAPACK_LIBRARY_DIRS}")
# message("CBLAS_LIBRARY_DIRS: ${CBLAS_LIBRARY_DIRS}")
# message("BLAS_LIBRARY_DIRS: ${BLAS_LIBRARY_DIRS}")
# message("HWLOC_LIBRARY_DIRS: ${HWLOC_LIBRARY_DIRS}")
# list(APPEND libs_for_tests ${CMAKE_Fortran_FLAGS} )
# list(APPEND libs_for_tests ${CMAKE_Fortran_LDFLAGS})
......
......@@ -2,8 +2,8 @@
# Check testing/
#
set(TEST_CMD_shm testing 4 0)
set(TEST_CMD_shmgpu testing 4 1)
set(TEST_CMD_shm testing 10 0)
set(TEST_CMD_shmgpu testing 10 1)
# set(TEST_CMD_mpi testing 4 0)
# set(TEST_CMD_mpigpu testing 4 1)
......@@ -40,15 +40,15 @@ foreach(cat ${TEST_CATEGORIES})
add_test(test_${cat}_${prec}gels_hlq ./${prec}${TEST_CMD_${cat}} GELS 1 400 800 825 25 810 4)
add_test(test_${cat}_${prec}gesv_incpiv ./${prec}${TEST_CMD_${cat}} GESV_INCPIV 800 825 25 810)
add_test(test_${cat}_${prec}gels_hqr_greedy ./${prec}${TEST_CMD_${cat}} GELS_HQR 1000 1000 1000 10 1000 4 -1 1 -1 0)
add_test(test_${cat}_${prec}gels_hqr_fibonacci ./${prec}${TEST_CMD_${cat}} GELS_HQR 1000 1000 1000 10 1000 4 -1 2 -1 0)
add_test(test_${cat}_${prec}gels_hqr_binary ./${prec}${TEST_CMD_${cat}} GELS_HQR 1000 1000 1000 10 1000 4 -1 3 -1 0)
add_test(test_${cat}_${prec}gels_hlq_greedy ./${prec}${TEST_CMD_${cat}} GELS_HQR 1000 1500 1000 10 1000 4 -1 1 -1 0)
add_test(test_${cat}_${prec}gels_hlq_fibonacci ./${prec}${TEST_CMD_${cat}} GELS_HQR 1000 1500 1000 10 1000 4 -1 2 -1 0)
add_test(test_${cat}_${prec}gels_hlq_binary ./${prec}${TEST_CMD_${cat}} GELS_HQR 1000 1500 1000 10 1000 4 -1 3 -1 0)
add_test(test_${cat}_${prec}gels_hqr_greedy ./${prec}${TEST_CMD_${cat}} GELS_HQR 100 100 100 10 100 4 -1 1 -1 0)
add_test(test_${cat}_${prec}gels_hqr_fibonacci ./${prec}${TEST_CMD_${cat}} GELS_HQR 100 100 100 10 100 4 -1 2 -1 0)
add_test(test_${cat}_${prec}gels_hqr_binary ./${prec}${TEST_CMD_${cat}} GELS_HQR 100 100 100 10 100 4 -1 3 -1 0)
add_test(test_${cat}_${prec}gels_hlq_greedy ./${prec}${TEST_CMD_${cat}} GELS_HQR 100 150 100 10 100 4 -1 1 -1 0)
add_test(test_${cat}_${prec}gels_hlq_fibonacci ./${prec}${TEST_CMD_${cat}} GELS_HQR 100 150 100 10 100 4 -1 2 -1 0)
add_test(test_${cat}_${prec}gels_hlq_binary ./${prec}${TEST_CMD_${cat}} GELS_HQR 100 150 100 10 100 4 -1 3 -1 0)
add_test(test_${cat}_${prec}gels_rq_systolic ./${prec}${TEST_CMD_${cat}} GELS_SYSTOLIC 1000 1000 1000 10 1000 3 2)
add_test(test_${cat}_${prec}gels_lq_systolic ./${prec}${TEST_CMD_${cat}} GELS_SYSTOLIC 1000 1500 1000 10 1000 3 2)
add_test(test_${cat}_${prec}gels_rq_systolic ./${prec}${TEST_CMD_${cat}} GELS_SYSTOLIC 100 100 100 10 100 3 2)
add_test(test_${cat}_${prec}gels_lq_systolic ./${prec}${TEST_CMD_${cat}} GELS_SYSTOLIC 100 150 100 10 100 3 2)
endif()
endforeach()
......
......@@ -153,7 +153,7 @@ elseif(MORSE_SCHED_QUARK)
list(APPEND libs_for_tests coreblas)
endif()
foreach(_dep LAPACKE LAPACK CBLAS BLAS CUDA HWLOC MPI DL)
foreach(_dep LAPACKE LAPACK CBLAS BLAS CUDA MPI DL)
if(HAVE_${_dep})
list(APPEND libs_for_tests ${${_dep}_LIBRARY})
endif()
......
......@@ -185,8 +185,8 @@ int main (int argc, char **argv)
else*/
MORSE_Init( ncores, ngpus);
MORSE_Disable(MORSE_AUTOTUNING);
MORSE_Set(MORSE_TILE_SIZE, 320 );
MORSE_Set(MORSE_INNER_BLOCK_SIZE, 48 );
MORSE_Set(MORSE_TILE_SIZE, 32 );
MORSE_Set(MORSE_INNER_BLOCK_SIZE, 5 );
argc -= 4;
argv += 4;
......
......@@ -203,7 +203,6 @@ if(NOT CHAMELEON_SIMULATION)
${LAPACK_SEQ_LIBRARIES}
${BLAS_SEQ_LIBRARIES}
${LIBHQR_LIBRARIES}
${HWLOC_LIBRARIES}
${EXTRA_LIBRARIES}
)
......@@ -224,13 +223,11 @@ endif()
# message("CBLAS_LIBRARIES: ${CBLAS_LIBRARIES}")
# message("LAPACK_SEQ_LIBRARIES: ${LAPACK_SEQ_LIBRARIES}")
# message("LAPACKE_LIBRARIES: ${LAPACKE_LIBRARIES}")
# message("HWLOC_LIBRARIES: ${HWLOC_LIBRARIES}")
# message("LAPACKE_LIBRARY_DIRS: ${LAPACKE_LIBRARY_DIRS}")
# message("LAPACK_LIBRARY_DIRS: ${LAPACK_LIBRARY_DIRS}")
# message("CBLAS_LIBRARY_DIRS: ${CBLAS_LIBRARY_DIRS}")
# message("BLAS_LIBRARY_DIRS: ${BLAS_LIBRARY_DIRS}")
# message("HWLOC_LIBRARY_DIRS: ${HWLOC_LIBRARY_DIRS}")
# message(STATUS "libs timings: ${libs_for_timings}")
foreach(_timing ${TIMINGS})
......
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