fixed bash output errors

.gitlab-ci.yml

@@ -8,10 +8,7 @@ stages:
 env:ubuntu_zesty:
   image: keckj/hysop:ubuntu_zesty
   stage: env
-  script: "sh ci/scripts/version.sh 2>&1 | tee /tmp/ubuntu_zesty_env"
-  artifacts:
-    paths:
-        - /tmp/ubuntu_zesty_env
+  script: "sh ci/scripts/version.sh"
 
 config:ubuntu_zesty:
   image: keckj/hysop:ubuntu_zesty

CMakeLists.txt

@@ -45,7 +45,7 @@ option(VERBOSE "Enable verbose mode for HySoP. Default = ON" ON)
 option(DEBUG "Enable debug mode for HySoP. Default = OFF" OFF)
 option(FULL_TEST "Enable all test options (pep8, mpi ...) - Default = OFF" OFF)
 option(OPTIM "To allow python -OO run, some packages must be deactivated. Set this option to 'ON' to do so. Default = OFF" OFF)
-option(WITH_MPI_TESTS "Enable mpi tests. Default = ON if USE_MPI is ON." ON)
+option(WITH_MPI_TESTS "Enable mpi tests. Default = OFF." OFF)
 option(WITH_GOOGLE_TESTS "Enable google tests (c++). Default = OFF." OFF)
 option(FORTRAN_LAYOUT "Choose default data layout ('fortran', column-major or 'C' order, row-major) for arrays. Default = column-major." OFF)
 option(WITH_DOCUMENTATION "Build Documentation. Default = OFF" OFF)

ci/scripts/build_install_clean.sh

 #!/bin/bash
+set -e
 cd build
 make
 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
+exit 0

ci/scripts/config.sh

 #!/bin/bash
+set -e
 mkdir build
 cd build
 export FC=mpif90 CC=mpicc CXX=mpic++ F77=mpif90
 cmake  -DCMAKE_BUILD_TYPE=Debug -DUSE_CXX=OFF  ..
+exit 0

ci/scripts/run_tests.sh

 #!/bin/bash
+set -e
 mkdir build
 cd build
 export FC=mpif90 CC=mpicc CXX=mpic++
 cmake -D CMAKE_BUILD_TYPE=Debug -DUSE_CXX=OFF  ..
 make
 make test
+exit 0

ci/scripts/version.sh

+#!/bin/bash
+set -e
 echo "HOST"
 uname -a
 echo
@@ -14,3 +16,4 @@ echo
 echo "CL_INFO"
 clinfo
 echo
+exit 0

cmake/hysop_tests.cmake

@@ -54,33 +54,7 @@ endif()
 
 
 # === Set the list of all directories which may contain tests ===
-set(py_src_dirs
-  core
-  backend
-  fields
-  domain
-  operator
-  numerics
-  tools
-  )
-
-# If GPU is on, we add test_XXX.py files of hysop/gpu directory
-#if(WITH_GPU)
-#endif()
-
-# Copy the OpenCL sources files to build dir (required since only python files are copied by setup.py)
-#set(clfiles)
-#file(GLOB clfilestmp RELATIVE ${CMAKE_SOURCE_DIR} hysop/gpu/cl_src/[a-z]*.cl)
-#set(clfiles ${clfiles} ${clfilestmp})
-#file(GLOB clfilestmp RELATIVE ${CMAKE_SOURCE_DIR} hysop/gpu/cl_src/kernels/[a-z]*.cl)
-#set(clfiles ${clfiles} ${clfilestmp})
-#file(GLOB clfilestmp RELATIVE ${CMAKE_SOURCE_DIR} hysop/gpu/cl_src/advection/[a-z]*.cl)
-#set(clfiles ${clfiles} ${clfilestmp})
-#file(GLOB clfilestmp RELATIVE ${CMAKE_SOURCE_DIR} hysop/gpu/cl_src/remeshing/[a-z]*.cl)
-#set(clfiles ${clfiles} ${clfilestmp})
-#foreach(_F ${clfiles})
-  #configure_file(${_F} ${testDir}/${_F} COPYONLY)
-#endforeach()
+set(py_src_dirs operator)
 
 # === Create the files list from all directories in py_src_dirs ===
 

hysop/__init__.py

@@ -16,7 +16,7 @@ __FFTW_ENABLED__   = "ON"   is "ON"
 __SCALES_ENABLED__ = "ON" is "ON"
 __OPTIMIZE__       = not __debug__
 
-__VERBOSE__        = True
+__VERBOSE__        = "ON" is "ON"
 __DEBUG__          = "OFF" is "ON"
 __PROFILE__        = "ON" is "ON"
 __TRACE__          = False
@@ -26,8 +26,8 @@ __KERNEL_DEBUG__   = False
 __ENABLE_LONG_TESTS__ = "OFF" is "ON"
 
 # OpenCL
-__DEFAULT_PLATFORM_ID__ = 0
-__DEFAULT_DEVICE_ID__   = 0
+__DEFAULT_PLATFORM_ID__ = 1
+__DEFAULT_DEVICE_ID__   = 1
 
 
 if __MPI_ENABLED__:

hysop/constants.py

@@ -152,7 +152,7 @@ SpaceDiscretization = EnumFactory.create('SpaceDiscretization',
 
 
 AutotunerFlags = EnumFactory.create('AutotunerFlags', 
-        ['ESTIMATE', 'MEASURE', 'PATIENT', 'EXHAUSTIVE' ])
+        ['ESTIMATE', 'MEASURE', 'PATIENT', 'EXHAUSTIVE'])
 """Configuration flags for kernel autotuner 
    (automatic runtime parameters tuning for cuda and opencl)."""
 DEFAULT_AUTOTUNER_FLAG            = AutotunerFlags.MEASURE