Reverted some of the previous changes due to errors. Updated some of the tests...

Reverted some of the previous changes due to errors. Updated some of the tests so that CPU versions can pass as well.

Signed-off-by: Jan André Reuter <jan.andre.reuter@hotmail.de>
4 jobs for v2.0.0-rc1 in 3 minutes and 6 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #103665
gpu docker
lint:python3

00:00:45

passed #103666
gpu docker
test:python3

00:02:20

 
  Install
canceled #103667
gpu docker
install:python3

 
  Pack
canceled #103668
gpu docker
pack:python3