Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
fb5ad90
update blob.py to run
zhanwenchen Feb 17, 2022
38ea2b8
make my_model_24 work
zhanwenchen Feb 17, 2022
b7756e2
make get_union_boxes work
zhanwenchen Feb 17, 2022
e700c27
make rel_assignments work
zhanwenchen Feb 17, 2022
4d35be2
make object_detector work
zhanwenchen Feb 17, 2022
a133fd4
suppress volatile removed warnings
zhanwenchen Feb 17, 2022
1dac9f3
fix 0045.ipynb
zhanwenchen Feb 17, 2022
ad3727c
modify for bpl
zhanwenchen Mar 1, 2022
c066973
bpl working
zhanwenchen Mar 1, 2022
76cffe9
forgot to add changes in config.py
zhanwenchen Mar 1, 2022
c93316d
suppress volatile
zhanwenchen Mar 1, 2022
68d8ab1
add SA
zhanwenchen Mar 2, 2022
000246e
add lrga
zhanwenchen Mar 3, 2022
df31e34
fix lgra=>lrga typo
zhanwenchen Mar 3, 2022
c37de89
fix bpl dataloader
zhanwenchen Mar 3, 2022
47d4fb5
change bn to gn
zhanwenchen Mar 3, 2022
e186ee4
fix not using fc_output_proj_img_pred_clean
zhanwenchen Mar 14, 2022
6b66728
no longer doing any clean/transfer with refine_obj_cls
zhanwenchen Mar 14, 2022
2bf5465
fix clean/transfer dependency order
zhanwenchen Mar 14, 2022
d1bb065
skip restoring clean layers
zhanwenchen Mar 16, 2022
7788d25
1.fix missing _clean in model; 2. fix dependency order in ggnn steps;…
zhanwenchen Mar 24, 2022
a31a8e7
optimize, print sg_eval
zhanwenchen Mar 24, 2022
7399641
Delete printing that bugs out Jupyter with 288MB
zhanwenchen Mar 25, 2022
175f94c
Add normalize EOA
zhanwenchen Mar 25, 2022
a318674
fix bug; refactor
zhanwenchen Mar 28, 2022
87331c6
use tqdm to print
zhanwenchen Mar 29, 2022
0b7d8ce
dataloader visual_genome add option for caching to disk
zhanwenchen Mar 29, 2022
1e10eee
delete intermediate results; delete _new; do not compute non-clean fo…
zhanwenchen Mar 29, 2022
1ed1c0f
fix typo
zhanwenchen Mar 29, 2022
f27932b
use only conceptnet edges for eoa
zhanwenchen Mar 29, 2022
ff79e64
add eoa shift and fold
zhanwenchen Mar 29, 2022
75a4f00
add merge_eoa_sa
zhanwenchen Mar 29, 2022
46c94d9
add init for merge_eoa_sa
zhanwenchen Mar 29, 2022
8e29b28
use better normalization logic for eoa instead of the bpl default sum
zhanwenchen Mar 30, 2022
af96d03
use only pred_cov
zhanwenchen Mar 30, 2022
fd8ecd2
Fix num_gpus to work with GPUs ordered 0, 1, 3
zhanwenchen Apr 27, 2022
ab52922
Fix getitem to work with GPU order 0, 1, 3
zhanwenchen Apr 27, 2022
61e77a0
Update imports for parallel object_detector
zhanwenchen Apr 27, 2022
947c5eb
Fix parallel_apply to use internal order
zhanwenchen Apr 27, 2022
6ec7526
Store devices in model init
zhanwenchen Apr 27, 2022
b5441a8
Add files via upload
zhanwenchen Feb 8, 2024
df3b2de
Add files via upload
zhanwenchen Feb 8, 2024
80287e8
Add files via upload
zhanwenchen Mar 11, 2024
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
16,796 changes: 16,796 additions & 0 deletions add_wikidata/1. Generate Facts with Multihop.ipynb

Large diffs are not rendered by default.

1,361 changes: 1,361 additions & 0 deletions add_wikidata/1b. Compare Edges.ipynb

Large diffs are not rendered by default.

5,201 changes: 5,201 additions & 0 deletions add_wikidata/1c. Compare Edges Zareian.ipynb

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1,921 changes: 1,921 additions & 0 deletions add_wikidata/3. Add Irrelevant Labels.ipynb

Large diffs are not rendered by default.

2,404 changes: 2,404 additions & 0 deletions add_wikidata/4. Build Graph.ipynb

Large diffs are not rendered by default.

3,853 changes: 3,853 additions & 0 deletions add_wikidata/Build Word Embedding.ipynb

Large diffs are not rendered by default.

1,884 changes: 1,884 additions & 0 deletions add_wikidata/Generate Prior Knowledge.ipynb

Large diffs are not rendered by default.

274 changes: 274 additions & 0 deletions add_wikidata/Generate emb_txt.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,274 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": 9,
"id": "eba8d895",
"metadata": {},
"outputs": [],
"source": [
"%load_ext autoreload\n",
"%autoreload 2"
]
},
{
"cell_type": "code",
"execution_count": 20,
"id": "affbd931",
"metadata": {},
"outputs": [],
"source": [
"import json\n",
"with open('VG-SGG-dicts.json', 'r') as fin:\n",
" scene_graph_meta_zareian = json.load(fin)\n",
"\n",
"with open('VG-SGG-dicts_combined_176_20211107.json', 'r') as fin:\n",
" scene_graph_meta_wiki_51 = json.load(fin)\n",
"\n",
"# labels_new = sorted(list(scene_graph_meta_150['label_to_idx'].keys()))\n",
"\n",
"# new_labels2order = scene_graph_meta['label_to_idx'].copy()\n",
"# labels_new = sorted(list(new_labels2order.keys()) + ['__background__'])\n",
"# new_preds2order = scene_graph_meta['predicate_to_idx'].copy()\n",
"# preds_new = sorted(list(new_preds2order.keys()) + ['__background__'])\n"
]
},
{
"cell_type": "code",
"execution_count": 21,
"id": "8f1635b8",
"metadata": {},
"outputs": [],
"source": [
"labels_sorted_150 = sorted(list(scene_graph_meta_zareian['label_to_idx'].keys())) # 150\n",
"labels_sorted_176 = sorted(list(scene_graph_meta_wiki_51['label_to_idx'].keys())) # 176"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "7acb8259",
"metadata": {},
"outputs": [],
"source": [
"label2synset_combined = load_obj('label2synset_combined')\n",
"idx2label_177 = {str(v): k for k, v in sorted(scene_graph_meta_177['label_to_idx'].items(), key=lambda item: item[1])}\n",
"labels_new = sorted(list(scene_graph_meta_177['label_to_idx'].keys()))\n"
]
},
{
"cell_type": "code",
"execution_count": 13,
"id": "466a71b4",
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"(151, 300)\n",
"(51, 300)\n"
]
}
],
"source": [
"from utils import save_obj, load_obj\n",
"emb_txt = load_obj('../emb_mtx')\n",
"emb_ent = emb_txt[0]\n",
"emb_preds = emb_txt[1]\n",
"print(emb_ent.shape)\n",
"print(emb_preds.shape)"
]
},
{
"cell_type": "code",
"execution_count": 63,
"id": "b040254b",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"array([[ 0. , 0. , 0. , ..., 0. , 0. ,\n",
" 0. ],\n",
" [ 0.6211 , -0.39874 , 0.14321 , ..., 0.48462 , 0.40693 ,\n",
" 0.30929 ],\n",
" [-0.47727 , -0.013122, -0.33529 , ..., 0.17792 , -0.29661 ,\n",
" -0.013497],\n",
" ...,\n",
" [ 0.14546 , 0.62681 , 0.57661 , ..., 0.023874, -0.29355 ,\n",
" 0.50647 ],\n",
" [ 0.025567, 0.27885 , -0.16992 , ..., -0.018582, -0.10128 ,\n",
" -0.34728 ],\n",
" [ 0.032498, -0.086628, -0.53464 , ..., 0.8099 , -0.3427 ,\n",
" -0.2495 ]], dtype=float32)"
]
},
"execution_count": 63,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"emb_ent"
]
},
{
"cell_type": "code",
"execution_count": 22,
"id": "0398fdce",
"metadata": {},
"outputs": [],
"source": [
"labels_150 = list(scene_graph_meta_zareian['label_to_idx'].keys())\n",
"preds_50 = list(scene_graph_meta_zareian['predicate_to_idx'].keys())"
]
},
{
"cell_type": "code",
"execution_count": 62,
"id": "68d2feae",
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Loaded 1917494 words\n"
]
}
],
"source": [
"import torch\n",
"import torchtext.vocab as vocab\n",
"\n",
"glove_840B = vocab.GloVe(name='840B', dim=300)\n",
"\n",
"print('Loaded {} words'.format(len(glove.itos)))\n",
"\n",
"# def get_word(word):\n",
"# return glove_840B.vectors[glove.stoi[word]]\n",
"\n",
"labels_zareian = sorted(scene_graph_meta_zareian['label_to_idx'].keys())\n",
"emb_151 = glove_840B.get_vecs_by_tokens(['__background__'] + labels_zareian, lower_case_backup=True)\n",
"\n",
"# Assume labels_new is sorted\n",
"labels_new = sorted(scene_graph_meta_wiki_51['label_to_idx'].keys())\n",
"emb_177 = glove_840B.get_vecs_by_tokens(['__background__'] + labels_new, lower_case_backup=True)\n"
]
},
{
"cell_type": "code",
"execution_count": 66,
"id": "45b44249",
"metadata": {},
"outputs": [],
"source": [
"emb_177_np = emb_177.numpy()"
]
},
{
"cell_type": "code",
"execution_count": 68,
"id": "46a3a645",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"(177, 300)"
]
},
"execution_count": 68,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"emb_177_np.shape"
]
},
{
"cell_type": "markdown",
"id": "effc7aba",
"metadata": {},
"source": [
"# Can do the preds later"
]
},
{
"cell_type": "code",
"execution_count": 77,
"id": "b376112f",
"metadata": {},
"outputs": [],
"source": [
"# save_obj((emb_177_np, emb_preds), 'emb_txt_wiki_51')"
]
},
{
"cell_type": "markdown",
"id": "5ef52e71",
"metadata": {},
"source": [
"# Verify Zareian-TorchText Match"
]
},
{
"cell_type": "code",
"execution_count": 74,
"id": "c7d02b08",
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"23.505192\n",
"tensor(23.5052)\n",
"82.076355\n",
"82.076355\n"
]
}
],
"source": [
"import numpy as np\n",
"\n",
"print(emb_ent.sum()) # 23.505192\n",
"print(emb_151.sum()) # 23.5052\n",
"\n",
"print(np.linalg.norm(emb_ent)) #82.076355\n",
"print(np.linalg.norm(emb_151)) # 82.076355\n"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "102d61f8",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.7"
}
},
"nbformat": 4,
"nbformat_minor": 5
}
Loading