CHG: Updating paths to Python installation (now using venv)

ISSMteam · May 30, 2024 · 1eecdda · 1eecdda
1 parent 48a9b97
commit 1eecdda
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/jenkins/ross-debian_linux-adolc-ampioff b/jenkins/ross-debian_linux-adolc-ampioff
@@ -15,9 +15,9 @@ ISSM_CONFIG='\
  --without-Sealevelchange \
  --without-Love \
  --with-matlab-dir=${MATLAB_PATH} \
- --with-python-version=3.7 \
+ --with-python-version=3.11 \
  --with-python-dir=/usr \
- --with-python-numpy-dir=/usr/local/lib/python3.7/dist-packages/numpy \
+ --with-python-numpy-dir="${HOME}/.venv/issm/lib/python3.11/site-packages/numpy" \
  --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
  --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
  --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

diff --git a/jenkins/ross-debian_linux-adolc-ampion b/jenkins/ross-debian_linux-adolc-ampion
@@ -14,9 +14,9 @@ ISSM_CONFIG='\
  --without-kml \
  --without-Love \
  --with-matlab-dir=${MATLAB_PATH} \
- --with-python-version=3.7 \
+ --with-python-version=3.11 \
  --with-python-dir=/usr \
- --with-python-numpy-dir=/usr/local/lib/python3.7/dist-packages/numpy \
+ --with-python-numpy-dir="${HOME}/.venv/issm/lib/python3.11/site-packages/numpy" \
  --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
  --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
  --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

diff --git a/jenkins/ross-debian_linux-binaries-python-3 b/jenkins/ross-debian_linux-binaries-python-3
@@ -16,9 +16,9 @@ ISSM_CONFIG='\
  --enable-standalone-libraries \
  --disable-dependency-tracking \
  --with-pic \
- --with-python-version=3.7 \
+ --with-python-version=3.11 \
  --with-python-dir=/usr \
- --with-python-numpy-dir=/usr/local/lib/python3.7/dist-packages/numpy \
+ --with-python-numpy-dir="${HOME}/.venv/issm/lib/python3.11/site-packages/numpy" \
  --with-fortran-lib="-L${ISSM_DIR}/lib -lgfortran" \
  --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
  --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

diff --git a/jenkins/ross-debian_linux-dakota b/jenkins/ross-debian_linux-dakota
@@ -13,9 +13,9 @@ ISSM_CONFIG='\
  --with-pic \
  --with-numthreads=4 \
  --with-matlab-dir=${MATLAB_PATH} \
- --with-python-version=3.7 \
+ --with-python-version=3.11 \
  --with-python-dir=/usr \
- --with-python-numpy-dir=/usr/local/lib/python3.7/dist-packages/numpy \
+ --with-python-numpy-dir="${HOME}/.venv/issm/lib/python3.11/site-packages/numpy" \
  --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
  --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
  --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

diff --git a/jenkins/ross-debian_linux-full b/jenkins/ross-debian_linux-full
@@ -14,9 +14,9 @@ ISSM_CONFIG='\
  --enable-debugging \
  --with-numthreads=4 \
  --with-matlab-dir=${MATLAB_PATH} \
- --with-python-version=3.7 \
+ --with-python-version=3.11 \
  --with-python-dir=/usr \
- --with-python-numpy-dir=/usr/local/lib/python3.7/dist-packages/numpy \
+ --with-python-numpy-dir="${HOME}/.venv/issm/lib/python3.11/site-packages/numpy" \
  --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
  --with-mpi-include="${ISSM_DIR}/externalpackages/petsc/install/include" \
  --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

diff --git a/jenkins/ross-debian_linux-full-mplapack b/jenkins/ross-debian_linux-full-mplapack
@@ -12,9 +12,9 @@ ISSM_CONFIG='\
  --with-cxxoptflags="-g -O2 -fPIC -std=gnu++11" \
  --with-numthreads=4 \
  --with-matlab-dir=${MATLAB_PATH} \
- --with-python-version=3.7 \
+ --with-python-version=3.11 \
  --with-python-dir=/usr \
- --with-python-numpy-dir=/usr/local/lib/python3.7/dist-packages/numpy \
+ --with-python-numpy-dir="${HOME}/.venv/issm/lib/python3.11/site-packages/numpy" \
  --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
  --with-mpi-include="${ISSM_DIR}/externalpackages/petsc/install/include" \
  --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

diff --git a/jenkins/ross-debian_linux-full-valgrind b/jenkins/ross-debian_linux-full-valgrind
@@ -13,9 +13,9 @@ ISSM_CONFIG='\
  --enable-development \
  --enable-debugging \ --with-numthreads=4 \
  --with-matlab-dir=${MATLAB_PATH} \
- --with-python-version=3.7 \
+ --with-python-version=3.11 \
  --with-python-dir=/usr \
- --with-python-numpy-dir=/usr/local/lib/python3.7/dist-packages/numpy \
+ --with-python-numpy-dir="${HOME}/.venv/issm/lib/python3.11/site-packages/numpy" \
  --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
  --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
  --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

diff --git a/jenkins/ross-debian_linux-gia b/jenkins/ross-debian_linux-gia
@@ -12,9 +12,9 @@ ISSM_CONFIG='\
  --with-gia=yes \
  --with-numthreads=4
  --with-matlab-dir=${MATLAB_PATH} \
- --with-python-version=3.7 \
+ --with-python-version=3.11 \
  --with-python-dir=/usr \
- --with-python-numpy-dir=/usr/local/lib/python3.7/dist-packages/numpy \
+ --with-python-numpy-dir="${HOME}/.venv/issm/lib/python3.11/site-packages/numpy" \
  --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
  --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
  --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

diff --git a/jenkins/ross-debian_linux-python b/jenkins/ross-debian_linux-python
@@ -8,9 +8,9 @@ ISSM_CONFIG='\
  --enable-development \
  --enable-debugging \
  --with-numthreads=4 \
- --with-python-version=3.7 \
+ --with-python-version=3.11 \
  --with-python-dir=/usr \
- --with-python-numpy-dir=/usr/local/lib/python3.7/dist-packages/numpy \
+ --with-python-numpy-dir="${HOME}/.venv/issm/lib/python3.11/site-packages/numpy" \
  --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
  --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
  --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

diff --git a/jenkins/ross-debian_linux-solid_earth b/jenkins/ross-debian_linux-solid_earth
@@ -11,9 +11,9 @@ ISSM_CONFIG='\
  --enable-debugging \
  --with-numthreads=4 \
  --with-matlab-dir=${MATLAB_PATH} \
- --with-python-version=3.7 \
+ --with-python-version=3.11 \
  --with-python-dir=/usr \
- --with-python-numpy-dir=/usr/local/lib/python3.7/dist-packages/numpy \
+ --with-python-numpy-dir="${HOME}/.venv/issm/lib/python3.11/site-packages/numpy" \
  --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
  --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
  --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \