idealo#9: Fix TF-cpu overriding TF-gpu in Docker. Closes idealo#9.

agermanidis · Apr 3, 2019 · 119addb · 119addb
1 parent 9c0a00e
commit 119addb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -21,7 +21,7 @@ You may look through the [GitHub issues](https://github.com/idealo/image-super-r
 ## Pull Requests (PR)
 1. Fork the repository and a create a new branch from the master branch.
 2. For bug fixes, add new tests and for new features please add changes to the documentation.
-3. Do a PR from your new branch to our `master` branch of the original Image Super-Resolution repo.
+3. Do a PR from your new branch to our `dev` branch of the original Image Super-Resolution repo.
 
 ## Documentation
 - Make sure any new function or class you introduce has proper docstrings.

diff --git a/Dockerfile.gpu b/Dockerfile.gpu
@@ -24,7 +24,7 @@ COPY config.yml ./
 COPY setup.py ./
 
 RUN pip install --upgrade pip
-RUN pip install -e .
+RUN pip install -e ".[gpu]" --ignore-installed
 
 ENV PYTHONPATH ./ISR/:$PYTHONPATH
 ENTRYPOINT ["sh", "./scripts/entrypoint.sh"]
diff --git a/setup.py b/setup.py
@@ -20,6 +20,7 @@
     extras_require={
         'tests': ['pytest==4.3.0', 'pytest-cov==2.6.1'],
         'docs': ['mkdocs==1.0.4', 'mkdocs-material==4.0.2'],
+        'gpu': ['tensorflow-gpu==1.13.1'],
     },
     classifiers=[
         'Development Status :: 4 - Beta',