summaryrefslogtreecommitdiff
path: root/megapixels/notebooks/datasets
diff options
context:
space:
mode:
Diffstat (limited to 'megapixels/notebooks/datasets')
-rw-r--r--megapixels/notebooks/datasets/face_tracer/face_tracer.pngbin538370 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/identity/identity_testing.ipynb (renamed from megapixels/notebooks/datasets/knowledge_graph/identity.ipynb)265
-rw-r--r--megapixels/notebooks/datasets/identity/imdb_wiki_identity.ipynb (renamed from megapixels/notebooks/datasets/imdb_wiki/identity.ipynb)0
-rw-r--r--megapixels/notebooks/datasets/identity/imdb_wiki_meta_debug.ipynb (renamed from megapixels/notebooks/datasets/imdb_wiki_meta_debug.ipynb)0
-rw-r--r--megapixels/notebooks/datasets/identity/lfw_knowledge_graph.ipynb (renamed from megapixels/notebooks/datasets/lfw/lfw_knowledge_graph.ipynb)0
-rw-r--r--megapixels/notebooks/datasets/identity/lfw_make_identity_csv.ipynb (renamed from megapixels/notebooks/datasets/lfw/lfw_make_identity_csv.ipynb)0
-rw-r--r--megapixels/notebooks/datasets/identity/lfw_names.ipynb (renamed from megapixels/notebooks/datasets/lfw/lfw_names.ipynb)0
-rw-r--r--megapixels/notebooks/datasets/identity/msceleb_identity.ipynb (renamed from megapixels/notebooks/datasets/msceleb/identity.ipynb)0
-rw-r--r--megapixels/notebooks/datasets/identity/pubfig83_identity.ipynb (renamed from megapixels/notebooks/datasets/pubfig83/identity.ipynb)27
-rw-r--r--megapixels/notebooks/datasets/identity/umd_faces_identity.ipynb (renamed from megapixels/notebooks/datasets/umd_faces/identity.ipynb)0
-rw-r--r--megapixels/notebooks/datasets/identity/vgg_face2_clean_meta_kg.ipynb (renamed from megapixels/notebooks/datasets/vgg_face2/clean_vgg_identity_meta_kg.ipynb)0
-rw-r--r--megapixels/notebooks/datasets/identity/vgg_face2_identity.ipynb (renamed from megapixels/notebooks/datasets/vgg_face2/identity.ipynb)0
-rw-r--r--megapixels/notebooks/datasets/identity/vgg_face2_names.ipynb (renamed from megapixels/notebooks/datasets/vgg_face2/vgg_names.ipynb)0
-rw-r--r--megapixels/notebooks/datasets/lfw/lfw_vis_bboxes.ipynb6
-rw-r--r--megapixels/notebooks/datasets/lfw/output/lfw.pngbin3136746 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/lfw/output/lfw_mean_crop.pngbin13255 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/lfw/output/lfw_montage_1280.jpgbin374074 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/lfw/output/lfw_montage_960.jpgbin169159 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/lfw/output/lfw_rand.pngbin4950369 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/output.pngbin2000555 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/output_10px.pngbin12884593 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/output_1px.pngbin23684044 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/output_black.pngbin1990327 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/output_head20.pngbin15745587 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/output_norm.pngbin16436196 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/output_norm_bgr.pngbin1823485 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/output_white copy.pngbin127929 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/output_white.pngbin57990 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/pose_02.pngbin8772665 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/pose_02_sm.pngbin8584736 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/pose_03.pngbin20135610 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/pose_04.pngbin17390569 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/pose_05.pngbin2571124 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/pose_06.pngbin13135806 -> 0 bytes
-rw-r--r--megapixels/notebooks/datasets/mpii_pose/output/pose_07.pngbin14055853 -> 0 bytes
35 files changed, 86 insertions, 212 deletions
diff --git a/megapixels/notebooks/datasets/face_tracer/face_tracer.png b/megapixels/notebooks/datasets/face_tracer/face_tracer.png
deleted file mode 100644
index dc04f0a6..00000000
--- a/megapixels/notebooks/datasets/face_tracer/face_tracer.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/knowledge_graph/identity.ipynb b/megapixels/notebooks/datasets/identity/identity_testing.ipynb
index 81a74faf..384cca93 100644
--- a/megapixels/notebooks/datasets/knowledge_graph/identity.ipynb
+++ b/megapixels/notebooks/datasets/identity/identity_testing.ipynb
@@ -13,7 +13,7 @@
},
{
"cell_type": "code",
- "execution_count": 48,
+ "execution_count": 155,
"metadata": {},
"outputs": [],
"source": [
@@ -48,72 +48,87 @@
"\n",
"import sys\n",
"sys.path.append('/work/megapixels_dev/megapixels')\n",
- "from app.utils import api_utils\n",
+ "from app.utils import api_utils, identity_utils\n",
+ "from app.settings import app_cfg\n",
"from app.settings import types"
]
},
{
- "cell_type": "markdown",
+ "cell_type": "code",
+ "execution_count": 159,
"metadata": {},
+ "outputs": [
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "/media/adam/ah8tb/work/megapixels_dev/env/google_knowledge_graph_api.env\n"
+ ]
+ }
+ ],
"source": [
- "## Get List of Names"
+ "print(app_cfg.FP_KNOWLEDGE_GRAPH_ENV)"
]
},
{
- "cell_type": "code",
- "execution_count": 2,
+ "cell_type": "markdown",
"metadata": {},
- "outputs": [],
"source": [
- "def get_names(enum_dataset):\n",
- " if enum_dataset == types.Dataset.LFW:\n",
- " dir_lfw = '/data_store_hdd/datasets/people/lfw/media/original/'\n",
- " names = [x.replace('_', ' ') for x in os.listdir(dir_lfw)]\n",
- " elif enum_dataset == types.Dataset.YOUTUBE_FACES:\n",
- " names = [x for x in names if 'labeled faces.txt' not in x]\n",
- " return names"
+ "## Get List of Names"
]
},
{
"cell_type": "code",
- "execution_count": 3,
+ "execution_count": 160,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
- "['Kim Clijsters', 'William Rosenberg', 'John Brady', 'Juan Ignacio Chela', 'Floyd Keith', 'Sam Gerald', 'Imad Khadduri', 'Anna Kournikova', 'Jacques Rogge', 'Wilbert Elki Meza Majino']\n"
+ "['Kim Clijsters', 'William Rosenberg', 'John Brady', 'Juan Ignacio Chela', 'Floyd Keith', 'Sam Gerald', 'Imad Khadduri', 'Anna Kournikova', 'Jacques Rogge', 'Wilbert Elki Meza Majino']\n",
+ "['Kim_Clijsters', 'William_Rosenberg', 'John_Brady', 'Juan_Ignacio_Chela', 'Floyd_Keith', 'Sam_Gerald', 'Imad_Khadduri', 'Anna_Kournikova', 'Jacques_Rogge', 'Wilbert_Elki_Meza_Majino']\n"
]
}
],
"source": [
- "names = get_names(types.Dataset.LFW)\n",
- "print(names[0:10])"
+ "names = identity_utils.get_names(types.Dataset.LFW)\n",
+ "print(names['names_query'][0:10])\n",
+ "print(names['names_orig'][0:10])"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
- "## Google Knowledge Graph API"
+ "## Google Knowledge Graph API\n",
+ "\n",
+ "- about 100.000 requests per 24 hours"
]
},
{
"cell_type": "code",
- "execution_count": 4,
+ "execution_count": 161,
"metadata": {},
"outputs": [],
"source": [
"# read API key\n",
- "api_key = open('/work/megapixels_dev/env/google_knowledge_graph_api.env').read()\n",
+ "\n",
+ "api_key = open(app_cfg.FP_KNOWLEDGE_GRAPH_ENV).read()\n",
"kg_api = api_utils.GoogleKnowledgeGraph(api_key)\n",
"wp_api = api_utils.WikipediaAPI()"
]
},
{
+ "cell_type": "markdown",
+ "metadata": {},
+ "source": [
+ "## Test API Access"
+ ]
+ },
+ {
"cell_type": "code",
- "execution_count": 241,
+ "execution_count": 128,
"metadata": {},
"outputs": [
{
@@ -121,27 +136,33 @@
"output_type": "stream",
"text": [
"wp\n",
- "{'wp_accessed': True, 'wp_description': '', 'wp_name': '', 'wp_page_id': ''}\n",
+ "https://en.wikipedia.org/w/api.php?redirects=&ppprop=displaytitle&prop=pageprops%7Cpageimages%7Cdescription&generator=prefixsearch&action=query&format=json&piprop=thumbnail&pilimit=1&gpssearch=Vicente+Fox&gpsnamespace=0&gpslimit=1\n",
+ "{'wp_accessed': True,\n",
+ " 'wp_description': 'President of Mexico',\n",
+ " 'wp_name': 'Vicente Fox',\n",
+ " 'wp_page_id': '32836'}\n",
"kg\n",
"{'kg_accessed': True,\n",
- " 'kg_bio': '',\n",
- " 'kg_bio_url': '',\n",
- " 'kg_description': '',\n",
- " 'kg_id': '',\n",
- " 'kg_image_url': '',\n",
- " 'kg_name': '',\n",
- " 'kg_score': 0,\n",
+ " 'kg_bio': 'Vicente Fox Quesada, RSerafO is a Mexican businessman and '\n",
+ " 'politician who served as the 55th President of Mexico from 1 '\n",
+ " 'December 2000 to 30 November 2006.\\n',\n",
+ " 'kg_bio_url': 'https://en.wikipedia.org/wiki/Vicente_Fox',\n",
+ " 'kg_description': 'Former President of Mexico',\n",
+ " 'kg_error': '',\n",
+ " 'kg_id': '/m/081f4',\n",
+ " 'kg_image_url': 'http://t2.gstatic.com/images?q=tbn:ANd9GcQqs1Z0NhSLve9OyfdC0AHFWKWlTpHO4tCnU7dedSSz2kzCRk60',\n",
+ " 'kg_name': 'Vicente Fox',\n",
+ " 'kg_score': 610.987427,\n",
" 'kg_url': '',\n",
- " 'query': 'Jeff Dederian'}\n"
+ " 'query': 'Vicente Fox'}\n"
]
}
],
"source": [
- "#wp_api.test_access()\n",
- "print('wp')\n",
- "pprint(wp_api.get_meta({'query': 'Florecita Cobian'}))\n",
- "print('kg')\n",
- "pprint(kg_api.get_kg_from_name({'query':'Jeff Dederian'}))"
+ "print('wp----')\n",
+ "pprint(wp_api.get_meta({'query': 'Vicente Fox'}, verbose=True))\n",
+ "print('kg----')\n",
+ "pprint(kg_api.get_kg_from_name({'query':'Vicente Fox'}))"
]
},
{
@@ -153,121 +174,29 @@
},
{
"cell_type": "code",
- "execution_count": 242,
- "metadata": {},
- "outputs": [],
- "source": [
- "def same_person(query, name, sim_min=.9, word_match_min=0.75, verbose=False):\n",
- " if name == '':\n",
- " return False\n",
- " # check and remove if WP added parenthesis\n",
- " if '(' in name and ')' in name:\n",
- " name = name.split('(')[0]\n",
- " \n",
- " # then strip spaces and split into list\n",
- " query_strings = [unidecode.unidecode(x.strip().lower()) for x in query.strip().split(' ')] # query\n",
- " result_strings = [unidecode.unidecode(x.strip().lower()) for x in name.strip().split(' ')] # result\n",
- " min_str_len = min(len(result_strings), len(query_strings))\n",
- " # match each word in the query\n",
- " matched_strings = []\n",
- " \n",
- " for i in range(len(query_strings)):\n",
- " # for each word in the shorter text string\n",
- " result_strings_tmp = result_strings.copy()\n",
- " for j in range(len(result_strings_tmp)):\n",
- " a = query_strings[i]\n",
- " b = result_strings_tmp[j]\n",
- " # make a the shorter string\n",
- " lengths = [len(a), len(b)]\n",
- " min_ratio = (min(lengths) / max(lengths) * .75)\n",
- " ratio = difflib.SequenceMatcher(a=a.lower(), b=b.lower()).ratio()\n",
- " result = (ratio >= min_ratio)\n",
- " if verbose:\n",
- " print(f'comapre \"{a}\" to \"{b}\" ratio was: {ratio:.2f} min: {min_ratio:.2}, passed: {result}')\n",
- " if result:\n",
- " # remove this item from result strings\n",
- " matched_string = result_strings.pop(j)\n",
- " matched_strings.append(matched_string)\n",
- " break # exit loop and use shortened result string haystack\n",
- "\n",
- " matched = len(matched_strings) >= min_str_len\n",
- " if verbose:\n",
- " print(f'{matched} because {len(matched_strings)} >= {min_str_len}')\n",
- " return matched"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 245,
+ "execution_count": 162,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
- "(Adoor Gopalakrishnan == Adoors Gopalakarishnan ok) = True\n",
- "\n",
- "comapre \"dave\" to \"david\" ratio was: 0.67 min: 0.6, passed: True\n",
- "comapre \"letterman\" to \"letterman\" ratio was: 1.00 min: 0.75, passed: True\n",
- "True because 2 >= 2\n",
- "(David Letterman == Dave Letterman) = True\n",
- "\n",
- "comapre \"charles\" to \"charles\" ratio was: 1.00 min: 0.75, passed: True\n",
- "comapre \"dickens\" to \"booker\" ratio was: 0.31 min: 0.64, passed: False\n",
- "False because 1 >= 2\n",
- "(Charles Booker == Charles Dickens) = False\n",
- "\n",
- "comapre \"donald\" to \"don\" ratio was: 0.67 min: 0.38, passed: True\n",
- "comapre \"trump\" to \"j.\" ratio was: 0.00 min: 0.3, passed: False\n",
- "comapre \"trump\" to \"trump\" ratio was: 1.00 min: 0.75, passed: True\n",
- "True because 2 >= 2\n",
- "(Don J. Trump == Donald Trump) = True\n",
- "\n",
- "comapre \"wang\" to \"wang\" ratio was: 1.00 min: 0.75, passed: True\n",
- "comapre \"fei\" to \"fei\" ratio was: 1.00 min: 0.75, passed: True\n",
- "True because 2 >= 2\n",
- "(Wang Fei (female footballer) == Wang Fei) = True\n"
+ "0.7714285714285716\n"
]
}
],
"source": [
- "test_sim_match = True\n",
- "if test_sim_match:\n",
- " # Test name similarity search\n",
- " query = 'Adoors Gopalakarishnan ok'\n",
- " wp_name = 'Adoor Gopalakrishnan'\n",
- " matched = same_person(query, wp_name)\n",
- " print(f'({wp_name} == {query}) = {matched}')\n",
- " print('')\n",
- "\n",
- " query = 'Dave Letterman'\n",
- " wp_name = 'David Letterman'\n",
- " matched = same_person(query, wp_name, verbose=True)\n",
- " print(f'({wp_name} == {query}) = {matched}')\n",
- " print('')\n",
- "\n",
- " query = 'Charles Dickens'\n",
- " wp_name = 'Charles Booker'\n",
- " matched = same_person(query, wp_name, verbose=True)\n",
- " print(f'({wp_name} == {query}) = {matched}')\n",
- " print('')\n",
- "\n",
- " query = 'Donald Trump'\n",
- " wp_name = 'Don J. Trump'\n",
- " matched = same_person(query, wp_name, verbose=True)\n",
- " print(f'({wp_name} == {query}) = {matched}')\n",
- " print('')\n",
- " \n",
- " query = 'Wang Fei'\n",
- " kg_name = 'Faye Wong'\n",
- " wp_name = 'Wang Fei (female footballer)'\n",
- " matched = same_person(query, wp_name, verbose=True)\n",
- " print(f'({wp_name} == {query}) = {matched}')"
+ "#print(identity_utils.names_match('Andréss Iniestas', 'Andres Iniestalossas Jr.', as_float=True))\n",
+ "#print(identity_utils.names_match('Adoor Gopalakrishnan', 'Adoors Gopalakarishnan', as_float=True))\n",
+ "#print(identity_utils.names_match('Dave Letterman', 'David Letterman', as_float=True))\n",
+ "print(identity_utils.names_match('Charles Dickens', 'Charles Boooker', as_float=True))\n",
+ "#print(identity_utils.names_match('Donald Trump', 'Donald J. Trump', as_float=True))\n",
+ "#print(identity_utils.names_match('Wang Fei', 'Fei Wang III', as_float=True))"
]
},
{
"cell_type": "code",
- "execution_count": 246,
+ "execution_count": 126,
"metadata": {},
"outputs": [],
"source": [
@@ -710,69 +639,13 @@
"source": [
"df_mapped_persons.head(2)"
]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "## Clean data"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 225,
- "metadata": {
- "scrolled": false
- },
- "outputs": [],
- "source": [
- "for mp in mapped_persons:\n",
- " mp['source_name'] = mp['source_name'].replace(' ', '_')\n",
- "# mp['kg_description'] = mp['kg_description'].strip()\n",
- "# mp['kg_name'] = mp['kg_name'].strip()\n",
- "# mp['kg_bio_url'] = mp['kg_bio_url'].strip()\n",
- "# mp['kg_bio'] = mp['kg_bio'].strip()\n",
- "# mp['kg_url'] = mp['kg_url'].strip()\n",
- " \n",
- "# mp['wp_description'] = mp['wp_description'].strip()\n",
- "# mp['wp_name'] = mp['wp_name'].strip()\n",
- " \n",
- "# mp['mp_name'] = ''\n",
- "# mp['mp_bio'] = ''\n",
- "# mp['mp_description'] = ''\n",
- "# mp['mp_slug'] = ''\n",
- " \n",
- " #mp.setdefault('kg_description','')\n",
- "# if mp.get('kg_score', 0) == 0:\n",
- "# mp['kg_image_url'] = ''\n",
- "# mp['kg_bio_url'] = ''\n",
- "# mp['kg_id'] = ''\n",
- "# mp['kg_url'] = ''\n",
- "# mp['kg_description'] = ''\n",
- "# mp['kg_bio_url'] = ''\n",
- "# mp['kg_name'] = ''\n",
- "# if mp['kg_url'] == [] or mp['kg_url'] == '[]':\n",
- "# mp['kg_url'] = ''\n",
- "\n",
- " try:\n",
- " _ = mp.pop('wp_bio')\n",
- " except:\n",
- " pass"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
}
],
"metadata": {
"kernelspec": {
- "display_name": "Python [conda env:megapixels]",
+ "display_name": "megapixels",
"language": "python",
- "name": "conda-env-megapixels-py"
+ "name": "megapixels"
},
"language_info": {
"codemirror_mode": {
@@ -784,7 +657,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.6.6"
+ "version": "3.6.8"
}
},
"nbformat": 4,
diff --git a/megapixels/notebooks/datasets/imdb_wiki/identity.ipynb b/megapixels/notebooks/datasets/identity/imdb_wiki_identity.ipynb
index 40d7bd86..40d7bd86 100644
--- a/megapixels/notebooks/datasets/imdb_wiki/identity.ipynb
+++ b/megapixels/notebooks/datasets/identity/imdb_wiki_identity.ipynb
diff --git a/megapixels/notebooks/datasets/imdb_wiki_meta_debug.ipynb b/megapixels/notebooks/datasets/identity/imdb_wiki_meta_debug.ipynb
index 3b66fc5e..3b66fc5e 100644
--- a/megapixels/notebooks/datasets/imdb_wiki_meta_debug.ipynb
+++ b/megapixels/notebooks/datasets/identity/imdb_wiki_meta_debug.ipynb
diff --git a/megapixels/notebooks/datasets/lfw/lfw_knowledge_graph.ipynb b/megapixels/notebooks/datasets/identity/lfw_knowledge_graph.ipynb
index 01e516bb..01e516bb 100644
--- a/megapixels/notebooks/datasets/lfw/lfw_knowledge_graph.ipynb
+++ b/megapixels/notebooks/datasets/identity/lfw_knowledge_graph.ipynb
diff --git a/megapixels/notebooks/datasets/lfw/lfw_make_identity_csv.ipynb b/megapixels/notebooks/datasets/identity/lfw_make_identity_csv.ipynb
index 039614f0..039614f0 100644
--- a/megapixels/notebooks/datasets/lfw/lfw_make_identity_csv.ipynb
+++ b/megapixels/notebooks/datasets/identity/lfw_make_identity_csv.ipynb
diff --git a/megapixels/notebooks/datasets/lfw/lfw_names.ipynb b/megapixels/notebooks/datasets/identity/lfw_names.ipynb
index 8c474dd7..8c474dd7 100644
--- a/megapixels/notebooks/datasets/lfw/lfw_names.ipynb
+++ b/megapixels/notebooks/datasets/identity/lfw_names.ipynb
diff --git a/megapixels/notebooks/datasets/msceleb/identity.ipynb b/megapixels/notebooks/datasets/identity/msceleb_identity.ipynb
index d330badb..d330badb 100644
--- a/megapixels/notebooks/datasets/msceleb/identity.ipynb
+++ b/megapixels/notebooks/datasets/identity/msceleb_identity.ipynb
diff --git a/megapixels/notebooks/datasets/pubfig83/identity.ipynb b/megapixels/notebooks/datasets/identity/pubfig83_identity.ipynb
index 697d9cee..9809d6d6 100644
--- a/megapixels/notebooks/datasets/pubfig83/identity.ipynb
+++ b/megapixels/notebooks/datasets/identity/pubfig83_identity.ipynb
@@ -13,7 +13,7 @@
},
{
"cell_type": "code",
- "execution_count": 22,
+ "execution_count": 1,
"metadata": {},
"outputs": [],
"source": [
@@ -53,7 +53,7 @@
},
{
"cell_type": "code",
- "execution_count": 2,
+ "execution_count": 7,
"metadata": {},
"outputs": [
{
@@ -66,25 +66,26 @@
],
"source": [
"dir_lfw = '/data_store_hdd/datasets/people/pubfig83/media/original/'\n",
- "names = [x.replace('_', ' ') for x in os.listdir(dir_lfw)]\n",
+ "names_orig = [x for x in os.listdir(dir_lfw)]\n",
+ "names_query = [x.replace('_', ' ') for x in names_orig]\n",
"print(len(names))"
]
},
{
"cell_type": "code",
- "execution_count": 3,
+ "execution_count": 8,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
- "julia stiles\n"
+ "julia_stiles\n"
]
}
],
"source": [
- "print(names[0])"
+ "print(names_orig[0])"
]
},
{
@@ -96,7 +97,7 @@
},
{
"cell_type": "code",
- "execution_count": 7,
+ "execution_count": 9,
"metadata": {},
"outputs": [],
"source": [
@@ -107,7 +108,7 @@
},
{
"cell_type": "code",
- "execution_count": 8,
+ "execution_count": 10,
"metadata": {},
"outputs": [],
"source": [
@@ -168,7 +169,7 @@
},
{
"cell_type": "code",
- "execution_count": 24,
+ "execution_count": 11,
"metadata": {},
"outputs": [
{
@@ -188,7 +189,7 @@
" 'kg_id': '/m/07s7wk',\n",
" 'name': 'Adoor Gopalakrishnan',\n",
" 'query': 'Adoor Gopalakrishnan',\n",
- " 'score': 501.001862,\n",
+ " 'score': 501.590881,\n",
" 'url': 'http://www.adoorgopalakrishnan.com'}\n"
]
}
@@ -634,9 +635,9 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Python [conda env:megapixels]",
+ "display_name": "megapixels",
"language": "python",
- "name": "conda-env-megapixels-py"
+ "name": "megapixels"
},
"language_info": {
"codemirror_mode": {
@@ -648,7 +649,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.6.6"
+ "version": "3.6.8"
}
},
"nbformat": 4,
diff --git a/megapixels/notebooks/datasets/umd_faces/identity.ipynb b/megapixels/notebooks/datasets/identity/umd_faces_identity.ipynb
index a3da9d58..a3da9d58 100644
--- a/megapixels/notebooks/datasets/umd_faces/identity.ipynb
+++ b/megapixels/notebooks/datasets/identity/umd_faces_identity.ipynb
diff --git a/megapixels/notebooks/datasets/vgg_face2/clean_vgg_identity_meta_kg.ipynb b/megapixels/notebooks/datasets/identity/vgg_face2_clean_meta_kg.ipynb
index 91ca1626..91ca1626 100644
--- a/megapixels/notebooks/datasets/vgg_face2/clean_vgg_identity_meta_kg.ipynb
+++ b/megapixels/notebooks/datasets/identity/vgg_face2_clean_meta_kg.ipynb
diff --git a/megapixels/notebooks/datasets/vgg_face2/identity.ipynb b/megapixels/notebooks/datasets/identity/vgg_face2_identity.ipynb
index 66eeeb90..66eeeb90 100644
--- a/megapixels/notebooks/datasets/vgg_face2/identity.ipynb
+++ b/megapixels/notebooks/datasets/identity/vgg_face2_identity.ipynb
diff --git a/megapixels/notebooks/datasets/vgg_face2/vgg_names.ipynb b/megapixels/notebooks/datasets/identity/vgg_face2_names.ipynb
index f792bc81..f792bc81 100644
--- a/megapixels/notebooks/datasets/vgg_face2/vgg_names.ipynb
+++ b/megapixels/notebooks/datasets/identity/vgg_face2_names.ipynb
diff --git a/megapixels/notebooks/datasets/lfw/lfw_vis_bboxes.ipynb b/megapixels/notebooks/datasets/lfw/lfw_vis_bboxes.ipynb
index 4fa970fa..23054721 100644
--- a/megapixels/notebooks/datasets/lfw/lfw_vis_bboxes.ipynb
+++ b/megapixels/notebooks/datasets/lfw/lfw_vis_bboxes.ipynb
@@ -385,9 +385,9 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Python [conda env:megapixels]",
+ "display_name": "megapixels",
"language": "python",
- "name": "conda-env-megapixels-py"
+ "name": "megapixels"
},
"language_info": {
"codemirror_mode": {
@@ -399,7 +399,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.6.7"
+ "version": "3.6.8"
}
},
"nbformat": 4,
diff --git a/megapixels/notebooks/datasets/lfw/output/lfw.png b/megapixels/notebooks/datasets/lfw/output/lfw.png
deleted file mode 100644
index 87d36a7c..00000000
--- a/megapixels/notebooks/datasets/lfw/output/lfw.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/lfw/output/lfw_mean_crop.png b/megapixels/notebooks/datasets/lfw/output/lfw_mean_crop.png
deleted file mode 100644
index 50a0e497..00000000
--- a/megapixels/notebooks/datasets/lfw/output/lfw_mean_crop.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/lfw/output/lfw_montage_1280.jpg b/megapixels/notebooks/datasets/lfw/output/lfw_montage_1280.jpg
deleted file mode 100644
index 5cad0c32..00000000
--- a/megapixels/notebooks/datasets/lfw/output/lfw_montage_1280.jpg
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/lfw/output/lfw_montage_960.jpg b/megapixels/notebooks/datasets/lfw/output/lfw_montage_960.jpg
deleted file mode 100644
index 015c11c7..00000000
--- a/megapixels/notebooks/datasets/lfw/output/lfw_montage_960.jpg
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/lfw/output/lfw_rand.png b/megapixels/notebooks/datasets/lfw/output/lfw_rand.png
deleted file mode 100644
index dc13f7c1..00000000
--- a/megapixels/notebooks/datasets/lfw/output/lfw_rand.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/output.png b/megapixels/notebooks/datasets/mpii_pose/output/output.png
deleted file mode 100644
index 2024fb2f..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/output.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/output_10px.png b/megapixels/notebooks/datasets/mpii_pose/output/output_10px.png
deleted file mode 100644
index acb5e88a..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/output_10px.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/output_1px.png b/megapixels/notebooks/datasets/mpii_pose/output/output_1px.png
deleted file mode 100644
index 0040825a..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/output_1px.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/output_black.png b/megapixels/notebooks/datasets/mpii_pose/output/output_black.png
deleted file mode 100644
index af001993..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/output_black.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/output_head20.png b/megapixels/notebooks/datasets/mpii_pose/output/output_head20.png
deleted file mode 100644
index 275e452f..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/output_head20.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/output_norm.png b/megapixels/notebooks/datasets/mpii_pose/output/output_norm.png
deleted file mode 100644
index 232adc3a..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/output_norm.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/output_norm_bgr.png b/megapixels/notebooks/datasets/mpii_pose/output/output_norm_bgr.png
deleted file mode 100644
index dee79180..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/output_norm_bgr.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/output_white copy.png b/megapixels/notebooks/datasets/mpii_pose/output/output_white copy.png
deleted file mode 100644
index 9e354cfe..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/output_white copy.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/output_white.png b/megapixels/notebooks/datasets/mpii_pose/output/output_white.png
deleted file mode 100644
index 8113f76d..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/output_white.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/pose_02.png b/megapixels/notebooks/datasets/mpii_pose/output/pose_02.png
deleted file mode 100644
index 37d9a2dd..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/pose_02.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/pose_02_sm.png b/megapixels/notebooks/datasets/mpii_pose/output/pose_02_sm.png
deleted file mode 100644
index a053b494..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/pose_02_sm.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/pose_03.png b/megapixels/notebooks/datasets/mpii_pose/output/pose_03.png
deleted file mode 100644
index 48f71b7a..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/pose_03.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/pose_04.png b/megapixels/notebooks/datasets/mpii_pose/output/pose_04.png
deleted file mode 100644
index b89d19fa..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/pose_04.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/pose_05.png b/megapixels/notebooks/datasets/mpii_pose/output/pose_05.png
deleted file mode 100644
index 526f3768..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/pose_05.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/pose_06.png b/megapixels/notebooks/datasets/mpii_pose/output/pose_06.png
deleted file mode 100644
index b0f073c3..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/pose_06.png
+++ /dev/null
Binary files differ
diff --git a/megapixels/notebooks/datasets/mpii_pose/output/pose_07.png b/megapixels/notebooks/datasets/mpii_pose/output/pose_07.png
deleted file mode 100644
index 18780803..00000000
--- a/megapixels/notebooks/datasets/mpii_pose/output/pose_07.png
+++ /dev/null
Binary files differ