fix msceleb typo

5 files changed, 91 insertions, 80 deletions

diff --git a/docs/install_notes.md b/docs/install_notes.md
new file mode 100644
index 00000000..9dcf3da6
--- /dev/null
+++ b/docs/install_notes.md
@@ -0,0 +1,70 @@
+PATH=/home/adam/torch/install/bin:/home/adam/anaconda3/bin:/home/adam/anaconda3/envs/megapixels/bin:/home/adam/anaconda3/bin:/home/adam/.nvm/versions/node/v9.9.0/bin:/home/adam/bin:/home/adam/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/usr/lib/nvidia/:/usr/local/cuda/bin:/usr/lib/nvidia/:/usr/local/cuda/bin
+
+PATH=/home/adam/anaconda3/bin:/home/adam/.nvm/versions/node/v9.9.0/bin:/home/adam/code/google-cloud-sdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/local/cuda/bin
+
+CUDA_HOME=/usr/local/cuda
+LD_LIBRARY_PATH=/home/adam/torch/install/lib::/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64
+
+
+
+LD_LIBRARY_PATH=/home/adam/torch/install/lib::/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64
+
+
+LD_LIBRARY_PATH=:/usr/local/cuda/lib64
+CUDA_HOME=/usr/local/cuda
+
+
+TORCH_NVCC_FLAGS=-D__CUDA_NO_HALF_OPERATORS__
+TORCH_NVCC_FLAGS=-D__CUDA_NO_HALF_OPERATORS__
+
+
+export PATH=/usr/local/cuda/bin:"$PATH
+./clean.sh
+export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"
+./install.sh
+
+find . -name "*.JPEG" | xargs -I {} convert {} -resize "256^>" {}
+
+find . -name \*.png -exec identify -ping {} \; -or -exec echo {} \;
+find . -name \*.jpg -exec identify -ping {} \; -or -exec rm -f {} \;
+
+luarocks install cudnn
+luarocks install display
+
+scp undisclosed:/home/adam/FIDs.zip .
+unzip -q FIDs.zip
+find FIDs_NEW -name \*.jpg > list.txt
+mkdir -p /work/megapixels_dev/3rdparty/art-DCGAN/fiw/images/
+
+while read -r line;do dst=/work/megapixels_dev/3rdparty/art-DCGAN/hipsterwars/images/$(basename "$line");src=`pwd`/$line;ln -s $src $dst;done < list.txt
+
+extension="${filename##*.}"
+
+
+filename="${filename%.*}
+
+for d in $(find source -type d)
+	do 
+			ls $d/*.bin 1>/dev/null 2>&1 && ln -s $d/*.bin target/$(basename $d).dat;done
+
+gpu=0 batchSize=1 imsize=10 noisemode=linefull net=bedrooms_4_net_G.t7 th generate.lua
+
+DATA_ROOT=fiw dataset=folder ndf=50 ngf=150 name=fiw_01 nThreads=6 gpu=2 th main.lua
+
+DATA_ROOT=megaface_13 dataset=folder ndf=50 ngf=150 name=megaface_13 nThreads=6 gpu=1 th main.lua
+
+DATA_ROOT=hipsterwars dataset=folder ndf=50 ngf=150 name=hipsterwars nThreads=6 gpu=2 th main.lua
+
+export PATH=/usr/local/cuda/bin/:$PATH 
+
+export LD_LIBRARY_PATH=/usr/local/cuda/lib64/:$LD_LIBRARY_PATH
+
+
+git clone https://github.com/soumith/cudnn.torch.git -b R7 && cd cudnn.torch && luarocks make cudnn-scm-1.rockspec
+
+scp undisclosed:/home/adam/hipsterwars_v1.0.zip .
+find . -name "*.jpg" -print0 | xargs -0 mogrify -flop
+
+https://github.com/facebookresearch/deepcluster
+
+DATA_ROOT=hipsterwars dataset=folder ndf=100 ngf=200 batchSize=128 name=hipsterwars_d100_g200_b128 nThreads=8 gpu=2 th main.lua && DATA_ROOT=hipsterwars dataset=folder ndf=100 ngf=200 batchSize=64 name=hipsterwars_d100_g200_b64 nThreads=8 gpu=2 th main.lua && DATA_ROOT=hipsterwars dataset=folder ndf=100 ngf=300 batchSize=128 name=hipsterwars_d100_g300_b128 nThreads=8 gpu=2 th main.lua && DATA_ROOT=hipsterwars dataset=folder ndf=100 ngf=300 batchSize=64 name=hipsterwars_d100_g200_b64 nThreads=8 gpu=2 th main.lua 
\ No newline at end of file
diff --git a/docs/notes.md b/docs/notes.md
index 9dcf3da6..df71a14d 100644
--- a/docs/notes.md
+++ b/docs/notes.md
@@ -1,70 +1,3 @@
-PATH=/home/adam/torch/install/bin:/home/adam/anaconda3/bin:/home/adam/anaconda3/envs/megapixels/bin:/home/adam/anaconda3/bin:/home/adam/.nvm/versions/node/v9.9.0/bin:/home/adam/bin:/home/adam/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/usr/lib/nvidia/:/usr/local/cuda/bin:/usr/lib/nvidia/:/usr/local/cuda/bin
+# Notes
 
-PATH=/home/adam/anaconda3/bin:/home/adam/.nvm/versions/node/v9.9.0/bin:/home/adam/code/google-cloud-sdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/local/cuda/bin
-
-CUDA_HOME=/usr/local/cuda
-LD_LIBRARY_PATH=/home/adam/torch/install/lib::/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64
-
-
-
-LD_LIBRARY_PATH=/home/adam/torch/install/lib::/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64
-
-
-LD_LIBRARY_PATH=:/usr/local/cuda/lib64
-CUDA_HOME=/usr/local/cuda
-
-
-TORCH_NVCC_FLAGS=-D__CUDA_NO_HALF_OPERATORS__
-TORCH_NVCC_FLAGS=-D__CUDA_NO_HALF_OPERATORS__
-
-
-export PATH=/usr/local/cuda/bin:"$PATH
-./clean.sh
-export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"
-./install.sh
-
-find . -name "*.JPEG" | xargs -I {} convert {} -resize "256^>" {}
-
-find . -name \*.png -exec identify -ping {} \; -or -exec echo {} \;
-find . -name \*.jpg -exec identify -ping {} \; -or -exec rm -f {} \;
-
-luarocks install cudnn
-luarocks install display
-
-scp undisclosed:/home/adam/FIDs.zip .
-unzip -q FIDs.zip
-find FIDs_NEW -name \*.jpg > list.txt
-mkdir -p /work/megapixels_dev/3rdparty/art-DCGAN/fiw/images/
-
-while read -r line;do dst=/work/megapixels_dev/3rdparty/art-DCGAN/hipsterwars/images/$(basename "$line");src=`pwd`/$line;ln -s $src $dst;done < list.txt
-
-extension="${filename##*.}"
-
-
-filename="${filename%.*}
-
-for d in $(find source -type d)
-	do 
-			ls $d/*.bin 1>/dev/null 2>&1 && ln -s $d/*.bin target/$(basename $d).dat;done
-
-gpu=0 batchSize=1 imsize=10 noisemode=linefull net=bedrooms_4_net_G.t7 th generate.lua
-
-DATA_ROOT=fiw dataset=folder ndf=50 ngf=150 name=fiw_01 nThreads=6 gpu=2 th main.lua
-
-DATA_ROOT=megaface_13 dataset=folder ndf=50 ngf=150 name=megaface_13 nThreads=6 gpu=1 th main.lua
-
-DATA_ROOT=hipsterwars dataset=folder ndf=50 ngf=150 name=hipsterwars nThreads=6 gpu=2 th main.lua
-
-export PATH=/usr/local/cuda/bin/:$PATH 
-
-export LD_LIBRARY_PATH=/usr/local/cuda/lib64/:$LD_LIBRARY_PATH
-
-
-git clone https://github.com/soumith/cudnn.torch.git -b R7 && cd cudnn.torch && luarocks make cudnn-scm-1.rockspec
-
-scp undisclosed:/home/adam/hipsterwars_v1.0.zip .
-find . -name "*.jpg" -print0 | xargs -0 mogrify -flop
-
-https://github.com/facebookresearch/deepcluster
-
-DATA_ROOT=hipsterwars dataset=folder ndf=100 ngf=200 batchSize=128 name=hipsterwars_d100_g200_b128 nThreads=8 gpu=2 th main.lua && DATA_ROOT=hipsterwars dataset=folder ndf=100 ngf=200 batchSize=64 name=hipsterwars_d100_g200_b64 nThreads=8 gpu=2 th main.lua && DATA_ROOT=hipsterwars dataset=folder ndf=100 ngf=300 batchSize=128 name=hipsterwars_d100_g300_b128 nThreads=8 gpu=2 th main.lua && DATA_ROOT=hipsterwars dataset=folder ndf=100 ngf=300 batchSize=64 name=hipsterwars_d100_g200_b64 nThreads=8 gpu=2 th main.lua 
\ No newline at end of file
+- https://verify.megapixels.cc/paper/ucf_crowd/verify/bfdc7cde3bbfcba738a5eefe9143417ebf7d8f5c mentions the UCF-QNRF dataset that was built searching Flickr/Google/etc using the words 'HAJJ,SPECTATOR  CROWD,PILGRIMAGE,PROTEST  CROWDandCONCERT  CROWD.'
\ No newline at end of file
diff --git a/docs/todo.md b/docs/todo.md
index dc7ebaad..529d8773 100644
--- a/docs/todo.md
+++ b/docs/todo.md
@@ -19,6 +19,8 @@
 
 - JL: this paper isn't appearing in the UCCS list of verified papers but should be included https://arxiv.org/pdf/1708.02337.pdf
 - AH: add dataset analysis for IJB-C, HRT Transgender, MegaFace, PIPA
+- AH: scrape the Daniel Boone Yearbook photo dataset http://cs.uky.edu/~jacobs/papers/salem2016f2y.pdf
+    - http://2008.dbrl.org/reference/community-school-yearbook-archive
 
 ## About
 
@@ -53,6 +55,20 @@ Collect Flickr IDs and metadata for:
 - yfcc_100m
 
 
+## MSC Analysis:
+
+- [x] Adience, 97
+- [ ] LFPW, 9 completed, estimated 180
+- [ ] 300W, 3, estimated 150
+- [x] GeoFaces, 2
+- [ ] h3d, low hit-rate, maybe skip
+- [ ] Helen, 206, waiting for s2q cleanup
+- [x] MegaFace, 40
+- [ ] PIPA, 29 done, estimated 330
+- [ ] UCF-CC-50, 3, estimated 30, maybe skip
+
+subtotal: about 350
+
 ## FT Analysis:
 
 - [x] Brainwash
@@ -63,21 +79,13 @@ Collect Flickr IDs and metadata for:
 - [ ] HRT Transgender
 - [x] Town Centre
 
-## NYT Analysis:
-
-- [ ] Helen
-- [ ] MegaFace
-- [ ] PIPA
 
 ## Verifications
 
 - [x] Brainwash
 - [x] Duke MTMC
-- [ ] Helen
 - [x] UCCS
-- [ ] MegaFace
 - [x] MSCeleb
-- [ ] PIPA
 - [x] IJB-C (and IJB-A/B?)
 - [x] HRT Transgender
 - [x] Town Centre
diff --git a/site/content/pages/datasets/msceleb/index.md b/site/content/pages/datasets/msceleb/index.md
index d1542f3f..58bacf1e 100644
--- a/site/content/pages/datasets/msceleb/index.md
+++ b/site/content/pages/datasets/msceleb/index.md
@@ -2,7 +2,7 @@
 
 status: published
 title: Microsoft Celeb Dataset
-desc: Microsoft Celeb 1M is a dataset of 10 millions faces images harvested from the Internet
+desc: Microsoft Celeb 1M is a dataset of 10 million face images harvested from the Internet
 subdesc: The MS Celeb dataset includes 100K people and a target list of 1 million individuals
 slug: msceleb
 cssclass: dataset
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
index b76b94f1..3bda88ea 100644
--- a/site/public/datasets/msceleb/index.html
+++ b/site/public/datasets/msceleb/index.html
@@ -4,7 +4,7 @@
   <title>MegaPixels: Microsoft Celeb Dataset</title>
   <meta charset="utf-8" />
   <meta name="author" content="Adam Harvey" />
-  <meta name="description" content="Microsoft Celeb 1M is a dataset of 10 millions faces images harvested from the Internet" />
+  <meta name="description" content="Microsoft Celeb 1M is a dataset of 10 million face images harvested from the Internet" />
   <meta property="og:title" content="MegaPixels: Microsoft Celeb Dataset"/>
   <meta property="og:type" content="website"/>
   <meta property="og:image" content="https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/msceleb/assets/background.jpg" />
@@ -53,7 +53,7 @@
   </header>
   <div class="content content-dataset">
     
-  <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/msceleb/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>Microsoft Celeb 1M is a dataset of 10 millions faces images harvested from the Internet</span></div><div class='hero_subdesc'><span class='bgpad'>The MS Celeb dataset includes 100K people and a target list of 1 million individuals
+  <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/msceleb/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>Microsoft Celeb 1M is a dataset of 10 million face images harvested from the Internet</span></div><div class='hero_subdesc'><span class='bgpad'>The MS Celeb dataset includes 100K people and a target list of 1 million individuals
 </span></div></div></section><section><h2>Microsoft Celeb Dataset (MS Celeb)</h2>
 </section><section><div class='right-sidebar'><div class='meta'>
     <div class='gray'>Published</div>