Update dev branch to use PyTorch 1.8 prerelease #2753

fritzo · 2021-01-27T20:47:28Z

@fehiepsi , @neerajprad could one of you review general changes?
@stefanwebb could you take a look at the flows changes?

This pins our dev branch to track the latest PyTorch 1.8 nightly build, and fixes Pyro to be compatible with PyTorch 1.8.

This may be inconvenient for advanced users who use Pyro's dev branch, but it will help minimize breakage around the upcoming PyTorch 1.8 release by allowing us to release Pyro faster.

Tested

added test_distributions.py::test_support_shape
added test_distributions.py::test_is_discrete and is_not_discrete
xfailed some collapse tests; these will be fixed by Add a Distribution.infer_shapes() method to statically infer shapes #2739

fritzo · 2021-02-11T17:56:37Z

pyro/distributions/transforms/cholesky.py

@@ -87,8 +84,6 @@ class CholeskyTransform(Transform):
    positive definite matrix.
    """
    bijective = True
-    sign = +1


note .sign is defined only for scalar transforms, not multivariate transforms

fritzo · 2021-02-11T18:06:10Z

tests/distributions/conftest.py

-                {'d': 3, 'eta': [1.], 'test_data':
-                    [[[1.0000,  0.0000,  0.0000], [-0.8221,  0.5693,  0.0000], [0.7655,   0.1756,  0.6190]],
-                     [[1.0000,  0.0000,  0.0000], [-0.5345,  0.8451,  0.0000], [-0.5459, -0.3847,  0.7444]],
-                     [[1.0000,  0.0000,  0.0000], [-0.3758,  0.9267,  0.0000], [-0.2409,  0.4044,  0.8823]],
-                     [[1.0000,  0.0000,  0.0000], [-0.8800,  0.4750,  0.0000], [-0.9493,  0.1546,  0.2737]],
-                     [[1.0000,  0.0000,  0.0000], [0.2284,   0.9736,  0.0000], [-0.1283,  0.0451,  0.9907]]]},
-                ]),
+                {
+                    'd': 3,
+                    'eta': [1.],
+                    'test_data': [
+                        [[1.0, 0.0, 0.0],
+                         [-0.17332135, 0.98486533, 0.0],
+                         [0.43106407, -0.54767312, 0.71710384]],
+                        [[1.0, 0.0, 0.0],
+                         [-0.31391555, 0.94945091, 0.0],
+                         [-0.31391296, -0.29767500, 0.90158097]],
+                    ],
+                },
+            ]),


the old low-precision test data was failing the new test_support_shape, so I created new data

fritzo · 2021-02-19T14:20:44Z

@fehiepsi @neerajprad can we discuss this today? This PR is blocking development on pyro.distributions (#2739, #2766, ...)

pyro/distributions/conjugate.py

neerajprad · 2021-02-20T01:59:26Z

pyro/distributions/lkj.py

 from pyro.distributions.torch import Beta, TransformedDistribution
 from pyro.distributions.torch_distribution import TorchDistribution
 from pyro.distributions.transforms.cholesky import CorrMatrixCholeskyTransform, _vector_to_l_cholesky

+from . import constraints


We should have LKJ in pytorch now, so we can remove this file.

It looks like PyTorch has an LKJCholesky but neither an LKJ nor an LKJCorrCholesky. When I try to replace Pyro's LKJCorrCholesky with PyTorch's LKJCholesk the test_lkj.py tests fail. The code is quite different.

@fehiepsi do you understand the differences between these distributions, and can you suggest a deprecation plan?

Hmm..LkJCholesky and LKJCorrCholesky should be the same except that the sampling method should be more efficient. I think we can merge this for now and I'll take a look at the tests to see why that is failing.

tests/distributions/test_lkj.py

neerajprad

LGTM. Thanks for making this change, @fritzo.

fritzo · 2021-02-22T18:30:49Z

@neerajprad thanks for reviewing! I'm happy merging this now and resolving LKJ differences in a follow-up PR. WDYT?

neerajprad · 2021-02-22T18:34:37Z

That sounds great. I'll take a look at the LKJ distribution differences after this PR merges.

Balandat · 2021-02-23T02:23:00Z

Hmm is this binary actually available (yet, or still)? I am getting the following, both in a fresh local conda installation on my mac, as well as in CI:

ERROR: Could not find a version that satisfies the requirement torch>=1.8.0.dev20210210 (from pyro-ppl)
ERROR: No matching distribution found for torch>=1.8.0.dev20210210

Balandat · 2021-02-23T02:23:44Z

Hmm ok I see from the readme that this requires manual install of the pytorch nightly.

I still get the following on linux though:

pip install --pre torch==1.8.0.dev20210210 torchvision==0.9.0.dev20210210 -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html

ERROR: Could not find a version that satisfies the requirement torchvision==0.9.0.dev20210210
ERROR: No matching distribution found for torchvision==0.9.0.dev20210210

fritzo · 2021-02-23T13:36:47Z

@Balandat In linux you could try adding +cpu suffixes:

pip install --pre torch==1.8.0.dev20210210+cpu torchvision==0.9.0.dev20210210+cpu -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html

And please let me know if you can suggest a better option for depending on PyTorch 1.8 prerelease.

fritzo added 3 commits January 27, 2021 15:37

Update to PyTorch nightly

a4afd43

Update README.md

25cbfc1

Commit to PyTorch nightly on dev branch

649e00a

fritzo added the discussion label Jan 27, 2021

fritzo requested a review from neerajprad January 27, 2021 20:47

This was referenced Jan 28, 2021

Upgrade to PyTorch 1.8 #2754

Closed

Bump to version 1.5.2 #2755

Merged

fritzo added breaking WIP and removed discussion breaking labels Jan 28, 2021

fritzo force-pushed the pytorch-nightly branch from cf2a76c to 649e00a Compare January 29, 2021 20:43

fritzo mentioned this pull request Feb 3, 2021

Fix Delta.arg_constraints and .support #2759

Merged

fritzo added 3 commits February 11, 2021 08:46

Merge branch 'dev' into pytorch-nightly

6ca82a7

Fix constraint bugs

bfbe8a5

Relax torchvision version

53cbf30

fritzo added this to the 1.6 release milestone Feb 11, 2021

fritzo added 5 commits February 11, 2021 10:21

Fix CorrCholesky constraint and test data

3dca80d

Fix funsor bugs

d34ce73

Try harder to generate positive data

604fe53

xfail; switch to torch_test channel

e1a7e4e

Fix versions

3b37c97

fritzo changed the title ~~Track PyTorch nightly in Pyro's dev branch~~ Track PyTorch 1.8 test release in Pyro's dev branch Feb 11, 2021

fritzo added the high priority label Feb 11, 2021

fritzo changed the title ~~Track PyTorch 1.8 test release in Pyro's dev branch~~ Track PyTorch 1.8 nightly in Pyro's dev branch Feb 11, 2021

Pin to fixed nightly version

4ec4981

fritzo changed the title ~~Track PyTorch 1.8 nightly in Pyro's dev branch~~ Pin dev branch to use PyTorch 1.8 prerelease Feb 11, 2021

fritzo added 2 commits February 11, 2021 11:15

lint

20381df

xfail some funsor tests

699659a

fritzo removed the WIP label Feb 11, 2021

fritzo added the awaiting review label Feb 11, 2021

fritzo requested review from stefanwebb, fehiepsi and neerajprad and removed request for neerajprad February 11, 2021 17:47

fritzo removed the high priority label Feb 11, 2021

fritzo commented Feb 11, 2021

View reviewed changes

Remove accidental file

93e9287

fritzo commented Feb 11, 2021

View reviewed changes

fritzo changed the title ~~Pin dev branch to use PyTorch 1.8 prerelease~~ Update dev branch to use PyTorch 1.8 prerelease Feb 11, 2021

fritzo mentioned this pull request Feb 12, 2021

Switch to testing with Pyro master branch pyro-ppl/funsor#460

Merged

fritzo mentioned this pull request Feb 19, 2021

Stabilize autoguide scale parameters via SoftplusTransform #2767

Merged

neerajprad reviewed Feb 20, 2021

View reviewed changes

neerajprad approved these changes Feb 22, 2021

View reviewed changes

neerajprad merged commit 1f02392 into dev Feb 22, 2021

fritzo mentioned this pull request Feb 22, 2021

Deprecate LKJCorrCholesky distribution #2771

Merged

fritzo deleted the pytorch-nightly branch September 27, 2021 14:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Update dev branch to use PyTorch 1.8 prerelease #2753

Update dev branch to use PyTorch 1.8 prerelease #2753

Uh oh!

fritzo commented Jan 27, 2021 •

edited

Loading

Uh oh!

fritzo Feb 11, 2021 •

edited

Loading

Uh oh!

fritzo Feb 11, 2021

Uh oh!

fritzo commented Feb 19, 2021

Uh oh!

Uh oh!

neerajprad Feb 20, 2021

Uh oh!

fritzo Feb 22, 2021

Uh oh!

neerajprad Feb 22, 2021

Uh oh!

Uh oh!

neerajprad left a comment

Uh oh!

fritzo commented Feb 22, 2021

Uh oh!

neerajprad commented Feb 22, 2021

Uh oh!

Balandat commented Feb 23, 2021

Uh oh!

Balandat commented Feb 23, 2021 •

edited

Loading

Uh oh!

fritzo commented Feb 23, 2021 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Update dev branch to use PyTorch 1.8 prerelease #2753

Update dev branch to use PyTorch 1.8 prerelease #2753

Uh oh!

Conversation

fritzo commented Jan 27, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Tested

Uh oh!

fritzo Feb 11, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fritzo Feb 11, 2021

Choose a reason for hiding this comment

Uh oh!

fritzo commented Feb 19, 2021

Uh oh!

Uh oh!

neerajprad Feb 20, 2021

Choose a reason for hiding this comment

Uh oh!

fritzo Feb 22, 2021

Choose a reason for hiding this comment

Uh oh!

neerajprad Feb 22, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

neerajprad left a comment

Choose a reason for hiding this comment

Uh oh!

fritzo commented Feb 22, 2021

Uh oh!

neerajprad commented Feb 22, 2021

Uh oh!

Balandat commented Feb 23, 2021

Uh oh!

Balandat commented Feb 23, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fritzo commented Feb 23, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

fritzo commented Jan 27, 2021 •

edited

Loading

fritzo Feb 11, 2021 •

edited

Loading

Balandat commented Feb 23, 2021 •

edited

Loading

fritzo commented Feb 23, 2021 •

edited

Loading