diff --git a/README.md b/README.md index 1bb4d18a4..05a2c9db5 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ where the configuration file below can be downloaded [here](https://raw.githubus te_d: caltech # domain name of test domain tpath: examples/tasks/task_vlcs.py # python file path to specify the task bs: 2 # batch size -model: dann_diva # specify model +model: dann_diva # combine model DANN with DIVA epos: 1 # number of epochs trainer: mldg_dial # combine trainer MLDG and DIAL gamma_y: 700000.0 # hyperparameter of diva diff --git a/domainlab/algos/builder_erm.py b/domainlab/algos/builder_erm.py index 4d7ddf933..253339cbb 100644 --- a/domainlab/algos/builder_erm.py +++ b/domainlab/algos/builder_erm.py @@ -8,7 +8,7 @@ from domainlab.algos.observers.b_obvisitor import ObVisitor from domainlab.algos.trainers.zoo_trainer import TrainerChainNodeGetter from domainlab.compos.zoo_nn import FeatExtractNNBuilderChainNodeGetter -from domainlab.models.model_deep_all import mk_erm +from domainlab.models.model_erm import mk_erm from domainlab.utils.utils_cuda import get_device diff --git a/domainlab/models/model_deep_all.py b/domainlab/models/model_erm.py similarity index 100% rename from domainlab/models/model_deep_all.py rename to domainlab/models/model_erm.py diff --git a/examples/nets/transformer.py b/examples/nets/transformer.py index 70c6c9c39..557d842c9 100644 --- a/examples/nets/transformer.py +++ b/examples/nets/transformer.py @@ -8,7 +8,7 @@ from domainlab.mk_exp import mk_exp from domainlab.tasks import get_task -from domainlab.models.model_deep_all import mk_erm +from domainlab.models.model_erm import mk_erm class VIT(nn.Module): diff --git a/pyproject.toml b/pyproject.toml index f752bd73e..ccb088d6a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "domainlab" -version = "0.4.1" +version = "0.4.2" readme = "README.md" repository = "https://github.com/marrlab/DomainLab" homepage = "https://marrlab.github.io/DomainLab/" diff --git a/setup.py b/setup.py index a09faad3e..a164fffb4 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ def copy_dir(dir_path="zdata"): package_data = { 'zdata': [f for f in copy_dir()], }, - version='0.4.1', + version='0.4.2', description='Library of modular domain generalization for deep learning', url='https://github.com/marrlab/DomainLab', author='Xudong Sun, et.al.', diff --git a/tests/test_mk_exp_deepall.py b/tests/test_mk_exp_deepall.py index 7e53f3315..6b645e755 100644 --- a/tests/test_mk_exp_deepall.py +++ b/tests/test_mk_exp_deepall.py @@ -8,7 +8,7 @@ from domainlab.mk_exp import mk_exp from domainlab.dsets.dset_mnist_color_solo_default import DsetMNISTColorSoloDefault from domainlab.tasks.task_dset import mk_task_dset -from domainlab.models.model_deep_all import mk_erm +from domainlab.models.model_erm import mk_erm from domainlab.tasks.utils_task import ImSize diff --git a/tests/test_msel_oracle.py b/tests/test_msel_oracle.py index 81832352b..245ea2b4d 100644 --- a/tests/test_msel_oracle.py +++ b/tests/test_msel_oracle.py @@ -9,7 +9,7 @@ from domainlab.algos.msels.c_msel_oracle import MSelOracleVisitor from domainlab.algos.msels.c_msel_val import MSelValPerf from domainlab.algos.observers.b_obvisitor import ObVisitor -from domainlab.models.model_deep_all import mk_erm +from domainlab.models.model_erm import mk_erm from domainlab.utils.utils_cuda import get_device from domainlab.arg_parser import mk_parser_main from domainlab.exp.exp_main import Exp