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
504ebaf7
Commit
504ebaf7
authored
4 years ago
by
Pietro Incardona
Browse files
Options
Downloads
Patches
Plain Diff
Testing push
parent
26a2bc73
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#1874
failed
4 years ago
Stage: build
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+7
-0
7 additions, 0 deletions
CMakeLists.txt
install
+10
-0
10 additions, 0 deletions
install
src/CMakeLists.txt
+2
-0
2 additions, 0 deletions
src/CMakeLists.txt
with
19 additions
and
0 deletions
CMakeLists.txt
+
7
−
0
View file @
504ebaf7
...
@@ -184,6 +184,13 @@ if(SUITESPARSE_FOUND AND SuiteSparse_UMFPACK_FOUND)
...
@@ -184,6 +184,13 @@ if(SUITESPARSE_FOUND AND SuiteSparse_UMFPACK_FOUND)
set
(
DEFINE_HAVE_SUITESPARSE
"#define HAVE_SUITESPARSE"
)
set
(
DEFINE_HAVE_SUITESPARSE
"#define HAVE_SUITESPARSE"
)
endif
()
endif
()
if
(
Vc_FOUND
)
set
(
DEFINE_HAVE_VCDEVEL
)
else
()
file
(
WRITE error_code
"211"
)
message
(
FATAL_ERROR
"Vc is required in roder to install OpenFPM"
)
endif
()
if
(
APPLE
)
if
(
APPLE
)
set
(
DEFINE_HAVE_OSX
"#define HAVE_OSX"
)
set
(
DEFINE_HAVE_OSX
"#define HAVE_OSX"
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
install
+
10
−
0
View file @
504ebaf7
...
@@ -317,6 +317,7 @@ EIGEN_System_prv=1
...
@@ -317,6 +317,7 @@ EIGEN_System_prv=1
HDF5_installed
=
0
HDF5_installed
=
0
HDF5_System_prv
=
1
HDF5_System_prv
=
1
LIBHILBERT_installed
=
0
LIBHILBERT_installed
=
0
VCDEVEL_installed
=
0
conf_err
=
1
conf_err
=
1
...
@@ -387,6 +388,15 @@ else
...
@@ -387,6 +388,15 @@ else
./script/install_LIBHILBERT.sh
$i_dir
$ncore
./script/install_LIBHILBERT.sh
$i_dir
$ncore
configure_options
=
"
$configure_options
--with-libhilbert=
$i_dir
/LIBHILBERT "
configure_options
=
"
$configure_options
--with-libhilbert=
$i_dir
/LIBHILBERT "
LIBHILBERT_installed
=
1
LIBHILBERT_installed
=
1
elif
[
$conf_err
-eq
211
]
;
then
echo
"VCDEVEL not found try to install"
if
[
$LIBHILBERT_installed
-eq
1
]
;
then
echo
"Error the installation of VCDEVEL failed"
exit
1
fi
./script/install_VCDEVEL.sh
$i_dir
$ncore
configure_options
=
"
$configure_options
--with-vcdevel=
$i_dir
/VCDEVEL "
VCDEVEL_installed
=
1
elif
[
$conf_err
-ne
0
]
;
then
elif
[
$conf_err
-ne
0
]
;
then
echo
"I do not know how to recover from this error"
echo
"I do not know how to recover from this error"
exit
1
exit
1
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
2
−
0
View file @
504ebaf7
...
@@ -84,6 +84,7 @@ target_include_directories (pdata PUBLIC ${PETSC_INCLUDES})
...
@@ -84,6 +84,7 @@ target_include_directories (pdata PUBLIC ${PETSC_INCLUDES})
target_include_directories
(
pdata PUBLIC
${
HDF5_ROOT
}
/include
)
target_include_directories
(
pdata PUBLIC
${
HDF5_ROOT
}
/include
)
target_include_directories
(
pdata PUBLIC
${
LIBHILBERT_INCLUDE_DIRS
}
)
target_include_directories
(
pdata PUBLIC
${
LIBHILBERT_INCLUDE_DIRS
}
)
target_include_directories
(
pdata PUBLIC
${
Vc_INCLUDE_DIR
}
)
target_include_directories
(
pdata PUBLIC
${
Boost_INCLUDE_DIRS
}
)
target_include_directories
(
pdata PUBLIC
${
Boost_INCLUDE_DIRS
}
)
target_link_libraries
(
pdata
${
Boost_LIBRARIES
}
)
target_link_libraries
(
pdata
${
Boost_LIBRARIES
}
)
...
@@ -92,6 +93,7 @@ target_link_libraries(pdata -L${METIS_ROOT}/lib metis)
...
@@ -92,6 +93,7 @@ target_link_libraries(pdata -L${METIS_ROOT}/lib metis)
target_link_libraries
(
pdata -L
${
HDF5_ROOT
}
/lib hdf5 hdf5_hl
)
target_link_libraries
(
pdata -L
${
HDF5_ROOT
}
/lib hdf5 hdf5_hl
)
target_link_libraries
(
pdata -L
${
LIBHILBERT_LIBRARY_DIRS
}
${
LIBHILBERT_LIBRARIES
}
)
target_link_libraries
(
pdata -L
${
LIBHILBERT_LIBRARY_DIRS
}
${
LIBHILBERT_LIBRARIES
}
)
target_link_libraries
(
pdata
${
PETSC_LIBRARIES
}
)
target_link_libraries
(
pdata
${
PETSC_LIBRARIES
}
)
target_link_libraries
(
pdata
${
Vc_LIBRARIES
}
)
if
(
TEST_PERFORMANCE
)
if
(
TEST_PERFORMANCE
)
target_link_libraries
(
pdata
${
Boost_FILESYSTEM_LIBRARY
}
)
target_link_libraries
(
pdata
${
Boost_FILESYSTEM_LIBRARY
}
)
...
...
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