Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
openfpm_numerics
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_numerics
Commits
c9433fb4
Commit
c9433fb4
authored
1 year ago
by
yaskovet
Browse files
Options
Downloads
Patches
Plain Diff
Add minter library as a cmake ExternalProject
parent
53a5a613
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+27
-10
27 additions, 10 deletions
CMakeLists.txt
src/CMakeLists.txt
+195
-184
195 additions, 184 deletions
src/CMakeLists.txt
src/regression/poly_levelset.hpp
+2
-2
2 additions, 2 deletions
src/regression/poly_levelset.hpp
src/regression/regression.hpp
+1
-1
1 addition, 1 deletion
src/regression/regression.hpp
with
225 additions
and
197 deletions
CMakeLists.txt
+
27
−
10
View file @
c9433fb4
...
...
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
project
(
openfpm_pdata LANGUAGES C CXX
)
if
(
POLICY CMP0074
)
cmake_policy
(
SET CMP0074 OLD
)
cmake_policy
(
SET CMP0074 OLD
)
endif
()
list
(
APPEND CMAKE_MODULE_PATH
${
CMAKE_CURRENT_LIST_DIR
}
/../cmake_modules/
)
...
...
@@ -115,7 +115,7 @@ else()
endif
()
if
(
PETSC_FOUND
)
set
(
DEFINE_HAVE_PETSC
"#define HAVE_PETSC"
)
set
(
DEFINE_HAVE_PETSC
"#define HAVE_PETSC"
)
endif
()
if
(
HDF5_FOUND
)
...
...
@@ -136,18 +136,18 @@ endif()
if
(
EIGEN3_FOUND
)
set
(
DEFINE_HAVE_EIGEN
"#define HAVE_EIGEN"
)
set
(
DEFINE_HAVE_EIGEN
"#define HAVE_EIGEN"
)
endif
()
if
(
LIBHILBERT_FOUND
)
set
(
DEFINE_HAVE_LIBHILBERT
"#define HAVE_LIBHILBERT 1"
)
set
(
DEFINE_HAVE_LIBHILBERT
"#define HAVE_LIBHILBERT 1"
)
else
()
file
(
WRITE error_code
"210"
)
message
(
FATAL_ERROR
"LibHilbert is required in order to install OpenFPM"
)
file
(
WRITE error_code
"210"
)
message
(
FATAL_ERROR
"LibHilbert is required in order to install OpenFPM"
)
endif
()
if
(
SUITESPARSE_FOUND AND SuiteSparse_UMFPACK_FOUND
)
set
(
DEFINE_HAVE_SUITESPARSE
"#define HAVE_SUITESPARSE"
)
set
(
DEFINE_HAVE_SUITESPARSE
"#define HAVE_SUITESPARSE"
)
endif
()
if
(
SUITESPARSE_FOUND AND SuiteSparse_UMFPACK_FOUND
)
...
...
@@ -163,8 +163,25 @@ if(TINYOBJLOADER_FOUND)
endif
()
if
(
TEST_COVERAGE
)
set
(
DEFINE_TEST_COVERAGE_MODE
"#define TEST_COVERAGE_MODE"
)
endif
()
set
(
DEFINE_TEST_COVERAGE_MODE
"#define TEST_COVERAGE_MODE"
)
endif
()
#include Minter as a dependency project
#TODO: make optional
include
(
ExternalProject
)
ExternalProject_Add
(
minter
PREFIX
${
CMAKE_CURRENT_SOURCE_DIR
}
/minter
GIT_REPOSITORY https://git.mpi-cbg.de/mosaic/software/math/minter.git
GIT_TAG origin/header_only
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
INSTALL_COMMAND
${
CMAKE_COMMAND
}
-E copy_directory
<SOURCE_DIR>
${
CMAKE_CURRENT_SOURCE_DIR
}
/src/regression/minter
LOG_DOWNLOAD ON
LOG_INSTALL ON
)
file
(
WRITE error_code
"0"
)
file
(
WRITE cuda_lib
"
${
CUDA_cudart_static_LIBRARY
}
${
CUDA_cudadevrt_LIBRARY
}
"
)
...
...
@@ -174,7 +191,7 @@ file(WRITE mpi_libs "${MPI_C_LINK_FLAGS} ${MPI_C_LIBRARIES}")
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/src/config/config_cmake.h.in
${
CMAKE_CURRENT_SOURCE_DIR
}
/src/config/config.h
)
if
(
CUDA_ON_BACKEND STREQUAL
"CUDA"
)
enable_language
(
CUDA
)
enable_language
(
CUDA
)
endif
()
add_subdirectory
(
src
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
195
−
184
View file @
c9433fb4
This diff is collapsed.
Click to expand it.
src/regression/poly_levelset.hpp
+
2
−
2
View file @
c9433fb4
...
...
@@ -12,7 +12,7 @@
#include
"Space/Shape/Point.hpp"
#include
"DMatrix/EMatrix.hpp"
#include
"minter.h"
#include
"minter
/include/minter
.h"
template
<
int
spatial_dim
,
typename
MatType
=
EMatrixXd
,
typename
VecType
=
EVectorXd
>
...
...
@@ -115,4 +115,4 @@ public:
#endif
/* POLYLEVELSET_HPP_ */
\ No newline at end of file
#endif
/* POLYLEVELSET_HPP_ */
This diff is collapsed.
Click to expand it.
src/regression/regression.hpp
+
1
−
1
View file @
c9433fb4
...
...
@@ -12,7 +12,7 @@
#include
"Space/Shape/Point.hpp"
#include
"DMatrix/EMatrix.hpp"
#include
"DCPSE/SupportBuilder.hpp"
#include
"minter.h"
#include
"minter
/include/minter
.h"
template
<
typename
vector_type_support
,
typename
NN_type
>
...
...
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