Remove tutorials from main repository.

* They now live at https://github.com/caffe2/tutorials
* Updating caffe2.ai website to match in a separate commit.
This commit is contained in:
Orion Reblitz-Richardson 2018-03-27 14:33:07 -07:00
parent bb3bfa09f3
commit 368f96acde
5 changed files with 12 additions and 27 deletions

1
.gitattributes vendored
View File

@ -1 +0,0 @@
*.ipynb linguist-documentation

View File

@ -62,18 +62,6 @@ fi
exit_code=0 exit_code=0
cd "$ROOT_DIR"/caffe2/python/tutorials
python tutorials_to_script_converter.py
git status
if git diff --quiet HEAD; then
echo "Source tree is clean."
else
echo "After running a tutorial -> script sync there are changes. This probably means you edited an ipython notebook without a proper sync to a script. Please see caffe2/python/tutorials/README.md for more information"
if [ "$exit_code" -eq 0 ]; then
exit_code=1
fi
fi
cd "$ROOT_DIR" cd "$ROOT_DIR"
if [ -d ./test ]; then if [ -d ./test ]; then

View File

@ -1,5 +1,5 @@
FROM caffe2ai/caffe2:latest FROM caffe2ai/caffe2:latest
MAINTAINER Aaron Markham <aaronmarkham@fb.com> MAINTAINER Orion Reblitz-Richardson <orionr@fb.com>
# Caffe2 source refresh and tutorial files overlay # Caffe2 source refresh and tutorial files overlay
# Change to a CPU-only docker base if needed (latest is GPU) # Change to a CPU-only docker base if needed (latest is GPU)
@ -9,6 +9,8 @@ RUN apt-get install unzip vim -y --no-install-recommends
WORKDIR "/" WORKDIR "/"
RUN rm -rf caffe2 RUN rm -rf caffe2
RUN git clone --recursive https://github.com/caffe2/caffe2.git RUN git clone --recursive https://github.com/caffe2/caffe2.git
RUN rm -rf caffe2_tutorials
RUN git clone --recursive https://github.com/caffe2/tutorials.git caffe2_tutorials
########## REBUILD ################### ########## REBUILD ###################
WORKDIR "/caffe2" WORKDIR "/caffe2"
@ -30,9 +32,9 @@ RUN python -m caffe2.python.models.download -i squeezenet
# RUN python -m caffe2.python.models.download -i bvlc_reference_rcnn_ilsvrc13 # RUN python -m caffe2.python.models.download -i bvlc_reference_rcnn_ilsvrc13
# RUN python -m caffe2.python.models.download -i finetune_flickr_style # RUN python -m caffe2.python.models.download -i finetune_flickr_style
# get MNIST dataset for MNIST # get MNIST dataset for MNIST
WORKDIR "/caffe2/caffe2/python/tutorials" WORKDIR "/caffe2_tutorials"
RUN mkdir tutorial_data && cd tutorial_data RUN mkdir tutorial_data && cd tutorial_data
WORKDIR "/caffe2/caffe2/python/tutorials/tutorial_data" WORKDIR "/caffe2_tutorials/tutorial_data"
RUN wget "https://download.caffe2.ai/datasets/mnist/mnist.zip" RUN wget "https://download.caffe2.ai/datasets/mnist/mnist.zip"
RUN unzip -d mnist mnist.zip RUN unzip -d mnist mnist.zip
WORKDIR "/caffe2/caffe2/python/tutorials" WORKDIR "/caffe2_tutorials"

View File

@ -62,7 +62,12 @@ To use Caffe2 in Python, you need two libraries, future and six.
pip install future six pip install future six
To run the tutorials you'll need jupyter (formerly ipython) notebooks and matplotlib, which can be installed on MacOS X with To run the tutorials, download additional source from GitHub.
git clone --recursive https://github.com/caffe2/tutorials.git caffe2_tutorials
cd caffe2_tutorials
You'll also need jupyter (formerly ipython) notebooks and matplotlib, which can be installed on MacOS X with
brew install matplotlib --with-python3 brew install matplotlib --with-python3
pip install jupyter pip install jupyter

View File

@ -1,9 +0,0 @@
#!/usr/bin/env sh
# This script simply starts the ipython notebook and allows all network machines
# to access it.
# Use the following command for very verbose prints.
# GLOG_logtostderr=1 GLOG_v=1 PYTHONPATH=../../../build:$PYTHONPATH jupyter notebook "$@"
# Use the following command for a normal run.
PYTHONPATH=build:$PYTHONPATH jupyter notebook --notebook-dir=caffe2/python/tutorials "$@"