fix conflicts with GPU specification using new style parameters
fix conflicts with GPU specification using new style parameters

clab/cnn,clab/cnn,clab/dynet,shuheik/dynet,danielhers/dynet,shuheik/dynet,shuheik/dynet,shuheik/dynet,chunyang-wen/dynet,chunyang-wen/dynet,chunyang-wen/dynet,clab/dynet,shuheik/dynet,shuheik/dynet,shuheik/dynet,clab/cnn,danielhers/dynet,danielhers/dynet,danielhers/dynet,danielhers/dynet,clab/dynet,danielhers/dynet,chunyang-wen/dynet,clab/dynet,danielhers/dynet,clab/dynet,clab/dynet,clab/dynet