Skip to content

Fix compilation with PGI by replacing verbatim _real_, _imag_ extensions #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martin-frbg merged 5 commits into from
Mar 14, 2017
Merged

Fix compilation with PGI by replacing verbatim _real_, _imag_ extensions #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea26b00
Fix CREAL,CIMAG macros for PGI
martin-frbg Mar 12, 2017
a6efabf
Replace gnu _real_ , _imag_ extensions in initializers
martin-frbg Mar 12, 2017
e44b028
Replace gnu _real_, _imag_ extensions in initializers
martin-frbg Mar 12, 2017
5813ed0
Update zdot.c
martin-frbg Mar 13, 2017
211d2ec
Update zdot.c
martin-frbg Mar 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,8 +556,13 @@ static void __inline blas_lock(volatile BLASULONG *address){
#endif

#if defined(C_PGI) || defined(C_SUN)
#define CREAL(X) (*((FLOAT *)&X + 0))
#define CIMAG(X) (*((FLOAT *)&X + 1))
#if defined(__STDC_IEC_559_COMPLEX__)
#define CREAL(X) creal(X)
#define CIMAG(X) cimag(X)
#else
#define CREAL(X) (*((FLOAT *)&X + 0))
#define CIMAG(X) (*((FLOAT *)&X + 1))
#endif
#else
#ifdef OPENBLAS_COMPLEX_STRUCT
#define CREAL(Z) ((Z).real)
Expand Down
7 changes: 4 additions & 3 deletions interface/zdot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,10 @@ OPENBLAS_COMPLEX_FLOAT CNAME(blasint n, FLOAT *x, blasint incx, FLOAT *y, blasin

if (n <= 0) {
#ifdef FORCE_USE_STACK
//*result = OPENBLAS_MAKE_COMPLEX_FLOAT(0.0, 0.0);
CREAL(*result) = 0.0;
CIMAG(*result) = 0.0;
OPENBLAS_COMPLEX_FLOAT zero=OPENBLAS_MAKE_COMPLEX_FLOAT(0.0, 0.0);
*result = zero;
// CREAL(*result) = 0.0;
// CIMAG(*result) = 0.0;
return;
#else
return zero;
Expand Down
13 changes: 7 additions & 6 deletions kernel/x86_64/cdot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ FLOAT _Complex CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG in

if ( n <= 0 )
{
__real__ result = 0.0 ;
__imag__ result = 0.0 ;
result = OPENBLAS_MAKE_COMPLEX_FLOAT (0.0, 0.0) ;
return(result);

}
Expand Down Expand Up @@ -161,11 +160,13 @@ FLOAT _Complex CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG in
}

#if !defined(CONJ)
__real__ result = dot[0] - dot[1];
__imag__ result = dot[4] + dot[5];
result = OPENBLAS_MAKE_COMPLEX_FLOAT (dot[0]-dot[1], dot[4]+dot[5]) ;
// CREAL(result) = dot[0] - dot[1];
// CIMAG(result) = dot[4] + dot[5];
#else
__real__ result = dot[0] + dot[1];
__imag__ result = dot[4] - dot[5];
result = OPENBLAS_MAKE_COMPLEX_FLOAT (dot[0]+dot[1], dot[4]-dot[5]) ;
// CREAL(result) = dot[0] + dot[1];
// CIMAG(result) = dot[4] - dot[5];

#endif

Expand Down
15 changes: 9 additions & 6 deletions kernel/x86_64/zdot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,9 @@ FLOAT _Complex CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG in

if ( n <= 0 )
{
__real__ result = 0.0 ;
__imag__ result = 0.0 ;
// CREAL(result) = 0.0 ;
// CIMAG(result) = 0.0 ;
result=OPENBLAS_MAKE_COMPLEX_FLOAT(0.0,0.0);
return(result);

}
Expand Down Expand Up @@ -150,11 +151,13 @@ FLOAT _Complex CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG in
}

#if !defined(CONJ)
__real__ result = dot[0] - dot[1];
__imag__ result = dot[2] + dot[3];
result=OPENBLAS_MAKE_COMPLEX_FLOAT(dot[0]-dot[1],dot[2]+dot[3]);
// CREAL(result) = dot[0] - dot[1];
// CIMAG(result) = dot[2] + dot[3];
#else
__real__ result = dot[0] + dot[1];
__imag__ result = dot[2] - dot[3];
result=OPENBLAS_MAKE_COMPLEX_FLOAT(dot[0]+dot[1],dot[2]-dot[3]);
// CREAL(result) = dot[0] + dot[1];
// CIMAG(result) = dot[2] - dot[3];

#endif

Expand Down