Merging cpuonly and openmponly versions of clamr