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 gpu-optimization in 4 minutes and 52 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #103661
gpu docker
lint:python3

00:00:45

passed #103662
gpu docker
test:python3

00:02:19

 
  Install
passed #103663
gpu docker
install:python3

00:00:56

 
  Pack
passed #103664
gpu docker
pack:python3

00:00:50