Skip to content

Misc changes #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Misc changes #6

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08fcafe
* Normalize images read from the filesystem so the floats are in the …
pcuenca Apr 21, 2017
6075e9e
* `test` function defaults to using a valid image path.
pcuenca Apr 21, 2017
83330ab
* Use all the generated words if no period is part of the list.
pcuenca Apr 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions 3. O'Reilly Generate from image.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@
" image = cv2.imread(x)\n",
" if as_float:\n",
" image = image.astype(np.float32)\n",
" image = image / image.max()\n",
"\n",
" if len(image.shape) == 2:\n",
" image = np.tile(image[:,:,None], 3)\n",
Expand Down Expand Up @@ -351,7 +352,7 @@
},
"outputs": [],
"source": [
"def test(sess,image,generated_words,ixtoword,test_image_path=0): # Naive greedy search\n",
"def test(sess,image,generated_words,ixtoword,test_image_path=image_path): # Naive greedy search\n",
"\n",
" \n",
"\n",
Expand All @@ -370,9 +371,11 @@
" generated_word_index= sess.run(generated_words, feed_dict={image:fc7})\n",
" generated_word_index = np.hstack(generated_word_index)\n",
" generated_words = [ixtoword[x] for x in generated_word_index]\n",
" punctuation = np.argmax(np.array(generated_words) == '.')+1\n",
"\n",
" generated_words = generated_words[:punctuation]\n",
" \n",
" # Select words until the first period, or all words if there is no period\n",
" punctuation = np.argmax(np.array(generated_words) == '.')\n",
" if punctuation == 0: punctuation = len(generated_words)\n",
" generated_words = generated_words[:punctuation+1]\n",
" generated_sentence = ' '.join(generated_words)\n",
" print(generated_sentence)"
]
Expand Down