Loading deepchem/hyperparameters/tests/test_tf_hyperparam_opt.py +4 −4 Original line number Diff line number Diff line Loading @@ -42,7 +42,7 @@ class TestTFHyperparamOptAPI(TestAPI): train_dataset, valid_dataset, _, transformers = self._featurize_train_test_split( splittype, compound_featurizers, complex_featurizers, input_transformers, output_transformers, input_file, tests) output_transformers, input_file, tasks) metric = Metric(metrics.matthews_corrcoef, np.mean) params_dict = {"activation": ["relu"], "momentum": [.9], Loading @@ -66,11 +66,11 @@ class TestTFHyperparamOptAPI(TestAPI): "num_classification_tasks": [len(task_types)] } def model_builder(task_types, params_dict, logdir, verbosity=None): def model_builder(tasks, task_types, params_dict, logdir, verbosity=None): return TensorflowModel( task_types, params_dict, logdir, tasks, task_types, params_dict, logdir, tf_class=TensorflowMultiTaskClassifier, verbosity=verbosity) self._hyperparam_opt(model_builder, params_dict, train_dataset, valid_dataset, output_transformers, task_types, valid_dataset, output_transformers, tasks, task_types, metric, logdir=self.model_dir) deepchem/models/test/test_singletask_to_multitask.py +3 −3 Original line number Diff line number Diff line Loading @@ -42,10 +42,10 @@ class TestSingletasktoMultitaskAPI(TestAPI): "data_shape": train_dataset.get_data_shape() } classification_metrics = [Metric(metrics.roc_auc_score)] def model_builder(task_types, model_params, model_builder, verbosity=None): return SklearnModel(task_types, model_params, model_builder, def model_builder(tasks, task_types, model_params, model_builder, verbosity=None): return SklearnModel(tasks, task_types, model_params, model_builder, model_instance=LogisticRegression()) multitask_model = SingletaskToMultitask(task_types, params_dict, multitask_model = SingletaskToMultitask(tasks, task_types, params_dict, self.model_dir, model_builder) self._create_model(train_dataset, test_dataset, multitask_model, output_transformers, classification_metrics) Loading
deepchem/hyperparameters/tests/test_tf_hyperparam_opt.py +4 −4 Original line number Diff line number Diff line Loading @@ -42,7 +42,7 @@ class TestTFHyperparamOptAPI(TestAPI): train_dataset, valid_dataset, _, transformers = self._featurize_train_test_split( splittype, compound_featurizers, complex_featurizers, input_transformers, output_transformers, input_file, tests) output_transformers, input_file, tasks) metric = Metric(metrics.matthews_corrcoef, np.mean) params_dict = {"activation": ["relu"], "momentum": [.9], Loading @@ -66,11 +66,11 @@ class TestTFHyperparamOptAPI(TestAPI): "num_classification_tasks": [len(task_types)] } def model_builder(task_types, params_dict, logdir, verbosity=None): def model_builder(tasks, task_types, params_dict, logdir, verbosity=None): return TensorflowModel( task_types, params_dict, logdir, tasks, task_types, params_dict, logdir, tf_class=TensorflowMultiTaskClassifier, verbosity=verbosity) self._hyperparam_opt(model_builder, params_dict, train_dataset, valid_dataset, output_transformers, task_types, valid_dataset, output_transformers, tasks, task_types, metric, logdir=self.model_dir)
deepchem/models/test/test_singletask_to_multitask.py +3 −3 Original line number Diff line number Diff line Loading @@ -42,10 +42,10 @@ class TestSingletasktoMultitaskAPI(TestAPI): "data_shape": train_dataset.get_data_shape() } classification_metrics = [Metric(metrics.roc_auc_score)] def model_builder(task_types, model_params, model_builder, verbosity=None): return SklearnModel(task_types, model_params, model_builder, def model_builder(tasks, task_types, model_params, model_builder, verbosity=None): return SklearnModel(tasks, task_types, model_params, model_builder, model_instance=LogisticRegression()) multitask_model = SingletaskToMultitask(task_types, params_dict, multitask_model = SingletaskToMultitask(tasks, task_types, params_dict, self.model_dir, model_builder) self._create_model(train_dataset, test_dataset, multitask_model, output_transformers, classification_metrics)
