cleanup

Kautenja · Apr 27, 2018 · a4f2c04 · a4f2c04
1 parent 970920b
commit a4f2c04
Show file tree

Hide file tree

Showing 98 changed files with 31 additions and 3,512 deletions.
diff --git a/Makefile b/Makefile
@@ -2,14 +2,8 @@
 PYTHON=python3
 # the directory the main framework exists in
 MAIN=neural_stylization
-# the directory with the dataset
-DATASET=${MAIN}/dataset
 # the build directory
 BUILD=build
-# the pointer to the pdflatex binary
-PDFLATEX=pdflatex
-# the pointer to the bibilography engine (bibtex)
-BIBTEX=bibtex
 # the number of frames of interpolation to use in videos
 INTER_FRAMES=3
 
@@ -26,36 +20,6 @@ build:
 delete_tex_garbage:
 	cd tex && rm -f *.aux *.nav *.log *.out *.snm *.toc *.bbl *.blg *.brf *.swp *.nlo
 
-# make the presentation
-presentation: build delete_tex_garbage
-	cd tex && ${PDFLATEX} -halt-on-error presentation | grep -a3 "^!" || true
-	cp tex/presentation.pdf ${BUILD}
-	@make delete_tex_garbage
-
-# make the presentation using bibtex to compile references
-presentation_w_ref: build delete_tex_garbage
-	cd tex && ${PDFLATEX} -halt-on-error presentation | grep -a3 "^!" || true
-	cd tex && ${BIBTEX} presentation
-	cd tex && ${PDFLATEX} -halt-on-error presentation | grep -a3 "^!" || true
-	cd tex && ${PDFLATEX} -halt-on-error presentation | grep -a3 "^!" || true
-	cp tex/presentation.pdf ${BUILD}
-	@make delete_tex_garbage
-
-# make the review without references
-review: build delete_tex_garbage
-	cd tex && ${PDFLATEX} review | grep -a3 "^!" || true
-	cp tex/review.pdf ${BUILD}
-	@make delete_tex_garbage
-
-# make the review using bibtex to compile references
-review_w_ref: build delete_tex_garbage
-	cd tex && ${PDFLATEX} -halt-on-error review | grep -a3 "^!" || true
-	cd tex && ${BIBTEX} review | grep -a3 "^!" || true
-	cd tex && ${PDFLATEX} -halt-on-error review | grep -a3 "^!" || true
-	cd tex && ${PDFLATEX} -halt-on-error review | grep -a3 "^!" || true
-	cp tex/review.pdf ${BUILD}
-	@make delete_tex_garbage
-
 # Convert the frames in a given directory to a video of the directories name
 # in its parent directory.
 # Args:
@@ -65,7 +29,7 @@ define frames_to_video
 endef
 
 # make all the content reconstruction videos
-content_videos:
+content_videos: build
 	$(call frames_to_video,content/block1_conv1)
 	$(call frames_to_video,content/block2_conv1)
 	$(call frames_to_video,content/block3_conv1)
@@ -74,15 +38,15 @@ content_videos:
 	$(call frames_to_video,content/block4_conv2)
 
 # make all the style reconstruction videos
-style_videos:
+style_videos: build
 	$(call frames_to_video,style/block1_conv1)
 	$(call frames_to_video,style/block2_conv1)
 	$(call frames_to_video,style/block3_conv1)
 	$(call frames_to_video,style/block4_conv1)
 	$(call frames_to_video,style/block5_conv1)
 
 # make all the style transfer videos
-transfer_videos:
+transfer_videos: build
 	$(call frames_to_video,transfer/seated-nude)
 	$(call frames_to_video,transfer/the-starry-night)
 	$(call frames_to_video,transfer/the-scream)

diff --git a/README.md b/README.md
@@ -2,57 +2,57 @@
 
 An **implementation** of the arXiv preprint
 [_A Neural Algorithm of Artistic Style [1]_](#references)
-& paper 
+& paper
 [_Image Style Transfer Using Convolutional Neural Networks [2]_](#references).
 
 ## Original Photograph: _Tubingen, Germany_
 
 <p float="left" align="center">
-<img src="img/content/tubingen.jpg" width="375"/> 
+<img src="img/content/tubingen.jpg" width="375"/>
 </p>
 
 -----
 
 ## Claude Monet's _Houses of Parliament_
 
 <p float="left" align="center">
-<img src="img/styles/houses-of-parliament.jpg" width="375"/>  
-<img src="tex/img/transfer/houses-of-parliament-tv-1e0.png" width="425"/> 
+<img src="img/styles/houses-of-parliament.jpg" width="375"/>
+<img src="img/transfer/houses-of-parliament-tv-1e0.png" width="425"/>
 </p>
 
 ## Pablo Picasso's _Seated Nude_
 
 <p float="left" align="center">
-<img src="img/styles/seated-nude.jpg" width="245"/>  
-<img src="tex/img/transfer/seated-nude.png" width="425"/> 
+<img src="img/styles/seated-nude.jpg" width="245"/>
+<img src="img/transfer/seated-nude.png" width="425"/>
 </p>
 
 ## Edvard Munch's _The Scream_
 
 <p float="left" align="center">
-<img src="img/styles/the-scream.jpg" width="250"/>  
-<img src="tex/img/transfer/the-scream.png" width="425"/> 
+<img src="img/styles/the-scream.jpg" width="250"/>
+<img src="img/transfer/the-scream.png" width="425"/>
 </p>
 
 ## Vincent van Gogh's _The Starry Night_
 
 <p float="left" align="center">
-<img src="img/styles/the-starry-night.jpg" width="400"/>  
-<img src="tex/img/transfer/the-starry-night.png" width="425"/> 
+<img src="img/styles/the-starry-night.jpg" width="400"/>
+<img src="img/transfer/the-starry-night.png" width="425"/>
 </p>
 
 ## William Turner's _The Shipwreck of The Minotaur_
 
 <p float="left" align="center">
-<img src="img/styles/the-shipwreck-of-the-minotaur.jpg" width="425"/>  
-<img src="tex/img/transfer/the-shipwreck-of-the-minotaur.png" width="400"/> 
+<img src="img/styles/the-shipwreck-of-the-minotaur.jpg" width="425"/>
+<img src="img/transfer/the-shipwreck-of-the-minotaur.png" width="400"/>
 </p>
 
 ## Wassily Kandinsky's _Composition VII_
 
 <p float="left" align="center">
-<img src="img/styles/composition-vii.jpg" width="425"/>  
-<img src="tex/img/transfer/composition-vii.png" width="425"/> 
+<img src="img/styles/composition-vii.jpg" width="425"/>
+<img src="img/transfer/composition-vii.png" width="425"/>
 </p>
 
 # Getting Started
@@ -125,11 +125,11 @@ and colors from **a**.
 
 [style-transfer.ipynb]: style-transfer.ipynb
 
-## Photo-Realistic Style Transfer 
+## Photo-Realistic Style Transfer
 
 [photo-realistic-style-transfer.ipynb][] describes the photo-realistic style
-transfer process. Opposed to transfering style from an artwork, this notebook 
-explores transfering a nighttime theme from a picture of one city to a 
+transfer process. Opposed to transfering style from an artwork, this notebook
+explores transfering a nighttime theme from a picture of one city to a
 daytime picture of another city with mixed results.
 
 [photo-realistic-style-transfer.ipynb]: photo-realistic-style-transfer.ipynb
@@ -150,7 +150,7 @@ by using different sets of layers for style loss.
 
 ## Optimizers
 
-[optimizers.ipynb][] employs _gradient descent_, _adam_, and _L-BFGS_ to 
+[optimizers.ipynb][] employs _gradient descent_, _adam_, and _L-BFGS_ to
 understand the affect of different blackbox optimizers. Gatys et. al use
 L-BFGS, but Adam appears to produce competetive results too.
 

diff --git a/tex/img/transfer/composition-vii.png → img/transfer/composition-vii.png b/tex/img/transfer/composition-vii.png → img/transfer/composition-vii.png
diff --git a/...mg/transfer/houses-of-parliament-tv-0.png → img/transfer/houses-of-parliament-tv-0.png b/...mg/transfer/houses-of-parliament-tv-0.png → img/transfer/houses-of-parliament-tv-0.png
diff --git a/.../transfer/houses-of-parliament-tv-1e0.png → img/transfer/houses-of-parliament-tv-1e0.png b/.../transfer/houses-of-parliament-tv-1e0.png → img/transfer/houses-of-parliament-tv-1e0.png
diff --git a/.../transfer/houses-of-parliament-tv-1e1.png → img/transfer/houses-of-parliament-tv-1e1.png b/.../transfer/houses-of-parliament-tv-1e1.png → img/transfer/houses-of-parliament-tv-1e1.png
diff --git a/tex/img/transfer/seated-nude.png → img/transfer/seated-nude.png b/tex/img/transfer/seated-nude.png → img/transfer/seated-nude.png
diff --git a/tex/img/transfer/the-scream.png → img/transfer/the-scream.png b/tex/img/transfer/the-scream.png → img/transfer/the-scream.png
diff --git a/...ransfer/the-shipwreck-of-the-minotaur.png → ...ransfer/the-shipwreck-of-the-minotaur.png b/...ransfer/the-shipwreck-of-the-minotaur.png → ...ransfer/the-shipwreck-of-the-minotaur.png
diff --git a/tex/img/transfer/the-starry-night.png → img/transfer/the-starry-night.png b/tex/img/transfer/the-starry-night.png → img/transfer/the-starry-night.png
diff --git a/papers/a-neural-algorithm-of-artistic-style.pdf b/papers/a-neural-algorithm-of-artistic-style.pdf
diff --git a/papers/extra/Artistic style transfer for videos.pdf b/papers/extra/Artistic style transfer for videos.pdf
diff --git a/papers/extra/Image Quilting for Texture Synthesis and Transfer.pdf b/papers/extra/Image Quilting for Texture Synthesis and Transfer.pdf
diff --git a/...xtra/Learning to Discover Cross-Domain Relations with Generative Adversarial Networks.pdf b/...xtra/Learning to Discover Cross-Domain Relations with Generative Adversarial Networks.pdf
diff --git a/papers/extra/Preserving Color in Neural Artistic Style Transfer.pdf b/papers/extra/Preserving Color in Neural Artistic Style Transfer.pdf
diff --git a/papers/extra/incorporating-long-range-consistency-in-cnn-based-texture-generation.pdf b/papers/extra/incorporating-long-range-consistency-in-cnn-based-texture-generation.pdf
diff --git a/papers/extra/perceptual-losses-for-real-time-style-transfer-and-super-resolution/paper.pdf b/papers/extra/perceptual-losses-for-real-time-style-transfer-and-super-resolution/paper.pdf
diff --git a/...s/extra/perceptual-losses-for-real-time-style-transfer-and-super-resolution/reference.bib b/...s/extra/perceptual-losses-for-real-time-style-transfer-and-super-resolution/reference.bib
diff --git a/papers/extra/preserving-color-in-neural-style-transfer/paper.pdf b/papers/extra/preserving-color-in-neural-style-transfer/paper.pdf
diff --git a/papers/extra/preserving-color-in-neural-style-transfer/reference.bib b/papers/extra/preserving-color-in-neural-style-transfer/reference.bib
diff --git a/papers/image-style-transfer-using-convolutional-neural-networks.pdf b/papers/image-style-transfer-using-convolutional-neural-networks.pdf
diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,10 @@
-keras
-numpy
-image
-tensorflow
-h5py
-jupyter
-tqdm
-IPython
-ipywidgets
-scipy
+Keras==2.1.3
+numpy==1.14.2
+image==1.5.20
+Pillow==5.0.0
+tensorflow==1.6.0
+h5py==2.7.1
+jupyter==1.0.0
+tqdm==4.19.5
+ipywidgets==6.0.0
+scipy==0.19.1
diff --git a/tex/img/artworks/composition-vii.jpg b/tex/img/artworks/composition-vii.jpg
diff --git a/tex/img/artworks/houses-of-parliament.jpg b/tex/img/artworks/houses-of-parliament.jpg
diff --git a/tex/img/artworks/seated-nude.jpg b/tex/img/artworks/seated-nude.jpg
diff --git a/tex/img/artworks/the-scream.jpg b/tex/img/artworks/the-scream.jpg
diff --git a/tex/img/artworks/the-shipwreck-of-the-minotaur.jpg b/tex/img/artworks/the-shipwreck-of-the-minotaur.jpg
diff --git a/tex/img/artworks/the-starry-night.jpg b/tex/img/artworks/the-starry-night.jpg
diff --git a/tex/img/content-layer-selection/block1_conv1.png b/tex/img/content-layer-selection/block1_conv1.png
diff --git a/tex/img/content-layer-selection/block2_conv1.png b/tex/img/content-layer-selection/block2_conv1.png
diff --git a/tex/img/content-layer-selection/block3_conv1.png b/tex/img/content-layer-selection/block3_conv1.png
diff --git a/tex/img/content-layer-selection/block4_conv1.png b/tex/img/content-layer-selection/block4_conv1.png
diff --git a/tex/img/content-layer-selection/block5_conv1.png b/tex/img/content-layer-selection/block5_conv1.png
diff --git a/tex/img/content/block1_conv1.png b/tex/img/content/block1_conv1.png
diff --git a/tex/img/content/block2_conv1.png b/tex/img/content/block2_conv1.png
diff --git a/tex/img/content/block3_conv1.png b/tex/img/content/block3_conv1.png
diff --git a/tex/img/content/block4_conv1.png b/tex/img/content/block4_conv1.png
diff --git a/tex/img/content/block4_conv2.png b/tex/img/content/block4_conv2.png
diff --git a/tex/img/content/block5_conv1.png b/tex/img/content/block5_conv1.png
diff --git a/tex/img/content/noise.jpg b/tex/img/content/noise.jpg
diff --git a/tex/img/content/samford-sign.jpg b/tex/img/content/samford-sign.jpg
diff --git a/tex/img/content/tubingen.jpg b/tex/img/content/tubingen.jpg
diff --git a/tex/img/deep-dream.jpg b/tex/img/deep-dream.jpg
diff --git a/tex/img/discoGanI.png b/tex/img/discoGanI.png
diff --git a/tex/img/discoGanII.png b/tex/img/discoGanII.png
diff --git a/tex/img/fast-neural-style/chicago.jpg b/tex/img/fast-neural-style/chicago.jpg
diff --git a/tex/img/fast-neural-style/chicago_mosaic.jpg b/tex/img/fast-neural-style/chicago_mosaic.jpg
diff --git a/tex/img/fast-neural-style/chicago_scream.jpg b/tex/img/fast-neural-style/chicago_scream.jpg
diff --git a/tex/img/fast-neural-style/chicago_starry_night.jpg b/tex/img/fast-neural-style/chicago_starry_night.jpg
diff --git a/tex/img/levels.jpg b/tex/img/levels.jpg
diff --git a/tex/img/loss/Adam.png b/tex/img/loss/Adam.png
diff --git a/tex/img/loss/L_BFGS.png b/tex/img/loss/L_BFGS.png
diff --git a/tex/img/loss/SGD.png b/tex/img/loss/SGD.png
diff --git a/tex/img/loss/plot.png b/tex/img/loss/plot.png
diff --git a/tex/img/other-models/alex-net-a.png b/tex/img/other-models/alex-net-a.png
diff --git a/tex/img/other-models/alex-net-p.png b/tex/img/other-models/alex-net-p.png
diff --git a/tex/img/other-models/alex-net-x.png b/tex/img/other-models/alex-net-x.png
diff --git a/tex/img/photo-transfer/a.png b/tex/img/photo-transfer/a.png
diff --git a/tex/img/photo-transfer/p.png b/tex/img/photo-transfer/p.png
diff --git a/tex/img/photo-transfer/x.png b/tex/img/photo-transfer/x.png
diff --git a/tex/img/previous_worksII_content.png b/tex/img/previous_worksII_content.png
diff --git a/tex/img/previous_worksII_style.png b/tex/img/previous_worksII_style.png
diff --git a/tex/img/previous_worksII_transfer.png b/tex/img/previous_worksII_transfer.png
diff --git a/tex/img/previous_works_content.png b/tex/img/previous_works_content.png
diff --git a/tex/img/previous_works_style.png b/tex/img/previous_works_style.png
diff --git a/tex/img/previous_works_transfer.png b/tex/img/previous_works_transfer.png
diff --git a/tex/img/style-layer-selection/block1_conv1.png b/tex/img/style-layer-selection/block1_conv1.png
diff --git a/tex/img/style-layer-selection/block2_conv1.png b/tex/img/style-layer-selection/block2_conv1.png
diff --git a/tex/img/style-layer-selection/block3_conv1.png b/tex/img/style-layer-selection/block3_conv1.png
diff --git a/tex/img/style-layer-selection/block4_conv1.png b/tex/img/style-layer-selection/block4_conv1.png
diff --git a/tex/img/style-layer-selection/block5_conv1.png b/tex/img/style-layer-selection/block5_conv1.png
diff --git a/tex/img/style-transfer.png b/tex/img/style-transfer.png
diff --git a/tex/img/style/block1_conv1.png b/tex/img/style/block1_conv1.png
diff --git a/tex/img/style/block2_conv1.png b/tex/img/style/block2_conv1.png
diff --git a/tex/img/style/block3_conv1.png b/tex/img/style/block3_conv1.png
diff --git a/tex/img/style/block4_conv1.png b/tex/img/style/block4_conv1.png
diff --git a/tex/img/style/block5_conv1.png b/tex/img/style/block5_conv1.png
diff --git a/tex/img/style/noise.jpg b/tex/img/style/noise.jpg
diff --git a/tex/img/style/the-starry-night.jpg b/tex/img/style/the-starry-night.jpg
diff --git a/tex/img/vgg19/classification.png b/tex/img/vgg19/classification.png
diff --git a/tex/img/vgg19/content/block1_conv1.png b/tex/img/vgg19/content/block1_conv1.png
diff --git a/tex/img/vgg19/content/block2_conv1.png b/tex/img/vgg19/content/block2_conv1.png
diff --git a/tex/img/vgg19/content/block3_conv1.png b/tex/img/vgg19/content/block3_conv1.png
diff --git a/tex/img/vgg19/content/block4_conv1.png b/tex/img/vgg19/content/block4_conv1.png
diff --git a/tex/img/vgg19/content/block5_conv1.png b/tex/img/vgg19/content/block5_conv1.png
diff --git a/tex/img/vgg19/feature-extraction.png b/tex/img/vgg19/feature-extraction.png
diff --git a/tex/img/vgg19/style/block1_conv1.png b/tex/img/vgg19/style/block1_conv1.png
diff --git a/tex/img/vgg19/style/block2_conv1.png b/tex/img/vgg19/style/block2_conv1.png
diff --git a/tex/img/vgg19/style/block3_conv1.png b/tex/img/vgg19/style/block3_conv1.png
diff --git a/tex/img/vgg19/style/block4_conv1.png b/tex/img/vgg19/style/block4_conv1.png
diff --git a/tex/img/vgg19/style/block5_conv1.png b/tex/img/vgg19/style/block5_conv1.png
diff --git a/tex/img/vgg19/synthesis.png b/tex/img/vgg19/synthesis.png
diff --git a/tex/img/vgg19/transfer/layers.png b/tex/img/vgg19/transfer/layers.png