Commit db017820 authored by Mathieu Faverge's avatar Mathieu Faverge

A large bunch of cleanup

parent b9439882
###
#
# @copyright 2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
# @copyright 2017-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
# Univ. Bordeaux. All rights reserved.
#
# @version 0.1.0
......@@ -100,6 +100,7 @@ set(srcs
src/check.c
src/gendot.c
src/gensvg.c
src/print.c
src/queue.c
)
......
#
# @file hqr_env.sh
#
# @copyright 2016-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
# @copyright 2016-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
# Univ. Bordeaux. All rights reserved.
#
# @version 6.0.0
......
......@@ -6,7 +6,7 @@
* of Tennessee Research Foundation. All rights
* reserved.
*
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......@@ -247,14 +247,13 @@ void libhqr_print_svg( const libhqr_tree_t *qrtree,
* @name Checking/Debugging functions
* @{
*/
int libhqr_check ( const libhqr_matrix_t *A, const libhqr_tree_t *qrtree );
void libhqr_print_type ( const libhqr_matrix_t *A, const libhqr_tree_t *qrtree );
void libhqr_print_pivot ( const libhqr_matrix_t *A, const libhqr_tree_t *qrtree );
void libhqr_print_nbgeqrt( const libhqr_matrix_t *A, const libhqr_tree_t *qrtree );
void libhqr_print_perm ( const libhqr_matrix_t *A, const libhqr_tree_t *qrtree, int *perm );
void libhqr_print_next_k ( const libhqr_matrix_t *A, const libhqr_tree_t *qrtree, int k );
void libhqr_print_prev_k ( const libhqr_matrix_t *A, const libhqr_tree_t *qrtree, int k );
void libhqr_print_geqrt_k( const libhqr_matrix_t *A, const libhqr_tree_t *qrtree, int k );
int libhqr_check ( const libhqr_tree_t *qrtree );
void libhqr_print_type ( const libhqr_tree_t *qrtree );
void libhqr_print_pivot ( const libhqr_tree_t *qrtree );
void libhqr_print_nbgeqrt( const libhqr_tree_t *qrtree );
void libhqr_print_next_k ( const libhqr_tree_t *qrtree, int k );
void libhqr_print_prev_k ( const libhqr_tree_t *qrtree, int k );
void libhqr_print_geqrt_k( const libhqr_tree_t *qrtree, int k );
/**
* @}
......
/**
*
* @file libhqr.h
* @file libhqr_internal.h
*
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
*
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -4,7 +4,7 @@
*
* List module for the treewalk algorithm.
*
* @copyright 2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2017-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -4,7 +4,7 @@
*
* Queue module for the treewalk algorithm.
*
* @copyright 2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2017-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
This diff is collapsed.
......@@ -6,7 +6,7 @@
* of Tennessee Research Foundation. All rights
* reserved.
*
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -4,7 +4,7 @@
*
* File for algorithm of treewalking.
*
* @copyright 2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2017-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -5,7 +5,7 @@
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -5,7 +5,7 @@
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -5,7 +5,7 @@
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -5,7 +5,7 @@
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -5,7 +5,7 @@
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -5,7 +5,7 @@
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -5,7 +5,7 @@
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -5,7 +5,7 @@
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -5,7 +5,7 @@
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -5,7 +5,7 @@
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -5,7 +5,7 @@
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -5,7 +5,7 @@
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -4,7 +4,7 @@
*
* Queue module for the treewalk algorithm.
*
* @copyright 2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2017-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -5,7 +5,7 @@
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......@@ -680,6 +680,9 @@ libhqr_initmtx_svd( libhqr_tree_t *qrtree,
libhqr_tree_t qrtreefct;
int rc;
/* Missing functions for now, should not be used */
assert(0);
rc = libhqr_initfct_svd( &qrtreefct, trans, A, type_hlvl, p, nbthread_per_node, ratio );
if ( rc != 0 ) {
return rc;
......@@ -698,5 +701,5 @@ libhqr_init_svd( libhqr_tree_t *qrtree,
libhqr_facto_e trans, libhqr_matrix_t *A,
int type_hlvl, int p, int nbthread_per_node, int ratio )
{
return libhqr_initmtx_svd( qrtree, trans, A, type_hlvl, p, nbthread_per_node, ratio );
return libhqr_initfct_svd( qrtree, trans, A, type_hlvl, p, nbthread_per_node, ratio );
}
/**
*
* @file libhqr_systolic.c
* @file systolic.c
*
* @copyright 2010-2017 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
*
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -4,7 +4,7 @@
*
* All the functions required for drawing tree are here.
*
* @copyright 2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2017-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
/**
*
* @file tshqr.c
*
* @copyright 2018-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
* @author Mathieu Faverge
* @date 2018-09-30
*
*/
#include "libhqr_internal.h"
#include "libhqr_list.h"
#include <assert.h>
......
###
#
# @copyright 2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
# @copyright 2017-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
# Univ. Bordeaux. All rights reserved.
#
# @version 0.1.0
......
......@@ -2,7 +2,7 @@
*
* @file common.c
*
* @copyright 2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2017-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 0.1.0
......
......@@ -2,7 +2,7 @@
*
* @file common.h
*
* @copyright 2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2017-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 0.1.0
......
/**
*
* @file drawhqr.c
* @file draw_hqr.c
*
* Binary to draw hierarchical trees.
*
* @copyright 2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2017-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
/**
*
* @file drawsystolic.c
* @file draw_systolic.c
*
* Binary to draw systolic trees.
*
* @copyright 2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2017-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -4,7 +4,7 @@
*
* Binary to draw hierarchical trees used to compute the tsqrt/tslqt of a full matrix.
*
* @copyright 2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2017-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......
......@@ -8,7 +8,7 @@
* of Tennessee Research Foundation. All rights
* reserved.
*
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......@@ -95,7 +95,7 @@ main(int argc, char ** argv)
libhqr_init_hqr( &qrtree, LIBHQR_QR, &matrix,
llvl, hlvl, qr_a, qr_p, domino, tsrr );
rc = libhqr_check( &matrix, &qrtree );
rc = libhqr_check( &qrtree );
libhqr_finalize( &qrtree );
if (rc != 0) {
......@@ -157,7 +157,7 @@ main(int argc, char ** argv)
libhqr_init_hqr( &qrtree, LIBHQR_QR, &matrix,
llvl, hlvl, qr_a, qr_p, domino, tsrr );
rc = libhqr_check( &matrix, &qrtree );
rc = libhqr_check( &qrtree );
libhqr_finalize( &qrtree );
if (rc != 0) {
......@@ -189,7 +189,7 @@ main(int argc, char ** argv)
libhqr_init_hqr( &qrtree, LIBHQR_QR, &matrix,
llvl, hlvl, qr_a, qr_p, domino, tsrr );
rc = libhqr_check( &matrix, &qrtree );
rc = libhqr_check( &qrtree );
libhqr_finalize( &qrtree );
if (rc != 0) {
......
/**
*
* @file testing_hqr.c
* @file testing_svd.c
*
* Testing file for all combinations of hierarchical QR trees.
*
......@@ -8,7 +8,7 @@
* of Tennessee Research Foundation. All rights
* reserved.
*
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......@@ -100,10 +100,10 @@ main(int argc, char ** argv)
NT = all_nt[n];
matrix.nt = NT;
libhqr_initfct_svd( &qrtree, LIBHQR_QR, &matrix,
hlvl, qr_p, cores, qr_a );
libhqr_init_svd( &qrtree, LIBHQR_QR, &matrix,
hlvl, qr_p, cores, qr_a );
rc = libhqr_check( &matrix, &qrtree );
rc = libhqr_check( &qrtree );
libhqr_finalize( &qrtree );
if (rc != 0) {
......@@ -130,10 +130,10 @@ main(int argc, char ** argv)
matrix.mt = MT;
matrix.nt = NT;
libhqr_initfct_svd( &qrtree, LIBHQR_QR, &matrix,
libhqr_init_svd( &qrtree, LIBHQR_QR, &matrix,
hlvl, qr_p, cores, qr_a );
rc = libhqr_check( &matrix, &qrtree );
rc = libhqr_check( &qrtree );
libhqr_finalize( &qrtree );
if (rc != 0) {
......
......@@ -8,7 +8,7 @@
* of Tennessee Research Foundation. All rights
* reserved.
*
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......@@ -75,7 +75,7 @@ main(int argc, char ** argv)
matrix.nt = NT;
libhqr_init_sys( &qrtree, LIBHQR_QR, &matrix, P, Q );
rc = libhqr_check( &matrix, &qrtree );
rc = libhqr_check( &qrtree );
libhqr_finalize( &qrtree );
if (rc != 0) {
......@@ -103,7 +103,7 @@ main(int argc, char ** argv)
libhqr_init_sys( &qrtree, LIBHQR_QR, &matrix,
qr_p, qr_a );
rc = libhqr_check( &matrix, &qrtree );
rc = libhqr_check( &qrtree );
libhqr_finalize( &qrtree );
if (rc != 0) {
......
......@@ -8,7 +8,7 @@
* of Tennessee Research Foundation. All rights
* reserved.
*
* @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
* Univ. Bordeaux. All rights reserved.
*
* @version 1.0.0
......@@ -82,7 +82,7 @@ main(int argc, char ** argv)
libhqr_init_tshqr( &qrtree, LIBHQR_TSQR, &matrix,
qr_a, qr_p );
rc = libhqr_check( &matrix, &qrtree );
rc = libhqr_check( &qrtree );
libhqr_finalize( &qrtree );
if (rc != 0) {
......@@ -111,7 +111,7 @@ main(int argc, char ** argv)
libhqr_init_tshqr( &qrtree, LIBHQR_TSQR, &matrix,
qr_a, qr_p );
rc = libhqr_check( &matrix, &qrtree );
rc = libhqr_check( &qrtree );
libhqr_finalize( &qrtree );
if (rc != 0) {
......
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