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
10701a2f
Commit
10701a2f
authored
3 years ago
by
Pietro Incardona
Browse files
Options
Downloads
Patches
Plain Diff
Activating openmp installation test
parent
6c4c571b
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#3910
passed
3 years ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
build.sh
+3
-1
3 additions, 1 deletion
build.sh
with
4 additions
and
2 deletions
CMakeLists.txt
+
1
−
1
View file @
10701a2f
...
...
@@ -257,7 +257,7 @@ endif()
file
(
WRITE error_code
"0"
)
file
(
WRITE cuda_lib
"
${
CUDA_cudart_static_LIBRARY
}
${
CUDA_cudadevrt_LIBRARY
}
"
)
if
(
CUDA_ON_BACKEND STREQUAL
"SEQUENTIAL"
OR CUDA_ON_BACKEND STREQUAL
"OpenMP"
)
file
(
WRITE cuda_include
"
-I
${
CUDA_INCLUDE_DIRS
}
-D__NVCC__ -DCUDART_VERSION=11000"
)
file
(
WRITE cuda_include
"-D__NVCC__ -DCUDART_VERSION=11000"
)
file
(
WRITE cuda_on_cpu
"YES"
)
else
()
file
(
WRITE cuda_include
"-I
${
CUDA_INCLUDE_DIRS
}
"
)
...
...
This diff is collapsed.
Click to expand it.
build.sh
+
3
−
1
View file @
10701a2f
...
...
@@ -71,7 +71,7 @@ else
fi
if
[
x
"
$with_gpu
"
==
x
"1"
]
;
then
gpu_support
=
-g
foward_options
=
"
$foward_options
--with-cuda-on-backend=CUDA"
else
gpu_support
=
fi
...
...
@@ -115,6 +115,8 @@ elif [ x"$comp_type" == x"garbageinjv" ]; then
foward_options
=
"
$foward_options
--enable-garbageinjv"
elif
[
x
"
$comp_type
"
==
x
"asan"
]
;
then
foward_options
=
"
$foward_options
--enable-asan"
elif
[
x
"
$comp_type
"
==
x
"openmp"
]
;
then
foward_options
=
"
$foward_options
--with-cuda-on-backend=OpenMP"
fi
echo
"Installing with: ./install
$gpu_support
-i
$dependency_dir
$install_options
-c
\"
$installation_dir
$foward_options
\"
"
...
...
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