Permalink
Browse files

tape_stats is size_t array (not int array) in ADOLC 2.4.1

  • Loading branch information...
1 parent 8b8f284 commit c1a109a3dd9a5b5402887a62836fbe66cb8e5be7 @b45ch1 committed Apr 4, 2013
Showing with 7 additions and 7 deletions.
  1. +4 −4 adolc/colpack/src/py_colpack_adolc.cpp
  2. +2 −2 adolc/sparse/src/py_sparse_adolc.cpp
  3. +1 −1 adolc/src/py_adolc.cpp
@@ -1,7 +1,7 @@
#include "py_colpack_adolc.hpp"
bp::list wrapped_sparse_jac_no_repeat(short tape_tag, bpn::array &bpn_x, bpn::array &bpn_options){
- int tape_stats[STAT_SIZE];
+ size_t tape_stats[STAT_SIZE];
tapestats(tape_tag, tape_stats);
int N = tape_stats[NUM_INDEPENDENTS];
int M = tape_stats[NUM_DEPENDENTS];
@@ -37,7 +37,7 @@ bp::list wrapped_sparse_jac_no_repeat(short tape_tag, bpn::array &bpn_x, bpn::ar
}
bp::list wrapped_sparse_jac_repeat(short tape_tag, bpn::array &bpn_x, npy_intp nnz, bpn::array &bpn_rind, bpn::array &bpn_cind, bpn::array &bpn_values){
- int tape_stats[STAT_SIZE];
+ size_t tape_stats[STAT_SIZE];
tapestats(tape_tag, tape_stats);
int N = tape_stats[NUM_INDEPENDENTS];
int M = tape_stats[NUM_DEPENDENTS];
@@ -63,7 +63,7 @@ bp::list wrapped_sparse_jac_repeat(short tape_tag, bpn::array &bpn_x, npy_intp n
bp::list wrapped_sparse_hess_no_repeat(short tape_tag, bpn::array &bpn_x, bpn::array &bpn_options){
- int tape_stats[STAT_SIZE];
+ size_t tape_stats[STAT_SIZE];
tapestats(tape_tag, tape_stats);
int N = tape_stats[NUM_INDEPENDENTS];
@@ -97,7 +97,7 @@ bp::list wrapped_sparse_hess_no_repeat(short tape_tag, bpn::array &bpn_x, bpn::a
}
bp::list wrapped_sparse_hess_repeat(short tape_tag, bpn::array &bpn_x, npy_intp nnz, bpn::array &bpn_rind, bpn::array &bpn_cind, bpn::array &bpn_values){
- int tape_stats[STAT_SIZE];
+ size_t tape_stats[STAT_SIZE];
tapestats(tape_tag, tape_stats);
npy_intp N = tape_stats[NUM_INDEPENDENTS];
@@ -1,7 +1,7 @@
#include "py_sparse_adolc.hpp"
bp::list wrapped_jac_pat(short tape_tag, bpn::array &bpn_x,bpn::array &bpn_options){
- int tape_stats[STAT_SIZE];
+ size_t tape_stats[STAT_SIZE];
tapestats(tape_tag, tape_stats);
npy_intp N = tape_stats[NUM_INDEPENDENTS];
npy_intp M = tape_stats[NUM_DEPENDENTS];
@@ -98,7 +98,7 @@ bp::list wrapped_jac_pat(short tape_tag, bpn::array &bpn_x,bpn::array &bpn_optio
bp::list wrapped_hess_pat(short tape_tag, bpn::array &bpn_x,npy_intp option){
- int tape_stats[STAT_SIZE];
+ size_t tape_stats[STAT_SIZE];
tapestats(tape_tag, tape_stats);
npy_intp N = tape_stats[NUM_INDEPENDENTS];
npy_intp M = tape_stats[NUM_DEPENDENTS];
View
@@ -25,7 +25,7 @@ void print_array(double *vec, int length, string msg=""){
bp::dict wrapped_tapestats(short tape_tag){
- int tape_stats[STAT_SIZE];
+ size_t tape_stats[STAT_SIZE];
tapestats(tape_tag, tape_stats);
bp::dict retval;
retval["NUM_INDEPENDENTS"] = tape_stats[NUM_INDEPENDENTS];

0 comments on commit c1a109a

Please sign in to comment.