From fdce1a9b2a4d0eb63cbbc7fa3055ca43d423dc54 Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Sat, 14 Sep 2024 12:39:20 -0500 Subject: [PATCH] Compute correctly the git-tree-sha1 of each artifact --- Artifacts.toml | 148 +++++++++++------------ src/BundleAdjustmentArtifactFunctions.jl | 15 +-- src/BundleAdjustmentModels.jl | 3 + utils/gen_artifacts_toml.jl | 39 +++--- 4 files changed, 105 insertions(+), 100 deletions(-) diff --git a/Artifacts.toml b/Artifacts.toml index f13dbc7..0830474 100644 --- a/Artifacts.toml +++ b/Artifacts.toml @@ -1,5 +1,5 @@ ["dubrovnik/problem-135-90642-pre.txt.bz2"] -git-tree-sha1 = "81de4d356e5e664e87f3e06d5558a77b1feb1c93" +git-tree-sha1 = "0d3a75635b9100c7d32c045082b900b767177b39" lazy = true [["dubrovnik/problem-135-90642-pre.txt.bz2".download]] @@ -7,7 +7,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-135-90642-pre.txt.bz2" ["dubrovnik/problem-142-93602-pre.txt.bz2"] -git-tree-sha1 = "115764dd673db3028cc5ce198e2629b4a3286c2b" +git-tree-sha1 = "ee69b747d17e041d9778d09860948dbf8aa6aa45" lazy = true [["dubrovnik/problem-142-93602-pre.txt.bz2".download]] @@ -15,7 +15,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-142-93602-pre.txt.bz2" ["dubrovnik/problem-150-95821-pre.txt.bz2"] -git-tree-sha1 = "c455401d05aa50261446e6073b1633631c604778" +git-tree-sha1 = "c901adea8415b66c62a4e109e0c4c10678b61825" lazy = true [["dubrovnik/problem-150-95821-pre.txt.bz2".download]] @@ -23,7 +23,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-150-95821-pre.txt.bz2" ["dubrovnik/problem-16-22106-pre.txt.bz2"] -git-tree-sha1 = "bafd5accdad3c17dd4d9794a64e33d6294095a49" +git-tree-sha1 = "04c746596398ae78bea801b3c16a4e3d800c77ad" lazy = true [["dubrovnik/problem-16-22106-pre.txt.bz2".download]] @@ -31,7 +31,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-16-22106-pre.txt.bz2" ["dubrovnik/problem-161-103832-pre.txt.bz2"] -git-tree-sha1 = "05010b04528c716465f0b54c2e55bb3cddc0b67f" +git-tree-sha1 = "1d810dbf0d11f781beb3c74ee70e34dad9a3c259" lazy = true [["dubrovnik/problem-161-103832-pre.txt.bz2".download]] @@ -39,7 +39,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-161-103832-pre.txt.bz2" ["dubrovnik/problem-173-111908-pre.txt.bz2"] -git-tree-sha1 = "7f25b55a3bee80e5f89d0fbf4600f022fbf3ffca" +git-tree-sha1 = "5e041dd44e12e3c341b11875e3600b373ef59879" lazy = true [["dubrovnik/problem-173-111908-pre.txt.bz2".download]] @@ -47,7 +47,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-173-111908-pre.txt.bz2" ["dubrovnik/problem-182-116770-pre.txt.bz2"] -git-tree-sha1 = "758a2c8024689aa5970ba546ba495d3a6ca3112a" +git-tree-sha1 = "53f294e1e1df8ca337870646d0ff96a774b66e86" lazy = true [["dubrovnik/problem-182-116770-pre.txt.bz2".download]] @@ -55,7 +55,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-182-116770-pre.txt.bz2" ["dubrovnik/problem-202-132796-pre.txt.bz2"] -git-tree-sha1 = "8f3dae9b9d4f6aa9ef1db299349f2d388979be88" +git-tree-sha1 = "fec817d822d18ab1dbf017feebcbcf4067471b1e" lazy = true [["dubrovnik/problem-202-132796-pre.txt.bz2".download]] @@ -63,7 +63,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-202-132796-pre.txt.bz2" ["dubrovnik/problem-237-154414-pre.txt.bz2"] -git-tree-sha1 = "70933968f7ab2a80d6d7629d783225b3b9c19b15" +git-tree-sha1 = "3eab086df04fbf52cdbcabbe2235153da610b6f8" lazy = true [["dubrovnik/problem-237-154414-pre.txt.bz2".download]] @@ -71,7 +71,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-237-154414-pre.txt.bz2" ["dubrovnik/problem-253-163691-pre.txt.bz2"] -git-tree-sha1 = "4119859019222757091fb182c127862779353292" +git-tree-sha1 = "82a7210ce485666e491556de98da9c297c87f619" lazy = true [["dubrovnik/problem-253-163691-pre.txt.bz2".download]] @@ -79,7 +79,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-253-163691-pre.txt.bz2" ["dubrovnik/problem-262-169354-pre.txt.bz2"] -git-tree-sha1 = "a3fa081f75ced0c28e6baeee3b6bad34772dab37" +git-tree-sha1 = "0752213e73bb875a0d28ff097bfd1564ba132e66" lazy = true [["dubrovnik/problem-262-169354-pre.txt.bz2".download]] @@ -87,7 +87,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-262-169354-pre.txt.bz2" ["dubrovnik/problem-273-176305-pre.txt.bz2"] -git-tree-sha1 = "c423a9802c8ec684767c0209ad0b08b3592797d6" +git-tree-sha1 = "54471399cbe84b6a240541b09acb1b69382e683f" lazy = true [["dubrovnik/problem-273-176305-pre.txt.bz2".download]] @@ -95,7 +95,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-273-176305-pre.txt.bz2" ["dubrovnik/problem-287-182023-pre.txt.bz2"] -git-tree-sha1 = "4f5d70294de8c6697ddf682096c55682f7cdebb4" +git-tree-sha1 = "30ac32cb8c6190d7e447cea864e4ad04faecb113" lazy = true [["dubrovnik/problem-287-182023-pre.txt.bz2".download]] @@ -103,7 +103,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-287-182023-pre.txt.bz2" ["dubrovnik/problem-308-195089-pre.txt.bz2"] -git-tree-sha1 = "fd6a82118ea7e8ed231fc484273becf3fb097788" +git-tree-sha1 = "66eac4bd2055c2f02e207393d59f39315ea99b21" lazy = true [["dubrovnik/problem-308-195089-pre.txt.bz2".download]] @@ -111,7 +111,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-308-195089-pre.txt.bz2" ["dubrovnik/problem-356-226730-pre.txt.bz2"] -git-tree-sha1 = "e5ff6210f10f633531314bcf00001776adabe725" +git-tree-sha1 = "1cfd970e32fc44e83976fd7fcf62a5529fac2e45" lazy = true [["dubrovnik/problem-356-226730-pre.txt.bz2".download]] @@ -119,7 +119,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-356-226730-pre.txt.bz2" ["dubrovnik/problem-88-64298-pre.txt.bz2"] -git-tree-sha1 = "3f42bef7b8ff9b4f5df21ecb4cf8bcc65827eb38" +git-tree-sha1 = "e362633c86ec23e7ddc1cd3729091adf856f2c80" lazy = true [["dubrovnik/problem-88-64298-pre.txt.bz2".download]] @@ -127,7 +127,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/dubrovnik/problem-88-64298-pre.txt.bz2" ["ladybug/problem-1031-110968-pre.txt.bz2"] -git-tree-sha1 = "e3cddf6f44c30007df01ca55f661ca9375424670" +git-tree-sha1 = "dbf922286fe0e63f885b702cca43d113f7b80a37" lazy = true [["ladybug/problem-1031-110968-pre.txt.bz2".download]] @@ -135,7 +135,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-1031-110968-pre.txt.bz2" ["ladybug/problem-1064-113655-pre.txt.bz2"] -git-tree-sha1 = "57399e61350632516e5e770cfa4f813f1ff7ea65" +git-tree-sha1 = "37f3743478004b166f2b7e09f8a5981cf940a3a4" lazy = true [["ladybug/problem-1064-113655-pre.txt.bz2".download]] @@ -143,7 +143,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-1064-113655-pre.txt.bz2" ["ladybug/problem-1118-118384-pre.txt.bz2"] -git-tree-sha1 = "1270d5019c1c29492aaf9f7ea5470c3e3af4b471" +git-tree-sha1 = "6ab0305ce5377676da266fd7036a6a52b4276ce7" lazy = true [["ladybug/problem-1118-118384-pre.txt.bz2".download]] @@ -151,7 +151,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-1118-118384-pre.txt.bz2" ["ladybug/problem-1152-122269-pre.txt.bz2"] -git-tree-sha1 = "157fe52c2fa7e9beb06422f3f360d244c59c924a" +git-tree-sha1 = "9fe3f2cb2a31040af55b3a018c6ec8856be2e68d" lazy = true [["ladybug/problem-1152-122269-pre.txt.bz2".download]] @@ -159,7 +159,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-1152-122269-pre.txt.bz2" ["ladybug/problem-1197-126327-pre.txt.bz2"] -git-tree-sha1 = "72cdf832cd3eedb4cc4c589127e7ab5b91a60f00" +git-tree-sha1 = "03e592564dc0f42b5eedab7a3b53bbf9ecbad3e1" lazy = true [["ladybug/problem-1197-126327-pre.txt.bz2".download]] @@ -167,7 +167,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-1197-126327-pre.txt.bz2" ["ladybug/problem-1235-129634-pre.txt.bz2"] -git-tree-sha1 = "1e01d6927d4d4e0acd3086d9c75d2ee783ab1220" +git-tree-sha1 = "4b4f58c073570eede8d9bc0e18031a2985b10195" lazy = true [["ladybug/problem-1235-129634-pre.txt.bz2".download]] @@ -175,7 +175,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-1235-129634-pre.txt.bz2" ["ladybug/problem-1266-132593-pre.txt.bz2"] -git-tree-sha1 = "b92a8dfd520e7440769c4a72685e817632f9ea43" +git-tree-sha1 = "fc39bfe440d138e8bf9adc442e45a1975f8fb46f" lazy = true [["ladybug/problem-1266-132593-pre.txt.bz2".download]] @@ -183,7 +183,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-1266-132593-pre.txt.bz2" ["ladybug/problem-1340-137079-pre.txt.bz2"] -git-tree-sha1 = "366a8368c091027a23a190b1ed498158eef947a5" +git-tree-sha1 = "580bfe822e16d9a789516df19abb0d6fb61538ed" lazy = true [["ladybug/problem-1340-137079-pre.txt.bz2".download]] @@ -191,7 +191,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-1340-137079-pre.txt.bz2" ["ladybug/problem-138-19878-pre.txt.bz2"] -git-tree-sha1 = "5c5c938c998d6c083f549bc584cfeb07bd296d89" +git-tree-sha1 = "658f23b6973c0f3d927ec4af548616781e333dd5" lazy = true [["ladybug/problem-138-19878-pre.txt.bz2".download]] @@ -199,7 +199,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-138-19878-pre.txt.bz2" ["ladybug/problem-1469-145199-pre.txt.bz2"] -git-tree-sha1 = "ee08f4f6898cc26471d3a63502fe908cfa9a5dcc" +git-tree-sha1 = "deee0e713f9b46cd9a75f245d823fde043a89c1a" lazy = true [["ladybug/problem-1469-145199-pre.txt.bz2".download]] @@ -207,7 +207,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-1469-145199-pre.txt.bz2" ["ladybug/problem-1514-147317-pre.txt.bz2"] -git-tree-sha1 = "1a0ebf23b35d784ad3d39f4987bc7d785f5976b6" +git-tree-sha1 = "cc4ba6b13ab362d4c305d2f21c06cb10d4a4fd90" lazy = true [["ladybug/problem-1514-147317-pre.txt.bz2".download]] @@ -215,7 +215,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-1514-147317-pre.txt.bz2" ["ladybug/problem-1587-150845-pre.txt.bz2"] -git-tree-sha1 = "00be55410c27068ec73261e122a39258100a1a11" +git-tree-sha1 = "2b08e18ae0bb7d65709a0e062fe937b0f76af099" lazy = true [["ladybug/problem-1587-150845-pre.txt.bz2".download]] @@ -223,7 +223,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-1587-150845-pre.txt.bz2" ["ladybug/problem-1642-153820-pre.txt.bz2"] -git-tree-sha1 = "0303e7ae8256c494c9da052d977277f21265899b" +git-tree-sha1 = "481a3d5abd3f7fe09e0478fd9f0923e2802955ea" lazy = true [["ladybug/problem-1642-153820-pre.txt.bz2".download]] @@ -231,7 +231,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-1642-153820-pre.txt.bz2" ["ladybug/problem-1695-155710-pre.txt.bz2"] -git-tree-sha1 = "389ecea5c2f2e2b637a2b4439af0bd4ca98e6d84" +git-tree-sha1 = "4262d69f73c4e228881886f5403f68034d41588f" lazy = true [["ladybug/problem-1695-155710-pre.txt.bz2".download]] @@ -239,7 +239,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-1695-155710-pre.txt.bz2" ["ladybug/problem-318-41628-pre.txt.bz2"] -git-tree-sha1 = "e8ebdcec7cd5dc3ec4825dcb6642064e541fa625" +git-tree-sha1 = "59f166b21f6dc628a4b8d06f10846ef223c3398f" lazy = true [["ladybug/problem-318-41628-pre.txt.bz2".download]] @@ -247,7 +247,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-318-41628-pre.txt.bz2" ["ladybug/problem-372-47423-pre.txt.bz2"] -git-tree-sha1 = "111ebd1dcdf5670eac8a12f4e2ce5a3b79b4f7f6" +git-tree-sha1 = "6cea78f2387bc93d89a74570f7c4b88f9e1c9eb5" lazy = true [["ladybug/problem-372-47423-pre.txt.bz2".download]] @@ -255,7 +255,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-372-47423-pre.txt.bz2" ["ladybug/problem-412-52215-pre.txt.bz2"] -git-tree-sha1 = "3e8acd1ef4cb13d93a7140be1c3702b5eb165978" +git-tree-sha1 = "922cbd8236181aad6958c3c47fce6205c27fb88d" lazy = true [["ladybug/problem-412-52215-pre.txt.bz2".download]] @@ -263,7 +263,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-412-52215-pre.txt.bz2" ["ladybug/problem-460-56811-pre.txt.bz2"] -git-tree-sha1 = "69595726ce3990604ef56b80c273fe7f95506f2e" +git-tree-sha1 = "e8560260787f9fd681ee45b0fcbf5fc4b46850dd" lazy = true [["ladybug/problem-460-56811-pre.txt.bz2".download]] @@ -271,7 +271,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-460-56811-pre.txt.bz2" ["ladybug/problem-49-7776-pre.txt.bz2"] -git-tree-sha1 = "dd2da5f94014b5f9086a2b38a87f8c1bc171b9c2" +git-tree-sha1 = "1c889d92a544c32de78828666f6b4d025495945b" lazy = true [["ladybug/problem-49-7776-pre.txt.bz2".download]] @@ -279,7 +279,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-49-7776-pre.txt.bz2" ["ladybug/problem-539-65220-pre.txt.bz2"] -git-tree-sha1 = "1eab751f4850b1e22302a7f97894d4b769c7350e" +git-tree-sha1 = "ed4ea0afac50c71bbeadd1843c0a45d0cdc564c9" lazy = true [["ladybug/problem-539-65220-pre.txt.bz2".download]] @@ -287,7 +287,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-539-65220-pre.txt.bz2" ["ladybug/problem-598-69218-pre.txt.bz2"] -git-tree-sha1 = "90ce1588d82c76a81c2b07d9e6abcc984e0e4586" +git-tree-sha1 = "63f60e2b50589f60f8cf42dfe7e4541311cf2e5f" lazy = true [["ladybug/problem-598-69218-pre.txt.bz2".download]] @@ -295,7 +295,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-598-69218-pre.txt.bz2" ["ladybug/problem-646-73584-pre.txt.bz2"] -git-tree-sha1 = "05e4248f24d897a97e9be1f386e18d1de7e511e5" +git-tree-sha1 = "759168bc1230360398ccead443f455e7ed498b85" lazy = true [["ladybug/problem-646-73584-pre.txt.bz2".download]] @@ -303,7 +303,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-646-73584-pre.txt.bz2" ["ladybug/problem-707-78455-pre.txt.bz2"] -git-tree-sha1 = "9609aa95bd2626c02e6fdc4182e642fdb3f5e7be" +git-tree-sha1 = "7c6cc8f4fc72941c5a525fb5b2baf9f66feb6126" lazy = true [["ladybug/problem-707-78455-pre.txt.bz2".download]] @@ -311,7 +311,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-707-78455-pre.txt.bz2" ["ladybug/problem-73-11032-pre.txt.bz2"] -git-tree-sha1 = "3d0853a3ca8e585814697fea9cd4d6956692e103" +git-tree-sha1 = "4461ac81e3c3c5793507c377bc719b421ece44ca" lazy = true [["ladybug/problem-73-11032-pre.txt.bz2".download]] @@ -319,7 +319,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-73-11032-pre.txt.bz2" ["ladybug/problem-783-84444-pre.txt.bz2"] -git-tree-sha1 = "8cd6fdd56c39180dce9c4ef3f5650cce9b1ca784" +git-tree-sha1 = "31689998d46ecb3855bb164a2cf6801669a31c40" lazy = true [["ladybug/problem-783-84444-pre.txt.bz2".download]] @@ -327,7 +327,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-783-84444-pre.txt.bz2" ["ladybug/problem-810-88814-pre.txt.bz2"] -git-tree-sha1 = "b5319f9518899ac6fd30ba5ff9c2d6381f2203cf" +git-tree-sha1 = "495695e92f1c329016f532d6c8eded90134759bc" lazy = true [["ladybug/problem-810-88814-pre.txt.bz2".download]] @@ -335,7 +335,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-810-88814-pre.txt.bz2" ["ladybug/problem-856-93344-pre.txt.bz2"] -git-tree-sha1 = "c7c6a4e9130e12eb458bd2826ee3c0de69e6d0a1" +git-tree-sha1 = "565cbc5908a2e6e040bd6340a7ad5c26c13095bf" lazy = true [["ladybug/problem-856-93344-pre.txt.bz2".download]] @@ -343,7 +343,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-856-93344-pre.txt.bz2" ["ladybug/problem-885-97473-pre.txt.bz2"] -git-tree-sha1 = "53229252cdde853e72f5d920f101667e189dbad0" +git-tree-sha1 = "2653596e2ce78ce3c59f83a0a310be45790cac8e" lazy = true [["ladybug/problem-885-97473-pre.txt.bz2".download]] @@ -351,7 +351,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-885-97473-pre.txt.bz2" ["ladybug/problem-931-102699-pre.txt.bz2"] -git-tree-sha1 = "c95cdbabf3405b2d481230fd049b96974679e2d4" +git-tree-sha1 = "a857257f94e3dfc3d64b815790182d9ec49427d4" lazy = true [["ladybug/problem-931-102699-pre.txt.bz2".download]] @@ -359,7 +359,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-931-102699-pre.txt.bz2" ["ladybug/problem-969-105826-pre.txt.bz2"] -git-tree-sha1 = "1a8f98c19abe44571b213172e9465a13aab2275d" +git-tree-sha1 = "2ade2ed3d4a811ba5242957b5775ed9a1f95db03" lazy = true [["ladybug/problem-969-105826-pre.txt.bz2".download]] @@ -367,7 +367,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/ladybug/problem-969-105826-pre.txt.bz2" ["trafalgar/problem-126-40037-pre.txt.bz2"] -git-tree-sha1 = "9d1d5b3c72e64f5c4c98907580438c3a1bed0c7e" +git-tree-sha1 = "1a5db64f87d7bd1a88a9f8027cb823abda7decfd" lazy = true [["trafalgar/problem-126-40037-pre.txt.bz2".download]] @@ -375,7 +375,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-126-40037-pre.txt.bz2" ["trafalgar/problem-138-44033-pre.txt.bz2"] -git-tree-sha1 = "3acad73b4b0b59c6453d965a9107271b0d567695" +git-tree-sha1 = "fe04f05c207f6a80d0a27ffdbf42c5e828345534" lazy = true [["trafalgar/problem-138-44033-pre.txt.bz2".download]] @@ -383,7 +383,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-138-44033-pre.txt.bz2" ["trafalgar/problem-161-48126-pre.txt.bz2"] -git-tree-sha1 = "d7cc0bbf1bb6bd3a3331f220baf318c9350837f0" +git-tree-sha1 = "7158725b64cff11216f248399d696f94c12f2bd6" lazy = true [["trafalgar/problem-161-48126-pre.txt.bz2".download]] @@ -391,7 +391,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-161-48126-pre.txt.bz2" ["trafalgar/problem-170-49267-pre.txt.bz2"] -git-tree-sha1 = "c2a7bcb75dfbf1730355f3b14d2a05fd5593a3c1" +git-tree-sha1 = "1644ec3312a78211660293bb7884bc1386d236ab" lazy = true [["trafalgar/problem-170-49267-pre.txt.bz2".download]] @@ -399,7 +399,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-170-49267-pre.txt.bz2" ["trafalgar/problem-174-50489-pre.txt.bz2"] -git-tree-sha1 = "09cb33420642f5079c4f3990801975b66303f528" +git-tree-sha1 = "a6a82b2ea3bfaab0554ae5e810cd352d2f809742" lazy = true [["trafalgar/problem-174-50489-pre.txt.bz2".download]] @@ -407,7 +407,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-174-50489-pre.txt.bz2" ["trafalgar/problem-193-53101-pre.txt.bz2"] -git-tree-sha1 = "dcbf893b88d7aa014209bac3a5e83a2f62a1ca40" +git-tree-sha1 = "33edf869c50b7389c85fd340663ae36958b6056a" lazy = true [["trafalgar/problem-193-53101-pre.txt.bz2".download]] @@ -415,7 +415,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-193-53101-pre.txt.bz2" ["trafalgar/problem-201-54427-pre.txt.bz2"] -git-tree-sha1 = "a580d82e8bd162a6eb3384d1959e035c781166fd" +git-tree-sha1 = "b058c72197546a5d9a852078974dada6a137185e" lazy = true [["trafalgar/problem-201-54427-pre.txt.bz2".download]] @@ -423,7 +423,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-201-54427-pre.txt.bz2" ["trafalgar/problem-206-54562-pre.txt.bz2"] -git-tree-sha1 = "1fac6d804e6c98d0df33b28acc982c30e55836de" +git-tree-sha1 = "4b7413a2fb4544d318d42cb4c5961d3559a830a1" lazy = true [["trafalgar/problem-206-54562-pre.txt.bz2".download]] @@ -431,7 +431,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-206-54562-pre.txt.bz2" ["trafalgar/problem-21-11315-pre.txt.bz2"] -git-tree-sha1 = "2af98b9359d4f7d517e4784b1cd64c750b4b876b" +git-tree-sha1 = "dc13397cd2bb332f5a875c4f4409a46585226dca" lazy = true [["trafalgar/problem-21-11315-pre.txt.bz2".download]] @@ -439,7 +439,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-21-11315-pre.txt.bz2" ["trafalgar/problem-215-55910-pre.txt.bz2"] -git-tree-sha1 = "81b358eff3217b2eddcae5bda69862bd5d333408" +git-tree-sha1 = "09b507ce8856ca7420c0867438ea2f6ccc4081a1" lazy = true [["trafalgar/problem-215-55910-pre.txt.bz2".download]] @@ -447,7 +447,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-215-55910-pre.txt.bz2" ["trafalgar/problem-225-57665-pre.txt.bz2"] -git-tree-sha1 = "8b2380d52960f45ad27b5f0f41ff388e79c1e0f8" +git-tree-sha1 = "ade4f1450c0812b40316c1b60818c047c5753593" lazy = true [["trafalgar/problem-225-57665-pre.txt.bz2".download]] @@ -455,7 +455,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-225-57665-pre.txt.bz2" ["trafalgar/problem-257-65132-pre.txt.bz2"] -git-tree-sha1 = "e2f5109c72871cc83f5e32b14ae90bfdc599a29c" +git-tree-sha1 = "cd6de24afb058ae3ddbc6bcd7c6dbaf018a930e3" lazy = true [["trafalgar/problem-257-65132-pre.txt.bz2".download]] @@ -463,7 +463,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-257-65132-pre.txt.bz2" ["trafalgar/problem-39-18060-pre.txt.bz2"] -git-tree-sha1 = "77d7d6954c9655d01ef61a46a8cadd377e5af82d" +git-tree-sha1 = "2d7a59d0c07c8aa132be6c3fa7a998e0040dc380" lazy = true [["trafalgar/problem-39-18060-pre.txt.bz2".download]] @@ -471,7 +471,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-39-18060-pre.txt.bz2" ["trafalgar/problem-50-20431-pre.txt.bz2"] -git-tree-sha1 = "4a0f3d0c4243f234659146f658a22a0a79e109a4" +git-tree-sha1 = "c6637c2c95d8a0ec7aa2900491bcaa489bfc27af" lazy = true [["trafalgar/problem-50-20431-pre.txt.bz2".download]] @@ -479,7 +479,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/trafalgar/problem-50-20431-pre.txt.bz2" ["venice/problem-1102-780462-pre.txt.bz2"] -git-tree-sha1 = "7faef0220ced708f59a332f73c972724a47b7192" +git-tree-sha1 = "e95ae564591152805ce5bfefac4906b6c4a937a7" lazy = true [["venice/problem-1102-780462-pre.txt.bz2".download]] @@ -487,7 +487,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/venice/problem-1102-780462-pre.txt.bz2" ["venice/problem-1158-802917-pre.txt.bz2"] -git-tree-sha1 = "c9d9cfdfe97d06932fa9529f353916614afc55fd" +git-tree-sha1 = "7736fabd0da359dc1dd6d4ad872fcf695f9b75ba" lazy = true [["venice/problem-1158-802917-pre.txt.bz2".download]] @@ -495,7 +495,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/venice/problem-1158-802917-pre.txt.bz2" ["venice/problem-1184-816583-pre.txt.bz2"] -git-tree-sha1 = "aeb2277394490d303ffaa1db7c2db70d8b1442ca" +git-tree-sha1 = "162f9ef39a4a52e88195b0e688db18f24ef5dc97" lazy = true [["venice/problem-1184-816583-pre.txt.bz2".download]] @@ -503,7 +503,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/venice/problem-1184-816583-pre.txt.bz2" ["venice/problem-1238-843534-pre.txt.bz2"] -git-tree-sha1 = "98222b3268992d33c85844b427653b70eb98f55e" +git-tree-sha1 = "f41b1eba354f375223ebe5a27c5c097c79c82aa9" lazy = true [["venice/problem-1238-843534-pre.txt.bz2".download]] @@ -511,7 +511,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/venice/problem-1238-843534-pre.txt.bz2" ["venice/problem-1288-866452-pre.txt.bz2"] -git-tree-sha1 = "0425a54973d1814a1eed8ea42ee3283abc2c21b4" +git-tree-sha1 = "08a56a03c863ac3ff205d4333e9f7644a11cb0c6" lazy = true [["venice/problem-1288-866452-pre.txt.bz2".download]] @@ -519,7 +519,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/venice/problem-1288-866452-pre.txt.bz2" ["venice/problem-1350-894716-pre.txt.bz2"] -git-tree-sha1 = "5b7e4bfea9d1941fcb25676b0592e34a4d4650ec" +git-tree-sha1 = "1e9b8af78b50cd16c194ebc166e52e727b0571c1" lazy = true [["venice/problem-1350-894716-pre.txt.bz2".download]] @@ -527,7 +527,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/venice/problem-1350-894716-pre.txt.bz2" ["venice/problem-1408-912229-pre.txt.bz2"] -git-tree-sha1 = "63acde23fca2cda10d741b2fcf9dc41ef2e6a59f" +git-tree-sha1 = "b0bb70cae7fc516da00a89054acc0f773129503e" lazy = true [["venice/problem-1408-912229-pre.txt.bz2".download]] @@ -535,7 +535,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/venice/problem-1408-912229-pre.txt.bz2" ["venice/problem-1778-993923-pre.txt.bz2"] -git-tree-sha1 = "0a9dd556de081783ba71f41c1a35bbd19991de41" +git-tree-sha1 = "ac608b53f1aae51fd4a98f1c4f3e950ce17214a6" lazy = true [["venice/problem-1778-993923-pre.txt.bz2".download]] @@ -543,7 +543,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/venice/problem-1778-993923-pre.txt.bz2" ["venice/problem-245-198739-pre.txt.bz2"] -git-tree-sha1 = "1a7abe1cceef8e15fc6947f76e052703451de45d" +git-tree-sha1 = "2971a0b6fa76b7b0e18a077c2cc17ed3b637c78d" lazy = true [["venice/problem-245-198739-pre.txt.bz2".download]] @@ -551,7 +551,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/venice/problem-245-198739-pre.txt.bz2" ["venice/problem-427-310384-pre.txt.bz2"] -git-tree-sha1 = "b54ad6497ab7ec0b67c2d69d12a3dfc5f2610500" +git-tree-sha1 = "06f61614c4cb41041c036d859d291c885c1f68e0" lazy = true [["venice/problem-427-310384-pre.txt.bz2".download]] @@ -559,7 +559,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/venice/problem-427-310384-pre.txt.bz2" ["venice/problem-52-64053-pre.txt.bz2"] -git-tree-sha1 = "f9aa5924012af6edec9809fdba37a1a34da750b1" +git-tree-sha1 = "0e8d2fbcfb9ad263b286c10d486372cbf5f1657b" lazy = true [["venice/problem-52-64053-pre.txt.bz2".download]] @@ -567,7 +567,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/venice/problem-52-64053-pre.txt.bz2" ["venice/problem-744-543562-pre.txt.bz2"] -git-tree-sha1 = "49573355706f857c8edf1729cb86ad9acae9356b" +git-tree-sha1 = "a5e077355edc8e607bb15b176dea69d53df1fc67" lazy = true [["venice/problem-744-543562-pre.txt.bz2".download]] @@ -575,7 +575,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/venice/problem-744-543562-pre.txt.bz2" ["venice/problem-89-110973-pre.txt.bz2"] -git-tree-sha1 = "568c555f3f2b44b4a6a13a8d6e0fb6eb5f284220" +git-tree-sha1 = "10218487b520306769cfb1df9ad37d8824574d0e" lazy = true [["venice/problem-89-110973-pre.txt.bz2".download]] @@ -583,7 +583,7 @@ lazy = true url = "https://grail.cs.washington.edu/projects/bal/data/venice/problem-89-110973-pre.txt.bz2" ["venice/problem-951-708276-pre.txt.bz2"] -git-tree-sha1 = "3ccf4e4f08da453dec278897fd5d26b4a402cc00" +git-tree-sha1 = "2dad356ae0a877d049fb5746c837e7d5cb999b1a" lazy = true [["venice/problem-951-708276-pre.txt.bz2".download]] diff --git a/src/BundleAdjustmentArtifactFunctions.jl b/src/BundleAdjustmentArtifactFunctions.jl index a3286bd..6b67229 100644 --- a/src/BundleAdjustmentArtifactFunctions.jl +++ b/src/BundleAdjustmentArtifactFunctions.jl @@ -2,15 +2,13 @@ import Base.SHA1, Pkg.PlatformEngines.download_verify export problems_df, fetch_ba_name, fetch_ba_group, delete_ba_artifact!, delete_all_ba_artifacts! -const ba_probs_jld2 = joinpath(@__DIR__, "..", "src", "ba_probs_df.jld2") - """ problems_df() Return a dataframe of the problems and their characteristics. """ function problems_df() - file = jldopen(ba_probs_jld2, "r") + file = jldopen(ba_jld2, "r") ba_probs = file["df"] close(file) return ba_probs @@ -65,7 +63,7 @@ function fetch_ba_name(name::AbstractString) loc = ba_ensure_artifact_installed( filename, artifact_name, - joinpath(@__DIR__, "..", "Artifacts.toml"), + ba_artifacts, ) return loc @@ -283,13 +281,8 @@ function delete_ba_artifact!(name::AbstractString) filename = get_filename(name) group = get_group(filename) - artifacts_toml = joinpath(@__DIR__, "..", "Artifacts.toml") - - meta = artifact_meta("$(group)/$(filename)", artifacts_toml) - - if meta === nothing - error("Cannot locate artifact '$(filename)' in '$(artifacts_toml)'") - end + meta = artifact_meta("$(group)/$(filename)", ba_artifacts) + (meta === nothing) && error("Cannot locate artifact '$(filename)' in '$(ba_artifacts)'") hash = SHA1(meta["git-tree-sha1"]) diff --git a/src/BundleAdjustmentModels.jl b/src/BundleAdjustmentModels.jl index 9ad3181..249abbb 100644 --- a/src/BundleAdjustmentModels.jl +++ b/src/BundleAdjustmentModels.jl @@ -3,6 +3,9 @@ module BundleAdjustmentModels using Pkg.Artifacts, Pkg.PlatformEngines, NLPModels, .Threads, CodecBzip2, SHA, DataFrames, JLD2, LinearAlgebra +const ba_jld2 = joinpath(@__DIR__, "ba_probs_df.jld2") +const ba_artifacts = joinpath(@__DIR__, "..", "Artifacts.toml") |> normpath + include("BundleAdjustmentProblemsList.jl") include("BundleAdjustmentNLSFunctions.jl") include("BundleAdjustmentArtifactFunctions.jl") diff --git a/utils/gen_artifacts_toml.jl b/utils/gen_artifacts_toml.jl index 2e84240..9dc071f 100644 --- a/utils/gen_artifacts_toml.jl +++ b/utils/gen_artifacts_toml.jl @@ -4,6 +4,7 @@ using Pkg.Artifacts using Pkg.PlatformEngines using SHA +import Pkg.GitTools.tree_hash import Base.SHA1 include("../src/BundleAdjustmentProblemsList.jl") @@ -15,39 +16,47 @@ const ba_url = "https://grail.cs.washington.edu/projects/bal/data" fails = String[] function sha256sum(path) - return open(path, "r") do io + open(path, "r") do io return bytes2hex(sha256(io)) end end +function ba_sha1(path) + return SHA1(tree_hash(path)) +end + lazybool = true forcebool = true +global k = 0 for probs_symbol ∈ ba_groups problems = eval(probs_symbol) group = string(probs_symbol) for problem ∈ problems + global k = k+1 url = "$ba_url/$group/$problem" - println(problem) - println(url) + @info "Problem $problem of the group $group -- $url" try problem_hash = artifact_hash("$group/$problem", artifact_toml) # If the name was not bound, or the hash it was bound to does not exist, create it! if problem_hash === nothing || !artifact_exists(problem_hash) - # create_artifact() returns the content-hash of the artifact directory once we're finished creating it - problem_hash = create_artifact() do artifact_dir - # We create the artifact by simply downloading a few files into the new artifact directory - println(joinpath(artifact_dir, "$problem")) - download("$url", joinpath(artifact_dir, "$problem")) - end + # download the artifact in a temporary folder and compute its sha256 + isdir("tmp_pb$k") && rm("tmp_pb$k", recursive=true, force=true) + mkdir("tmp_pb$k") + path_folder_artifact = joinpath(@__DIR__, "tmp_pb$k") + path_artifact = joinpath(path_folder_artifact, problem) + download(url, path_artifact) + hash_artifact = sha256sum(path_artifact) - path_artifact = artifact_path(problem_hash) - hash_artifact = sha256sum("$path_artifact/$problem") - remove_artifact(problem_hash) + # Extract the archive *.bz2 such that we can compute the git-tree-sha1 + run(`bzip2 -d $(path_artifact)`) + problem_hash = ba_sha1(path_folder_artifact) + rm("tmp_pb$k", recursive=true, force=true) - # Now bind that hash within our `Artifacts.toml`. `force = true` means that if it already exists, - # just overwrite with the new content-hash. Unless the source files change, we do not expect - # the content hash to change, so this should not cause unnecessary version control churn. + # Now bind that hash within our `Artifacts.toml`. + # `force = true` means that if it already exists, just overwrite with the new content-hash. + # Unless the source files change, we do not expect the content hash to change, + # so this should not cause unnecessary version control churn. bind_artifact!( artifact_toml, "$group/$problem",