Skip to content

Commit

Permalink
Updated to PaintsChainer commit 1c14f9e
Browse files Browse the repository at this point in the history
  • Loading branch information
liamjones committed Jun 16, 2017
1 parent 4041348 commit b9a4e69
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 7 deletions.
12 changes: 8 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
FROM nvidia/cuda:8.0-cudnn5-devel-ubuntu16.04
FROM nvidia/cuda:8.0-cudnn6-devel-ubuntu16.04

MAINTAINER Liam Jones <[email protected]>

# Keep Anaconda download separate so this big layer can usually remain cached
ENV ANACONDA_VERSION=4.2.0
RUN apt-get update && \
apt-get install --assume-yes ca-certificates && \
apt-get install --assume-yes \
ca-certificates \
curl && \
curl --location "https://repo.continuum.io/archive/Anaconda3-${ANACONDA_VERSION}-Linux-x86_64.sh" > /anaconda.sh && \
/bin/bash anaconda.sh -b -p /opt/conda && \
rm anaconda.sh
Expand Down Expand Up @@ -42,10 +44,12 @@ RUN mkdir --parents /opt/conda/var/lib/dbus/ & \
chmod +x /usr/local/bin/tini && \
conda install --yes --channel menpo opencv3 && \
conda clean --all && \
pip --no-cache-dir install chainer
pip --no-cache-dir install \
cupy \
chainer

ENV PAINTSCHAINER_REPO=https://github.com/pfnet/PaintsChainer.git \
PAINTSCHAINER_COMMIT=ecd5087
PAINTSCHAINER_COMMIT=1c14f9e

RUN git clone $PAINTSCHAINER_REPO && \
mkdir /PaintsChainer/cgi-bin/paint_x2_unet/models/ && \
Expand Down
20 changes: 20 additions & 0 deletions PaintsChainer-Docker.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library name="PHP Runtime" type="php">
<CLASSES>
<root url="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/standard" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/standard" />
</SOURCES>
</library>
</orderEntry>
</component>
</module>
2 changes: 1 addition & 1 deletion apply-dockerize-template.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/server.py b/server.py
index 3ddc1a9..f1c914d 100755
index 3ddc1a9..2231c97 100755
--- a/server.py
+++ b/server.py
@@ -114,7 +114,7 @@ class MyHandler(http.server.CGIHTTPRequestHandler):
Expand Down
4 changes: 2 additions & 2 deletions remove-image-upload-limit.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/paints_chainer.js b/paints_chainer.js
index 791ef7d..c03f8f4 100644
index f668fc0..788c535 100644
--- a/paints_chainer.js
+++ b/paints_chainer.js
@@ -172,10 +172,6 @@ $(function () {
@@ -176,10 +176,6 @@ $(function () {
}
blobUrlToBlob($('#background').attr('src'), function (line_blob) {
ajaxData.append('line', line_blob);
Expand Down

0 comments on commit b9a4e69

Please sign in to comment.