Skip to content

Commit

Permalink
Relax pyarrow and pandas pinning (#358)
Browse files Browse the repository at this point in the history
* Update README to clarify GPU installation procedure

* Relax pandas and pyarrow pins
  • Loading branch information
jclay authored Jan 8, 2021
1 parent fe449f1 commit 65c112f
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ def precommit_container_name = "pymapd-precommit-$BUILD_NUMBER"
def db_cuda_container_image = "omnisci/core-os-cuda-dev:master"
def db_cpu_container_image = "omnisci/core-os-cpu-dev:master"
def db_container_name = "pymapd-db-$BUILD_NUMBER"
def testscript_container_image = "rapidsai/rapidsai:0.16-cuda11.0-base-ubuntu18.04-py3.7"
def testscript_container_image = "rapidsai/rapidsai:0.15-cuda11.0-base-ubuntu18.04-py3.7"
def testscript_container_name = "pymapd-pytest-$BUILD_NUMBER"
def stage_succeeded
def git_commit
Expand Down
13 changes: 9 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,25 @@ pymapd
A python `DB API`_ compliant interface for `OmniSci`_ (formerly MapD). See the
`documentation`_ for more.

Quick Install
-------------
Quick Install (CPU)
-------------------

Packages are available on conda-forge and PyPI::

conda install -c conda-forge pymapd

pip install pymapd

To install cudf for GPU Dataframe support (conda-only)::
Quick Install (GPU)
-------------------

conda install -c nvidia/label/cuda10.0 -c rapidsai/label/cuda10.0 -c numba -c conda-forge -c defaults cudf pymapd
We recommend creating a fresh conda 3.7 or 3.8 environment when installing
pymapd with GPU capabilities.

To install pymapd and cudf for GPU Dataframe support (conda-only)::

conda create -n omnisci-gpu -c rapidsai -c nvidia -c conda-forge \
-c defaults cudf=0.15 python=3.7 cudatoolkit=10.2 pymapd

.. _DB API: https://www.python.org/dev/peps/pep-0249/
.. _OmniSci: https://www.omnisci.com/
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ channels:
- defaults
dependencies:
- thrift=0.13.0
- pyarrow==0.17.1.*
- pandas==1.1.*
- pyarrow<=2.0
- pandas
- python >=3.7.0,<3.9
# related: https://github.com/conda-forge/pillow-feedstock/issues/73
- libtiff=4.0.10
Expand Down
5 changes: 3 additions & 2 deletions environment_gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ dependencies:
- thrift=0.13.0
- cudf=0.15
- cudatoolkit=11.0
- pyarrow==0.17.1.*
- pandas==1.1.*
- python >=3.7.0,<3.9
- pyarrow<=2.0
- pandas
- python>3.6.6,<3.9
# related: https://github.com/conda-forge/pillow-feedstock/issues/73
- libtiff=4.0.10
- geopandas
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
long_description = f.read()

install_requires = [
'pyarrow >= 0.17,<0.18',
'pyarrow <= 2.0',
'thrift == 0.13.0',
'shapely',
'sqlalchemy >= 1.3',
'pandas >=1.0,<1.2.0dev0', # keep consistency with cudf 0.15
'pandas',
'packaging >= 20.0',
'requests >= 2.23.0',
'numba >= 0.49', # keep consistency with cudf 0.15
Expand Down

0 comments on commit 65c112f

Please sign in to comment.