Update installation and ci

.travis.yml

@@ -23,13 +23,13 @@ jobs:
       env: PYTHON_VERSION="3.7.5" COMPILER="gcc" GCCv="7"
     - stage: full linux
       os: linux
-      env: PYTHON_VERSION="3.7.5" COMPILER="gcc" GCCv="7"
+      env: PYTHON_VERSION="3.7.5" COMPILER="gcc" GCCv="8"
     - stage: full linux
       os: linux
-      env: PYTHON_VERSION="3.7.5" COMPILER="gcc" GCCv="6"
+      env: PYTHON_VERSION="3.7.5" COMPILER="gcc" GCCv="7"
     - stage: full linux
       os: linux
-      env: PYTHON_VERSION="3.6.9" COMPILER="gcc" GCCv="7"
+      env: PYTHON_VERSION="3.7.5" COMPILER="gcc" GCCv="6"
     - stage: full linux
       os: linux
       env: PYTHON_VERSION="3.6.9" COMPILER="gcc" GCCv="6"
@@ -86,7 +86,7 @@ before_install:
 install:
   - conda install -y python=$PYTHON_VERSION
   - echo $PYTHON_VERSION
-  - conda install -y cmake libstdcxx-ng numpy -c anaconda
+  - conda install -y cmake numpy -c anaconda
   - conda install -y -c conda-forge tbb-devel
   - export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname $(which conda))/../"}
   - pip install -e .[test]

CMakeLists.txt

@@ -146,6 +146,17 @@ if(BUILD_FOAM_TESTS)
     add_subdirectory(test)
 endif()
 
+# ============
+# Build flags
+# ============
+
+if(CMAKE_CXX_COMPILER_VERSION)
+    set(FOAM_COMPILER_STR "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} (version ${CMAKE_CXX_COMPILER_VERSION})")
+else()
+    set(FOAM_COMPILER_STR "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}")
+endif()
+string(STRIP "${FOAM_COMPILER_STR}" FOAM_COMPILER_STR)
+
 # ============
 # Installation
 # ============

docs/installation.rst

@@ -18,10 +18,18 @@ Dependencies
 In your Anaconda_ environment, run the following commands:
 
 .. code-block:: bash
-
-    $ conda install -c anaconda cmake libstdcxx-ng numpy
+    # install gcc-6.1
     $ conda install -c omgarcia gcc-6
-    $ conda install -c conda-forge tbb
+    $ conda install -c anaconda libstdcxx-ng
+
+    # install gcc-7.5 (experimenting)
+    # $ conda install -c conda-forge gxx_linux-64
+    # $ ln -s ${CONDA_PREFIX}/bin/x86_64-conda_cos6-linux-gnu-gcc  ${CONDA_PREFIX}/bin/gcc
+    # $ ln -s ${CONDA_PREFIX}/bin/x86_64-conda_cos6-linux-gnu-g++  ${CONDA_PREFIX}/bin/g++
+
+    # install cmake and dependencies
+    $ conda install -c anaconda cmake numpy
+    $ conda install -c conda-forge tbb-devel
 
 Install **EXtra-foam**
 ----------------------

extra_foam/database/metadata.py

@@ -249,7 +249,7 @@ def _write_configuration(self, cfg, old, new):
 
             if k_root in Metadata.processor_keys:
                 if v:
-                    self._db.hmset(k_new, v)
+                    self._db.hset(k_new, mapping=v)
                 else:
                     self._db.execute_command("DEL", k_new)
             else:

src/extra_foam/CMakeLists.txt

@@ -4,6 +4,33 @@
 # All rights reserved.                                            #
 ###################################################################
 
+# ============
+# Build flags
+# ============
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+    if(NOT CMAKE_CXX_FLAGS MATCHES "-march")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+    endif()
+endif()
+
+message(STATUS "=========================== EXtra-foam Python ============================")
+message(STATUS "")
+message(STATUS "    C++ Compiler:               ${FOAM_COMPILER_STR}")
+message(STATUS "    C++ flags (Release):        ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
+message(STATUS "    C++ flags (Debug):          ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
+message(STATUS "    Linker flags (Release):     ${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
+message(STATUS "    Linker flags (Debug):       ${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}")
+message(STATUS "")
+message(STATUS "    USE TBB in FOAM/XTENSOR:    ${FOAM_USE_TBB}/${XTENSOR_USE_TBB}")
+message(STATUS "    USE XSIMD in FOAM/XTENSOR:  ${FOAM_USE_XSIMD}/${XTENSOR_USE_XSIMD}")
+message(STATUS "")
+message(STATUS "==========================================================================")
+
+# ===============
+# Build libraries
+# ===============
+
 set(_FOAM_MODULE_FILES
     f_canny.cpp
     f_datamodel.cpp

test/CMakeLists.txt

@@ -4,10 +4,6 @@
 # All rights reserved.                                            #
 ###################################################################
 
-if(NOT CMAKE_CXX_FLAGS MATCHES "-march")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-endif()
-
 # Download and unpack googletest at configure time
 configure_file(downloadGTest.cmake.in googletest-download/CMakeLists.txt)
 
@@ -61,6 +57,20 @@ set(_FOAM_UNITTEST_TARGETS_NEED_BLAS
 
 set(CMAKE_BUILD_RPATH "${CMAKE_PREFIX_PATH}/lib")
 
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+    if(NOT CMAKE_CXX_FLAGS MATCHES "-march")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+    endif()
+endif()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "7")
+        # solve the linker error with test_tbb.cpp:
+        #     undefined reference to symbol 'clock_gettime@@GLIBC_2.2.5'
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lrt")
+    endif()
+endif()
+
 foreach(pathname IN LISTS _FOAM_UNITTESTS)
     get_filename_component(filename ${pathname} NAME)
     string(REPLACE ".cpp" "" targetname ${filename})