notwa/thursday
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move imports of candidates into init script

Browse source
This commit is contained in:
Connor Olding 2023-05-07 06:16:08 -07:00
parent fe290b4311
commit a8595d2616
2 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
thursday/candidates/__init__.py Normal file
View file

@ -0,0 +1,43 @@
from .dlib import dlib_cube
from .evolopy import make_evolopy
from .nevergrad import NEVERGRAD2_OPTIMIZERS
from .nlopt import nlopt_neldermead_cube
from .fcmaes import (
make_biteopt,
make_csma,
make_fcmaes,
make_crfmnes,
# make_lde,
make_da,
make_gclde,
make_lclde,
)
from .notwa import make_birect, make_mercury, make_soo
from .random import another_random_cube, quasirandom_cube
from .scipy import (
make_shgo,
scipy_basinhopping_cube,
scipy_bfgs_2j_cube,
scipy_bfgs_3j_cube,
scipy_cg_2j_cube,
scipy_cg_3j_cube,
scipy_cobyla_cube,
scipy_direct_cube,
scipy_direct_l_cube,
# scipy_dogleg_cube,
scipy_lbfgsb_2j_cube,
scipy_lbfgsb_3j_cube,
scipy_neldermead_cube,
# scipy_newtoncg_cube,
scipy_powell_cube,
scipy_slsqp_2j_cube,
scipy_slsqp_3j_cube,
scipy_tnc_2j_cube,
scipy_tnc_3j_cube,
scipy_trustconstr_2j_cube,
scipy_trustconstr_3j_cube,
# scipy_trustexact_2j_cube,
# scipy_trustexact_3j_cube,
# scipy_trustkrylov_cube,
# scipy_trustncg_cube,
)

45
thursday/notwacube.py
View file

@ -1,48 +1,5 @@
from .candidates.dlib import dlib_cube
from .candidates.evolopy import make_evolopy
from .candidates.nevergrad import NEVERGRAD2_OPTIMIZERS
from .candidates.nlopt import nlopt_neldermead_cube
from .candidates.fcmaes import (
make_biteopt,
make_csma,
make_fcmaes,
make_crfmnes,
# make_lde,
make_da,
make_gclde,
make_lclde,
)
from .candidates.notwa import make_birect, make_mercury, make_soo
from .candidates.random import another_random_cube, quasirandom_cube
from .candidates.scipy import (
make_shgo,
scipy_basinhopping_cube,
scipy_bfgs_2j_cube,
scipy_bfgs_3j_cube,
scipy_cg_2j_cube,
scipy_cg_3j_cube,
scipy_cobyla_cube,
scipy_direct_cube,
scipy_direct_l_cube,
# scipy_dogleg_cube,
scipy_lbfgsb_2j_cube,
scipy_lbfgsb_3j_cube,
scipy_neldermead_cube,
# scipy_newtoncg_cube,
scipy_powell_cube,
scipy_slsqp_2j_cube,
scipy_slsqp_3j_cube,
scipy_tnc_2j_cube,
scipy_tnc_3j_cube,
scipy_trustconstr_2j_cube,
scipy_trustconstr_3j_cube,
# scipy_trustexact_2j_cube,
# scipy_trustexact_3j_cube,
# scipy_trustkrylov_cube,
# scipy_trustncg_cube,
)
from . import tinytweaks as tt
from .candidates import *
BASELINE_OPTIMIZERS = [
another_random_cube,