Skip to content

Commit

Permalink
Updates to hevd_test, gsvd_test.
Browse files Browse the repository at this point in the history 
Details:
- in examples/hevd_test and examples/gsvd_test, updated invocations of
  FLA_Tridiag_UT_extract_diagonals() to _extract_real_diagonals(), and of
  FLA_Bidiag_UT_extract_diagonals() to _extract_real_diagonals(). This
  change was missed many years ago (pre-git) when the
  _extract_real_diagonals() functions were defined as a replacement to
  their _extract_diagonals() counterparts.
- Updated these test drivers' makefiles primarily to fix link order
  issues, and other small updates.
  • Loading branch information
@fgvanzee
fgvanzee committed Jan 30, 2018
1 parent 3bc0286 commit 271ce6e
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 25 deletions.
4 changes: 2 additions & 2 deletions examples/gsvd_test/FLA_Svd_uv_var1_components.c
View file
Expand Up @@ -79,7 +79,7 @@ FLA_Error FLA_Svd_uv_var1_components( dim_t n_iter_max, dim_t k_accum, dim_t b_a
// Extract the diagonal and superdiagonal from A.
FLA_Bidiag_UT( A, T, S );
FLA_Bidiag_UT_realify( A, rL, rR );
FLA_Bidiag_UT_extract_diagonals( A, d, e );
FLA_Bidiag_UT_extract_real_diagonals( A, d, e );
}
*dtime_bred = FLA_Clock() - dtime_temp;

Expand Down Expand Up @@ -153,7 +153,7 @@ FLA_Error FLA_Svd_uv_var1_components( dim_t n_iter_max, dim_t k_accum, dim_t b_a
// Extract the diagonal and superdiagonal from A.
FLA_Bidiag_UT( R, T, S );
FLA_Bidiag_UT_realify( R, rL, rR );
FLA_Bidiag_UT_extract_diagonals( R, d, e );
FLA_Bidiag_UT_extract_real_diagonals( R, d, e );
}
*dtime_bred = FLA_Clock() - dtime_temp;

Expand Down
4 changes: 2 additions & 2 deletions examples/gsvd_test/FLA_Svd_uv_var2_components.c
View file
Expand Up @@ -76,7 +76,7 @@ FLA_Error FLA_Svd_uv_var2_components( dim_t n_iter_max, dim_t k_accum, dim_t b_a
// Extract the diagonal and sub-diagonal from A.
FLA_Bidiag_UT( A, T, S );
FLA_Bidiag_UT_realify( A, rL, rR );
FLA_Bidiag_UT_extract_diagonals( A, d, e );
FLA_Bidiag_UT_extract_real_diagonals( A, d, e );
}
*dtime_bred = FLA_Clock() - dtime_temp;

Expand Down Expand Up @@ -147,7 +147,7 @@ FLA_Error FLA_Svd_uv_var2_components( dim_t n_iter_max, dim_t k_accum, dim_t b_a
// Extract the diagonal and superdiagonal from A.
FLA_Bidiag_UT( R, T, S );
FLA_Bidiag_UT_realify( R, rL, rR );
FLA_Bidiag_UT_extract_diagonals( R, d, e );
FLA_Bidiag_UT_extract_real_diagonals( R, d, e );
}
*dtime_bred = FLA_Clock() - dtime_temp;

Expand Down
4 changes: 2 additions & 2 deletions examples/gsvd_test/REF_Svd_uv_components.c
View file
Expand Up @@ -60,7 +60,7 @@ FLA_Error REF_Svd_uv_components( FLA_Obj A, FLA_Obj s, FLA_Obj U, FLA_Obj V,
{
// Reduce to bidiagonal form.
FLA_Bidiag_blk_external( A, tu, tv );
FLA_Bidiag_UT_extract_diagonals( A, d, eT );
FLA_Bidiag_UT_extract_real_diagonals( A, d, eT );
}
*dtime_bred = FLA_Clock() - dtime_temp;

Expand Down Expand Up @@ -124,7 +124,7 @@ FLA_Error REF_Svd_uv_components( FLA_Obj A, FLA_Obj s, FLA_Obj U, FLA_Obj V,
{
// Reduce R to bidiagonal form.
FLA_Bidiag_blk_external( R, tu, tv );
FLA_Bidiag_UT_extract_diagonals( R, d, eT );
FLA_Bidiag_UT_extract_real_diagonals( R, d, eT );
}
*dtime_bred = FLA_Clock() - dtime_temp;

Expand Down
4 changes: 2 additions & 2 deletions examples/gsvd_test/REF_Svdd_uv_components.c
View file
Expand Up @@ -63,7 +63,7 @@ FLA_Error REF_Svdd_uv_components( FLA_Obj A, FLA_Obj s, FLA_Obj U, FLA_Obj V,
{
// Reduce to bidiagonal form.
FLA_Bidiag_blk_external( A, tu, tv );
FLA_Bidiag_UT_extract_diagonals( A, d, eT );
FLA_Bidiag_UT_extract_real_diagonals( A, d, eT );
}
*dtime_bred = FLA_Clock() - dtime_temp;

Expand Down Expand Up @@ -127,7 +127,7 @@ FLA_Error REF_Svdd_uv_components( FLA_Obj A, FLA_Obj s, FLA_Obj U, FLA_Obj V,
{
// Reduce R to bidiagonal form.
FLA_Bidiag_blk_external( AT, tu, tv );
FLA_Bidiag_UT_extract_diagonals( A, d, eT );
FLA_Bidiag_UT_extract_real_diagonals( A, d, eT );
}
*dtime_bred = FLA_Clock() - dtime_temp;

Expand Down
9 changes: 4 additions & 5 deletions examples/gsvd_test/makefile
View file
Expand Up @@ -11,16 +11,15 @@ INST_PATH := $(HOME)/flame
LIB_PATH := $(INST_PATH)/lib
INC_PATH := $(INST_PATH)/include
FLAME_LIB := $(LIB_PATH)/libflame.a
#BLAS_LIB := $(LIB_PATH)/libblas.a
#BLAS_LIB := $(LIB_PATH)/libgoto.a
BLAS_LIB := $(LIB_PATH)/liblapack.a $(LIB_PATH)/libgoto.a
LAPACK_LIB := $(LIB_PATH)/liblapack.a
BLAS_LIB := $(LIB_PATH)/libopenblas.a

CC := gcc
FC := gfortran
LINKER := $(CC)
CFLAGS := -I$(SRC_PATH) -I$(INC_PATH) -g -O3 -Wall -Wno-comment -march=native -msse3 -mfpmath=sse -malign-double
FFLAGS := -I$(SRC_PATH) -I$(INC_PATH) -g -O3 -Wall
LDFLAGS := -L/lusr/opt/gcc-4.2.2/lib/gcc/i686-pc-linux-gnu/4.2.2 -L/lusr/opt/gcc-4.2.2/lib/gcc/i686-pc-linux-gnu/4.2.2/../../.. -lgfortranbegin -lgfortran -lm
LDFLAGS := -L/usr/lib/gcc/x86_64-linux-gnu/5 -L/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/u/field/intel/compilers_and_libraries_2017.3.191/linux/compiler/lib/intel64_lin -L/u/field/intel/compilers_and_libraries_2017.3.191/linux/mkl/lib/intel64_lin -L/usr/lib/gcc/x86_64-linux-gnu/5/../../.. -lgfortran -lm -lquadmath
LDFLAGS += -lpthread

#TEST_OBJS := $(patsubst $(SRC_PATH)/%.c, $(OBJ_PATH)/%.o, $(wildcard $(SRC_PATH)/*.c))
Expand All @@ -35,7 +34,7 @@ TEST_OBJS := test_$(FNAME).o \
TEST_BIN := test_$(FNAME).x

test_$(FNAME): $(TEST_OBJS)
$(LINKER) $(TEST_OBJS) $(LDFLAGS) $(FLAME_LIB) $(LAPACK_LIB) $(BLAS_LIB) -o $(TEST_BIN)
$(LINKER) $(TEST_OBJS) $(FLAME_LIB) $(LAPACK_LIB) $(BLAS_LIB) $(LDFLAGS) -o $(TEST_BIN)

$(OBJ_PATH)/%.o: $(SRC_PATH)/%.c
$(CC) $(CFLAGS) -c $< -o $@
Expand Down
4 changes: 2 additions & 2 deletions examples/hevd_test/FLA_Hevd_lv_var1_components.c
View file
Expand Up @@ -61,13 +61,13 @@ FLA_Error FLA_Hevd_lv_var1_components( dim_t n_iter_max, FLA_Obj A, FLA_Obj l, d
FLA_Tridiag_UT_realify( uplo, A, r );

// Extract the diagonal and sub-diagonal from A.
FLA_Tridiag_UT_extract_diagonals( uplo, A, d, e );
FLA_Tridiag_UT_extract_real_diagonals( uplo, A, d, e );


dtime_temp = FLA_Clock();
{
// Form Q, overwriting A.
FLA_Tridiag_UT_form_Q( uplo, A, T );
FLA_Tridiag_UT_form_Q( uplo, A, T, A );
}
*dtime_appq = FLA_Clock() - dtime_temp;

Expand Down
4 changes: 2 additions & 2 deletions examples/hevd_test/FLA_Hevd_lv_var2_components.c
View file
Expand Up @@ -61,12 +61,12 @@ FLA_Error FLA_Hevd_lv_var2_components( dim_t n_iter_max, FLA_Obj A, FLA_Obj l, d
FLA_Tridiag_UT_realify( uplo, A, r );

// Extract the diagonal and sub-diagonal from A.
FLA_Tridiag_UT_extract_diagonals( uplo, A, d, e );
FLA_Tridiag_UT_extract_real_diagonals( uplo, A, d, e );

dtime_temp = FLA_Clock();
{
// Form Q, overwriting A.
FLA_Tridiag_UT_form_Q( uplo, A, T );
FLA_Tridiag_UT_form_Q( uplo, A, T, A );
}
*dtime_appq = FLA_Clock() - dtime_temp;

Expand Down
2 changes: 1 addition & 1 deletion examples/hevd_test/REF_Hevd_lv_components.c
View file
Expand Up @@ -39,7 +39,7 @@ FLA_Error REF_Hevd_lv_components( FLA_Obj A, FLA_Obj l,
{
// Reduce to tridiagonal form.
FLA_Tridiag_blk_external( uplo, A, t );
FLA_Tridiag_UT_extract_diagonals( uplo, A, d, e );
FLA_Tridiag_UT_extract_real_diagonals( uplo, A, d, e );
}
*dtime_tred = FLA_Clock() - dtime_temp;

Expand Down
2 changes: 1 addition & 1 deletion examples/hevd_test/REF_Hevdd_lv_components.c
View file
Expand Up @@ -41,7 +41,7 @@ FLA_Error REF_Hevdd_lv_components( FLA_Obj A, FLA_Obj l,
{
// Reduce to tridiagonal form.
FLA_Tridiag_blk_external( uplo, A, t );
FLA_Tridiag_UT_extract_diagonals( uplo, A, d, e );
FLA_Tridiag_UT_extract_real_diagonals( uplo, A, d, e );
}
*dtime_tred = FLA_Clock() - dtime_temp;

Expand Down
2 changes: 1 addition & 1 deletion examples/hevd_test/REF_Hevdr_lv_components.c
View file
Expand Up @@ -44,7 +44,7 @@ FLA_Error REF_Hevdr_lv_components( FLA_Obj A, FLA_Obj l, FLA_Obj Z,
{
// Reduce to tridiagonal form.
FLA_Tridiag_blk_external( uplo, A, t );
FLA_Tridiag_UT_extract_diagonals( uplo, A, d, eT );
FLA_Tridiag_UT_extract_real_diagonals( uplo, A, d, eT );
}
*dtime_tred = FLA_Clock() - dtime_temp;

Expand Down
9 changes: 4 additions & 5 deletions examples/hevd_test/makefile
View file
Expand Up @@ -11,16 +11,15 @@ INST_PATH := $(HOME)/flame
LIB_PATH := $(INST_PATH)/lib
INC_PATH := $(INST_PATH)/include
FLAME_LIB := $(LIB_PATH)/libflame.a
#BLAS_LIB := $(LIB_PATH)/libblas.a
#BLAS_LIB := $(LIB_PATH)/libgoto.a
BLAS_LIB := $(LIB_PATH)/liblapack.a $(LIB_PATH)/libgoto.a
LAPACK_LIB := $(LIB_PATH)/liblapack.a
BLAS_LIB := $(LIB_PATH)/libopenblas.a

CC := gcc
FC := gfortran
LINKER := $(CC)
CFLAGS := -I$(SRC_PATH) -I$(INC_PATH) -O3 -Wall -Wno-comment -march=native -msse3 -malign-double -g
FFLAGS := -I$(SRC_PATH) -I$(INC_PATH) -O3 -Wall
LDFLAGS := -L/lusr/opt/gcc-4.2.2/lib/gcc/i686-pc-linux-gnu/4.2.2 -L/lusr/opt/gcc-4.2.2/lib/gcc/i686-pc-linux-gnu/4.2.2/../../.. -lgfortranbegin -lgfortran -lm
LDFLAGS := -L/usr/lib/gcc/x86_64-linux-gnu/5 -L/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/u/field/intel/compilers_and_libraries_2017.3.191/linux/compiler/lib/intel64_lin -L/u/field/intel/compilers_and_libraries_2017.3.191/linux/mkl/lib/intel64_lin -L/usr/lib/gcc/x86_64-linux-gnu/5/../../.. -lgfortran -lm -lquadmath
LDFLAGS += -lpthread -fopenmp

#TEST_OBJS := $(patsubst $(SRC_PATH)/%.c, $(OBJ_PATH)/%.o, $(wildcard $(SRC_PATH)/*.c))
Expand All @@ -37,7 +36,7 @@ TEST_OBJS := test_$(FNAME).o \
TEST_BIN := test_$(FNAME).x

test_$(FNAME): $(TEST_OBJS)
$(LINKER) $(TEST_OBJS) $(LDFLAGS) $(FLAME_LIB) $(LAPACK_LIB) $(BLAS_LIB) -o $(TEST_BIN)
$(LINKER) $(TEST_OBJS) $(FLAME_LIB) $(LAPACK_LIB) $(BLAS_LIB) $(LDFLAGS) -o $(TEST_BIN)

$(OBJ_PATH)/%.o: $(SRC_PATH)/%.c
$(CC) $(CFLAGS) -c $< -o $@
Expand Down

0 comments on commit 271ce6e

Please sign in to comment.