Skip to content

csr_matrix_times_vector2 now uses csr_matrix_times_vector #514

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

csr_matrix_times_vector2 now uses csr_matrix_times_vector #514

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e3fb1f0
csr_matrix_times_vector2 now uses csr_matrix_times_vector
SteveBronder May 7, 2021
55981d9
Merge branch 'master' into pr/514
jgabry May 7, 2021
e0fb4fc
also include the old version for backwards compatability
SteveBronder May 8, 2021
674e9f7
Merge branch 'master' into pr/514
jgabry May 8, 2021
01ae484
Merge branch 'fix/csr-matrix-times-vector2-orig' of https://github.co…
jgabry May 8, 2021
6e3e23c
Merge branch 'master' into pr/514
jgabry May 9, 2021
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
22 changes: 8 additions & 14 deletions inst/include/csr_matrix_times_vector2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,14 @@
/*
* This works exactly like csr_matrix_times_vector but faster and less safe
*/
template <typename T2__, typename T5__>
inline
Eigen::Matrix<typename boost::math::tools::promote_args<T2__, T5__>::type,
Eigen::Dynamic, 1>
csr_matrix_times_vector2(const int& m,
const int& n,
const Eigen::Matrix<T2__, Eigen::Dynamic, 1>& w,
const std::vector<int>& v,
const std::vector<int>& u,
const Eigen::Matrix<T5__, Eigen::Dynamic, 1>& b,
std::ostream* pstream__) {
Eigen::Map<const Eigen::SparseMatrix<T2__,Eigen::RowMajor> >
sm(m, n, w.size(), &u[0], &v[0], &w[0]);
return sm * b;
template <typename T2__, typename T5__>
Eigen::Matrix<stan::promote_args_t<stan::value_type_t<T2__>,
stan::value_type_t<T5__>>, -1, 1>
csr_matrix_times_vector2(const int& m, const int& n, const T2__& w_arg__,
const std::vector<int>& v,
const std::vector<int>& u, const T5__& b_arg__,
std::ostream* pstream__) {
return stan::math::csr_matrix_times_vector(m, n, w_arg__, v, u, b_arg__);
Comment on lines +23 to +30

This comment was marked as resolved.

Sign in to view

Copy link
Member

@hsbadr hsbadr May 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, this is related to a specific version of stanc3 > v2.26.1, after stan-dev/stanc3#865.

Copy link
Author

@SteveBronder SteveBronder May 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I did exactly this but idt we need the macro branch? I think the compiler should be able to figure out which version to use

Copy link
Member

@hsbadr hsbadr May 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is resolved now:

* checking whether package ‘rstanarm’ can be installed ... OK

I'll re-check with the development version of rstan, after it's merged.

}

/* This specialization is slower than the above templated version
Expand Down