new name option input

CMake/findExternalLibs.cmake

@@ -65,13 +65,13 @@ if (BUILD_MATLAB_MEX_FILES)
 	include(CMake/findMatlab.cmake)
 endif(BUILD_MATLAB_MEX_FILES)
 ######## MATIO INCLUDE AND LIBRARY ##################
-if (FAUST_USE_MATIO)
+if (BUILD_READ_MAT_FILE)
 	include(CMake/findMATIOLib.cmake)
-endif(FAUST_USE_MATIO)
+endif(BUILD_READ_MAT_FILE)
 ######## XML INCLUDE AND LIBRARY ##################
-if (FAUST_USE_XML)
+if (BUILD_READ_XML_FILE)
 	include(CMake/findXML2Lib.cmake)
-endif(FAUST_USE_XML)
+endif(BUILD_READ_XML_FILE)
 
 
 

CMakeLists.txt

@@ -68,13 +68,11 @@ option(BUILD_DEBUG "Enable MPTK Debug mode." OFF)
 # Allows Matlab MEX files :
 option(BUILD_USE_GPU  "Using both CPU and GPU process" OFF)
 
-
 option(BUILD_MATLAB_MEX_FILES "Enable building Matlab MEX files." ON)
 # Using openBLAS for matrix and vector computations
 option(BUILD_OPENBLAS "Using openBLAS for matrix and vector computations" OFF)
-
-
-
+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" OFF)
 
 
 #CMAKE_DEPENDENT_OPTION
@@ -88,10 +86,11 @@ set(FAUST_USE_PROFILING OFF CACHE BOOL "Profiling the code")
 #set(BUILD_USE_GPU OFF CACHE BOOL "Using both CPU and GPU process")
 #set(BUILD_DOCUMENTATION OFF CACHE BOOL "Generate html documentation with doxygen")
 
-set(FAUST_USE_XML OFF CACHE BOOL "Using xml configuration to read xml files")
+#set(BUILD_READ_XML_FILE OFF CACHE BOOL "Using xml configuration to read xml files")
 #set(BUILD_MATLAB_MEX_FILES ON CACHE BOOL "Generate Mexfiles")
 #set(BUILD_OPENBLAS OFF CACHE BOOL "Using openBLAS for matrix and vector computations")
-set(FAUST_USE_MATIO OFF CACHE BOOL "Using matio library to read mat files")
+#set(BUILD_READ_MAT_FILE OFF CACHE BOOL "Using matio library to read mat files")
+
 if (FAUST_USE_SINGLEPRECISION)
 	message(STATUS "**********SINGLEPRECISION ACTIF************")
 endif()
@@ -104,10 +103,10 @@ endif()
 if (FAUST_USE_PROFILING)
 	message(STATUS "**********PROFILING ACTIF************")
 endif()
-if (FAUST_USE_MATIO)
+if (BUILD_READ_MAT_FILE)
 	message(STATUS "**********MATIO ACTIF************")
 endif()
-if (FAUST_USE_XML)
+if (BUILD_READ_XML_FILE)
 	message(STATUS "**********XML ACTIF************")
 endif()
 if (BUILD_VERBOSE)

README.txt

@@ -45,10 +45,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Install:
 
 1-	Unpack the directory. 
-2-	mkdir ./build 
-3-  cd build
+2-	mkdir ./build
+3-	cd ./build
 4-	cmake ..
-5-	make install
+	cmake .. -DBUILD_OPENBLAS=ON 
+	cmake .. -DCMAKE_INSTALL_PREFIX="/home/username/Faust_install"
+	ccmake ..
+
+5-	make
+6- make install
+
 ##########################################################################
 
 

misc/CTest_nightly/run_nightly_OS-X.sh

@@ -49,8 +49,8 @@ fi
 # CTEST OPTION 
 export CTEST_CONFIGURE_OPTIONS="\
 -DBUILD_OPENBLAS=ON;\
--DFAUST_USE_MATIO=ON;\
--DFAUST_USE_XML=ON;\
+-DBUILD_READ_MAT_FILE=ON;\
+-DBUILD_READ_XML_FILE=ON;\
 -DBUILD_MATLAB_MEX_FILES=ON;\
 -DBUILD_USE_GPU:BOOL=OFF;\
 -DFAUST_USE_PROFILING=OFF;\

misc/CTest_nightly/run_nightly_cormier.sh

@@ -51,8 +51,8 @@ fi
 # CTEST OPTION 
 export CTEST_CONFIGURE_OPTIONS="\
 -DBUILD_OPENBLAS=ON;\
--DFAUST_USE_MATIO=ON;\
--DFAUST_USE_XML=ON;\
+-DBUILD_READ_MAT_FILE=ON;\
+-DBUILD_READ_XML_FILE=ON;\
 -DBUILD_MATLAB_MEX_FILES=ON;\
 -DBUILD_USE_GPU:BOOL=ON;\
 -DFAUST_USE_PROFILING=OFF;\

misc/CTest_nightly/run_nightly_plombier.sh

@@ -48,8 +48,8 @@ export PATH=/usr/local/cuda-6.5/bin:/usr/local/bin:/usr/bin:$PATH
 # CTEST OPTION 
 export CTEST_CONFIGURE_OPTIONS="
 -DBUILD_OPENBLAS=ON;\
--DFAUST_USE_MATIO=ON;\
--DFAUST_USE_XML=OFF;\
+-DBUILD_READ_MAT_FILE=ON;\
+-DBUILD_READ_XML_FILE=OFF;\
 -DBUILD_MATLAB_MEX_FILES=OFF;\
 -DBUILD_USE_GPU:BOOL=OFF;\
 -DFAUST_USE_PROFILING=OFF;\

misc/CTest_nightly/run_nightly_ubuntu_AMD64.sh

@@ -51,8 +51,8 @@ fi
 # CTEST OPTION 
 export CTEST_CONFIGURE_OPTIONS="\
 -DBUILD_OPENBLAS=ON;\
--DFAUST_USE_MATIO=ON;\
--DFAUST_USE_XML=ON;\
+-DBUILD_READ_MAT_FILE=ON;\
+-DBUILD_READ_XML_FILE=ON;\
 -DBUILD_MATLAB_MEX_FILES=ON;\
 -DBUILD_USE_GPU:BOOL=OFF;\
 -DFAUST_USE_PROFILING=OFF;\

misc/test/CMakeLists.txt

@@ -5,9 +5,9 @@ message(STATUS "CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
 #${FAUST_EXCEPTION_SRC_DIR}
 include_directories(${FAUST_SRC_LINEAR_OPERATOR_DIR} ${FAUST_LINEAR_OPERATOR_CPU_SRC_DIR} ${FAUST_ALGORITHM_CONSTRAINT_SRC_DIR} ${FAUST_ALGORITHM_FACTORIZATION_SRC_DIR} ${EIGEN_INC_DIR})
 
-if(FAUST_USE_MATIO)
+if(BUILD_READ_MAT_FILE)
 	include_directories(${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR} ${MATIO_INC_DIR})
-endif(FAUST_USE_MATIO)
+endif(BUILD_READ_MAT_FILE)
 
 #rajout OPENBLAS_INC_DIR pour la compatibilite UBUNTU
 if(BUILD_OPENBLAS)
@@ -16,7 +16,7 @@ endif()
 
 
 ####### IF THE MATIO LIBRARY IS AVAILABLE ELSE WE USE TXT OR XML DATA  #######
-if(MATIO_LIB_FILE AND MATIO_INC_DIR AND FAUST_USE_MATIO) # AND HDF5_LIB_FILE)
+if(MATIO_LIB_FILE AND MATIO_INC_DIR AND BUILD_READ_MAT_FILE) # AND HDF5_LIB_FILE)
 
 	### list of executable generated in double and simple precision
 	# hierarchical_fact : test the hierarchical_fact algorithm
@@ -49,9 +49,9 @@ if(MATIO_LIB_FILE AND MATIO_INC_DIR AND FAUST_USE_MATIO) # AND HDF5_LIB_FILE)
 
 
 ###### IN CASE MATIO IS NOT AVAILABLE YOU CAN RUN THE TEST ######
-else(MATIO_LIB_FILE AND MATIO_INC_DIR AND FAUST_USE_MATIO)	
+else(MATIO_LIB_FILE AND MATIO_INC_DIR AND BUILD_READ_MAT_FILE)	
 	message(STATUS "Library matio is not available. Please used .xml input files.")
-endif(MATIO_LIB_FILE AND MATIO_INC_DIR AND FAUST_USE_MATIO)
+endif(MATIO_LIB_FILE AND MATIO_INC_DIR AND BUILD_READ_MAT_FILE)
 
 
 
@@ -77,7 +77,7 @@ set(TIMEOUT_COMP 10)
 
 
 # MATLAB input format
-if (FAUST_USE_MATIO)
+if (BUILD_READ_MAT_FILE)
 	
 	# test for the algorithm (palm4MSA and hierarchical_fact) for different configuration (MEG, Hadamard,...) 
 	add_test(NAME HADAMARD_FACT_DOUBLE COMMAND  ${FAUST_BIN_TEST_BIN_DIR}/hierarchicalFactorization_double 	${FAUST_DATA_MAT_DIR}/config_HADAMARD.mat)
@@ -104,11 +104,11 @@ if (FAUST_USE_MATIO)
 	
 	set_tests_properties(FIG_MULTIPLY_COMPTIME PROPERTIES TIMEOUT 120)
 
-endif (FAUST_USE_MATIO)
+endif (BUILD_READ_MAT_FILE)
 
 
 # XML input format
-if (FAUST_USE_XML)
+if (BUILD_READ_XML_FILE)
 	add_test(NAME FAUST_HIER_CMDLINE COMMAND ${FAUST_BIN_CMDLINE_BIN_DIR}/launch_hierarchical_fact ${FAUST_CONFIG_XML_DIR}/hier_fact_config.xml ${FAUST_DATA_TXT_DIR}/hier_fact_data.txt )
 
 	add_test(NAME FAUST_HIER_TRANSPOSE_CMDLINE COMMAND ${FAUST_BIN_CMDLINE_BIN_DIR}/launch_hierarchical_fact ${FAUST_CONFIG_XML_DIR}/trans_hier_fact_config.xml ${FAUST_DATA_TXT_DIR}/hier_fact_data.txt  T)
@@ -117,7 +117,7 @@ if (FAUST_USE_XML)
 	# limit the time of the process in case of bug... 
 	set_tests_properties(FAUST_HIER_CMDLINE FAUST_HIER_TRANSPOSE_CMDLINE PROPERTIES TIMEOUT ${TIMEOUT_COMP})
 	set_tests_properties(MEG_FACT_CMDLINE PROPERTIES TIMEOUT ${TIMEOUT_MEG})	 
-endif(FAUST_USE_XML)
+endif(BUILD_READ_XML_FILE)
 
 
 
@@ -152,9 +152,9 @@ endif()
 #	#${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(FAUST_USE_MATIO)
+#	if(BUILD_READ_MAT_FILE)
 #		include_directories(${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR} ${MATIO_INC_DIR})
-#	endif(FAUST_USE_MATIO)
+#	endif(BUILD_READ_MAT_FILE)
 
 
 #	add_definitions(-DCOMPILE_GPU)

misc/test/GPU_test/CMakeLists.txt

@@ -3,9 +3,9 @@
 
 include_directories(${FAUST_SRC_LINEAR_OPERATOR_DIR} ${FAUST_LINEAR_OPERATOR_CPU_SRC_DIR} ${FAUST_SRC_LINEAR_OPERATOR_GPU_DIR} ${CUDA_INC_DIR} ${CUDA_RUNTIME_API_INC_DIR} ${CUSPARSE_INC_DIR} ${CUBLAS_V2_INC_DIR} ${FAUST_ALGORITHM_CONSTRAINT_SRC_DIR} ${FAUST_ALGORITHM_FACTORIZATION_SRC_DIR} ${EIGEN_INC_DIR})
 
-if(FAUST_USE_MATIO)
+if(BUILD_READ_MAT_FILE)
 	include_directories(${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR} ${MATIO_INC_DIR})
-endif(FAUST_USE_MATIO)
+endif(BUILD_READ_MAT_FILE)
 
 
 add_definitions(-DCOMPILE_GPU)