Merge branch 'master' of github.com:keunhong/photoshape

README.md

@@ -41,15 +41,21 @@ pyenv update
 sudo apt-get install -y make build-essential libssl-dev zlib1g-dev libbz2-dev \
 libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
 xz-utils tk-dev libffi-dev liblzma-dev
-pyenv install 3.7.0
-pyenv virtualenv 3.7.0 photoshape
+pyenv install 3.7.1
+pyenv virtualenv 3.7.1 photoshape
 
 # Enter the environment and set paths
 source env.sh
 ```
 
 ### Install Dependencies
 
+### Non-Python Dependencies
+ * Blender 2.79 or higher
+ * Docker and Docker-Compose
+ * NVIDIA GPU compatible with PyTorch and OpenGL rendering.
+
+#### Python Dependencies
 If you just need to use the network, all you'll need is the basic dependencies.
 
 ```bash

data/postgres/exemplar_shape_pairs.sql

@@ -20,7 +20,7 @@ SET default_tablespace = '';
 SET default_with_oids = false;
 
 --
--- Name: exemplar_shape_pair; Type: TABLE; Schema: public; Owner: terial_user
+-- Name: exemplar_shape_pair; Type: TABLE; Schema: public; Owner: photoshape_user
 --
 
 CREATE TABLE public.exemplar_shape_pair (
@@ -42,10 +42,10 @@ CREATE TABLE public.exemplar_shape_pair (
 );
 
 
-ALTER TABLE public.exemplar_shape_pair OWNER TO terial_user;
+ALTER TABLE public.exemplar_shape_pair OWNER TO photoshape_user;
 
 --
--- Name: exemplar_shape_pair_id_seq; Type: SEQUENCE; Schema: public; Owner: terial_user
+-- Name: exemplar_shape_pair_id_seq; Type: SEQUENCE; Schema: public; Owner: photoshape_user
 --
 
 CREATE SEQUENCE public.exemplar_shape_pair_id_seq
@@ -57,24 +57,24 @@ CREATE SEQUENCE public.exemplar_shape_pair_id_seq
     CACHE 1;
 
 
-ALTER TABLE public.exemplar_shape_pair_id_seq OWNER TO terial_user;
+ALTER TABLE public.exemplar_shape_pair_id_seq OWNER TO photoshape_user;
 
 --
--- Name: exemplar_shape_pair_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: terial_user
+-- Name: exemplar_shape_pair_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: photoshape_user
 --
 
 ALTER SEQUENCE public.exemplar_shape_pair_id_seq OWNED BY public.exemplar_shape_pair.id;
 
 
 --
--- Name: exemplar_shape_pair id; Type: DEFAULT; Schema: public; Owner: terial_user
+-- Name: exemplar_shape_pair id; Type: DEFAULT; Schema: public; Owner: photoshape_user
 --
 
 ALTER TABLE ONLY public.exemplar_shape_pair ALTER COLUMN id SET DEFAULT nextval('public.exemplar_shape_pair_id_seq'::regclass);
 
 
 --
--- Data for Name: exemplar_shape_pair; Type: TABLE DATA; Schema: public; Owner: terial_user
+-- Data for Name: exemplar_shape_pair; Type: TABLE DATA; Schema: public; Owner: photoshape_user
 --
 
 INSERT INTO public.exemplar_shape_pair VALUES (314051, 41618, 8039, 4.359375, 1.548828125, 50, 14.3748064041137695, 'align_hog_8.npz', NULL, false, '{}', NULL, NULL, false, 39);
@@ -312118,51 +312118,51 @@ INSERT INTO public.exemplar_shape_pair VALUES (97734, 12884, 2699, 4.1015625, 1.
 
 
 --
--- Name: exemplar_shape_pair_id_seq; Type: SEQUENCE SET; Schema: public; Owner: terial_user
+-- Name: exemplar_shape_pair_id_seq; Type: SEQUENCE SET; Schema: public; Owner: photoshape_user
 --
 
 SELECT pg_catalog.setval('public.exemplar_shape_pair_id_seq', 314062, true);
 
 
 --
--- Name: exemplar_shape_pair exemplar_shape_pair_pkey; Type: CONSTRAINT; Schema: public; Owner: terial_user
+-- Name: exemplar_shape_pair exemplar_shape_pair_pkey; Type: CONSTRAINT; Schema: public; Owner: photoshape_user
 --
 
 ALTER TABLE ONLY public.exemplar_shape_pair
     ADD CONSTRAINT exemplar_shape_pair_pkey PRIMARY KEY (id);
 
 
 --
--- Name: exemplar_shape_pair_distance_index; Type: INDEX; Schema: public; Owner: terial_user
+-- Name: exemplar_shape_pair_distance_index; Type: INDEX; Schema: public; Owner: photoshape_user
 --
 
 CREATE INDEX exemplar_shape_pair_distance_index ON public.exemplar_shape_pair USING btree (distance);
 
 
 --
--- Name: exemplar_shape_pair_exemplar_id_index; Type: INDEX; Schema: public; Owner: terial_user
+-- Name: exemplar_shape_pair_exemplar_id_index; Type: INDEX; Schema: public; Owner: photoshape_user
 --
 
 CREATE INDEX exemplar_shape_pair_exemplar_id_index ON public.exemplar_shape_pair USING btree (exemplar_id);
 
 
 --
--- Name: exemplar_shape_pair_shape_id_index; Type: INDEX; Schema: public; Owner: terial_user
+-- Name: exemplar_shape_pair_shape_id_index; Type: INDEX; Schema: public; Owner: photoshape_user
 --
 
 CREATE INDEX exemplar_shape_pair_shape_id_index ON public.exemplar_shape_pair USING btree (shape_id);
 
 
 --
--- Name: exemplar_shape_pair exemplar_shape_pair_exemplar_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: terial_user
+-- Name: exemplar_shape_pair exemplar_shape_pair_exemplar_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: photoshape_user
 --
 
 ALTER TABLE ONLY public.exemplar_shape_pair
     ADD CONSTRAINT exemplar_shape_pair_exemplar_id_fkey FOREIGN KEY (exemplar_id) REFERENCES public.exemplars(id);
 
 
 --
--- Name: exemplar_shape_pair exemplar_shape_pair_shape_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: terial_user
+-- Name: exemplar_shape_pair exemplar_shape_pair_shape_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: photoshape_user
 --
 
 ALTER TABLE ONLY public.exemplar_shape_pair

requirements.txt

@@ -44,6 +44,5 @@ tornado==5.0.1
 tqdm==4.19.5
 traitlets==4.3.2
 ujson==1.35
-urllib3==1.22
 uvloop==0.9.1
 visdom==0.1.7