Updated tfutils to use new op naming (#284)

* Updated tfutils to use new op naming

* Reverted tensorflow 12.0.0
This commit is contained in:
Wapaul1
2017-02-15 17:47:53 -08:00
committed by Robert Nishihara
parent 12a68e84d2
commit 883f945db4
2 changed files with 5 additions and 9 deletions
+4 -8
View File
@@ -20,8 +20,7 @@ fi
if [[ "$PYTHON" == "2.7" ]] && [[ "$platform" == "linux" ]]; then
sudo apt-get update
sudo apt-get install -y cmake build-essential autoconf curl libtool python-dev python-numpy python-pip libboost-all-dev unzip
sudo pip install cloudpickle funcsigs colorama psutil redis
sudo pip install tensorflow==0.12.0
sudo pip install cloudpickle funcsigs colorama psutil redis tensorflow
elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "linux" ]]; then
sudo apt-get update
sudo apt-get install -y cmake python-dev python-numpy build-essential autoconf curl libtool libboost-all-dev unzip
@@ -29,8 +28,7 @@ elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "linux" ]]; then
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
bash miniconda.sh -b -p $HOME/miniconda
export PATH="$HOME/miniconda/bin:$PATH"
pip install numpy cloudpickle funcsigs colorama psutil redis
pip install tensorflow==0.12.0
pip install numpy cloudpickle funcsigs colorama psutil redis tensorflow
elif [[ "$PYTHON" == "2.7" ]] && [[ "$platform" == "macosx" ]]; then
# check that brew is installed
which -s brew
@@ -43,8 +41,7 @@ elif [[ "$PYTHON" == "2.7" ]] && [[ "$platform" == "macosx" ]]; then
fi
brew install cmake automake autoconf libtool boost
sudo easy_install pip
sudo pip install numpy cloudpickle funcsigs colorama psutil redis --ignore-installed six
sudo pip install tensorflow==0.12.0 --ignore-installed six
sudo pip install numpy cloudpickle funcsigs colorama psutil redis tensorflow --ignore-installed six
elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "macosx" ]]; then
# check that brew is installed
which -s brew
@@ -60,8 +57,7 @@ elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "macosx" ]]; then
wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
bash miniconda.sh -b -p $HOME/miniconda
export PATH="$HOME/miniconda/bin:$PATH"
pip install numpy cloudpickle funcsigs colorama psutil redis
pip install tensorflow==0.12.0
pip install numpy cloudpickle funcsigs colorama psutil redis tensorflow
else
echo "Unrecognized environment."
exit 1
+1 -1
View File
@@ -58,7 +58,7 @@ class TensorFlowVariables(object):
if control not in explored_inputs:
queue.append(control)
explored_inputs.add(control)
if tf_obj.node_def.op == "Variable":
if "Variable" in tf_obj.node_def.op:
variable_names.append(tf_obj.node_def.name)
self.variables = OrderedDict()
for v in [v for v in tf.global_variables() if v.op.node_def.name in variable_names]: