From 1eecddafd121e5c5966ecb0a6a93ba084d022170 Mon Sep 17 00:00:00 2001 From: Tidbit Software <34657535+TidbitSoftware@users.noreply.github.com> Date: Thu, 30 May 2024 12:11:03 -0700 Subject: [PATCH] CHG: Updating paths to Python installation (now using venv) --- jenkins/ross-debian_linux-adolc-ampioff | 4 ++-- jenkins/ross-debian_linux-adolc-ampion | 4 ++-- jenkins/ross-debian_linux-binaries-python-3 | 4 ++-- jenkins/ross-debian_linux-dakota | 4 ++-- jenkins/ross-debian_linux-full | 4 ++-- jenkins/ross-debian_linux-full-mplapack | 4 ++-- jenkins/ross-debian_linux-full-valgrind | 4 ++-- jenkins/ross-debian_linux-gia | 4 ++-- jenkins/ross-debian_linux-python | 4 ++-- jenkins/ross-debian_linux-solid_earth | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/jenkins/ross-debian_linux-adolc-ampioff b/jenkins/ross-debian_linux-adolc-ampioff index 7d8cfae..5f79ee4 100755 --- 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 index 5cbd067..aa9e275 100755 --- 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 index d8b98a6..b7c76ed 100755 --- 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 index 3bc57ed..4242b5c 100755 --- 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 index 5561916..7230c9c 100755 --- 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 index 0c59f29..08cd5f9 100755 --- 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 index 614afc0..e2d19e9 100755 --- 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 index a792a6a..e5d110c 100755 --- 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 index f7f3a2c..710a9c5 100755 --- 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 index da0cd0c..2af2003 100755 --- 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" \