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
b4e4cc3f
Commit
b4e4cc3f
authored
6 years ago
by
Pietro Incardona
Browse files
Options
Downloads
Patches
Plain Diff
Fixing reduce marked
parent
ee2cb6ae
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#972
failed
6 years ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
example/Vector/7_SPH_dlb_gpu_opt/Makefile
+2
-2
2 additions, 2 deletions
example/Vector/7_SPH_dlb_gpu_opt/Makefile
src/Vector/cuda/vector_dist_cuda_funcs.cuh
+7
-1
7 additions, 1 deletion
src/Vector/cuda/vector_dist_cuda_funcs.cuh
with
9 additions
and
3 deletions
example/Vector/7_SPH_dlb_gpu_opt/Makefile
+
2
−
2
View file @
b4e4cc3f
...
...
@@ -12,10 +12,10 @@ sph_dlb_test: OPT += -DTEST_RUN
sph_dlb_test
:
sph_dlb
%.o
:
%.cu
nvcc
-O
0
-g
-c
-isystem
=
/home/i-bird/MPI/include
--std
=
c++11
-o
$@
$<
$(
INCLUDE_PATH_NVCC
)
nvcc
-O
3
-g
-c
-isystem
=
/home/i-bird/MPI/include
--std
=
c++11
-o
$@
$<
$(
INCLUDE_PATH_NVCC
)
%.o
:
%.cpp
$(
CC
)
-O
0
$(
OPT
)
-g
-c
--std
=
c++11
-o
$@
$<
$(
INCLUDE_PATH
)
$(
CC
)
-O
3
$(
OPT
)
-g
-c
--std
=
c++11
-o
$@
$<
$(
INCLUDE_PATH
)
sph_dlb
:
$(OBJ)
$(
CC
)
-o
$@
$^
$(
CFLAGS
)
$(
LIBS_PATH
)
$(
LIBS
)
...
...
This diff is collapsed.
Click to expand it.
src/Vector/cuda/vector_dist_cuda_funcs.cuh
+
7
−
1
View file @
b4e4cc3f
...
...
@@ -373,7 +373,13 @@ void remove_marked(vector_type & vd)
// we have no particles to remove
if
(
*
(
int
*
)
mem
.
getPointer
()
!=
1
)
{
return
;}
{
if
(
*
(
int
*
)
mem
.
getPointer
()
>=
2
)
{
std
::
cout
<<
__FILE__
<<
":"
<<
__LINE__
<<
" error: removing marked particle. Carefull particle must be marked with 1 or 0, no other numbers"
<<
std
::
endl
;
}
return
;
}
// Get the mark point
mark
.
template
deviceToHost
<
0
>();
...
...
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