Skip to content

GitLab

O
openfpm_numerics
Commit a0ec2f25 authored by incardon's avatar incardon
Browse files
Options

Fixing openmp

parent 3a56de9c
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 55 deletions
Jenkinsfile deleted 100644 → 0
View file @ 3a56de9c
#!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"}
)
}
}
}
)
m4/ax_petsc_lib.m4
View file @ a0ec2f25
......@@ -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
......
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