Merge pull request #1573 from nouiz/fix_test

fix test following the removing of set_flops.
Fix pickling of GpuConv op due to not completly removing set_flops last time.