Commit 9b562556 authored by Daniele Venzano's avatar Daniele Venzano

Update with compatibility for

parent 6c258299
# Batch TensorFlow
Stand-alone batch TensorFlow version 1.3 for Python 3, recompiled with instructions for modern x86_64 Intel CPUs.
This ZApp expects as parameter the command to run, relative to the workspace. For example, if you want to run
the script `~/algo/run.py`, you can write `python3 ./algo/run.py`.
# Tensorflow ZApp
Unmodified [Google TensorFlow](https://www.tensorflow.org/) as generated by Google. This ZApp contains a Jupyter Notebook.
The image used contains TensorFlow 1.3 for Python 3.
# Tensorflow ZApp
Google Tensorflow image with notebook or stand-alone batch tensorflow based on latest GIT.
...@@ -43,10 +43,6 @@ RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add - ...@@ -43,10 +43,6 @@ RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
RUN apt-get update && sudo apt-get install -y --force-yes --no-install-recommends bazel patch RUN apt-get update && sudo apt-get install -y --force-yes --no-install-recommends bazel patch
RUN apt-get upgrade -y --force-yes --no-install-recommends bazel RUN apt-get upgrade -y --force-yes --no-install-recommends bazel
# CLONE FROM GIT
#RUN git clone https://github.com/tensorflow/tensorflow
#WORKDIR /tensorflow
################################################## ##################################################
# Make sure important packages are installed # Make sure important packages are installed
################################################## ##################################################
...@@ -76,7 +72,7 @@ RUN mkdir /bazel && \ ...@@ -76,7 +72,7 @@ RUN mkdir /bazel && \
RUN git clone https://github.com/tensorflow/tensorflow.git && \ RUN git clone https://github.com/tensorflow/tensorflow.git && \
cd tensorflow cd tensorflow
# git checkout r1.2 git checkout r1.3
WORKDIR /tensorflow WORKDIR /tensorflow
# TODO(craigcitro): Don't install the pip package, since it makes it # TODO(craigcitro): Don't install the pip package, since it makes it
......
...@@ -35,7 +35,7 @@ REGISTRY = os.getenv("DOCKER_REGISTRY", default="docker-engine:5000") ...@@ -35,7 +35,7 @@ REGISTRY = os.getenv("DOCKER_REGISTRY", default="docker-engine:5000")
REPOSITORY = os.getenv("REPOSITORY", default="zapps") REPOSITORY = os.getenv("REPOSITORY", default="zapps")
VERSION = os.getenv("VERSION", default="latest") VERSION = os.getenv("VERSION", default="latest")
GOOG_IMAGE = "gcr.io/tensorflow/tensorflow" GOOG_IMAGE = "gcr.io/tensorflow/tensorflow:1.3.0-py3"
def goog_tensorflow_service(memory_limit, core_limit): def goog_tensorflow_service(memory_limit, core_limit):
""" """
......
...@@ -43,7 +43,7 @@ def custom_tensorflow_service(memory_limit, core_limit): ...@@ -43,7 +43,7 @@ def custom_tensorflow_service(memory_limit, core_limit):
:rtype: dict :rtype: dict
""" """
service = { service = {
'name': "jupyter", 'name': "tf",
'image': CUSTOM_IMAGE, 'image': CUSTOM_IMAGE,
'monitor': True, 'monitor': True,
'resources': { 'resources': {
......
{
"version": 1,
"zapps": [
{
"category": "Jupyter notebooks",
"name": "TensorFlow notebook",
"description": "goog_tensorflow.json",
"readable_descr": "README-goog.md",
"parameters": []
},
{
"category": "Non-interactive",
"name": "Optimized TensorFlow",
"description": "custom_tensorflow.json",
"readable_descr": "README-custom.md",
"parameters": [
{
"kind": "command",
"name": "tf",
"readable_name": "Command",
"description": "The Python script to run, relative to the workspace directory",
"type": "string",
"default": "./my-tf-app/main.py"
}
]
}
]
}
...@@ -2,12 +2,15 @@ ...@@ -2,12 +2,15 @@
set -e set -e
VALIDATION_URL=${VALIDATION_URL:-http://localhost:5001/api/0.7/zapp_validation} VALIDATION_URL=${VALIDATION_URL:-http://localhost:5001/api/0.7/zapp_validate}
tempfile=`mktemp` tempfile=`mktemp`
trap "{ rm -f $tempfile; }" EXIT trap "{ rm -f $tempfile; }" EXIT
for json in *.json; do for json in *.json; do
if [ $json = "manifest.json" ]; then
continue
fi
echo '{"application":' > $tempfile echo '{"application":' > $tempfile
cat $json >> $tempfile cat $json >> $tempfile
echo '}' >> $tempfile echo '}' >> $tempfile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment