Britain's Cameron Norrie also made it to the quarter-finals in Geneva after seeing opponent Tomas Machac retire injured during the third set.