merge caffe_set definitions; define for int as well