Patch DIVA for CPU-based local reproduction#6

Ndiatenda wants to merge 16 commits into

AMLab-Amsterdam:masterAMLab-Amsterdam/DIVA:masterfrom

Ndiatenda:baseline-divaNdiatenda/DIVA-REPRODUCTION:baseline-divaCopy head branch name to clipboard