Skip to content

Commit

Permalink
Merge pull request #449 from ironmussa/develop
Browse files Browse the repository at this point in the history
Update version, spark, tensorflow and keras
  • Loading branch information
FavioVazquez authored Feb 4, 2019
2 parents ec63cca + 0fb6a3b commit 2fb3f9a
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion optimus/dl/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import os
os.environ['PYSPARK_SUBMIT_ARGS'] = '--packages databricks:spark-deep-learning:1.2.0-spark2.3-s_2.11 pyspark-shell'
os.environ['PYSPARK_SUBMIT_ARGS'] = '--packages databricks:spark-deep-learning:1.5.0-spark2.4-s_2.11 pyspark-shell'
2 changes: 1 addition & 1 deletion optimus/optimus.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def __init__(self, master="local[*]", app_name="optimus", checkpoint=False, path

if dl is True:
self._add_spark_packages(
["databricks:spark-deep-learning:1.2.0-spark2.3-s_2.11", "com.databricks:spark-avro_2.11:4.0.0"])
["databricks:spark-deep-learning:1.5.0-spark2.4-s_2.11", "com.databricks:spark-avro_2.11:4.0.0"])

self._start_session()

Expand Down
2 changes: 1 addition & 1 deletion optimus/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ def _safe_int(string):
return string


__version__ = '2.1.4'
__version__ = '2.1.5'
VERSION = tuple(_safe_int(x) for x in __version__.split('.'))
4 changes: 2 additions & 2 deletions requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ setuptools==40.6.3
pyarrow==0.10.0
tabulate==0.8.2
Jinja2==2.10
tensorflow==1.10.0
keras==2.2.2
tensorflow==1.12.0
keras==2.2.4
pillow==5.3.0
pygments>=2.2.0
six>=1.10.0
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ setuptools==40.6.3
pyarrow==0.10.0
tabulate==0.8.2
Jinja2==2.10
tensorflow==1.10.0
keras==2.2.2
tensorflow==1.12.0
keras==2.2.4
pillow==5.3.0
pygments>=2.2.0
six>=1.10.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def readme():
author='Favio Vazquez and Argenis Leon',
author_email='[email protected]',
url='https://github.com/ironmussa/Optimus/',
download_url='https://github.com/ironmussa/Optimus/archive/2.1.4.tar.gz',
download_url='https://github.com/ironmussa/Optimus/archive/2.1.5.tar.gz',
description=('Optimus is the missing framework for cleaning and pre-processing data in a distributed fashion with '
'pyspark.'),
long_description=readme(),
Expand Down

0 comments on commit 2fb3f9a

Please sign in to comment.