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
0ec12982
Commit
0ec12982
authored
2 years ago
by
hhakim
Browse files
Options
Downloads
Patches
Plain Diff
Fix cmake script consistency issues about NO_MATIO and BUILD_READ_MAT_FILE options.
parent
0c6c99bd
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMake/findExternalLibs.cmake
+2
-2
2 additions, 2 deletions
CMake/findExternalLibs.cmake
CMakeLists.txt
+6
-0
6 additions, 0 deletions
CMakeLists.txt
wrapper/python/CMakeLists.txt
+37
-32
37 additions, 32 deletions
wrapper/python/CMakeLists.txt
with
45 additions
and
34 deletions
CMake/findExternalLibs.cmake
+
2
−
2
View file @
0ec12982
...
...
@@ -127,9 +127,9 @@ if(${USE_MATIO_STATIC_LIBS})
add_library
(
Z_STATIC_LIB STATIC IMPORTED GLOBAL
)
add_library
(
HDF5_STATIC_LIB STATIC IMPORTED GLOBAL
)
endif
()
#
if (BUILD_READ_MAT_FILE)
if
(
BUILD_READ_MAT_FILE
)
include
(
CMake/findMATIOLib.cmake
)
#
endif(BUILD_READ_MAT_FILE)
endif
(
BUILD_READ_MAT_FILE
)
######## XML INCLUDE AND LIBRARY ##################
if
(
BUILD_READ_XML_FILE
)
include
(
CMake/findXML2Lib.cmake
)
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
6
−
0
View file @
0ec12982
...
...
@@ -568,6 +568,9 @@ if(NOT "$ENV{MATIO_INC_DIR}" MATCHES "^$")
endif
()
############################################
if
(
NO_MATIO AND BUILD_READ_MAT_FILE
)
message
(
WARNING
"NO_MATIO option is enabled, BUILD_READ_MAT_FILE should be OFF"
)
endif
()
#########################################
###### FIND EXTERNALS LIBRARY ##########
...
...
@@ -681,6 +684,9 @@ if(NOT BUILD_EIGTJ_SVDTJ)
list
(
REMOVE_ITEM CPP_FILES
${
FILE
}
)
endforeach
()
endif
()
if
(
NO_MATIO
)
list
(
REMOVE_ITEM CPP_FILES
${
FAUST_SRC_DIR
}
/utils/matio/faust_init_from_matio.cpp
)
endif
()
if
(
NOT FAUST_TORCH
)
list
(
REMOVE_ITEM CPP_FILES
${
FAUST_SRC_LINEAR_OPERATOR_DIR
}
/CPU/faust_torch.cpp
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
wrapper/python/CMakeLists.txt
+
37
−
32
View file @
0ec12982
...
...
@@ -18,42 +18,47 @@ set(FAUST_PYTHON_LIBS "'faust'")
string
(
REGEX REPLACE
" "
"', '"
PYFAUST_PYTHON_REQUIREMENTS_AS_PYLIST
${
PYFAUST_PYTHON_REQUIREMENTS
}
)
set
(
PYFAUST_PYTHON_REQUIREMENTS_AS_PYLIST
"'
${
PYFAUST_PYTHON_REQUIREMENTS_AS_PYLIST
}
'"
)
if
(
${
USE_MATIO_STATIC_LIBS
}
)
# Build using matio static library and dependencies
if
(
NOT WIN32
)
set
(
PYTHON_EXT_EXTRA_OBJECTS
"[ '
${
MATIO_STATIC_LIB_PATH
}
', '
${
HDF5_STATIC_LIB_PATH
}
', '
${
Z_STATIC_LIB_PATH
}
']"
)
# the order matters for compilation
else
()
# WIN32 (tested on Visual Studio)
# compile the pyx and all faust .cpp needed (instead to link to faust.lib)
set
(
PY_EXT_SOURCES
"
${
PY_EXT_SOURCES
}
+glob('
${
FAUST_PYTHON_SRC_SRC_DIR
}
/*.cpp')"
)
# extract the name (without .lib suffix) and the path of each lib
# 1/ matio
get_filename_component
(
MATIO_LIB_DIR
${
MATIO_STATIC_LIB_PATH
}
DIRECTORY
)
get_filename_component
(
MATIO_LIB_NAME
${
MATIO_STATIC_LIB_PATH
}
NAME_WE
)
#set(FAUST_PYTHON_LIBS "'${MATIO_LIB_NAME}'") # override variable (ignoring faust lib., recompiling from code)
set
(
FAUST_PYTHON_LIBS
"
${
FAUST_PYTHON_LIBS
}
,'
${
MATIO_LIB_NAME
}
'"
)
# override variable (ignoring faust lib., recompiling from code)
set
(
FAUST_PYTHON_LIB_DIR
"
${
FAUST_PYTHON_LIB_DIR
}
,'
${
MATIO_LIB_DIR
}
'"
)
# 2/ zlib
get_filename_component
(
Z_LIB_DIR
${
Z_STATIC_LIB_PATH
}
DIRECTORY
)
get_filename_component
(
Z_LIB_NAME
${
Z_STATIC_LIB_PATH
}
NAME_WE
)
set
(
FAUST_PYTHON_LIBS
"
${
FAUST_PYTHON_LIBS
}
,'
${
Z_LIB_NAME
}
'"
)
set
(
FAUST_PYTHON_LIB_DIR
"
${
FAUST_PYTHON_LIB_DIR
}
,'
${
Z_LIB_DIR
}
'"
)
# 3/ hdf5
get_filename_component
(
HDF5_LIB_DIR
${
HDF5_STATIC_LIB_PATH
}
DIRECTORY
)
get_filename_component
(
HDF5_LIB_NAME
${
HDF5_STATIC_LIB_PATH
}
NAME_WE
)
set
(
FAUST_PYTHON_LIBS
"
${
FAUST_PYTHON_LIBS
}
,'
${
HDF5_LIB_NAME
}
'"
)
set
(
FAUST_PYTHON_LIB_DIR
"
${
FAUST_PYTHON_LIB_DIR
}
,'
${
HDF5_LIB_DIR
}
'"
)
if
(
BUILD_READ_MAT_FILE AND NOT NO_MATIO
)
if
(
${
USE_MATIO_STATIC_LIBS
}
)
# Build using matio static library and dependencies
if
(
NOT WIN32
)
set
(
PYTHON_EXT_EXTRA_OBJECTS
"[ '
${
MATIO_STATIC_LIB_PATH
}
', '
${
HDF5_STATIC_LIB_PATH
}
', '
${
Z_STATIC_LIB_PATH
}
']"
)
# the order matters for compilation
else
()
# WIN32 (tested on Visual Studio)
# compile the pyx and all faust .cpp needed (instead to link to faust.lib)
set
(
PY_EXT_SOURCES
"
${
PY_EXT_SOURCES
}
+glob('
${
FAUST_PYTHON_SRC_SRC_DIR
}
/*.cpp')"
)
# extract the name (without .lib suffix) and the path of each lib
# 1/ matio
get_filename_component
(
MATIO_LIB_DIR
${
MATIO_STATIC_LIB_PATH
}
DIRECTORY
)
get_filename_component
(
MATIO_LIB_NAME
${
MATIO_STATIC_LIB_PATH
}
NAME_WE
)
#set(FAUST_PYTHON_LIBS "'${MATIO_LIB_NAME}'") # override variable (ignoring faust lib., recompiling from code)
set
(
FAUST_PYTHON_LIBS
"
${
FAUST_PYTHON_LIBS
}
,'
${
MATIO_LIB_NAME
}
'"
)
# override variable (ignoring faust lib., recompiling from code)
set
(
FAUST_PYTHON_LIB_DIR
"
${
FAUST_PYTHON_LIB_DIR
}
,'
${
MATIO_LIB_DIR
}
'"
)
# 2/ zlib
get_filename_component
(
Z_LIB_DIR
${
Z_STATIC_LIB_PATH
}
DIRECTORY
)
get_filename_component
(
Z_LIB_NAME
${
Z_STATIC_LIB_PATH
}
NAME_WE
)
set
(
FAUST_PYTHON_LIBS
"
${
FAUST_PYTHON_LIBS
}
,'
${
Z_LIB_NAME
}
'"
)
set
(
FAUST_PYTHON_LIB_DIR
"
${
FAUST_PYTHON_LIB_DIR
}
,'
${
Z_LIB_DIR
}
'"
)
# 3/ hdf5
get_filename_component
(
HDF5_LIB_DIR
${
HDF5_STATIC_LIB_PATH
}
DIRECTORY
)
get_filename_component
(
HDF5_LIB_NAME
${
HDF5_STATIC_LIB_PATH
}
NAME_WE
)
set
(
FAUST_PYTHON_LIBS
"
${
FAUST_PYTHON_LIBS
}
,'
${
HDF5_LIB_NAME
}
'"
)
set
(
FAUST_PYTHON_LIB_DIR
"
${
FAUST_PYTHON_LIB_DIR
}
,'
${
HDF5_LIB_DIR
}
'"
)
set
(
PYTHON_EXT_EXTRA_OBJECTS
"None"
)
endif
()
else
()
# Build using matio dynamic library or static standalone library (including defs for zlib, hdf5 and szip -- which is normally in hdf5 static lib)
set
(
PYTHON_EXT_EXTRA_OBJECTS
"None"
)
get_filename_component
(
MATIO_LIB_DIR
${
MATIO_LIB_FILE
}
DIRECTORY
)
get_filename_component
(
MATIO_LIB_NAME
${
MATIO_LIB_FILE
}
NAME_WE
)
if
((
NOT WIN32 OR
${
CMAKE_GENERATOR
}
MATCHES
"MinGW Makefiles"
)
AND NOT
${
MATIO_LIB_FILE
}
MATCHES
".*
\\
.a"
)
string
(
REGEX REPLACE
"^lib"
""
MATIO_LIB_NAME
${
MATIO_LIB_NAME
}
)
endif
()
set
(
FAUST_PYTHON_LIBS
"
${
FAUST_PYTHON_LIBS
}
,'
${
MATIO_LIB_NAME
}
'"
)
set
(
FAUST_PYTHON_LIB_DIR
"
${
FAUST_PYTHON_LIB_DIR
}
,'
${
MATIO_LIB_DIR
}
'"
)
endif
()
else
()
# Build using matio dynamic library or static standalone library (including defs for zlib, hdf5 and szip -- which is normally in hdf5 static lib)
set
(
PYTHON_EXT_EXTRA_OBJECTS
"None"
)
get_filename_component
(
MATIO_LIB_DIR
${
MATIO_LIB_FILE
}
DIRECTORY
)
get_filename_component
(
MATIO_LIB_NAME
${
MATIO_LIB_FILE
}
NAME_WE
)
if
((
NOT WIN32 OR
${
CMAKE_GENERATOR
}
MATCHES
"MinGW Makefiles"
)
AND NOT
${
MATIO_LIB_FILE
}
MATCHES
".*
\\
.a"
)
string
(
REGEX REPLACE
"^lib"
""
MATIO_LIB_NAME
${
MATIO_LIB_NAME
}
)
endif
()
set
(
FAUST_PYTHON_LIBS
"
${
FAUST_PYTHON_LIBS
}
,'
${
MATIO_LIB_NAME
}
'"
)
set
(
FAUST_PYTHON_LIB_DIR
"
${
FAUST_PYTHON_LIB_DIR
}
,'
${
MATIO_LIB_DIR
}
'"
)
endif
()
set
(
PROC_LIST CPU
)
...
...
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
