From 848e4d1fd6631920fb90405ed9a501f7e8ebcbab Mon Sep 17 00:00:00 2001
From: Sachin Krishnan T V <s.thekke-veettil@hzdr.de>
Date: Fri, 28 May 2021 16:31:37 +0200
Subject: [PATCH] Add closest point functions
---
CMakeLists.txt | 2 ++
configure | 8 ++++++++
install | 3 +++
openfpm_numerics | 2 +-
4 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ee76a524..8937baf05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,8 @@ set(TINYOBJLOADER_ROOT CACHE PATH "TinyObjLoader library path")
set(SE_CLASS1 CACHE BOOL "Activate compilation with SE_CLASS1")
set(SE_CLASS2 CACHE BOOL "Activate compilation with SE_CLASS2")
set(SE_CLASS3 CACHE BOOL "Activate compilation with SE_CLASS3")
+set(BLITZ_ROOT CACHE PATH "Blitz root directory")
+set(ALGOIM_ROOT CACHE PATH "Algoim root directory")
set(ACTION_ON_ERROR CACHE STRING "Action to perform in case of error")
set(PROFILE_WITH_SCOREP CACHE BOOL "Enable profiling with scorep")
set(ENV{PETSC_DIR} ${PETSC_ROOT})
diff --git a/configure b/configure
index 7853c20d0..9fe5ac816 100755
--- a/configure
+++ b/configure
@@ -108,6 +108,8 @@ with_parmetis
enable_se_class1
enable_se_class2
enable_se_class3
+with_blitz
+with_algoim
with_alpaka
with_action_on_error
with_boost
@@ -512,6 +514,12 @@ do
vcdevel)
conf_options="$conf_options -DVc_ROOT=$ac_optarg"
;;
+ blitz)
+ conf_options="$conf_options -DBLITZ_ROOT=$ac_optarg"
+ ;;
+ algoim)
+ conf_options="$conf_options -DALGOIM_ROOT=$ac_optarg"
+ ;;
alpaka)
conf_options="$conf_options -DALPAKA_ROOT=$ac_optarg"
;;
diff --git a/install b/install
index fff9a319f..c66110ab2 100755
--- a/install
+++ b/install
@@ -296,6 +296,9 @@ configure_options=" $configure_options --with-parmetis=$i_dir/PARMETIS "
./script/install_Metis.sh $i_dir $CC $CXX $ncore
configure_options=" $configure_options --with-metis=$i_dir/METIS "
+./script/install_blitz_algoim.sh $i_dir $ncore
+configure_options=" $configure_options --with-blitz=$i_dir/BLITZ --with-algoim=$i_dir/ALGOIM "
+
if [ x"$gpu_support" == x"1" ]; then
configure_options=" $configure_options --enable-gpu "
fi
diff --git a/openfpm_numerics b/openfpm_numerics
index 7edb74ce6..1d3a6cc2a 160000
--- a/openfpm_numerics
+++ b/openfpm_numerics
@@ -1 +1 @@
-Subproject commit 7edb74ce68f5fd3f71817877712f0dbf8f35ea79
+Subproject commit 1d3a6cc2a4ce7b1a21d6cc9e1bdf6edb385d276d
--
GitLab