Skip to content

Fixing 64-bit issue #16

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
Jun 26, 2019
Merged

Fixing 64-bit issue #16

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
30 changes: 15 additions & 15 deletions src/krbalancing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
// rescaled = false;
// }

kr_balancing::kr_balancing(const size_t &input_rows, const size_t &input_cols,
const size_t &input_nnz,
const Eigen::Ref<VectorXsize_t> input_indptr,
const Eigen::Ref<VectorXsize_t> input_indices,
kr_balancing::kr_balancing(const int64_t &input_rows, const int64_t &input_cols,
const int64_t &input_nnz,
const Eigen::Ref<VectorXint64> input_indptr,
const Eigen::Ref<VectorXint64> input_indices,
const Eigen::Ref<Eigen::VectorXd> input_values)
{

Expand All @@ -26,17 +26,17 @@ kr_balancing::kr_balancing(const size_t &input_rows, const size_t &input_cols,
std::vector<T> triplets;
triplets.reserve(input_nnz);

size_t i = 0;
size_t j_start = 0;
size_t j_end = 0;
int64_t i = 0;
int64_t j_start = 0;
int64_t j_end = 0;
while (i < input_indptr.size() - 1)
{
j_start = input_indptr(i);
j_end = input_indptr(i + 1);

while (j_start < j_end)
{
triplets.push_back(T(i, size_t(input_indices(j_start)),
triplets.push_back(T(i, int64_t(input_indices(j_start)),
float(input_values(j_start))));
j_start++;
}
Expand Down Expand Up @@ -75,15 +75,15 @@ void kr_balancing::computeKR()

void kr_balancing::outer_loop()
{
size_t outer_loop_count = 0;
int64_t outer_loop_count = 0;
double stop_tol = tol * 0.5;
double eta = etamax;
double rt = tol * tol;
double rout = rho_km1.coeff(0, 0);
double rold = rout;
if (fl == 1)
std::cout << "intermediate convergence statistics is off" << std::endl;
size_t nochange = 0;
int64_t nochange = 0;
while (rout > rt)
{ //outer itteration
outer_loop_count++;
Expand Down Expand Up @@ -168,7 +168,7 @@ void kr_balancing::inner_loop()
if (delta == 0)
break;
Eigen::Matrix<bool, Eigen::Dynamic, Eigen::Dynamic> ind_helper = (ap.array() < 0);
VectorXsize_t ind = VectorXsize_t::LinSpaced(ind_helper.size(), 0, ind_helper.size() - 1);
VectorXint64 ind = VectorXint64::LinSpaced(ind_helper.size(), 0, ind_helper.size() - 1);
ind.conservativeResize(std::stable_partition(
ind.data(), ind.data() + ind.size(), [&ind_helper](int i) { return ind_helper(i); }) -
ind.data());
Expand All @@ -185,7 +185,7 @@ void kr_balancing::inner_loop()
if (ynew.maxCoeff() >= Delta)
{
Eigen::Matrix<bool, Eigen::Dynamic, Eigen::Dynamic> ind_helper = (ynew.array() > Delta);
VectorXsize_t ind = VectorXsize_t::LinSpaced(ind_helper.size(), 0, ind_helper.size() - 1);
VectorXint64 ind = VectorXint64::LinSpaced(ind_helper.size(), 0, ind_helper.size() - 1);
ind.conservativeResize(std::stable_partition(
ind.data(), ind.data() + ind.size(), [&ind_helper](size_t i) { return ind_helper(i); }) -
ind.data());
Expand Down Expand Up @@ -284,9 +284,9 @@ const SparseMatrixCol *kr_balancing::get_normalisation_vector(bool &rescale)
PYBIND11_MODULE(krbalancing, m)
{
py::class_<kr_balancing>(m, "kr_balancing")
.def(py::init<const size_t &, const size_t &, const size_t &,
const Eigen::Ref<VectorXsize_t>,
const Eigen::Ref<VectorXsize_t>,
.def(py::init<const int64_t &, const int64_t &, const int64_t &,
const Eigen::Ref<VectorXint64>,
const Eigen::Ref<VectorXint64>,
const Eigen::Ref<Eigen::VectorXd>>())
.def("computeKR", &kr_balancing::computeKR)
.def("get_normalisation_vector", &kr_balancing::get_normalisation_vector,
Expand Down
22 changes: 11 additions & 11 deletions src/krbalancing.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@
#include <limits>
namespace py = pybind11;

typedef Eigen::Matrix<size_t, Eigen::Dynamic, 1> VectorXsize_t;
typedef Eigen::Matrix<int64_t, Eigen::Dynamic, 1> VectorXint64;

using SparseMatrixCol = Eigen::SparseMatrix<double, Eigen::ColMajor>;
using SparseMatrixCol = Eigen::SparseMatrix<double, Eigen::ColMajor, int64_t>;
size_t num_threads = 10; //TODO add it as an argument to be set by user

class kr_balancing
{
public:
kr_balancing(const size_t &input_rows, const size_t &input_cols,
const size_t &input_nnz,
const Eigen::Ref<VectorXsize_t> input_outer,
const Eigen::Ref<VectorXsize_t> input_inner,
kr_balancing(const int64_t &input_rows, const int64_t &input_cols,
const int64_t &input_nnz,
const Eigen::Ref<VectorXint64> input_outer,
const Eigen::Ref<VectorXint64> input_inner,
const Eigen::Ref<Eigen::VectorXd> input_values);
~kr_balancing() {}
void computeKR();
Expand All @@ -47,8 +47,8 @@ class kr_balancing

private:
std::vector<double> res;
unsigned int fl = 0; //0 = on , 1 = off
unsigned int Delta = 3;
int fl = 0; //0 = on , 1 = off
int Delta = 3;
double delta = 0.1;
double tol = 1e-6;
double g = 0.9;
Expand All @@ -57,13 +57,13 @@ class kr_balancing
SparseMatrixCol A;
SparseMatrixCol rho_km1;
SparseMatrixCol rho_km2;
unsigned int k;
int k;
Eigen::VectorXd y;
SparseMatrixCol p;
SparseMatrixCol Z;
double innertol;
unsigned int i = 0; //Outer itteration count
unsigned int MVP = 0;
int i = 0; //Outer itteration count
int MVP = 0;
SparseMatrixCol v;
SparseMatrixCol x;
Eigen::SparseVector<double> rk;
Expand Down