Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
O
openfpm_pdata
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openfpm
openfpm_pdata
Commits
113f4b48
Commit
113f4b48
authored
Dec 11, 2018
by
incardon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
General fixing of the installer + example
parent
3fdc8779
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
install
install
+1
-1
src/Vector/cuda/vector_dist_cuda_funcs.cuh
src/Vector/cuda/vector_dist_cuda_funcs.cuh
+1
-1
src/Vector/cuda/vector_dist_gpu_unit_tests.cu
src/Vector/cuda/vector_dist_gpu_unit_tests.cu
+8
-8
No files found.
install
View file @
113f4b48
...
...
@@ -411,7 +411,7 @@ fi
### Create example.mk
install_base
=
$(
cat
install_dir
)
openmp_flags
=
"
$(
cat
openmp_flags
)
$(
cat
openfpm_flags
)
"
openmp_flags
=
"
$(
cat
openmp_flags
)
"
if
[
-d
"
$i_dir
/HDF5/lib"
]
;
then
hdf5_lib
=
$i_dir
/HDF5/lib
...
...
src/Vector/cuda/vector_dist_cuda_funcs.cuh
View file @
113f4b48
...
...
@@ -283,7 +283,7 @@ struct _max_: mgpu::maximum_t<red_type>
{};
template
<
unsigned
int
prp
,
template
<
typename
>
class
op
,
typename
vector_type
>
auto
reduce
(
vector_type
&
vd
)
->
typename
std
::
remove_reference
<
decltype
(
vd
.
template
getProp
<
prp
>(
0
))
>::
type
auto
reduce
_local
(
vector_type
&
vd
)
->
typename
std
::
remove_reference
<
decltype
(
vd
.
template
getProp
<
prp
>(
0
))
>::
type
{
typedef
typename
std
::
remove_reference
<
decltype
(
vd
.
template
getProp
<
prp
>(
0
))
>::
type
reduce_type
;
...
...
src/Vector/cuda/vector_dist_gpu_unit_tests.cu
View file @
113f4b48
...
...
@@ -736,20 +736,20 @@ BOOST_AUTO_TEST_CASE(vector_dist_reduce)
vd
.
template
hostToDeviceProp
<
0
,
1
,
2
,
3
>();
float
redf
=
reduce
<
0
,
_add_
>
(
vd
);
double
redd
=
reduce
<
1
,
_add_
>
(
vd
);
int
redi
=
reduce
<
2
,
_add_
>
(
vd
);
size_t
reds
=
reduce
<
3
,
_add_
>
(
vd
);
float
redf
=
reduce
_local
<
0
,
_add_
>
(
vd
);
double
redd
=
reduce
_local
<
1
,
_add_
>
(
vd
);
int
redi
=
reduce
_local
<
2
,
_add_
>
(
vd
);
size_t
reds
=
reduce
_local
<
3
,
_add_
>
(
vd
);
BOOST_REQUIRE_EQUAL
(
redf
,(
vd
.
size_local
()
+
1.0
)
*
(
vd
.
size_local
())
/
2.0
);
BOOST_REQUIRE_EQUAL
(
redd
,(
vd
.
size_local
()
+
1.0
)
*
(
vd
.
size_local
())
/
2.0
);
BOOST_REQUIRE_EQUAL
(
redi
,(
vd
.
size_local
()
+
1
)
*
(
vd
.
size_local
())
/
2
);
BOOST_REQUIRE_EQUAL
(
reds
,(
vd
.
size_local
()
+
1
)
*
(
vd
.
size_local
())
/
2
);
float
redf2
=
reduce
<
0
,
_max_
>
(
vd
);
double
redd2
=
reduce
<
1
,
_max_
>
(
vd
);
int
redi2
=
reduce
<
2
,
_max_
>
(
vd
);
size_t
reds2
=
reduce
<
3
,
_max_
>
(
vd
);
float
redf2
=
reduce
_local
<
0
,
_max_
>
(
vd
);
double
redd2
=
reduce
_local
<
1
,
_max_
>
(
vd
);
int
redi2
=
reduce
_local
<
2
,
_max_
>
(
vd
);
size_t
reds2
=
reduce
_local
<
3
,
_max_
>
(
vd
);
BOOST_REQUIRE_EQUAL
(
redf2
,
vd
.
size_local
());
BOOST_REQUIRE_EQUAL
(
redd2
,
vd
.
size_local
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment