Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
faust
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
faust group
faust
Commits
442002db
Commit
442002db
authored
8 years ago
by
Adrien Leman
Committed by
hhakim
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
debug cmake list fopen
parent
3f4f80fd
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+26
-61
26 additions, 61 deletions
CMakeLists.txt
misc/test/CMakeLists.txt
+2
-53
2 additions, 53 deletions
misc/test/CMakeLists.txt
with
28 additions
and
114 deletions
CMakeLists.txt
+
26
−
61
View file @
442002db
...
...
@@ -193,7 +193,7 @@ option(BUILD_MATLAB_MEX_FILES "Enable building Matlab MEX files." ON)
option
(
BUILD_OPENBLAS
"Using openBLAS for matrix and vector computations"
OFF
)
# different type of files
option
(
BUILD_READ_XML_FILE
"Using xml configuration to read xml files"
OFF
)
option
(
BUILD_READ_MAT_FILE
"Using matio library to read mat files"
O
FF
)
option
(
BUILD_READ_MAT_FILE
"Using matio library to read mat files"
O
N
)
#CMAKE_DEPENDENT_OPTION
###### Different option of configuration ######
...
...
@@ -269,7 +269,6 @@ set(FAUST_ALGORITHM_FACTORIZATION_BIN_DIR ${FAUST_ALGORITHM_BIN_DIR}/factorizati
#set(FAUST_FAUSTCORE_SRC_DIR ${PROJECT_SOURCE_DIR}/faust_core CACHE INTERNAL "")
###### WRAPPER DIRECTORIES ######
set
(
FAUST_SRC_WRAPPER_DIR
${
PROJECT_SOURCE_DIR
}
/wrapper CACHE INTERNAL
""
)
set
(
FAUST_BIN_WRAPPER_DIR
${
PROJECT_BINARY_DIR
}
/wrapper CACHE INTERNAL
""
)
...
...
@@ -309,12 +308,6 @@ set(FAUST_SRC_TEST_SRC_DIR ${FAUST_SRC_TEST_DIR}/src CACHE INTERNAL "")
###### WRAPPER MATLAB DIRECTORIES ######
if
(
BUILD_MATLAB_MEX_FILES
)
#version MATLAB du code (entierement MATLAB, pas de mexfunction)
###### SRC DIRECTORY #####
set
(
FAUST_MATLAB_SRC_DIR
${
FAUST_SRC_WRAPPER_DIR
}
/matlab CACHE INTERNAL
""
)
...
...
@@ -370,7 +363,7 @@ if (BUILD_MATLAB_MEX_FILES)
set
(
FAUST_DEMO_TIMECOMP_INSTALL_DIR
${
FAUST_DEMO_INSTALL_DIR
}
/Runtime_comparison CACHE INTERNAL
""
)
set
(
FAUST_DEMO_FIG_INSTALL_DIR
${
FAUST_DEMO_INSTALL_DIR
}
/Figures CACHE INTERNAL
""
)
endif
(
BUILD_MATLAB_MEX_FILES
)
##################################################################
## examples directories including some examples of the use of the library FAuST
set
(
FAUST_BIN_TEST_DIR
${
PROJECT_BINARY_DIR
}
/run_test CACHE INTERNAL
""
)
...
...
@@ -383,9 +376,7 @@ set(FAUST_BIN_TEST_TIME_COMPARE_DIR ${FAUST_BIN_TEST_DIR}/runtime_comparison CA
set
(
FAUST_BIN_TEST_TOOLS_DIR
${
FAUST_BIN_TEST_DIR
}
/tools CACHE INTERNAL
""
)
##################################################################
### pour le GPU
### In the case of GPU preocess
if
(
BUILD_USE_GPU
)
set
(
FAUST_SRC_LINEAR_OPERATOR_GPU_DIR
${
FAUST_SRC_LINEAR_OPERATOR_DIR
}
/GPU CACHE INTERNAL
""
)
set
(
FAUST_BIN_LINEAR_OPERATOR_GPU_DIR
${
FAUST_BIN_LINEAR_OPERATOR_DIR
}
/GPU CACHE INTERNAL
""
)
...
...
@@ -393,7 +384,7 @@ if (BUILD_USE_GPU)
set
(
FAUST_SRC_TEST_GPU_DIR
${
FAUST_MISC_DIR
}
/test/GPU_test CACHE INTERNAL
""
)
set
(
FAUST_BIN_TEST_GPU_DIR
${
FAUST_BIN_TEST_DIR
}
/binGPU CACHE INTERNAL
""
)
endif
(
BUILD_USE_GPU
)
##################################################################
###### DOCUMENTATION DIRECTORIES ######
if
(
BUILD_DOCUMENTATION
)
...
...
@@ -435,36 +426,6 @@ endif(BUILD_USE_GPU)
##################################################################
###### FLAG for DEBUG or RELEASE TARGETS ######
#if(WIN32)
# if(CMAKE_BUILD_TYPE MATCHES "Debug")
# set(FAUST_DEBUG_RELEASE "debug")
# set(FAUST_BIN_DIR ${PROJECT_BINARY_DIR}/Debug)
# set(FAUST_MATLAB_BIN_DIR ${FAUST_MATLAB_BIN_DIR}/Debug)
# elseif(CMAKE_BUILD_TYPE MATCHES "Release")
# set(FAUST_DEBUG_RELEASE "release")
# set(FAUST_BIN_DIR ${PROJECT_BINARY_DIR}/Release)
# set(FAUST_MATLAB_BIN_DIR ${FAUST_MATLAB_BIN_DIR}/Release)
# else()
# set(FAUST_BIN_DIR ${PROJECT_BINARY_DIR})
# endif()
#message(STATUS "FAUST_BIN_DIR : ${FAUST_BIN_DIR}")
#else()
# if(CMAKE_BUILD_TYPE MATCHES "Debug")
# # set(FAUST_DEBUG_RELEASE "debug")
# set(FAUST_BIN_DIR ${PROJECT_BINARY_DIR}/Debug)
# # set(FAUST_MATLAB_BIN_DIR ${FAUST_MATLAB_BIN_DIR}/Debug)
# elseif(CMAKE_BUILD_TYPE MATCHES "Release")
# # set(FAUST_DEBUG_RELEASE "release")
# set(FAUST_BIN_DIR ${PROJECT_BINARY_DIR}/Release)
# # set(FAUST_MATLAB_BIN_DIR ${FAUST_MATLAB_BIN_DIR}/Release)
# else()
#
# endif()
#message(STATUS "FAUST_BIN_DIR : ${FAUST_BIN_DIR}")
#endif(WIN32)
######################################"
######################################"
# Case of Visual Studio
IF
(
WIN32
)
...
...
@@ -500,35 +461,37 @@ ENDIF(WIN32)
set
(
CMAKE_ARCHIVE_OUTPUT_DIRECTORY
${
FAUST_BIN_DIR
}
CACHE STRING
""
FORCE
)
#message(STATUS "CMAKE_ARCHIVE_OUTPUT_DIRECTORY : ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}")
#message(STATUS "FAUST_BIN_DIR : ${FAUST_BIN_DIR}")
#message(STATUS "CMAKE_LIBRARY_OUTPUT_DIRECTORY : ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
set
(
CMAKE_LIBRARY_OUTPUT_DIRECTORY
${
FAUST_BIN_DIR
}
CACHE STRING
""
FORCE
)
#message(STATUS "CMAKE_LIBRARY_OUTPUT_DIRECTORY : ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
######################################"
############################################################################
# adding compiler flags
#
# adding compiler flags
###################################################
set
(
CMAKE_CXX_FLAGS
""
)
#if( (CMAKE_BUILD_TYPE MATCHES "Debug") OR (CMAKE_BUILD_TYPE MATCHES "debug") OR (CMAKE_BUILD_TYPE MATCHES "DEBUG") )
if
(
BUILD_DEBUG
OR
(
CMAKE_BUILD_TYPE MATCHES
"Debug"
)
OR
(
CMAKE_BUILD_TYPE MATCHES
"debug"
)
OR
(
CMAKE_BUILD_TYPE MATCHES
"DEBUG"
)
)
if
(
UNIX
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-O1"
)
if
(
BUILD_MULTITHREAD
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fopenmp "
CACHE STRING
"compile flags"
FORCE
)
endif
(
BUILD_MULTITHREAD
)
if
(
APPLE
)
#message(STATUS "APPLE OPERATING SYSTEM")
if
(
BUILD_MULTITHREAD
)
message
(
WARNING
"-fopen is not activated for MAC OS."
)
endif
(
BUILD_MULTITHREAD
)
# -pthread is not take into account with MAC platform.
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fexceptions -fno-omit-frame-pointer -fPIC "
CACHE STRING
"compile flags"
FORCE
)
else
(
APPLE
)
#message(STATUS "UNIX OPERATING SYSTEM")
if
(
BUILD_MULTITHREAD
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fopenmp "
CACHE STRING
"compile flags"
FORCE
)
endif
(
BUILD_MULTITHREAD
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fexceptions -fno-omit-frame-pointer -pthread -fPIC "
CACHE STRING
"compile flags"
FORCE
)
endif
(
APPLE
)
elseif
(
WIN32
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS_DEBUG
}
/O0"
)
if
(
BUILD_MULTITHREAD
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/openmp "
CACHE STRING
"compile flags"
FORCE
)
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp " CACHE STRING "compile flags" FORCE)
message
(
WARNING
"openmp is not activated for Windows platform."
)
endif
(
BUILD_MULTITHREAD
)
else
()
message
(
WARNING
"Unknown type of plateform for CMAKE_CXX_FLAGS"
)
...
...
@@ -536,22 +499,26 @@ if (BUILD_DEBUG OR (CMAKE_BUILD_TYPE MATCHES "Debug") OR (CMAKE_BUILD_TYPE MATC
message
(
STATUS
"**********DEBUG mode************"
)
else
(
BUILD_DEBUG
OR
(
CMAKE_BUILD_TYPE MATCHES
"Debug"
)
OR
(
CMAKE_BUILD_TYPE MATCHES
"debug"
)
OR
(
CMAKE_BUILD_TYPE MATCHES
"DEBUG"
)
)
if
(
UNIX
)
if
(
BUILD_MULTITHREAD
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fopenmp "
CACHE STRING
"compile flags"
FORCE
)
endif
(
BUILD_MULTITHREAD
)
if
(
APPLE
)
#message(STATUS "APPLE OPERATING SYSTEM")
# -pthread is not take into account with MAC platform.
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fexceptions -fno-omit-frame-pointer -fPIC -O3"
CACHE STRING
"compile flags"
FORCE
)
# -pthread is not take into account with MAC platform.
if
(
BUILD_MULTITHREAD
)
message
(
WARNING
"-fopen is not activated for MAC OS."
)
endif
(
BUILD_MULTITHREAD
)
else
(
APPLE
)
#message(STATUS "UNIX OPERATING SYSTEM")
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fexceptions -fno-omit-frame-pointer -pthread -fPIC -O3"
CACHE STRING
"compile flags"
FORCE
)
if
(
BUILD_MULTITHREAD
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fopenmp "
CACHE STRING
"compile flags"
FORCE
)
endif
(
BUILD_MULTITHREAD
)
endif
(
APPLE
)
elseif
(
WIN32
)
if
(
BUILD_MULTITHREAD
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/openmp "
CACHE STRING
"compile flags"
FORCE
)
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp " CACHE STRING "compile flags" FORCE)
message
(
WARNING
"openmp is not activated for Windows platform."
)
endif
(
BUILD_MULTITHREAD
)
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs /MD /O2" CACHE STRING "compile flags" FORCE)
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs /MD /O2" CACHE STRING "compile flags" FORCE)
...
...
@@ -560,6 +527,7 @@ else(BUILD_DEBUG OR (CMAKE_BUILD_TYPE MATCHES "Debug") OR (CMAKE_BUILD_TYPE MAT
endif
()
message
(
STATUS
"**********RELEASE mode************"
)
endif
(
BUILD_DEBUG
OR
(
CMAKE_BUILD_TYPE MATCHES
"Debug"
)
OR
(
CMAKE_BUILD_TYPE MATCHES
"debug"
)
OR
(
CMAKE_BUILD_TYPE MATCHES
"DEBUG"
)
)
############################################################################
#if(UNIX)
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp -fexceptions -fno-omit-frame-pointer -pthread -fPIC " CACHE STRING "compile flags" FORCE)
...
...
@@ -568,7 +536,6 @@ endif(BUILD_DEBUG OR (CMAKE_BUILD_TYPE MATCHES "Debug") OR (CMAKE_BUILD_TYPE MA
#else()
# message(WARNING "Unknown type of plateform for CMAKE_CXX_FLAGS")
#endif(UNIX)
#message(STATUS "CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
##################################################################
...
...
@@ -617,8 +584,6 @@ else (BUILD_USE_GPU)
endif
(
BUILD_USE_GPU
)
if
(
BUILD_MATLAB_MEX_FILES
)
if
(
UNIX
)
if
(
APPLE
)
...
...
This diff is collapsed.
Click to expand it.
misc/test/CMakeLists.txt
+
2
−
53
View file @
442002db
...
...
@@ -80,8 +80,6 @@ endif()
####### IF THE MATIO LIBRARY IS AVAILABLE ELSE WE USE TXT OR XML DATA #######
if
(
MATIO_LIB_FILE AND MATIO_INC_DIR AND BUILD_READ_MAT_FILE
)
# AND HDF5_LIB_FILE)
...
...
@@ -135,14 +133,12 @@ endif(BUILD_MATLAB_MEX_FILES)
# MATLAB input format
if
(
BUILD_READ_MAT_FILE
)
# test for the algorithm (palm4MSA and hierarchical_fact) for different configuration (MEG, Hadamard,...) in simple and double precision
add_test
(
NAME MATFILE_FACT_MEG_float COMMAND
${
FAUST_BIN_TEST_BIN_DIR
}
/hierarchicalFactorization_float
${
FAUST_DATA_MAT_DIR
}
/matrix_MEG.mat
${
FAUST_CONFIG_MAT_DIR
}
/config_MEG.mat 22450
2
00
)
add_test
(
NAME MATFILE_FACT_MEG_float COMMAND
${
FAUST_BIN_TEST_BIN_DIR
}
/hierarchicalFactorization_float
${
FAUST_DATA_MAT_DIR
}
/matrix_MEG.mat
${
FAUST_CONFIG_MAT_DIR
}
/config_MEG.mat 22450
5
00
)
add_test
(
NAME MATFILE_FACT_MEG_double COMMAND
${
FAUST_BIN_TEST_BIN_DIR
}
/hierarchicalFactorization_double
${
FAUST_DATA_MAT_DIR
}
/matrix_MEG.mat
${
FAUST_CONFIG_MAT_DIR
}
/config_MEG.mat 22480 1
)
set_tests_properties
(
MATFILE_FACT_MEG_float MATFILE_FACT_MEG_double PROPERTIES TIMEOUT
${
TIMEOUT_MEG
}
)
...
...
@@ -157,14 +153,11 @@ if (BUILD_READ_MAT_FILE)
# limit the time of the process in case of bug...
set_tests_properties
(
MATFILE_FACT_HADAMARD_
${
TEST_FPP
}
MATFILE_FACT_HIER_
${
TEST_FPP
}
PROPERTIES TIMEOUT
${
TIMEOUT_COMP
}
)
endforeach
()
endforeach
()
## time comparison between Faust-vector product and Dense matrix-vector product for various configuration ( dimension, RCG , number of factor)
#add_test(NAME MULTIPLY_COMPTIME COMMAND ${FAUST_BIN_TEST_BIN_DIR}/multiply_compare_time_double)
...
...
@@ -191,47 +184,3 @@ endif(BUILD_READ_XML_FILE)
########################################################################
################## TEST VERSION GPU (version using CUDA)
#if (BUILD_USE_GPU)
# #${FAUST_EXCEPTION_SRC_DIR}
# include_directories(${FAUST_MATRIX_CU_SRC_DIR} ${FAUST_FAUSTCORE_CU_SRC_DIR} ${FAUST_ALGORITHM_CU_SRC_DIR} ${CUDA_INC_DIR} ${CUDA_RUNTIME_API_INC_DIR} ${CUSPARSE_INC_DIR} ${CUBLAS_V2_INC_DIR} ${EIGEN_INC_DIR})
# if(BUILD_READ_MAT_FILE)
# include_directories(${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR} ${MATIO_INC_DIR})
# endif(BUILD_READ_MAT_FILE)
# add_definitions(-DCOMPILE_GPU)
# # generation des executables de algorithme hierarchical_fact en GPU en simple et double precision
# foreach(TEST_FPP float double)
# foreach(testin hierarchical_fact_cu)
# # copy CPU files cpp.in to the user's ./src/ directory en float et double precision
# configure_file(${FAUST_SRC_TEST_SRC_DIR}/${testin}.cpp.in ${FAUST_BIN_TEST_SRC_DIR}/${testin}_${TEST_FPP}.cpp @ONLY)
# # Creation des executable en double et en float
# add_executable(${testin}_${TEST_FPP} ${FAUST_BIN_TEST_SRC_DIR}/${testin}_${TEST_FPP}.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)
# target_link_libraries(${testin}_${TEST_FPP} ${FAUST_TARGET} ${MATIO_LIB_FILE} ${HDF5_LIB_FILE} ${CUBLAS_LIB_FILE} ${CUDART_LIB_FILE} ${CUSPARSE_LIB_FILE})
# install(TARGETS ${testin}_${TEST_FPP} DESTINATION ${FAUST_INSTALL_BIN})
# endforeach()
# endforeach()
# # test GPU
# add_test(NAME HADAMARD_GPU_FACT_DOUBLE COMMAND ${FAUST_BIN_TEST_BIN_DIR}/hierarchical_fact_cu_double ${FAUST_DATA_MAT_DIR}/config_HADAMARD.mat)
# add_test(NAME FAUST_HIER_GPU_DOUBLE COMMAND ${FAUST_BIN_TEST_BIN_DIR}/hierarchical_fact_cu_double ${FAUST_DATA_MAT_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
# add_test(NAME FAUST_HIER_GPU_FLOAT COMMAND ${FAUST_BIN_TEST_BIN_DIR}/hierarchical_fact_cu_float ${FAUST_DATA_MAT_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
# add_test(NAME MEG_GPU_FACT_FLOAT COMMAND ${FAUST_BIN_TEST_BIN_DIR}/hierarchical_fact_cu_float ${FAUST_DATA_MAT_DIR}/config_MEG.mat 22332 1)
# add_test(NAME MEG_GPU_FACT_DOUBLE COMMAND ${FAUST_BIN_TEST_BIN_DIR}/hierarchical_fact_cu_double ${FAUST_DATA_MAT_DIR}/config_MEG.mat 22480 1)
# set(TIMEOUT_MEG 14000)
# set_tests_properties(MEG_GPU_FACT_FLOAT MEG_GPU_FACT_DOUBLE PROPERTIES TIMEOUT ${TIMEOUT_MEG})
#endif(BUILD_USE_GPU)
########################################################################
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment