Commit a6306f10 authored by incardon's avatar incardon

fixing build IO

parent a6edd41a
......@@ -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"
}
}
......
......@@ -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
......
......@@ -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])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment