An intra prediction method comprises receiving input data of a current block in a current picture, determines a current mode set including multiple intra prediction modes for the current block, derives a number of MPMs from the number of intra prediction modes in the current mode set, and determines the MPMs for the current block. The number of MPMs varies with the number of intra prediction modes in the current mode set. The method encodes or decodes the current block according to a current intra prediction mode selected from the current mode set. To process a non-square block, a current mode set is selected from multiple mode sets according to one or both of a longer side and a shorter side of the non-square block. A current intra prediction mode is selected from the current mode set and the non-square block is coded according to the current intra prediction mode.