Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#656: mpl, utils, type_traits: check functionalities usage #657

Merged
merged 6 commits into from
Feb 15, 2024
Merged

#656: mpl, utils, type_traits: check functionalities usage #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ea610c
remove pressio::mpl::is_same
cz4rs Jan 11, 2024
9680947
remove pressio::mpl::enable_if_t
cz4rs Jan 11, 2024
97a2b2d
remove pressio::mpl::is_same usage
cz4rs Jan 11, 2024
42e294b
ci: use C++14 when building examples
cz4rs Jan 11, 2024
4bf3f03
fix std::is_same
cz4rs Jan 30, 2024
d084b1a
try remove std , should default to 17
fnrizzi Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-baseline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
-I/eigen/eigen-${{ env.eigen_version }} \
-I../include \
-c main.cpp \
&& $CXX -o pressio-example main.o \
&& $CXX --std=c++17 -o pressio-example main.o \
&& ./pressio-example

- name: Example - include only with embedded definitions
Expand All @@ -99,7 +99,7 @@ jobs:
-I/eigen/eigen-${{ env.eigen_version }} \
-I../include \
-c main_with_defines.cpp \
&& $CXX -o pressio-example main.o \
&& $CXX --std=c++17 -o pressio-example main.o \
&& ./pressio-example

- name: Configure
Expand Down
2 changes: 1 addition & 1 deletion docs/source/components/type_traits.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ An example of one such specialization (in this case for Eigen) is:

template <typename T>
struct Traits<
T, ::pressio::mpl::enable_if_t<is_dynamic_vector_eigen<T>::value>
T, std::enable_if_t<is_dynamic_vector_eigen<T>::value>
>
{
using scalar_type = typename T::Scalar;
Expand Down
6 changes: 3 additions & 3 deletions include/pressio/expressions/impl/column_classes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace pressio{ namespace expressions{ namespace impl{
template <typename T>
class ColumnExpr<
T,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_dense_matrix_eigen<T>::value
>
>
Expand Down Expand Up @@ -110,7 +110,7 @@ class ColumnExpr<
#ifdef PRESSIO_ENABLE_TPL_TRILINOS
template <typename T>
class ColumnExpr<
T, ::pressio::mpl::enable_if_t<
T, std::enable_if_t<
::pressio::is_multi_vector_tpetra<T>::value > >
{

Expand Down Expand Up @@ -156,7 +156,7 @@ class ColumnExpr<

template <typename T>
class ColumnExpr<
T, ::pressio::mpl::enable_if_t<
T, std::enable_if_t<
::pressio::is_multi_vector_tpetra_block<T>::value > >
{
using traits = ColumnTraits<ColumnExpr<T>>;
Expand Down
6 changes: 3 additions & 3 deletions include/pressio/expressions/impl/column_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace pressio{ namespace expressions{ namespace impl{
template <typename MatrixType>
class ColumnTraits<
ColumnExpr<MatrixType>,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_dense_matrix_eigen<MatrixType>::value
>
> : public ::pressio::Traits<MatrixType>
Expand Down Expand Up @@ -92,7 +92,7 @@ class ColumnTraits<
template <typename T>
class ColumnTraits<
ColumnExpr<T>,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_multi_vector_tpetra<T>::value
>
> : public ::pressio::Traits<T>
Expand All @@ -107,7 +107,7 @@ class ColumnTraits<
template <typename T>
class ColumnTraits<
ColumnExpr<T>,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_multi_vector_tpetra_block<T>::value
>
> : public ::pressio::Traits<T>
Expand Down
4 changes: 2 additions & 2 deletions include/pressio/expressions/impl/diagonal_classes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace pressio{ namespace expressions{ namespace impl{
template <typename MatrixType>
class DiagonalExpr<
MatrixType,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_dense_matrix_eigen<MatrixType>::value
>
>
Expand Down Expand Up @@ -115,7 +115,7 @@ class DiagonalExpr<
template <typename MatrixType>
class DiagonalExpr<
MatrixType,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_dense_matrix_kokkos<MatrixType>::value
>
>
Expand Down
4 changes: 2 additions & 2 deletions include/pressio/expressions/impl/diagonal_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace pressio{ namespace expressions{ namespace impl{
template <typename MatrixType>
class DiagonalTraits<
DiagonalExpr<MatrixType>,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_dense_matrix_eigen<MatrixType>::value
>
> : public ::pressio::Traits<MatrixType>
Expand Down Expand Up @@ -86,7 +86,7 @@ class DiagonalTraits<
template <typename MatrixType>
class DiagonalTraits<
DiagonalExpr<MatrixType>,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_dense_matrix_kokkos<MatrixType>::value
>
> : public ::pressio::Traits<MatrixType>
Expand Down
4 changes: 2 additions & 2 deletions include/pressio/expressions/impl/span_classes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace pressio{ namespace expressions{ namespace impl{
template <typename VectorType>
class SpanExpr<
VectorType,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_dynamic_vector_eigen<VectorType>::value
>
>
Expand Down Expand Up @@ -109,7 +109,7 @@ class SpanExpr<
template <typename VectorType>
class SpanExpr<
VectorType,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_vector_kokkos<VectorType>::value
>
>
Expand Down
4 changes: 2 additions & 2 deletions include/pressio/expressions/impl/span_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace pressio{ namespace expressions{ namespace impl{
template <typename VectorType>
class SpanTraits<
SpanExpr<VectorType>,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_dynamic_vector_eigen<VectorType>::value
>
> : public ::pressio::Traits<VectorType>
Expand Down Expand Up @@ -95,7 +95,7 @@ class SpanTraits<
template <typename VectorType>
class SpanTraits<
SpanExpr<VectorType>,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_vector_kokkos<VectorType>::value
>
> : public ::pressio::Traits<VectorType>
Expand Down
4 changes: 2 additions & 2 deletions include/pressio/expressions/impl/subspan_classes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace pressio{ namespace expressions{ namespace impl{
template <typename MatrixType>
class SubspanExpr<
MatrixType,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_dense_matrix_eigen<MatrixType>::value
>
>
Expand Down Expand Up @@ -135,7 +135,7 @@ class SubspanExpr<
template <typename MatrixType>
struct SubspanExpr<
MatrixType,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_dense_matrix_kokkos<MatrixType>::value
>
>
Expand Down
4 changes: 2 additions & 2 deletions include/pressio/expressions/impl/subspan_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace pressio{ namespace expressions{ namespace impl{
template <typename MatrixType>
class SubSpanTraits<
SubspanExpr<MatrixType>,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_dense_matrix_eigen<MatrixType>::value
>
> : public ::pressio::Traits<MatrixType>
Expand Down Expand Up @@ -90,7 +90,7 @@ class SubSpanTraits<
template <typename MatrixType>
class SubSpanTraits<
SubspanExpr<MatrixType>,
::pressio::mpl::enable_if_t<
std::enable_if_t<
::pressio::is_dense_matrix_kokkos<MatrixType>::value
>
> : public ::pressio::Traits<MatrixType>
Expand Down
2 changes: 1 addition & 1 deletion include/pressio/expressions/is_expression.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ struct is_expression : std::false_type{};
template <typename T>
struct is_expression<
T,
mpl::enable_if_t<
std::enable_if_t<
is_expression_span<T>::value
|| is_expression_diagonal<T>::value
|| is_expression_subspan<T>::value
Expand Down
2 changes: 0 additions & 2 deletions include/pressio/mpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@

// some will change/disappear once we move to C++14
#include "./mpl/identity.hpp"
#include "./mpl/enable_if_t.hpp"
#include "./mpl/conditional_t.hpp"
#include "./mpl/void_t.hpp"
#include "./mpl/is_same.hpp"
#include "./mpl/not_same.hpp"
#include "./mpl/remove_cvref.hpp"
#include "./mpl/remove_reference.hpp"
Expand Down
63 changes: 0 additions & 63 deletions include/pressio/mpl/enable_if_t.hpp
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions include/pressio/mpl/is_same.hpp
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions include/pressio/mpl/is_std_complex.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,20 @@
#ifndef MPL_IS_STD_COMPLEX_HPP_
#define MPL_IS_STD_COMPLEX_HPP_

namespace pressio{ namespace mpl{
#include <complex>
#include <type_traits>

namespace pressio{ namespace mpl{

template <typename T,
typename enable = void>
struct is_std_complex : std::false_type{};

template <typename T>
struct is_std_complex<T, typename
::pressio::mpl::enable_if_t<
std::enable_if_t<
std::is_same<T,
std::complex<typename T::value_type
>
std::complex<typename T::value_type>
>::value
>
> : std::true_type{};
Expand Down
8 changes: 4 additions & 4 deletions include/pressio/ode/concepts/ode_has_const_discrete_residual_jacobian_method.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ template <
class ResidualType, class JacobianType>
struct has_const_discrete_residual_jacobian_method<
T, 1, StepType, IndVarType, state_t, ResidualType, JacobianType,
::pressio::mpl::enable_if_t<
std::enable_if_t<
std::is_void<
decltype
(
Expand Down Expand Up @@ -98,7 +98,7 @@ template <
class ResidualType, class JacobianType>
struct has_const_discrete_residual_jacobian_method<
T, 2, StepType, IndVarType, state_t, ResidualType, JacobianType,
::pressio::mpl::enable_if_t<
std::enable_if_t<
std::is_void<
decltype
(
Expand Down Expand Up @@ -126,7 +126,7 @@ template <
class ResidualType, class JacobianType>
struct has_const_discrete_residual_jacobian_method<
T, 3, StepType, IndVarType, state_t, ResidualType, JacobianType,
::pressio::mpl::enable_if_t<
std::enable_if_t<
std::is_void<
decltype
(
Expand Down Expand Up @@ -156,7 +156,7 @@ template <
class ResidualType, class JacobianType>
struct has_const_discrete_residual_jacobian_method<
T, 4, StepType, IndVarType, state_t, ResidualType, JacobianType,
::pressio::mpl::enable_if_t<
std::enable_if_t<
std::is_void<
decltype
(
Expand Down
Loading