Skip to content

dev: Fix TensorFlow workaround for our Jenkins server #359

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
mihaic merged 2 commits into from
Apr 30, 2018
Merged

dev: Fix TensorFlow workaround for our Jenkins server #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6563b55
dev: Fix TensorFlow workaround for our Jenkins server
mihaic Apr 19, 2018
680125f
Merge branch 'master' into fix-jenkins
mihaic Apr 30, 2018
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
5 changes: 5 additions & 0 deletions .conda/bin/jenkins-server-customization
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# This Bash script must be sourced, not executed
# Customizations required for the server that currently runs Jenkins

conda install --yes mpi4py tensorflow
module unload gcc
28 changes: 13 additions & 15 deletions pr-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,27 +116,25 @@ python3 -m pip install -U "pip<10" || \
python3 -m pip install $ignore_installed -U -e . || \
exit_with_error_and_venv "Failed to install BrainIAK."

# Allow installation on OSes we do not formally support by installing packages
# with unmet non-PyPI dependencies with Conda. This option is not supported and
# should not be documented in user docs. In particular we use it on our CentOS
# 6 Jenkins server for Tensorflow, which requires glibc >= 2.17.
conda_override=$1
if [ ${conda_override:-default} = "--conda-override" ]
# install developer dependencies
python3 -m pip install $ignore_installed -U -r requirements-dev.txt || \
exit_with_error_and_venv "Failed to install development requirements."

# Source a user-specified Bash script to customize the installation.
# This option is not supported and should not be documented in user docs.
# In particular we use it on our CentOS 6 Jenkins server with .conda/bin/
customization_script_flag=$1
if [ ${customization_script_flag:-default} = "--customization-script" ]
then
conda_override_packages=$2
if [ ${conda_override_packages:-default} = "default" ]
customization_script=$2
if [ ${customization_script:-default} = "default" ]
then
exit_with_error_and_venv "Missing Conda override package list"
exit_with_error_and_venv "Must specify customization script"
else
echo $conda_override_packages | tr , " " | xargs conda install --yes
source $customization_script
fi
fi


# install developer dependencies
python3 -m pip install $ignore_installed -U -r requirements-dev.txt || \
exit_with_error_and_venv "Failed to install development requirements."

# static analysis
./run-checks.sh || \
exit_with_error_and_venv "run-checks failed"
Expand Down
6 changes: 3 additions & 3 deletions run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ python3 -m pip freeze | grep -qi /brainiak \
# If removing, also remove from .conda/*
export MKL_THREADING_LAYER=GNU

mpi_command=mpiexec
if [ ! -z $SLURM_NODELIST ]
mpi_command=$BRAINIAKDEV_MPI_COMMAND
if [ -z $mpi_command ]
then
mpi_command=srun
mpi_command=mpiexec
fi
$mpi_command -n 2 coverage run -m pytest

Expand Down