Skip to content

Commit b94699e

Browse files
pre-commit-ci[bot]pre-commit-ci[bot]
committed
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent dfa09d0 commit b94699e

File tree

19 files changed

+170
-193
lines changed

19 files changed

+170
-193
lines changed

‎include/proxsuite/linalg/dense/core.hpp‎

Lines changed: 55 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ static_assert(sizeof(f64) == 8, "f64 should be 64 bits");
117117
LDLT_FN_IMPL3(fnmadd, Prefix, Suffix); /* (-a * b + c) */
118118

119119
#define LDLT_LOAD_STORE(Prefix, Suffix) \
120-
VEG_INLINE static auto load_unaligned( \
121-
ScalarType const* ptr) noexcept -> Pack \
120+
VEG_INLINE static auto load_unaligned(ScalarType const* ptr) noexcept \
121+
-> Pack \
122122
{ \
123123
return Pack{ simde_mm##Prefix##_loadu_##Suffix(ptr) }; \
124124
} \
@@ -560,9 +560,8 @@ elem_addr(T* ptr,
560560

561561
template<typename Mat>
562562
auto
563-
matrix_elem_addr(Mat&& mat,
564-
isize row,
565-
isize col) noexcept -> decltype(mat.data())
563+
matrix_elem_addr(Mat&& mat, isize row, isize col) noexcept
564+
-> decltype(mat.data())
566565
{
567566
return util::elem_addr<!bool(
568567
proxsuite::linalg::veg::uncvref_t<Mat>::IsRowMajor)>( //
@@ -575,38 +574,34 @@ matrix_elem_addr(Mat&& mat,
575574

576575
template<typename T>
577576
auto
578-
col(T&& mat, isize col_idx) noexcept ->
579-
typename _detail::RowColAccessImpl<
580-
!bool(proxsuite::linalg::veg::uncvref_t<T>::IsRowMajor)>::template Col<T>
577+
col(T&& mat, isize col_idx) noexcept -> typename _detail::RowColAccessImpl<
578+
!bool(proxsuite::linalg::veg::uncvref_t<T>::IsRowMajor)>::template Col<T>
581579
{
582580
return _detail::RowColAccessImpl<!bool(
583581
proxsuite::linalg::veg::uncvref_t<T>::IsRowMajor)>::col(mat, col_idx);
584582
}
585583
template<typename T>
586584
auto
587-
row(T&& mat, isize row_idx) noexcept ->
588-
typename _detail::RowColAccessImpl<
589-
!bool(proxsuite::linalg::veg::uncvref_t<T>::IsRowMajor)>::template Row<T>
585+
row(T&& mat, isize row_idx) noexcept -> typename _detail::RowColAccessImpl<
586+
!bool(proxsuite::linalg::veg::uncvref_t<T>::IsRowMajor)>::template Row<T>
590587
{
591588
return _detail::RowColAccessImpl<!bool(
592589
proxsuite::linalg::veg::uncvref_t<T>::IsRowMajor)>::row(mat, row_idx);
593590
}
594591

595592
template<typename Mat>
596593
auto
597-
trans(Mat&& mat) noexcept
598-
-> Eigen::Map< //
599-
_detail::const_if<
600-
_detail::ptr_is_const<decltype(mat.data())>::value,
601-
Eigen::Matrix< //
602-
typename proxsuite::linalg::veg::uncvref_t<Mat>::Scalar,
603-
proxsuite::linalg::veg::uncvref_t<Mat>::ColsAtCompileTime,
604-
proxsuite::linalg::veg::uncvref_t<Mat>::RowsAtCompileTime,
605-
bool(proxsuite::linalg::veg::uncvref_t<Mat>::IsRowMajor)
606-
? Eigen::ColMajor
607-
: Eigen::RowMajor>>,
608-
Eigen::Unaligned,
609-
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
594+
trans(Mat&& mat) noexcept -> Eigen::Map< //
595+
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
596+
Eigen::Matrix< //
597+
typename proxsuite::linalg::veg::uncvref_t<Mat>::Scalar,
598+
proxsuite::linalg::veg::uncvref_t<Mat>::ColsAtCompileTime,
599+
proxsuite::linalg::veg::uncvref_t<Mat>::RowsAtCompileTime,
600+
bool(proxsuite::linalg::veg::uncvref_t<Mat>::IsRowMajor)
601+
? Eigen::ColMajor
602+
: Eigen::RowMajor>>,
603+
Eigen::Unaligned,
604+
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
610605
{
611606
return {
612607
mat.data(),
@@ -621,16 +616,15 @@ trans(Mat&& mat) noexcept
621616

622617
template<typename Mat>
623618
auto
624-
diagonal(Mat&& mat) noexcept
625-
-> Eigen::Map< //
626-
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
627-
Eigen::Matrix< //
628-
typename proxsuite::linalg::veg::uncvref_t<Mat>::Scalar,
629-
Eigen::Dynamic,
630-
1,
631-
Eigen::ColMajor>>,
632-
Eigen::Unaligned,
633-
Eigen::InnerStride<Eigen::Dynamic>>
619+
diagonal(Mat&& mat) noexcept -> Eigen::Map< //
620+
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
621+
Eigen::Matrix< //
622+
typename proxsuite::linalg::veg::uncvref_t<Mat>::Scalar,
623+
Eigen::Dynamic,
624+
1,
625+
Eigen::ColMajor>>,
626+
Eigen::Unaligned,
627+
Eigen::InnerStride<Eigen::Dynamic>>
634628
{
635629
VEG_DEBUG_ASSERT( //
636630
mat.rows() == mat.cols());
@@ -667,12 +661,11 @@ submatrix(Mat&& mat,
667661

668662
template<typename Mat>
669663
auto
670-
to_view(Mat&& mat) noexcept
671-
-> Eigen::Map<_detail::const_if<
672-
_detail::ptr_is_const<decltype(mat.data())>::value,
673-
_detail::OwnedAll<proxsuite::linalg::veg::uncvref_t<Mat>>>,
674-
Eigen::Unaligned,
675-
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
664+
to_view(Mat&& mat) noexcept -> Eigen::Map<
665+
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
666+
_detail::OwnedAll<proxsuite::linalg::veg::uncvref_t<Mat>>>,
667+
Eigen::Unaligned,
668+
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
676669
{
677670
return {
678671
mat.data(),
@@ -687,12 +680,11 @@ to_view(Mat&& mat) noexcept
687680

688681
template<typename Mat>
689682
auto
690-
to_view_dyn_rows(Mat&& mat) noexcept
691-
-> Eigen::Map<_detail::const_if<
692-
_detail::ptr_is_const<decltype(mat.data())>::value,
693-
_detail::OwnedRows<proxsuite::linalg::veg::uncvref_t<Mat>>>,
694-
Eigen::Unaligned,
695-
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
683+
to_view_dyn_rows(Mat&& mat) noexcept -> Eigen::Map<
684+
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
685+
_detail::OwnedRows<proxsuite::linalg::veg::uncvref_t<Mat>>>,
686+
Eigen::Unaligned,
687+
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
696688
{
697689
return {
698690
mat.data(),
@@ -707,12 +699,11 @@ to_view_dyn_rows(Mat&& mat) noexcept
707699

708700
template<typename Mat>
709701
auto
710-
to_view_dyn_cols(Mat&& mat) noexcept
711-
-> Eigen::Map<_detail::const_if<
712-
_detail::ptr_is_const<decltype(mat.data())>::value,
713-
_detail::OwnedCols<proxsuite::linalg::veg::uncvref_t<Mat>>>,
714-
Eigen::Unaligned,
715-
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
702+
to_view_dyn_cols(Mat&& mat) noexcept -> Eigen::Map<
703+
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
704+
_detail::OwnedCols<proxsuite::linalg::veg::uncvref_t<Mat>>>,
705+
Eigen::Unaligned,
706+
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
716707
{
717708
return {
718709
mat.data(),
@@ -747,12 +738,11 @@ to_view_dyn(Mat&& mat) noexcept
747738

748739
template<typename Mat>
749740
auto
750-
subrows(Mat&& mat, isize row_start, isize nrows) noexcept
751-
-> Eigen::Map<_detail::const_if<
752-
_detail::ptr_is_const<decltype(mat.data())>::value,
753-
_detail::OwnedRows<proxsuite::linalg::veg::uncvref_t<Mat>>>,
754-
Eigen::Unaligned,
755-
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
741+
subrows(Mat&& mat, isize row_start, isize nrows) noexcept -> Eigen::Map<
742+
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
743+
_detail::OwnedRows<proxsuite::linalg::veg::uncvref_t<Mat>>>,
744+
Eigen::Unaligned,
745+
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
756746
{
757747
return {
758748
util::elem_addr<!bool(proxsuite::linalg::veg::uncvref_t<Mat>::IsRowMajor)>(
@@ -768,12 +758,11 @@ subrows(Mat&& mat, isize row_start, isize nrows) noexcept
768758

769759
template<typename Mat>
770760
auto
771-
subcols(Mat&& mat, isize col_start, isize ncols) noexcept
772-
-> Eigen::Map<_detail::const_if<
773-
_detail::ptr_is_const<decltype(mat.data())>::value,
774-
_detail::OwnedCols<proxsuite::linalg::veg::uncvref_t<Mat>>>,
775-
Eigen::Unaligned,
776-
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
761+
subcols(Mat&& mat, isize col_start, isize ncols) noexcept -> Eigen::Map<
762+
_detail::const_if<_detail::ptr_is_const<decltype(mat.data())>::value,
763+
_detail::OwnedCols<proxsuite::linalg::veg::uncvref_t<Mat>>>,
764+
Eigen::Unaligned,
765+
_detail::StrideOf<proxsuite::linalg::veg::uncvref_t<Mat>>>
777766
{
778767
return {
779768
util::elem_addr<!bool(proxsuite::linalg::veg::uncvref_t<Mat>::IsRowMajor)>(
@@ -859,8 +848,8 @@ temp_mat_req(proxsuite::linalg::veg::Tag<T> /*tag*/,
859848

860849
template<typename T>
861850
auto
862-
temp_vec_req(proxsuite::linalg::veg::Tag<T> /*tag*/,
863-
isize rows) noexcept -> proxsuite::linalg::veg::dynstack::StackReq
851+
temp_vec_req(proxsuite::linalg::veg::Tag<T> /*tag*/, isize rows) noexcept
852+
-> proxsuite::linalg::veg::dynstack::StackReq
864853
{
865854
return {
866855
rows * isize{ sizeof(T) },

‎include/proxsuite/linalg/dense/factorize.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ factorize_recursive(Mat&& mat,
350350

351351
template<typename T>
352352
auto
353-
factorize_req(proxsuite::linalg::veg::Tag<T> tag,
354-
isize n) noexcept -> proxsuite::linalg::veg::dynstack::StackReq
353+
factorize_req(proxsuite::linalg::veg::Tag<T> tag, isize n) noexcept
354+
-> proxsuite::linalg::veg::dynstack::StackReq
355355
{
356356
return proxsuite::linalg::dense::factorize_blocked_req(tag, n, 128) |
357357
proxsuite::linalg::dense::factorize_recursive_req(tag, n);

‎include/proxsuite/linalg/dense/ldlt.hpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -614,23 +614,23 @@ struct Ldlt
614614
auto dim() const noexcept -> isize { return perm.len(); }
615615

616616
auto ld_col() const noexcept -> Eigen::Map< //
617-
ColMat const,
618-
Eigen::Unaligned,
619-
Eigen::OuterStride<DYN>>
617+
ColMat const,
618+
Eigen::Unaligned,
619+
Eigen::OuterStride<DYN>>
620620
{
621621
return { ld_storage.ptr(), dim(), dim(), stride };
622622
}
623623
auto ld_col_mut() noexcept -> Eigen::Map< //
624-
ColMat,
625-
Eigen::Unaligned,
626-
Eigen::OuterStride<DYN>>
624+
ColMat,
625+
Eigen::Unaligned,
626+
Eigen::OuterStride<DYN>>
627627
{
628628
return { ld_storage.ptr_mut(), dim(), dim(), stride };
629629
}
630630
auto ld_row() const noexcept -> Eigen::Map< //
631-
RowMat const,
632-
Eigen::Unaligned,
633-
Eigen::OuterStride<DYN>>
631+
RowMat const,
632+
Eigen::Unaligned,
633+
Eigen::OuterStride<DYN>>
634634
{
635635
return {
636636
ld_storage.ptr(),
@@ -640,9 +640,9 @@ struct Ldlt
640640
};
641641
}
642642
auto ld_row_mut() noexcept -> Eigen::Map< //
643-
RowMat,
644-
Eigen::Unaligned,
645-
Eigen::OuterStride<DYN>>
643+
RowMat,
644+
Eigen::Unaligned,
645+
Eigen::OuterStride<DYN>>
646646
{
647647
return {
648648
ld_storage.ptr_mut(),

‎include/proxsuite/linalg/sparse/factorize.hpp‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ dense_ltsolve(DenseVecMut<T> x, MatRef<T, I> l) noexcept(false)
249249
*/
250250
template<typename I>
251251
auto
252-
etree_req(proxsuite::linalg::veg::Tag<I> /*tag*/,
253-
isize n) noexcept -> proxsuite::linalg::veg::dynstack::StackReq
252+
etree_req(proxsuite::linalg::veg::Tag<I> /*tag*/, isize n) noexcept
253+
-> proxsuite::linalg::veg::dynstack::StackReq
254254
{
255255
return { n * isize{ sizeof(I) }, alignof(I) };
256256
}
@@ -456,8 +456,8 @@ postorder_depth_first_search( //
456456
*/
457457
template<typename I>
458458
auto
459-
postorder_req(proxsuite::linalg::veg::Tag<I> /*tag*/,
460-
isize n) noexcept -> proxsuite::linalg::veg::dynstack::StackReq
459+
postorder_req(proxsuite::linalg::veg::Tag<I> /*tag*/, isize n) noexcept
460+
-> proxsuite::linalg::veg::dynstack::StackReq
461461
{
462462
return { (3 * n) * isize(sizeof(I)), alignof(I) };
463463
}
@@ -716,9 +716,8 @@ column_counts(I* counts,
716716

717717
template<typename I>
718718
auto
719-
amd_req(proxsuite::linalg::veg::Tag<I> /*tag*/,
720-
isize /*n*/,
721-
isize nnz) noexcept -> proxsuite::linalg::veg::dynstack::StackReq
719+
amd_req(proxsuite::linalg::veg::Tag<I> /*tag*/, isize /*n*/, isize nnz) noexcept
720+
-> proxsuite::linalg::veg::dynstack::StackReq
722721
{
723722
return { nnz * isize{ sizeof(char) }, alignof(char) };
724723
}

‎include/proxsuite/linalg/veg/internal/dyn_index.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ struct binary_traits<Fix<0>, Dyn> : binary_traits<Dyn, Dyn>
223223
{
224224
using Mul = Fix<0>;
225225
VEG_NODISCARD
226-
constexpr VEG_INLINE static auto mul_fn(Fix<0> /*a*/,
227-
Dyn /*b*/) VEG_NOEXCEPT -> Mul
226+
constexpr VEG_INLINE static auto mul_fn(Fix<0> /*a*/, Dyn /*b*/) VEG_NOEXCEPT
227+
-> Mul
228228
{
229229
return {};
230230
}
@@ -234,8 +234,8 @@ template<isize N>
234234
struct binary_traits<Dyn, Fix<N>> : binary_traits<Dyn, Dyn>
235235
{
236236
using Mul = typename binary_traits<Fix<N>, Dyn>::Mul;
237-
VEG_INLINE static constexpr auto mul_fn(Dyn a,
238-
Fix<N> /*b*/) VEG_NOEXCEPT -> Mul
237+
VEG_INLINE static constexpr auto mul_fn(Dyn a, Fix<N> /*b*/) VEG_NOEXCEPT
238+
-> Mul
239239
{
240240
return binary_traits<Fix<N>, Dyn>::mul_fn({}, a);
241241
}

‎include/proxsuite/linalg/veg/internal/external/hedley.ext.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1838,7 +1838,7 @@ HEDLEY_DIAGNOSTIC_POP
18381838
#else
18391839
#include <stdint.h>
18401840
#define HEDLEY_IS_CONSTEXPR_(expr) \
1841-
_Generic((1 ? (void*)((intptr_t) * 0) : (int*)0), int*: 1, void*: 0)
1841+
_Generic((1 ? (void*)((intptr_t)*0) : (int*)0), int*: 1, void*: 0)
18421842
#endif
18431843
#elif defined(HEDLEY_GCC_VERSION) || defined(HEDLEY_INTEL_VERSION) || \
18441844
defined(HEDLEY_TINYC_VERSION) || defined(HEDLEY_TI_ARMCL_VERSION) || \

‎include/proxsuite/linalg/veg/internal/macros.hpp‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -324,11 +324,11 @@
324324
Name, \
325325
(__VA_ARGS__), \
326326
::proxsuite::linalg::veg::meta::bool_constant<__VA_ARGS__>); \
327-
VEG_TEMPLATE( \
328-
Tpl, \
329-
requires(__VA_ARGS__), \
330-
constexpr auto check_##Name, \
331-
(_ = 0, int)) noexcept -> ::proxsuite::linalg::veg::meta::true_type
327+
VEG_TEMPLATE(Tpl, \
328+
requires(__VA_ARGS__), \
329+
constexpr auto check_##Name, \
330+
(_ = 0, int)) noexcept \
331+
-> ::proxsuite::linalg::veg::meta::true_type
332332

333333
#define __VEG_IMPL_SFINAE(_, Param) \
334334
, ::proxsuite::linalg::veg::meta:: \
@@ -1195,20 +1195,18 @@ struct ExtractCharsImplExpr<LiteralType, _meta::integer_sequence<usize, Is...>>
11951195

11961196
template<typename LiteralType>
11971197
auto
1198-
extract_chars(LiteralType /*unused*/) ->
1199-
typename ExtractCharsImpl<
1200-
LiteralType,
1201-
_meta::make_index_sequence<LiteralType::Size::value>>::Type
1198+
extract_chars(LiteralType /*unused*/) -> typename ExtractCharsImpl<
1199+
LiteralType,
1200+
_meta::make_index_sequence<LiteralType::Size::value>>::Type
12021201
{
12031202
return {};
12041203
}
12051204

12061205
template<typename LiteralType>
12071206
auto
1208-
extract_chars_expr(LiteralType /*unused*/) ->
1209-
typename ExtractCharsImplExpr<
1210-
LiteralType,
1211-
_meta::make_index_sequence<LiteralType::Size::value>>::Type
1207+
extract_chars_expr(LiteralType /*unused*/) -> typename ExtractCharsImplExpr<
1208+
LiteralType,
1209+
_meta::make_index_sequence<LiteralType::Size::value>>::Type
12121210
{
12131211
return {};
12141212
}

‎include/proxsuite/linalg/veg/memory/dynamic_stack.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ struct DynStackMut
279279
template<typename T>
280280
VEG_NODISCARD auto make_alloc(Tag<T> /*unused*/,
281281
isize len,
282-
isize align = alignof(T))
283-
VEG_NOEXCEPT -> DynStackAlloc<T>
282+
isize align = alignof(T)) VEG_NOEXCEPT
283+
-> DynStackAlloc<T>
284284
{
285285
assert_valid_len(len);
286286
DynStackAlloc<T> get{

0 commit comments

Comments
 (0)