From 386ee207abd8e45bf80970ca0a14377985b95ea6 Mon Sep 17 00:00:00 2001 From: Pietro Incardona Date: Mon, 24 Oct 2016 20:21:18 +0200 Subject: [PATCH] Reducing timing for pdata --- Jenkinsfile | 3 --- Makefile.am | 21 +++++++++++++++++++++ build.sh | 9 ++++----- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9abeef56..68757617 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,6 @@ parallel ( sh "./run.sh $WORKSPACE $NODE_NAME 1" sh "./run.sh $WORKSPACE $NODE_NAME 2" sh "./run.sh $WORKSPACE $NODE_NAME 3" - sh "./run.sh $WORKSPACE $NODE_NAME 4" sh "./run.sh $WORKSPACE $NODE_NAME 5" } } @@ -65,9 +64,7 @@ parallel ( sh "./run.sh $WORKSPACE $NODE_NAME 1" sh "./run.sh $WORKSPACE $NODE_NAME 2" sh "./run.sh $WORKSPACE $NODE_NAME 3" - sh "./run.sh $WORKSPACE $NODE_NAME 4" sh "./run.sh $WORKSPACE $NODE_NAME 5" - sh "./run.sh $WORKSPACE $NODE_NAME 6" sh "./run.sh $WORKSPACE $NODE_NAME 7" } } diff --git a/Makefile.am b/Makefile.am index 437d908c..51fbbec9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,27 @@ SUBDIRS = src images openfpm_data openfpm_io openfpm_devices openfpm_vcluster op bin_PROGRAMS = +pdata: + cd src && make + +data: + cd openfpm_data/src && make + +devices: + cd openfpm_devices/src && make + +vcluster: + cd openfpm_vcluster/src && make + +io: + cd openfpm_io/src && make + +numerics: + cd openfpm_numerics/src && make + + + + test_pdata: cd src && make test diff --git a/build.sh b/build.sh index 01b31395..f7da4d7f 100755 --- a/build.sh +++ b/build.sh @@ -28,13 +28,12 @@ then source ~/.bashrc module load gcc/4.9.2 ./install -s -c "--prefix=/home/jenkins/openfpm_install" - make + make pdata if [ $? -ne 0 ]; then curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$2 failed to complete the openfpm_pdata test \" }] }" https://hooks.slack.com/services/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 exit 1 ; fi - make install source $HOME/openfpm_vars if [ x"$3" == x"no_test" ]; then @@ -59,7 +58,7 @@ then sh ./autogen.sh ./install -s -c "--with-boost=/sw/apps/boost/1.54.0/ CXX=mpic++" - make + make pdata if [ $? -ne 0 ]; then curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$2 failed to complete the openfpm_pdata test \" }] }" https://hooks.slack.com/services/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 @@ -82,7 +81,7 @@ then export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/home/incard/PARMETIS/lib:/home/incard/METIS/lib:/home/incard/HDF5/lib" ./install -i "/scratch/p_ppm/" -s -c"CXX=mpic++" - make + make pdata source $HOME/openfpm_vars @@ -94,7 +93,7 @@ else echo "Compiling general" source ~/.bashrc ./install -s - make + make pdata if [ $? -ne 0 ]; then curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$2 failed to complete the openfpm_pdata test \" }] }" https://hooks.slack.com/services/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 -- GitLab