Skip to content

Commit 94d7be3

Browse files
committed
Actually, we don't need explicit calls to display inside these notebooks except in the one existing case where display(choicemap) is not the last line of the cell 🙂
1 parent ec34fc2 commit 94d7be3

10 files changed

+134
-100
lines changed

Manifest.toml

Lines changed: 93 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
# This file is machine-generated - editing it directly is not advised
22

33
[[Arpack]]
4-
deps = ["BinaryProvider", "Libdl", "LinearAlgebra"]
5-
git-tree-sha1 = "cd64c112638582ba4f0be9c3e20656499c508565"
4+
deps = ["Arpack_jll", "Libdl", "LinearAlgebra"]
5+
git-tree-sha1 = "2ff92b71ba1747c5fdd541f8fc87736d82f40ec9"
66
uuid = "7d9fca2a-8960-54d3-9f78-7d1dccf2cb97"
7-
version = "0.3.2"
7+
version = "0.4.0"
8+
9+
[[Arpack_jll]]
10+
deps = ["Libdl", "OpenBLAS_jll", "Pkg"]
11+
git-tree-sha1 = "68a90a692ddc0eb72d69a6993ca26e2a923bf195"
12+
uuid = "68821587-b530-5797-8361-c406ea357684"
13+
version = "3.5.0+2"
814

915
[[Base64]]
1016
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -22,16 +28,16 @@ uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
2228
version = "0.5.8"
2329

2430
[[Blosc]]
25-
deps = ["BinaryProvider", "CMakeWrapper", "Compat", "Libdl"]
26-
git-tree-sha1 = "71fb23581e1f0b0ae7be8ccf0ebfb3600e23ca41"
31+
deps = ["BinaryProvider", "CMakeWrapper", "Libdl"]
32+
git-tree-sha1 = "9981f1795919b8f770dc064fe733ba09c2e7c7a9"
2733
uuid = "a74b3585-a348-5f62-a45c-50e91977d574"
28-
version = "0.5.1"
34+
version = "0.6.0"
2935

3036
[[CMake]]
3137
deps = ["BinDeps"]
32-
git-tree-sha1 = "c67a8689dc5444adc5eb2be7d837100340ecba11"
38+
git-tree-sha1 = "50a8b41d2c562fccd9ab841085fc7d1e2706da82"
3339
uuid = "631607c0-34d2-5d66-819e-eb0f9aa2061a"
34-
version = "1.1.2"
40+
version = "1.2.0"
3541

3642
[[CMakeWrapper]]
3743
deps = ["BinDeps", "CMake", "Libdl", "Parameters", "Test"]
@@ -63,11 +69,17 @@ git-tree-sha1 = "ed2c4abadf84c53d9e58510b5fc48912c2336fbb"
6369
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
6470
version = "2.2.0"
6571

72+
[[CompilerSupportLibraries_jll]]
73+
deps = ["Libdl", "Pkg"]
74+
git-tree-sha1 = "7c4f882c41faa72118841185afc58a2eb00ef612"
75+
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
76+
version = "0.3.3+0"
77+
6678
[[Conda]]
6779
deps = ["JSON", "VersionParsing"]
68-
git-tree-sha1 = "9a11d428dcdc425072af4aea19ab1e8c3e01c032"
80+
git-tree-sha1 = "7a58bb32ce5d85f8bf7559aa7c2842f9aecf52fc"
6981
uuid = "8f4d0f93-b110-5947-807f-2305c1781a2d"
70-
version = "1.3.0"
82+
version = "1.4.1"
7183

7284
[[DataAPI]]
7385
git-tree-sha1 = "674b67f344687a88310213ddfa8a2b3c76cc4252"
@@ -76,15 +88,15 @@ version = "1.1.0"
7688

7789
[[DataDeps]]
7890
deps = ["HTTP", "Reexport", "SHA"]
79-
git-tree-sha1 = "795b99df0963831ddeefbe9ac05721ffd9475c04"
91+
git-tree-sha1 = "f2be642d7a94e7f0cabcd2106fee4c6715d452d1"
8092
uuid = "124859b0-ceae-595e-8997-d05f6a7a8dfe"
81-
version = "0.7.1"
93+
version = "0.7.2"
8294

8395
[[DataStructures]]
8496
deps = ["InteractiveUtils", "OrderedCollections"]
85-
git-tree-sha1 = "b7720de347734f4716d1815b00ce5664ed6bbfd4"
97+
git-tree-sha1 = "73eb18320fe3ba58790c8b8f6f89420f0a622773"
8698
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
87-
version = "0.17.9"
99+
version = "0.17.11"
88100

89101
[[Dates]]
90102
deps = ["Printf"]
@@ -102,9 +114,9 @@ version = "1.0.2"
102114

103115
[[DiffRules]]
104116
deps = ["NaNMath", "Random", "SpecialFunctions"]
105-
git-tree-sha1 = "10dca52cf6d4a62d82528262921daf63b99704a2"
117+
git-tree-sha1 = "eb0c34204c8410888844ada5359ac8b96292cfd1"
106118
uuid = "b552c78f-8df3-52c6-915a-8e097449b14b"
107-
version = "1.0.0"
119+
version = "1.0.1"
108120

109121
[[Distributed]]
110122
deps = ["Random", "Serialization", "Sockets"]
@@ -118,18 +130,18 @@ version = "0.22.4"
118130

119131
[[FileIO]]
120132
deps = ["Pkg"]
121-
git-tree-sha1 = "74585bf1f7ed7259e166011e89f49363d7fa89a6"
133+
git-tree-sha1 = "3d7cb2c4c850439f19c4d6d3fbe1dce6481cddb1"
122134
uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
123-
version = "1.2.1"
135+
version = "1.2.4"
124136

125137
[[FileWatching]]
126138
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
127139

128140
[[FillArrays]]
129141
deps = ["LinearAlgebra", "Random", "SparseArrays"]
130-
git-tree-sha1 = "fec413d4fc547992eb62a5c544cedb6d7853c1f5"
142+
git-tree-sha1 = "3eb5253af6186eada40de3df524a1c10f0c6bfa2"
131143
uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
132-
version = "0.8.4"
144+
version = "0.8.6"
133145

134146
[[FixedPointNumbers]]
135147
git-tree-sha1 = "4aaea64dd0c30ad79037084f8ca2b94348e65eaa"
@@ -138,15 +150,14 @@ version = "0.7.1"
138150

139151
[[ForwardDiff]]
140152
deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"]
141-
git-tree-sha1 = "88b082d492be6b63f967b6c96b352e25ced1a34c"
153+
git-tree-sha1 = "869540e4367122fbffaace383a5bdc34d6e5e5ac"
142154
uuid = "f6369f11-7733-5829-9624-2563aa707210"
143-
version = "0.10.9"
155+
version = "0.10.10"
144156

145157
[[FunctionWrappers]]
146-
deps = ["Compat"]
147-
git-tree-sha1 = "49bf793ebd37db5adaa7ac1eae96c2c97ec86db5"
158+
git-tree-sha1 = "e4813d187be8c7b993cb7f85cbf2b7bfbaadc694"
148159
uuid = "069b7b12-0de2-55c6-9aab-29f3d0a68a2e"
149-
version = "1.0.0"
160+
version = "1.1.1"
150161

151162
[[FunctionalCollections]]
152163
deps = ["Test"]
@@ -162,7 +173,7 @@ version = "0.5.1"
162173

163174
[[Gen]]
164175
deps = ["DataStructures", "Distributions", "FunctionalCollections", "JSON", "LinearAlgebra", "MacroTools", "Random", "ReverseDiff", "SpecialFunctions"]
165-
git-tree-sha1 = "8b1686eca997088b31541e4a2b92d479bf2de24d"
176+
git-tree-sha1 = "e8a12d045fe36dfddb7e2019f42d8179ae6f2b3f"
166177
repo-rev = "master"
167178
repo-url = "https://github.com/probcomp/Gen"
168179
uuid = "ea4f424c-a589-11e8-07c0-fd5c91b9da4a"
@@ -192,15 +203,15 @@ version = "0.12.5"
192203

193204
[[HTTP]]
194205
deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"]
195-
git-tree-sha1 = "5c49dab19938b119fe204fd7d7e8e174f4e9c68b"
206+
git-tree-sha1 = "cd60d9a575d3b70c026d7e714212fd4ecf86b4bb"
196207
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
197-
version = "0.8.8"
208+
version = "0.8.13"
198209

199210
[[IJulia]]
200211
deps = ["Base64", "Conda", "Dates", "InteractiveUtils", "JSON", "Markdown", "MbedTLS", "Pkg", "Printf", "REPL", "Random", "SoftGlobalScope", "Test", "UUIDs", "ZMQ"]
201-
git-tree-sha1 = "468b6290cd10ed30732fde36207c64034386c5ef"
212+
git-tree-sha1 = "b60c883405f31b90c5a7b6862e1d21caad5b411a"
202213
uuid = "7073ff75-c697-5162-941a-fcdaad2a7d2a"
203-
version = "1.21.0"
214+
version = "1.21.1"
204215

205216
[[IniFile]]
206217
deps = ["Test"]
@@ -225,10 +236,9 @@ uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
225236
version = "0.21.0"
226237

227238
[[LaTeXStrings]]
228-
deps = ["Compat"]
229-
git-tree-sha1 = "7ab9b8788cfab2bdde22adf9004bda7ad9954b6c"
239+
git-tree-sha1 = "de44b395389b84fd681394d4e8d39ef14e3a2ea8"
230240
uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
231-
version = "1.0.3"
241+
version = "1.1.0"
232242

233243
[[LegacyStrings]]
234244
deps = ["Compat"]
@@ -237,6 +247,7 @@ uuid = "1b4a561d-cfcb-5daf-8433-43fcf8b4bea3"
237247
version = "0.4.1"
238248

239249
[[LibGit2]]
250+
deps = ["Printf"]
240251
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
241252

242253
[[Libdl]]
@@ -256,20 +267,20 @@ uuid = "eb30cadb-4394-5ae3-aed4-317e484a6458"
256267
version = "0.4.0"
257268

258269
[[MacroTools]]
259-
deps = ["DataStructures", "Markdown", "Random"]
260-
git-tree-sha1 = "07ee65e03e28ca88bc9a338a3726ae0c3efaa94b"
270+
deps = ["Markdown", "Random"]
271+
git-tree-sha1 = "f7d2e3f654af75f01ec49be82c231c382214223a"
261272
uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
262-
version = "0.5.4"
273+
version = "0.5.5"
263274

264275
[[Markdown]]
265276
deps = ["Base64"]
266277
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
267278

268279
[[MbedTLS]]
269-
deps = ["BinaryProvider", "Dates", "Distributed", "Libdl", "Random", "Sockets", "Test"]
270-
git-tree-sha1 = "2d94286a9c2f52c63a16146bb86fd6cdfbf677c6"
280+
deps = ["BinaryProvider", "Dates", "Libdl", "Random", "Sockets"]
281+
git-tree-sha1 = "85f5947b53c8cfd53ccfa3f4abae31faa22c2181"
271282
uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
272-
version = "0.6.8"
283+
version = "0.7.0"
273284

274285
[[Missings]]
275286
deps = ["DataAPI"]
@@ -285,6 +296,18 @@ git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f"
285296
uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
286297
version = "0.3.3"
287298

299+
[[OpenBLAS_jll]]
300+
deps = ["Libdl", "Pkg"]
301+
git-tree-sha1 = "72163ef83570d258af87ed91f301c5b51a5e08e9"
302+
uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
303+
version = "0.3.9+0"
304+
305+
[[OpenSpecFun_jll]]
306+
deps = ["CompilerSupportLibraries_jll", "Libdl", "Pkg"]
307+
git-tree-sha1 = "d51c416559217d974a1113522d5919235ae67a87"
308+
uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
309+
version = "0.5.3+3"
310+
288311
[[OrderedCollections]]
289312
deps = ["Random", "Serialization", "Test"]
290313
git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1"
@@ -293,9 +316,9 @@ version = "1.1.0"
293316

294317
[[PDMats]]
295318
deps = ["Arpack", "LinearAlgebra", "SparseArrays", "SuiteSparse", "Test"]
296-
git-tree-sha1 = "5f303510529486bb02ac4d70da8295da38302194"
319+
git-tree-sha1 = "2fc6f50ddd959e462f0a2dbc802ddf2a539c6e35"
297320
uuid = "90014a1f-27ba-587c-ab20-58faa44d9150"
298-
version = "0.9.11"
321+
version = "0.9.12"
299322

300323
[[Parameters]]
301324
deps = ["OrderedCollections"]
@@ -305,12 +328,12 @@ version = "0.12.0"
305328

306329
[[Parsers]]
307330
deps = ["Dates", "Test"]
308-
git-tree-sha1 = "d112c19ccca00924d5d3a38b11ae2b4b268dda39"
331+
git-tree-sha1 = "75d07cb840c300084634b4991761886d0d762724"
309332
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
310-
version = "0.3.11"
333+
version = "1.0.1"
311334

312335
[[Pkg]]
313-
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
336+
deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
314337
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
315338

316339
[[Printf]]
@@ -357,15 +380,21 @@ version = "1.0.1"
357380

358381
[[ReverseDiff]]
359382
deps = ["DiffResults", "DiffRules", "ForwardDiff", "FunctionWrappers", "LinearAlgebra", "NaNMath", "Random", "SpecialFunctions", "StaticArrays", "Statistics"]
360-
git-tree-sha1 = "6a5aae862f93c577f89a607334f09630439ec119"
383+
git-tree-sha1 = "5f7dafd314ff2ada3076797b1edfb71e52151cb9"
361384
uuid = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
362-
version = "1.0.0"
385+
version = "1.1.0"
363386

364387
[[Rmath]]
365-
deps = ["BinaryProvider", "Libdl", "Random", "Statistics"]
366-
git-tree-sha1 = "2bbddcb984a1d08612d0c4abb5b4774883f6fa98"
388+
deps = ["Random", "Rmath_jll"]
389+
git-tree-sha1 = "86c5647b565873641538d8f812c04e4c9dbeb370"
367390
uuid = "79098fc4-a85e-5d69-aa6a-4863f24498fa"
368-
version = "0.6.0"
391+
version = "0.6.1"
392+
393+
[[Rmath_jll]]
394+
deps = ["Libdl", "Pkg"]
395+
git-tree-sha1 = "1660f8fefbf5ab9c67560513131d4e933012fc4b"
396+
uuid = "f50d1b31-88e8-58de-be2c-1cc44531875f"
397+
version = "0.2.2+0"
369398

370399
[[SHA]]
371400
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
@@ -397,10 +426,10 @@ deps = ["LinearAlgebra", "Random"]
397426
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
398427

399428
[[SpecialFunctions]]
400-
deps = ["BinDeps", "BinaryProvider", "Libdl"]
401-
git-tree-sha1 = "3bdd374b6fd78faf0119b8c5d538788dbf910c6e"
429+
deps = ["OpenSpecFun_jll"]
430+
git-tree-sha1 = "e19b98acb182567bcb7b75bb5d9eedf3a3b5ec6c"
402431
uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
403-
version = "0.8.0"
432+
version = "0.10.0"
404433

405434
[[StaticArrays]]
406435
deps = ["LinearAlgebra", "Random", "Statistics"]
@@ -420,12 +449,12 @@ version = "0.32.0"
420449

421450
[[StatsFuns]]
422451
deps = ["Rmath", "SpecialFunctions"]
423-
git-tree-sha1 = "79982835d2ff3970685cb704500909c94189bde9"
452+
git-tree-sha1 = "f290ddd5fdedeadd10e961eb3f4d3340f09d030a"
424453
uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
425-
version = "0.9.3"
454+
version = "0.9.4"
426455

427456
[[SuiteSparse]]
428-
deps = ["Libdl", "LinearAlgebra", "SparseArrays"]
457+
deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"]
429458
uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9"
430459

431460
[[Test]]
@@ -451,7 +480,13 @@ uuid = "81def892-9a0e-5fdd-b105-ffc91e053289"
451480
version = "1.2.0"
452481

453482
[[ZMQ]]
454-
deps = ["BinaryProvider", "FileWatching", "Libdl", "Sockets"]
455-
git-tree-sha1 = "5d7d4aec57689992f08672e5ff459bde7d105abd"
483+
deps = ["FileWatching", "Sockets", "ZeroMQ_jll"]
484+
git-tree-sha1 = "adb2d52aa12c8284da12714f35d2b21fc3d5b2bb"
456485
uuid = "c2297ded-f4af-51ae-bb23-16f91089e4e1"
457-
version = "1.1.0"
486+
version = "1.2.0"
487+
488+
[[ZeroMQ_jll]]
489+
deps = ["Libdl", "Pkg"]
490+
git-tree-sha1 = "d24fc0004686b534cc7518412b626deeea0b0208"
491+
uuid = "8f1865be-045e-5c20-9c9f-bfbfb0764568"
492+
version = "4.3.2+1"

tutorials/A Bottom-Up Introduction to Gen.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
"source": [
443443
"using Gen: get_choices\n",
444444
"\n",
445-
"display(get_choices(trace))"
445+
"get_choices(trace)"
446446
]
447447
},
448448
{
@@ -1151,15 +1151,15 @@
11511151
],
11521152
"metadata": {
11531153
"kernelspec": {
1154-
"display_name": "Julia 1.1.1",
1154+
"display_name": "Julia 1.4.0",
11551155
"language": "julia",
1156-
"name": "julia-1.1"
1156+
"name": "julia-1.4"
11571157
},
11581158
"language_info": {
11591159
"file_extension": ".jl",
11601160
"mimetype": "application/julia",
11611161
"name": "julia",
1162-
"version": "1.1.1"
1162+
"version": "1.4.0"
11631163
}
11641164
},
11651165
"nbformat": 4,

tutorials/Data-Driven Proposals in Gen.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@
479479
"outputs": [],
480480
"source": [
481481
"(proposed_choices, _, _) = Gen.propose(custom_dest_proposal, (measurements, scene))\n",
482-
"display(proposed_choices)"
482+
"proposed_choices"
483483
]
484484
},
485485
{
@@ -1492,15 +1492,15 @@
14921492
],
14931493
"metadata": {
14941494
"kernelspec": {
1495-
"display_name": "Julia 1.1.1",
1495+
"display_name": "Julia 1.4.0",
14961496
"language": "julia",
1497-
"name": "julia-1.1"
1497+
"name": "julia-1.4"
14981498
},
14991499
"language_info": {
15001500
"file_extension": ".jl",
15011501
"mimetype": "application/julia",
15021502
"name": "julia",
1503-
"version": "1.1.1"
1503+
"version": "1.4.0"
15041504
}
15051505
},
15061506
"nbformat": 4,

0 commit comments

Comments
 (0)