From 8c83dd92940fd0750b2a5d73d4a851eceea7e9ba Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Wed, 26 Dec 2018 02:17:12 +0100
Subject: [PATCH] Adding furiosa falcon
---
build.sh | 35 +++++++++++++++++------------------
openfpm_io | 2 +-
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/build.sh b/build.sh
index 06571d0aa..395eff484 100755
--- a/build.sh
+++ b/build.sh
@@ -36,6 +36,15 @@ if [ x"$hostname" == x"cifarm-mac-node.mpi-cbg.de" ]; then
echo "Continue"
fi
+if [ x"$hostname" == x"falcon1" ]; then
+# rm -rf $HOME/openfpm_dependencies/openfpm_pdata/$branch/
+ echo "Continue"
+ dependency_dir=/projects/ppm/rundeck/openfpm_dependencies/
+else
+ dependency_dir=$HOME/openfpm_dependencies/openfpm_pdata/$branch
+fi
+
+
#### If you have a dep_dir file change the branch name to the dep_dir
dep_dir=$(cat dep_dir)
@@ -50,21 +59,16 @@ echo "Compiling general"
source ~/.bashrc
-installation_dir=""
-if [ x"$hostname" == x"sbalzarini-mac-15" ]; then
- installation_dir="--prefix=/Users/jenkins/openfpm_install"
-else
- installation_dir="--prefix=$HOME/openfpm_install/$branch"
-fi
+installation_dir="--prefix=$HOME/openfpm_install/$branch"
# force ssh to not use HostKey verification
-echo "StrictHostKeyChecking=no" > $HOME/.ssh/config
-chmod 600 $HOME/.ssh/config
+#echo "StrictHostKeyChecking=no" > $HOME/.ssh/config
+#chmod 600 $HOME/.ssh/config
mkdir $HOME/openfpm_dependencies/openfpm_pdata/$branch
if [ x"$comp_type" == x"full" ]; then
- echo "Installing with: ./install -i $HOME/openfpm_dependencies/openfpm_pdata/$branch -s -c \"$installation_dir\" "
- ./install -i $HOME/openfpm_dependencies/openfpm_pdata/$branch -s -c "$installation_dir"
+ echo "Installing with: ./install -i $dependency_dir -s -c \"$installation_dir\" "
+ ./install -i $dependency_dir -s -c "$installation_dir"
make install
if [ $? -ne 0 ]; then
curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$hostname failed to complete the openfpm_pdata test \" }] }" https://hooks.slack.com/services/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
@@ -73,7 +77,7 @@ if [ x"$comp_type" == x"full" ]; then
mv $HOME/openfpm_vars $HOME/openfpm_vars_$branch
source $HOME/openfpm_vars_$branch
elif [ x"$comp_type" == x"numerics" ]; then
- ./install -i $HOME/openfpm_dependencies/openfpm_pdata/$branch -m -s -c "$installation_dir"
+ ./install -i $dependency_dir -m -s -c "$installation_dir"
if [ $? -ne 0 ]; then
curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$hostname failed to complete the openfpm_pdata test \" }] }" https://hooks.slack.com/services/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
@@ -83,8 +87,8 @@ elif [ x"$comp_type" == x"numerics" ]; then
source $HOME/openfpm_vars_$branch
make VERBOSE=1 -j 8
else
- echo "Installing with: ./install -i $HOME/openfpm_dependencies/openfpm_pdata/$branch -m -s -c \"$installation_dir --no-recursion\""
- ./install -i $HOME/openfpm_dependencies/openfpm_pdata/$branch -m -s -c "$installation_dir"
+ echo "Installing with: ./install -i $dependency_dir -m -s -c \"$installation_dir --no-recursion\""
+ ./install -i $dependency_dir -m -s -c "$installation_dir"
if [ $? -ne 0 ]; then
curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$hostname failed to complete the openfpm_pdata test \" }] }" https://hooks.slack.com/services/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
@@ -93,9 +97,6 @@ else
mv $HOME/openfpm_vars $HOME/openfpm_vars_$branch
source $HOME/openfpm_vars_$branch
- echo "------------- DEBUGGING ------------------"
- echo "$PATH"
- echo "-------------------------------------------"
make VERBOSE=1 -j 8
fi
@@ -104,5 +105,3 @@ if [ $? -ne 0 ]; then
exit 1 ;
fi
-
-
diff --git a/openfpm_io b/openfpm_io
index 0c0026b6f..a63a55e5c 160000
--- a/openfpm_io
+++ b/openfpm_io
@@ -1 +1 @@
-Subproject commit 0c0026b6fc603fcac6463768e6da0a178a3d75eb
+Subproject commit a63a55e5c66839e93bd30af99475b2c4c3fe1355
--
GitLab