diff options
18 files changed, 91 insertions, 116 deletions
diff --git a/megapixels/app/site/parser.py b/megapixels/app/site/parser.py index 87539ade..f6e308f3 100644 --- a/megapixels/app/site/parser.py +++ b/megapixels/app/site/parser.py @@ -136,11 +136,11 @@ def intro_section(metadata, s3_path): # colorize the first instance of the database name in the header if 'color' in metadata and metadata['title'] in desc: desc = desc.replace(metadata['title'], "<span style='color: {}'>{}</span>".format(metadata['color'], metadata['title']), 1) - section += "<div class='hero_desc'><span>{}</span></div>".format(desc, desc) + section += "<div class='hero_desc'><span class='bgpad'>{}</span></div>".format(desc, desc) if 'subdesc' in metadata: subdesc = markdown(metadata['subdesc']).replace('<p>', '').replace('</p>', '') - section += "<div class='hero_subdesc'><span>{}</span></div>".format(subdesc, subdesc) + section += "<div class='hero_subdesc'><span class='bgpad'>{}</span></div>".format(subdesc, subdesc) section += "</div>" section += "</section>" diff --git a/site/content/assets/megapixels_logo.svg b/site/content/assets/megapixels_logo.svg index a9b7eff2..00aa430f 100644..100755 --- a/site/content/assets/megapixels_logo.svg +++ b/site/content/assets/megapixels_logo.svg @@ -2,13 +2,9 @@ <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="92.718px" height="58.333px" viewBox="0 0 92.718 58.333" enable-background="new 0 0 92.718 58.333" xml:space="preserve">
+ width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
<g>
- <polygon fill="#000001" points="66.937,28.509 71.575,23.871 76.214,28.509 78.942,25.78 74.304,21.142 78.942,16.503
- 76.214,13.774 71.575,18.413 66.937,13.774 64.208,16.503 68.847,21.142 64.208,25.78 "/>
- <polygon fill="#000001" points="34.288,0 27.144,0 17.144,0 10,0 0.144,0 0,0 0,44 10,44 10,10 17.144,10 17.144,44 27.144,44
- 27.144,10 34.288,10 34.288,44 44.288,44 44.288,0 44.144,0 "/>
- <path fill="#000001" d="M92.717,0h-10H60.432h-9.999h-0.001v16.049v26.235v16.049h10V42.284h22.286h10h0L92.717,0L92.717,0z
- M82.718,32.284H60.432V16.049V10h22.286V32.284z"/>
+ <rect x="9.833" y="9.833" fill="#FFFFFF" width="10.334" height="10.333"/>
+ <path fill="#FFFFFF" d="M0,0v30h30V0H0z M25,25.002H5V4.999h20V25.002z"/>
</g>
</svg>
diff --git a/site/content/assets/megapixels_logo_01.svg b/site/content/assets/megapixels_logo_01.svg new file mode 100644 index 00000000..a9b7eff2 --- /dev/null +++ b/site/content/assets/megapixels_logo_01.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="92.718px" height="58.333px" viewBox="0 0 92.718 58.333" enable-background="new 0 0 92.718 58.333" xml:space="preserve">
+<g>
+ <polygon fill="#000001" points="66.937,28.509 71.575,23.871 76.214,28.509 78.942,25.78 74.304,21.142 78.942,16.503
+ 76.214,13.774 71.575,18.413 66.937,13.774 64.208,16.503 68.847,21.142 64.208,25.78 "/>
+ <polygon fill="#000001" points="34.288,0 27.144,0 17.144,0 10,0 0.144,0 0,0 0,44 10,44 10,10 17.144,10 17.144,44 27.144,44
+ 27.144,10 34.288,10 34.288,44 44.288,44 44.288,0 44.144,0 "/>
+ <path fill="#000001" d="M92.717,0h-10H60.432h-9.999h-0.001v16.049v26.235v16.049h10V42.284h22.286h10h0L92.717,0L92.717,0z
+ M82.718,32.284H60.432V16.049V10h22.286V32.284z"/>
+</g>
+</svg>
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md index 17302118..ccb6ed0d 100644 --- a/site/content/pages/about/index.md +++ b/site/content/pages/about/index.md @@ -11,7 +11,7 @@ authors: Adam Harvey ------------ -# About This Project +# About MegaPixels {% include 'about_navigation.html' %} @@ -21,6 +21,15 @@ MegaPixels sets out to answer to these questions and reveal the stories behind t MegaPixels sets out to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla. +Notes + +- critical but informative +- not anti-dataset +- pro-sharing, pro-public dataset +- w/o data +- not generally anti-researcher, their parent organization should have checks in place to prevent dubious dataset collection methods +- +  **Adam Harvey** is an American artist and researcher based in Berlin. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and is currently a researcher in residence at Karlsruhe HfG studying artifical intelligence and datasets. diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md index 1c80d020..abd4d823 100644 --- a/site/content/pages/about/press.md +++ b/site/content/pages/about/press.md @@ -13,15 +13,7 @@ authors: Adam Harvey # Press -- [About](/about/) -- [Press](/about/press/) -- [Disclaimer](/about/disclaimer/) -- [Terms and Conditions](/about/terms/) -- [Privacy Policy](/about/privacy/) - -### Sidebar - -## End Sidebar +{% include 'about_navigation.html' %} (list of press articles and images will go here) diff --git a/site/content/pages/about/privacy.md b/site/content/pages/about/privacy.md index 43db5032..a47b74cc 100644 --- a/site/content/pages/about/privacy.md +++ b/site/content/pages/about/privacy.md @@ -13,11 +13,7 @@ authors: Adam Harvey # Privacy Policy -- [About](/about/) -- [Press](/about/press/) -- [Disclaimer](/about/disclaimer/) -- [Terms and Conditions](/about/terms/) -- [Privacy Policy](/about/privacy/) +{% include 'about_navigation.html' %} A summary of our privacy policy is as follows: diff --git a/site/content/pages/about/research.md b/site/content/pages/about/research.md index 71dedcf0..8f001cc9 100644 --- a/site/content/pages/about/research.md +++ b/site/content/pages/about/research.md @@ -13,9 +13,4 @@ authors: Adam Harvey # Research Methodologies -- [About](/about/) -- [Press](/about/press/) -- [Research Methodology](/about/research/) -- [Disclaimer](/about/disclaimer/) -- [Terms and Conditions](/about/terms/) -- [Privacy Policy](/about/privacy/) +{% include 'about_navigation.html' %}
\ No newline at end of file diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md index aa298421..38d43735 100644 --- a/site/content/pages/about/terms.md +++ b/site/content/pages/about/terms.md @@ -14,17 +14,7 @@ authors: Adam Harvey # Terms and Conditions ("Terms") -### Sidebar - -- [About](/about/) -- [Press](/about/press/) -- [Credits](/about/credits/) -- [Research Methodology](/about/research/) -- [Disclaimer](/about/disclaimer/) -- [Terms and Conditions](/about/terms/) -- [Privacy Policy](/about/privacy/) - -## End Sidebar +{% include 'about_navigation.html' %} (FPO: this is only example text) diff --git a/site/content/pages/datasets/brainwash/assets/00425000_960.jpg b/site/content/pages/datasets/brainwash/assets/00425000_960.jpg Binary files differnew file mode 100644 index 00000000..caa96fe2 --- /dev/null +++ b/site/content/pages/datasets/brainwash/assets/00425000_960.jpg diff --git a/site/content/pages/datasets/brainwash/assets/background.jpg b/site/content/pages/datasets/brainwash/assets/background.jpg Binary files differindex f6efb253..8f2de697 100644..100755 --- a/site/content/pages/datasets/brainwash/assets/background.jpg +++ b/site/content/pages/datasets/brainwash/assets/background.jpg diff --git a/site/content/pages/datasets/brainwash/assets/index.jpg b/site/content/pages/datasets/brainwash/assets/index.jpg Binary files differindex e85f75c2..e5004ec0 100644..100755 --- a/site/content/pages/datasets/brainwash/assets/index.jpg +++ b/site/content/pages/datasets/brainwash/assets/index.jpg diff --git a/site/content/pages/datasets/brainwash/index.md b/site/content/pages/datasets/brainwash/index.md index a99dce3a..32cfd6bd 100644 --- a/site/content/pages/datasets/brainwash/index.md +++ b/site/content/pages/datasets/brainwash/index.md @@ -4,8 +4,8 @@ status: published title: Brainwash desc: <span style="color:#ffaa00">Brainwash</span> is a dataset of people from webcams the Brainwash Cafe in San Francisco being used to train face detection algorithms subdesc: Brainwash dataset includes 11,918 images of people getting coffee at the Brainwash cafe during 2014 -caption: An sample image from the Brainwash dataset used for training face detection algorithms for surveillance. License: Open Data Commons Public Domain Dedication (PDDL) slug: brainwash +cssclass: dataset image: assets/background.jpg published: 2019-2-23 updated: 2019-2-23 @@ -13,18 +13,18 @@ authors: Adam Harvey ------------ -### Statistics +### sidebar + Collected: 2014 + Published: 2015 -+ Location: 1122 Folsom Street​ San Franscisco + Images: 11,917 + Faces: 91,146 + Created by: Stanford Department of Computer Science -+ Funding: Max Planck Center for Visual Computing and Communication ++ Funded by: Max Planck Center for Visual Computing and Communication + Resolution: 640x480px -+ Origin: Angelcam IP Cam ++ Origin: Brainwash Cafe, San Franscisco + Purpose: Training face detection ++ Website: <a href="https://exhibits.stanford.edu/data/catalog/sx925dc9385">stanford.edu</a> - more info1 - more info2 @@ -41,17 +41,16 @@ The photos were collected on Sed ut perspiciatis, unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam eaque ipsa, quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt, explicabo. Nemo enim ipsam voluptatem, quia voluptas sit, aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos, qui ratione voluptatem sequi nesciunt, neque porro quisquam est, qui dolorem ipsum, quia dolor sit amet consectetur adipisci[ng] velit, sed quia non-numquam [do] eius modi tempora inci[di]dunt, ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam. - - + porro quisquam est, qui dolorem ipsum, quia dolor sit amet consectetur adipisci[ng] velit, sed quia non-numquam [do] eius modi tempora inci[di]dunt, ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum[d] exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit, qui in ea voluptate velit esse, quam nihil molestiae consequatur, vel illum, qui dolorem eum fugiat, quo voluptas nulla pariatur? {% include 'map.html' %} -<hr class="supp"> +A short analysis of the map information -## Supplementary Information for Brainwash Dataset +{% include 'supplementary_header.html' %} {% include 'citations.html' %} diff --git a/site/content/pages/datasets/index.md b/site/content/pages/datasets/index.md index 47d0bce2..30fca496 100644 --- a/site/content/pages/datasets/index.md +++ b/site/content/pages/datasets/index.md @@ -13,3 +13,4 @@ sync: false # Facial Recognition Datasets +[add text, make sortable] This is a list of all the facial recognition datasets
\ No newline at end of file diff --git a/site/content/pages/datasets/lfw/assets/background.jpg b/site/content/pages/datasets/lfw/assets/background.jpg Binary files differindex 3ab1607d..2c517060 100644 --- a/site/content/pages/datasets/lfw/assets/background.jpg +++ b/site/content/pages/datasets/lfw/assets/background.jpg diff --git a/site/content/pages/datasets/lfw/assets/background_lg.jpg b/site/content/pages/datasets/lfw/assets/background_lg.jpg Binary files differnew file mode 100644 index 00000000..3ab1607d --- /dev/null +++ b/site/content/pages/datasets/lfw/assets/background_lg.jpg diff --git a/site/content/pages/datasets/lfw/assets/fetch_lfw_people.py b/site/content/pages/datasets/lfw/assets/fetch_lfw_people.py new file mode 100644 index 00000000..639883a6 --- /dev/null +++ b/site/content/pages/datasets/lfw/assets/fetch_lfw_people.py @@ -0,0 +1,34 @@ +#!/usr/bin/python + +# ------------------------------------------------------------ +# +# Script to generate montage of LFW faces used in scikit-learn +# +# ------------------------------------------------------------ + +import numpy as np +from sklearn.datasets import fetch_lfw_people +import imageio +import imutils + +# download LFW dataset (first run takes a while) +lfw_people = fetch_lfw_people(min_faces_per_person=1, resize=1, color=True, funneled=False) + +# introspect dataset +n_samples, h, w, c = lfw_people.images.shape +print(f'{n_samples:,} images at {w}x{h} pixels') +cols, rows = (176, 76) +n_ims = cols * rows + +# build montages +im_scale = 0.5 +ims = lfw_people.images[:n_ims] +montages = imutils.build_montages(ims, (int(w * im_scale, int(h * im_scale)), (cols, rows)) +montage = montages[0] + +# save full montage image +imageio.imwrite('lfw_montage_full.png', montage) + +# make a smaller version +montage = imutils.resize(montage, width=960) +imageio.imwrite('lfw_montage_960.jpg', montage)
\ No newline at end of file diff --git a/site/content/pages/datasets/lfw/index.md b/site/content/pages/datasets/lfw/index.md index 1af263dc..7c606364 100644 --- a/site/content/pages/datasets/lfw/index.md +++ b/site/content/pages/datasets/lfw/index.md @@ -5,7 +5,6 @@ title: Labeled Faces in The Wild desc: <span style="color:#ff0000">Labeled Faces in The Wild (LFW)</span> is a database of face photographs designed for studying the problem of unconstrained face recognition. subdesc: It includes 13,456 images of 4,432 people's images copied from the Internet during 2002-2004. image: assets/background.jpg -caption: A few of the 5,749 people in the Labeled Faces in the Wild Dataset, thee most widely used face dataset for benchmarking face recognition algorithms. slug: lfw published: 2019-2-23 updated: 2019-2-23 @@ -15,12 +14,12 @@ authors: Adam Harvey ### sidebar -+ Created: 2002-2004 ++ Created: 2002 – 2004 + Images: 13,233 + Identities: 5,749 + Origin: Yahoo! News Images + Used by: Facebook, Google, Microsoft, Baidu, Tencent, SenseTime, Face++, CIA, NSA, IARPA -+ Website: <a href="http://vis-www.cs.umass.edu/lfw">vis-www.cs.umass.edu/lfw</a> ++ Website: <a href="http://vis-www.cs.umass.edu/lfw">umass.edu</a> - There are about 3 men for every 1 woman in the LFW dataset[^lfw_www] - The person with the most images is [George W. Bush](http://vis-www.cs.umass.edu/lfw/person/George_W_Bush_comp.html) with 530 @@ -48,23 +47,13 @@ The *Names and Faces* dataset was the first face recognition dataset created ent {% include 'map.html' %} - Sed ut perspiciatis, unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam eaque ipsa, quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt, explicabo. Nemo enim ipsam voluptatem, quia voluptas sit, aspernatur aut odit aut fugit, sed quia. +Sed ut perspiciatis, unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam eaque ipsa, quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt, explicabo. Nemo enim ipsam voluptatem, quia voluptas sit, aspernatur aut odit aut fugit, sed quia. -<hr class="supp"> - -## Supplementary Information for Labeled Faces in The Wild +{% include 'supplementary_header.html' %} {% include 'citations.html' %} -{% include 'synthetic_faces_intro.html' %} - - - - - - - -### Commercial Use of Labeled Faces in The Wild +### Commercial Use Add a paragraph about how usage extends far beyond academia into research centers for largest companies in the world. And even funnels into CIA funded research in the US and defense industry usage in China. @@ -73,46 +62,6 @@ load_file assets/lfw_commercial_use.csv name_display, company_url, example_url, country, description ``` -### Code - -The LFW dataset is so widely used that access to the facial data has built directly into a popular code library called Sci-Kit Learn. It includes a function called `fetch_lfw_people` to download the faces in the LFW dataset. - -```python -#!/usr/bin/python - -# ------------------------------------------------------------ -# -# Script to generate montage of LFW faces used in scikit-learn -# -# ------------------------------------------------------------ - -import numpy as np -from sklearn.datasets import fetch_lfw_people -import imageio -import imutils - -# download LFW dataset (first run takes a while) -lfw_people = fetch_lfw_people(min_faces_per_person=1, resize=1, color=True, funneled=False) - -# introspect dataset -n_samples, h, w, c = lfw_people.images.shape -print(f'{n_samples:,} images at {w}x{h} pixels') -cols, rows = (176, 76) -n_ims = cols * rows - -# build montages -im_scale = 0.5 -ims = lfw_people.images[:n_ims] -montages = imutils.build_montages(ims, (int(w * im_scale, int(h * im_scale)), (cols, rows)) -montage = montages[0] - -# save full montage image -imageio.imwrite('lfw_montage_full.png', montage) - -# make a smaller version -montage = imutils.resize(montage, width=960) -imageio.imwrite('lfw_montage_960.jpg', montage) -``` Research, text, and graphics ©Adam Harvey / megapixels.cc @@ -2,9 +2,10 @@ ## Splash - - AH: work on CTA overlay design - - AH: render one head from each activate dataset - - JL: add "Name / Dataset Name" below head? and make linkable to dataset? +- AH: work on CTA overlay design +- AH: render one head from each activate dataset +- JL: add "Name \n Dataset Name" below head? and make linkable to dataset? +- change animation to be only colored vertices <---> colored landmarks ## Datasets Index @@ -14,23 +15,22 @@ ## Datasets - overall looking really good -- AH: small CSS tweaks to font -- JL: possible to fade in background graphic? +- JL: possible to fade in background header graphic? - AH: add more synthetic faces - modify layout into section: - Overview - Citations - Supplementary Information - -### Dataset Citations: - +- modify layout for synthetic images (1 large image/video left column, 4 small thumbnails right column) - JL: add URL text and href to citations -- JL: add download button and search option for CSV? +- JL: add download (button) and search option for CSV? or link to github - AH: Try creating another google doc to manually review each citation and send to FT to maybe help with review -- AH/JL: add color legend to citations (red, blue, yellow) +- JL/AH: add graph showing distribtion by country +- JL/AH: add graph/number display showing distribution by sector (edu, gov, com) ## About +- layout still feels awkward - AH: update text and images - AH/JL: update layout, css tweaks - awaiting Mozilla response for their text |
