From f945bdee04f9f6202327d0399caf0ef17b366923 Mon Sep 17 00:00:00 2001
From: Javi Ribera <jprat@purdue.edu>
Date: Sun, 18 Mar 2018 23:19:04 -0400
Subject: [PATCH] get rid of the plant word

Former-commit-id: 598e2e847f43f5e58dc3a41d6b8febc5fca729f1
---
 Dockerfile                 | 18 ++++++++++--------
 environment.yml            |  5 ++---
 object-locator/__main__.py |  2 +-
 setup.py                   | 10 +++++-----
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5221273..16d62f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 FROM nvidia/cuda:8.0-cudnn6-devel-ubuntu16.04
 
+# Install conda
 RUN apt-get -qq update && \
     apt-get -qq -y install curl bzip2 qtbase5-dev libgtk2.0-0\
     && curl -sSL https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o /tmp/miniconda.sh \
@@ -12,15 +13,16 @@ RUN apt-get -qq update && \
     && rm -rf /var/lib/apt/lists/* /var/log/dpkg.log \
     && conda clean --all --yes
 
-COPY . /plant_locator
-WORKDIR /plant_locator
+COPY . /object_locator
+WORKDIR /object_locator
 
+# Create conda environment with all the dependencies
 RUN [ "conda", "env", "create", "--file", "environment.yml" ]
 
-# Install plant-locator python package inside the conda environment
-RUN [ "/bin/bash", "-c", "source activate plant-location-unet && python setup.py install" ]
+# Install object-locator python package inside the conda environment
+RUN [ "/bin/bash", "-c", "source activate object-location && python setup.py install" ]
 
-# Prepare entrypoint, which just calls the plant-locator
-RUN echo '#!/bin/bash \n source activate plant-location-unet \n python -m plant-locator "$@"' > /plant_locator/entrypoint.bash
-RUN chmod u+x "/plant_locator/entrypoint.bash"
-ENTRYPOINT ["/plant_locator/entrypoint.bash"]
+# Prepare entrypoint, which just calls the object-locator
+RUN echo '#!/bin/bash \n source activate object \n python -m object-locator "$@"' > /object_locator/entrypoint.bash
+RUN chmod u+x "/object_locator/entrypoint.bash"
+ENTRYPOINT ["/object_locator/entrypoint.bash"]
diff --git a/environment.yml b/environment.yml
index 6110e01..a84470e 100644
--- a/environment.yml
+++ b/environment.yml
@@ -1,9 +1,9 @@
-name: plant-location-unet
+name: object-location
 channels:
-  - soumith
   - conda-forge
   - pytorch
   - menpo
+  - soumith
   - defaults
 dependencies:
   - asn1crypto=0.22.0=py36_0
@@ -117,5 +117,4 @@ dependencies:
     - torch==0.3.1.post2
     - torchfile==0.1.0
     - visdom==0.1.7
-prefix: /home/jprat/.anaconda3/envs/plant-location-unet
 
diff --git a/object-locator/__main__.py b/object-locator/__main__.py
index 983b7f8..5ef1e26 100644
--- a/object-locator/__main__.py
+++ b/object-locator/__main__.py
@@ -3,4 +3,4 @@
 os.environ["PYTHONIOENCODING"] = 'UTF-8'
 
 # Execute locate.py script
-from . import locate as plant_locator
+from . import locate as object_locator
diff --git a/setup.py b/setup.py
index bbbc8d4..c6620a3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,9 @@
 from setuptools import setup, find_packages
 
 setup(
-    name='plant-locator',
-    version='1.0.0',
-    description='Plant Location using PyTorch (inference/testing only).',
+    name='object-locator',
+    version='1.1.0',
+    description='Object Location using PyTorch (inference/testing only).',
 
     # The project's main homepage.
     url='https://viperlab.org',
@@ -25,13 +25,13 @@
     ],
     python_requires='~=3.6',
     # What does your project relate to?
-    keywords='phenotyping purdue location sorghum',
+    keywords='object localization purdue',
 
     # You can just specify the packages manually here if your project is
     # simple. Or you can use find_packages().
     packages=find_packages(),
     
-    package_data={'plant-locator': ['models/*.ckpt']},
+    package_data={'object-locator': ['models/*.ckpt']},
 
     # List run-time dependencies here.  These will be installed by pip when
     # your project is installed. For an analysis of "install_requires" vs pip's