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
Admin message
GitLab upgrade completed. Current version is 17.11.4.
Show more breadcrumbs
faust group
faust
Commits
f2f70e82
Commit
f2f70e82
authored
9 years ago
by
Adrien Leman
Committed by
hhakim
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
external lib matio auto
parent
aae7b18c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMake/findExternalLibs.cmake
+13
-6
13 additions, 6 deletions
CMake/findExternalLibs.cmake
CMake/findMatlab.cmake
+8
-8
8 additions, 8 deletions
CMake/findMatlab.cmake
CMakeLists.txt
+1
-2
1 addition, 2 deletions
CMakeLists.txt
with
22 additions
and
16 deletions
CMake/findExternalLibs.cmake
+
13
−
6
View file @
f2f70e82
...
...
@@ -31,19 +31,24 @@ message(STATUS "******* Check externals library ***********")
# Default path library (where the library is automatically install)
add_library_path
(
LIBRARY_PATH_LIST_TMP_DEFAULT
"/opt/OpenBLAS"
"
${
PROJECT_SOURCE_DIR
}
/externals/unix/OpenBLAS"
"/usr/local"
#pour matio
"/usr/local/lib"
#pour matio
"
${
PROJECT_SOURCE_DIR
}
/externals/unix/matio/src/.libs"
#pour matio
)
add_include_path
(
INCLUDE_PATH_LIST_TMP_DEFAULT
"/opt/OpenBLAS"
"
${
PROJECT_SOURCE_DIR
}
/externals/unix/OpenBLAS"
"/usr/include/eigen3"
"
${
PROJECT_SOURCE_DIR
}
/externals/unix/eigen"
"/usr/local"
#pour matio
"
${
PROJECT_SOURCE_DIR
}
/externals/unix/matio/src"
#pour matio
)
#set(LIBRARY_PATH_LIST ${LIBRARY_PATH_LIST_TMP_DEFAULT}) # CACHE PATH "List of library paths used as PATH parameter in find_library")
#set(INCLUDE_PATH_LIST ${INCLUDE_PATH_LIST_TMP_DEFAULT})# CACHE PATH "List of include paths used as PATH parameter in find_path")
set
(
LIBRARY_PATH_LIST
${
LIBRARY_PATH_LIST_TMP_DEFAULT
}
)
# CACHE PATH "List of library paths used as PATH parameter in find_library")
set
(
INCLUDE_PATH_LIST
${
INCLUDE_PATH_LIST_TMP_DEFAULT
}
)
# CACHE PATH "List of include paths used as PATH parameter in find_path")
#message(STATUS "DEFAULT LIBRARY_PATH_LIST=${LIBRARY_PATH_LIST}")
message
(
STATUS
"DEFAULT INCLUDE_PATH_LIST=
${
INCLUDE_PATH_LIST
}
"
)
#
message(STATUS "DEFAULT INCLUDE_PATH_LIST=${INCLUDE_PATH_LIST}")
######## EIGEN ##############
include
(
CMake/findEIGENLib.cmake
)
...
...
@@ -55,7 +60,10 @@ endif(FAUST_USE_OPENBLAS)
if
(
FAUST_USE_MEX
)
include
(
CMake/findMatlab.cmake
)
endif
(
FAUST_USE_MEX
)
######## MATIO INCLUDE AND LIBRARY ##################
if
(
FAUST_USE_MATIO
)
include
(
CMake/findMATIOLib.cmake
)
endif
(
FAUST_USE_MATIO
)
add_library_path
(
LIBRARY_PATH_LIST_TMP3
"$ENV{CUDADIR}"
"$ENV{MATIODIR}"
"$ENV{HDF5_ROOT_DIR}"
"$ENV{OPENBLASDIR}"
"/usr"
"/usr/local"
"/usr/local/lib"
"/opt"
"/opt/local"
"/usr/lib/x86_64-linux-gnu/"
"
${
PROJECT_SOURCE_DIR
}
/externals"
)
...
...
@@ -65,13 +73,12 @@ add_include_path(INCLUDE_PATH_LIST_TMP3 "$ENV{CUDADIR}" "$ENV{MATIODIR}" "$ENV{M
set
(
LIBRARY_PATH_LIST
${
LIBRARY_PATH_LIST_TMP3
}
)
# CACHE PATH "List of library paths used as PATH parameter in find_library")
set
(
INCLUDE_PATH_LIST
${
INCLUDE_PATH_LIST_TMP3
}
)
# CACHE PATH "List of include paths used as PATH parameter in find_path")
check_external_libraries
(
matio MATIO_LIB_FILE 0
)
check_external_libraries
(
xml2 XML2_LIB_FILE 0
)
check_external_libraries
(
hdf5 HDF5_LIB_FILE 0
)
#LDFLAGS = -L$(CUDADIR)/lib64 -L$(MATIODIR)/lib -lpthread -lm -lcublas -lcudart -lcusparse -lstdc++ -lgfortran -lz -lmatio -lhdf5
check_external_includes
(
"libxml/parser.h"
XML_INC_DIR 0
)
check_external_includes
(
"matio.h"
MATIO_INC_DIR 0
)
...
...
This diff is collapsed.
Click to expand it.
CMake/findMatlab.cmake
+
8
−
8
View file @
f2f70e82
...
...
@@ -23,16 +23,16 @@
###### test if executable matlab is in the path ######
#if (FAUST_USE_MEX)
if
(
UNIX
)
message
(
STATUS
"MATLAB_DIR_TMP 1 =
${
MATLAB_DIR_TMP
}
"
)
#
message(STATUS "MATLAB_DIR_TMP 1 = ${MATLAB_DIR_TMP}")
exec_program
(
"which matlab | xargs echo"
OUTPUT_VARIABLE MATLAB_DIR_TMP
)
message
(
STATUS
"MATLAB_DIR_TMP 2 =
${
MATLAB_DIR_TMP
}
"
)
#
message(STATUS "MATLAB_DIR_TMP 2 = ${MATLAB_DIR_TMP}")
exec_program
(
"readlink
${
MATLAB_DIR_TMP
}
"
OUTPUT_VARIABLE READLINK_TMP
)
message
(
STATUS
"READLINK_TMP =
${
READLINK_TMP
}
"
)
#
message(STATUS "READLINK_TMP = ${READLINK_TMP}")
if
(
${
READLINK_TMP
}
MATCHES matlab
)
set
(
MATLAB_DIR_TMP
${
READLINK_TMP
}
)
message
(
STATUS
"MATLAB_DIR_TMP 3 =
${
MATLAB_DIR_TMP
}
"
)
#
message(STATUS "MATLAB_DIR_TMP 3 = ${MATLAB_DIR_TMP}")
endif
()
message
(
STATUS
"MATLAB_DIR_TMP 4 =
${
MATLAB_DIR_TMP
}
"
)
#
message(STATUS "MATLAB_DIR_TMP 4 = ${MATLAB_DIR_TMP}")
elseif
(
WIN32
)
exec_program
(
"where matlab.exe"
OUTPUT_VARIABLE MATLAB_DIR_TMP
)
...
...
@@ -51,10 +51,10 @@ if( ${MATLAB_DIR_TMP} MATCHES "matlab")
endif
()
set
(
MATLAB_ROOT
${
MATLAB_ROOT
}
CACHE PATH
"Matlab root directory"
)
message
(
STATUS
"MATLAB_DIR_TMP
${
MATLAB_DIR_TMP
}
"
)
message
(
STATUS
"MATLAB_ROOT has been found :
${
MATLAB_ROOT
}
"
)
#
message(STATUS "MATLAB_DIR_TMP ${MATLAB_DIR_TMP}")
#
message(STATUS "MATLAB_ROOT has been found : ${MATLAB_ROOT}")
# example : "/usr/local/MATLAB/R2014b"
message
(
STATUS
"MATLAB_ROOT has been found :
${
MATLAB_ROOT
}
"
)
message
(
STATUS
"MATLAB_ROOT has been found :
${
MATLAB_ROOT
}
"
)
set
(
MATLAB_INCLUDE_DIR
"
${
MATLAB_ROOT
}
/extern/include"
CACHE INTERNAL
"Matlab include directory"
)
set
(
MATLAB_ARCH_FILE
"
${
FAUST_TMP_BUILD_DIR
}
/matlab_arch.txt"
)
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
1
−
2
View file @
f2f70e82
...
...
@@ -50,7 +50,6 @@ option(BUILD_TESTING "Build Tests" ON)
set
(
FAUST_USE_SINGLEPRECISION OFF CACHE BOOL
"Using single precision instead of double precision for matrix and vector computations"
)
set
(
FAUST_USE_PROFILING OFF CACHE BOOL
"Profiling the code"
)
set
(
FAUST_USE_OPENMP OFF CACHE BOOL
"OpenMP Multithreading"
)
set
(
FAUST_USE_MATIO FF CACHE BOOL
"Using matio library to read mat files"
)
set
(
FAUST_USE_XML OFF CACHE BOOL
"Using xml configuration to read xml files"
)
set
(
FAUST_ISVERBOSE OFF CACHE BOOL
"Display useful message for debugging"
)
set
(
FAUST_USE_GPU OFF CACHE BOOL
"Using both CPU and GPU process"
)
...
...
@@ -58,7 +57,7 @@ set(FAUST_GEN_DOC OFF CACHE BOOL "Generate html documentation with doxygen")
set
(
FAUST_USE_MEX ON CACHE BOOL
"Generate Mexfiles"
)
set
(
FAUST_USE_OPENBLAS ON CACHE BOOL
"Using openBLAS for matrix and vector computations"
)
set
(
FAUST_USE_MATIO ON CACHE BOOL
"Using matio library to read mat files"
)
if
(
FAUST_USE_SINGLEPRECISION
)
message
(
STATUS
"**********SINGLEPRECISION ACTIF************"
)
...
...
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