DIY macro blowing away downstream version of diy

We use diy downstream. Having a #define diy vtkmdiy does blows away the local diy so it is not possible to have them in the same compilation unit.