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
59467cfe
Commit
59467cfe
authored
4 years ago
by
hhakim
Browse files
Options
Downloads
Patches
Plain Diff
Fix issue #153 (matlab wrapper build with gpu_mod).
parent
f901fddc
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+6
-3
6 additions, 3 deletions
CMakeLists.txt
with
6 additions
and
3 deletions
CMakeLists.txt
+
6
−
3
View file @
59467cfe
...
@@ -649,6 +649,12 @@ if(FAUST_TORCH)
...
@@ -649,6 +649,12 @@ if(FAUST_TORCH)
message
(
STATUS TORCH_LIBRARY=
${
TORCH_LIBRARY
}
)
message
(
STATUS TORCH_LIBRARY=
${
TORCH_LIBRARY
}
)
endif
()
endif
()
# before add Matlab directory, because its includes depend on faust's
if
(
USE_GPU_MOD
)
include_directories
(
${
FAUST_TARGET
}
${
GPU_MOD_INCLUDE_DIR
}
${
GPU_MOD_INCLUDE_DIR
}
/../build
)
include_directories
(
${
FAUST_TARGET
}
${
FAUST_SRC_LINEAR_OPERATOR_GPU2_DIR
}
)
endif
()
########### add_subdirectory ###############
########### add_subdirectory ###############
if
(
BUILD_WRAPPER_PYTHON
)
if
(
BUILD_WRAPPER_PYTHON
)
...
@@ -744,15 +750,12 @@ if(BUILD_MULTITHREAD)
...
@@ -744,15 +750,12 @@ if(BUILD_MULTITHREAD)
endif
()
endif
()
if
(
USE_GPU_MOD
)
if
(
USE_GPU_MOD
)
include_directories
(
${
FAUST_TARGET
}
${
GPU_MOD_INCLUDE_DIR
}
${
GPU_MOD_INCLUDE_DIR
}
/../build
)
include_directories
(
${
FAUST_TARGET
}
${
FAUST_SRC_LINEAR_OPERATOR_GPU2_DIR
}
)
target_include_directories
(
${
FAUST_TARGET
}
PUBLIC
${
GPU_MOD_INCLUDE_DIR
}
${
GPU_MOD_INCLUDE_DIR
}
/../build
)
target_include_directories
(
${
FAUST_TARGET
}
PUBLIC
${
GPU_MOD_INCLUDE_DIR
}
${
GPU_MOD_INCLUDE_DIR
}
/../build
)
target_link_libraries
(
${
FAUST_TARGET
}
${
GPU_MOD_LIBS
}
)
target_link_libraries
(
${
FAUST_TARGET
}
${
GPU_MOD_LIBS
}
)
if
(
UNIX
)
if
(
UNIX
)
target_link_libraries
(
${
FAUST_TARGET
}
dl
)
target_link_libraries
(
${
FAUST_TARGET
}
dl
)
endif
(
UNIX
)
endif
(
UNIX
)
install
(
FILES
${
GPU_MOD_INCLUDE_DIR
}
/../build/libgm.so DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_EXECUTE WORLD_READ
)
install
(
FILES
${
GPU_MOD_INCLUDE_DIR
}
/../build/libgm.so DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_EXECUTE WORLD_READ
)
include_directories
(
${
FAUST_TARGET
}
${
FAUST_SRC_LINEAR_OPERATOR_GPU2_DIR
}
)
endif
()
endif
()
# In case of GPU, the "CUDA" library libfaust_matrix_cu.a is linked with faust (libfaust_matrix_cu.a is not a OBJECT library)
# In case of GPU, the "CUDA" library libfaust_matrix_cu.a is linked with faust (libfaust_matrix_cu.a is not a OBJECT library)
...
...
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