Merge pull request #25 from dune-community/dependencies_updates

Dependencies updates

.travis.script.bash

@@ -12,9 +12,9 @@ source ${SUPERDIR}/scripts/bash/retry_command.bash
 ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} configure
 ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD}
 if [ x"${TESTS}" == x ] ; then
-    ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v test_binaries
+    ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} test_binaries
 else
-    ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v test_binaries_builder_${TESTS}
+    ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} test_binaries_builder_${TESTS}
 fi
 
 source ${OPTS}
@@ -22,7 +22,7 @@ CTEST="ctest -V --timeout ${DXT_TEST_TIMEOUT:-300} -j ${DXT_TEST_PROCS:-2}"
 
 if [ x"${TESTS}" == x ] ; then
     ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${CTEST}
-    ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 headercheck
+    ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} headercheck
 else
     # with binning headercheck is included in building tests
     ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${CTEST} -L "^builder_${TESTS}$"

.travis.test_python.bash

@@ -11,8 +11,7 @@ source ${SUPERDIR}/scripts/bash/retry_command.bash
 
 ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} configure
 ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD}
-${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v bindings
-
-${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v test_python
+${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} bindings
+${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} test_python
 
 # ****** THIS FILE IS AUTOGENERATED, DO NOT EDIT **********
\ No newline at end of file

.travis.yml

@@ -66,24 +66,6 @@ jobs:
   - stage: test_cpp
     env: DOCKER_TAG=gcc_full TESTS=3
     
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_istl_no_disc TESTS=0
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_istl_no_disc TESTS=1
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_istl_no_disc TESTS=2
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_istl_no_disc TESTS=3
-    
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_disc TESTS=0
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_disc TESTS=1
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_disc TESTS=2
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_disc TESTS=3
-    
   - stage: test_cpp
     env: DOCKER_TAG=clang_full TESTS=0
   - stage: test_cpp
@@ -98,16 +80,6 @@ jobs:
     script: ${DOCKER_RUN} /root/src/dune-xt-functions/.travis.test_python.bash
     # overwrite other global/matrix settings
     after_script: true
-  - stage: test_python
-    env: DOCKER_TAG=gcc_no_istl_no_disc
-    script: ${DOCKER_RUN} /root/src/dune-xt-functions/.travis.test_python.bash
-    # overwrite other global/matrix settings
-    after_script: true
-  - stage: test_python
-    env: DOCKER_TAG=gcc_no_disc
-    script: ${DOCKER_RUN} /root/src/dune-xt-functions/.travis.test_python.bash
-    # overwrite other global/matrix settings
-    after_script: true
   - stage: test_python
     env: DOCKER_TAG=clang_full
     script: ${DOCKER_RUN} /root/src/dune-xt-functions/.travis.test_python.bash

dune.module

@@ -12,5 +12,4 @@
 Module: dune-xt-functions
 Version: 2.5.0-dev
 Maintainer: dune-xt-dev@listserv.uni-muenster.de
-Depends: dune-common (>= 2.5) dune-testtools (>= 2.5) dune-geometry (>= 2.5) dune-grid (>= 2.5) dune-xt-common (>=2.5) dune-xt-grid (>= 2.5)
-Suggests: dune-fem dune-pdelab dune-xt-la (>= 2.5)
+Depends: dune-common (>= 2.5) dune-testtools (>= 2.5) dune-geometry (>= 2.5) dune-grid (>= 2.5) dune-xt-common (>=2.5) dune-xt-grid (>= 2.5) dune-xt-la (>= 2.5)

dune/xt/functions/affine.hh

@@ -129,19 +129,6 @@ public:
 
   AffineFunctionBase(const ThisType& other) = default;
 
-// if HAVE_DUNE_FEM is true, GlobalFunctionInterface is derived from Fem::Function which has a deleted copy assignment
-// operator
-#if HAVE_DUNE_FEM
-  ThisType& operator=(const ThisType& other)
-  {
-    A_ = other.A_;
-    b_ = other.b_;
-    name_ = other.name_;
-    b_zero_ = other.b_zero_;
-    return *this;
-  }
-#endif
-
   const std::vector<MatrixType>& A() const
   {
     return A_;

dune/xt/functions/femadapter.hh

-// This file is part of the dune-xt-functions project:
-//   https://github.com/dune-community/dune-xt-functions
-// Copyright 2009-2018 dune-xt-functions developers and contributors. All rights reserved.
-// License: Dual licensed as BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
-//      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
-//          with "runtime exception" (http://www.dune-project.org/license.html)
-// Authors:
-//   Felix Schindler (2014 - 2017)
-//   Rene Milk       (2013 - 2018)
-//   Tobias Leibner  (2014, 2017)
-
-#ifndef DUNE_XT_FUNCTIONS_FEMADAPTER
-#define DUNE_XT_FUNCTIONS_FEMADAPTER
-
-#include <dune/xt/common/memory.hh>
-
-#include <dune/xt/functions/interfaces.hh>
-
-#if HAVE_DUNE_FEM
-
-namespace Dune {
-namespace XT {
-namespace Functions {
-
-
-template <class DiscreteFunctionType>
-class FemAdapterFunction
-    : public LocalizableFunctionInterface<typename DiscreteFunctionType::EntityType,
-                                          typename DiscreteFunctionType::DomainFieldType,
-                                          DiscreteFunctionType::DiscreteFunctionSpaceType::dimDomain,
-                                          typename DiscreteFunctionType::RangeFieldType,
-                                          DiscreteFunctionType::DiscreteFunctionSpaceType::dimRange,
-                                          1>
-{
-  typedef LocalizableFunctionInterface<typename DiscreteFunctionType::EntityType,
-                                       typename DiscreteFunctionType::DomainFieldType,
-                                       DiscreteFunctionType::DiscreteFunctionSpaceType::dimDomain,
-                                       typename DiscreteFunctionType::RangeFieldType,
-                                       DiscreteFunctionType::DiscreteFunctionSpaceType::dimRange,
-                                       1>
-      BaseType;
-  typedef FemAdapterFunction<DiscreteFunctionType> ThisType;
-
-  class Localfunction : public LocalfunctionInterface<typename DiscreteFunctionType::EntityType,
-                                                      typename DiscreteFunctionType::DomainFieldType,
-                                                      DiscreteFunctionType::DiscreteFunctionSpaceType::dimDomain,
-                                                      typename DiscreteFunctionType::RangeFieldType,
-                                                      DiscreteFunctionType::DiscreteFunctionSpaceType::dimRange,
-                                                      1>
-  {
-    typedef LocalfunctionInterface<typename DiscreteFunctionType::EntityType,
-                                   typename DiscreteFunctionType::DomainFieldType,
-                                   DiscreteFunctionType::DiscreteFunctionSpaceType::dimDomain,
-                                   typename DiscreteFunctionType::RangeFieldType,
-                                   DiscreteFunctionType::DiscreteFunctionSpaceType::dimRange,
-                                   1>
-        BaseType;
-
-  public:
-    typedef typename BaseType::EntityType EntityType;
-
-    typedef typename BaseType::DomainType DomainType;
-    typedef typename BaseType::RangeType RangeType;
-    typedef typename BaseType::JacobianRangeType JacobianRangeType;
-
-    Localfunction(const DiscreteFunctionType& df, const EntityType& ent)
-      : BaseType(ent)
-      , wrapped_localfunction_(df.localFunction(ent))
-    {
-    }
-
-    Localfunction(const Localfunction& /*other*/) = delete;
-
-    Localfunction& operator=(const Localfunction& /*other*/) = delete;
-
-    virtual size_t order(const XT::Common::Parameter& /*mu*/ = {}) const override
-    {
-      // being a dune-fem datatype, the wrapped funcitons _really_ do not process the mu
-      return wrapped_localfunction_.order();
-    }
-
-    virtual void evaluate(const DomainType& xx, RangeType& ret, const Common::Parameter& /*mu*/ = {}) const override
-    {
-      wrapped_localfunction_.evaluate(xx, ret);
-    }
-
-    virtual void
-    jacobian(const DomainType& xx, JacobianRangeType& ret, const Common::Parameter& /*mu*/ = {}) const override
-    {
-      wrapped_localfunction_.jacobian(xx, ret);
-    }
-
-  private:
-    typedef typename DiscreteFunctionType::LocalFunctionType WrappedLocalfunctionType;
-    WrappedLocalfunctionType wrapped_localfunction_;
-  }; // class Localfunction
-
-public:
-  typedef typename BaseType::EntityType EntityType;
-  typedef typename BaseType::LocalfunctionType LocalfunctionType;
-
-  FemAdapterFunction(const DiscreteFunctionType& df)
-    : df_(df)
-  {
-  }
-
-  static std::string static_id()
-  {
-    return BaseType::static_id() + ".femadapter";
-  }
-
-  virtual ThisType* copy() const override
-  {
-    return new ThisType(*this);
-  }
-
-  virtual std::string type() const override
-  {
-    return BaseType::static_id() + ".femadapter";
-  }
-
-  virtual std::string name() const override
-  {
-    return df_.name();
-  }
-
-  //! this intentionally hides
-  virtual std::unique_ptr<LocalfunctionType> local_function(const EntityType& entity) const
-  {
-    return Common::make_unique<Localfunction>(df_, entity);
-  } // ... local_function(...)
-
-private:
-  const DiscreteFunctionType& df_;
-}; // class CheckerboardFunction
-
-
-} // namespace Functions
-} // namespace XT
-} // namespace Dune
-
-#endif // if HAVE_DUNE_FEM
-
-#endif // DUNE_XT_FUNCTIONS_FEMADAPTER

dune/xt/functions/interfaces.lib.hh

@@ -16,7 +16,6 @@
 #if DUNE_XT_WITH_PYTHON_BINDINGS
 
 
-#if HAVE_DUNE_FEM
 #define _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE_DD_SUBDOMAIN(_p, _G, _t, _b, _R, _r, _rC)                           \
   _p void Dune::XT::Functions::LocalizableFunctionInterface<                                                           \
       typename _G::template Codim<0>::Entity,                                                                          \
@@ -31,9 +30,6 @@
                       const std::string,                                                                               \
                       const bool,                                                                                      \
                       const VTK::OutputType) const
-#else
-#define _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE_DD_SUBDOMAIN(_p, _G, _t, _b, _R, _r, _rC)
-#endif
 
 #define _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE(_p, _G, _t, _b, _R, _r, _rC)                                        \
   _p void Dune::XT::Functions::LocalizableFunctionInterface<typename _G::template Codim<0>::Entity,                    \
@@ -50,10 +46,10 @@
 
 #if HAVE_DUNE_FEM
 #define _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE_PART(_p, _G, _R, _r, _rC)                                           \
-  _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE(_p, _G, adaptive_leaf, part, _R, _r, _rC);                                \
+  _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE(_p, _G, adaptive_leaf, view, _R, _r, _rC);                                \
   _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE(_p, _G, leaf, part, _R, _r, _rC);                                         \
   _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE(_p, _G, level, part, _R, _r, _rC);                                        \
-  _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE_DD_SUBDOMAIN(_p, _G, dd_subdomain, part, _R, _r, _rC)
+  _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE_DD_SUBDOMAIN(_p, _G, dd_subdomain, view, _R, _r, _rC)
 #else
 #define _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE_PART(_p, _G, _R, _r, _rC)
 #endif

python/dune/xt/functions/ESV2007.bindings.hh

@@ -10,7 +10,6 @@
 
 #ifndef DUNE_XT_FUNCTIONS_ESV2007_BINDINGS_HH
 #define DUNE_XT_FUNCTIONS_ESV2007_BINDINGS_HH
-#if HAVE_DUNE_PYBINDXI
 
 #include <dune/pybindxi/pybind11.h>
 
@@ -92,7 +91,6 @@ class CutoffFunction
             "poincare_constant"_a = 1.0 / (M_PIl * M_PIl),
             "name"_a = type_single_diffusion::static_id(),
             py::keep_alive<0, 2>());
-#if HAVE_DUNE_FEM
       m.def(std::string(make_name + "_single_diffusion_to_1x1").c_str(),
             [](const Grid::GridProvider<G, XT::Grid::DD::SubdomainGrid<G>>& /*grid*/,
                const ScalarFunction& diffusion,
@@ -103,8 +101,6 @@ class CutoffFunction
             "poincare_constant"_a = 1.0 / (M_PIl * M_PIl),
             "name"_a = type_single_diffusion::static_id(),
             py::keep_alive<0, 2>());
-#endif // HAVE_DUNE_FEM
-
       m.def(std::string(make_name + "_diffusion_factor_and_tensor_to_1x1").c_str(),
             [](const Grid::GridProvider<G>& /*grid*/,
                const ScalarFunction& diffusion_factor,
@@ -118,7 +114,6 @@ class CutoffFunction
             "name"_a = type::static_id(),
             py::keep_alive<0, 2>(),
             py::keep_alive<0, 3>());
-#if HAVE_DUNE_FEM
       m.def(std::string(make_name + "_diffusion_factor_and_tensor_to_1x1").c_str(),
             [](const Grid::GridProvider<G, XT::Grid::DD::SubdomainGrid<G>>& /*grid*/,
                const ScalarFunction& diffusion_factor,
@@ -132,7 +127,6 @@ class CutoffFunction
             "name"_a = type::static_id(),
             py::keep_alive<0, 2>(),
             py::keep_alive<0, 3>());
-#endif // HAVE_DUNE_FEM
     }
   }; // struct helper<true, ...>
 
@@ -158,5 +152,4 @@ public:
 } // namespace XT
 } // namespace Dune
 
-#endif // HAVE_DUNE_PYBINDXI
 #endif // DUNE_XT_FUNCTIONS_ESV2007_BINDINGS_HH

python/dune/xt/functions/checkerboard.pbh

@@ -10,7 +10,6 @@
 
 #ifndef DUNE_XT_FUNCTIONS_CHECKERBOARD_PBH
 #define DUNE_XT_FUNCTIONS_CHECKERBOARD_PBH
-#if HAVE_DUNE_PYBINDXI
 
 #include <dune/pybindxi/pybind11.h>
 
@@ -112,5 +111,4 @@ bind_CheckerboardFunction(pybind11::module& m, const std::string& grid_id)
 } // namespace XT
 } // namespace Dune
 
-#endif // HAVE_DUNE_PYBINDXI
 #endif // DUNE_XT_FUNCTIONS_CHECKERBOARD_PBH

python/dune/xt/functions/constant.pbh

@@ -10,7 +10,6 @@
 
 #ifndef DUNE_XT_FUNCTIONS_CONSTANT_PBH
 #define DUNE_XT_FUNCTIONS_CONSTANT_PBH
-#if HAVE_DUNE_PYBINDXI
 
 #include <dune/pybindxi/pybind11.h>
 
@@ -107,5 +106,4 @@ bind_ConstantFunction(pybind11::module& m, const std::string& grid_id)
 } // namespace XT
 } // namespace Dune
 
-#endif // HAVE_DUNE_PYBINDXI
 #endif // DUNE_XT_FUNCTIONS_CONSTANT_PBH

python/dune/xt/functions/expression.pbh

@@ -10,7 +10,6 @@
 
 #ifndef DUNE_XT_FUNCTIONS_EXPRESSION_PBH
 #define DUNE_XT_FUNCTIONS_EXPRESSION_PBH
-#if HAVE_DUNE_PYBINDXI
 
 #include <dune/pybindxi/pybind11.h>
 #include <dune/pybindxi/stl.h>
@@ -187,5 +186,4 @@ bind_ExpressionFunction(pybind11::module& m, const std::string& grid_id)
 } // namespace XT
 } // namespace Dune
 
-#endif // HAVE_DUNE_PYBINDXI
 #endif // DUNE_XT_FUNCTIONS_EXPRESSION_PBH

python/dune/xt/functions/interfaces.pbh

@@ -10,7 +10,6 @@
 
 #ifndef DUNE_XT_FUNCTIONS_INTERFACE_PBH
 #define DUNE_XT_FUNCTIONS_INTERFACE_PBH
-#if HAVE_DUNE_PYBINDXI
 
 #include <dune/pybindxi/pybind11.h>
 #include <dune/pybindxi/operators.h>
@@ -222,7 +221,6 @@ bind_LocalizableFunctionInterface(pybind11::module& m, const std::string& grid_i
         "level"_a = -1,
         "path"_a,
         "subsampling"_a = true);
-#if HAVE_DUNE_FEM
   c.def("visualize",
         [](const C& self,
            const Grid::GridProvider<G, Grid::DD::SubdomainGrid<G>>& dd_grid_provider,
@@ -261,7 +259,6 @@ bind_LocalizableFunctionInterface(pybind11::module& m, const std::string& grid_i
         "level_or_subdomain"_a = -1,
         "path"_a,
         "subsampling"_a = true);
-#endif // HAVE_DUNE_FEM
 
   internal::Divergence<G>::addbind(m, c);
 
@@ -347,5 +344,4 @@ void addbind_LocalizableFunctionInterface_combined_op(C& c)
 } // namespace XT
 } // namespace Dune
 
-#endif // HAVE_DUNE_PYBINDXI
 #endif // DUNE_XT_FUNCTIONS_INTERFACE_PBH

python/dune/xt/functions/spe10.pbh

@@ -10,7 +10,6 @@
 
 #ifndef DUNE_XT_FUNCTIONS_SPE10_PBH
 #define DUNE_XT_FUNCTIONS_SPE10_PBH
-#if HAVE_DUNE_PYBINDXI
 
 #include <dune/pybindxi/pybind11.h>
 
@@ -123,5 +122,4 @@ bind_Spe10Model1Function(pybind11::module& m, const std::string& grid_id)
 } // namespace XT
 } // namespace Dune
 
-#endif // HAVE_DUNE_PYBINDXI
 #endif // DUNE_XT_FUNCTIONS_SPE10_PBH