asmjit.dll binary interface conflict with the one bundled with Pytorch 1.5 (Windows only)

[mlamarre]

Using Windows, miniconda, Python 3.7, Pytorch 1.5.

Pytorch 1.4 works fine, this issue came up with the release of 1.5. Pytorch updated asmjit. Pytorch's asmjit.dll version is no longer binary compatible with Mitsuba's version.

Importing torch or mitsuba alone works fine. Issue is for scripts that need to use both.

Repro steps

conda install pytorch=1.5 -c pytorch

>>> import torch
>>> import mitsuba
[ large traceback boils down to]
ImportError: DLL load failed: The specified procedure could not be found.

Trying in the opposite order

>>>import mitsuba
>>>import torch
[ large traceback boils down to]
OSError: [WinError 127] The specified procedure could not be found

I get the following pop-up (but pop-up on windows depends on many things so this part might not be reproducible)

Compared the binary interface of both dlls with a tool and the binary interface changed a lot.

On Linux (Ubuntu) there's no issue since pytorch doesn't install libasmjit.so in the environment.