Skip to content

D
dlib
Commit 9e781781 authored by Jim61C's avatar Jim61C Committed by Davis E. King
Browse files
Options

remove enum in function signature to avoid cblas declaration conflicts (#571)

parent 09b4dc82
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
dlib/matrix/matrix_blas_bindings.h
View file @ 9e781781
This diff is collapsed.
dlib/matrix/matrix_trsm.h
View file @ 9e781781
...@@ -13,15 +13,15 @@ namespace dlib ...@@ -13,15 +13,15 @@ namespace dlib
#ifndef CBLAS_H #ifndef CBLAS_H
extern "C" extern "C"
{ {
void cblas_strsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, void cblas_strsm(const CBLAS_ORDER Order, const CBLAS_SIDE Side,
const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, const CBLAS_UPLO Uplo, const CBLAS_TRANSPOSE TransA,
const enum CBLAS_DIAG Diag, const int M, const int N, const CBLAS_DIAG Diag, const int M, const int N,
const float alpha, const float *A, const int lda, const float alpha, const float *A, const int lda,
float *B, const int ldb); float *B, const int ldb);
void cblas_dtrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, void cblas_dtrsm(const CBLAS_ORDER Order, const CBLAS_SIDE Side,
const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, const CBLAS_UPLO Uplo, const CBLAS_TRANSPOSE TransA,
const enum CBLAS_DIAG Diag, const int M, const int N, const CBLAS_DIAG Diag, const int M, const int N,
const double alpha, const double *A, const int lda, const double alpha, const double *A, const int lda,
double *B, const int ldb); double *B, const int ldb);
} }
...@@ -150,11 +150,11 @@ namespace dlib ...@@ -150,11 +150,11 @@ namespace dlib
template <typename T> template <typename T>
void local_trsm( void local_trsm(
const enum CBLAS_ORDER Order, const CBLAS_ORDER Order,
enum CBLAS_SIDE Side, CBLAS_SIDE Side,
enum CBLAS_UPLO Uplo, CBLAS_UPLO Uplo,
const enum CBLAS_TRANSPOSE TransA, const CBLAS_TRANSPOSE TransA,
const enum CBLAS_DIAG Diag, const CBLAS_DIAG Diag,
long m, long m,
long n, long n,
T alpha, T alpha,
...@@ -515,9 +515,9 @@ namespace dlib ...@@ -515,9 +515,9 @@ namespace dlib
// ------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------
inline void cblas_trsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, inline void cblas_trsm(const CBLAS_ORDER Order, const CBLAS_SIDE Side,
const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, const CBLAS_UPLO Uplo, const CBLAS_TRANSPOSE TransA,
const enum CBLAS_DIAG Diag, const int M, const int N, const CBLAS_DIAG Diag, const int M, const int N,
const float alpha, const float *A, const int lda, const float alpha, const float *A, const int lda,
float *B, const int ldb) float *B, const int ldb)
{ {
...@@ -531,9 +531,9 @@ namespace dlib ...@@ -531,9 +531,9 @@ namespace dlib
local_trsm(Order, Side, Uplo, TransA, Diag, M, N, alpha, A, lda, B, ldb); local_trsm(Order, Side, Uplo, TransA, Diag, M, N, alpha, A, lda, B, ldb);
} }
inline void cblas_trsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, inline void cblas_trsm(const CBLAS_ORDER Order, const CBLAS_SIDE Side,
const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, const CBLAS_UPLO Uplo, const CBLAS_TRANSPOSE TransA,
const enum CBLAS_DIAG Diag, const int M, const int N, const CBLAS_DIAG Diag, const int M, const int N,
const double alpha, const double *A, const int lda, const double alpha, const double *A, const int lda,
double *B, const int ldb) double *B, const int ldb)
{ {
...@@ -547,9 +547,9 @@ namespace dlib ...@@ -547,9 +547,9 @@ namespace dlib
local_trsm(Order, Side, Uplo, TransA, Diag, M, N, alpha, A, lda, B, ldb); local_trsm(Order, Side, Uplo, TransA, Diag, M, N, alpha, A, lda, B, ldb);
} }
inline void cblas_trsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side, inline void cblas_trsm(const CBLAS_ORDER Order, const CBLAS_SIDE Side,
const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA, const CBLAS_UPLO Uplo, const CBLAS_TRANSPOSE TransA,
const enum CBLAS_DIAG Diag, const int M, const int N, const CBLAS_DIAG Diag, const int M, const int N,
const long double alpha, const long double *A, const int lda, const long double alpha, const long double *A, const int lda,
long double *B, const int ldb) long double *B, const int ldb)
{ {
...@@ -565,10 +565,10 @@ namespace dlib ...@@ -565,10 +565,10 @@ namespace dlib
typename MM typename MM
> >
inline void triangular_solver ( inline void triangular_solver (
const enum CBLAS_SIDE Side, const CBLAS_SIDE Side,
const enum CBLAS_UPLO Uplo, const CBLAS_UPLO Uplo,
const enum CBLAS_TRANSPOSE TransA, const CBLAS_TRANSPOSE TransA,
const enum CBLAS_DIAG Diag, const CBLAS_DIAG Diag,
const matrix<T,NR1,NC1,MM,row_major_layout>& A, const matrix<T,NR1,NC1,MM,row_major_layout>& A,
const T alpha, const T alpha,
matrix<T,NR2,NC2,MM,row_major_layout>& B matrix<T,NR2,NC2,MM,row_major_layout>& B
...@@ -587,10 +587,10 @@ namespace dlib ...@@ -587,10 +587,10 @@ namespace dlib
typename MM typename MM
> >
inline void triangular_solver ( inline void triangular_solver (
const enum CBLAS_SIDE Side, const CBLAS_SIDE Side,
const enum CBLAS_UPLO Uplo, const CBLAS_UPLO Uplo,
const enum CBLAS_TRANSPOSE TransA, const CBLAS_TRANSPOSE TransA,
const enum CBLAS_DIAG Diag, const CBLAS_DIAG Diag,
const matrix<T,NR1,NC1,MM,column_major_layout>& A, const matrix<T,NR1,NC1,MM,column_major_layout>& A,
const T alpha, const T alpha,
matrix<T,NR2,NC2,MM,column_major_layout>& B matrix<T,NR2,NC2,MM,column_major_layout>& B
...@@ -609,10 +609,10 @@ namespace dlib ...@@ -609,10 +609,10 @@ namespace dlib
typename MM typename MM
> >
inline void triangular_solver ( inline void triangular_solver (
const enum CBLAS_SIDE Side, const CBLAS_SIDE Side,
const enum CBLAS_UPLO Uplo, const CBLAS_UPLO Uplo,
const enum CBLAS_TRANSPOSE TransA, const CBLAS_TRANSPOSE TransA,
const enum CBLAS_DIAG Diag, const CBLAS_DIAG Diag,
const matrix<T,NR1,NC1,MM,column_major_layout>& A, const matrix<T,NR1,NC1,MM,column_major_layout>& A,
matrix<T,NR2,NC2,MM,column_major_layout>& B, matrix<T,NR2,NC2,MM,column_major_layout>& B,
long rows_of_B long rows_of_B
...@@ -633,10 +633,10 @@ namespace dlib ...@@ -633,10 +633,10 @@ namespace dlib
typename layout typename layout
> >
inline void triangular_solver ( inline void triangular_solver (
const enum CBLAS_SIDE Side, const CBLAS_SIDE Side,
const enum CBLAS_UPLO Uplo, const CBLAS_UPLO Uplo,
const enum CBLAS_TRANSPOSE TransA, const CBLAS_TRANSPOSE TransA,
const enum CBLAS_DIAG Diag, const CBLAS_DIAG Diag,
const matrix<T,NR1,NC1,MM,layout>& A, const matrix<T,NR1,NC1,MM,layout>& A,
matrix<T,NR2,NC2,MM,layout>& B matrix<T,NR2,NC2,MM,layout>& B
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment