TypeError: switch argument was for hp.choice nodes with numpy >= 1.20 #949

TypeError: ('switch argument was', 0)
  File "hyperopt/pyll/base.py", line 863, in rec_eval
    raise TypeError("switch argument was", switch_i)

if isinstance(switch_i, np.ndarray):
    switch_i = switch_i.item()
if isinstance(switch_i, int):   # fails for np.int64 bare scalars
    ...
else:
    raise TypeError("switch argument was", switch_i)

import numpy as np
print(np.__version__)          # e.g. 1.26.4
print(isinstance(np.int64(0), int))  # False — this is the core issue

from hyperopt import fmin, tpe, hp, STATUS_OK

space = {'layers': hp.choice('layers', [1, 2, 3])}
fmin(fn=lambda p: {'loss': p['layers'], 'status': STATUS_OK},
     space=space, algo=tpe.suggest, max_evals=5)
# Raises: TypeError: ('switch argument was', 0)

# Before:
                if isinstance(switch_i, np.ndarray):
                    switch_i = switch_i.item()
                if isinstance(switch_i, int):

# After:
                if isinstance(switch_i, np.ndarray):
                    switch_i = switch_i.item()
                if isinstance(switch_i, np.integer):
                    switch_i = int(switch_i)
                if isinstance(switch_i, int):