diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b1e97add..e0c863cc 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,7 +9,6 @@ the below items: - [ ] Code is [PEP8](https://www.python.org/dev/peps/pep-0008/) - [ ] I'm making the PR to `master` - [ ] I've updated the versions based on [Semantic Versioning](https://semver.org/) - - [ ] `setup.py` - [ ] `talos/__init__.py` - [ ] `docs/index.html` - [ ] `docs/_coverpage.md` diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88d97d38..6a88f46a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: strategy: max-parallel: 9 matrix: - python-version: [3.7, 3.8] + python-version: ['3.9', '3.10', '3.11'] os: [ubuntu-latest, macos-latest] steps: @@ -33,7 +33,7 @@ jobs: - name: Tests run: | export MPLBACKEND=agg - pip install tensorflow>=2.0 + pip install tensorflow==2.14.1 pip install coveralls coverage run --source=talos ./test-ci.py - name: Coverage diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 21f2f01d..afef4e0c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,11 +16,11 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install setuptools wheel twine + pip install hatch - name: Build and publish env: - TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }} run: | - python setup.py sdist bdist_wheel - twine upload dist/* + hatch build + hatch publish --user __token__ --auth $PYPI_API_TOKEN + diff --git a/.gitignore b/.gitignore index a58fe15d..fc4ba81f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ talos.egg-info *.npy test.sh .vscode -.test_* \ No newline at end of file +test_*/ +test/ \ No newline at end of file diff --git a/docs/Examples_Generator.md b/docs/Examples_Generator.md index 32826327..003d4514 100644 --- a/docs/Examples_Generator.md +++ b/docs/Examples_Generator.md @@ -83,8 +83,8 @@ return out, model ### Parameter Dictionary ```python p = {'activation':['relu', 'elu'], - 'optimizer': ['AdaDelta'], - 'losses': ['logcosh'], + 'optimizer': ['Adam'], + 'losses': ['LogCosh'], 'shapes': ['brick'], 'first_neuron': [32], 'dropout': [.2, .3], diff --git a/docs/Examples_Generator_Code.md b/docs/Examples_Generator_Code.md index 010a53cd..d0c8cde5 100644 --- a/docs/Examples_Generator_Code.md +++ b/docs/Examples_Generator_Code.md @@ -36,8 +36,8 @@ def mnist_model(x_train, y_train, x_val, y_val, params): return out, model p = {'activation':['relu', 'elu'], - 'optimizer': ['AdaDelta'], - 'losses': ['logcosh'], + 'optimizer': ['Adam'], + 'losses': ['LogCosh'], 'shapes': ['brick'], 'first_neuron': [32], 'dropout': [.2, .3], diff --git a/docs/Examples_PyTorch.md b/docs/Examples_PyTorch.md index dc8d468e..1ad48723 100644 --- a/docs/Examples_PyTorch.md +++ b/docs/Examples_PyTorch.md @@ -138,8 +138,8 @@ return net, net.parameters() ```python p = {'activation':['relu', 'elu'], - 'optimizer': ['Nadam', 'Adam'], - 'losses': ['logcosh'], + 'optimizer': ['Adagrad', 'Adam'], + 'losses': ['LogCosh'], 'hidden_layers':[0, 1, 2], 'batch_size': (20, 50, 5), 'epochs': [10, 20]} diff --git a/docs/Examples_PyTorch_Code.md b/docs/Examples_PyTorch_Code.md index bc697299..480185b8 100644 --- a/docs/Examples_PyTorch_Code.md +++ b/docs/Examples_PyTorch_Code.md @@ -106,8 +106,8 @@ def breast_cancer(x_train, y_train, x_val, y_val, params): p = {'activation':['relu', 'elu'], - 'optimizer': ['Nadam', 'Adam'], - 'losses': ['logcosh'], + 'optimizer': ['Adagrad', 'Adam'], + 'losses': ['LogCosh'], 'hidden_layers':[0, 1, 2], 'batch_size': (20, 50, 5), 'epochs': [10, 20]} diff --git a/docs/Examples_Typical.md b/docs/Examples_Typical.md index 8cbe9e94..e4ffe973 100644 --- a/docs/Examples_Typical.md +++ b/docs/Examples_Typical.md @@ -55,8 +55,8 @@ return out, model ### Parameter Dictionary ```python p = {'activation':['relu', 'elu'], - 'optimizer': ['Nadam', 'Adam'], - 'losses': ['logcosh'], + 'optimizer': ['Adagrad', 'Adam'], + 'losses': ['LogCosh'], 'hidden_layers':[0, 1, 2], 'batch_size': (20, 50, 5), 'epochs': [10, 20]} diff --git a/docs/Examples_Typical_Code.md b/docs/Examples_Typical_Code.md index 72bf4214..11a3528a 100644 --- a/docs/Examples_Typical_Code.md +++ b/docs/Examples_Typical_Code.md @@ -31,7 +31,7 @@ def iris_model(x_train, y_train, x_val, y_val, params): # set the parameter space boundaries p = {'activation':['relu', 'elu'], - 'optimizer': ['Nadam', 'Adam'], + 'optimizer': ['Adagrad', 'Adam'], 'losses': ['categorical_crossentropy'], 'epochs': [100, 200], 'batch_size': [4, 6, 8]} diff --git a/docs/Hidden_Layers.md b/docs/Hidden_Layers.md index e59b9509..62b65e14 100644 --- a/docs/Hidden_Layers.md +++ b/docs/Hidden_Layers.md @@ -18,8 +18,8 @@ When hidden layers are used, `dropout`, `shapes`, `hidden_layers`, and `first_ne ```python p = {'activation':['relu', 'elu'], - 'optimizer': ['Nadam', 'Adam'], - 'losses': ['logcosh'], + 'optimizer': ['Adagrad', 'Adam'], + 'losses': ['LogCosh'], 'shapes': ['brick'], # <<< required 'first_neuron': [32, 64], # <<< required 'hidden_layers':[0, 1, 2], # <<< required diff --git a/docs/_coverpage.md b/docs/_coverpage.md index 0e1635c2..463ba67f 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -1,6 +1,6 @@ ![logo](_media/talos_logo_bg.png) -## v1.3.3 +## v1.4 > Hyperparameter Experiments with Tensorflow, PyTorch and Keras diff --git a/docs/index.html b/docs/index.html index 7b917bff..a6f97f90 100644 --- a/docs/index.html +++ b/docs/index.html @@ -16,7 +16,7 @@