As of August when we were there, Building 18 and Building 38 were smoking-optional. ie: Not every room in each building is smoking, just certain groups of rooms.
We had 1815 which was smoking, and an absolutely perfect location for ease of access to bus stops, food court, quiet pool, etc.
Hope it helps.