Merge pull request #214 from NervanaSystems/peter/makefile_tf_fix

Update makefile to include tf-mkl

Author: peteriz

.gitignore

@@ -25,3 +25,4 @@ generated
 .idea/
 dist
 .nlp_architect_env/
+_generated_reqs.txt

Makefile

@@ -21,7 +21,7 @@ DOC_PUB_RELEASE_PATH := $(DOC_PUB_PATH)/$(RELEASE)
 
 LIBRARY_NAME := nlp_architect
 VIRTUALENV_DIR := .nlp_architect_env
-REQ_FILE := requirements.txt
+REQ_FILE := _generated_reqs.txt
 ACTIVATE := $(VIRTUALENV_DIR)/bin/activate
 MODELS_DIR := $(LIBRARY_NAME)/models
 NLP_DIR := $(LIBRARY_NAME)/nlp
@@ -57,10 +57,18 @@ html: doc_prepare $(ACTIVATE)
 clean:
 	@echo "Cleaning files.."
 	@rm -rf $(VIRTUALENV_DIR)
+	@rm -rf $(REQ_FILE)
 
 ENV_EXIST := $(shell test -d $(VIRTUALENV_DIR) && echo -n yes)
+REQ_EXIST := $(shell test -f $(REQ_FILE) && echo -n yes)
 
-$(ACTIVATE):
+$(REQ_FILE):
+ifneq ($(REQ_EXIST), yes)
+	@echo "Generating pip requirements file"
+	@bash generate_reqs.sh
+endif
+
+$(ACTIVATE): $(REQ_FILE)
 ifneq ($(ENV_EXIST), yes)
 	@echo "NLP Architect installation"
 	@echo "**************************"
@@ -83,14 +91,14 @@ dev: pre_install
 	@. $(ACTIVATE); pip install -e .
 	$(MAKE) print_finish
 
-install_no_virt_env:
+install_no_virt_env: $(REQ_FILE)
 	@echo "\n\n****************************************"
 	@echo "Installing NLP Architect in current python env"
 	pip install -r $(REQ_FILE)
 	pip install -e .
 	@echo "NLP Architect setup complete."
 
-sysinstall:
+sysinstall: $(REQ_FILE)
 	@echo "\n\n****************************************"
 	@echo "Installing NLP Architect in current python env (system install)"
 	pip install -r $(REQ_FILE)

generate_reqs.sh

@@ -0,0 +1,68 @@
+#!/bin/bash -e
+# ******************************************************************************
+# Copyright 2017-2018 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ******************************************************************************
+
+# optimized pacakge links
+tf_ver='1.6.0'
+tf_to_install='tensorflow=='${tf_ver}
+tf35='https://anaconda.org/intel/tensorflow/1.6.0/download/tensorflow-1.6.0-cp35-cp35m-linux_x86_64.whl'
+tf36='https://anaconda.org/intel/tensorflow/1.6.0/download/tensorflow-1.6.0-cp36-cp36m-linux_x86_64.whl'
+
+
+# detect python version and OS
+pyver=`python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))'`
+platform='other'
+unamestr=`uname`
+if [[ "$unamestr" == 'Linux' ]]; then
+   platform='linux'
+fi
+
+ask_which_tf() {
+  read -p 'Install Tensorflow MKL-DNN ? [Y/n] ' install_opt_tf
+  retval=0
+  case "${install_opt_tf}" in
+    y|Y ) retval=1;;
+    n|N ) retval=0;;
+    "" ) retval=0;;
+  esac
+  if [ ${retval} == 1 ];
+  then
+    if [ ${pyver} == 3.5 ];
+    then
+      echo python 3.5 detected;
+      tf_to_install=${tf35};
+    elif [ ${pyver} == 3.6 ];
+    then
+      echo python 3.6 detected;
+      tf_to_install=${tf36};
+    fi
+  fi
+}
+
+if [ ${pyver} == 3.5 ] || [ ${pyver} == 3.6 ] ;
+then
+  if [ ${platform} == 'linux' ] ;
+  then
+    ask_which_tf
+  fi
+fi
+
+# read file
+while read line
+do
+    line=${line/tensorflow*/$tf_to_install}
+    echo "$line"
+done < requirements.txt > _generated_reqs.txt