Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
O
openfpm_numerics
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_numerics
Commits
dd0e4d4d
Commit
dd0e4d4d
authored
Dec 13, 2016
by
incardon
Browse files
Options
Browse Files
Download
Plain Diff
Fixing conflict
parents
c0aef3fd
6794c24b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
12 deletions
+15
-12
src/Makefile.am
src/Makefile.am
+1
-1
src/Matrix/SparseMatrix_Eigen.hpp
src/Matrix/SparseMatrix_Eigen.hpp
+1
-1
src/Operators/Vector/vector_dist_operators_apply_kernel.hpp
src/Operators/Vector/vector_dist_operators_apply_kernel.hpp
+1
-1
src/Operators/Vector/vector_dist_operators_functions.hpp
src/Operators/Vector/vector_dist_operators_functions.hpp
+9
-6
src/Operators/Vector/vector_dist_operators_unit_tests.hpp
src/Operators/Vector/vector_dist_operators_unit_tests.hpp
+2
-2
src/unit_test_init_cleanup.hpp
src/unit_test_init_cleanup.hpp
+1
-1
No files found.
src/Makefile.am
View file @
dd0e4d4d
...
...
@@ -2,7 +2,7 @@
LINKLIBS
=
$(OPENMP_LDFLAGS)
$(LIBHILBERT_LIB)
$(PETSC_LIB)
$(SUITESPARSE_LIBS)
$(LAPACK_LIBS)
$(BLAS_LIBS)
$(METIS_LIB)
$(PARMETIS_LIB)
$(DEFAULT_LIB)
$(PTHREAD_LIBS)
$(OPT_LIBS)
$(BOOST_LDFLAGS)
$(BOOST_PROGRAM_OPTIONS_LIB)
$(BOOST_IOSTREAMS_LIB)
$(HDF5_LDFLAGS)
$(HDF5_LIBS)
$(LIBQUADMATH)
$(OPENMP_LDFLAGS)
$(LIBIFCORE)
noinst_PROGRAMS
=
numerics
numerics_SOURCES
=
main.cpp ../../openfpm_vcluster/src/VCluster.cpp ../../openfpm_devices/src/memory/HeapMemory.cpp ../../openfpm_devices/src/memory/PtrMemory.cpp ../../openfpm_devices/src/Memleak_check.cpp
numerics_SOURCES
=
main.cpp ../../openfpm_vcluster/src/VCluster
/VCluster
.cpp ../../openfpm_devices/src/memory/HeapMemory.cpp ../../openfpm_devices/src/memory/PtrMemory.cpp ../../openfpm_devices/src/Memleak_check.cpp
numerics_CXXFLAGS
=
$(OPENMP_CFLAGS)
$(LIBHILBERT_INCLUDE)
$(AM_CXXFLAGS)
$(HDF5_CPPFLAGS)
$(INCLUDES_PATH)
$(BOOST_CPPFLAGS)
$(SUITESPARSE_INCLUDE)
$(METIS_INCLUDE)
$(PARMETIS_INCLUDE)
$(EIGEN_INCLUDE)
$(PETSC_INCLUDE)
-Wno-deprecated-declarations
-Wno-unused-local-typedefs
numerics_CFLAGS
=
$(CUDA_CFLAGS)
numerics_LDADD
=
$(LINKLIBS)
-lparmetis
-lmetis
...
...
src/Matrix/SparseMatrix_Eigen.hpp
View file @
dd0e4d4d
...
...
@@ -10,7 +10,7 @@
#include "Vector/map_vector.hpp"
#include <boost/mpl/int.hpp>
#include "VCluster.hpp"
#include "VCluster
/VCluster
.hpp"
#define EIGEN_TRIPLET 1
...
...
src/Operators/Vector/vector_dist_operators_apply_kernel.hpp
View file @
dd0e4d4d
...
...
@@ -256,7 +256,7 @@ class vector_dist_expression_op<exp1,vector_type,VECT_APPLYKER_IN>
//! The vector that contain the particles
const
vector_orig
&
vd
;
//! Get the return type of apply the kernel to a particle
//! Get the return type of apply
ing
the kernel to a particle
typedef
typename
apply_kernel_rtype
<
decltype
(
o1
.
value
(
vect_dist_key_dx
(
0
)))
>::
rtype
rtype
;
public:
...
...
src/Operators/Vector/vector_dist_operators_functions.hpp
View file @
dd0e4d4d
...
...
@@ -207,15 +207,17 @@ CREATE_VDIST_ARG2_FUNC(pmul,pmul,VECT_PMUL)
////////// Special function reduce /////////////////////////
/*! \brief Expression that create a reduction
/*! \brief expression that encapsulate a vector reduction expression
*
* \tparam exp1 expression
* \tparam vector_type type of
the vector
* \tparam exp1 expression
1
* \tparam vector_type type of
vector on which the expression is acting
*
*/
template
<
typename
exp1
,
typename
vector_type
>
class
vector_dist_expression_op
<
exp1
,
vector_type
,
VECT_SUM_REDUCE
>
{
//! expression on which apply the reduction
const
exp1
o1
;
...
...
@@ -230,13 +232,13 @@ class vector_dist_expression_op<exp1,vector_type,VECT_SUM_REDUCE>
public:
//!
Constructor from expression and the vector of particles
//!
constructor from an epxression exp1 and a vector vd
vector_dist_expression_op
(
const
exp1
&
o1
,
const
vector_type
&
vd
)
:
o1
(
o1
),
vd
(
vd
)
{}
//! sum reduction require initialization where we calculate the reduction
//
!
this produce a cache for the calculated value
// this produce a cache for the calculated value
inline
void
init
()
const
{
o1
.
init
();
...
...
@@ -269,7 +271,7 @@ public:
}
};
//! Reduce function (it generate an expression)
template
<
typename
exp1
,
typename
exp2_
,
unsigned
int
op1
,
typename
vector_type
>
inline
vector_dist_expression_op
<
vector_dist_expression_op
<
exp1
,
exp2_
,
op1
>
,
vector_type
,
VECT_SUM_REDUCE
>
rsum
(
const
vector_dist_expression_op
<
exp1
,
exp2_
,
op1
>
&
va
,
const
vector_type
&
vd
)
...
...
@@ -279,6 +281,7 @@ rsum(const vector_dist_expression_op<exp1,exp2_,op1> & va, const vector_type & v
return
exp_sum
;
}
//! Reduce function (It generate an expression)
template
<
unsigned
int
prp1
,
typename
v1
,
typename
vector_type
>
inline
vector_dist_expression_op
<
vector_dist_expression
<
prp1
,
v1
>
,
vector_type
,
VECT_SUM_REDUCE
>
rsum
(
const
vector_dist_expression
<
prp1
,
v1
>
&
va
,
const
vector_type
&
vd
)
...
...
src/Operators/Vector/vector_dist_operators_unit_tests.hpp
View file @
dd0e4d4d
...
...
@@ -652,10 +652,10 @@ typedef vector_dist<3,float,aggregate<float,float,float,VectorS<3,float>,VectorS
//! Exponential kernel
struct
exp_kernel
{
//! variance
//! variance
of the exponential kernel
float
var
;
//!
Set the variance of the exponential kernel
//!
Exponential kernel giving variance
exp_kernel
(
float
var
)
:
var
(
var
)
{}
...
...
src/unit_test_init_cleanup.hpp
View file @
dd0e4d4d
...
...
@@ -8,7 +8,7 @@
#ifndef UNIT_TEST_INIT_CLEANUP_HPP_
#define UNIT_TEST_INIT_CLEANUP_HPP_
#include "VCluster.hpp"
#include "VCluster
/VCluster
.hpp"
struct
ut_start
{
ut_start
()
{
...
...
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