diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index b2969ff3d98915f34d9f32ee848ca52b268860f8..0000000000000000000000000000000000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,53 +0,0 @@ -#!groovy - -parallel ( - - -"nyu" : {node ('gin') - { - deleteDir() - checkout scm - stage ('build_gin') - { - sh "./build.sh $WORKSPACE $NODE_NAME" - } - - stage ('run_gin') - { - parallel ( - "1" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 1"}, - "2" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 2"}, - "3" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 3"}, - "4" : {sh "cd openfpm_numerics && ./run.sh $WORKSPACE $NODE_NAME 4"} - ) - } - } - }, - - - - -"sb15" : {node ('sbalzarini-mac-15') - { - deleteDir() - env.PATH = "/usr/local/bin:${env.PATH}" - checkout scm - stage ('build_sb15') - { - sh "./build.sh $WORKSPACE $NODE_NAME NO" - } - - stage ('run_sb15') - { - parallel ( - "1" : {sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 1"}, - "2" : {sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 2"}, - "3" : {sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 3"}, - "4" : {sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 4"} - ) - } - } - } - -) - diff --git a/m4/ax_petsc_lib.m4 b/m4/ax_petsc_lib.m4 index ed14c831b4e230d19b4bd7c9b80b37fa7dd7a098..1bd159091052c10c40e9e9317a4cca0ec579c4ec 100755 --- a/m4/ax_petsc_lib.m4 +++ b/m4/ax_petsc_lib.m4 @@ -102,8 +102,10 @@ AC_DEFUN([AX_LIB_PETSC], [ old_CC=$CC old_CFLAGS=$CFLAGS old_LDFLAGS=$LDFLAGS - CFLAGS="-I$with_petsc/include $HDF5_INCLUDE $METIS_INCLUDE " - LDFLAGS="-L$with_petsc/lib $HDF5_LDFLAGS $HDF5_LIBS $METIS_LIB -lmetis " + AX_OPENMP([CFLAGS="$OPENMP_CFLAGS" + LDFLAGS="$OPENMP_LDFLAGS"],[]) + CFLAGS="$CFLAGS -I$with_petsc/include $HDF5_INCLUDE $METIS_INCLUDE " + LDFLAGS="$LDFLAGS -L$with_petsc/lib $HDF5_LDFLAGS $HDF5_LIBS $METIS_LIB -lmetis " CC=$CXX AC_LANG_SAVE