From 91c199697e8839b176a649f6b4291767360df659 Mon Sep 17 00:00:00 2001
From: Sachin Krishnan T V <s.thekke-veettil@hzdr.de>
Date: Sun, 30 May 2021 01:39:11 +0200
Subject: [PATCH] Add closest point docs and unit test
---
install | 4 +--
openfpm_numerics | 2 +-
script/install_blitz_algoim.sh | 48 ++++++++++++++++++++++++++++++++++
3 files changed, 51 insertions(+), 3 deletions(-)
create mode 100755 script/install_blitz_algoim.sh
diff --git a/install b/install
index c66110ab2..8906ba025 100755
--- a/install
+++ b/install
@@ -435,7 +435,7 @@ elif [ -d "$i_dir/HDF5/lib64" ]; then
hdf5_lib_dir=-L$i_dir/HDF5/lib64
fi
-echo "INCLUDE_PATH=$mpi_include_dirs $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/VCDEVEL/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=$mpi_include_dirs $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/VCDEVEL/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 -I$i_dir/BLITZ/include -I$i_dir/ALGOIM/include" > example.mk
echo "LIBS_PATH=$mpi_libs $openmp_flags -L$install_base/openfpm_devices/lib -L$install_base/openfpm_pdata/lib -L$install_base/openfpm_vcluster/lib -L$i_dir/VCDEVEL/lib -L$i_dir/METIS/lib -L$i_dir/PARMETIS/lib -L$i_dir/BOOST/lib $hdf5_lib_dir -L$i_dir/LIBHILBERT/lib $lin_alg_dir " >> example.mk
if [ x"$cuda_on_cpu" == x"YES" ]; then
echo "CUDA_ON_CPU=YES" >> example.mk
@@ -447,7 +447,7 @@ else
echo "LIBS=-lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lboost_program_options -lhdf5 -llibhilbert -lVc $lin_alg_lib -ldl -lboost_filesystem -lboost_system $optional_boost" >> example.mk
echo "LIBS_CUDA_ON_CPU=\$(LIBS)" >> example.mk
fi
-echo "INCLUDE_PATH_NVCC=-Xcompiler="-Wno-deprecated-declarations" $(cat openmp_flags) "$(cat cuda_options)" $mpi_include_dirs -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) "$(cat cuda_options)" $mpi_include_dirs -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 -I$i_dir/BLITZ/include -I$i_dir/ALGOIM/include" >> example.mk
cp example.mk src/example.mk
cp example.mk example/example.mk
diff --git a/openfpm_numerics b/openfpm_numerics
index 1d3a6cc2a..60754da8c 160000
--- a/openfpm_numerics
+++ b/openfpm_numerics
@@ -1 +1 @@
-Subproject commit 1d3a6cc2a4ce7b1a21d6cc9e1bdf6edb385d276d
+Subproject commit 60754da8ce53eca9bfbf3c33a7d7fa397a4c9c33
diff --git a/script/install_blitz_algoim.sh b/script/install_blitz_algoim.sh
new file mode 100755
index 000000000..9d98002e9
--- /dev/null
+++ b/script/install_blitz_algoim.sh
@@ -0,0 +1,48 @@
+#! /bin/bash
+
+source script/discover_os
+discover_os
+
+# check if the directory $1/BLITZ exist
+
+if [ -d "$1/BLITZ" ]; then
+ echo "BLITZ is already installed"
+else
+ ## Remove old download
+ rm blitz-1.0.2.tar.gz
+ rm -rf blitz-1.0.2.tar.gz
+ wget https://github.com/blitzpp/blitz/archive/refs/tags/1.0.2.tar.gz -O blitz-1.0.2.tar.gz
+ tar -xf blitz-1.0.2.tar.gz
+ cd blitz-1.0.2
+
+ BUILDDIR=build
+ mkdir -p $BUILDDIR
+ cd $BUILDDIR
+ echo "cmake ../. -DCMAKE_INSTALL_PREFIX=$1/BLITZ"
+ cmake ../. -DCMAKE_INSTALL_PREFIX=$1/BLITZ
+ make -j $2
+ make install
+
+ # Mark the installation
+ echo 1 > $1/BLITZ/version
+fi
+
+## Algoim installation
+
+
+
+
+if [ -d "$1/ALGOIM" ]; then
+ echo "ALGOIM is already installed"
+else
+
+ ## Remove old download
+ rm algoim.tar.gz
+ rm -rf algoim.tar.gz
+ wget http://ppmcore.mpi-cbg.de/upload/algoim.tar.gz
+ tar -xf algoim.tar.gz
+ mv algoim $1/ALGOIM
+ mv $1/ALGOIM/src $1/ALGOIM/include
+ # Mark the installation
+ echo 1 > $1/ALGOIM/version
+fi
--
GitLab