ddi-fw 0.0.199__tar.gz → 0.0.201__tar.gz

{ddi_fw-0.0.199 → ddi_fw-0.0.201}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddi_fw
-Version: 0.0.199
+Version: 0.0.201
 Summary: Do not use :)
 Author-email: Kıvanç Bayraktar <bayraktarkivanc@gmail.com>
 Maintainer-email: Kıvanç Bayraktar <bayraktarkivanc@gmail.com>

{ddi_fw-0.0.199 → ddi_fw-0.0.201}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ddi_fw"
-version = "0.0.199"
+version = "0.0.201"
 description = "Do not use :)"
 readme = "README.md"
 authors = [

{ddi_fw-0.0.199 → ddi_fw-0.0.201}/src/ddi_fw/datasets/core.py

@@ -95,6 +95,8 @@ class BaseDataset(BaseModel, abc.ABC):
             for index, column in enumerate(self.columns):
                 train_data, test_data = self.X_train[:,
                                                      index], self.X_test[:, index]
+                #TODO üstteki satır ile alttaki tek satır olsun, tolist() ile numpy array'e çevrilmesin, numpy array zaten ama uyarı verdiği için böyle
+                train_data,test_data = np.stack(train_data.tolist()), np.stack(test_data.tolist()
                 items.append([f'{column}', np.nan_to_num(train_data),
                               y_train_label, np.nan_to_num(test_data), y_test_label])
 

{ddi_fw-0.0.199 → ddi_fw-0.0.201}/src/ddi_fw/ml/ml_helper.py

@@ -99,23 +99,25 @@ class MultiModalRunner:
                         self.train_idx_arr, self.val_idx_arr, train_data, train_label, test_data, test_label)
                 else:
                     raise Exception("check configurations")
-            else: # TODO default model maybe?
-                print("Default model will be used")
-                name = self.default_model.get('name')
-                # input_type = m.get('input_type')
-                input = self.default_model.get('input')
-                inputs = self.default_model.get('inputs')
-                model_type = get_import(self.default_model.get("model_type"))
-                kwargs = self.default_model.get('params')
+                logs, metrics, prediction = single_modal.fit_and_evaluate()
+                self.result.add_metric(name, metrics)
+                single_results[name] = prediction
+        else: # TODO default model maybe?
+            print("Default model will be used")
+            name = self.default_model.get('name')
+            # input_type = m.get('input_type')
+            model_type = get_import(self.default_model.get("model_type"))
+            kwargs = self.default_model.get('params')
+            for item in self.items:
+                T = self.__create_model(self.library)
                 single_modal = T(self.date, name, model_type,
                                 use_mlflow=self.use_mlflow,  **kwargs)
-                item = self.items[0]
                 single_modal.set_data(
                         self.train_idx_arr, self.val_idx_arr, item[1], item[2], item[3], item[4])
 
-            logs, metrics, prediction = single_modal.fit_and_evaluate()
-            self.result.add_metric(name, metrics)
-            single_results[name] = prediction
+                logs, metrics, prediction = single_modal.fit_and_evaluate()
+                self.result.add_metric(name, metrics)
+                single_results[name] = prediction
 
     def predict(self, combinations: list = [], generate_combinations=False):
         self.prefix = utils.utc_time_as_string()

{ddi_fw-0.0.199 → ddi_fw-0.0.201}/src/ddi_fw.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddi_fw
-Version: 0.0.199
+Version: 0.0.201
 Summary: Do not use :)
 Author-email: Kıvanç Bayraktar <bayraktarkivanc@gmail.com>
 Maintainer-email: Kıvanç Bayraktar <bayraktarkivanc@gmail.com>