Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VirtualFluids
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
iRMB
VirtualFluids
Commits
22acab26
Commit
22acab26
authored
4 years ago
by
Soeren Peters
Browse files
Options
Downloads
Patches
Plain Diff
Fix python build.
parent
dd4da690
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!34
Add new library, which contains the calculation of the macroscopic quantities and a general cumulant computation. (Closes #13)
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
setup.py
+1
-1
1 addition, 1 deletion
setup.py
src/gpu/VirtualFluids_GPU/CMakeLists.txt
+1
-3
1 addition, 3 deletions
src/gpu/VirtualFluids_GPU/CMakeLists.txt
src/lbm/cuda/CMakeLists.txt
+1
-2
1 addition, 2 deletions
src/lbm/cuda/CMakeLists.txt
with
3 additions
and
6 deletions
setup.py
+
1
−
1
View file @
22acab26
...
...
@@ -9,7 +9,7 @@ from setuptools.command.build_ext import build_ext
from
distutils.version
import
LooseVersion
vf_cmake_args
=
[
"
--preset=cpu_make
"
"
--preset=cpu_make
"
,
"
-DBUILD_VF_PYTHON_BINDINGS=ON
"
]
...
...
This diff is collapsed.
Click to expand it.
src/gpu/VirtualFluids_GPU/CMakeLists.txt
+
1
−
3
View file @
22acab26
...
...
@@ -5,7 +5,7 @@ if(MSVC)
set
(
additional_libraries ws2_32 Traffic
)
# ws_32 throws an error on Phoenix
endif
()
vf_add_library
(
BUILDTYPE static
PRIVATE_LINK
${
additional_libraries
}
GridGenerator basics MPI::MPI_CXX PUBLIC_LINK lbmCuda
)
vf_add_library
(
PRIVATE_LINK
${
additional_libraries
}
GridGenerator basics MPI::MPI_CXX PUBLIC_LINK lbmCuda
)
linkBoost
(
COMPONENTS
"serialization"
)
...
...
@@ -13,6 +13,4 @@ linkBoost(COMPONENTS "serialization")
#https://stackoverflow.com/questions/6832666/lnk2019-when-including-asio-headers-solution-generated-with-cmake
#https://stackoverflow.com/questions/27442885/syntax-error-with-stdnumeric-limitsmax
#set_target_properties(VirtualFluids_GPU PROPERTIES CUDA_RESOLVE_DEVICE_SYMBOLS ON)
set_target_properties
(
VirtualFluids_GPU PROPERTIES CUDA_SEPARABLE_COMPILATION ON
)
#set_target_properties(VirtualFluids_GPU PROPERTIES POSITION_INDEPENDENT_CODE ON)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/lbm/cuda/CMakeLists.txt
+
1
−
2
View file @
22acab26
...
...
@@ -3,7 +3,6 @@ project(lbmCuda LANGUAGES CUDA CXX)
vf_add_library
(
NAME lbmCuda BUILDTYPE static PUBLIC_LINK basics FOLDER ../../lbm
)
#set_target_properties(lbm PROPERTIES CUDA_RESOLVE_DEVICE_SYMBOLS ON)
set_target_properties
(
lbmCuda PROPERTIES CUDA_SEPARABLE_COMPILATION ON
)
#set_target_properties(lbm PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_source_files_properties
(
../CalcMac.cpp PROPERTIES LANGUAGE CUDA
)
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