Base -> blocks and minor changes in cuda-convnet