Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
openfpm_pdata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
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
Sbalzarini Lab
Software
Parallel Computing
OpenFPM
openfpm_pdata
Commits
6a8d1df8
Commit
6a8d1df8
authored
4 years ago
by
Pietro Incardona
Browse files
Options
Downloads
Plain Diff
MErged with 3.0.0
parents
d1a38870
507a69ed
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+11
-0
11 additions, 0 deletions
CMakeLists.txt
openfpm_data
+1
-1
1 addition, 1 deletion
openfpm_data
with
12 additions
and
1 deletion
CMakeLists.txt
+
11
−
0
View file @
6a8d1df8
...
...
@@ -3,6 +3,10 @@ project(openfpm_pdata LANGUAGES C CXX)
enable_testing
()
if
(
POLICY CMP0074
)
cmake_policy
(
SET CMP0074 NEW
)
endif
()
list
(
APPEND CMAKE_MODULE_PATH
${
CMAKE_CURRENT_LIST_DIR
}
/cmake_modules/
)
set
(
BOOST_INCLUDE
${
Boost_INCLUDE_DIR
}
CACHE PATH
"Include directory for BOOST"
)
...
...
@@ -45,6 +49,12 @@ if(ENABLE_GPU)
if
(
CUDA_VERSION_MAJOR EQUAL 9 AND CUDA_VERSION_MINOR EQUAL 2
)
message
(
"CUDA is compatible"
)
set
(
WARNING_SUPPRESSION_AND_OPTION_NVCC -Xcudafe
"--display_error_number --diag_suppress=611 --diag_suppress=2885 --diag_suppress=2886 --diag_suppress=2887 --diag_suppress=2888 --diag_suppress=186 --diag_suppress=111"
--expt-extended-lambda
)
set
(
WARNING_SUPPRESSION_AND_OPTION_NVCC_TEXT
"-Xcudafe
\"
--display_error_number --diag_suppress=611 --diag_suppress=2885 --diag_suppress=2886 --diag_suppress=2887 --diag_suppress=2888 --diag_suppress=186 --diag_suppress=111
\"
--expt-extended-lambda"
)
elseif
(
CUDA_VERSION_MAJOR EQUAL 10 AND CUDA_VERSION_MINOR EQUAL 1
)
message
(
"CUDA is compatible"
)
set
(
WARNING_SUPPRESSION_AND_OPTION_NVCC -Xcudafe
"--display_error_number --diag_suppress=2915 --diag_suppress=2914 --diag_suppress=2912 --diag_suppress=2913 --diag_suppress=111 --diag_suppress=186 --diag_suppress=611 --diag_suppress=2928 --diag_suppress=2931 --diag_suppress=2929 --diag_suppress=2930"
--expt-extended-lambda
)
set
(
WARNING_SUPPRESSION_AND_OPTION_NVCC_TEXT
"-Xcudafe
\"
--display_error_number --diag_suppress=2915 --diag_suppress=2914 --diag_suppress=2912 --diag_suppress=2913 --diag_suppress=111 --diag_suppress=186 --diag_suppress=611 --diag_suppress=2928 --diag_suppress=2931 --diag_suppress=2929 --diag_suppress=2930
\"
--expt-extended-lambda"
)
else
()
message
(
FATAL_ERROR
"CUDA is incompatible, version 9.2 is only supported"
)
endif
()
...
...
@@ -186,6 +196,7 @@ file(WRITE cuda_lib "${CUDA_cudart_static_LIBRARY} ${CUDA_cudadevrt_LIBRARY}")
file
(
WRITE cuda_include
"-I
${
CUDA_INCLUDE_DIRS
}
"
)
file
(
WRITE mpi_include
"-I
${
MPI_C_INCLUDE_DIRS
}
"
)
file
(
WRITE mpi_libs
"
${
MPI_C_LINK_FLAGS
}
${
MPI_C_LIBRARIES
}
"
)
file
(
WRITE cuda_suppress_wr
"
${
WARNING_SUPPRESSION_AND_OPTION_NVCC_TEXT
}
"
)
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/src/config/config_cmake.h.in
${
CMAKE_CURRENT_SOURCE_DIR
}
/src/config/config.h
)
...
...
This diff is collapsed.
Click to expand it.
openfpm_data
@
a7fa383c
Subproject commit
1bbb808f85a184f2e40333fc49fe8d27d323eb96
Subproject commit
a7fa383c1d9c766ee2dec63bc867f77af6d16d3b
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