Rev | Line | |
---|
[23390] | 1 | Index: ../trunk-jpl/jenkins/linux64_ross_dakota
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/jenkins/linux64_ross_dakota (revision 23233)
|
---|
| 4 | +++ ../trunk-jpl/jenkins/linux64_ross_dakota (revision 23234)
|
---|
| 5 | @@ -10,6 +10,8 @@
|
---|
| 6 | ISSM_CONFIG='--prefix=$ISSM_DIR\
|
---|
| 7 | --disable-static \
|
---|
| 8 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 9 | + --with-python-dir=/usr \
|
---|
| 10 | + --with-python-numpy-dir=/home/jenkins/.local/lib/python2.7/site-packages/numpy \
|
---|
| 11 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 12 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 13 | --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
|
---|
| 14 | @@ -29,7 +31,7 @@
|
---|
| 15 |
|
---|
| 16 | #PYTHON and MATLAB testing
|
---|
| 17 | MATLAB_TEST=1
|
---|
| 18 | -PYTHON_TEST=0
|
---|
| 19 | +PYTHON_TEST=1
|
---|
| 20 |
|
---|
| 21 | #-----------------------------------#
|
---|
| 22 | # 3: External packages installation #
|
---|
| 23 | @@ -62,5 +64,5 @@
|
---|
| 24 | #as follows: runme($MATLAB_NROPTIONS). The options must be understandable
|
---|
| 25 | #by Matlab and runme.m
|
---|
| 26 | #ex: "'id',[101 102 103]"
|
---|
| 27 | -PYTHON_NROPTIONS="--exclude 243 701 702 435"
|
---|
| 28 | +PYTHON_NROPTIONS="--exclude 243 701 702 435 --include_name 'Dakota'"
|
---|
| 29 | MATLAB_NROPTIONS="'exclude',[243,701,702,435]"
|
---|
Note:
See
TracBrowser
for help on using the repository browser.