Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Remove references to s1053, use installdir instead #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcgibbon merged 6 commits into from
Dec 21, 2021
Merged

Remove references to s1053, use installdir instead #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4110ba2
remove references to s1053, use installdir instead
mcgibbon Dec 20, 2021
3d2f33d
remove unused DOCKER_BUILDKIT environment variable
mcgibbon Dec 20, 2021
0c5a52c
source machineEnvironment before using installdir variable
mcgibbon Dec 20, 2021
e271d4d
Update buildenv to latest main
mcgibbon Dec 20, 2021
b20289b
fix fv3core install_virtualenv, use WHEEL_DIR for wheels if present
mcgibbon Dec 21, 2021
772da21
Merge branch 'main' into feature/restore_installdir
mcgibbon Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .jenkins/install_virtualenv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ exitError()

# check a virtualenv path has been provided
test -n "$1" || exitError 1001 ${virtualenv_path} "must pass an argument"
wheel_dir=/project/s1053/install/wheeldir
wheel_command="--find-links=$wheel_dir"
if [ "$WHEEL_DIR" != "" ]; then
wheel_command="--find-links=$WHEEL_DIR"
else
wheel_command=""
fi
make update_submodules_venv
virtualenv_path=$1
pace_dir=`dirname $0`/../
Expand All @@ -23,7 +26,7 @@ fi
${pace_dir}/external/daint_venv/install.sh ${virtualenv_path}
source ${virtualenv_path}/bin/activate
python3 -m pip install ${pace_dir}/pace-util/
python3 -m pip install $wheel_command -c ${pace_dir}/constraints.txt -r fv3core/requirements/requirements_daint.txt
python3 -m pip install $wheel_command -c ${pace_dir}/constraints.txt -r fv3core/requirements/requirements_base.txt
python3 -m pip install ${PACE_INSTALL_FLAGS} ${pace_dir}/fv3core/
python3 -m pip install ${PACE_INSTALL_FLAGS} ${pace_dir}/fv3gfs-physics/
python3 -m pip install ${PACE_INSTALL_FLAGS} ${pace_dir}/stencils/
Expand Down
1 change: 0 additions & 1 deletion .jenkins/jenkins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ if [ -z ${SCRATCH} ] ; then
fi

# Set the host data head directory location
export TEST_DATA_DIR="/project/s1053/fv3core_serialized_test_data/${DATA_VERSION}"
export TEST_DATA_DIR="${SCRATCH}/jenkins/scratch/fv3core_fortran_data/${DATA_VERSION}"
export FV3_STENCIL_REBUILD_FLAG=False
# Set the host data location
Expand Down
2 changes: 1 addition & 1 deletion buildenv
Open in desktop
Submodule buildenv updated 2 files
+1 −1 env.daint.sh
+3 −0 machineEnvironment.sh
9 changes: 6 additions & 3 deletions external/daint_venv/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ BUILDENV_DIR=$SCRIPT_DIR/../../buildenv

VERSION=vcm_1.0
env_file=env.daint.sh
dst_dir=${1:-/project/s1053/install/venv/${VERSION}}
wheeldir=${2:-/project/s1053/install/wheeldir}
save_wheel=${3: false}
src_dir=$(pwd)

# versions
Expand All @@ -22,6 +19,10 @@ source ${BUILDENV_DIR}/${env_file}
set -e
set -x

dst_dir=${1:-${installdir}/venv/${VERSION}}
wheeldir=${2:-${installdir}/wheeldir}
save_wheel=${3: false}

# delete any pre-existing venv directories
if [ -d ${dst_dir} ] ; then
/bin/rm -rf ${dst_dir}
Expand Down Expand Up @@ -56,6 +57,8 @@ if [ $save_wheel ]; then
fi
python3 -m pip install --find-links=$wheeldir "gt4py/[${cuda_version}]"

python3 -m pip install ${installdir}/mpi4py/mpi4py-3.1.0a0-cp38-cp38-linux_x86_64.whl

# deactivate virtual environment
deactivate

Expand Down
10 changes: 7 additions & 3 deletions fv3core/.jenkins/install_virtualenv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,12 @@ exitError()

# check a virtualenv path has been provided
test -n "$1" || exitError 1001 ${virtualenv_path} "must pass an argument"
wheel_dir=/project/s1053/install/wheeldir
wheel_command="--find-links=$wheel_dir"
if [ "$WHEEL_DIR" != "" ]; then
wheel_command="--find-links=$WHEEL_DIR"
else
wheel_command=""
fi

make update_submodules_venv
virtualenv_path=$1
fv3core_dir=`dirname $0`/../
Expand All @@ -22,7 +26,7 @@ fi
${fv3core_dir}/external/daint_venv/install.sh ${virtualenv_path}
source ${virtualenv_path}/bin/activate
python3 -m pip install ${fv3core_dir}/external/pace-util/
python3 -m pip install $wheel_command -c ${fv3core_dir}/constraints.txt -r ${fv3core_dir}/requirements/requirements_daint.txt
python3 -m pip install $wheel_command -c ${fv3core_dir}/constraints.txt -r ${fv3core_dir}/requirements/requirements_base.txt
python3 -m pip install ${FV3CORE_INSTALL_FLAGS} ${fv3core_dir}
python3 -m pip install ${fv3core_dir}/external/stencils/
python3 -m pip install ${fv3core_dir}/external/dsl/
Expand Down
1 change: 0 additions & 1 deletion fv3core/.jenkins/jenkins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ if [ -z ${SCRATCH} ] ; then
fi

# Set the host data head directory location
export TEST_DATA_DIR="/project/s1053/fv3core_serialized_test_data/${DATA_VERSION}"
export TEST_DATA_DIR="${SCRATCH}/jenkins/scratch/fv3core_fortran_data/${DATA_VERSION}"
export FV3_STENCIL_REBUILD_FLAG=False
# Set the host data location
Expand Down
2 changes: 0 additions & 2 deletions fv3core/requirements/requirements_daint.txt
View file
Open in desktop

This file was deleted.