@@ -67,11 +67,12 @@ function install_protobuf3.4.0() {
67
67
# Utility function for installing tensorflow components of python/C++
68
68
function install_tf() {
69
69
TFCApiFile=$1
70
- TFBinaryURL =$2
70
+ TF_VERSION =$2
71
71
LinkerConfigCmd=$3
72
72
TARGET_DIRECTORY=" /usr/local"
73
73
# Install Tensorflow Python Binary
74
- sudo -E pip3 install --upgrade ${TFBinaryURL}
74
+ sudo -E pip3 install --upgrade pip
75
+ sudo -E pip3 install --upgrade tensorflow==${TF_VERSION}
75
76
76
77
# Install C-API
77
78
TFCApiURL=" https://storage.googleapis.com/tensorflow/libtensorflow/${TFCApiFile} "
@@ -88,7 +89,6 @@ function install_tf() {
88
89
# # ------------------------------------------------
89
90
if [ " $DISTRO " = " UBUNTU" ]; then
90
91
MAJOR_VER=$( echo " $DISTRO_VER " | cut -d ' .' -f 1)
91
- MINOR_VER=$( echo " $DISTRO_VER " | cut -d ' .' -f 2)
92
92
# Fix for LLVM-3.7 on Ubuntu 14 + 17
93
93
if [ " $MAJOR_VER " == " 14" -o " $MAJOR_VER " == " 17" ]; then
94
94
if [ " $MAJOR_VER " == " 14" ]; then
@@ -120,23 +120,16 @@ if [ "$DISTRO" = "UBUNTU" ]; then
120
120
if [ " $MAJOR_VER " == " 14" ]; then
121
121
PKG_CMAKE=" cmake3"
122
122
FORCE_Y=" --force-yes"
123
- TF_VERSION=" 1.4.0"
124
- TFBinaryURL=" https://storage.googleapis.com/tensorflow/linux/${TF_TYPE} /tensorflow-${TF_VERSION} -cp34-cp34m-linux_x86_64.whl"
123
+ TF_VERSION=" 1.4.0"
125
124
fi
126
125
if [ " $MAJOR_VER " == " 16" ]; then
127
- TF_VERSION=" 1.5.0"
128
- TFBinaryURL=" https://storage.googleapis.com/tensorflow/linux/${TF_TYPE} /tensorflow-${TF_VERSION} -cp35-cp35m-linux_x86_64.whl"
126
+ TF_VERSION=" 1.5.0"
129
127
fi
130
128
# Fix for llvm on Ubuntu 17.x
131
129
if [ " $MAJOR_VER " == " 17" ]; then
132
130
PKG_LLVM=" llvm-3.9"
133
131
PKG_CLANG=" clang-3.8"
134
- TF_VERSION=" 1.5.0"
135
- if [ " $MINOR_VER " == " 10" ]; then
136
- TFBinaryURL=" https://storage.googleapis.com/tensorflow/linux/${TF_TYPE} /tensorflow-${TF_VERSION} -cp36-cp36m-linux_x86_64.whl"
137
- elif [ " $MINOR_VER " == " 04" ]; then
138
- TFBinaryURL=" https://storage.googleapis.com/tensorflow/linux/${TF_TYPE} /tensorflow-${TF_VERSION} -cp35-cp35m-linux_x86_64.whl"
139
- fi
132
+ TF_VERSION=" 1.5.0"
140
133
fi
141
134
TFCApiFile=" libtensorflow-${TF_TYPE} -linux-x86_64-${TF_VERSION} .tar.gz"
142
135
LinkerConfigCmd=" sudo ldconfig"
@@ -172,7 +165,7 @@ if [ "$DISTRO" = "UBUNTU" ]; then
172
165
# Install version of protobuf needed by C-API
173
166
install_protobuf3.4.0 " ubuntu"
174
167
# Install tensorflow
175
- install_tf " $TFCApiFile " " $TFBinaryURL " " $LinkerConfigCmd "
168
+ install_tf " $TFCApiFile " " $TF_VERSION " " $LinkerConfigCmd "
176
169
177
170
# # ------------------------------------------------
178
171
# # DEBIAN
@@ -212,7 +205,6 @@ elif [[ "$DISTRO" == *"FEDORA"* ]]; then
212
205
esac
213
206
TF_VERSION=" 1.5.0"
214
207
TFCApiFile=" libtensorflow-${TF_TYPE} -linux-x86_64-${TF_VERSION} .tar.gz"
215
- TFBinaryURL=" https://storage.googleapis.com/tensorflow/linux/${TF_TYPE} /tensorflow-${TF_VERSION} -cp36-cp36m-linux_x86_64.whl"
216
208
LinkerConfigCmd=" sudo ldconfig"
217
209
sudo dnf -q install -y \
218
210
git \
@@ -248,7 +240,7 @@ elif [[ "$DISTRO" == *"FEDORA"* ]]; then
248
240
# Install version of protobuf needed by C-API
249
241
install_protobuf3.4.0 " fedora"
250
242
# Install tensorflow
251
- install_tf " $TFCApiFile " " $TFBinaryURL " " $LinkerConfigCmd "
243
+ install_tf " $TFCApiFile " " $TF_VERSION " " $LinkerConfigCmd "
252
244
253
245
# # ------------------------------------------------
254
246
# # REDHAT
@@ -329,7 +321,6 @@ elif [ "$DISTRO" = "DARWIN" ]; then
329
321
ruby -e " $( curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install) "
330
322
fi
331
323
TF_VERSION=" 1.4.0"
332
- TFBinaryURL=" https://storage.googleapis.com/tensorflow/mac/${TF_TYPE} /tensorflow-${TF_VERSION} -py3-none-any.whl"
333
324
TFCApiFile=" libtensorflow-${TF_TYPE} -darwin-x86_64-${TF_VERSION} .tar.gz"
334
325
LinkerConfigCmd=" sudo update_dyld_shared_cache"
335
326
brew install git
@@ -353,7 +344,7 @@ elif [ "$DISTRO" = "DARWIN" ]; then
353
344
brew upgrade python
354
345
# Brew installs correct version of Protobuf(3.5.1 >= 3.4.0)
355
346
# So we can directly install tensorflow
356
- install_tf " $TFCApiFile " " $TFBinaryURL " " $LinkerConfigCmd "
347
+ install_tf " $TFCApiFile " " $TF_VERSION " " $LinkerConfigCmd "
357
348
358
349
# # ------------------------------------------------
359
350
# # UNKNOWN
0 commit comments