From fe4fae44be86794a014f6ee08f2bc347a944ef7c Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Keck <jean-baptiste.keck@imag.fr>
Date: Thu, 5 Oct 2017 22:26:07 +0200
Subject: [PATCH] fixed cmake tests
---
CMakeLists.txt | 4 ++--
ci/scripts/build_install_clean.sh | 2 +-
cmake/hysop_tests.cmake | 6 +++---
hysop/backend/device/kernel_autotuner_config.py | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c7743cae..9431a7001 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -617,9 +617,9 @@ if(VERBOSE_MODE)
message(STATUS " ${PROJECT_NAME} debug mode : ${DEBUG}")
message(STATUS " Enable -OO run? : ${OPTIM}")
if(DOUBLEPREC)
- message(STATUS " Real numbers precision : double.")
+ message(STATUS " Default real numbers precision : double.")
else()
- message(STATUS " Real numbers precision : simple.")
+ message(STATUS " Default real numbers precision : simple.")
endif()
message(STATUS "====================== ======= ======================")
message(STATUS " ")
diff --git a/ci/scripts/build_install_clean.sh b/ci/scripts/build_install_clean.sh
index 00f85b4ca..7d6b661e8 100644
--- a/ci/scripts/build_install_clean.sh
+++ b/ci/scripts/build_install_clean.sh
@@ -6,7 +6,7 @@ make install
cd -
python -c 'import hysop'
cd build
-echo $'y\n' | make uninstall
+echo 'y\n' | make uninstall
make clean
cd -
rm -rf build
diff --git a/cmake/hysop_tests.cmake b/cmake/hysop_tests.cmake
index d12fbccd6..e529368f9 100755
--- a/cmake/hysop_tests.cmake
+++ b/cmake/hysop_tests.cmake
@@ -86,10 +86,10 @@ endforeach()
# === Create tests from py_test_files ===
foreach(testfile ${py_test_files})
+ set(execname ${CMAKE_SOURCE_DIR}/${testfile})
get_filename_component(testName ${testfile} NAME_WE)
- set(exename ${testDir}/${testfile})
- #message(STATUS "Add test ${exename} ...")
- add_python_test(${testName} ${exename})
+ message(STATUS "Add test ${execname} ...")
+ add_python_test(${testName} ${execname})
endforeach()
# Add files containing doctests
diff --git a/hysop/backend/device/kernel_autotuner_config.py b/hysop/backend/device/kernel_autotuner_config.py
index 6fbf1a015..52287760e 100644
--- a/hysop/backend/device/kernel_autotuner_config.py
+++ b/hysop/backend/device/kernel_autotuner_config.py
@@ -19,7 +19,7 @@ class KernelAutotunerConfig(object):
def __init__(self, dump_folder = None,
autotuner_flag = DEFAULT_AUTOTUNER_FLAG,
prune_threshold = DEFAULT_AUTOTUNER_PRUNE_THRESHOLD,
- max_candidates = None,
+ max_candidates = 10,
verbose = None,
debug = __KERNEL_DEBUG__,
dump_kernels = True,
--
GitLab