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
0
Issues
0
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
3d2143d3
Commit
3d2143d3
authored
Mar 11, 2019
by
incardon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing MetaParser function
parent
872b9877
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
14 deletions
+10
-14
example/Vector/3_molecular_dynamic_gpu/main.cu
example/Vector/3_molecular_dynamic_gpu/main.cu
+0
-2
install
install
+2
-2
src/Vector/vector_dist.hpp
src/Vector/vector_dist.hpp
+5
-7
src/Vector/vector_dist_kernel.hpp
src/Vector/vector_dist_kernel.hpp
+3
-3
No files found.
example/Vector/3_molecular_dynamic_gpu/main.cu
View file @
3d2143d3
...
@@ -96,8 +96,6 @@ constexpr int energy = 2;
...
@@ -96,8 +96,6 @@ constexpr int energy = 2;
template
<
typename
vector_dist_type
,
typename
NN_type
>
template
<
typename
vector_dist_type
,
typename
NN_type
>
__global__
void
calc_force_gpu
(
vector_dist_type
vd
,
NN_type
NN
,
real_number
sigma12
,
real_number
sigma6
,
real_number
r_cut2
)
__global__
void
calc_force_gpu
(
vector_dist_type
vd
,
NN_type
NN
,
real_number
sigma12
,
real_number
sigma6
,
real_number
r_cut2
)
{
{
if
(
blockIdx
.
x
==
0
&&
threadIdx
.
x
==
0
)
{
printf
(
"AAAAA %ld "
,
vd
.
size
());}
auto
p
=
GET_PARTICLE
(
vd
);
auto
p
=
GET_PARTICLE
(
vd
);
// Get the position xp of the particle
// Get the position xp of the particle
...
...
install
View file @
3d2143d3
...
@@ -420,11 +420,11 @@ fi
...
@@ -420,11 +420,11 @@ fi
echo
"INCLUDE_PATH=
$cuda_include_dirs
-Wno-deprecated-declarations
$openmp_flags
-I. -I
$install_base
/openfpm_numerics/include -I
$install_base
/openfpm_pdata/include/config -I
$install_base
/openfpm_pdata/include -I
$install_base
/openfpm_data/include -I
$install_base
/openfpm_vcluster/include -I
$install_base
/openfpm_io/include -I
$install_base
/openfpm_devices/include -I
$i_dir
/METIS/include -I
$i_dir
/PARMETIS/include -I
$i_dir
/BOOST/include -I
$i_dir
/HDF5/include -I
$i_dir
/LIBHILBERT/include
$lin_alg_inc
"
>
example.mk
echo
"INCLUDE_PATH=
$cuda_include_dirs
-Wno-deprecated-declarations
$openmp_flags
-I. -I
$install_base
/openfpm_numerics/include -I
$install_base
/openfpm_pdata/include/config -I
$install_base
/openfpm_pdata/include -I
$install_base
/openfpm_data/include -I
$install_base
/openfpm_vcluster/include -I
$install_base
/openfpm_io/include -I
$install_base
/openfpm_devices/include -I
$i_dir
/METIS/include -I
$i_dir
/PARMETIS/include -I
$i_dir
/BOOST/include -I
$i_dir
/HDF5/include -I
$i_dir
/LIBHILBERT/include
$lin_alg_inc
"
>
example.mk
echo
"LIBS_PATH=
$openmp_flags
-L
$install_base
/openfpm_devices/lib -L
$install_base
/openfpm_pdata/lib -L
$install_base
/openfpm_vcluster/lib -L
$i_dir
/METIS/lib -L
$i_dir
/PARMETIS/lib -L
$i_dir
/BOOST/lib -L
$hdf5_lib
-L
$i_dir
/LIBHILBERT/lib
$lin_alg_dir
"
>>
example.mk
echo
"LIBS_PATH=
$openmp_flags
-L
$install_base
/openfpm_devices/lib -L
$install_base
/openfpm_pdata/lib -L
$install_base
/openfpm_vcluster/lib -L
$i_dir
/METIS/lib -L
$i_dir
/PARMETIS/lib -L
$i_dir
/BOOST/lib -L
$hdf5_lib
-L
$i_dir
/LIBHILBERT/lib
$lin_alg_dir
"
>>
example.mk
if
[
x
"
$gpu_support
"
==
x
"1"
]
;
then
if
[
x
"
$gpu_support
"
==
x
"1"
]
;
then
echo
"LIBS=-lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lhdf5 -llibhilbert
$(
cat
cuda_lib
)
$lin_alg_lib
-ldl"
>>
example.mk
echo
"LIBS=-lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -l
boost_program_options -l
hdf5 -llibhilbert
$(
cat
cuda_lib
)
$lin_alg_lib
-ldl"
>>
example.mk
echo
"LIBS_SE2=-lvcluster -lofpmmemory_se2 -lparmetis -lmetis -lboost_iostreams -lboost_program_options -lhdf5 -llibhilbert
$(
cat
cuda_lib
)
$lin_alg_lib
"
>>
example.mk
echo
"LIBS_SE2=-lvcluster -lofpmmemory_se2 -lparmetis -lmetis -lboost_iostreams -lboost_program_options -lhdf5 -llibhilbert
$(
cat
cuda_lib
)
$lin_alg_lib
"
>>
example.mk
else
else
echo
"LIBS=-lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lboost_program_options -lhdf5 -llibhilbert
$lin_alg_lib
-ldl"
>>
example.mk
echo
"LIBS=-lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lboost_program_options -lhdf5 -llibhilbert
$lin_alg_lib
-ldl"
>>
example.mk
echo
"LIBS_SE2=-lvcluster -lofpmmemory_se2 -lparmetis -lmetis -lboost_iostreams -lhdf5 -llibhilbert
$lin_alg_lib
"
>>
example.mk
echo
"LIBS_SE2=-lvcluster -lofpmmemory_se2 -lparmetis -lmetis -lboost_iostreams -l
boost_program_options -l
hdf5 -llibhilbert
$lin_alg_lib
"
>>
example.mk
fi
fi
echo
"INCLUDE_PATH_NVCC=-Xcompiler="
-Wno-deprecated-declarations
"
$(
cat
openmp_flags
)
-Xcudafe
\"
--display_error_number --diag_suppress=2885 --diag_suppress=2886 --diag_suppress=2887 --diag_suppress=2888 --diag_suppress=186 --diag_suppress=111
\"
--expt-extended-lambda -I. -I
$install_base
/openfpm_numerics/include -I
$install_base
/openfpm_pdata/include/config -I
$install_base
/openfpm_pdata/include -I
$install_base
/openfpm_data/include -I
$install_base
/openfpm_vcluster/include -I
$install_base
/openfpm_io/include -I
$install_base
/openfpm_devices/include -I
$i_dir
/METIS/include -I
$i_dir
/PARMETIS/include -I
$i_dir
/BOOST/include -I
$i_dir
/HDF5/include -I
$i_dir
/LIBHILBERT/include
$lin_alg_inc
"
>>
example.mk
echo
"INCLUDE_PATH_NVCC=-Xcompiler="
-Wno-deprecated-declarations
"
$(
cat
openmp_flags
)
-Xcudafe
\"
--display_error_number --diag_suppress=2885 --diag_suppress=2886 --diag_suppress=2887 --diag_suppress=2888 --diag_suppress=186 --diag_suppress=111
\"
--expt-extended-lambda -I. -I
$install_base
/openfpm_numerics/include -I
$install_base
/openfpm_pdata/include/config -I
$install_base
/openfpm_pdata/include -I
$install_base
/openfpm_data/include -I
$install_base
/openfpm_vcluster/include -I
$install_base
/openfpm_io/include -I
$install_base
/openfpm_devices/include -I
$i_dir
/METIS/include -I
$i_dir
/PARMETIS/include -I
$i_dir
/BOOST/include -I
$i_dir
/HDF5/include -I
$i_dir
/LIBHILBERT/include
$lin_alg_inc
"
>>
example.mk
cp
example.mk src/example.mk
cp
example.mk src/example.mk
...
...
src/Vector/vector_dist.hpp
View file @
3d2143d3
...
@@ -2372,9 +2372,7 @@ public:
...
@@ -2372,9 +2372,7 @@ public:
*/
*/
inline
bool
write
(
std
::
string
out
,
int
opt
=
VTK_WRITER
)
inline
bool
write
(
std
::
string
out
,
int
opt
=
VTK_WRITER
)
{
{
write
(
out
,
""
,
opt
);
return
write
(
out
,
""
,
opt
);
return
true
;
}
}
/*! \brief Output particle position and properties
/*! \brief Output particle position and properties
...
@@ -2461,7 +2459,7 @@ public:
...
@@ -2461,7 +2459,7 @@ public:
*/
*/
inline
bool
write_frame
(
std
::
string
out
,
size_t
iteration
,
int
opt
=
VTK_WRITER
)
inline
bool
write_frame
(
std
::
string
out
,
size_t
iteration
,
int
opt
=
VTK_WRITER
)
{
{
write_frame
(
out
,
iteration
,
""
,
opt
);
return
write_frame
(
out
,
iteration
,
""
,
opt
);
}
}
/*! \brief Output particle position and properties
/*! \brief Output particle position and properties
...
@@ -2503,7 +2501,7 @@ public:
...
@@ -2503,7 +2501,7 @@ public:
std
::
string
output
=
std
::
to_string
(
out
+
"_"
+
std
::
to_string
(
v_cl
.
getProcessUnitID
())
+
"_"
+
std
::
to_string
(
iteration
)
+
std
::
to_string
(
".vtk"
));
std
::
string
output
=
std
::
to_string
(
out
+
"_"
+
std
::
to_string
(
v_cl
.
getProcessUnitID
())
+
"_"
+
std
::
to_string
(
iteration
)
+
std
::
to_string
(
".vtk"
));
// Write the VTK file
// Write the VTK file
return
vtk_writer
.
write
(
output
,
prp_names
,
"
"
,
"particles
"
,
ft
);
return
vtk_writer
.
write
(
output
,
prp_names
,
"
particles"
,
"
"
,
ft
);
}
}
}
}
...
@@ -2738,7 +2736,7 @@ public:
...
@@ -2738,7 +2736,7 @@ public:
*/
*/
template
<
unsigned
int
...
prp
>
vector_dist_ker
<
dim
,
St
,
prop
>
toKernel
()
template
<
unsigned
int
...
prp
>
vector_dist_ker
<
dim
,
St
,
prop
>
toKernel
()
{
{
vector_dist_ker
<
dim
,
St
,
prop
>
v
(
v_pos
.
toKernel
(),
v_prp
.
toKernel
());
vector_dist_ker
<
dim
,
St
,
prop
>
v
(
g_m
,
v_pos
.
toKernel
(),
v_prp
.
toKernel
());
return
v
;
return
v
;
}
}
...
@@ -2752,7 +2750,7 @@ public:
...
@@ -2752,7 +2750,7 @@ public:
*/
*/
template
<
unsigned
int
...
prp
>
vector_dist_ker
<
dim
,
St
,
prop
>
toKernel_sorted
()
template
<
unsigned
int
...
prp
>
vector_dist_ker
<
dim
,
St
,
prop
>
toKernel_sorted
()
{
{
vector_dist_ker
<
dim
,
St
,
prop
>
v
(
v_pos_out
.
toKernel
(),
v_prp_out
.
toKernel
());
vector_dist_ker
<
dim
,
St
,
prop
>
v
(
g_m
,
v_pos_out
.
toKernel
(),
v_prp_out
.
toKernel
());
return
v
;
return
v
;
}
}
...
...
src/Vector/vector_dist_kernel.hpp
View file @
3d2143d3
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
#define POS_PROP -1
#define POS_PROP -1
#define GET_PARTICLE(vd) blockDim.x*blockIdx.x + threadIdx.x; if (blockDim.x*blockIdx.x + threadIdx.x >= vd.size()) {return;};
#define GET_PARTICLE(vd) blockDim.x*blockIdx.x + threadIdx.x; if (blockDim.x*blockIdx.x + threadIdx.x >= vd.size
_local
()) {return;};
#define GET_PARTICLE_SORT(p,NN) if (blockDim.x*blockIdx.x + threadIdx.x >= NN.get_g_m()) {return;}\
#define GET_PARTICLE_SORT(p,NN) if (blockDim.x*blockIdx.x + threadIdx.x >= NN.get_g_m()) {return;}\
else{p = NN.getDomainSortIds().template get<0>(blockDim.x*blockIdx.x + threadIdx.x);}
else{p = NN.getDomainSortIds().template get<0>(blockDim.x*blockIdx.x + threadIdx.x);}
...
@@ -40,8 +40,8 @@ public:
...
@@ -40,8 +40,8 @@ public:
//! dimensions of space
//! dimensions of space
static
const
unsigned
int
dims
=
dim
;
static
const
unsigned
int
dims
=
dim
;
vector_dist_ker
(
const
openfpm
::
vector_gpu_ker
<
Point
<
dim
,
St
>
,
memory_traits_inte
>
&
v_pos
,
const
openfpm
::
vector_gpu_ker
<
prop
,
memory_traits_inte
>
&
v_prp
)
vector_dist_ker
(
int
g_m
,
const
openfpm
::
vector_gpu_ker
<
Point
<
dim
,
St
>
,
memory_traits_inte
>
&
v_pos
,
const
openfpm
::
vector_gpu_ker
<
prop
,
memory_traits_inte
>
&
v_prp
)
:
v_pos
(
v_pos
),
v_prp
(
v_prp
)
:
g_m
(
g_m
),
v_pos
(
v_pos
),
v_prp
(
v_prp
)
{}
{}
/*! \brief return the number of particles (excluding ghost)
/*! \brief return the number of particles (excluding ghost)
...
...
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