updated nvidia #define's
ifdefs around waveform_as_feature