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
963a8384
Commit
963a8384
authored
2 years ago
by
Pietro Incardona
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
a8b6feda
e7f27463
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
openfpm_numerics
+1
-1
1 addition, 1 deletion
openfpm_numerics
openfpm_vcluster
+1
-1
1 addition, 1 deletion
openfpm_vcluster
src/Vector/cuda/vector_dist_cuda_funcs.cuh
+2
-2
2 additions, 2 deletions
src/Vector/cuda/vector_dist_cuda_funcs.cuh
with
4 additions
and
4 deletions
openfpm_numerics
@
66ae0b6a
Compare
e3ebd6a3
...
66ae0b6a
Subproject commit
e3ebd6a3ef3c0de5a11267fb03135751c1780026
Subproject commit
66ae0b6ae0ef539bab766a1c630f1f22340b6c2e
This diff is collapsed.
Click to expand it.
openfpm_vcluster
@
4077b179
Compare
895aa0e5
...
4077b179
Subproject commit
895aa0e5387d7eb0f7b6be65dd18c48f7db08f64
Subproject commit
4077b1797cfd2e9f63dc5bc8b9e886fb5b51e7b7
This diff is collapsed.
Click to expand it.
src/Vector/cuda/vector_dist_cuda_funcs.cuh
+
2
−
2
View file @
963a8384
...
...
@@ -430,8 +430,8 @@ void remove_marked(vector_type & vd, const int n = 1024)
for (int j = 0 ; j < exp_tmp.ref() ; j++)
{exp_tmp.decRef();}*/
vd_pos_new
.
setMemory
(
exp_tmp
);
vd_prp_new
.
setMemoryArray
((
CudaMemory
*
)
&
exp_tmp2
);
//
vd_pos_new.setMemory(exp_tmp);
//
vd_prp_new.setMemoryArray((CudaMemory *)&exp_tmp2);
// resize them
...
...
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