update to C-software, using a compiler define for column major

Author: jonathan-taylor

selectiveInference/src/Makevars

@@ -1,5 +1,5 @@
-PKG_CFLAGS= -I.
-PKG_CPPFLAGS= -I.
+PKG_CFLAGS= -I. -DCOLUMN_MAJOR_ORDER
+PKG_CPPFLAGS= -I. -DCOLUMN_MAJOR_ORDER
 PKG_LIBS=-L. 
 
 $(SHLIB): Rcpp Rcpp-matrixcomps.o Rcpp-debias.o RcppExports.o quadratic_program.o quadratic_program_wide.o

selectiveInference/src/Rcpp-debias.cpp

@@ -101,7 +101,6 @@ Rcpp::List solve_QP_wide(Rcpp::NumericMatrix X,
 			 int param_stop
 			 ) {
 
-  int column_major = 1; // R has matrices in column major order
   int ncase = X.nrow(); // number of cases
   int nfeature = X.ncol(); // number of features
 
@@ -140,7 +139,6 @@ Rcpp::List solve_QP_wide(Rcpp::NumericMatrix X,
 			(int *) nactive.begin(),
 			ncase,
 			nfeature,
-			column_major,
 			(double *) bound.begin(),
 			ridge_term,
 			(double *) theta.begin(),
@@ -164,7 +162,6 @@ Rcpp::List solve_QP_wide(Rcpp::NumericMatrix X,
 				 (int *) need_update.begin(),
 				 nfeature,
 				 ncase,
-				 column_major,
 				 (double *) bound.begin(),
 				 ridge_term,
 				 kkt_tol);
@@ -179,8 +176,7 @@ Rcpp::List solve_QP_wide(Rcpp::NumericMatrix X,
 		       (double *) linear_func.begin(),
 		       (int *) need_update.begin(),
 		       nfeature,
-		       ncase,
-		       column_major);
+		       ncase);
 
   return(Rcpp::List::create(Rcpp::Named("soln") = theta,
 			    Rcpp::Named("gradient") = gradient,