Skip to content

Commit f1aa9f0

Browse files
EulalieCoevoetEulalieCoevoet
authored
[extlibs] fixes qpOASES libs conflict (#79)
* [extlibs] fixes qpOASES libs conflict * forgotten files
1 parent 24bb071 commit f1aa9f0

File tree

4 files changed

+45
-45
lines changed

4 files changed

+45
-45
lines changed

‎extlibs/qpOASES-3.2.0/include/qpOASES/Matrices.hpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,57 +45,57 @@
4545
#ifdef __USE_SINGLE_PRECISION__
4646

4747
/** Macro for calling level 3 BLAS operation in single precision. */
48-
#define GEMM sgemm_
48+
#define GEMM qpoases_sgemm_
4949
/** Macro for calling level 3 BLAS operation in single precision. */
50-
#define SYR ssyr_
50+
#define SYR qpoases_ssyr_
5151
/** Macro for calling level 3 BLAS operation in single precision. */
52-
#define SYR2 ssyr2_
52+
#define SYR2 qpoases_ssyr2_
5353
/** Macro for calling level 3 BLAS operation in single precision. */
54-
#define POTRF spotrf_
54+
#define POTRF qpoases_spotrf_
5555

5656
#else
5757

5858
/** Macro for calling level 3 BLAS operation in double precision. */
59-
#define GEMM dgemm_
59+
#define GEMM qpoases_dgemm_
6060
/** Macro for calling level 3 BLAS operation in double precision. */
61-
#define SYR dsyr_
61+
#define SYR qpoases_dsyr_
6262
/** Macro for calling level 3 BLAS operation in double precision. */
63-
#define SYR2 dsyr2_
63+
#define SYR2 qpoases_dsyr2_
6464
/** Macro for calling level 3 BLAS operation in double precision. */
65-
#define POTRF dpotrf_
65+
#define POTRF qpoases_dpotrf_
6666

6767
#endif /* __USE_SINGLE_PRECISION__ */
6868

6969

7070
extern "C"
7171
{
7272
/** Performs one of the matrix-matrix operation in double precision. */
73-
void dgemm_ ( const char*, const char*, const unsigned long*, const unsigned long*, const unsigned long*,
73+
void qpoases_dgemm_ ( const char*, const char*, const unsigned long*, const unsigned long*, const unsigned long*,
7474
const double*, const double*, const unsigned long*, const double*, const unsigned long*,
7575
const double*, double*, const unsigned long* );
7676
/** Performs one of the matrix-matrix operation in single precision. */
77-
void sgemm_ ( const char*, const char*, const unsigned long*, const unsigned long*, const unsigned long*,
77+
void qpoases_sgemm_ ( const char*, const char*, const unsigned long*, const unsigned long*, const unsigned long*,
7878
const float*, const float*, const unsigned long*, const float*, const unsigned long*,
7979
const float*, float*, const unsigned long* );
8080

8181
/** Performs a symmetric rank 1 operation in double precision. */
82-
void dsyr_ ( const char *, const unsigned long *, const double *, const double *,
82+
void qpoases_dsyr_ ( const char *, const unsigned long *, const double *, const double *,
8383
const unsigned long *, double *, const unsigned long *);
8484
/** Performs a symmetric rank 1 operation in single precision. */
85-
void ssyr_ ( const char *, const unsigned long *, const float *, const float *,
85+
void qpoases_ssyr_ ( const char *, const unsigned long *, const float *, const float *,
8686
const unsigned long *, float *, const unsigned long *);
8787

8888
/** Performs a symmetric rank 2 operation in double precision. */
89-
void dsyr2_ ( const char *, const unsigned long *, const double *, const double *,
89+
void qpoases_dsyr2_ ( const char *, const unsigned long *, const double *, const double *,
9090
const unsigned long *, const double *, const unsigned long *, double *, const unsigned long *);
9191
/** Performs a symmetric rank 2 operation in single precision. */
92-
void ssyr2_ ( const char *, const unsigned long *, const float *, const float *,
92+
void qpoases_ssyr2_ ( const char *, const unsigned long *, const float *, const float *,
9393
const unsigned long *, const float *, const unsigned long *, float *, const unsigned long *);
9494

9595
/** Calculates the Cholesky factorization of a real symmetric positive definite matrix in double precision. */
96-
void dpotrf_ ( const char *, const unsigned long *, double *, const unsigned long *, long * );
96+
void qpoases_dpotrf_ ( const char *, const unsigned long *, double *, const unsigned long *, long * );
9797
/** Calculates the Cholesky factorization of a real symmetric positive definite matrix in single precision. */
98-
void spotrf_ ( const char *, const unsigned long *, float *, const unsigned long *, long * );
98+
void qpoases_spotrf_ ( const char *, const unsigned long *, float *, const unsigned long *, long * );
9999
}
100100

101101

‎extlibs/qpOASES-3.2.0/include/qpOASES/SQProblemSchur.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
/** Macro for calling level 3 BLAS operation in single precision. */
5050
//#define ORMQR sormqr_
5151
/** Macro for calling level 3 BLAS operation in single precision. */
52-
#define TRTRS strtrs_
52+
#define TRTRS qpoases_strtrs_
5353
/** Macro for calling level 3 BLAS operation in single precision. */
54-
#define TRCON strcon_
54+
#define TRCON qpoases_strcon_
5555

5656
#else
5757

@@ -60,9 +60,9 @@
6060
/** Macro for calling level 3 BLAS operation in double precision. */
6161
//#define ORMQR dormqr_
6262
/** Macro for calling level 3 BLAS operation in double precision. */
63-
#define TRTRS dtrtrs_
63+
#define TRTRS qpoases_dtrtrs_
6464
/** Macro for calling level 3 BLAS operation in double precision. */
65-
#define TRCON dtrcon_
65+
#define TRCON qpoases_dtrcon_
6666

6767
#endif /* __USE_SINGLE_PRECISION__ */
6868

@@ -84,17 +84,17 @@ extern "C" {
8484
//float *WORK, const unsigned long *LWORK, int *INFO );
8585

8686
/** Solve a triangular system (double precision) */
87-
void dtrtrs_( const char *UPLO, const char *TRANS, const char *DIAG, const unsigned long *N, const unsigned long *NRHS,
87+
void qpoases_dtrtrs_( const char *UPLO, const char *TRANS, const char *DIAG, const unsigned long *N, const unsigned long *NRHS,
8888
double *A, const unsigned long *LDA, double *B, const unsigned long *LDB, long *INFO );
8989
/** Solve a triangular system (single precision) */
90-
void strtrs_( const char *UPLO, const char *TRANS, const char *DIAG, const unsigned long *N, const unsigned long *NRHS,
90+
void qpoases_strtrs_( const char *UPLO, const char *TRANS, const char *DIAG, const unsigned long *N, const unsigned long *NRHS,
9191
float *A, const unsigned long *LDA, float *B, const unsigned long *LDB, long *INFO );
9292

9393
/** Estimate the reciprocal of the condition number of a triangular matrix in double precision */
94-
void dtrcon_( const char *NORM, const char *UPLO, const char *DIAG, const unsigned long *N, double *A, const unsigned long *LDA,
94+
void qpoases_dtrcon_( const char *NORM, const char *UPLO, const char *DIAG, const unsigned long *N, double *A, const unsigned long *LDA,
9595
double *RCOND, double *WORK, const unsigned long *IWORK, long *INFO );
9696
/** Estimate the reciprocal of the condition number of a triangular matrix in single precision */
97-
void strcon_( const char *NORM, const char *UPLO, const char *DIAG, const unsigned long *N, float *A, const unsigned long *LDA,
97+
void qpoases_strcon_( const char *NORM, const char *UPLO, const char *DIAG, const unsigned long *N, float *A, const unsigned long *LDA,
9898
float *RCOND, float *WORK, const unsigned long *IWORK, long *INFO );
9999
}
100100

‎extlibs/qpOASES-3.2.0/src/BLASReplacement.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
#include <qpOASES/Utils.hpp>
3636

3737

38-
extern "C" void dgemm_( const char *TRANSA, const char *TRANSB,
39-
const unsigned long *M, const unsigned long *N, const unsigned long *K,
40-
const double *ALPHA, const double *A, const unsigned long *LDA, const double *B, const unsigned long *LDB,
41-
const double *BETA, double *C, const unsigned long *LDC
42-
)
38+
extern "C" void qpoases_dgemm_( const char *TRANSA, const char *TRANSB,
39+
const unsigned long *M, const unsigned long *N, const unsigned long *K,
40+
const double *ALPHA, const double *A, const unsigned long *LDA, const double *B, const unsigned long *LDB,
41+
const double *BETA, double *C, const unsigned long *LDC
42+
)
4343
{
4444
unsigned long i, j, k;
4545

@@ -90,11 +90,11 @@ extern "C" void dgemm_( const char *TRANSA, const char *TRANSB,
9090
C[j+(*LDC)*k] += *ALPHA * A[i+(*LDA)*j] * B[i+(*LDB)*k];
9191
}
9292

93-
extern "C" void sgemm_( const char *TRANSA, const char *TRANSB,
94-
const unsigned long *M, const unsigned long *N, const unsigned long *K,
95-
const float *ALPHA, const float *A, const unsigned long *LDA, const float *B, const unsigned long *LDB,
96-
const float *BETA, float *C, const unsigned long *LDC
97-
)
93+
extern "C" void qpoases_sgemm_( const char *TRANSA, const char *TRANSB,
94+
const unsigned long *M, const unsigned long *N, const unsigned long *K,
95+
const float *ALPHA, const float *A, const unsigned long *LDA, const float *B, const unsigned long *LDB,
96+
const float *BETA, float *C, const unsigned long *LDC
97+
)
9898
{
9999
unsigned long i, j, k;
100100

‎extlibs/qpOASES-3.2.0/src/LAPACKReplacement.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
#include <qpOASES/Utils.hpp>
3636

3737

38-
extern "C" void dpotrf_( const char *uplo, const unsigned long *_n, double *a,
39-
const unsigned long *_lda, long *info
40-
)
38+
extern "C" void qpoases_dpotrf_( const char *uplo, const unsigned long *_n, double *a,
39+
const unsigned long *_lda, long *info
40+
)
4141
{
4242
double sum;
4343
long i, j, k;
@@ -77,7 +77,7 @@ extern "C" void dpotrf_( const char *uplo, const unsigned long *_n, double *a,
7777
}
7878

7979

80-
extern "C" void spotrf_( const char *uplo, const unsigned long *_n, float *a,
80+
extern "C" void qpoases_spotrf_( const char *uplo, const unsigned long *_n, float *a,
8181
const unsigned long *_lda, long *info
8282
)
8383
{
@@ -118,31 +118,31 @@ extern "C" void spotrf_( const char *uplo, const unsigned long *_n, float *a,
118118
*info = 0;
119119
}
120120

121-
extern "C" void dtrtrs_( const char *UPLO, const char *TRANS, const char *DIAG,
122-
const unsigned long *N, const unsigned long *NRHS,
123-
double *A, const unsigned long *LDA, double *B, const unsigned long *LDB, long *INFO
124-
)
121+
extern "C" void qpoases_dtrtrs_( const char *UPLO, const char *TRANS, const char *DIAG,
122+
const unsigned long *N, const unsigned long *NRHS,
123+
double *A, const unsigned long *LDA, double *B, const unsigned long *LDB, long *INFO
124+
)
125125
{
126126
; /* Dummy. If SQProblemSchur is to be used, system LAPACK must be used */
127127
}
128128

129-
extern "C" void strtrs_( const char *UPLO, const char *TRANS, const char *DIAG,
129+
extern "C" void qpoases_strtrs_( const char *UPLO, const char *TRANS, const char *DIAG,
130130
const unsigned long *N, const unsigned long *NRHS,
131131
float *A, const unsigned long *LDA, float *B, const unsigned long *LDB, long *INFO
132132
)
133133
{
134134
; /* Dummy. If SQProblemSchur is to be used, system LAPACK must be used */
135135
}
136136

137-
extern "C" void dtrcon_( const char *NORM, const char *UPLO, const char *DIAG,
137+
extern "C" void qpoases_dtrcon_( const char *NORM, const char *UPLO, const char *DIAG,
138138
const unsigned long *N, double *A, const unsigned long *LDA,
139139
double *RCOND, double *WORK, const unsigned long *IWORK, long *INFO
140140
)
141141
{
142142
; /* Dummy. If SQProblemSchur is to be used, system LAPACK must be used */
143143
}
144144

145-
extern "C" void strcon_( const char *NORM, const char *UPLO, const char *DIAG,
145+
extern "C" void qpoases_strcon_( const char *NORM, const char *UPLO, const char *DIAG,
146146
const unsigned long *N, float *A, const unsigned long *LDA,
147147
float *RCOND, float *WORK, const unsigned long *IWORK, long *INFO
148148
)

0 commit comments

Comments
 (0)