Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 768d1c7c authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Merge branch 'bugfix' into 'master' 

Set of minor bugfix

See merge request !234
parents 8be1d531 c368f542
No related branches found
No related tags found
1 merge request!234Set of minor bugfix
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 40 deletions
compute/pzlatms.c
+ 14
− 20
View file @ 768d1c7c
......@@ -134,6 +134,9 @@ void chameleon_pzlatms( cham_dist_t idist, unsigned long long int seed, cham_sym
return;
}
/* Shift the seed for future use to generate the random unitary matrices */
seed = CORE_rnd64_jump( 2 * minmn, seed );
/* Scale by dmax */
if ( ( mode != 0 ) && ( abs(mode) != 6 ) )
{
......@@ -177,13 +180,11 @@ void chameleon_pzlatms( cham_dist_t idist, unsigned long long int seed, cham_sym
/* U is of size A->m by min(A->m, A->n) */
chameleon_zdesc_copy_and_restrict( A, &descU, A->m, minmn );
/* Shift the seed to generate the random unitary matrix */
#if !defined(CHAMELEON_SIMULATION)
seed = CORE_rnd64_jump( 2 * minmn, seed );
#endif
chameleon_pzplrnt( &descU, seed, sequence, request );
/* Shift the seed to generate the next random unitary matrix */
#if !defined(CHAMELEON_SIMULATION)
seed = CORE_rnd64_jump( 2 * minmn * A->n, seed );
seed = CORE_rnd64_jump( 2 * minmn * A->m, seed );
#endif
/* Apply a QR factorization */
......@@ -207,13 +208,13 @@ void chameleon_pzlatms( cham_dist_t idist, unsigned long long int seed, cham_sym
chameleon_desc_init( &descTS, CHAMELEON_MAT_ALLOC_TILE,
ChamComplexDouble, ib, descU.nb, ib * descU.nb,
ib * descU.lmt, descU.nb * descU.lnt, 0, 0,
ib * descU.lmt, descU.nb * descU.lnt, descU.p, descU.q,
ib * descU.mt, descU.nb * descU.nt, 0, 0,
ib * descU.mt, descU.nb * descU.nt, descU.p, descU.q,
NULL, NULL, NULL );
chameleon_desc_init( &descTT, CHAMELEON_MAT_ALLOC_TILE,
ChamComplexDouble, ib, descU.nb, ib * descU.nb,
ib * descU.lmt, descU.nb * descU.lnt, 0, 0,
ib * descU.lmt, descU.nb * descU.lnt, descU.p, descU.q,
ib * descU.mt, descU.nb * descU.nt, 0, 0,
ib * descU.mt, descU.nb * descU.nt, descU.p, descU.q,
NULL, NULL, NULL );
/* U <= qr(U) */
......@@ -255,14 +256,7 @@ void chameleon_pzlatms( cham_dist_t idist, unsigned long long int seed, cham_sym
/* V is of size min(A->m, A->n) by A->n */
chameleon_zdesc_copy_and_restrict( A, &descV, minmn, A->n );
/* Shift the seed to generate the random unitary matrix */
#if !defined(CHAMELEON_SIMULATION)
seed = CORE_rnd64_jump( 2 * minmn, seed );
#endif
chameleon_pzplrnt( &descV, seed, sequence, request );
#if !defined(CHAMELEON_SIMULATION)
seed = CORE_rnd64_jump( 2 * minmn * A->n, seed );
#endif
/* Apply a QR factorization */
mat.mt = descV.mt;
......@@ -285,13 +279,13 @@ void chameleon_pzlatms( cham_dist_t idist, unsigned long long int seed, cham_sym
chameleon_desc_init( &descTS, CHAMELEON_MAT_ALLOC_TILE,
ChamComplexDouble, ib, descV.nb, ib * descV.nb,
ib * descV.lmt, descV.nb * descV.lnt, 0, 0,
ib * descV.lmt, descV.nb * descV.lnt, descV.p, descV.q,
ib * descV.mt, descV.nb * descV.nt, 0, 0,
ib * descV.mt, descV.nb * descV.nt, descV.p, descV.q,
NULL, NULL, NULL );
chameleon_desc_init( &descTT, CHAMELEON_MAT_ALLOC_TILE,
ChamComplexDouble, ib, descV.nb, ib * descV.nb,
ib * descV.lmt, descV.nb * descV.lnt, 0, 0,
ib * descV.lmt, descV.nb * descV.lnt, descV.p, descV.q,
ib * descV.mt, descV.nb * descV.nt, 0, 0,
ib * descV.mt, descV.nb * descV.nt, descV.p, descV.q,
NULL, NULL, NULL );
/* V <= qr(V) */
......
compute/zsymm.c
+ 1
− 1
View file @ 768d1c7c
......@@ -36,7 +36,7 @@
*
* \f[ C = \alpha \times B \times A + \beta \times C \f]
*
* where alpha and beta are scalars, A is an symmetric matrix and B and
* where alpha and beta are scalars, A is a symmetric matrix and B and
* C are m by n matrices.
*
*******************************************************************************
......
control/compute_z.h
+ 1
− 1
View file @ 768d1c7c
......@@ -166,7 +166,7 @@ chameleon_zdesc_alloc_diag( CHAM_desc_t *descA, int nb, int m, int n, int p, int
* @return CHAMELEON_SUCCESS on success, the associated error on failure.
*/
static inline int
chameleon_zdesc_copy_and_restrict( CHAM_desc_t *descIn,
chameleon_zdesc_copy_and_restrict( const CHAM_desc_t *descIn,
CHAM_desc_t *descOut,
int m, int n )
{
......
control/descriptor.c
+ 2
− 2
View file @ 768d1c7c
......@@ -759,7 +759,7 @@ int CHAMELEON_Desc_Create_OOC(CHAM_desc_t **descptr, cham_flttype_t dtyp, int mb
* @retval The new matrix descriptor.
*
*/
CHAM_desc_t *CHAMELEON_Desc_Copy( CHAM_desc_t *descin, void *mat )
CHAM_desc_t *CHAMELEON_Desc_Copy( const CHAM_desc_t *descin, void *mat )
{
CHAM_desc_t *descout = NULL;
CHAMELEON_Desc_Create_User( &descout, mat,
......@@ -794,7 +794,7 @@ CHAM_desc_t *CHAMELEON_Desc_Copy( CHAM_desc_t *descin, void *mat )
* @retval The new matrix descriptor.
*
*/
CHAM_desc_t *CHAMELEON_Desc_CopyOnZero( CHAM_desc_t *descin, void *mat )
CHAM_desc_t *CHAMELEON_Desc_CopyOnZero( const CHAM_desc_t *descin, void *mat )
{
CHAM_desc_t *descout = NULL;
CHAMELEON_Desc_Create_User( &descout, mat,
......
coreblas/compute/core_zlatm1.c
+ 1
− 1
View file @ 768d1c7c
......@@ -189,7 +189,7 @@ int CORE_zlatm1( int MODE, double COND, int IRSIGN, cham_dist_t DIST,
alpha = ( 1. - temp ) / ((double)(N-1));
for( i=1; i<N; i++ ) {
D[i] = ((double)(N-i)) * alpha + temp;
D[i] = ((double)(N-i-1)) * alpha + temp;
}
}
break;
......
include/CMakeLists.txt
+ 1
− 1
View file @ 768d1c7c
......@@ -57,7 +57,7 @@ set(CHAMELEON_HDRS
chameleon/tasks.h
chameleon/timer.h
chameleon/types.h
chameleon/types.h
chameleon/flops.h
)
# Add generated headers
......
include/chameleon.h
+ 2
− 2
View file @ 768d1c7c
......@@ -121,8 +121,8 @@ int CHAMELEON_Desc_Create_OOC( CHAM_desc_t **desc, cham_flttype_t dtyp,
int mb, int nb, int bsiz, int lm, int ln,
int i, int j, int m, int n, int p, int q );
CHAM_desc_t *CHAMELEON_Desc_Copy( CHAM_desc_t *descin, void *mat );
CHAM_desc_t *CHAMELEON_Desc_CopyOnZero( CHAM_desc_t *descin, void *mat );
CHAM_desc_t *CHAMELEON_Desc_Copy( const CHAM_desc_t *descin, void *mat );
CHAM_desc_t *CHAMELEON_Desc_CopyOnZero( const CHAM_desc_t *descin, void *mat );
CHAM_desc_t *CHAMELEON_Desc_SubMatrix( CHAM_desc_t *descA, int i, int j, int m, int n );
int CHAMELEON_Desc_Destroy( CHAM_desc_t **desc );
......
testing/flops.h → include/chameleon/flops.h
+ 0
− 0
View file @ 768d1c7c
File moved
testing/testing_zcheck.c
+ 1
− 1
View file @ 768d1c7c
......@@ -33,7 +33,7 @@
#include "../control/common.h"
#include "testings.h"
#include "testing_zcheck.h"
#include "flops.h"
#include <chameleon/flops.h>
#ifndef max
#define max( _a_, _b_ ) ( (_a_) > (_b_) ? (_a_) : (_b_) )
......
testing/testing_zgeadd.c
+ 1
− 1
View file @ 768d1c7c
......@@ -18,7 +18,7 @@
#include <chameleon.h>
#include "testings.h"
#include "testing_zcheck.h"
#include "flops.h"
#include <chameleon/flops.h>
static cham_fixdbl_t
flops_zgeadd( int M, int N )
......
testing/testing_zgelqf.c
+ 1
− 1
View file @ 768d1c7c
......@@ -18,7 +18,7 @@
#include <chameleon.h>
#include "testings.h"
#include "testing_zcheck.h"
#include "flops.h"
#include <chameleon/flops.h>
int
testing_zgelqf( run_arg_list_t *args, int check )
......
testing/testing_zgelqf_hqr.c
+ 1
− 1
View file @ 768d1c7c
......@@ -18,7 +18,7 @@
#include <chameleon.h>
#include "testings.h"
#include "testing_zcheck.h"
#include "flops.h"
#include <chameleon/flops.h>
int
testing_zgelqf_hqr( run_arg_list_t *args, int check )
......
testing/testing_zgelqs.c
+ 1
− 1
View file @ 768d1c7c
......@@ -18,7 +18,7 @@
#include <chameleon.h>
#include "testings.h"
#include "testing_zcheck.h"
#include "flops.h"
#include <chameleon/flops.h>
#include "control/common.h"
static cham_fixdbl_t
......
testing/testing_zgels.c
+ 1
− 1
View file @ 768d1c7c
......@@ -18,7 +18,7 @@
#include <chameleon.h>
#include "testings.h"
#include "testing_zcheck.h"
#include "flops.h"
#include <chameleon/flops.h>
#include "../control/common.h"
static cham_fixdbl_t
......
testing/testing_zgels_hqr.c
+ 1
− 1
View file @ 768d1c7c
......@@ -18,7 +18,7 @@
#include <chameleon.h>
#include "testings.h"
#include "testing_zcheck.h"
#include "flops.h"
#include <chameleon/flops.h>
#include "../control/common.h"
static cham_fixdbl_t
......
testing/testing_zgemm.c
+ 1
− 1
View file @ 768d1c7c
......@@ -18,7 +18,7 @@
#include <chameleon.h>
#include "testings.h"
#include "testing_zcheck.h"
#include "flops.h"
#include <chameleon/flops.h>
int
testing_zgemm( run_arg_list_t *args, int check )
......
testing/testing_zgenm2.c
+ 1
− 1
View file @ 768d1c7c
......@@ -24,7 +24,7 @@
#endif
#include "testings.h"
#include "testing_zcheck.h"
#include "flops.h"
#include <chameleon/flops.h>
static cham_fixdbl_t
flops_zgenm2( int M, int N )
......
testing/testing_zgeqrf.c
+ 1
− 1
View file @ 768d1c7c
......@@ -18,7 +18,7 @@
#include <chameleon.h>
#include "testings.h"
#include "testing_zcheck.h"
#include "flops.h"
#include <chameleon/flops.h>
int
testing_zgeqrf( run_arg_list_t *args, int check )
......
testing/testing_zgeqrf_hqr.c
+ 1
− 1
View file @ 768d1c7c
......@@ -18,7 +18,7 @@
#include <chameleon.h>
#include "testings.h"
#include "testing_zcheck.h"
#include "flops.h"
#include <chameleon/flops.h>
int
testing_zgeqrf_hqr( run_arg_list_t *args, int check )
......
testing/testing_zgeqrs.c
+ 1
− 1
View file @ 768d1c7c
......@@ -18,7 +18,7 @@
#include <chameleon.h>
#include "testings.h"
#include "testing_zcheck.h"
#include "flops.h"
#include <chameleon/flops.h>
#include "control/common.h"
int
......
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