Skip to content
This repository has been archived by the owner on Sep 27, 2019. It is now read-only.

TF installation temporary fix #1450

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 11 additions & 5 deletions script/installation/packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,17 @@ function install_tf() {
TFCApiFile=$1
TF_VERSION=$2
LinkerConfigCmd=$3
DISTRO=$4
TARGET_DIRECTORY="/usr/local"
# Install Tensorflow Python Binary
sudo -E pip3 install --upgrade pip
# Related issue: https://github.com/pypa/pip/issues/3165
sudo -E pip3 install tensorflow==${TF_VERSION} --upgrade --ignore-installed six
if [ "$DISTRO" == "DARWIN" ]; then
# Temporary fix for https://github.com/cmu-db/peloton/issues/1448
sudo -E pip3 install --upgrade https://storage.googleapis.com/tensorflow/mac/${TF_TYPE}/tensorflow-${TF_VERSION}-py3-none-any.whl
else
sudo -E pip3 install --upgrade pip
# Related issue: https://github.com/pypa/pip/issues/3165
sudo -E pip3 install tensorflow==${TF_VERSION} --upgrade --ignore-installed six
fi

# Install C-API
TFCApiURL="https://storage.googleapis.com/tensorflow/libtensorflow/${TFCApiFile}"
Expand Down Expand Up @@ -193,7 +199,7 @@ if [ "$DISTRO" = "UBUNTU" ]; then
# Install version of protobuf needed by C-API
install_protobuf3.4.0 "ubuntu"
# Install tensorflow
install_tf "$TFCApiFile" "$TF_VERSION" "$LinkerConfigCmd"
install_tf "$TFCApiFile" "$TF_VERSION" "$LinkerConfigCmd" "$DISTRO"

## ------------------------------------------------
## DARWIN (macOS)
Expand Down Expand Up @@ -231,7 +237,7 @@ elif [ "$DISTRO" = "DARWIN" ]; then
brew install ant
# Brew installs correct version of Protobuf(3.5.1 >= 3.4.0)
# So we can directly install tensorflow
install_tf "$TFCApiFile" "$TF_VERSION" "$LinkerConfigCmd"
install_tf "$TFCApiFile" "$TF_VERSION" "$LinkerConfigCmd" "$DISTRO"

## ------------------------------------------------
## UNKNOWN
Expand Down
1 change: 0 additions & 1 deletion src/brain/workload/workload_defaults.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

namespace peloton {
namespace brain {

const int LSTMWorkloadDefaults::NFEATS = 3;
const int LSTMWorkloadDefaults::NENCODED = 20;
const int LSTMWorkloadDefaults::NHID = 20;
Expand Down