Skip to content

fix for the issue #171 #172

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

Merged
merged 1 commit into from
Oct 27, 2020
Merged

fix for the issue #171 #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions include/xtensor-blas/xblas_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
#include "xtensor/xutils.hpp"

#ifndef DEFAULT_LEADING_STRIDE_BEHAVIOR
#define DEFAULT_LEADING_STRIDE_BEHAVIOR throw std::runtime_error("No valid layout chosen.");
#define DEFAULT_LEADING_STRIDE_BEHAVIOR XTENSOR_THROW(std::runtime_error, "No valid layout chosen.");
#endif

#ifndef DEFAULT_STORAGE_ORDER_BEHAVIOR
#define DEFAULT_STORAGE_ORDER_BEHAVIOR throw std::runtime_error("Cannot handle layout_type of e.");
#define DEFAULT_STORAGE_ORDER_BEHAVIOR XTENSOR_THROW(std::runtime_error, "Cannot handle layout_type of e.");
#endif

namespace xt
Expand Down Expand Up @@ -203,7 +203,7 @@ namespace xt
auto& dt = t.derived_cast();
if (dt.shape()[dt.dimension() - 1] != dt.shape()[dt.dimension() - 2])
{
throw std::runtime_error("Last 2 dimensions of the array must be square.");
XTENSOR_THROW(std::runtime_error, "Last 2 dimensions of the array must be square.");
}
}
}
Expand Down
26 changes: 13 additions & 13 deletions include/xtensor-blas/xlapack.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ namespace lapack

if (info != 0)
{
throw std::runtime_error("Could not find workspace size for orgqr.");
XTENSOR_THROW(std::runtime_error, "Could not find workspace size for orgqr.");
}

work.resize(static_cast<std::size_t>(work[0]));
Expand Down Expand Up @@ -152,7 +152,7 @@ namespace lapack

if (info != 0)
{
throw std::runtime_error("Could not find workspace size for ungqr.");
XTENSOR_THROW(std::runtime_error, "Could not find workspace size for ungqr.");
}

work.resize(static_cast<std::size_t>(std::real(work[0])));
Expand Down Expand Up @@ -195,7 +195,7 @@ namespace lapack

if (info != 0)
{
throw std::runtime_error("Could not find workspace size for geqrf.");
XTENSOR_THROW(std::runtime_error, "Could not find workspace size for geqrf.");
}

work.resize(static_cast<std::size_t>(std::real(work[0])));
Expand Down Expand Up @@ -299,7 +299,7 @@ namespace lapack

if (info != 0)
{
throw std::runtime_error("Could not find workspace size for real gesdd.");
XTENSOR_THROW(std::runtime_error, "Could not find workspace size for real gesdd.");
}

work.resize(static_cast<std::size_t>(work[0]));
Expand Down Expand Up @@ -386,7 +386,7 @@ namespace lapack

if (info != 0)
{
throw std::runtime_error("Could not find workspace size for complex gesdd.");
XTENSOR_THROW(std::runtime_error, "Could not find workspace size for complex gesdd.");
}
work.resize(static_cast<std::size_t>(std::real(work[0])));

Expand Down Expand Up @@ -503,7 +503,7 @@ namespace lapack

if (info > 0)
{
throw std::runtime_error("Could not find workspace size for getri.");
XTENSOR_THROW(std::runtime_error, "Could not find workspace size for getri.");
}

work.resize(static_cast<std::size_t>(std::real(work[0])));
Expand Down Expand Up @@ -553,7 +553,7 @@ namespace lapack

if (info != 0)
{
throw std::runtime_error("Could not find workspace size for geev.");
XTENSOR_THROW(std::runtime_error, "Could not find workspace size for geev.");
}

work.resize(static_cast<std::size_t>(work[0]));
Expand Down Expand Up @@ -608,7 +608,7 @@ namespace lapack

if (info != 0)
{
throw std::runtime_error("Could not find workspace size for syevd.");
XTENSOR_THROW(std::runtime_error, "Could not find workspace size for syevd.");
}

work.resize(std::size_t(work[0]));
Expand Down Expand Up @@ -668,7 +668,7 @@ namespace lapack

if (info != 0)
{
throw std::runtime_error("Could not find workspace size for sygvd.");
XTENSOR_THROW(std::runtime_error, "Could not find workspace size for sygvd.");
}

work.resize(std::size_t(work[0]));
Expand Down Expand Up @@ -729,7 +729,7 @@ namespace lapack

if (info != 0)
{
throw std::runtime_error("Could not find workspace size for geev.");
XTENSOR_THROW(std::runtime_error, "Could not find workspace size for geev.");
}

work.resize(std::size_t(std::real(work[0])));
Expand Down Expand Up @@ -784,7 +784,7 @@ namespace lapack

if (info != 0)
{
throw std::runtime_error("Could not find workspace size for heevd.");
XTENSOR_THROW(std::runtime_error, "Could not find workspace size for heevd.");
}

work.resize(std::size_t(std::real(work[0])));
Expand Down Expand Up @@ -843,7 +843,7 @@ namespace lapack

if (info != 0)
{
throw std::runtime_error("Could not find workspace size for gelsd.");
XTENSOR_THROW(std::runtime_error, "Could not find workspace size for gelsd.");
}

work.resize(std::size_t(work[0]));
Expand Down Expand Up @@ -900,7 +900,7 @@ namespace lapack

if (info != 0)
{
throw std::runtime_error("Could not find workspace size for gelsd.");
XTENSOR_THROW(std::runtime_error, "Could not find workspace size for gelsd.");
}

work.resize(std::size_t(std::real(work[0])));
Expand Down
Loading