Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 4dbfe553 authored by hhakim's avatar hhakim
Browse files

Fix faust_multiplication ctest add without needed arguments and remove its complex versions.

parent c260f72e
Branches
Tags
No related merge requests found
...@@ -213,9 +213,9 @@ if(MATIO_LIB_FILE AND MATIO_INC_DIR AND BUILD_READ_MAT_FILE AND NOT NOCPPTESTS) ...@@ -213,9 +213,9 @@ if(MATIO_LIB_FILE AND MATIO_INC_DIR AND BUILD_READ_MAT_FILE AND NOT NOCPPTESTS)
message(STATUS "${testin}_${TEST_FPP} skipped") message(STATUS "${testin}_${TEST_FPP} skipped")
continue() continue()
endif() endif()
if(${TEST_FPP} MATCHES complex ) if(${TEST_FPP} MATCHES complex)
set(TEST_IS_COMPLEX 1) set(TEST_IS_COMPLEX 1)
if(${testin} MATCHES EigTJ OR ${testin} MATCHES palm4msa_2020 OR ${testin} MATCHES hierarchical2020.* OR ${testin} MATCHES hierarchicalFactorizationHadamard OR ${testin} MATCHES hierarchicalFactorizationButterfly) if(${testin} MATCHES EigTJ|palm4msa_2020|hierarchical2020.*|hierarchicalFactorizationHadamard|hierarchicalFactorizationButterfly|faust_multiplication)
continue() continue()
endif() endif()
# EigTJ doesn't handle complex matrices # EigTJ doesn't handle complex matrices
...@@ -236,7 +236,12 @@ if(MATIO_LIB_FILE AND MATIO_INC_DIR AND BUILD_READ_MAT_FILE AND NOT NOCPPTESTS) ...@@ -236,7 +236,12 @@ if(MATIO_LIB_FILE AND MATIO_INC_DIR AND BUILD_READ_MAT_FILE AND NOT NOCPPTESTS)
# Generation of the binary files in double and float precision # Generation of the binary files in double and float precision
add_executable(${TEST_CPP_NAME} ${FAUST_BIN_TEST_SRC_DIR}/${TEST_FILE_CPP} ${FAUST_BIN_TEST_SRC_DIR}/) #${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR}/faust_init_from_matio.cpp ${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR}/faust_init_from_matio_mat.cpp) add_executable(${TEST_CPP_NAME} ${FAUST_BIN_TEST_SRC_DIR}/${TEST_FILE_CPP} ${FAUST_BIN_TEST_SRC_DIR}/) #${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR}/faust_init_from_matio.cpp ${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR}/faust_init_from_matio_mat.cpp)
add_test(NAME ${TEST_CPP_NAME} COMMAND ${FAUST_BIN_TEST_BIN_DIR}/${TEST_CPP_NAME}) if(TEST_CPP_NAME MATCHES faust_multiplication)
# ./run_test/bin/faust_multiplication_float ../misc/data/mat/matrix_MEG.mat T ../misc/data/mat/faust_MEG_rcg_25.mat
add_test(NAME ${TEST_CPP_NAME} COMMAND ${FAUST_BIN_TEST_BIN_DIR}/${TEST_CPP_NAME} ${FAUST_DATA_MAT_DIR}/matrix_MEG.mat T ${FAUST_DATA_MAT_DIR}/faust_MEG_rcg_25.mat)
else()
add_test(NAME ${TEST_CPP_NAME} COMMAND ${FAUST_BIN_TEST_BIN_DIR}/${TEST_CPP_NAME})
endif()
set(TEST_LIBS ${FAUST_TARGET};${MATIO_LIB_FILE};${HDF5_LIB_FILE}) set(TEST_LIBS ${FAUST_TARGET};${MATIO_LIB_FILE};${HDF5_LIB_FILE})
if(FAUST_TORCH) if(FAUST_TORCH)
list(APPEND TEST_LIBS ${TORCH_LIBRARY};${Torch_DIR}/../../../lib/libc10.so) list(APPEND TEST_LIBS ${TORCH_LIBRARY};${Torch_DIR}/../../../lib/libc10.so)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment