From 4a754cec917c8c0a7a4c9e53c9900a476ade4c50 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Wed, 23 Aug 2017 12:34:41 +0200
Subject: [PATCH] HwLoc is not a direct dependence of chameleon
---
cmake_modules/GenPkgConfig.cmake | 2 --
example/basic_zposv/CMakeLists.txt | 4 ----
example/lapack_to_morse/CMakeLists.txt | 3 ---
example/out_of_core/CMakeLists.txt | 1 -
testing/CMakeLists.txt | 2 --
testing/CTestLists.cmake | 20 ++++++++++----------
testing/lin/CMakeLists.txt | 2 +-
testing/testing_zauxiliary.c | 4 ++--
timing/CMakeLists.txt | 3 ---
9 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/cmake_modules/GenPkgConfig.cmake b/cmake_modules/GenPkgConfig.cmake
index e10b77ea1..7d6b218c5 100644
--- a/cmake_modules/GenPkgConfig.cmake
+++ b/cmake_modules/GenPkgConfig.cmake
@@ -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)
diff --git a/example/basic_zposv/CMakeLists.txt b/example/basic_zposv/CMakeLists.txt
index 555e7f72e..7fe4f8d57 100644
--- a/example/basic_zposv/CMakeLists.txt
+++ b/example/basic_zposv/CMakeLists.txt
@@ -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)
diff --git a/example/lapack_to_morse/CMakeLists.txt b/example/lapack_to_morse/CMakeLists.txt
index c627c5eea..662d24c4f 100644
--- a/example/lapack_to_morse/CMakeLists.txt
+++ b/example/lapack_to_morse/CMakeLists.txt
@@ -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 ()
diff --git a/example/out_of_core/CMakeLists.txt b/example/out_of_core/CMakeLists.txt
index 01bb27041..27bc3ebfe 100644
--- a/example/out_of_core/CMakeLists.txt
+++ b/example/out_of_core/CMakeLists.txt
@@ -56,7 +56,6 @@ if(NOT CHAMELEON_SIMULATION)
${CBLAS_LIBRARIES}
${LAPACK_SEQ_LIBRARIES}
${BLAS_SEQ_LIBRARIES}
- ${HWLOC_LIBRARIES}
${EXTRA_LIBRARIES}
)
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index beb55c62b..ec4430f0c 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -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})
diff --git a/testing/CTestLists.cmake b/testing/CTestLists.cmake
index 9a9ddf980..9671119a0 100644
--- a/testing/CTestLists.cmake
+++ b/testing/CTestLists.cmake
@@ -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()
diff --git a/testing/lin/CMakeLists.txt b/testing/lin/CMakeLists.txt
index 290647bb4..87d87bd42 100644
--- a/testing/lin/CMakeLists.txt
+++ b/testing/lin/CMakeLists.txt
@@ -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()
diff --git a/testing/testing_zauxiliary.c b/testing/testing_zauxiliary.c
index e1501a07d..247390083 100644
--- a/testing/testing_zauxiliary.c
+++ b/testing/testing_zauxiliary.c
@@ -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;
diff --git a/timing/CMakeLists.txt b/timing/CMakeLists.txt
index b6db5de47..69efac991 100644
--- a/timing/CMakeLists.txt
+++ b/timing/CMakeLists.txt
@@ -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})
--
GitLab