Genome is one full set of chromosomes, so haploid is the correct number. This was the first time I saw anyone suggesting the diploid amount of DNA as genome size. Wonder how one would handle the mitochondrial genome using that approach? The number of them varies greatly, though I guess their share is about 1% only.