From ca9e8eb24b07731f3e9fec42c31e3dcaaca9d31a Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Keck <jean-baptiste.keck@imag.fr>
Date: Fri, 6 Oct 2017 19:08:31 +0200
Subject: [PATCH] test_cache
---
.gitlab-ci.yml | 3 ++
CMakeLists.txt | 1 -
hysop/operator/tests/test_transpose.py | 40 +++++++++-----------------
3 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50f2d8e0b..cc0c7b29e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,6 +54,9 @@ test:ubuntu_zesty:
- "sh ci/scripts/test.sh $CI_PROJECT_DIR/install/gcc-6 $CI_PROJECT_DIR/hysop"
dependencies:
- install:ubuntu_zesty
+ artifacts:
+ paths:
+ - /root/.cache
cache:
paths:
- /root/.cache
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e50ccf90..c899d98e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -179,7 +179,6 @@ endif()
# --- FFTW ---
if(WITH_FFTW)
- #set(FIND_FFTW_VERBOSE VERBOSE_MODE)
set(FIND_FFTW_VERBOSE OFF)
set(FIND_FFTW_DEBUG ON)
set(FIND_FFTW_SHARED_ONLY ON)
diff --git a/hysop/operator/tests/test_transpose.py b/hysop/operator/tests/test_transpose.py
index bf63878ef..a1c07840c 100644
--- a/hysop/operator/tests/test_transpose.py
+++ b/hysop/operator/tests/test_transpose.py
@@ -187,30 +187,22 @@ class TestTransposeOperator(object):
raise RuntimeError(msg)
- def test_2d_int_out_of_place(self):
+ def test_2d_out_of_place(self):
self._test(dim=2, dtype=None, is_inplace=False)
- def test_2d_float_out_of_place(self):
- self._test(dim=2, dtype=None, is_inplace=False)
- def test_3d_int_out_of_place(self):
- self._test(dim=3, dtype=None, is_inplace=False)
- def test_3d_float_out_of_place(self):
+ def test_3d_out_of_place(self):
self._test(dim=3, dtype=None, is_inplace=False)
- def test_4d_int_out_of_place(self):
+ def test_4d_out_of_place(self):
self._test(dim=4, dtype=None, is_inplace=False)
def test_upper_dimensions_out_of_place(self):
for i in xrange(5,9):
self._test(dim=i, dtype=None, is_inplace=False,
size_min=3, size_max=4, naxes=1)
- def test_2d_int_inplace(self):
+ def test_2d_inplace(self):
self._test(dim=2, dtype=None, is_inplace=True)
- def test_2d_float_inplace(self):
- self._test(dim=2, dtype=None, is_inplace=True)
- def test_3d_int_inplace(self):
- self._test(dim=3, dtype=None, is_inplace=True)
- def test_3d_float_inplace(self):
+ def test_3d_inplace(self):
self._test(dim=3, dtype=None, is_inplace=True)
- def test_4d_int_inplace(self):
+ def test_4d_inplace(self):
self._test(dim=4, dtype=None, is_inplace=True)
def test_upper_dimensions_inplace(self):
for i in xrange(5,9):
@@ -218,19 +210,15 @@ class TestTransposeOperator(object):
size_min=3, size_max=4, naxes=1)
def perform_tests(self):
- self.test_2d_int_out_of_place()
- self.test_2d_float_out_of_place()
- self.test_3d_int_out_of_place()
- self.test_3d_float_out_of_place()
- self.test_4d_int_out_of_place()
- self.test_upper_dimensions_out_of_place()
+ self.test_2d_out_of_place()
+ #self.test_3d_out_of_place()
+ #self.test_4d_out_of_place()
+ #self.test_upper_dimensions_out_of_place()
- self.test_2d_int_inplace()
- self.test_2d_float_inplace()
- self.test_3d_int_inplace()
- self.test_3d_float_inplace()
- self.test_4d_int_inplace()
- self.test_upper_dimensions_inplace()
+ #self.test_2d_inplace()
+ #self.test_3d_inplace()
+ #self.test_4d_inplace()
+ #self.test_upper_dimensions_inplace()
if __name__ == '__main__':
TestTransposeOperator.setup_class(enable_extra_tests=False,
--
GitLab