Merge branch 'master' into type_tuple_fix

.pylicense-cpp.cfg

@@ -3,12 +3,11 @@
 #   https://github.com/dune-community/dune-xt-common
 # Copyright 2009-2018 dune-xt-common 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 (2015 - 2017)
 #   Rene Milk       (2018)
-#
-#      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
-#          with "runtime exception" (http://www.dune-project.org/license.html)
 # ~~~
 
 [header]
@@ -16,8 +15,8 @@ name = This file is part of the dune-xt-common project:
 url = https://github.com/dune-community/dune-xt-common
 copyright_statement = Copyright 2009-2018 dune-xt-common 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)
+               or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
+                   with "runtime exception" (http://www.dune-project.org/license.html)
 prefix = //
 
 [files]

.pylicense-other.cfg

@@ -3,12 +3,11 @@
 #   https://github.com/dune-community/dune-xt-common
 # Copyright 2009-2018 dune-xt-common 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 (2015 - 2017)
 #   Rene Milk       (2015, 2018)
-#
-#      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
-#          with "runtime exception" (http://www.dune-project.org/license.html)
 # ~~~
 
 [header]
@@ -16,8 +15,8 @@ name = This file is part of the dune-xt-common project:
 url = https://github.com/dune-community/dune-xt-common
 copyright_statement = Copyright 2009-2018 dune-xt-common 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)
+               or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
+                   with "runtime exception" (http://www.dune-project.org/license.html)
 prefix = #
 lead-in = # ~~~
 lead-out = # ~~~

cmake/modules/FindMKL.cmake

@@ -48,6 +48,7 @@ else("${MKL_LP64_LIBRARY}" MATCHES "MKL_LP64_LIBRARY-NOTFOUND")
 endif("${MKL_LIBRARY}" MATCHES "MKL_LP64_LIBRARY-NOTFOUND")
 
 message("-- checking for mkl.h header")
+#message(FATAL_ERROR ${mkl_include_hints})
 find_path(MKL_INCLUDE_DIRS mkl.h HINTS ${mkl_include_hints})
 if("${MKL_INCLUDE_DIRS}" MATCHES "MKL_INCLUDE_DIRS-NOTFOUND")
   message("--   mkl.h header not found")

dune/xt/common/lapacke.cc

@@ -330,17 +330,6 @@ int dormqr(int DXTC_LAPACKE_ONLY(matrix_layout),
 #if HAVE_MKL || HAVE_LAPACKE
   return LAPACKE_dormqr(matrix_layout, side, trans, m, n, k, a, lda, tau, c, ldc);
 #else
-  DUNE_UNUSED_PARAMETER(matrix_layout);
-  DUNE_UNUSED_PARAMETER(side);
-  DUNE_UNUSED_PARAMETER(trans);
-  DUNE_UNUSED_PARAMETER(m);
-  DUNE_UNUSED_PARAMETER(n);
-  DUNE_UNUSED_PARAMETER(k);
-  DUNE_UNUSED_PARAMETER(a);
-  DUNE_UNUSED_PARAMETER(lda);
-  DUNE_UNUSED_PARAMETER(tau);
-  DUNE_UNUSED_PARAMETER(c);
-  DUNE_UNUSED_PARAMETER(ldc);
   DUNE_THROW(Exceptions::dependency_missing, "You are missing lapacke or the intel mkl, check available() first!");
   return 1;
 #endif
@@ -418,9 +407,6 @@ int dpttrf(int DXTC_LAPACKE_ONLY(n), double* DXTC_LAPACKE_ONLY(d), double* DXTC_
 #if HAVE_MKL || HAVE_LAPACKE
   return LAPACKE_dpttrf(n, d, e);
 #else
-  DUNE_UNUSED_PARAMETER(n);
-  DUNE_UNUSED_PARAMETER(d);
-  DUNE_UNUSED_PARAMETER(e);
   DUNE_THROW(Exceptions::dependency_missing, "You are missing lapacke or the intel mkl, check available() first!");
   return 1;
 #endif

python/setup.py.in

@@ -16,7 +16,7 @@
 import sys
 from setuptools import setup, find_packages
 
-requires=['binpacking==1.3', 'cython', 'jinja2', 'docopt', 'pylicense3>=0.2.1',
+requires=['binpacking==1.3', 'cython', 'jinja2', 'docopt', 'pylicense3>=0.3.0',
                         'ipython', 'pytest', 'pytest-cov', 'cmake_format>=0.3.6']
 if '${HAVE_MPI}' == 'TRUE':
     requires.append('mpi4py')