make release-tag: Merge branch 'master' into stable

Author: sarahmish

.github/workflows/tests.yml

@@ -12,11 +12,11 @@ jobs:
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8]
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-20.04, macos-latest]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install package
@@ -29,11 +29,11 @@ jobs:
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8]
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-20.04, macos-latest]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install package and dependencies
@@ -46,11 +46,11 @@ jobs:
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8]
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-20.04, macos-latest]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install package and dependencies

HISTORY.md

@@ -1,5 +1,15 @@
 # History
 
+## 0.3.3 - 2023-01-20
+
+### General Imporvements
+
+* Update dependencies - [Issue #276](https://github.com/MLBazaar/MLPrimitives/issues/276) by @sarahmish
+
+### Adapter Improvements
+
+* Building model within fit in keras adapter- [Issue #267](https://github.com/MLBazaar/MLPrimitives/issues/267) by @sarahmish
+
 ## 0.3.2 - 2021-11-09
 
 ### Adapter Improvements

mlprimitives/__init__.py

@@ -4,7 +4,7 @@
 
 __author__ = 'MIT Data To AI Lab'
 __email__ = '[email protected]'
-__version__ = '0.3.2'
+__version__ = '0.3.3.dev1'
 
 import os
 

mlprimitives/adapters/keras.py

@@ -72,6 +72,7 @@ def __init__(self, layers, loss, optimizer, classification, callbacks=tuple(),
         self.validation_split = validation_split
         self.batch_size = batch_size
         self.shuffle = shuffle
+        self._fitted = False
 
         for callback in callbacks:
             callback['class'] = import_object(callback['class'])
@@ -99,9 +100,10 @@ def _augment_hyperparameters(self, X, mode, kwargs):
         return kwargs
 
     def fit(self, X, y, **kwargs):
-        self._augment_hyperparameters(X, 'input', kwargs)
-        self._augment_hyperparameters(y, 'target', kwargs)
-        self.model = self._build_model(**kwargs)
+        if not self._fitted:
+            self._augment_hyperparameters(X, 'input', kwargs)
+            self._augment_hyperparameters(y, 'target', kwargs)
+            self.model = self._build_model(**kwargs)
 
         if self.classification:
             y = keras.utils.to_categorical(y)
@@ -115,6 +117,8 @@ def fit(self, X, y, **kwargs):
                        validation_split=self.validation_split, batch_size=self.batch_size,
                        shuffle=self.shuffle)
 
+        self._fitted = True
+
     def predict(self, X):
         y = self.model.predict(X, batch_size=self.batch_size, verbose=self.verbose)
 

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.2
+current_version = 0.3.3.dev1
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\d+))?

setup.py

@@ -21,7 +21,7 @@
     'networkx>=2.0,<3',
     'nltk>=3.3,<4',
     'numpy<1.21.0,>=1.16.0',
-    'opencv-python>=3.4.0.12,<5',
+    'opencv-python>=3.4.0.12,<4.7',
     'pandas>=1,<2',
     'python-louvain>=0.10,<0.14',   # community
     'scikit-image>=0.15',
@@ -30,6 +30,7 @@
     'statsmodels>=0.9.0,<0.13',
     'tensorflow>=2,<2.5',
     'xgboost>=0.72.1,<1',
+    'protobuf<4',
 ]
 
 
@@ -55,6 +56,8 @@
     'sphinx_rtd_theme>=0.2.4,<0.5',
     'docutils>=0.14,<0.18',
     'ipython>=6.5.0',
+    'mistune>=0.7,<2',
+    'Jinja2>=2,<3.1',
 
     # style check
     'flake8>=3.7.7,<4',
@@ -63,6 +66,7 @@
     # fix style issues
     'autoflake>=1.1,<2',
     'autopep8>=1.4.3,<2',
+    'importlib-metadata<5',
 
     # distribute on PyPI
     'twine>=1.10.0,<4',
@@ -118,6 +122,6 @@
     test_suite='tests',
     tests_require=tests_require,
     url='https://github.com/MLBazaar/MLPrimitives',
-    version='0.3.2',
+    version='0.3.3.dev1',
     zip_safe=False,
 )