diff --git a/Jenkinsfile b/Jenkinsfile index c491d4b7a08c5f06fae0dd0fa760c4958a472322..207c3da88a038af26f4f5422b227a379499634c5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,12 +22,12 @@ parallel ( stage ('build_nyu') { - sh "./build.sh $WORKSPACE $NODE_NAME" + sh "./build.sh $WORKSPACE $NODE_NAME $BRANCH_NAME" } stage ('run_nyu') { - sh "cd openfpm_io && ./run.sh $WORKSPACE $NODE_NAME" + sh "cd openfpm_io && ./run.sh $WORKSPACE $NODE_NAME $BRANCH_NAME" sh "cd openfpm_io && ./success.sh 2 nyu openfpm_io" } } @@ -55,12 +55,12 @@ parallel ( stage ('build_sb15') { - sh "echo $PATH && ./build.sh $WORKSPACE $NODE_NAME" + sh "echo $PATH && ./build.sh $WORKSPACE $NODE_NAME $BRANCH_NAME" } stage ('run_sb15') { - sh "cd openfpm_io && ./run.sh $WORKSPACE $NODE_NAME" + sh "cd openfpm_io && ./run.sh $WORKSPACE $NODE_NAME $BRANCH_NAME" sh "cd openfpm_io && ./success.sh 2 sbalzarini-mac-15 openfpm_io" } } @@ -86,12 +86,12 @@ parallel ( stage ('build_gin') { - sh "echo $PATH && ./build.sh $WORKSPACE $NODE_NAME" + sh "echo $PATH && ./build.sh $WORKSPACE $NODE_NAME $BRANCH_NAME" } stage ('run_gin') { - sh "cd openfpm_io && ./run.sh $WORKSPACE $NODE_NAME" + sh "cd openfpm_io && ./run.sh $WORKSPACE $NODE_NAME $BRANCH_NAME" sh "cd openfpm_io && ./success.sh 2 gin openfpm_io" } } diff --git a/build.sh b/build.sh index 5185f415055f60a752a0b2a31e35a2c21458477d..745267716afe503b3e634af30290fbdea0738317 100755 --- a/build.sh +++ b/build.sh @@ -2,6 +2,8 @@ source $HOME/.bashrc +echo "Branch: $3" + echo "$PATH" # Make a directory in /tmp/openfpm_data @@ -27,14 +29,14 @@ echo "Compiling on $2" sh ./autogen.sh if [ "$2" == "master" ] then - sh ./configure CXX=mpic++ --with-hdf5=$HOME/HDF5/bin/h5pcc --disable-gpu + sh ./configure CXX=mpic++ --with-hdf5=$HOME/$3/HDF5/bin/h5pcc --disable-gpu elif [ "$2" == "gin" ] then module load gcc/4.8.2 module load boost/1.54.0 - sh ./configure CXX=mpic++ --with-boost=/sw/apps/boost/1.54.0/ --with-hdf5=$HOME/HDF5/bin/h5pcc + sh ./configure CXX=mpic++ --with-boost=/sw/apps/boost/1.54.0/ --with-hdf5=$HOME/$3/HDF5/bin/h5pcc else - sh ./configure CXX=mpic++ --with-hdf5=$HOME/HDF5/bin/h5pcc + sh ./configure CXX=mpic++ --with-hdf5=$HOME/$3/HDF5/bin/h5pcc fi make diff --git a/configure.ac b/configure.ac index ba69661c99e6395154f65023149e7bf13000450f..14d9899da43cf7bb3744cc844bf48af486eefe59 100755 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.59) -AC_INIT(OpenFPM_io, 0.8.0, BUG-REPORT-ADDRESS) +AC_INIT(OpenFPM_io, 1.0.0, BUG-REPORT-ADDRESS) AC_CANONICAL_SYSTEM AC_CONFIG_SRCDIR([src/main.cpp])