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

sintel-dev · Jan 31, 2023 · 5bab060 · 5bab060
2 parents fafe86b + 5f5e1f9
commit 5bab060
Show file tree

Hide file tree

Showing 12 changed files with 3,993 additions and 46 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -33,7 +33,7 @@ jobs:
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8]
-        os: [ubuntu-latest]
+        os: [ubuntu-20.04]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
@@ -51,7 +51,7 @@ 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 }}
@@ -69,7 +69,7 @@ jobs:
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8]
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-20.04, macos-latest, windows-latest]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
@@ -87,7 +87,7 @@ 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 }}
@@ -105,7 +105,7 @@ jobs:
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8]
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-20.04, macos-latest, windows-latest]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,15 @@
 History
 =======
 
+## 0.4.1 - 2023-01-31
+
+### Issues resolved
+
+* Move VAE from sandbox to verified – [Issue #377](https://github.com/signals-dev/Orion/issues/377) by @sarahmish
+* Pin ``opencv`` – [Issue #372](https://github.com/signals-dev/Orion/issues/372) by @sarahmish
+* Pin ``scikit-learn`` – [Issue #367](https://github.com/signals-dev/Orion/issues/367) by @sarahmish
+* Fix VAE documentation – [Issue #360](https://github.com/signals-dev/Orion/issues/360) by @sarahmish
+
 ## 0.4.0 - 2022-11-08
 
 This version introduces several new enhancements:

diff --git a/README.md b/README.md
@@ -130,11 +130,12 @@ We run the benchmark on **11** datasets with their known grounth truth. We recor
 
 | Pipeline                  |  Outperforms ARIMA |
 |---------------------------|--------------------|
-| AER                       |         11         |
-| TadGAN                    |          8         |
-| LSTM Dynamic Thresholding |          7         |
-| LSTM Autoencoder          |          7         |
+| AER                       |         10         |
+| TadGAN                    |          7         |
+| LSTM Dynamic Thresholding |          8         |
+| LSTM Autoencoder          |          6         |
 | Dense Autoencoder         |          6         |
+| VAE                       |          6         |
 | Azure                     |          0         |
 
 

diff --git a/benchmark/leaderboard.md b/benchmark/leaderboard.md
@@ -1,8 +1,9 @@
 | Pipeline                  |  Outperforms ARIMA |
 |---------------------------|--------------------|
-| AER					    |          11        |
-| TadGAN					|          8         |
-| LSTM Dynamic Thresholding |          7         |
-| LSTM Autoencoder			|          7         |
+| AER					    |          10        |
+| TadGAN					|          7         |
+| LSTM Dynamic Thresholding |          8         |
+| LSTM Autoencoder			|          6         |
 | Dense Autoencoder			|          6         |
+| VAE					    |          6         |
 | Azure						|          0         |
diff --git a/benchmark/leaderboard.xlsx b/benchmark/leaderboard.xlsx
diff --git a/benchmark/results/0.4.0.csv b/benchmark/results/0.4.0.csv
diff --git a/docs/user_guides/primitives_pipelines/primitives/VAE.rst b/docs/user_guides/primitives_pipelines/primitives/VAE.rst
@@ -1,7 +1,7 @@
 .. highlight:: shell
 
 VAE
-~~~~~~
+~~~
 
 **path**: ``orion.primitives.vae.VAE``
 
@@ -39,10 +39,9 @@ argument                    type                description
 **output**
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
- ``y``                  ``numpy.ndarray``   predicted values
+ ``y``                      ``numpy.ndarray``   predicted values
 ========================== =================== =================================================================================================
 
-
 .. ipython:: python
     :okwarning:
 

diff --git a/orion/__init__.py b/orion/__init__.py
@@ -2,7 +2,7 @@
 
 __author__ = """MIT Data To AI Lab"""
 __email__ = 'dailabmit@gmail.com'
-__version__ = '0.4.0'
+__version__ = '0.4.1.dev1'
 
 import os
 

diff --git a/orion/benchmark.py b/orion/benchmark.py
@@ -45,7 +45,7 @@
 
 VERIFIED_PIPELINES = [
     'arima', 'lstm_dynamic_threshold', 'azure', 'tadgan',
-    'aer', 'lstm_autoencoder', 'dense_autoencoder'
+    'aer', 'lstm_autoencoder', 'dense_autoencoder', 'vae'
 ]
 
 VERIFIED_PIPELINES_GPU = {
@@ -55,7 +55,8 @@
     'tadgan': 'tadgan_without_dropout_gpu',
     'aer': 'aer',
     'lstm_autoencoder': 'lstm_autoencoder_gpu',
-    'dense_autoencoder': 'dense_autoencoder'
+    'dense_autoencoder': 'dense_autoencoder',
+    'vae': 'vae'
 }
 
 

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.0
+current_version = 0.4.1.dev1
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\d+))?

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
     'mlprimitives>=0.3.2,<0.4',
     'numpy>=1.17.4,<1.19',
     'pandas>=1,<2',
-    'scikit-learn>=0.22',
+    'scikit-learn>=0.22,<1.2',
     'tabulate>=0.8.3,<0.9',
     'numba>=0.48,<0.52',
     'pyts>=0.9,<0.11',
@@ -122,6 +122,6 @@
     test_suite='tests',
     tests_require=tests_require,
     url='https://github.com/sintel-dev/Orion',
-    version='0.4.0',
+    version='0.4.1.dev1',
     zip_safe=False,
 )
diff --git a/tests/requirement_files/latest_requirements.txt b/tests/requirement_files/latest_requirements.txt
@@ -1,33 +1,33 @@
 absl-py==1.3.0
 astunparse==1.6.3
-attrs==22.1.0
+attrs==22.2.0
 azure-cognitiveservices-anomalydetector==0.3.0
 azure-common==1.1.28
-azure-core==1.26.0
+azure-core==1.26.1
 beautifulsoup4==4.11.1
-botocore==1.28.4
+botocore==1.29.37
 cachetools==5.2.0
-certifi==2022.9.24
+certifi==2022.12.7
 charset-normalizer==2.1.1
 click==7.1.2
 cloudpickle==2.2.0
-coverage==6.5.0
+coverage==7.0.1
 dask==2022.2.0
 distributed==2022.2.0
-exceptiongroup==1.0.0
+exceptiongroup==1.1.0
 featuretools==0.22.0
-fsspec==2022.10.0
+fsspec==2022.11.0
 gast==0.3.3
-google-auth==2.13.0
+google-auth==2.15.0
 google-auth-oauthlib==0.4.6
 google-pasta==0.2.0
 graphviz==0.20.1
-grpcio==1.50.0
+grpcio==1.51.1
 h5py==2.10.0
 HeapDict==1.0.1
 idna==3.4
-imageio==2.22.2
-importlib-metadata==5.0.0
+imageio==2.23.0
+importlib-metadata==5.2.0
 iniconfig==1.1.1
 invoke==1.7.3
 iso639==0.1.4
@@ -49,35 +49,34 @@ mlprimitives==0.3.2
 msgpack==1.0.4
 msrest==0.7.1
 networkx==2.6.3
-nltk==3.7
+nltk==3.8
 numba==0.51.2
 numpy==1.18.5
 oauthlib==3.2.2
 opencv-python==4.6.0.66
 opt-einsum==3.3.0
-orion-ml==0.3.3.dev0
-packaging==21.3
+orion-ml==0.4.1.dev0
+packaging==22.0
 pandas==1.3.5
 partd==1.3.0
 patsy==0.5.3
 Pillow==9.3.0
 pluggy==1.0.0
-prompt-toolkit==3.0.31
-protobuf==3.19.6
-psutil==5.9.3
+prompt-toolkit==3.0.36
+protobuf==3.20.3
+psutil==5.9.4
 pyasn1==0.4.8
 pyasn1-modules==0.2.8
 Pygments==2.13.0
-pyparsing==3.0.9
 pytest==7.2.0
 pytest-cov==4.0.0
 python-dateutil==2.8.2
 python-louvain==0.13
 pyts==0.10.0
-pytz==2022.5
+pytz==2022.7
 PyWavelets==1.3.0
 PyYAML==6.0
-regex==2022.9.13
+regex==2022.10.31
 requests==2.28.1
 requests-oauthlib==1.3.1
 rsa==4.9
@@ -92,24 +91,24 @@ soupsieve==2.3.2.post1
 statsmodels==0.12.2
 tabulate==0.8.10
 tblib==1.7.0
-tensorboard==2.10.1
+tensorboard==2.11.0
 tensorboard-data-server==0.6.1
 tensorboard-plugin-wit==1.8.1
 tensorflow==2.3.4
 tensorflow-estimator==2.3.0
-termcolor==2.1.0
+termcolor==2.1.1
 threadpoolctl==3.1.0
 tifffile==2021.11.2
 tomli==2.0.1
 toolz==0.12.0
 tornado==6.2
 tqdm==4.64.1
 typing_extensions==4.4.0
-urllib3==1.26.12
+urllib3==1.26.13
 wcwidth==0.2.5
 Werkzeug==2.2.2
 wrapt==1.14.1
 xgboost==0.90
 XlsxWriter==3.0.3
 zict==2.2.0
-zipp==3.10.0
+zipp==3.11.0