Skip to content
Snippets Groups Projects
Commit 4c457119 authored by Thomas Purcell's avatar Thomas Purcell
Browse files

Bug Fixes

parent d20ca50d
No related branches found
No related tags found
No related merge requests found
...@@ -107,7 +107,7 @@ void SISSOLogRegressor::l0_regularization(const int n_dim) ...@@ -107,7 +107,7 @@ void SISSOLogRegressor::l0_regularization(const int n_dim)
if(inds.back() >= 0) if(inds.back() >= 0)
{ {
#pragma omp parallel shared(min_inds, min_errors, n_interactions, n_get_models, n_dim) firstprivate(inds) #pragma omp parallel shared(min_inds, min_errors, n_interactions, n_get_models) firstprivate(inds)
{ {
std::shared_ptr<LossFunction> loss_copy; std::shared_ptr<LossFunction> loss_copy;
#pragma omp critical #pragma omp critical
......
...@@ -95,7 +95,7 @@ void SISSORegressor::l0_regularization(const int n_dim) ...@@ -95,7 +95,7 @@ void SISSORegressor::l0_regularization(const int n_dim)
if(inds.back() >= 0) if(inds.back() >= 0)
{ {
#pragma omp parallel shared(min_inds, min_errors, n_interactions, n_get_models, n_dim) firstprivate(inds, coefs) #pragma omp parallel shared(min_inds, min_errors, n_interactions, n_get_models) firstprivate(inds, coefs)
{ {
std::shared_ptr<LossFunction> loss_copy; std::shared_ptr<LossFunction> loss_copy;
#pragma omp critical #pragma omp critical
......
...@@ -49,7 +49,7 @@ extern "C" ...@@ -49,7 +49,7 @@ extern "C"
void dscal_(const int*, const double*, double*, const int*); void dscal_(const int*, const double*, double*, const int*);
void mkl_domatcopy_(const char*, const char*, const int *, const int *, const double* , const double* , const int *, double* , const int *); // void mkl_domatcopy_(const char*, const char*, const int *, const int *, const double* , const double* , const int *, double* , const int *);
void zaxpy_(const int*, const cplx*, const cplx*, const int*, const cplx*, const int*); void zaxpy_(const int*, const cplx*, const cplx*, const int*, const cplx*, const int*);
...@@ -69,9 +69,9 @@ extern "C" ...@@ -69,9 +69,9 @@ extern "C"
void zgemv_(const char*, const int*, const int*, const cplx*, const cplx*, const int*, const cplx*, const int*, const cplx*, cplx*, const int*); void zgemv_(const char*, const int*, const int*, const cplx*, const cplx*, const int*, const cplx*, const int*, const cplx*, cplx*, const int*);
void mkl_zomatcopy_(const char*, const char*, const int *, const int *, const cplx *, const cplx* , const int *, cplx* , const int *); // void mkl_zomatcopy_(const char*, const char*, const int *, const int *, const cplx *, const cplx* , const int *, cplx* , const int *);
void mkl_zomatadd (const char*, const char*, const char*, const int* m, const int* n, const cplx* alpha, const cplx* A, const int* lda, const cplx* beta, const cplx* B, const int* ldb, cplx* C, const int* ldc); // void mkl_zomatadd (const char*, const char*, const char*, const int* m, const int* n, const cplx* alpha, const cplx* A, const int* lda, const cplx* beta, const cplx* B, const int* ldb, cplx* C, const int* ldc);
void dgels_(const char* trans, const int* m, const int* n, const int* nrhs, const double* a, const int* lda, const double* b, const int* ldb, const double* work, const int* lwork, const int* info); void dgels_(const char* trans, const int* m, const int* n, const int* nrhs, const double* a, const int* lda, const double* b, const int* ldb, const double* work, const int* lwork, const int* info);
...@@ -285,7 +285,7 @@ namespace ...@@ -285,7 +285,7 @@ namespace
* @param[in] B Array * @param[in] B Array
* @param[in] nc Distance between the first elements in adjacent columns (in the case of the column-major order) or rows (in the case of the row-major order) in the destination matrix; measured in the number of elements. To determine the minimum value of ldb on output, consider the following guideline: If ordering = 'C' or 'c', then If trans = 'T' or 't' or 'C' or 'c', this parameter must be at least max(1,cols) If trans = 'N' or 'n' or 'R' or 'r', this parameter must be at least max(1,rows) If ordering = 'R' or 'r', then If trans = 'T' or 't' or 'C' or 'c', this parameter must be at least max(1,rows) If trans = 'N' or 'n' or 'R' or 'r', this parameter must be at least max(1,cols) * @param[in] nc Distance between the first elements in adjacent columns (in the case of the column-major order) or rows (in the case of the row-major order) in the destination matrix; measured in the number of elements. To determine the minimum value of ldb on output, consider the following guideline: If ordering = 'C' or 'c', then If trans = 'T' or 't' or 'C' or 'c', this parameter must be at least max(1,cols) If trans = 'N' or 'n' or 'R' or 'r', this parameter must be at least max(1,rows) If ordering = 'R' or 'r', then If trans = 'T' or 't' or 'C' or 'c', this parameter must be at least max(1,rows) If trans = 'N' or 'n' or 'R' or 'r', this parameter must be at least max(1,cols)
*/ */
void mkl_domatcopy_(const char* ordering, const char* trans, const int r, const int c, const double alpha, const double* A, const int nr, double* B, const int nc) {::mkl_domatcopy_(ordering,trans,&r,&c,&alpha,A,&nr,B,&nc);} // void mkl_domatcopy_(const char* ordering, const char* trans, const int r, const int c, const double alpha, const double* A, const int nr, double* B, const int nc) {::mkl_domatcopy_(ordering,trans,&r,&c,&alpha,A,&nr,B,&nc);}
/** /**
* @brief wrapper for ddot * @brief wrapper for ddot
...@@ -585,8 +585,8 @@ namespace ...@@ -585,8 +585,8 @@ namespace
* @param[in] B Array * @param[in] B Array
* @param[in] nc Distance between the first elements in adjacent columns (in the case of the column-major order) or rows (in the case of the row-major order) in the destination matrix; measured in the number of elements. To determine the minimum value of ldb on output, consider the following guideline: If ordering = 'C' or 'c', then If trans = 'T' or 't' or 'C' or 'c', this parameter must be at least max(1,cols) If trans = 'N' or 'n' or 'R' or 'r', this parameter must be at least max(1,rows) If ordering = 'R' or 'r', then If trans = 'T' or 't' or 'C' or 'c', this parameter must be at least max(1,rows) If trans = 'N' or 'n' or 'R' or 'r', this parameter must be at least max(1,cols) * @param[in] nc Distance between the first elements in adjacent columns (in the case of the column-major order) or rows (in the case of the row-major order) in the destination matrix; measured in the number of elements. To determine the minimum value of ldb on output, consider the following guideline: If ordering = 'C' or 'c', then If trans = 'T' or 't' or 'C' or 'c', this parameter must be at least max(1,cols) If trans = 'N' or 'n' or 'R' or 'r', this parameter must be at least max(1,rows) If ordering = 'R' or 'r', then If trans = 'T' or 't' or 'C' or 'c', this parameter must be at least max(1,rows) If trans = 'N' or 'n' or 'R' or 'r', this parameter must be at least max(1,cols)
*/ */
void mkl_zomatcopy_(const char* ordering, const char* trans, const int r, const int c, const cplx alpha, const cplx* A, const int nr, cplx* B, const int nc) // void mkl_zomatcopy_(const char* ordering, const char* trans, const int r, const int c, const cplx alpha, const cplx* A, const int nr, cplx* B, const int nc)
{::mkl_zomatcopy_(ordering,trans,&r,&c,&alpha,A,&nr,B,&nc);} // {::mkl_zomatcopy_(ordering,trans,&r,&c,&alpha,A,&nr,B,&nc);}
/** /**
* @brief mkl_zomatcopy_ wrapper * @brief mkl_zomatcopy_ wrapper
...@@ -605,8 +605,8 @@ namespace ...@@ -605,8 +605,8 @@ namespace
* @param[in] C Array * @param[in] C Array
* @param[in] ldc Distance between the first elements in adjacent columns (in the case of the column-major order) or rows (in the case of the row-major order) in the destination matrix C; measured in the number of elements. If ordering = 'C' or 'c', then ldc must be at least max(1, m), otherwise ldc must be at least max(1, n). * @param[in] ldc Distance between the first elements in adjacent columns (in the case of the column-major order) or rows (in the case of the row-major order) in the destination matrix C; measured in the number of elements. If ordering = 'C' or 'c', then ldc must be at least max(1, m), otherwise ldc must be at least max(1, n).
*/ */
void mkl_zomatadd_(char ordering, char transa, char transb, const int m, const int n, const cplx alpha, const cplx* A, const int lda, const cplx beta, const cplx* B, const int ldb, cplx* C, const int ldc) // void mkl_zomatadd_(char ordering, char transa, char transb, const int m, const int n, const cplx alpha, const cplx* A, const int lda, const cplx beta, const cplx* B, const int ldb, cplx* C, const int ldc)
{::mkl_zomatadd(&ordering, &transa, &transb,&m,&n,&alpha,A,&lda, &beta,B,&ldb, C, &ldc); } // {::mkl_zomatadd(&ordering, &transa, &transb,&m,&n,&alpha,A,&lda, &beta,B,&ldb, C, &ldc); }
/** /**
* @brief dgels_ wrapper * @brief dgels_ wrapper
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment