Skip to content

Commit aef89b4

Browse files
authored
Use available Docker version for Local Mode setup.sh (aws#424)
We had a hard-coded version to ensure the same version between docker and nvidia-docker, but that runs into problems if what's hard-coded isn't present.
1 parent 330ca29 commit aef89b4

File tree

5 files changed

+60
-15
lines changed

5 files changed

+60
-15
lines changed

sagemaker-python-sdk/chainer_mnist/setup.sh

+12-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ if [ $? -eq 0 ]; then
77
NVIDIA_DOCKER=`rpm -qa | grep -c nvidia-docker2`
88
if [ $NVIDIA_DOCKER -eq 0 ]; then
99
# Install nvidia-docker2
10-
#sudo pkill -SIGHUP dockerd
10+
DOCKER_VERSION=`yum list docker | tail -1 | awk '{print $2}' | head -c 2`
11+
12+
if [ $DOCKER_VERSION -eq 17 ]; then
13+
DOCKER_PKG_VERSION='17.09.1ce-1.111.amzn1'
14+
NVIDIA_DOCKER_PKG_VERSION='2.0.3-1.docker17.09.1.ce.amzn1'
15+
else
16+
DOCKER_PKG_VERSION='18.06.1ce-3.17.amzn1'
17+
NVIDIA_DOCKER_PKG_VERSION='2.0.3-1.docker18.06.1.ce.amzn1'
18+
fi
19+
1120
sudo yum -y remove docker
12-
sudo yum -y install docker-17.09.1ce-1.111.amzn1
21+
sudo yum -y install docker-$DOCKER_PKG_VERSION
1322

1423
sudo /etc/init.d/docker start
1524

1625
curl -s -L https://nvidia.github.io/nvidia-docker/amzn1/nvidia-docker.repo | sudo tee /etc/yum.repos.d/nvidia-docker.repo
17-
sudo yum install -y nvidia-docker2-2.0.3-1.docker17.09.1.ce.amzn1
26+
sudo yum install -y nvidia-docker2-$NVIDIA_DOCKER_PKG_VERSION
1827
sudo cp daemon.json /etc/docker/daemon.json
1928
sudo pkill -SIGHUP dockerd
2029
echo "installed nvidia-docker2"

sagemaker-python-sdk/mxnet_gluon_cifar10/setup.sh

+12-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ if [ $? -eq 0 ]; then
77
NVIDIA_DOCKER=`rpm -qa | grep -c nvidia-docker2`
88
if [ $NVIDIA_DOCKER -eq 0 ]; then
99
# Install nvidia-docker2
10-
#sudo pkill -SIGHUP dockerd
10+
DOCKER_VERSION=`yum list docker | tail -1 | awk '{print $2}' | head -c 2`
11+
12+
if [ $DOCKER_VERSION -eq 17 ]; then
13+
DOCKER_PKG_VERSION='17.09.1ce-1.111.amzn1'
14+
NVIDIA_DOCKER_PKG_VERSION='2.0.3-1.docker17.09.1.ce.amzn1'
15+
else
16+
DOCKER_PKG_VERSION='18.06.1ce-3.17.amzn1'
17+
NVIDIA_DOCKER_PKG_VERSION='2.0.3-1.docker18.06.1.ce.amzn1'
18+
fi
19+
1120
sudo yum -y remove docker
12-
sudo yum -y install docker-17.09.1ce-1.111.amzn1
21+
sudo yum -y install docker-$DOCKER_PKG_VERSION
1322

1423
sudo /etc/init.d/docker start
1524

1625
curl -s -L https://nvidia.github.io/nvidia-docker/amzn1/nvidia-docker.repo | sudo tee /etc/yum.repos.d/nvidia-docker.repo
17-
sudo yum install -y nvidia-docker2-2.0.3-1.docker17.09.1.ce.amzn1
26+
sudo yum install -y nvidia-docker2-$NVIDIA_DOCKER_PKG_VERSION
1827
sudo cp daemon.json /etc/docker/daemon.json
1928
sudo pkill -SIGHUP dockerd
2029
echo "installed nvidia-docker2"

sagemaker-python-sdk/mxnet_gluon_mnist/setup.sh

+12-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ if [ $? -eq 0 ]; then
77
NVIDIA_DOCKER=`rpm -qa | grep -c nvidia-docker2`
88
if [ $NVIDIA_DOCKER -eq 0 ]; then
99
# Install nvidia-docker2
10-
#sudo pkill -SIGHUP dockerd
10+
DOCKER_VERSION=`yum list docker | tail -1 | awk '{print $2}' | head -c 2`
11+
12+
if [ $DOCKER_VERSION -eq 17 ]; then
13+
DOCKER_PKG_VERSION='17.09.1ce-1.111.amzn1'
14+
NVIDIA_DOCKER_PKG_VERSION='2.0.3-1.docker17.09.1.ce.amzn1'
15+
else
16+
DOCKER_PKG_VERSION='18.06.1ce-3.17.amzn1'
17+
NVIDIA_DOCKER_PKG_VERSION='2.0.3-1.docker18.06.1.ce.amzn1'
18+
fi
19+
1120
sudo yum -y remove docker
12-
sudo yum -y install docker-17.09.1ce-1.111.amzn1
21+
sudo yum -y install docker-$DOCKER_PKG_VERSION
1322

1423
sudo /etc/init.d/docker start
1524

1625
curl -s -L https://nvidia.github.io/nvidia-docker/amzn1/nvidia-docker.repo | sudo tee /etc/yum.repos.d/nvidia-docker.repo
17-
sudo yum install -y nvidia-docker2-2.0.3-1.docker17.09.1.ce.amzn1
26+
sudo yum install -y nvidia-docker2-$NVIDIA_DOCKER_PKG_VERSION
1827
sudo cp daemon.json /etc/docker/daemon.json
1928
sudo pkill -SIGHUP dockerd
2029
echo "installed nvidia-docker2"

sagemaker-python-sdk/pytorch_cnn_cifar10/setup.sh

+12-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ if [ $? -eq 0 ]; then
77
NVIDIA_DOCKER=`rpm -qa | grep -c nvidia-docker2`
88
if [ $NVIDIA_DOCKER -eq 0 ]; then
99
# Install nvidia-docker2
10-
#sudo pkill -SIGHUP dockerd
10+
DOCKER_VERSION=`yum list docker | tail -1 | awk '{print $2}' | head -c 2`
11+
12+
if [ $DOCKER_VERSION -eq 17 ]; then
13+
DOCKER_PKG_VERSION='17.09.1ce-1.111.amzn1'
14+
NVIDIA_DOCKER_PKG_VERSION='2.0.3-1.docker17.09.1.ce.amzn1'
15+
else
16+
DOCKER_PKG_VERSION='18.06.1ce-3.17.amzn1'
17+
NVIDIA_DOCKER_PKG_VERSION='2.0.3-1.docker18.06.1.ce.amzn1'
18+
fi
19+
1120
sudo yum -y remove docker
12-
sudo yum -y install docker-17.09.1ce-1.111.amzn1
21+
sudo yum -y install docker-$DOCKER_PKG_VERSION
1322

1423
sudo /etc/init.d/docker start
1524

1625
curl -s -L https://nvidia.github.io/nvidia-docker/amzn1/nvidia-docker.repo | sudo tee /etc/yum.repos.d/nvidia-docker.repo
17-
sudo yum install -y nvidia-docker2-2.0.3-1.docker17.09.1.ce.amzn1
26+
sudo yum install -y nvidia-docker2-$NVIDIA_DOCKER_PKG_VERSION
1827
sudo cp daemon.json /etc/docker/daemon.json
1928
sudo pkill -SIGHUP dockerd
2029
echo "installed nvidia-docker2"

sagemaker-python-sdk/tensorflow_distributed_mnist/setup.sh

+12-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ if [ $? -eq 0 ]; then
77
NVIDIA_DOCKER=`rpm -qa | grep -c nvidia-docker2`
88
if [ $NVIDIA_DOCKER -eq 0 ]; then
99
# Install nvidia-docker2
10-
#sudo pkill -SIGHUP dockerd
10+
DOCKER_VERSION=`yum list docker | tail -1 | awk '{print $2}' | head -c 2`
11+
12+
if [ $DOCKER_VERSION -eq 17 ]; then
13+
DOCKER_PKG_VERSION='17.09.1ce-1.111.amzn1'
14+
NVIDIA_DOCKER_PKG_VERSION='2.0.3-1.docker17.09.1.ce.amzn1'
15+
else
16+
DOCKER_PKG_VERSION='18.06.1ce-3.17.amzn1'
17+
NVIDIA_DOCKER_PKG_VERSION='2.0.3-1.docker18.06.1.ce.amzn1'
18+
fi
19+
1120
sudo yum -y remove docker
12-
sudo yum -y install docker-17.09.1ce-1.111.amzn1
21+
sudo yum -y install docker-$DOCKER_PKG_VERSION
1322

1423
sudo /etc/init.d/docker start
1524

1625
curl -s -L https://nvidia.github.io/nvidia-docker/amzn1/nvidia-docker.repo | sudo tee /etc/yum.repos.d/nvidia-docker.repo
17-
sudo yum install -y nvidia-docker2-2.0.3-1.docker17.09.1.ce.amzn1
26+
sudo yum install -y nvidia-docker2-$NVIDIA_DOCKER_PKG_VERSION
1827
sudo cp daemon.json /etc/docker/daemon.json
1928
sudo pkill -SIGHUP dockerd
2029
echo "installed nvidia-docker2"

0 commit comments

Comments
 (0)