Deformations and Clustering Correlations in p- and sd-Shell Nuclei Using the Gogny and Skyrme Interactions