Skip to content

Commit

Permalink
[pre-commit.ci] pre-commit autoupdate (#309)
Browse files Browse the repository at this point in the history
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/pre-commit/mirrors-clang-format: v17.0.6 → v18.1.1](pre-commit/mirrors-clang-format@v17.0.6...v18.1.1)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
pre-commit-ci[bot] authored Mar 14, 2024
1 parent 308ce2a commit 64c17d4
Show file tree
Hide file tree
Showing 25 changed files with 278 additions and 264 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ci:
autoupdate_branch: 'devel'
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v17.0.6
rev: v18.1.1
hooks:
- id: clang-format
args: ['--style={BasedOnStyle: Mozilla, SortIncludes: false}']
Expand Down
121 changes: 66 additions & 55 deletions include/proxsuite/linalg/dense/core.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ static_assert(sizeof(f64) == 8, "f64 should be 64 bits");
LDLT_FN_IMPL3(fnmadd, Prefix, Suffix); /* (-a * b + c) */

#define LDLT_LOAD_STORE(Prefix, Suffix) \
VEG_INLINE static auto load_unaligned(ScalarType const* ptr) noexcept \
-> Pack \
VEG_INLINE static auto load_unaligned( \
ScalarType const* ptr) noexcept -> Pack \
{ \
return Pack{ simde_mm##Prefix##_loadu_##Suffix(ptr) }; \
} \
Expand Down Expand Up @@ -560,8 +560,9 @@ elem_addr(T* ptr,

template<typename Mat>
auto
matrix_elem_addr(Mat&& mat, isize row, isize col) noexcept
-> decltype(mat.data())
matrix_elem_addr(Mat&& mat,
isize row,
isize col) noexcept -> decltype(mat.data())
{
return util::elem_addr<!bool(
proxsuite::linalg::veg::uncvref_t<Mat>::IsRowMajor)>( //
Expand All @@ -574,34 +575,38 @@ matrix_elem_addr(Mat&& mat, isize row, isize col) noexcept

template<typename T>
auto
col(T&& mat, isize col_idx) noexcept -> typename _detail::RowColAccessImpl<
!bool(proxsuite::linalg::veg::uncvref_t<T>::IsRowMajor)>::template Col<T>
col(T&& mat, isize col_idx) noexcept ->
typename _detail::RowColAccessImpl<
!bool(proxsuite::linalg::veg::uncvref_t<T>::IsRowMajor)>::template Col<T>
{
return _detail::RowColAccessImpl<!bool(
proxsuite::linalg::veg::uncvref_t<T>::IsRowMajor)>::col(mat, col_idx);
}
template<typename T>
auto
row(T&& mat, isize row_idx) noexcept -> typename _detail::RowColAccessImpl<
!bool(proxsuite::linalg::veg::uncvref_t<T>::IsRowMajor)>::template Row<T>
row(T&& mat, isize row_idx) noexcept ->
typename _detail::RowColAccessImpl<
!bool(proxsuite::linalg::veg::uncvref_t<T>::IsRowMajor)>::template Row<T>
{
return _detail::RowColAccessImpl<!bool(
proxsuite::linalg::veg::uncvref_t<T>::IsRowMajor)>::row(mat, row_idx);
}

template<typename Mat>
auto
trans(Mat&& mat) noexcept -> Eigen::Map< //
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
Eigen::Matrix< //
typename proxsuite::linalg::veg::uncvref_t<Mat>::Scalar,
proxsuite::linalg::veg::uncvref_t<Mat>::ColsAtCompileTime,
proxsuite::linalg::veg::uncvref_t<Mat>::RowsAtCompileTime,
bool(proxsuite::linalg::veg::uncvref_t<Mat>::IsRowMajor)
? Eigen::ColMajor
: Eigen::RowMajor>>,
Eigen::Unaligned,
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
trans(Mat&& mat) noexcept
-> Eigen::Map< //
_detail::const_if<
_detail::ptr_is_const<decltype(mat.data())>::value,
Eigen::Matrix< //
typename proxsuite::linalg::veg::uncvref_t<Mat>::Scalar,
proxsuite::linalg::veg::uncvref_t<Mat>::ColsAtCompileTime,
proxsuite::linalg::veg::uncvref_t<Mat>::RowsAtCompileTime,
bool(proxsuite::linalg::veg::uncvref_t<Mat>::IsRowMajor)
? Eigen::ColMajor
: Eigen::RowMajor>>,
Eigen::Unaligned,
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
{
return {
mat.data(),
Expand All @@ -616,15 +621,16 @@ trans(Mat&& mat) noexcept -> Eigen::Map< //

template<typename Mat>
auto
diagonal(Mat&& mat) noexcept -> Eigen::Map< //
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
Eigen::Matrix< //
typename proxsuite::linalg::veg::uncvref_t<Mat>::Scalar,
Eigen::Dynamic,
1,
Eigen::ColMajor>>,
Eigen::Unaligned,
Eigen::InnerStride<Eigen::Dynamic>>
diagonal(Mat&& mat) noexcept
-> Eigen::Map< //
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
Eigen::Matrix< //
typename proxsuite::linalg::veg::uncvref_t<Mat>::Scalar,
Eigen::Dynamic,
1,
Eigen::ColMajor>>,
Eigen::Unaligned,
Eigen::InnerStride<Eigen::Dynamic>>
{
VEG_DEBUG_ASSERT( //
mat.rows() == mat.cols());
Expand Down Expand Up @@ -661,11 +667,12 @@ submatrix(Mat&& mat,

template<typename Mat>
auto
to_view(Mat&& mat) noexcept -> Eigen::Map<
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
_detail::OwnedAll<proxsuite::linalg::veg::uncvref_t<Mat>>>,
Eigen::Unaligned,
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
to_view(Mat&& mat) noexcept
-> Eigen::Map<_detail::const_if<
_detail::ptr_is_const<decltype(mat.data())>::value,
_detail::OwnedAll<proxsuite::linalg::veg::uncvref_t<Mat>>>,
Eigen::Unaligned,
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
{
return {
mat.data(),
Expand All @@ -680,11 +687,12 @@ to_view(Mat&& mat) noexcept -> Eigen::Map<

template<typename Mat>
auto
to_view_dyn_rows(Mat&& mat) noexcept -> Eigen::Map<
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
_detail::OwnedRows<proxsuite::linalg::veg::uncvref_t<Mat>>>,
Eigen::Unaligned,
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
to_view_dyn_rows(Mat&& mat) noexcept
-> Eigen::Map<_detail::const_if<
_detail::ptr_is_const<decltype(mat.data())>::value,
_detail::OwnedRows<proxsuite::linalg::veg::uncvref_t<Mat>>>,
Eigen::Unaligned,
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
{
return {
mat.data(),
Expand All @@ -699,11 +707,12 @@ to_view_dyn_rows(Mat&& mat) noexcept -> Eigen::Map<

template<typename Mat>
auto
to_view_dyn_cols(Mat&& mat) noexcept -> Eigen::Map<
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
_detail::OwnedCols<proxsuite::linalg::veg::uncvref_t<Mat>>>,
Eigen::Unaligned,
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
to_view_dyn_cols(Mat&& mat) noexcept
-> Eigen::Map<_detail::const_if<
_detail::ptr_is_const<decltype(mat.data())>::value,
_detail::OwnedCols<proxsuite::linalg::veg::uncvref_t<Mat>>>,
Eigen::Unaligned,
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
{
return {
mat.data(),
Expand Down Expand Up @@ -738,11 +747,12 @@ to_view_dyn(Mat&& mat) noexcept

template<typename Mat>
auto
subrows(Mat&& mat, isize row_start, isize nrows) noexcept -> Eigen::Map<
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
_detail::OwnedRows<proxsuite::linalg::veg::uncvref_t<Mat>>>,
Eigen::Unaligned,
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
subrows(Mat&& mat, isize row_start, isize nrows) noexcept
-> Eigen::Map<_detail::const_if<
_detail::ptr_is_const<decltype(mat.data())>::value,
_detail::OwnedRows<proxsuite::linalg::veg::uncvref_t<Mat>>>,
Eigen::Unaligned,
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
{
return {
util::elem_addr<!bool(proxsuite::linalg::veg::uncvref_t<Mat>::IsRowMajor)>(
Expand All @@ -758,11 +768,12 @@ subrows(Mat&& mat, isize row_start, isize nrows) noexcept -> Eigen::Map<

template<typename Mat>
auto
subcols(Mat&& mat, isize col_start, isize ncols) noexcept -> Eigen::Map<
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
_detail::OwnedCols<proxsuite::linalg::veg::uncvref_t<Mat>>>,
Eigen::Unaligned,
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
subcols(Mat&& mat, isize col_start, isize ncols) noexcept
-> Eigen::Map<_detail::const_if<
_detail::ptr_is_const<decltype(mat.data())>::value,
_detail::OwnedCols<proxsuite::linalg::veg::uncvref_t<Mat>>>,
Eigen::Unaligned,
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
{
return {
util::elem_addr<!bool(proxsuite::linalg::veg::uncvref_t<Mat>::IsRowMajor)>(
Expand Down Expand Up @@ -848,8 +859,8 @@ temp_mat_req(proxsuite::linalg::veg::Tag<T> /*tag*/,

template<typename T>
auto
temp_vec_req(proxsuite::linalg::veg::Tag<T> /*tag*/, isize rows) noexcept
-> proxsuite::linalg::veg::dynstack::StackReq
temp_vec_req(proxsuite::linalg::veg::Tag<T> /*tag*/,
isize rows) noexcept -> proxsuite::linalg::veg::dynstack::StackReq
{
return {
rows * isize{ sizeof(T) },
Expand Down
4 changes: 2 additions & 2 deletions include/proxsuite/linalg/dense/factorize.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,8 @@ factorize_recursive(Mat&& mat,

template<typename T>
auto
factorize_req(proxsuite::linalg::veg::Tag<T> tag, isize n) noexcept
-> proxsuite::linalg::veg::dynstack::StackReq
factorize_req(proxsuite::linalg::veg::Tag<T> tag,
isize n) noexcept -> proxsuite::linalg::veg::dynstack::StackReq
{
return proxsuite::linalg::dense::factorize_blocked_req(tag, n, 128) |
proxsuite::linalg::dense::factorize_recursive_req(tag, n);
Expand Down
24 changes: 12 additions & 12 deletions include/proxsuite/linalg/dense/ldlt.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -614,23 +614,23 @@ struct Ldlt
auto dim() const noexcept -> isize { return perm.len(); }

auto ld_col() const noexcept -> Eigen::Map< //
ColMat const,
Eigen::Unaligned,
Eigen::OuterStride<DYN>>
ColMat const,
Eigen::Unaligned,
Eigen::OuterStride<DYN>>
{
return { ld_storage.ptr(), dim(), dim(), stride };
}
auto ld_col_mut() noexcept -> Eigen::Map< //
ColMat,
Eigen::Unaligned,
Eigen::OuterStride<DYN>>
ColMat,
Eigen::Unaligned,
Eigen::OuterStride<DYN>>
{
return { ld_storage.ptr_mut(), dim(), dim(), stride };
}
auto ld_row() const noexcept -> Eigen::Map< //
RowMat const,
Eigen::Unaligned,
Eigen::OuterStride<DYN>>
RowMat const,
Eigen::Unaligned,
Eigen::OuterStride<DYN>>
{
return {
ld_storage.ptr(),
Expand All @@ -640,9 +640,9 @@ struct Ldlt
};
}
auto ld_row_mut() noexcept -> Eigen::Map< //
RowMat,
Eigen::Unaligned,
Eigen::OuterStride<DYN>>
RowMat,
Eigen::Unaligned,
Eigen::OuterStride<DYN>>
{
return {
ld_storage.ptr_mut(),
Expand Down
13 changes: 7 additions & 6 deletions include/proxsuite/linalg/sparse/factorize.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ dense_ltsolve(DenseVecMut<T> x, MatRef<T, I> l) noexcept(false)
*/
template<typename I>
auto
etree_req(proxsuite::linalg::veg::Tag<I> /*tag*/, isize n) noexcept
-> proxsuite::linalg::veg::dynstack::StackReq
etree_req(proxsuite::linalg::veg::Tag<I> /*tag*/,
isize n) noexcept -> proxsuite::linalg::veg::dynstack::StackReq
{
return { n * isize{ sizeof(I) }, alignof(I) };
}
Expand Down Expand Up @@ -456,8 +456,8 @@ postorder_depth_first_search( //
*/
template<typename I>
auto
postorder_req(proxsuite::linalg::veg::Tag<I> /*tag*/, isize n) noexcept
-> proxsuite::linalg::veg::dynstack::StackReq
postorder_req(proxsuite::linalg::veg::Tag<I> /*tag*/,
isize n) noexcept -> proxsuite::linalg::veg::dynstack::StackReq
{
return { (3 * n) * isize(sizeof(I)), alignof(I) };
}
Expand Down Expand Up @@ -716,8 +716,9 @@ column_counts(I* counts,

template<typename I>
auto
amd_req(proxsuite::linalg::veg::Tag<I> /*tag*/, isize /*n*/, isize nnz) noexcept
-> proxsuite::linalg::veg::dynstack::StackReq
amd_req(proxsuite::linalg::veg::Tag<I> /*tag*/,
isize /*n*/,
isize nnz) noexcept -> proxsuite::linalg::veg::dynstack::StackReq
{
return { nnz * isize{ sizeof(char) }, alignof(char) };
}
Expand Down
13 changes: 7 additions & 6 deletions include/proxsuite/linalg/veg/internal/dyn_index.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,12 @@ struct binary_traits<Dyn, Dyn>
using Div = Dyn;
using Mod = Dyn;

VEG_NODISCARD static constexpr auto div_fn(Dyn a, Dyn b) VEG_NOEXCEPT->Div
VEG_NODISCARD static constexpr auto div_fn(Dyn a, Dyn b) VEG_NOEXCEPT -> Div
{
return VEG_INTERNAL_ASSERT_PRECONDITION(isize(b) != isize(0)),
isize(a) / isize(b);
}
VEG_NODISCARD static constexpr auto mod_fn(Dyn a, Dyn b) VEG_NOEXCEPT->Mod
VEG_NODISCARD static constexpr auto mod_fn(Dyn a, Dyn b) VEG_NOEXCEPT -> Mod
{

return VEG_INTERNAL_ASSERT_PRECONDITION(isize(b) != isize(0)),
Expand All @@ -224,7 +224,7 @@ struct binary_traits<Fix<0>, Dyn> : binary_traits<Dyn, Dyn>
using Mul = Fix<0>;
VEG_NODISCARD
constexpr VEG_INLINE static auto mul_fn(Fix<0> /*a*/,
Dyn /*b*/) VEG_NOEXCEPT->Mul
Dyn /*b*/) VEG_NOEXCEPT -> Mul
{
return {};
}
Expand All @@ -234,7 +234,8 @@ template<isize N>
struct binary_traits<Dyn, Fix<N>> : binary_traits<Dyn, Dyn>
{
using Mul = typename binary_traits<Fix<N>, Dyn>::Mul;
VEG_INLINE static constexpr auto mul_fn(Dyn a, Fix<N> /*b*/) VEG_NOEXCEPT->Mul
VEG_INLINE static constexpr auto mul_fn(Dyn a,
Fix<N> /*b*/) VEG_NOEXCEPT -> Mul
{
return binary_traits<Fix<N>, Dyn>::mul_fn({}, a);
}
Expand All @@ -243,12 +244,12 @@ struct binary_traits<Dyn, Fix<N>> : binary_traits<Dyn, Dyn>
using Mod = meta::if_t<N == 0, void, Dyn>;

VEG_NODISCARD VEG_INLINE static constexpr auto div_fn(Dyn a, Fix<N> /*b*/)
VEG_NOEXCEPT->Div
VEG_NOEXCEPT -> Div
{
return Div(isize(a) / N);
}
VEG_NODISCARD VEG_INLINE static constexpr auto mod_fn(Dyn a, Fix<N> /*b*/)
VEG_NOEXCEPT->Mod
VEG_NOEXCEPT -> Mod
{
return Mod(isize(a) % N);
}
Expand Down
5 changes: 2 additions & 3 deletions include/proxsuite/linalg/veg/internal/external/hedley.ext.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1971,9 +1971,8 @@ HEDLEY_DIAGNOSTIC_POP
#if HEDLEY_HAS_WARNING("-Wgcc-compat")
#define HEDLEY_REQUIRE(expr) \
HEDLEY_DIAGNOSTIC_PUSH \
_Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
__attribute__((diagnose_if(!(expr), #expr, "error"))) \
HEDLEY_DIAGNOSTIC_POP
_Pragma("clang diagnostic ignored \"-Wgcc-compat\"") __attribute__(( \
diagnose_if(!(expr), #expr, "error"))) HEDLEY_DIAGNOSTIC_POP
#define HEDLEY_REQUIRE_MSG(expr, msg) \
HEDLEY_DIAGNOSTIC_PUSH \
_Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
Expand Down
Loading

0 comments on commit 64c17d4

Please sign in to comment.